Fix line edits changing to unwanted value (#330)

Author: djhoese

uwsift/view/colormap_dialogs.py

@@ -91,7 +91,9 @@ def _slider_changed(self, value=None, is_max=True):
         value = self._get_slider_value(value)
         LOG.debug('slider %s %s => %f' % (self.uuid, 'max' if is_max else 'min', value))
         display_val = self.doc[self.uuid][Info.UNIT_CONVERSION][1](value)
+        edit.blockSignals(True)
         edit.setText('{:0.03f}'.format(display_val))
+        edit.blockSignals(False)
         return self._set_new_clims(value, is_max)
 
     def _edit_changed(self, is_max=True):
@@ -102,7 +104,9 @@ def _edit_changed(self, is_max=True):
         val = self.doc[self.uuid][Info.UNIT_CONVERSION][1](vdis, inverse=True)
         LOG.debug('line edit %s %s => %f => %f' % (self.uuid, 'max' if is_max else 'min', vdis, val))
         sv = self._create_slider_value(val)
+        slider.blockSignals(True)
         slider.setValue(sv)
+        slider.blockSignals(False)
         return self._set_new_clims(val, is_max)
 
     def _init_cmap_combo(self):

uwsift/view/rgb_config.py

@@ -198,6 +198,8 @@ def _update_line_edits(self, color: str, n: float = None, x: float = None):
         """
         idx = RGBA2IDX[color]
         edn, edx = self.line_edits[idx]
+        edn.blockSignals(True)
+        edx.blockSignals(True)
         if n is not None:
             ndis = self._data_to_display(color, n)
             edn.setText('%f' % ndis)
@@ -210,6 +212,8 @@ def _update_line_edits(self, color: str, n: float = None, x: float = None):
         else:
             xdis = float(edx.text())
             x = self._display_to_data(color, xdis)
+        edn.blockSignals(False)
+        edx.blockSignals(False)
         return n, x
 
     def _signal_color_changing_range(self, color: str, n: float, x: float):
@@ -249,9 +253,10 @@ def _edit_changed(self, line_edit: QLineEdit, color: str, is_max: bool):
         val = self._display_to_data(color, vdis)
         LOG.debug('line edit %s %s => %f => %f' % (color, 'max' if is_max else 'min', vdis, val))
         sv = self._create_slider_value(vn, vx, val)
-        print("Edit changed and updating slider to: ", sv)
         slider = self.sliders[idx][1 if is_max else 0]
+        slider.blockSignals(True)
         slider.setValue(sv)
+        slider.blockSignals(False)
         self._signal_color_changing_range(color, *self._update_line_edits(color))
 
     def selection_did_change(self, recipe):
@@ -305,13 +310,20 @@ def _set_minmax_slider(self, color: str, family: str, clims: Optional[Tuple[floa
         if family not in self._families:
             LOG.debug(
                 "Could not find {} in families {}".format(repr(family), repr(list(sorted(self._families.keys())))))
+        # block signals so the changed sliders don't trigger updates
+        slider[0].blockSignals(True)
+        slider[1].blockSignals(True)
         if clims is None or clims == (None, None) or \
                 family not in self._families:
             self._valid_ranges[idx] = (None, None)
             slider[0].setSliderPosition(0)
             slider[1].setSliderPosition(0)
+            editn.blockSignals(True)
+            editx.blockSignals(True)
             editn.setText('0.0')
             editx.setText('0.0')
+            editn.blockSignals(False)
+            editx.blockSignals(False)
             slider[0].setDisabled(True)
             slider[1].setDisabled(True)
             editn.setDisabled(True)
@@ -325,28 +337,21 @@ def _set_minmax_slider(self, color: str, family: str, clims: Optional[Tuple[floa
             valid_range = self._families[family][Info.VALID_RANGE]
             self._valid_ranges[idx] = valid_range
 
-            # block signals so the changed sliders don't trigger updates
-            slider[0].blockSignals(True)
-            slider[1].blockSignals(True)
             slider_val = self._create_slider_value(valid_range[0], valid_range[1], clims[0])
             slider[0].setSliderPosition(max(slider_val, 0))
             slider_val = self._create_slider_value(valid_range[0], valid_range[1], clims[1])
             slider[1].setSliderPosition(min(slider_val, self._slider_steps))
-            slider[0].blockSignals(False)
-            slider[1].blockSignals(False)
 
             self._update_line_edits(color, *clims)
+        slider[0].blockSignals(False)
+        slider[1].blockSignals(False)
 
     def _set_minmax_sliders(self, recipe):
         if recipe:
-            print("Setting sliders with a recipe: ", recipe)
             for idx, (color, clim) in enumerate(zip("rgb", recipe.color_limits)):
                 family = recipe.input_ids[idx]
-                print("About to set individual slider for ", color, clim, family)
                 self._set_minmax_slider(color, family, clim)
-                print("done setting individual slider for ", color)
         else:
-            print("Setting sliders with no recipe")
             self._set_minmax_slider("r", None)
             self._set_minmax_slider("g", None)
             self._set_minmax_slider("b", None)