Rename xively to logger

diff --git a/vis/xively.py b/vis/logger.py
similarity index 85%
rename from vis/xively.py
rename to vis/logger.py
index ae8d5252ecc858215070ca9c44b14d619ce12c3a..ffd79038781a5dfb9f89e328152aa0d9c06c76bd 100644 (file)
--- a/vis/xively.py
+++ b/vis/logger.py
@@ -1,4 +1,4 @@
-class Xively:
+class Logger:

        def __init__(self, config):
                self.config = config
 
        def __init__(self, config):
                self.config = config
 

diff --git a/vis/main.py b/vis/main.py
index 4f4fcd295c8be991e4cd460d2e5521ad94e17603..00149ad274d28212d2042232429bb4dd449512a4 100755 (executable)
--- a/vis/main.py
+++ b/vis/main.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from config import Config
 #!/usr/bin/env python
 
 from config import Config

-from xively import Xively
+from logger import Logger

 from device import Device
 from visual import Visual
 
 from device import Device
 from visual import Visual
 


@@ -9,8 +9,8 @@ class Main:
        def __init__(self):
                self.config = Config();
                self.device = Device(self.config);
        def __init__(self):
                self.config = Config();
                self.device = Device(self.config);

-               self.xively = Xively(self.config);
-               self.visual = Visual(self.config, self.device, self.xively);
+               self.logger = Logger(self.config);
+               self.visual = Visual(self.config, self.device, self.logger);

 
        def main(self):
                self.visual.run()
 
        def main(self):
                self.visual.run()

diff --git a/vis/visual.py b/vis/visual.py
index 0b21349b76bb6a4aa12afef8626b473af3b6a441..72fb7109c07e0d3602ca035c5401f61af2b0c1fd 100644 (file)
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -4,14 +4,14 @@ import pygtk
 import gtk
 
 class Visual:
 import gtk
 
 class Visual:

-       def __init__(self, config, device, xively):
+       def __init__(self, config, device, logger):

                def get_objects(names):
                        return map(lambda x:
                                self.builder.get_object(x), names)
 
                self.config   = config
                self.device   = device
                def get_objects(names):
                        return map(lambda x:
                                self.builder.get_object(x), names)
 
                self.config   = config
                self.device   = device

-               self.xively   = xively
+               self.logger   = logger

                self.builder  = gtk.Builder()
 
                self.builder.add_from_file('visual.ui')
                self.builder  = gtk.Builder()
 
                self.builder.add_from_file('visual.ui')


@@ -43,9 +43,9 @@ class Visual:
 
        def on_xively(self, act):
                if act.get_active():
 
        def on_xively(self, act):
                if act.get_active():

-                       self.status(self.xively.connect())
+                       self.status(self.logger.connect())

                else:
                else:

-                       self.status(self.xively.disconnect())
+                       self.status(self.logger.disconnect())

                return True
 
        def on_enable(self, _):
                return True
 
        def on_enable(self, _):