taurus 5.2.2__tar.gz → 5.2.3__tar.gz

{taurus-5.2.2 → taurus-5.2.3}/CHANGELOG.md

@@ -11,6 +11,19 @@ Note: changes in the [support-3.x] branch (which was split from
 the master branch after [3.7.1] and maintained in parallel to the
 develop branch) won't be reflected in this file.
 
+## [5.2.3] - 2025-02-25
+Unofficial release with bug fixes and small additions.
+
+IMPORTANT: this is a not-fully-official release: it did not undergo the usual
+release manual tests on various platforms and it is not merged into the stable
+branch. However, it has been used in production in ALBA for some weeks already
+without issues.
+
+### Fixed
+- Allow TaurusPollingTimer to end its infinite loop before removing the object so it doesn't create orphan threads. (!1345)
+- Problems updating bgRole color in TaurusLabels (!1344, #1400)
+- Fixed right-click context menu action in TaurusGraphicsScene. Now it correctly sets the model in TaurusDevicePanel launched from JDraw synoptics (!1343, #1399)
+
 ## [5.2.2] - 2025-01-22
 Unofficial release with bug fixes and small additions.
 
@@ -880,6 +893,7 @@ and several other places](https://sf.net/p/tauruslib/tickets/milestone/Jul15/)
 [TEP19]: http://www.taurus-scada.org/tep/?TEP19.md
 [TEP20]: http://www.taurus-scada.org/tep/?TEP20.md
 [Unreleased]: https://gitlab.com/taurus-org/taurus/-/tree/develop
+[5.2.3]: https://gitlab.com/taurus-org/taurus/-/tree/5.2.3
 [5.2.2]: https://gitlab.com/taurus-org/taurus/-/tree/5.2.2
 [5.2.1]: https://gitlab.com/taurus-org/taurus/-/tree/5.2.1
 [5.2.0]: https://gitlab.com/taurus-org/taurus/-/tree/5.2.0

{taurus-5.2.2/lib/taurus.egg-info → taurus-5.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: taurus
-Version: 5.2.2
+Version: 5.2.3
 Summary: A framework for scientific/industrial CLIs and GUIs
 Home-page: http://www.taurus-scada.org
 Download-URL: http://pypi.python.org/packages/source/t/taurus

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/_release.py

@@ -52,7 +52,7 @@ __docformat__ = "restructuredtext"
 # (https://github.com/peritus/bumpversion), except when adding/removing
 # extra numbers in the release segment (e.g. for hotfixes), which is done
 # manually.
-version = "5.2.2"
+version = "5.2.3"
 
 name = "taurus"
 

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/core/taurusattribute.py

@@ -430,7 +430,7 @@ class TaurusAttribute(TaurusModel):
 
     @property
     def rvalue(self, cache=True):
-        valueObj = self.getValueObj()
+        valueObj = self.getValueObj(cache=cache)
         if valueObj is None:
             return None
         else:

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/core/taurusfactory.py

@@ -382,6 +382,7 @@ class TaurusFactory(object):
         for period, timer in timers.items():
             timer.removeAttribute(attribute)
             if not timer.dev_dict and period in self.polling_timers:
+                self.polling_timers[period].finish()
                 del self.polling_timers[period]
 
     def __str__(self):

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/core/tauruspollingtimer.py

@@ -63,6 +63,7 @@ class TaurusPollingTimer(Logger):
         self.__thread = threading.Thread(target=self.__run, name=name)
         self.__thread.setDaemon(True)
         self._started = True
+        self._finished = False
         if application.state == ApplicationStates.STARTING:
             application.application_ready_eg.subscribeEvent(
                 self.on_application_ready, with_first_event=False
@@ -73,7 +74,7 @@ class TaurusPollingTimer(Logger):
     def __run(self):
         """Private Thread Function"""
         next_time = time.time() + self._period
-        while True:
+        while True and not self._finished:
             if not self._started:
                 # emulate stopped
                 time.sleep(self._period)
@@ -99,6 +100,9 @@ class TaurusPollingTimer(Logger):
         self.deprecated("TaurusPollingTimer.stop()", rel="4.7.1")
         self._started = False
 
+    def finish(self):
+        self._finished = True
+
     def containsAttribute(self, attribute):
         """Determines if the polling timer already contains this attribute
 

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/qt/qtgui/base/__init__.py

@@ -41,6 +41,7 @@ from .tauruscontroller import (
     TaurusAttributeControllerHelper,
     TaurusScalarAttributeControllerHelper,
     TaurusConfigurationControllerHelper,
+    TaurusBgRoleSubscriber,
     updateLabelBackground,
 )
 
@@ -50,6 +51,7 @@ __all__ = [
     "TaurusBaseComponent",
     "TaurusBaseWidget",
     "TaurusBaseWritableWidget",
+    "TaurusBgRoleSubscriber",
     "defaultFormatter",
     "expFormatter",
     "floatFormatter",

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/qt/qtgui/base/tauruscontroller.py

@@ -33,6 +33,7 @@ from taurus.external.qt import Qt
 
 from taurus.core.taurusbasetypes import DataFormat, TaurusEventType
 
+from taurus.qt.qtgui.base import TaurusBaseComponent
 from taurus.qt.qtgui.util import QT_ATTRIBUTE_QUALITY_PALETTE
 from taurus.qt.qtgui.util import QT_DEVICE_STATE_PALETTE
 
@@ -323,6 +324,12 @@ def updateLabelBackground(ctrl, widget):
             if bgRole == "quality":
                 palette = QT_ATTRIBUTE_QUALITY_PALETTE
                 bgItem = ctrl.quality()
+            elif bgRole == "tango_state":
+                modelObj = widget.getModelObj()
+                try:
+                    bgItem = modelObj.getParent().stateObj.rvalue
+                except AttributeError:
+                    pass
             elif bgRole == "state":
                 try:
                     bgItem = ctrl.state()
@@ -364,3 +371,14 @@ def updateLabelBackground(ctrl, widget):
             ss = StyleSheetTemplate.format("rgba(255,255,255,128)", color_ss)
         widget.setStyleSheet(ss)
     widget.update()  # necessary in pyqt <= 4.4
+
+
+class TaurusBgRoleSubscriber(TaurusBaseComponent):
+
+    def __init__(self, parent):
+        super().__init__(parent=parent)
+        self.parent = parent
+
+    def handleEvent(self, evt_src, evt_type, evt_value):
+        super().handleEvent(evt_src, evt_type, evt_value)
+        self.parent.controllerUpdate()

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/qt/qtgui/display/tauruslabel.py

@@ -42,7 +42,7 @@ from taurus.qt.qtgui.base import TaurusBaseController
 from taurus.qt.qtgui.base import TaurusScalarAttributeControllerHelper
 from taurus.qt.qtgui.base import TaurusConfigurationControllerHelper
 from taurus.qt.qtgui.base import updateLabelBackground
-
+from taurus.qt.qtgui.base import TaurusBgRoleSubscriber
 
 __docformat__ = "restructuredtext"
 
@@ -408,6 +408,18 @@ class TaurusLabel(Qt.QLabel, TaurusBaseWidget):
                      and its API may change in future versions
         """
         self._bgRole = str(bgRole)
+        if self._bgRole in ["tango_state"]:
+            _bgRoleSubscriber = TaurusBgRoleSubscriber(self)
+            _bgRoleSubscriber.setModel(f"{self.modelObj.parentObj.name}/state")
+        elif "parentObj." in self._bgRole:
+            _attr = self._bgRole.split(".")[1]
+            if "Obj" in _attr:
+                _attr = _attr.strip("Obj")
+            _bgRoleSubscriber = TaurusBgRoleSubscriber(self)
+            _bgRoleSubscriber.setModel(
+                f"{self.modelObj.parentObj.name}/{_attr}"
+            )
+
         self.controllerUpdate()
 
     def resetBgRole(self):

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/qt/qtgui/display/tauruslcd.py

@@ -40,6 +40,7 @@ from taurus.qt.qtgui.base import TaurusBaseController
 from taurus.qt.qtgui.base import TaurusScalarAttributeControllerHelper
 from taurus.qt.qtgui.base import TaurusConfigurationControllerHelper
 from taurus.qt.qtgui.base import updateLabelBackground
+from taurus.qt.qtgui.base import TaurusBgRoleSubscriber
 
 
 __docformat__ = "restructuredtext"
@@ -304,8 +305,20 @@ class TaurusLCD(Qt.QLCDNumber, TaurusBaseWidget):
         return self._bgRole
 
     def setBgRole(self, bgRole):
-        self._bgRole = str(bgRole).lower()
-        self.controller().update()
+        self._bgRole = str(bgRole)
+        if self._bgRole in ["tango_state"]:
+            _bgRoleSubscriber = TaurusBgRoleSubscriber(self)
+            _bgRoleSubscriber.setModel(f"{self.modelObj.parentObj.name}/state")
+        elif "parentObj." in self._bgRole:
+            _attr = self._bgRole.split(".")[1]
+            if "Obj" in _attr:
+                _attr = _attr.strip("Obj")
+            _bgRoleSubscriber = TaurusBgRoleSubscriber(self)
+            _bgRoleSubscriber.setModel(
+                f"{self.modelObj.parentObj.name}/{_attr}"
+            )
+
+        self.controllerUpdate()
 
     def resetBgRole(self):
         self.setBgRole(self.DefaultBgRole)

{taurus-5.2.2 → taurus-5.2.3}/lib/taurus/qt/qtgui/graphic/taurusgraphic.py

@@ -472,7 +472,7 @@ class TaurusGraphicsScene(Qt.QGraphicsScene):
                         configDialogAction = menu.addAction(k)
                         if action:
                             configDialogAction.triggered.connect(
-                                lambda dev=obj_name, act=action: act(dev)
+                                lambda: action(obj_name)
                             )
                         else:
                             configDialogAction.setEnabled(False)

{taurus-5.2.2 → taurus-5.2.3/lib/taurus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: taurus
-Version: 5.2.2
+Version: 5.2.3
 Summary: A framework for scientific/industrial CLIs and GUIs
 Home-page: http://www.taurus-scada.org
 Download-URL: http://pypi.python.org/packages/source/t/taurus