X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-meter;h=4355ff733171310819da5ee13c23ae8efef429a7;hb=9e7bd3d2aed8e7e292a42c8d6bd4b79e1566ac73;hp=d1c98636743a3c4e0f4b2b384e86fc07de1a4b88;hpb=dd73092bcdc3de3618887c9cd2d25cc6361450e6;p=sigrok-meter.git

diff --git a/sigrok-meter b/sigrok-meter
index d1c9863..4355ff7 100755
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -19,21 +19,84 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-from gi.repository import Gtk
+from multiprocessing import Process, Queue
+from gi.repository import Gtk, GObject
+from sigrok.core import *
 
-# Handler class for various GTK+ signals.
-class Handler:
-    def onDeleteWindow(self, *args):
+def init_and_run(queue):
+    def datafeed_in(device, packet):
+        if packet.type is PacketType.ANALOG:
+            data = packet.payload.data
+            unit, unit_str = packet.payload.unit, ""
+            if unit is Unit.VOLT:
+                unit_str = " V"
+            elif unit is Unit.OHM:
+                unit_str = " Ohm"
+            elif unit is unit.AMPERE:
+                unit_str = " A"
+            mqflags, mqflags_str = packet.payload.mqflags, ""
+            if QuantityFlag.AC in mqflags:
+                mqflags_str = " AC"
+            elif QuantityFlag.DC in mqflags:
+                mqflags_str = " DC"
+            for i in range(packet.payload.num_samples):
+                dev = "%s" % device.vendor
+                val = "%f%s%s" % (data[i], unit_str, mqflags_str)
+                queue.put((dev, val))
+
+    # log = Log()
+    # log.level = LogLevel.SPEW
+    context = Context()
+    drivers_to_use = ['voltcraft-vc820', 'victor-dmm']
+    drivers = [context.drivers[d] for d in drivers_to_use]
+    devices = [d.scan()[0] for d in drivers]
+    for dev in devices:
+        dev.limit_samples = 1000
+    session = Session(context)
+    for dev in devices:
+        session.add_device(dev)
+    session.add_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):
+        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]))
+        except:
+            pass
+        GObject.timeout_add(100, self.update_label_if_needed)
+
+    def on_quit(self, *args):
         Gtk.main_quit(*args)
-    def on_imagemenuitemAbout_activate(self, *args):
-        about = builder.get_object("aboutdialog")
+
+    def on_about(self, action):
+        about = self.builder.get_object("aboutdialog")
+        sr_pkg = ll.sr_package_version_string_get()
+        sr_lib = ll.sr_lib_version_string_get()
+        s = "Using libsigrok %s (lib version %s)." % (sr_pkg, sr_lib)
+        about.set_comments(s)
         about.run()
         about.hide()
 
-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()
+if __name__ == '__main__':
+    s = SigrokMeter()
+    process = Process(target=init_and_run, args=(s.queue,))
+    process.start()
+    Gtk.main()
+    process.terminate()