summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup.py6
-rw-r--r--src/sardana/taurus/qt/qtgui/extra_sardana/showscanonline.py29
2 files changed, 16 insertions, 19 deletions
diff --git a/setup.py b/setup.py
index d69916f5..217c544c 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,8 @@ install_requires = [
'PyTango>=9.2.5',
'itango>=0.1.6',
'taurus>4.5.4',
- 'lxml>=2.3'
+ 'lxml>=2.3',
+ 'click',
]
@@ -78,7 +79,8 @@ gui_scripts = [
"hklscan = sardana.taurus.qt.qtgui.extra_hkl.hklscan:main",
"macroexecutor = sardana.taurus.qt.qtgui.extra_macroexecutor.macroexecutor:main",
"sequencer = sardana.taurus.qt.qtgui.extra_macroexecutor.sequenceeditor:main",
- "ubmatrix = sardana.taurus.qt.qtgui.extra_hkl.ubmatrix:main"
+ "ubmatrix = sardana.taurus.qt.qtgui.extra_hkl.ubmatrix:main",
+ "showscan = sardana.taurus.qt.qtgui.extra_sardana.showscanonline:main"
]
entry_points = {'console_scripts': console_scripts,
diff --git a/src/sardana/taurus/qt/qtgui/extra_sardana/showscanonline.py b/src/sardana/taurus/qt/qtgui/extra_sardana/showscanonline.py
index 3a39c1e6..1930682c 100644
--- a/src/sardana/taurus/qt/qtgui/extra_sardana/showscanonline.py
+++ b/src/sardana/taurus/qt/qtgui/extra_sardana/showscanonline.py
@@ -27,6 +27,8 @@
__all__ = ["ShowScanOnline"]
+import click
+
from taurus.qt.qtgui.taurusgui import TaurusGui
from sardana.taurus.qt.qtgui.macrolistener import (DynamicPlotManager,
assertPlotAvailability)
@@ -83,33 +85,26 @@ class TaurusGuiLite(TaurusGui):
SPLASH_LOGO_NAME = None
-def main():
-
+@click.command()
+@click.option('--group', default='x-axis',
+ type=click.Choice(['single', 'x-axis']),
+ help='group curves')
+@click.argument('door')
+def main(group, door):
from taurus.qt.qtgui.application import TaurusApplication
- import sys
- from taurus.core.util.argparse import get_taurus_parser
-
- parser = get_taurus_parser()
- parser.set_usage("python showscanonline.py [door_name]")
app = TaurusApplication(app_name='Showscan Online', org_domain="Sardana",
- org_name="Tango communinity",
- cmd_line_parser=parser)
+ org_name="Tango communinity", parser=None)
assertPlotAvailability()
gui = TaurusGuiLite()
- args = app.get_command_line_args()
-
- if len(args) < 1:
- parser.print_help(sys.stderr)
- sys.exit(1)
- door_name = args[0]
widget = ShowScanOnline(gui)
- widget.setModel(door_name)
+ widget.setModel(door)
+ widget.setGroupMode(group)
gui.show()
- sys.exit(app.exec_())
+ return app.exec_()
if __name__ == "__main__":