Debugging..

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

diff --git a/vis/visual.py b/vis/visual.py
index 2ad6db69324ab31f6ea82686d9089a9592f31b19..f2deed65d24ffe7b16e87525ef3d4d0ebdac8e94 100644 (file)
--- 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  = 10 # hz
+
        def __init__(self, config, device, logger):
                def get_objects(names):
                        return list(map(lambda x:
@@ -27,6 +30,13 @@ class Visual:
                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")
@@ -37,7 +47,6 @@ class Visual:
                self.lgts     = get_objects(['lgt'])
                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):
@@ -97,11 +106,11 @@ class Visual:
                cairo   = obj.window.cairo_create()
                count   = len(self.history)
                extents = cairo.clip_extents()
-               width   = extents[2] - extents[0] 
-               height  = extents[3] - extents[1] 
+               width   = extents[2] - extents[0]
+               height  = extents[3] - extents[1]
 
                cairo.set_line_width(4)
-               for i in range(0,len(self.history)):
+               for i in range(count):
                        x = i*width/(count-1)
                        y = ((1-self.history[i]) * 0.8 + 0.1) * height
                        if i==0:
@@ -143,26 +152,29 @@ class Visual:
                        set_act(key+'_btn',  self.config.enable[key])
                        set_val(key+'_spin', self.config.rate[key])
 
-
        def update(self, state):
                def setval(objs, vals, lbls):
+                       found = 0
                        for i in range(0,len(objs)):
                                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
 
-               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.)
+               # 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, [])
 
-               self.history = self.history[1:] + [state.a2d[0]]
-               self.window.queue_draw()
+               # Save history
+               if state.a2d[0] != None:
+                       self.history = self.history[1:] + [state.a2d[0]]
 
        def debug(self, state):
                print('update: ' + str(state))
@@ -172,7 +184,7 @@ class Visual:
                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')
@@ -180,20 +192,34 @@ 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