Get things running

[~andy/csm213a-hw] / vis / visual.py

diff --git a/vis/visual.py b/vis/visual.py
index 6d06ba4444bf6a478cdafd0dbef54a1157f94fc9..ac42208494029e7b0c2b71d9498aeedfca913cc9 100644 (file)
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -1,7 +1,19 @@
 #!/usr/bin/env python
 
-from gi.repository import Gtk
-from gi.repository import GLib
+import sys
+
+if sys.version_info<(3,0,0):
+       import pygtk as PyGtk
+       import gtk   as Gtk
+       import gtk   as GLib
+else:
+       from gi.repository import Gtk
+       from gi.repository import GLib
+
+if sys.version_info<(3,0,0):
+       ICON_SIZE_BUTTON = Gtk.ICON_SIZE_BUTTON
+else:
+       ICON_SIZE_BUTTON = Gtk.IconSize.BUTTON
 
 class Visual:
        def __init__(self, config, device, logger):
@@ -21,8 +33,8 @@ class Visual:
 
                self.accs     = get_objects(['accx', 'accy', 'accz'])
                self.mags     = get_objects(['magx', 'magy', 'magz'])
-               self.touch    = get_objects(['touch'])
-               self.light    = get_objects(['light'])
+               self.lgts     = get_objects(['lgt'])
+               self.tchs     = get_objects(['tch'])
                self.a2ds     = get_objects(['a2d0', 'a2d1', 'a2d2', 'a2d3', 'a2d4', 'a2d5'])
 
        # Signal handlers
@@ -48,13 +60,26 @@ class Visual:
                        self.status(self.logger.disconnect())
                return True
 
-       def on_enable(self, _):
-               print("Unimplemented: on_enable")
-               return True
+       def on_flush(self, act):
+               self.logger.flush()
 
-       def on_rate(self, _):
-               print("Unimplemented: on_rate")
-               return True
+       def on_enable(self, obj):
+               name  = Gtk.Buildable.get_name(obj)
+               name  = name.replace('_btn', '')
+               state = obj.get_active()
+               if self.config.enable[name] != state:
+                       self.device.set_enable(name, state)
+                       self.config.enable[name] = state
+                       self.config.save()
+
+       def on_rate(self, obj):
+               name  = Gtk.Buildable.get_name(obj)
+               name  = name.replace('_spin', '')
+               value = obj.get_value()
+               if self.config.rate[name] != value:
+                       self.device.set_rate(name, value)
+                       self.config.rate[name] = value
+                       self.config.save()
 
        def on_config(self, obj):
                name = Gtk.Buildable.get_name(obj)
@@ -75,25 +100,30 @@ class Visual:
 
         # Methods
        def load_config(self):
+               def set_val(name, val):
+                       self.builder.get_object(name).set_value(val)
+               def set_txt(name, val):
+                       self.builder.get_object(name).set_text(val)
+               def set_act(name, val):
+                       self.builder.get_object(name).set_active(val)
+
                # Serial settings
-               device = self.builder.get_object("device")
-               baud   = self.builder.get_object("baudrate")
-               parity = self.builder.get_object("parity")
-               datab  = self.builder.get_object("databits")
-               stopb  = self.builder.get_object("stopbits")
-               device.set_text(self.config.device)
-               baud.set_value(self.config.baudrate)
-               parity.set_text(self.config.parity)
-               datab.set_value(self.config.databits)
-               stopb.set_value(self.config.stopbits)
+               set_txt('device',   self.config.device)
+               set_val('baudrate', self.config.baudrate)
+               set_txt('parity',   self.config.parity)
+               set_val('databits', self.config.databits)
+               set_val('stopbits', self.config.stopbits)
 
                # Xively settings
-               feed  = self.builder.get_object("feedid")
-               api   = self.builder.get_object("apikey")
-               rate  = self.builder.get_object("maxrate")
-               feed.set_text(self.config.feedid)
-               api.set_text(self.config.apikey)
-               rate.set_value(self.config.maxrate)
+               set_txt('feedid',   self.config.feedid)
+               set_txt('apikey',   self.config.apikey)
+               set_val('maxrate',  self.config.maxrate)
+
+               # Sensor settings
+               for key in list(self.config.enable.keys()):
+                       set_act(key+'_btn',  self.config.enable[key])
+                       set_val(key+'_spin', self.config.rate[key])
+
 
        def update(self, state):
                def setxyz(objs, vals):
@@ -106,32 +136,33 @@ class Visual:
 
                setxyz(self.accs,  state.acc)
                setxyz(self.mags,  state.mag)
-               setabs(self.touch, state.touch)
-               setabs(self.light, state.light)
+               setabs(self.lgts,  state.lgt)
+               setabs(self.tchs,  state.tch)
                setabs(self.a2ds,  state.a2d)
 
        def debug(self, state):
                print('update: ' + str(state))
                print('\tacc - ' + str(state.acc))
                print('\tmag - ' + str(state.mag))
-               print('\tlgt - ' + str(state.light))
-               print('\ttch - ' + str(state.touch))
+               print('\tlgt - ' + str(state.lgt))
+               print('\ttch - ' + str(state.tch))
                print('\ta2d - ' + str(state.a2d))
-       
-       def timer(self):
-               serial = self.builder.get_object("serial_btn")
-               status = self.builder.get_object("conn")
 
-               if self.device.running():
-                       serial.set_active(True)
-                       status.set_from_stock(Gtk.STOCK_YES, Gtk.IconSize.BUTTON)
-               else:
-                       serial.set_active(False)
-                       status.set_from_stock(Gtk.STOCK_NO,  Gtk.IconSize.BUTTON)
-               if self.device.running():
-                       for item in self.device.process():
-                               self.update(item)
-                               #self.debug(item)
+       def timer(self):
+               def check(state, name):
+                       btn = self.builder.get_object(name + '_btn')
+                       con = self.builder.get_object(name + '_con')
+                       img = Gtk.STOCK_YES if state else Gtk.STOCK_NO
+                       btn.set_active(state)
+                       con.set_from_stock(img, ICON_SIZE_BUTTON)
+
+               check(self.device.running(), "serial")
+               check(self.logger.running(), "xively")
+
+               for item in self.device.process():
+                       self.update(item)
+                       self.logger.append(item)
+                       #self.debug(item)
 
                return True