Merge pull request #269 from aaronwmorris/dev

use masks instead of extracting ROI for sqm, star, and line detection

Author: aaronwmorris

README.md

@@ -245,6 +245,7 @@ All configuration is read from /etc/indi-allsky/config.json .  You can find conf
 | DETECT_STARS        | true        | (bool) Enable star detection |
 | DETECT_STARS_THOLD  | 0.6         | (float) Star detection threshold |
 | DETECT_METEORS      | false       | (bool) Enable meteor detection |
+| DETECT_MASK         |             | (str) Image file to use for detection mask |
 | DETECT_DRAW         | false       | (bool) Draw detected objects on original image |
 | SQM_ROI             | []          | (array) Region of interest for SQM and Star detection |
 | LOCATION_LATITUDE   |             | (float) Your latitude for astrometric calculations |

config.json_template

@@ -50,6 +50,7 @@
     "DETECT_STARS_THOLD" : 0.6,
     "comment_DETECT_METEORS" : "Enable Meteor detection",
     "DETECT_METEORS" : false,
+    "DETECT_MASK" : "",
     "comment_DETECT_DRAW" : "Enable drawing detections on original image",
     "DETECT_DRAW" : false,
     "comment_SQM_ROI" : "Region of Interest for SQM and Star detection",

indi_allsky/detectLines.py

@@ -21,50 +21,41 @@ class IndiAllskyDetectLines(object):
     min_line_length = 40  # minimum number of pixels making up a line
     max_line_gap = 20  # maximum gap in pixels between connectable line segments
 
-    def __init__(self, config, bin_v):
+    mask_blur_kernel_size = 75
+
+
+    def __init__(self, config, bin_v, mask=None):
         self.config = config
         self.bin_v = bin_v
 
-        self.x_offset = 0
-        self.y_offset = 0
-
+        self._sqm_mask = mask
+        self._sqm_gradient_mask = None
 
-    def detectLines(self, img):
-        image_height, image_width = img.shape[:2]
 
-        sqm_roi = self.config.get('SQM_ROI', [])
+    def detectLines(self, original_img):
+        if isinstance(self._sqm_mask, type(None)):
+            # This only needs to be done once if a mask is not provided
+            self._generateSqmMask(original_img)
 
-        try:
-            x1 = int(sqm_roi[0] / self.bin_v.value)
-            y1 = int(sqm_roi[1] / self.bin_v.value)
-            x2 = int(sqm_roi[2] / self.bin_v.value)
-            y2 = int(sqm_roi[3] / self.bin_v.value)
-        except IndexError:
-            logger.warning('Using central ROI for line detection')
-            x1 = int((image_width / 2) - (image_width / 3))
-            y1 = int((image_height / 2) - (image_height / 3))
-            x2 = int((image_width / 2) + (image_width / 3))
-            y2 = int((image_height / 2) + (image_height / 3))
+        if isinstance(self._sqm_gradient_mask, type(None)):
+            # This only needs to be done once
+            self._generateSqmGradientMask(original_img)
 
 
-        self.x_offset = x1
-        self.y_offset = y1
+        # apply the gradient to the image
+        masked_img = (original_img * self._sqm_gradient_mask).astype(numpy.uint8)
 
-        roi_img = img[
-            y1:y2,
-            x1:x2,
-        ]
 
-        if len(img.shape) == 2:
-            img_gray = roi_img
+        if len(original_img.shape) == 2:
+            img_gray = masked_img
         else:
-            img_gray = cv2.cvtColor(roi_img, cv2.COLOR_BGR2GRAY)
+            img_gray = cv2.cvtColor(masked_img, cv2.COLOR_BGR2GRAY)
 
 
 
         lines_start = time.time()
 
-        blur_gray = cv2.GaussianBlur(img_gray, (self.blur_kernel_size, self.blur_kernel_size), 0)
+        blur_gray = cv2.GaussianBlur(img_gray, (self.blur_kernel_size, self.blur_kernel_size), cv2.BORDER_DEFAULT)
 
 
         edges = cv2.Canny(blur_gray, self.canny_low_threshold, self.canny_high_threshold)
