Merge branch 'cmft-bug-394' into develop

taurus-org · Feb 22, 2017 · cef3f2e · cef3f2e
2 parents 388f436 + 3ea85ff
commit cef3f2e
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/lib/taurus/core/tango/tangoattribute.py b/lib/taurus/core/tango/tangoattribute.py
@@ -812,7 +812,11 @@ def setRange(self, *limits):
             limits = limits[0]
         low, high = limits
         low = Quantity(low)
+        if low.unitless:
+            low = Quantity(low.magnitude, self._units)
         high = Quantity(high)
+        if high.unitless:
+            high = Quantity(high.magnitude, self._units)
         TaurusAttribute.setRange(self, [low, high])
         infoex = self._pytango_attrinfoex
         if low.magnitude != float('-inf'):
@@ -830,7 +834,11 @@ def setWarnings(self, *limits):
             limits = limits[0]
         low, high = limits
         low = Quantity(low)
+        if low.unitless:
+            low = Quantity(low.magnitude, self._units)
         high = Quantity(high)
+        if high.unitless:
+            high = Quantity(high.magnitude, self._units)
         TaurusAttribute.setWarnings(self, [low, high])
         infoex = self._pytango_attrinfoex
         if low.magnitude != float('-inf'):
@@ -848,7 +856,11 @@ def setAlarms(self, *limits):
             limits = limits[0]
         low, high = limits
         low = Quantity(low)
+        if low.unitless:
+            low = Quantity(low.magnitude, self._units)
         high = Quantity(high)
+        if high.unitless:
+            high = Quantity(high.magnitude, self._units)
         TaurusAttribute.setAlarms(self, [low, high])
         infoex = self._pytango_attrinfoex
         if low.magnitude != float('-inf'):