X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-meter;h=7ded2865cda5d5defaf3d1be2e4f137555ad3176;hb=68348e5abaa05fbbde7f3e6b0b28c2d12a7a2601;hp=e80b634035f01b77bb606fd575aa0c3ce1b07745;hpb=730cbd1fe394da4bc0646fe8f46f58a8a8827b0d;p=sigrok-meter.git

diff --git a/sigrok-meter b/sigrok-meter
index e80b634..7ded286 100755
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -1,8 +1,9 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 ##
 ## This file is part of the sigrok-meter project.
 ##
 ## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2014 Jens Steinhauser <jens.steinhauser@gmail.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,25 +20,97 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-from gi.repository import Gtk
+import argparse
+import sigrok.core as sr
+import sys
+import textwrap
+import signal
 
-class SigrokMeter:
-    def __init__(self):
-        self.builder = Gtk.Builder()
-        self.builder.add_from_file("sigrok-meter.glade")
-        self.builder.connect_signals(self)
-        self.win = self.builder.get_object("main-window")
-        self.win.show_all()
+default_drivers = [('demo:analog_channels=4', 'samplerate=4')]
+default_loglevel = 2
 
-    def onDeleteWindow(self, *args):
-        Gtk.main_quit(*args)
+def parse_cli():
+    parser = argparse.ArgumentParser(
+        description='Simple sigrok GUI for multimeters and dataloggers.',
+        epilog=textwrap.dedent('''\
+            The DRIVER string is the same as for sigrok-cli(1). Multiple
+            DRIVER and CONFIG items can be supplied. The nth CONFIG is applied
+            to the nth DRIVER. If there are more drivers than configs, the
+            remaining drivers use the default configuration.
 
-    def on_imagemenuitemAbout_activate(self, action):
-        about = self.builder.get_object("aboutdialog")
-        about.run()
-        about.hide()
+            Examples:
+
+              %(prog)s --driver tecpel-dmm-8061-ser:conn=/dev/ttyUSB0
+
+              %(prog)s --driver uni-t-ut61e:conn=1a86.e008
+
+              %(prog)s --driver demo:analog_channels=1 \\
+                       --config samplerate=10
+
+              %(prog)s --driver voltcraft-k204:conn=/dev/ttyUSB0 \\
+                       --driver uni-t-ut61d:conn=1a86.e008 \\
+                       --driver uni-t-ut61e-ser:conn=/dev/ttyUSB1
+        '''),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+
+    parser.add_argument('-d', '--driver',
+        action='append',
+        default=[],
+        help='The driver to use')
+    parser.add_argument('-c', '--config',
+        action='append',
+        default=[],
+        help='Specify device configuration options')
+    parser.add_argument('-l', '--loglevel',
+        type=int,
+        default=default_loglevel,
+        help='Set loglevel (5 is most verbose)')
+    parser.add_argument('--pyside',
+        action='store_true',
+        default=False,
+        help='Force use of PySide (default is to use PyQt4)')
+    args = parser.parse_args()
+
+    if len(args.config) > len(args.driver):
+        sys.exit('Error: More configurations than drivers given.')
+
+    # Merge drivers and configurations into a list of tuples.
+    setattr(args, 'drivers', [])
+    if not args.driver:
+        args.drivers = default_drivers
+        sys.stderr.write('No driver given, using demo driver.\n')
+    if args.driver:
+        args.config.extend([''] * (len(args.driver) - len(args.config)))
+        args.drivers = zip(args.driver, args.config)
+    del args.driver
+    del args.config
+
+    return args
 
 if __name__ == '__main__':
-	SigrokMeter()
-	Gtk.main()
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+    args = parse_cli()
+
+    import qtcompat
+    qtcompat.load_modules(args.pyside)
+    QtCore = qtcompat.QtCore
+    QtGui = qtcompat.QtGui
+    import mainwindow
+
+    context = sr.Context_create()
+    try:
+        loglevel = sr.LogLevel.get(args.loglevel)
+        context.log_level = loglevel
+    except:
+        sys.exit('Error: invalid log level.')
+
+    app = QtGui.QApplication([])
+
+    import icons
+    icons.load_icons()
+
+    s = mainwindow.MainWindow(context, args.drivers)
+    s.show()
 
+    sys.exit(app.exec_())