X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=vis%2Fvisual.py;h=c4a266f2bba9439dc2627a58fd660d955ff0bb31;hb=8f1763987ca9fb5666efdb03abf99624eec66d30;hp=5580b5b47700c80359c733d69aade5b32d1fa01a;hpb=7a43e3447b1787ed7dad5233996f474adb2aa4fb;p=~andy%2Fcsm213a-hw diff --git a/vis/visual.py b/vis/visual.py index 5580b5b..c4a266f 100644 --- a/vis/visual.py +++ b/vis/visual.py @@ -16,6 +16,9 @@ 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 list(map(lambda x: @@ -25,16 +28,26 @@ class Visual: self.device = device self.logger = logger 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) self.window = self.builder.get_object("window") self.settings = self.builder.get_object("settings") + self.plotsns = self.builder.get_object('sns') + self.plotaxis = self.builder.get_object('axis') 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 @@ -50,14 +63,14 @@ 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_flush(self, act): @@ -68,8 +81,8 @@ class Visual: 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.device.control() self.config.save() def on_rate(self, obj): @@ -77,8 +90,8 @@ class Visual: 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.device.control() self.config.save() def on_config(self, obj): @@ -91,6 +104,23 @@ class Visual: 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(); @@ -124,31 +154,46 @@ class Visual: 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 + idxs = ['acc', 'mag', 'tch', 'lgt', 'a2d'] + sns = idxs[self.plotsns.get_active()] + axis = int(self.plotaxis.get_value()) + if hasattr(state, sns): + data = getattr(state, sns) + axis = min(axis-1, len(data)-1) + item = data[axis] + if item != None: + self.history = self.history[1:] + [item] 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)) - def timer(self): + def read_timer(self): def check(state, name): btn = self.builder.get_object(name + '_btn') con = self.builder.get_object(name + '_con') @@ -156,25 +201,40 @@ class Visual: 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() - GLib.timeout_add(1000/60, self.timer) + 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)