taurus 5.2.2__tar.gz → 5.2.4__tar.gz

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

@@ -11,6 +11,33 @@ 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.
 
+## [Unreleased]
+
+## [5.2.4] - 2025-04-29
+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.
+
+### Added
+- New dropdown widget for handling Tango DevEnum attributes. (!1352)
+- Support for plotting of spectra and images in TaurusNeXusBrowser. (!1351, #1410)
+
+## [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 +907,8 @@ 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.4]: https://gitlab.com/taurus-org/taurus/-/tree/5.2.4
+[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.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: taurus
-Version: 5.2.2
+Version: 5.2.4
 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
@@ -46,6 +46,7 @@ Requires-Dist: ply>=2.3; extra == "taurus-qt"
 Requires-Dist: lxml>=2.1; extra == "taurus-qt"
 Requires-Dist: PyQtWebEngine; extra == "taurus-qt"
 Requires-Dist: guiqwt>=3; extra == "taurus-qt"
+Requires-Dist: pythonqwt<=0.14.3; extra == "taurus-qt"
 Provides-Extra: taurus-tango
 Requires-Dist: PyTango>=7.1; extra == "taurus-tango"
 Provides-Extra: taurus-epics
@@ -61,6 +62,7 @@ Dynamic: download-url
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: maintainer
 Dynamic: maintainer-email
 Dynamic: platform

{taurus-5.2.2 → taurus-5.2.4}/doc/source/devel/examples.rst

@@ -87,13 +87,17 @@ code::
     from taurus.qt.qtgui.display import TaurusLabel
     w = TaurusLabel()
     layout.addWidget(w)
-    w.model = 'sys/taurustest/1/position'
+    w.model = 'sys/taurustest/1/position#rvalue.magnitude'
 
     panel.show()
     sys.exit(app.exec_())
     
 *not much code to write, but... boring!*
 
+Note: If the `#rvalue.magnitude` fragment is not specified in the
+model (e.g., `sys/taurustest/1/position`), the units (if defined)
+will also be displayed in the label widget.
+
 Display attribute value with label
 ----------------------------------
 
@@ -110,7 +114,7 @@ code::
     layout.addWidget(w1)
     layout.addWidget(w2)
     w1.model, w1.bgRole = 'sys/taurustest/1/position#label', ''
-    w2.model = 'sys/taurustest/1/position'
+    w2.model = 'sys/taurustest/1/position#rvalue.magnitude'
     
 *Much better indeed!*
 
@@ -175,8 +179,8 @@ code::
     layout.addWidget(w3)
     layout.addWidget(w4)
     w1.model, w1.bgRole = 'sys/taurustest/1/position#label', ''
-    w2.model = 'sys/taurustest/1/position'
-    w3.model = 'sys/taurustest/1/position'
+    w2.model = 'sys/taurustest/1/position#rvalue.magnitude'
+    w3.model = 'sys/taurustest/1/position#wvalue.magnitude'
     w4.model, w4.bgRole = 'sys/taurustest/1/position#rvalue.units', ''
     
 *Now it seems a little bit more useful, doesn't it?*

{taurus-5.2.2 → taurus-5.2.4}/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.4"
 
 name = "taurus"
 

{taurus-5.2.2 → taurus-5.2.4}/lib/taurus/core/tango/enums.py

@@ -92,6 +92,7 @@ FROM_TANGO_TO_NUMPY_TYPE = {
     PyTango.DevString: str,
     PyTango.DevDouble: numpy.float64,
     PyTango.DevFloat: numpy.float32,
+    PyTango.DevEnum: numpy.ushort,
 }
 
 FROM_TANGO_TO_STR_TYPE = {
@@ -107,6 +108,7 @@ FROM_TANGO_TO_STR_TYPE = {
     PyTango.DevString: "str",
     PyTango.DevDouble: "float64",
     PyTango.DevFloat: "float32",
+    PyTango.DevEnum: "str",
 }
 
 

{taurus-5.2.2 → taurus-5.2.4}/lib/taurus/core/tango/tangoattribute.py

@@ -109,7 +109,7 @@ class TangoAttrValue(TaurusAttrValue):
 
         numerical = PyTango.is_numerical_type(
             self._attrRef._tango_data_type, inc_array=True
-        ) or (self._attrRef._tango_data_type == PyTango.DevEnum)
+        )
 
         if p.has_failed:
             self.error = PyTango.DevFailed(*p.get_err_stack())
@@ -142,6 +142,14 @@ class TangoAttrValue(TaurusAttrValue):
                 wvalue = Quantity(wvalue, units=units)
         elif isinstance(rvalue, PyTango._PyTango.DevState):
             rvalue = DevState[str(rvalue)]
+        elif self._attrRef._tango_data_type == PyTango.DevEnum:
+            self.enum_labels = self._attrRef.enum_labels
+            if self._attrRef.data_format == DataFormat._1D:
+                rvalue = numpy.array([self.enum_labels[x] for x in rvalue])
+            elif self._attrRef.data_format == DataFormat._2D:
+                rvalue = numpy.vectorize(lambda x: self.enum_labels[x])(rvalue)
+            else:
+                rvalue = self.enum_labels[rvalue]
 
         self.rvalue = rvalue
         self.wvalue = wvalue
@@ -322,11 +330,13 @@ class TangoAttribute(TaurusAttribute):
         self.call__init__(TaurusAttribute, name, parent, **kwargs)
         self.__deactivate_polling = False
 
+        self.enum_labels = []
         attr_info = None
         if parent:
             attr_name = self.getSimpleName()
             try:
                 attr_info = parent.attribute_query(attr_name)
+                self.enum_labels = attr_info.enum_labels
             except (AttributeError, PyTango.DevFailed):
                 # if PyTango could not connect to the dev
                 attr_info = None
@@ -456,10 +466,9 @@ class TangoAttribute(TaurusAttribute):
             elif tgtype in (
                 PyTango.CmdArgType.DevState,
                 PyTango.CmdArgType.DevEncoded,
+                PyTango.CmdArgType.DevEnum,
             ):
                 attrvalue = magnitude
-            elif tgtype == PyTango.CmdArgType.DevEnum:
-                attrvalue = int(magnitude)
             else:
                 attrvalue = str(magnitude)
         elif fmt in (DataFormat._1D, DataFormat._2D):

{taurus-5.2.2 → taurus-5.2.4}/lib/taurus/core/tango/test/res/TangoSchemeTest.py

@@ -109,6 +109,7 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
         "double": numpy.float64(1.23),
         "string": "hello world",
         "uchar": 1,
+        "enum": 0,
     }
     default_unit = {"int": "mm", "float": "mm", "double": "mm"}
     # x10 default_rvalue
@@ -151,6 +152,7 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
         ),
         "string_scalar": dict(dtype=str),
         "uchar_scalar": dict(unit=default_unit["int"], dtype=numpy.uint8),
