Better driver string handling and better error messages.

[sigrok-meter.git] / sigrok-meter

diff --git a/sigrok-meter b/sigrok-meter
index 4c74e7323ee77743e207f5eb30481c7a3fd9631e..72b8d49ee832d48a167aafec866ed3020789bbb9 100755 (executable)
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -4,6 +4,7 @@
 ## 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
@@ -20,86 +21,71 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-from multiprocessing import Process, Queue
-from gi.repository import Gtk, GObject
+import argparse
 import sigrok.core as sr
+import sys
+import textwrap
 
-def init_and_run(queue):
-    def datafeed_in(device, packet):
-        if packet.type == sr.PacketType.ANALOG:
-            data = packet.payload.data
-            unit, unit_str = packet.payload.unit, ""
-            if unit == sr.Unit.VOLT:
-                unit_str = " V"
-            elif unit == sr.Unit.OHM:
-                unit_str = " Ohm"
-            elif unit == sr.Unit.AMPERE:
-                unit_str = " A"
-            mqflags, mqflags_str = packet.payload.mq_flags, ""
-            if sr.QuantityFlag.AC in mqflags:
-                mqflags_str = " AC"
-            elif sr.QuantityFlag.DC in mqflags:
-                mqflags_str = " DC"
-            for i in range(packet.payload.num_samples):
-                dev = "%s %s" % (device.vendor, device.model)
-                val = "%f%s%s" % (data[0][i], unit_str, mqflags_str)
-                queue.put((dev, val))
+default_drivers = ['demo:analog_channels=4']
+default_loglevel = sr.LogLevel.WARN
 
-    context = sr.Context_create()
-    context.log_level = sr.LogLevel.SPEW
-    drivers_to_use = ['tecpel-dmm-8061-ser']
-    drivers = [context.drivers[d] for d in drivers_to_use]
-    devices = [d.scan(conn="/dev/ttyUSB0")[0] for d in drivers]
-    # devices = [d.scan()[0] for d in drivers]
-    # for dev in devices:
-    #     dev.limit_samples = 1000
-    session = context.create_session()
-    for dev in devices:
-        session.add_device(dev)
-        dev.open()
-    session.add_datafeed_callback(datafeed_in)
-    session.start()
-    session.run()
-    session.stop()
-
-class SigrokMeter:
-    def __init__(self):
-        self.builder = Gtk.Builder()
-        self.builder.add_from_file("sigrok-meter.glade")
-        self.builder.connect_signals(self)
-        self.value_label = self.builder.get_object("value_label")
-        self.value_label2 = self.builder.get_object("value_label2")
-        self.win = self.builder.get_object("mainwindow")
-        self.win.show_all()
-        self.queue = Queue()
-        GObject.timeout_add(100, self.update_label_if_needed)
-
-    def update_label_if_needed(self):
+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).
+
+            examples:
+
+              %(prog)s --driver tecpel-dmm-8061-ser:conn=/dev/ttyUSB0
+
+              %(prog)s --driver uni-t-ut61e:conn=1a86.e008
+        '''),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+
+    parser.add_argument('-d', '--driver',
+        action='append',
+        help='The driver to use')
+    parser.add_argument('-l', '--loglevel',
+        type=int,
+        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()
+
+    result = {
+        'drivers': default_drivers,
+        'loglevel': default_loglevel,
+        'pyside': args.pyside
+    }
+
+    if args.driver:
+        result['drivers'] = args.driver
+
+    if args.loglevel != None:
         try:
-            t = self.queue.get_nowait()
-            l = self.value_label if t[0] != "Victor" else self.value_label2
-            l.set_text("%s: %s" % (t[0], t[1]))
+            result['loglevel'] = sr.LogLevel.get(args.loglevel)
         except:
-            pass
-        GObject.timeout_add(100, self.update_label_if_needed)
-
-    def on_quit(self, *args):
-        Gtk.main_quit(*args)
-
-    def on_about(self, action):
-        about = self.builder.get_object("aboutdialog")
-        context = sr.Context_create()
-        sr_pkg = context.package_version
-        sr_lib = context.lib_version
-        s = "Using libsigrok %s (lib version %s)." % (sr_pkg, sr_lib)
-        about.set_comments(s)
-        about.run()
-        about.hide()
+            sys.exit('error: invalid log level')
+
+    return result
 
 if __name__ == '__main__':
-    s = SigrokMeter()
-    process = Process(target=init_and_run, args=(s.queue,))
-    process.start()
-    Gtk.main()
-    process.terminate()
+    args = parse_cli()
+
+    import qtcompat
+    qtcompat.load_modules(args['pyside'])
+    QtCore = qtcompat.QtCore
+    QtGui = qtcompat.QtGui
+    import mainwindow
+
+    context = sr.Context_create()
+    context.log_level = args['loglevel']
+
+    app = QtGui.QApplication([])
+    s = mainwindow.MainWindow(context, args['drivers'])
+    s.show()
 
+    sys.exit(app.exec_())