Skip to content

Remove COM lines when option off + Brightness/Contrast #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gadorlhiac wants to merge 1 commit into
base: thread_fixes
Choose a base branch
from
Open

Remove COM lines when option off + Brightness/Contrast #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions jet_tracking/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
8 changes: 4 additions & 4 deletions jet_tracking/datastream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions jet_tracking/gui/widgets/editorWidgetUi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down