changeset 29:f595fdd4c548

minor cleanups, convert parallel port controller to a class
author dmcc
date Sun, 07 Jul 2002 10:41:06 +0000
parents b0342f9ee328
children e9d2e7754fd9
files light8/Subs.py light8/io.py light8/rsn.py
diffstat 3 files changed, 18 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/light8/Subs.py	Sun Jul 07 10:17:00 2002 +0000
+++ b/light8/Subs.py	Sun Jul 07 10:41:06 2002 +0000
@@ -13,10 +13,8 @@
     def draw_tk(self, frame):
         pass
     def __getstate__(self):
-        print "get_state:", self.get_value()
         return {'value' : self.get_value()}
     def __setstate__(self, dict):
-        print "set_state to", dict
         self.value = StringVar()
         self.set_value(dict['value'])
 
@@ -196,7 +194,7 @@
         if level == 0: 
             self.slideradjuster.atzero = 1
             return d
-        if self.is_effect:
+        if self.is_effect: # effect
             d = self.generator.next()
             self.slideradjuster.atzero = 0
         else: # dictionary (standard)
--- a/light8/io.py	Sun Jul 07 10:17:00 2002 +0000
+++ b/light8/io.py	Sun Jul 07 10:41:06 2002 +0000
@@ -1,21 +1,14 @@
-
-
 from parport import *
 
-DUMMY=1
-
-def init(DUMMY_in):
-    global DUMMY
-    if not DUMMY_in:
-        
-        getparport()
-        DUMMY=0
-
-def sendlevels(levels):
-    if DUMMY: return
-    levels = list(levels) + [0]
-    if levels[14] > 0: levels[14] = 100
-    # print "levels", ' '.join(["%3.1f" % l for l in levels])
-    outstart()
-    for p in range(1,70):
-        outbyte(levels[p-1]*255/100)
+class ParportDMX:
+    def __init__(self, dummy=1, dimmers=68):
+        self.dummy = dummy
+        if not dummy:
+            getparport()
+    def sendlevels(self, levels):
+        if self.dummy: return
+        levels = list(levels) + [0]
+        # if levels[14] > 0: levels[14] = 100 # non-dim
+        outstart()
+        for p in range(1, dimmers + 2):
+            outbyte(levels[p-1]*255 / 100)
--- a/light8/rsn.py	Sun Jul 07 10:17:00 2002 +0000
+++ b/light8/rsn.py	Sun Jul 07 10:41:06 2002 +0000
@@ -36,7 +36,7 @@
 
 get_data()
 
-io.init(DUMMY)
+parportdmx = io.ParportDMX(DUMMY)
 
 class Lightboard:
     def __init__(self, master):
@@ -112,7 +112,7 @@
 
         self.oldlevels = levels[:]
             
-        io.sendlevels(levels)
+        parportdmx.sendlevels(levels)
 
     def load(self):
         try:
@@ -136,10 +136,10 @@
             print "IOError: Couldn't load prefs (%s)" % filename
         except EOFError:
             print "EOFrror: Couldn't load prefs (%s)" % filename
-
+        except:
+            print "BigTrouble: Couldn't load prefs (%s)" % filename
     def make_sub(self, name):
         i = 1
-        # name = console_entry.get() # read from console
         if not name:
             print "Enter sub name in console."
             return
@@ -188,13 +188,11 @@
             for name, lev in scalelevels.items()])
         self.substate = dict([(name, subobj.get_state())
             for name, subobj in subs])
+        # print "substate", self.substate
 
 mr_lightboard = Lightboard(root)
 
 signal(SIGINT, mr_lightboard.quit)
 bindkeys(root,'<Escape>', mr_lightboard.quit)
 
-# bindkeys(root,'<q>', quit)
-# bindkeys(root,'<r>', refresh)
-# bindkeys(root,'<s>', make_sub)
 root.mainloop() # Receiver switches main