+        "enum_scalar": dict(dtype="enum", enum_labels=["ZERO", "ONE", "TWO"]),
         "bool_spectrum": dict(dtype=(bool,), max_dim_x=MAXDIMX),
         "short_spectrum": dict(
             unit=default_unit["int"], dtype=(numpy.int16,), max_dim_x=MAXDIMX
@@ -169,6 +171,11 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
         "uchar_spectrum": dict(
             unit=default_unit["int"], dtype=(numpy.uint8,), max_dim_x=MAXDIMX
         ),
+        "enum_spectrum": dict(
+            dtype=("enum",),
+            enum_labels=["ZERO", "ONE", "TWO"],
+            max_dim_x=MAXDIMX,
+        ),
         "bool_image": dict(
             dtype=[(bool,)], max_dim_x=MAXDIMX, max_dim_y=MAXDIMY
         ),
@@ -199,6 +206,12 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
             max_dim_x=MAXDIMX,
             max_dim_y=MAXDIMY,
         ),
+        "enum_image": dict(
+            dtype=[("enum",)],
+            enum_labels=["ZERO", "ONE", "TWO"],
+            max_dim_x=MAXDIMX,
+            max_dim_y=MAXDIMY,
+        ),
         "MIXEDcase": dict(dtype=str),
     }
     extra_cfg = {
@@ -251,6 +264,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     uchar_scalar_ro = attribute(
         access=AttrWriteType.READ, **attrs["uchar_scalar"]
     )
+    enum_scalar_ro = attribute(
+        access=AttrWriteType.READ, **attrs["enum_scalar"]
+    )
 
     # SPECTRA
     boolean_spectrum_ro = attribute(
@@ -265,6 +281,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     string_spectrum_ro = attribute(
         access=AttrWriteType.READ, **attrs["string_spectrum"]
     )
+    enum_spectrum_ro = attribute(
+        access=AttrWriteType.READ, **attrs["enum_spectrum"]
+    )
 
     # IMAGES
     uchar_image_ro = attribute(
@@ -282,6 +301,8 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     string_image_ro = attribute(
         access=AttrWriteType.READ, **attrs["string_image"]
     )
+    enum_image_ro = attribute(access=AttrWriteType.READ, **attrs["enum_image"])
+
     MIXEDcase = attribute(access=AttrWriteType.READ, **attrs["MIXEDcase"])
 
     # READ/WRITE ATTRIBUTES
@@ -310,6 +331,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     uchar_scalar = attribute(
         access=AttrWriteType.READ_WRITE, **attrs["uchar_scalar"]
     )
+    enum_scalar = attribute(
+        access=AttrWriteType.READ_WRITE, **attrs["enum_scalar"]
+    )
 
     # SPECTRA
     boolean_spectrum = attribute(
@@ -330,6 +354,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     uchar_spectrum = attribute(
         access=AttrWriteType.READ_WRITE, **attrs["uchar_spectrum"]
     )
+    enum_spectrum = attribute(
+        access=AttrWriteType.READ_WRITE, **attrs["enum_spectrum"]
+    )
 
     # IMAGES
     boolean_image = attribute(
@@ -350,6 +377,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     uchar_image = attribute(
         access=AttrWriteType.READ_WRITE, **attrs["uchar_image"]
     )
+    enum_image = attribute(
+        access=AttrWriteType.READ_WRITE, **attrs["enum_image"]
+    )
 
     # EVENTS
     float_scalar_poll = attribute(
@@ -403,6 +433,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     def read_uchar_scalar_ro(self):
         return self.default_rvalue["uchar"]
 
+    def read_enum_scalar_ro(self):
+        return self.default_rvalue["enum"]
+
     # SPECTRA
     def read_boolean_spectrum_ro(self):
         return [self.default_rvalue["bool"]] * self.DIMX
@@ -419,6 +452,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     def read_string_spectrum_ro(self):
         return [self.default_rvalue["string"]] * self.DIMX
 
+    def read_enum_spectrum_ro(self):
+        return [self.default_rvalue["enum"]] * self.DIMX
+
     # IMAGES
     def read_boolean_image_ro(self):
         return [[self.default_rvalue["bool"]] * self.DIMX] * self.DIMY
@@ -438,6 +474,9 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     def read_uchar_image_ro(self):
         return [[self.default_rvalue["uchar"]] * self.DIMX] * self.DIMY
 
+    def read_enum_image_ro(self):
+        return [[self.default_rvalue["enum"]] * self.DIMX] * self.DIMY
+
     def read_MIXEDcase(self):
         return "MIXEDcase"
 
@@ -485,6 +524,12 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     def write_uchar_scalar(self, v):
         self._uchar_scalar = v
 
+    def read_enum_scalar(self):
+        return getattr(self, "_enum_scalar", self.default_rvalue["enum"])
+
+    def write_enum_scalar(self, v):
+        self._enum_scalar = v
+
     # SPECTRA
     def read_boolean_spectrum(self):
         return getattr(
@@ -540,7 +585,16 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     def write_uchar_spectrum(self, v):
         self._uchar_spectrum = v
 
+    def read_enum_spectrum(self):
+        return getattr(
+            self, "_enum_spectrum", [self.default_rvalue["enum"]] * self.DIMX
+        )
+
+    def write_enum_spectrum(self, v):
+        self._enum_spectrum = v
+
     # IMAGES
+
     def read_boolean_image(self):
         return getattr(
             self,
@@ -601,6 +655,16 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
     def write_uchar_image(self, v):
         self._uchar_image = v
 
+    def read_enum_image(self):
+        return getattr(
+            self,
+            "_enum_image",
+            [[self.default_rvalue["enum"]] * self.DIMX] * self.DIMY,
+        )
+
+    def write_enum_image(self, v):
+        self._enum_image = v
+
     def _update_loop(self):
         while True:
             try:
@@ -753,12 +817,14 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
         self._double_scalar = self.default_rvalue["double"]
         self._string_scalar = self.default_rvalue["string"]
         self._uchar_scalar = self.default_rvalue["uchar"]
+        self._enum_scalar = self.default_rvalue["enum"]
         self._boolean_spectrum = [self.default_rvalue["bool"]] * self.DIMX
         self._short_spectrum = [self.default_rvalue["int"]] * self.DIMX
         self._float_spectrum = [self.default_rvalue["float"]] * self.DIMX
         self._double_spectrum = [self.default_rvalue["double"]] * self.DIMX
         self._string_spectrum = [self.default_rvalue["string"]] * self.DIMX
         self._uchar_spectrum = [self.default_rvalue["uchar"]] * self.DIMX
+        self._enum_spectrum = [self.default_rvalue["enum"]] * self.DIMX
         v = [[self.default_rvalue["bool"]] * self.DIMX] * self.DIMY
         self._boolean_image = v
         v = [[self.default_rvalue["int"]] * self.DIMX] * self.DIMY
@@ -771,6 +837,8 @@ class TangoSchemeTest(Device, metaclass=__DeviceMeta):
         self._string_image = v
         v = [[self.default_rvalue["uchar"]] * self.DIMX] * self.DIMY
         self._uchar_image = v
+        v = [[self.default_rvalue["enum"]] * self.DIMX] * self.DIMY
+        self._enum_image = v
 
 
 if __name__ == "__main__":

{taurus-5.2.2 → taurus-5.2.4}/lib/taurus/core/tango/test/test_tangoattribute.py

@@ -52,6 +52,10 @@ _BOOL_SPE = [True, False]
 _STR = "foo BAR |-+#@!?_[]{}"
 _UINT8_IMG = numpy.array([[1, 2], [3, 4]], dtype="uint8")
 _UINT8_SPE = _UINT8_IMG[1, :]
+_ENUM_IMG_W = numpy.array([[0, 1], [1, 2]])
+_ENUM_IMG_R = numpy.array([["ZERO", "ONE"], ["ONE", "TWO"]])
+_ENUM_SPE_W = _ENUM_IMG_W[1, :]
+_ENUM_SPE_R = _ENUM_IMG_R[1, :]
 
 
 def _npfloat32(val):
@@ -383,6 +387,61 @@ def _getDecodePyTangoAttr(dev_name, attr_name, cfg):
             ),
             None,
         ),
+        (
+            "enum_scalar",
+            1,
+            dict(
+                rvalue="ONE",
+                wvalue=1,
+                type=DataType.DevEnum,
+                writable=True,
+            ),
+            dict(
+                rvalue="ONE",
+                value="ONE",
+                wvalue=1,
+                w_value=1,
+                quality=AttrQuality.ATTR_VALID,
+            ),
+            None,
+        ),
+        (
+            "enum_spectrum",
+            _ENUM_SPE_W,
+            dict(
+                rvalue=_ENUM_SPE_R,
+                wvalue=_ENUM_SPE_W,
+                type=DataType.DevEnum,
+                writable=True,
+            ),
+            dict(
+                rvalue=_ENUM_SPE_R,
+                value=_ENUM_SPE_R,
+                wvalue=_ENUM_SPE_W,
+                w_value=_ENUM_SPE_W,
+                quality=AttrQuality.ATTR_VALID,
+            ),
+            None,
+        ),
+        (
+            "enum_image",
+            _ENUM_IMG_W,
+            dict(
+                rvalue=_ENUM_IMG_R,
+                wvalue=_ENUM_IMG_W,
+                type=DataType.DevEnum,
+                label="enum_image",
+                writable=True,
+            ),
+            dict(
+                rvalue=_ENUM_IMG_R,
+                value=_ENUM_IMG_R,
+                wvalue=_ENUM_IMG_W,
+                w_value=_ENUM_IMG_W,
+                quality=AttrQuality.ATTR_VALID,
+            ),
+            None,
+        ),
         # ==================================================================
         # Test encode-decode with quantitiy conversions
         (
@@ -730,6 +789,53 @@ def _getDecodePyTangoAttr(dev_name, attr_name, cfg):
             dict(value=True, w_value=None, quality=AttrQuality.ATTR_VALID),
             None,
         ),
+        (
+            "enum_image_ro",
+            None,
+            dict(
+                rvalue=numpy.full((3, 3), "ZERO"),
+                wvalue=[[]] if tango.Release.version_number >= 940 else None,
+                type=DataType.DevEnum,
+            ),
+            dict(
+                value=numpy.full((3, 3), "ZERO"),
+                w_value=[[]] if tango.Release.version_number >= 940 else None,
+                quality=AttrQuality.ATTR_VALID,
+            ),
+            (3, 3),
+        ),
+        (
+            "enum_spectrum_ro",
+            None,
+            dict(
+                rvalue=numpy.array(["ZERO"] * 3),
+                wvalue=[] if tango.Release.version_number >= 940 else None,
+                type=DataType.DevEnum,
+                label="enum_spectrum_ro",
+            ),
+            dict(
+                value=numpy.array(["ZERO"] * 3),
+                w_value=[] if tango.Release.version_number >= 940 else None,
+                quality=AttrQuality.ATTR_VALID,
+            ),
+            (3,),
+        ),
+        (
+            "enum_scalar_ro",
+            None,
+            dict(
+                rvalue="ZERO",
+                wvalue=None,
+                type=DataType.DevEnum,
+                range=[None, None],
+                alarms=[None, None],
+                warnings=[None, None],
+                data_format=DataFormat._0D,
+                writable=False,
+            ),
+            dict(value="ZERO", w_value=None, quality=AttrQuality.ATTR_VALID),
+            None,
+        ),
         (
             "float_image_ro",
             None,

{taurus-5.2.2 → taurus-5.2.4}/lib/taurus/core/tango/util/tango_taurus.py

@@ -78,7 +78,7 @@ FROM_TANGO_TO_TAURUS_TYPE = {
     PyTango.CmdArgType.DevVarLong64Array: DataType.Integer,
     PyTango.CmdArgType.DevVarULong64Array: DataType.Integer,
     PyTango.CmdArgType.DevEncoded: DataType.DevEncoded,
-    PyTango.CmdArgType.DevEnum: DataType.Integer,
+    PyTango.CmdArgType.DevEnum: DataType.DevEnum,
 }
 # DevInt removed in cpptango/pytango 9.5.0
 try:

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

@@ -78,6 +78,7 @@ class TaurusAttribute(TaurusModel):
         self._alarm = [None, None]
         self._warning = [None, None]
         self.precision = None
+        self.enum_labels = []
 
     def cleanUp(self):
         self.trace("[TaurusAttribute] cleanUp")
@@ -430,7 +431,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.4}/lib/taurus/core/taurusbasetypes.py

@@ -129,6 +129,7 @@ DataType = Enumeration(
         "DevState",  # for Tango backwards-compat. Avoid using it
         "DevEncoded",  # for Tango backwards-compat. Avoid using it
         "Object",  # for opaque py objects not described by any of the above
+        "DevEnum",
     ),
 )
 # monkey-patch DataType to provide from_python_type()
@@ -138,6 +139,7 @@ __PYTHON_TYPE_TO_TAURUS_DATATYPE = {
     float: DataType.Float,
     bool: DataType.Boolean,
     bytes: DataType.Bytes,
+    IntEnum: DataType.DevEnum,
 }
 
 DataType.from_python_type = __PYTHON_TYPE_TO_TAURUS_DATATYPE.get

{taurus-5.2.2 → taurus-5.2.4}/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.4}/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.4}/lib/taurus/core/test/test_taurushelper.py

@@ -40,7 +40,7 @@ def _skip_if_scheme_not_supported(name):
     scheme = manager.getScheme(name)
     supportedSchemes = list(manager.getPlugins().keys())
     if scheme not in supportedSchemes:
-        pytest.skip(msg="'{}' scheme not supported".format(scheme))
+        pytest.skip("'{}' scheme not supported".format(scheme))
 
 
 @pytest.mark.parametrize(

taurus-5.2.4/lib/taurus/qt/qtcore/tango/tangocombobox.py

@@ -0,0 +1,23 @@
+from taurus.qt.qtgui.input import TaurusValueComboBox
+
+
+class TangoValueComboBox(TaurusValueComboBox):
+
+    def __init__(self, parent=None, designMode=False):
+        super().__init__(parent, designMode)
+        self.initComboBoxHandled = False
+
+    def handleEvent(self, src, evt_type, evt_value):
+        if not self.initComboBoxHandled and evt_value is not None:
+            self.initComboBoxHandled = True
+            self.setCurrentIndex(evt_value.wvalue)
+        super().handleEvent(src, evt_type, evt_value)
+
+    def setModel(self, model, **kwargs):
+        if model is None or model == "":
+            return
+        super().setModel(model, **kwargs)
+        modelObj = self.taurusValueBuddy().getModelObj()
+        self.setValueNames(
+            (name, i) for i, name in enumerate(modelObj.enum_labels)
+        )

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

@@ -323,6 +323,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()