light9: light8/Subs.py comparison

subeditor begins to work

comparison

equal deleted inserted replaced

-:3cbe7110d8f7
+:d07b3a20c48e
 pass
 return state
 # no setstate needed
 class Sub:
-def __init__(self, levels, dimmers=68, color=None):
+def __init__(self, name, levels, dimmers=68, color=None):
+self.name = name # keep this consistent please
 self.levels = levels
 self.dimmers = dimmers # needed?
 self.is_effect = callable(self.levels)
 self.slideradjuster = SliderAdjuster()
 if self.is_effect:
 return state
 def set_state(self, statedict):
 self.__dict__.update(statedict)
 def get_levels(self, level):
+"""returns a scaled version of the levels in the sub; channel names are resolved to numbers"""
 d = {}
 if level == 0:
 self.slideradjuster.atzero = 1
 return d
 if self.is_effect: # effect
 else: # dictionary (standard)
 d = self.levels
 return dict([(get_dmx_channel(ch), float(lev) * float(level))
 for ch, lev in d.items()])
+#
+# methods for Subediting to use
+#
+def getlevels(self):
+return self.levels.copy()
+def reviselevels(self,levels):
+# we can accept these new levels; subediting has done all the work
+self.levels.update(levels)
 def reload_data(dummy):
 global subs
 if dummy:
 import ConfigDummy as Config
 else:
 if type(name) == TupleType:
 name, color = name
 else:
 color = None
-subs[name] = Sub(levels, color=color)
+subs[name] = Sub(name, levels, color=color)
 # subs = dict([(name, Sub(levels)) for name, levels in Config.subs.items()])
+def longestsubname():
+return max([len(x) for x in subs.keys()])

Mercurial > code > home > repos > light9