Mercurial > code > home > repos > light9
diff bin/subcomposer @ 351:a6662d61ebcd
SC, KC, CC now run and seem to load and save ok. CC does not have any rdf for its data files
| author | Drew Perttula <drewp@bigasterisk.com> |
|---|---|
| date | Sun, 10 Jun 2007 08:09:08 +0000 |
| parents | 2c782ca93e73 |
| children | a13f2caf6f25 |
line wrap: on
line diff
--- a/bin/subcomposer Sun Jun 10 07:41:48 2007 +0000 +++ b/bin/subcomposer Sun Jun 10 08:09:08 2007 +0000 @@ -20,7 +20,7 @@ self.dmxdummy = dmxdummy self.numchannels = numchannels - self.levels = [0]*512 # levels should never get overwritten, just edited + self.levels = [0]*numchannels # levels should never get overwritten, just edited self.levelbox = Levelbox(self, num_channels=numchannels) self.levelbox.pack(side='top') @@ -31,8 +31,7 @@ self.savebox = EntryCommand(self, cmd=self.savenewsub) self.savebox.pack(side='top') - self.loadbox = EntryCommand(self, verb="Load", - cmd=lambda x: self.loadsub(self.levels, x)) + self.loadbox = EntryCommand(self, verb="Load", cmd=self.loadsub) self.loadbox.pack(side='top') def alltozero(): @@ -76,18 +75,17 @@ return self.levels[channel-1]=max(0,min(1,float(newlevel))) self.levelbox.setlevels(self.levels) - def savenewsub(self, levels, subname): + def savenewsub(self, subname): leveldict={} for i,lev in zip(range(len(self.levels)),self.levels): if lev!=0: leveldict[Patch.get_channel_name(i+1)]=lev - s=Submaster.Submaster(subname,leveldict) + s=Submaster.Submaster(subname,leveldict=leveldict) s.save() def loadsub(self, subname): """puts a sub into the levels, replacing old level values""" s=Submaster.Submasters().get_sub_by_name(subname) - self.levels[:]=[0]*68 self.levels[:]=s.get_dmx_list() dispatcher.send("levelchanged") def sendupdate(self): @@ -119,7 +117,7 @@ def action(self, *args): subname = self.entry.get() self.cmd(subname) - print "sub", verb, subname + print "sub", self.cmd, subname def set(self, text): self.entry.delete(0, 'end')