Update from Yue, and add rate column

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

diff --git a/vis/visual.py b/vis/visual.py
index ac42208494029e7b0c2b71d9498aeedfca913cc9..2ad6db69324ab31f6ea82686d9089a9592f31b19 100644 (file)
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -25,6 +25,7 @@ class Visual:
                self.device   = device
                self.logger   = logger
                self.builder  = Gtk.Builder()
+               self.history  = [0.5]*1000
 
                self.builder.add_from_file('visual.ui')
                self.builder.connect_signals(self)
@@ -34,8 +35,9 @@ class Visual:
                self.accs     = get_objects(['accx', 'accy', 'accz'])
                self.mags     = get_objects(['magx', 'magy', 'magz'])
                self.lgts     = get_objects(['lgt'])
-               self.tchs     = get_objects(['tch'])
+               self.tchs     = get_objects(['tchp', 'tchd'])
                self.a2ds     = get_objects(['a2d0', 'a2d1', 'a2d2', 'a2d3', 'a2d4', 'a2d5'])
+               self.smpl     = get_objects(['sampling'])
 
        # Signal handlers
        def on_hide(self, win, *args):
@@ -91,6 +93,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(0,len(self.history)):
+                       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();
@@ -126,26 +145,31 @@ class Visual:
 
 
        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.lgts,  state.lgt)
-               setabs(self.tchs,  state.tch)
-               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, [])
+               #setval(self.smpl,  state.)
+
+               self.history = self.history[1:] + [state.a2d[0]]
+               self.window.queue_draw()
 
        def debug(self, state):
                print('update: ' + str(state))
                print('\tacc - ' + str(state.acc))
                print('\tmag - ' + str(state.mag))
                print('\tlgt - ' + str(state.lgt))
-               print('\ttch - ' + str(state.tch))
+               print('\ttch - ' + str(state.touch))
                print('\ta2d - ' + str(state.a2d))
 
        def timer(self):