X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-meter;h=b2f60070d5442d284d76a58aa74b814599e458f6;hb=0b63748bf0df16561324cd77938425d2f9b7b040;hp=9711c83a0cfc1f25e286ad81260220a871e6177d;hpb=2f5ef701f2332bc47132955dadc5baf646d673d9;p=sigrok-meter.git

diff --git a/sigrok-meter b/sigrok-meter
index 9711c83..b2f6007 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
@@ -15,21 +16,110 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
-from gi.repository import Gtk
+import argparse
+import sys
+import textwrap
+import signal
 
-# Handler class for various GTK+ signals.
-class Handler:
-    def onDeleteWindow(self, *args):
-        Gtk.main_quit(*args)
+default_drivers = [('demo:analog_channels=4', 'samplerate=4')]
 
-builder = Gtk.Builder()
-builder.add_from_file("sigrok-meter.glade")
-builder.connect_signals(Handler())
-win = builder.get_object("main-window")
-win.show_all()
-Gtk.main()
+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.
 
+            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=None,
+        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__':
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+    args = parse_cli()
+
+    import qtcompat
+    qtcompat.load_modules(args.pyside)
+    QtCore = qtcompat.QtCore
+    QtGui = qtcompat.QtGui
+
+    app = QtGui.QApplication([])
+
+    try:
+        import sigrok.core as sr
+    except Exception as e:
+        QtGui.QMessageBox.critical(None, 'Error starting sigrok-meter',
+           'Unable to use the sigrok Python bindings:\n{}.'.format(e))
+        sys.exit(1)
+
+    # Initialize modules that need a QApplication to exist.
+    import settings
+    settings.init()
+    import icons
+    icons.load_icons()
+
+    context = sr.Context_create()
+
+    if args.loglevel != None:
+        try:
+            loglevel = sr.LogLevel.get(args.loglevel)
+            settings.logging.level.setValue(loglevel)
+        except:
+            sys.exit('Error: invalid log level.')
+
+    import mainwindow
+    s = mainwindow.MainWindow(context, args.drivers)
+    s.show()
+
+    sys.exit(app.exec_())