Changeset - 616f8af19462
[Not reviewed]
default
0 3 0
dmcc - 22 years ago 2002-07-16 00:17:42

results of 7.14 performance
3 files changed with 44 insertions and 2 deletions:
0 comments (0 inline, 0 general)
light8/Config.py
Show inline comments
 
@@ -375,24 +375,43 @@ subs["patio left"] = { "main 3" : 31, "e
 
    "patio1" : 0, "cafe1" : 40, "desk1" : 0,}
 
subs["*2-06-0"] = { "cycright" : 100, "main 11" : 13, "main 10" : 0,
 
    "upfill1" : 48, "b34" : 0, "b24" : 100, "b23" : 100, "b22" : 0,
 
    "desk2" : 23, "hotbox2" : 83, "hotbox1" : 51, "upfill4" : 48,
 
    "b32" : 41, "main 2" : 60, "main 4" : 85, "main 7" : 30, "main 9" : 70,
 
    "edge" : 0, "rock" : 0, "marry2" : 34, "marry1" : 64, "side r" : 30,}
 

	
 
# don't screw up!
 
subs['*2-06-1-patio right']=subs['patio right'].copy()
 

	
 
subs['*2-06-2 patio left']=subs['patio left'].copy()
 
subs["*2-07-0"] = { "sidefill2" : 100, "sidefill1" : 83, "cycright" : 41,
 
    "main 11" : 100, "main 10" : 100, "upfill1" : 56, "b34" : 100,
 
    "b25" : 100, "cycleft" : 41, "b23" : 100, "b22" : 100, "side l" : 100,
 
    "hotbox2" : 5, "hotbox1" : 14, "upfill4" : 56, "b24" : 100, "desk2" : 78,
 
    "upfill3" : 69, "upfill2" : 100, "main 3" : 83, "main 2" : 100,
 
    "main 5" : 100, "main 4" : 100, "main 7" : 100, "phone" : 62,
 
    "main 9" : 100, "main 8" : 100, "edge" : 63, "marry2" : 100,
 
    "marry1" : 100, "xmas" : 99, "side r" : 100,}
 
subs["*2-06-0"] = { "cycright" : 100, "main 11" : 13, "main 10" : 0,
 
    "upfill1" : 48, "b34" : 0, "b24" : 100, "b23" : 62, "b22" : 0,
 
    "desk2" : 23, "hotbox2" : 89, "hotbox1" : 88, "upfill4" : 48,
 
    "b32" : 0, "main 2" : 63, "main 4" : 97, "main 7" : 42, "main 9" : 52,
 
    "edge" : 0, "rock" : 0, "marry2" : 0, "marry1" : 41, "side r" : 0,}
 
subs["*2-02-0"] = { "main 2" : 53, "main 5" : 18, "main 4" : 24,
 
    "main 7" : 42, "main 9" : 60, "main 8" : 36, "b24" : 52, "b23" : 76,
 
    "side r" : 34, "blue1" : 72, "marry2" : 38, "blue3" : 72, "blue2" : 72,
 
    "blue4" : 72, "main 10" : 53,}
 
subs["*2-03-20-luckcover"] = { "red3" : 75, "red2" : 75, "red1" : 75,
 
    "b24" : 20, "upfill3" : 26, "upfill2" : 31, "upfill1" : 27, "red4" : 97,
 
    "b25" : 20, "side l" : 31, "b23" : 20, "b22" : 20, "upfill4" : 17,
 
    "side r" : 31, "blue1" : 70, "blue3" : 70, "blue2" : 70, "blue4" : 92,
 
    "main 7" : 100, "gree2" : 75, "gree3" : 75, "gree1" : 75, "gree4" : 75,
 
    "hotback" : 40, "main 8" : 0, "cuba1" : 5,}
 
subs["*1-01-0-justback"] = { "sidefill2" : 47, "sidefill1" : 47,
 
    "cycright" : 41, "upfill3" : 60, "main 10" : 100, "upfill1" : 56,
 
    "b34" : 16, "b25" : 16, "side l" : 0, "b23" : 16, "b22" : 16,
 
    "b32" : 7, "desk1" : 0, "hotbox2" : 100, "hotbox1" : 72, "upfill4" : 68,
 
    "b24" : 16, "desk2" : 0, "main 11" : 100, "upfill2" : 91, "main 3" : 13,
 
    "main 2" : 13, "main 5" : 13, "main 4" : 100, "main 7" : 100,
 
    "phone" : 0, "main 9" : 14, "main 8" : 13, "cycleft" : 41, "edge" : 0,
 
    "b13" : 16, "rock" : 0, "marry2" : 16, "marry1" : 16, "cuba1" : 16,
 
    "cuba2" : 0, "side r" : 0,}
