summaryrefslogtreecommitdiff
path: root/lib/taurus/qt/qtgui/display
diff options
context:
space:
mode:
Diffstat (limited to 'lib/taurus/qt/qtgui/display')
-rw-r--r--lib/taurus/qt/qtgui/display/qled.py2
-rw-r--r--lib/taurus/qt/qtgui/display/qlogo.py2
-rw-r--r--lib/taurus/qt/qtgui/display/test/test_tauruslabel.py6
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/taurus/qt/qtgui/display/qled.py b/lib/taurus/qt/qtgui/display/qled.py
index 0cb1e040..799c3020 100644
--- a/lib/taurus/qt/qtgui/display/qled.py
+++ b/lib/taurus/qt/qtgui/display/qled.py
@@ -383,7 +383,7 @@ def main():
if owns_app:
from taurus.qt.qtgui.application import TaurusApplication
- app = TaurusApplication(sys.argv)
+ app = TaurusApplication(sys.argv, cmd_line_parser=None)
w = Qt.QWidget()
layout = Qt.QGridLayout()
diff --git a/lib/taurus/qt/qtgui/display/qlogo.py b/lib/taurus/qt/qtgui/display/qlogo.py
index d2664a0e..5510d29b 100644
--- a/lib/taurus/qt/qtgui/display/qlogo.py
+++ b/lib/taurus/qt/qtgui/display/qlogo.py
@@ -82,7 +82,7 @@ def main():
import sys
from taurus.qt.qtgui.application import TaurusApplication
- app = TaurusApplication(sys.argv)
+ app = TaurusApplication(sys.argv, cmd_line_parser=None)
w = QLogo()
w.show()
sys.exit(app.exec_())
diff --git a/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py b/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py
index bedc02be..e231faa3 100644
--- a/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py
+++ b/lib/taurus/qt/qtgui/display/test/test_tauruslabel.py
@@ -34,6 +34,8 @@ from taurus.qt.qtgui.container import TaurusWidget
from taurus.core.tango.test import TangoSchemeTestLauncher
import functools
from taurus.core.util.colors import ATTRIBUTE_QUALITY_DATA, DEVICE_STATE_DATA
+from pint import UnitRegistry as ur
+import numpy
DEV_NAME = TangoSchemeTestLauncher.DEV_NAME
@@ -102,7 +104,9 @@ testOldFgroles = functools.partial(insertTest, helper_name='text', maxdepr=1,
# ------------------------------------------------------------------------------
@insertTest(helper_name='text',
model='tango:' + DEV_NAME + '/double_image#rvalue[1,::2]',
- expected='[ 1.23 1.23] mm')
+ expected='{:~}'.format(numpy.array([1.23,1.23])*ur().mm)
+ # expected is not explicit to support pint v<0.8 particularities
+ )
@insertTest(helper_name='text',
model='tango:' + DEV_NAME + '/double_spectrum#rvalue[1]',
expected='1.23 mm')