diff --git a/jet_tracking/context.py b/jet_tracking/context.py index 1bd9c09..a1aa5b2 100644 --- a/jet_tracking/context.py +++ b/jet_tracking/context.py @@ -565,3 +565,10 @@ def set_com_on(self, o): """ self.find_com_bool = o self.signals.comDetection.emit() + + if not o: + self.contours = [] + self.best_fit_line = [] + self.best_fit_line_plus = [] + self.best_fit_line_minus = [] + self.com = [] diff --git a/jet_tracking/datastream.py b/jet_tracking/datastream.py index 68cb02f..e1691e5 100644 --- a/jet_tracking/datastream.py +++ b/jet_tracking/datastream.py @@ -1148,12 +1148,12 @@ def editor(self, im): kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (self.close, self.close)) im = cv2.morphologyEx(im, cv2.MORPH_CLOSE, kernel) - if self.contrast: - pass - if self.brightness: - pass if self.blur: im = cv2.GaussianBlur(im, (3, 3), self.blur, self.blur) + if self.contrast: + im = cv2.convertScaleAbs(im, alpha=self.contrast/10) + if self.brightness: + im = cv2.convertScaleAbs(im, beta=self.brightness) ret, im = cv2.threshold(im, self.left_threshold, self.right_threshold, cv2.THRESH_BINARY) return im diff --git a/jet_tracking/gui/widgets/editorWidgetUi.py b/jet_tracking/gui/widgets/editorWidgetUi.py index 3449431..8fb2753 100644 --- a/jet_tracking/gui/widgets/editorWidgetUi.py +++ b/jet_tracking/gui/widgets/editorWidgetUi.py @@ -77,9 +77,13 @@ def setupUi(self, obj): obj.lbl_brightness = QLabel("Brightness") obj.slider_brightness = QSlider(Qt.Horizontal) + obj.slider_brightness.setMinimum(0) + obj.slider_brightness.setMaximum(99) obj.lbl_contrast = QLabel("Contrast") obj.slider_contrast = QSlider(Qt.Horizontal) + obj.slider_contrast.setMinimum(1) + obj.slider_contrast.setMaximum(20) obj.lbl_blur = QLabel("Blur") obj.slider_blur = QSlider(Qt.Horizontal)