light8/ExtSliderMapper.py
Show inline comments
 
@@ -193,57 +193,59 @@ class ExtSliderMapper(Frame):
 
                 lightboard, filename='slidermapping', numsliders=4):
 
        'Slider levels is scalelevels, sliderinput is an ExternalInput object'
 
        Frame.__init__(self, parent, bg='black')
 
        self.parent = parent
 
        self.sliderlevels = sliderlevels
 
        self.sliderinput = sliderinput
 
        self.filename = filename
 
        self.numsliders = numsliders
 
        self.lightboard = lightboard
 
        self.file = None
 

	
 
        # don't call setup, let them do that when scalelevels is created
 
    def setup(self):
 
        self.subnames = self.sliderlevels.keys()
 
        self.subnames.sort()
 
        self.presets = {}
 
        self.load_presets()
 

	
 
        self.current_preset = StringVar() # name of current preset
 
        self.current_mappings = []
 
        for i, color in zip(range(self.numsliders), colors):
 
            self.current_mappings.append(SliderMapping(color))
 

	
 
        self.draw_interface()
 
    def load_presets(self):
 
    def load_presets(self, *args):
 
        self.presets = {}
 
        self.file = open(self.filename, 'r')
 
        lines = self.file.readlines()
 
        for l in lines:
 
            tokens = l[:-1].split('\t')
 
            name = tokens.pop(0)
 
            self.presets[name] = tokens
 
        self.file.close()
 
        if args: # called from callback
 
            self.draw_interface()
 
    def save_presets(self):
 
        self.file = open(self.filename, 'w')
 
        self.file.seek(0)
 
        preset_names = self.presets.keys()
 
        preset_names.sort()
 
        for p in preset_names:
 
            s = '\t'.join([p] + self.presets[p]) + '\n'
 
            self.file.write(s)
 
        self.file.close()
 
    def load_scalelevels(self):
 
        for slidermap in self.current_mappings:
 
            try:
 
                v = self.sliderlevels[slidermap.get_mapping()]
 
                slidermap.set_sublevel_var(v)
 
                # print "ESM: Yes submaster named", slidermap.get_mapping()
 
            except KeyError:
 
                name = slidermap.get_mapping()
 
                if name != 'disconnected':
 
                    print "ESM: No submaster named", name
 
                
 
    def get_levels(self):
 
        'Called by changelevels, returns a dict of new values for submasters'
 
        if not self.sliderinput: return {}
 

	
 
