light9 Changeset - 092c00f6ba25

Changeset - 092c00f6ba25

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

drewp@bigasterisk.com - 12 years ago 2013-06-10 19:56:42
drewp@bigasterisk.com

fixes for Submaster init method
Ignore-this: 338d19cb4522babe56a77d46e863fe5d

3 files changed with 6 insertions and 11 deletions:

bin/subcomposer

light9/Effects.py

light9/Submaster.py

0 comments (0 inline, 0 general)

bin/subcomposer

➞

Show inline comments

@@ @@ -158,7 +158,7 @@ class Subcomposer(tk.Frame): @@
             if lev!=0:
                 leveldict[get_channel_name(i+1)]=lev
-        s=Submaster.Submaster(subname,leveldict=leveldict)
+        s=Submaster.Submaster(subname, levels=leveldict)
         s.save()
     def sendupdate(self):

light9/Effects.py

➞

Show inline comments

@@ @@ -29,7 +29,7 @@ def chase(t, ontime=0.5, offset=0.2, onv @@
             continue
         lev[dmx] = value
-    return Submaster.Submaster(leveldict=lev, temporary=True)
+    return Submaster.Submaster(name="chase" ,levels=lev)
 def stack(t, names=None, fade=0):
     """names is list of URIs. returns a submaster that stacks the the inputs
@@ @@ -52,7 +52,7 @@ def stack(t, names=None, fade=0): @@
         else:
             break
-    return Submaster.Submaster(leveldict=lev, temporary=True)
+    return Submaster.Submaster(name="stack", levels=lev)
 def configExprGlobals():
     graph = showconfig.getGraph()

light9/Submaster.py

➞

Show inline comments

@@ @@ -311,11 +311,6 @@ class Submasters: @@
     def get_sub_by_uri(self, uri):
         return self.submasters[uri]
 def fullsub(*chans):
     """Make a submaster with chans at full."""
     return Submaster('%r' % chans,
         leveldict=dict([(c, 1.0) for c in chans]), temporary=True)
 # a global instance of Submasters, created on demand
 _submasters = None
@@ @@ -338,20 +333,20 @@ def get_sub_by_name(name, submasters=Non @@
     try:
         val = int(name)
-        s = Submaster("#%d" % val, leveldict={val : 1.0}, temporary=True)
+        s = Submaster("#%d" % val, levels={val : 1.0})
         return s
     except ValueError:
         pass
     try:
         subnum = get_dmx_channel(name)
-        s = Submaster("'%s'" % name, leveldict={subnum : 1.0}, temporary=True)
+        s = Submaster("'%s'" % name, levels={subnum : 1.0})
         return s
     except ValueError:
         pass
     # make an error sub
     return Submaster('%s' % name)
+    return Submaster('%s' % name, levels=ValueError)
 if __name__ == "__main__":
     reload_data()

0 comments (0 inline, 0 general)