@@ -91,35 +82,74 @@ def detectLines(self, img):
 
         logger.info('Detected %d lines', len(lines))
 
-        self._drawLines(img, lines, (x1, y1, x2, y2))
+        self._drawLines(original_img, lines)
 
         return lines
 
 
-    def _drawLines(self, img, lines, box):
+    def _generateSqmMask(self, img):
+        logger.info('Generating mask based on SQM_ROI')
+
+        image_height, image_width = img.shape[:2]
+
+        # create a black background
+        mask = numpy.zeros((image_height, image_width), dtype=numpy.uint8)
+
+        sqm_roi = self.config.get('SQM_ROI', [])
+
+        try:
+            x1 = int(sqm_roi[0] / self.bin_v.value)
+            y1 = int(sqm_roi[1] / self.bin_v.value)
+            x2 = int(sqm_roi[2] / self.bin_v.value)
+            y2 = int(sqm_roi[3] / self.bin_v.value)
+        except IndexError:
+            logger.warning('Using central ROI for blob calculations')
+            x1 = int((image_width / 2) - (image_width / 3))
+            y1 = int((image_height / 2) - (image_height / 3))
+            x2 = int((image_width / 2) + (image_width / 3))
+            y2 = int((image_height / 2) + (image_height / 3))
+
+        # The white area is what we keep
+        cv2.rectangle(
+            img=mask,
+            pt1=(x1, y1),
+            pt2=(x2, y2),
+            color=(255),  # mono
+            thickness=cv2.FILLED,
+        )
+
+        # mask needs to be blurred so that we do not detect it as an edge
+        self._sqm_mask = mask
+
+
+    def _generateSqmGradientMask(self, img):
+        # blur the mask to prevent mask edges from being detected as lines
+        blur_mask = cv2.blur(self._sqm_mask, (self.mask_blur_kernel_size, self.mask_blur_kernel_size), cv2.BORDER_DEFAULT)
+
+        if len(img.shape) == 2:
+            # mono
+            mask = blur_mask
+        else:
+            # color
+            mask = cv2.cvtColor(blur_mask, cv2.COLOR_GRAY2BGR)
+
+        self._sqm_gradient_mask = mask / 255
+
+
+    def _drawLines(self, img, lines):
         if not self.config.get('DETECT_DRAW'):
             return
 
         color_bgr = list(self.config['TEXT_PROPERTIES']['FONT_COLOR'])
         color_bgr.reverse()
 
-        ### box drawn in star detection
-        #logger.info('Draw box around ROI')
-        #cv2.rectangle(
-        #    img=img,
-        #    pt1=(box[0], box[1]),
-        #    pt2=(box[2], box[3]),
-        #    color=(128, 128, 128),
-        #    thickness=1,
-        #)
-
 
         for line in lines:
             for x1, y1, x2, y2 in line:
                 cv2.line(
                     img,
-                    (x1 + self.x_offset, y1 + self.y_offset),
-                    (x2 + self.x_offset, y2 + self.y_offset),
+                    (x1, y1),
+                    (x2, y2),
                     tuple(color_bgr),
                     3,
                 )

indi_allsky/flask/forms.py

@@ -4,6 +4,7 @@
 import json
 import time
 from datetime import datetime
+import cv2
 
 from flask_wtf import FlaskForm
 from wtforms import IntegerField
@@ -440,6 +441,35 @@ def IMAGE_EXTRA_TEXT_validator(form, field):
         raise ValidationError(str(e))
 
 
+def DETECT_MASK_validator(form, field):
+    if not field.data:
+        return
+
+    folder_regex = r'^[a-zA-Z0-9_\.\-\/\ ]+$'
+    if not re.search(folder_regex, field.data):
+        raise ValidationError('Invalid file name')
+
+
+    detect_mask_p = Path(field.data)
+
+    try:
+        if not detect_mask_p.exists():
+            raise ValidationError('File does not exist')
+
+        if not detect_mask_p.is_file():
+            raise ValidationError('Not a file')
+
+        with io.open(str(detect_mask_p), 'r'):
+            pass
+    except PermissionError as e:
+        raise ValidationError(str(e))
+
+
+    mask_data = cv2.imread(str(detect_mask_p), cv2.IMREAD_GRAYSCALE)
+    if isinstance(mask_data, type(None)):
+        raise ValidationError('File is not a valid image')
+
+
 def IMAGE_SCALE_validator(form, field):
     if field.data < 1:
         raise ValidationError('Image Scaling must be 1 or greater')
