bkgrROI are removed and updated also on navigate scrollbar more

SchmollerLab · Oct 1, 2021 · db6003a · db6003a
1 parent aa8f2ec
commit db6003a
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/src/dataPrep.py b/src/dataPrep.py
@@ -427,18 +427,15 @@ def updateNavigateItems(self):
 
             self.navigateScrollbar.valueChanged.disconnect()
             self.navigateScrollbar.setValue(self.pos_i+1)
-            self.navigateScrollbar.valueChanged.connect(
-                self.navigateScrollBarMoved
-            )
         else:
             self.frameLabel.setText(
                      f'Current frame = {self.frame_i+1}/{self.num_frames}')
             self.navigateSB_label.setText(f'frame n. {self.frame_i+1}')
             self.navigateScrollbar.valueChanged.disconnect()
             self.navigateScrollbar.setValue(self.frame_i+1)
-            self.navigateScrollbar.valueChanged.connect(
-                self.navigateScrollBarMoved
-            )
+        self.navigateScrollbar.valueChanged.connect(
+            self.navigateScrollBarMoved
+        )
 
     def getImage(self, PosData, img_data, frame_i):
         if PosData.SizeT > 1:
@@ -481,6 +478,9 @@ def update_img(self):
 
 
     def updateBkgrROIs(self):
+        if self.startAction.isEnabled():
+            return
+
         PosData = self.data[self.pos_i]
         for roi in PosData.bkgrROIs:
             if roi not in self.ax1.items:
@@ -490,13 +490,19 @@ def updateBkgrROIs(self):
             roi.sigRegionChangeFinished.connect(self.bkgrROImovingFinished)
 
     def removeBkgrROIs(self):
+        if self.startAction.isEnabled():
+            return
+
         PosData = self.data[self.pos_i]
         for roi in PosData.bkgrROIs:
             self.ax1.removeItem(roi.label)
             self.ax1.removeItem(roi)
 
-            roi.sigRegionChanged.disconnect()
-            roi.sigRegionChangeFinished.disconnect()
+            try:
+                roi.sigRegionChanged.disconnect()
+                roi.sigRegionChangeFinished.disconnect()
+            except TypeError:
+                pass
 
     def init_attr(self):
         PosData = self.data[0]
@@ -515,6 +521,8 @@ def init_attr(self):
 
     def navigateScrollBarMoved(self, value):
         PosData = self.data[self.pos_i]
+        self.removeBkgrROIs()
+
         if PosData.SizeT > 1:
             self.frame_i = value-1
         elif self.num_pos > 1:
@@ -523,6 +531,8 @@ def navigateScrollBarMoved(self, value):
             return
 
         self.update_img()
+        self.updateBkgrROIs()
+
 
     def crop(self, data):
         x0, y0 = [int(round(c)) for c in self.cropROI.pos()]