fix for changing RGB/noRGB

lavue-org · Oct 15, 2021 · 9f24ac7 · 9f24ac7
1 parent f77b8b4
commit 9f24ac7
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 44 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2021-10-15 Jan Kotanski <jan.kotanski@desy.de>
+	* fix for changing RGB/noRGB
+	* tagged as 2.70.1
+
 2021-10-15 Jan Kotanski <jan.kotanski@desy.de>
 	* add motors tracking in the MoveMotor tool
 	* tagged as 2.70.0

diff --git a/lavuelib/levelsGroupBox.py b/lavuelib/levelsGroupBox.py
@@ -244,14 +244,14 @@ def _monoLevelMode(self, status):
         elif _PQGVER >= 1100:
             if status:
                 self.__dchl = 0
-                if not self.__ui.gradientLabel.isVisible():
-                    self._updateLevelLabels()
-                    if not self.__histo:
-                        self.__histogram.switchLevelMode('mono')
-                    self.__levelmode = "mono"
-                    self.updateLevels(self.__minval, self.__maxval)
-                    if self.__histogram:
-                        self.__histogram.switchLevelMode('mono')
+                # if not self.__ui.gradientLabel.isVisible():
+                self._updateLevelLabels()
+                if not self.__histo:
+                    self.__histogram.switchLevelMode('mono')
+                self.__levelmode = "mono"
+                self.updateLevels(self.__minval, self.__maxval)
+                if self.__histogram:
+                    self.__histogram.switchLevelMode('mono')
 
     @QtCore.pyqtSlot(bool)
     def _redLevelMode(self, status):
@@ -278,18 +278,18 @@ def _redLevelMode(self, status):
         elif _PQGVER >= 1100:
             if status:
                 self.__dchl = 1
-                if self.__ui.gradientLabel.isVisible():
-                    self._updateLevelLabels()
-                    if not self.__histo:
-                        self.__histogram.switchLevelMode('rgba')
-                    self.__levelmode = "rgba"
-                    if self.__channels is not None:
-                        while len(self.__channels) < 1:
-                            self.__channels.append(
-                                (self.__minval, self.__maxval))
-                        self.updateLevels(None, None, self.__channels)
-                    if self.__histogram:
-                        self.__histogram.switchLevelMode('rgba')
+                # if self.__ui.gradientLabel.isVisible():
+                self._updateLevelLabels()
+                if not self.__histo:
+                    self.__histogram.switchLevelMode('rgba')
+                self.__levelmode = "rgba"
+                if self.__channels is not None:
+                    while len(self.__channels) < 1:
+                        self.__channels.append(
+                            (self.__minval, self.__maxval))
+                    self.updateLevels(None, None, self.__channels)
+                if self.__histogram:
+                    self.__histogram.switchLevelMode('rgba')
 
     @QtCore.pyqtSlot(bool)
     def _greenLevelMode(self, status):
@@ -317,17 +317,17 @@ def _greenLevelMode(self, status):
             if status:
                 self.__dchl = 2
                 self._updateLevelLabels()
-                if self.__ui.gradientLabel.isVisible():
-                    if not self.__histo:
-                        self.__histogram.switchLevelMode('rgba')
-                    self.__levelmode = "rgba"
-                    if self.__channels is not None:
-                        while len(self.__channels) < 2:
-                            self.__channels.append(
-                                (self.__minval, self.__maxval))
-                        self.updateLevels(None, None, self.__channels)
-                    if self.__histogram:
-                        self.__histogram.switchLevelMode('rgba')
+                # if self.__ui.gradientLabel.isVisible():
+                if not self.__histo:
+                    self.__histogram.switchLevelMode('rgba')
+                self.__levelmode = "rgba"
+                if self.__channels is not None:
+                    while len(self.__channels) < 2:
+                        self.__channels.append(
+                            (self.__minval, self.__maxval))
+                    self.updateLevels(None, None, self.__channels)
+                if self.__histogram:
+                    self.__histogram.switchLevelMode('rgba')
 
     @QtCore.pyqtSlot(bool)
     def _blueLevelMode(self, status):
@@ -354,18 +354,18 @@ def _blueLevelMode(self, status):
         elif _PQGVER >= 1100:
             if status:
                 self.__dchl = 3
-                if self.__ui.gradientLabel.isVisible():
-                    self._updateLevelLabels()
-                    if not self.__histo:
-                        self.__histogram.switchLevelMode('rgba')
-                    self.__levelmode = "rgba"
-                    if self.__channels is not None:
-                        while len(self.__channels) < 3:
-                            self.__channels.append(
-                                (self.__minval, self.__maxval))
-                        self.updateLevels(None, None, self.__channels)
-                    if self.__histogram:
-                        self.__histogram.switchLevelMode('rgba')
+                # if self.__ui.gradientLabel.isVisible():
+                self._updateLevelLabels()
+                if not self.__histo:
+                    self.__histogram.switchLevelMode('rgba')
+                self.__levelmode = "rgba"
+                if self.__channels is not None:
+                    while len(self.__channels) < 3:
+                        self.__channels.append(
+                            (self.__minval, self.__maxval))
+                    self.updateLevels(None, None, self.__channels)
+                if self.__histogram:
+                    self.__histogram.switchLevelMode('rgba')
 
     def __connectHistogram(self, iid=0):
         """ create histogram object and connect its signals
@@ -1560,6 +1560,7 @@ def setGradientColors(self, status=True):
         """
         if self.__gradientcolors != status:
             self.__gradientcolors = status
+            self.__updateRadio(0)
             self.showHistograms(self.__rgbstatus)
 
     def gradientColors(self):

diff --git a/lavuelib/release.py b/lavuelib/release.py
@@ -26,4 +26,4 @@
 """ release version """
 
 #: (:obj:`str`) the live viewer version
-__version__ = "2.70.0"
+__version__ = "2.70.1"