@@ -827,6 +857,7 @@ class IndiAllskyConfigForm(FlaskForm):
     DETECT_STARS                     = BooleanField('Star Detection')
     DETECT_STARS_THOLD               = FloatField('Star Detection Threshold', validators=[DataRequired(), DETECT_STARS_THOLD_validator])
     DETECT_METEORS                   = BooleanField('Meteor Detection')
+    DETECT_MASK                      = StringField('Detection Mask', validators=[DETECT_MASK_validator])
     DETECT_DRAW                      = BooleanField('Mark Detections on Image')
     SQM_ROI_X1                       = IntegerField('SQM ROI x1', validators=[SQM_ROI_validator])
     SQM_ROI_Y1                       = IntegerField('SQM ROI y1', validators=[SQM_ROI_validator])

indi_allsky/flask/templates/config.html

@@ -338,6 +338,19 @@
         <div class="col-sm-8"></div>
     </div>
 
+    <div class="form-group row">
+        <div class="col-sm-2">
+            {{ form_config.DETECT_MASK.label(class='col-form-label') }}
+        </div>
+        <div class="col-sm-5">
+            {{ form_config.DETECT_MASK(class='form-control bg-secondary') }}
+            <div id="DETECT_MASK-error" class="invalid-feedback text-danger" style="display: none;"></div>
+        </div>
+        <div class="col-sm-5">
+            <div>Image mask file for detection area.  PNG or JPEG</div>
+        </div>
+    </div>
+
     <div class="form-group row">
         <div class="col-sm-2">
             {{ form_config.DETECT_DRAW.label }}
@@ -1408,6 +1421,7 @@
     'SQM_ROI_X2',
     'SQM_ROI_Y2',
     'DETECT_STARS_THOLD',
+    'DETECT_MASK',
     'LOCATION_LATITUDE',
     'LOCATION_LONGITUDE',
     'NIGHT_SUN_ALT_DEG',

indi_allsky/flask/views.py

@@ -772,6 +772,7 @@ def get_context(self):
             'DETECT_STARS'                   : self.indi_allsky_config.get('DETECT_STARS', True),
             'DETECT_STARS_THOLD'             : self.indi_allsky_config.get('DETECT_STARS_THOLD', 0.6),
             'DETECT_METEORS'                 : self.indi_allsky_config.get('DETECT_METEORS', False),
+            'DETECT_MASK'                    : self.indi_allsky_config.get('DETECT_MASK', ''),
             'DETECT_DRAW'                    : self.indi_allsky_config.get('DETECT_DRAW', False),
             'LOCATION_LATITUDE'              : self.indi_allsky_config.get('LOCATION_LATITUDE', 0.0),
             'LOCATION_LONGITUDE'             : self.indi_allsky_config.get('LOCATION_LONGITUDE', 0.0),
@@ -1035,6 +1036,7 @@ def dispatch_request(self):
         self.indi_allsky_config['DETECT_STARS']                         = bool(request.json['DETECT_STARS'])
         self.indi_allsky_config['DETECT_STARS_THOLD']                   = float(request.json['DETECT_STARS_THOLD'])
         self.indi_allsky_config['DETECT_METEORS']                       = bool(request.json['DETECT_METEORS'])
+        self.indi_allsky_config['DETECT_MASK']                          = str(request.json['DETECT_MASK'])
         self.indi_allsky_config['DETECT_DRAW']                          = bool(request.json['DETECT_DRAW'])
         self.indi_allsky_config['LOCATION_LATITUDE']                    = float(request.json['LOCATION_LATITUDE'])
         self.indi_allsky_config['LOCATION_LONGITUDE']                   = float(request.json['LOCATION_LONGITUDE'])