X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=vis%2Fvisual.py;h=62a0bc3fb887a72e5d12049a348ed2c4cc2ebe0a;hb=5d952f724284994ac55b2b5471e10f38c451120e;hp=3d93bcbe01f536d4d9c0c2877821af9718f158bf;hpb=e3f519bd2a6e48fc959006fba76996fa88db2530;p=~andy%2Fcsm213a-hw

diff --git a/vis/visual.py b/vis/visual.py
index 3d93bcb..62a0bc3 100644
--- 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(['tchp', 'tchd'])
 		self.a2ds     = get_objects(['a2d0', 'a2d1', 'a2d2', 'a2d3', 'a2d4', 'a2d5'])
 
 	# Signal handlers
@@ -51,13 +63,23 @@ class Visual:
 	def on_flush(self, act):
 		self.logger.flush()
 
-	def on_enable(self, _):
-		print("Unimplemented: on_enable")
-		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, _):
-		print("Unimplemented: on_rate")
-		return True
+	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)
@@ -78,46 +100,52 @@ 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):
-			if vals[0]: objs[0].set_text('X: %f' % vals[0])
-			if vals[1]: objs[1].set_text('Y: %f' % vals[1])
-			if vals[2]: objs[2].set_text('Z: %f' % vals[2])
-		def setabs(objs, vals):
+		def setval(objs, vals, lbls):
 			for i in range(0,len(objs)):
-				if vals[i]: objs[i].set_text('%f' % vals[i])
-
-		setxyz(self.accs,  state.acc)
-		setxyz(self.mags,  state.mag)
-		setabs(self.touch, state.touch)
-		setabs(self.light, state.light)
-		setabs(self.a2ds,  state.a2d)
+				if vals[i] == None:
+					continue
+				if lbls and lbls[i]:
+					objs[i].set_text('%s: %f' % (lbls[i], vals[i]))
+				else:
+					objs[i].set_text('%f' % vals[i])
+
+		setval(self.accs,  state.acc, ['X', 'Y', 'Z'])
+		setval(self.mags,  state.mag, ['X', 'Y', 'Z'])
+		setval(self.lgts,  state.lgt, [])
+		setval(self.tchs,  state.tch, ['P', 'D'])
+		setval(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('\tlgt - ' + str(state.lgt))
 		print('\ttch - ' + str(state.touch))
 		print('\ta2d - ' + str(state.a2d))
 
@@ -127,7 +155,7 @@ class Visual:
 			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, Gtk.IconSize.BUTTON)
+			con.set_from_stock(img, ICON_SIZE_BUTTON)
 
 		check(self.device.running(), "serial")
 		check(self.logger.running(), "xively")