Rename serial to device and clean up

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

diff --git a/vis/visual.py b/vis/visual.py
index aed73ae70aa7e6b0667bdd1ecc1b21830859b00c..908304d908da2b374d93211d51c1982fbe2db559 100644 (file)
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -4,13 +4,16 @@ import pygtk
 import gtk
 
 class Visual:
-       def __init__(self, config):
-               self.builder = gtk.Builder()
+       def __init__(self, config, device, xively):
+               self.config   = config
+               self.device   = device
+               self.xively   = xively
+               self.builder  = gtk.Builder()
+
                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.config   = config
 
        # Signal handlers
        def on_hide(self, win, *args):
@@ -21,8 +24,12 @@ class Visual:
                self.settings.show()
                return True
 
-       def on_connect(self, win):
-               print "Unimplemented: on_connect"
+       def on_serial(self, win):
+               self.device.connect()
+               return True
+
+       def on_xively(self, win):
+               self.xively.connect()
                return True
 
        def on_enable(self, _):
@@ -43,12 +50,14 @@ class Visual:
         # Methods
        def load_config(self):
                # Serial settings
-               baud  = self.builder.get_object("baudrate")
-               stopb = self.builder.get_object("stopbits")
-               datab = self.builder.get_object("databits")
+               baud   = self.builder.get_object("baudrate")
+               parity = self.builder.get_object("parity")
+               datab  = self.builder.get_object("databits")
+               stopb  = self.builder.get_object("stopbits")
                baud.set_value(self.config.baudrate)
-               stopb.set_value(self.config.stopbits)
+               parity.set_text(self.config.parity)
                datab.set_value(self.config.databits)
+               stopb.set_value(self.config.stopbits)
 
                # Xively settings
                user  = self.builder.get_object("username")