@@ -268,63 +270,84 @@ class ExtSliderMapper(Frame):
 
        for rawlev, slidermap in zip(rawlevels, self.current_mappings):
 
            slidermap.changed_extinput(rawlev)
 

	
 
        return dict([m.get_level_pair()
 
            for m in self.current_mappings
 
            if m.issynced()])
 
    def draw_interface(self):
 
        self.subs_highlighted = {}
 
        subchoiceframe = Frame(self, bg='black')
 
        for m in self.current_mappings:
 
            m.draw_interface(subchoiceframe, self.subnames)
 
        subchoiceframe.pack()
 
        
 
        presetframe = Frame(self, bg='black')
 
        Label(presetframe, text="Preset:", font=('Arial', 10), bg='black', 
 
            fg='white').pack(side=LEFT)
 
        self.presetcombo = ComboBox(presetframe, variable=self.current_preset, 
 
                                    editable=1, command=self.apply_preset,
 
                                    dropdown=1)
 
        self.presetcombo.slistbox.configure(bg='black')
 
        self.presetcombo.slistbox.listbox.configure(bg='black', fg='white')
 
        self.presetcombo.entry.configure(bg='black', fg='white')
 
        self.draw_presets()
 
        self.presetcombo.pack(side=LEFT)
 
        Button(presetframe, text="Prev", padx=0, pady=0, bg='black', 
 
                fg='white', font=stdfont, 
 
                command=self.prev_preset).pack(side=LEFT)
 
        Button(presetframe, text="Next", padx=0, pady=0, bg='black', 
 
                fg='white', font=stdfont, 
 
                command=self.next_preset).pack(side=LEFT)
 
        Button(presetframe, text="Add", padx=0, pady=0, bg='black', 
 
                fg='white', font=stdfont, 
 
                command=self.add_preset).pack(side=LEFT)
 
        Button(presetframe, text="Delete", padx=0, pady=0, bg='black', 
 
                fg='white', font=stdfont,
 
                command=self.delete_preset).pack(side=LEFT)
 
        Button(presetframe, text="Disconnect", padx=0, pady=0, bg='black', 
 
                fg='white', font=stdfont,
 
                command=self.disconnect_all).pack(side=LEFT)
 
        Button(presetframe, text="Reload", padx=0, pady=0, bg='black', 
 
                fg='white', font=stdfont,
 
                command=self.load_presets).pack(side=LEFT)
 
        presetframe.pack(side=BOTTOM)
 
    def apply_preset(self, preset):
 
        if not preset: return
 
        preset_mapping = self.presets.get(preset)
 
        if not preset_mapping: return
 
        self.disconnect_all()
 
        for subname, slidermap in zip(preset_mapping, self.current_mappings):
 
            slidermap.set_subname(subname)
 
    def change_preset_by_index(self, delta):
 
        preset_names = self.presets.keys()
 
        preset_names.sort()
 
        try:
 
            next = preset_names[preset_names.index(self.current_preset.get())
 
                + delta]
 
            self.current_preset.set(next)
 
            self.apply_preset(next)
 
        except (IndexError, ValueError):
 
            print "Light 8.8: Can't go in that direction.  Dig up!"
 
    def next_preset(self, *args):
 
        self.change_preset_by_index(1)
 
    def prev_preset(self, *args):
 
        self.change_preset_by_index(-1)
 
    def delete_preset(self, *args):
 
        del self.presets[self.current_preset.get()]
 
        self.presetcombo.slistbox.listbox.delete(0, END)
 
        self.draw_presets()
 
        self.save_presets()
 
    def add_preset(self, *args):
 
        self.presets[self.current_preset.get()] = [m.get_mapping() 
 
                for m in self.current_mappings]
 
        self.presetcombo.slistbox.listbox.delete(0, END)
 
        self.draw_presets()
 
        self.save_presets()
 
        self.draw_interface()
 
    def draw_presets(self):
 
        preset_names = self.presets.keys()
 
        preset_names.sort()
 
        for p in preset_names:
 
            self.presetcombo.slistbox.listbox.insert(END, p)
 
    def disconnect_all(self):
 
        for m in self.current_mappings:
 
            m.disconnect()
light8/slidermapping
Show inline comments
 
1-00 opening	*curtain	house	god	*1-01-0
 
1-01	*1-01-0	*1-01-9 end conversations	*1-02-0	*interscene
 
1-01-parts	*1-01-0	*1-01-0-justback	*1-01-0-justright	*1-01-0-sarah
 
1-02	*1-02-0	*1-02-1 desk solo	*1-03-0	*interscene
 
1-03	*1-03-0	*1-04-00-dance	*1-04-01 dark tables	*interscene
 
1-04	*1-04-00-dance	*1-04-01 dark tables	*1-04-02 solo ada	*1-04-10-after dance
 
1-04 - 2	*1-04-02 solo ada	*1-04-10-after dance	*1-04-20-table	*1-04-30-small table
 
1-04 -3, I.5, I.6	*1-04-30-small table	*1-05-0	*1-06-0	*interscene
 
1-06, I.7	*1-06-0	*1-07-0	*1-08-00-left cafe	*interscene
 
1-08 cuba intro	*1-08-00-left cafe	*1-08-10-right cafe	*1-08-10-centerwalk	*1-08-10-rightwalk
 
1-08 cuba travopen	*1-08-30-full	*1-08-10-right cafe	*1-08-20-backdrop	*1-08-10-rightwalk
 
1-10 - intermission	*1-10-0	*curtain	house	*2-01-0-dance
 
2-00 intermission	*curtain	house	god	*2-01-0-dance
 
2-01	*2-01-0-dance	*2-01-01-solo	*2-01-1-after dance	*2-01-1-darker dance
 
2-03 luck	*2-03-20-luck-l	*2-03-20-luck-c	*2-03-20-luck-r	*2-03-20-luckcover
 
2-03 start	*2-03-00-open dance	*2-03-10-dialogue	god	*2-03-20-luckcover
 
2-05	*2-05-0	*2-05-1-dream	*2-05-2-boat	*interscene
 
2-06	*2-06-0	patio right	patio left	*interscene
 
colors	col blue	col gree	col oran	col red
 
vitals	house	god	*curtain	phone booth
 
vitals	house	god	*curtain	*interscene
0 comments (0 inline, 0 general)