X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=vis%2Fvisual.py;h=737e2d9a3b61cc3fd08b3c58a3601cfb2ff47e6d;hb=d79f24cc277e31d7848f9683bac599339348aa44;hp=72fb7109c07e0d3602ca035c5401f61af2b0c1fd;hpb=5277ee21e352354a19478bad29496fc05d2f747b;p=~andy%2Fcsm213a-hw diff --git a/vis/visual.py b/vis/visual.py index 72fb710..737e2d9 100644 --- a/vis/visual.py +++ b/vis/visual.py @@ -1,18 +1,41 @@ #!/usr/bin/env python -import pygtk -import gtk +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: + FRAMES_PER_SEC = 60 # hz + RATES_PER_SEC = 1 # hz + def __init__(self, config, device, logger): def get_objects(names): - return map(lambda x: - self.builder.get_object(x), names) + return list(map(lambda x: + self.builder.get_object(x), names)) self.config = config self.device = device self.logger = logger - self.builder = gtk.Builder() + self.builder = Gtk.Builder() + self.history = [0.5]*1000 + + self.rate_due = 0 + self.rate_cnt = {'acc': 0, + 'mag': 0, + 'lgt': 0, + 'tch': 0, + 'a2d': 0} self.builder.add_from_file('visual.ui') self.builder.connect_signals(self) @@ -21,8 +44,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 @@ -38,105 +61,171 @@ class Visual: if act.get_active(): self.status(self.device.connect()) else: - self.status(self.device.disconnect()) + self.device.disconnect() return True def on_xively(self, act): if act.get_active(): self.status(self.logger.connect()) else: - self.status(self.logger.disconnect()) + self.logger.disconnect() return True - def on_enable(self, _): - print "Unimplemented: on_enable" - return True - - def on_rate(self, _): - print "Unimplemented: on_rate" - return True + def on_flush(self, act): + self.logger.flush() + + 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) + if isinstance(obj, Gtk.SpinButton): + value = obj.get_value() + else: + value = obj.get_text() + if getattr(self.config, name) != value: + setattr(self.config, name, value) + self.config.save() + + def on_expose(self, obj, _): + cairo = obj.window.cairo_create() + count = len(self.history) + extents = cairo.clip_extents() + width = extents[2] - extents[0] + height = extents[3] - extents[1] + + cairo.set_line_width(4) + for i in range(count): + x = i*width/(count-1) + y = ((1-self.history[i]) * 0.8 + 0.1) * height + if i==0: + cairo.move_to(x, y) + else: + cairo.line_to(x, y) + cairo.stroke() def on_key(self, win, ev): if ev.string == 'q': - gtk.main_quit(); + Gtk.main_quit(); def on_destroy(self, win): - gtk.main_quit() + Gtk.main_quit() # 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 - user = self.builder.get_object("username") - pwd = self.builder.get_object("password") - api = self.builder.get_object("apikey") - user.set_text(self.config.username) - pwd.set_text(self.config.password) - api.set_text(self.config.apikey) + set_txt('feedid', self.config.feedid) + set_txt('apikey', self.config.apikey) + set_val('maxrate', self.config.maxrate) - # TODO - send changes back to config + # 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): + found = 0 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 + found = 1 + if lbls and lbls[i]: + objs[i].set_text('%s: %f' % (lbls[i], vals[i])) + else: + objs[i].set_text('%f' % vals[i]) + return found + + # Dispaly values and sum up rates + self.rate_cnt['acc'] += setval(self.accs, state.acc, ['X', 'Y', 'Z']) + self.rate_cnt['mag'] += setval(self.mags, state.mag, ['X', 'Y', 'Z']) + self.rate_cnt['lgt'] += setval(self.lgts, state.lgt, []) + self.rate_cnt['tch'] += setval(self.tchs, state.tch, ['P', 'D']) + self.rate_cnt['a2d'] += setval(self.a2ds, state.a2d, []) + + # Save history + if state.a2d[0] != None: + self.history = self.history[1:] + [state.a2d[0]] 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 '\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.ICON_SIZE_BUTTON) - else: - serial.set_active(False) - status.set_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_BUTTON) - if self.device.running(): - for item in self.device.process(): - self.update(item) - #self.debug(item) + print('update: ' + str(state)) + print('\tacc - ' + str(state.acc)) + print('\tmag - ' + str(state.mag)) + print('\tlgt - ' + str(state.lgt)) + print('\ttch - ' + str(state.touch)) + print('\ta2d - ' + str(state.a2d)) + + def read_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) + + # Update status icons + check(self.device.running(), "serial") + check(self.logger.running(), "xively") + + # Read data and update data display + for item in self.device.process(): + self.update(item) + self.logger.append(item) + #self.debug(item) + + # Refresh window + self.window.queue_draw() + + return True + def rate_timer(self): + for sns in self.rate_cnt: + rate = self.rate_cnt[sns] * Visual.RATES_PER_SEC + obj = self.builder.get_object(sns + '_rate') + obj.set_text('%d' % rate) + self.rate_cnt[sns] = 0 return True def run(self): self.load_config() self.window.show() - gtk.timeout_add(1000/60, self.timer) - gtk.main() + GLib.timeout_add(1000/Visual.FRAMES_PER_SEC, self.read_timer) + GLib.timeout_add(1000/Visual.RATES_PER_SEC, self.rate_timer) + Gtk.main() # Private methods def status(self, msg): + status = self.builder.get_object("status") + status.pop(context_id=0) if not msg: return - status = self.builder.get_object("status") status.push(text=('Error: ' + msg), context_id=0) -