From 03a198e5bf7ec90ce6441248b1df976a13aebf95 Mon Sep 17 00:00:00 2001 From: Oli Date: Sat, 11 Aug 2007 06:56:33 +0000 Subject: SynthLab parameter's info display --- (limited to 'SynthLab') diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py index 9bf7294..e40d4d3 100755 --- a/SynthLab/SynthLabConstants.py +++ b/SynthLab/SynthLabConstants.py @@ -350,25 +350,25 @@ class SynthLabConstants: [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN, ADDSYNTH], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON, EQ4BAND, CHORUS], [ADSR]] - SYNTHPARA = { _('lfo'): [AMP, FREQ, WAVEFORM, OFFSET, LFO_INFO], - _('rand'): [MIN, MAX, FREQ, SEED, RANDOM_INFO], - _('adsr'): [ATTACK, DECAY, SUSTAIN, RELEASE, ADSR_INFO], - _('trackpadX'): [MIN, MAX, SCALING, POLL, TRACKPADX_INFO], - _('trackpadY'): [MIN, MAX, SCALING, POLL, TRACKPADY_INFO], - _('fm'): [CAR, MOD, INDEX, GAIN, FM_INFO], - _('buzz'): [FREQ, NHARM, FSLOPE, GAIN, BUZZ_INFO], - _('vco'): [FREQ, WAVEFORM, FSLOPE, GAIN, VCO_INFO], - _('pluck'): [FREQ, LFILTER, VIBRATO, GAIN, PLUCK_INFO], - _('noise'): [NOISETYPE, FREQ, BANDWITH, GAIN, NOISE_INFO], - _('sample'): [FREQ, SAMPLEN, LFILTER, GAIN, SAMPLE_INFO], - _('voice'): [FREQ, VOWEL, VIBRATO, GAIN, VOICE_INFO], - _('grain'): [FREQ, SAMPLEN, INDEX, GAIN, GRAIN_INFO], - _('addSynth'): [FREQ, SPREAD, WAVE, GAIN, ADDSYNTH_INFO], - _('wguide'): [FREQ, LFILTER, FEEDBACK, GAIN, DELAY_INFO], - _('distort'): [FREQ, RESON, DISTL, GAIN, DIST_INFO], - _('filter'): [FREQ, FSLOPE, FTYPE, GAIN, FILTER_INFO], - _('ring'): [FREQ, MIX, WAVEFORM, GAIN, RINGMOD_INFO], - _('reverb'): [REVERBD, REVERBF, REVERBL, GAIN, REVERB_INFO], - _('harmon'): [FREQ, DRYDELAY, MIX, GAIN, HARMON_INFO], - _('eq4band'): [FREQ1, FREQ2, FREQ3, FREQ4, EQ4BAND_INFO], - _('chorus'): [LFODEPTH, LFOFREQ, DELAY, FEEDBACK, CHORUS_INFO]} + SYNTHPARA = { _('lfo'): [AMP, FREQ, WAVEFORM, OFFSET, LFO_INFO, LFO_PARA1, LFO_PARA2, LFO_PARA3, LFO_PARA4], + _('rand'): [MIN, MAX, FREQ, SEED, RANDOM_INFO, RANDOM_PARA1, RANDOM_PARA2, RANDOM_PARA3, RANDOM_PARA4], + _('adsr'): [ATTACK, DECAY, SUSTAIN, RELEASE, ADSR_INFO, ADSR_PARA1, ADSR_PARA2, ADSR_PARA3, ADSR_PARA4], + _('trackpadX'): [MIN, MAX, SCALING, POLL, TRACKPADX_INFO, TRACKPADX_PARA1, TRACKPADX_PARA2, TRACKPADX_PARA3, TRACKPADX_PARA4], + _('trackpadY'): [MIN, MAX, SCALING, POLL, TRACKPADY_INFO, TRACKPADY_PARA1, TRACKPADY_PARA2, TRACKPADY_PARA3, TRACKPADY_PARA4], + _('fm'): [CAR, MOD, INDEX, GAIN, FM_INFO, FM_PARA1, FM_PARA2, FM_PARA3, FM_PARA4], + _('buzz'): [FREQ, NHARM, FSLOPE, GAIN, BUZZ_INFO, BUZZ_PARA1, BUZZ_PARA2, BUZZ_PARA3, BUZZ_PARA4], + _('vco'): [FREQ, WAVEFORM, FSLOPE, GAIN, VCO_INFO, VCO_PARA1, VCO_PARA2, VCO_PARA3, VCO_PARA4], + _('pluck'): [FREQ, LFILTER, VIBRATO, GAIN, PLUCK_INFO, PLUCK_PARA1, PLUCK_PARA2, PLUCK_PARA3, PLUCK_PARA4], + _('noise'): [NOISETYPE, FREQ, BANDWITH, GAIN, NOISE_INFO, NOISE_PARA1, NOISE_PARA2, NOISE_PARA3, NOISE_PARA4], + _('sample'): [FREQ, SAMPLEN, LFILTER, GAIN, SAMPLE_INFO, SAMPLE_PARA1, SAMPLE_PARA2, SAMPLE_PARA3, SAMPLE_PARA4], + _('voice'): [FREQ, VOWEL, VIBRATO, GAIN, VOICE_INFO, VOICE_PARA1, VOICE_PARA2, VOICE_PARA3, VOICE_PARA4], + _('grain'): [FREQ, SAMPLEN, INDEX, GAIN, GRAIN_INFO, GRAIN_PARA1, GRAIN_PARA2, GRAIN_PARA3, GRAIN_PARA4], + _('addSynth'): [FREQ, SPREAD, WAVE, GAIN, ADDSYNTH_INFO, ADDSYNTH_PARA1, ADDSYNTH_PARA2, ADDSYNTH_PARA3, ADDSYNTH_PARA4], + _('wguide'): [FREQ, LFILTER, FEEDBACK, GAIN, DELAY_INFO, DELAY_PARA1, DELAY_PARA2, DELAY_PARA3, DELAY_PARA4], + _('distort'): [FREQ, RESON, DISTL, GAIN, DIST_INFO, DIST_PARA1, DIST_PARA2, DIST_PARA3, DIST_PARA4], + _('filter'): [FREQ, FSLOPE, FTYPE, GAIN, FILTER_INFO, FILTER_PARA1, FILTER_PARA2, FILTER_PARA3, FILTER_PARA4], + _('ring'): [FREQ, MIX, WAVEFORM, GAIN, RINGMOD_INFO, RINGMOD_PARA1, RINGMOD_PARA2, RINGMOD_PARA3, RINGMOD_PARA4], + _('reverb'): [REVERBD, REVERBF, REVERBL, GAIN, REVERB_INFO, REVERB_PARA1, REVERB_PARA2, REVERB_PARA3, REVERB_PARA4], + _('harmon'): [FREQ, DRYDELAY, MIX, GAIN, HARMON_INFO, HARMON_PARA1, HARMON_PARA2, HARMON_PARA3, HARMON_PARA4], + _('eq4band'): [FREQ1, FREQ2, FREQ3, FREQ4, EQ4BAND_INFO, EQ4BAND_PARA1, EQ4BAND_PARA2, EQ4BAND_PARA3, EQ4BAND_PARA4], + _('chorus'): [LFODEPTH, LFOFREQ, DELAY, FEEDBACK, CHORUS_INFO, CHORUS_PARA1, CHORUS_PARA2, CHORUS_PARA3, CHORUS_PARA4]} diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index 279d026..6d3154a 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -215,7 +215,7 @@ class SynthLabWindow(SubActivity): text_bg_color = gtk.gdk.color_parse(Config.TOOLBAR_BCK_COLOR) textScroller = gtk.ScrolledWindow() textScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) - textScroller.set_size_request(270, 302) + textScroller.set_size_request(270, 301) self.textBuf = gtk.TextBuffer(None) self.textBuf.set_text(self.infoText) self.textViewer = gtk.TextView(self.textBuf) @@ -231,6 +231,7 @@ class SynthLabWindow(SubActivity): self.textViewer.set_cursor_visible(False) self.textViewer.set_left_margin(10) self.textViewer.set_right_margin(10) + self.textViewer.set_pixels_above_lines(7) self.textViewer.set_justification(gtk.JUSTIFY_LEFT) textScroller.add(self.textViewer) textBox.pack_start(textScroller, False, False, 10) @@ -239,6 +240,7 @@ class SynthLabWindow(SubActivity): self.infoLabel = gtk.Label() self.infoBox.pack_end(self.infoLabel, False, False, 20) textColor = gtk.gdk.color_parse(Config.WHITE_COLOR) + self.infoLabel.set_justify(gtk.JUSTIFY_LEFT) self.infoLabel.modify_fg(gtk.STATE_NORMAL, textColor) self.drawingAreaWidth = 900 @@ -335,9 +337,9 @@ class SynthLabWindow(SubActivity): def updateViewer(self): selectedType = SynthLabConstants.CHOOSE_TYPE[self.objectType][self.choosenType] infoType = SynthLabConstants.SYNTHPARA[selectedType][4] - #infoPara = SynthLabConstants.SYNTHPARA[selectedType][4+self.curSlider] - infoPara = "Parameter's info not yet set" - self.infoText = infoType + '\n\n' + infoPara + infoPara = SynthLabConstants.SYNTHPARA[selectedType][4+self.curSlider] + #infoPara = "Parameter's info not yet set" + self.infoText = infoType + '\n\n' + SynthLabConstants.SYNTHPARA[selectedType][self.curSlider-1] + ': ' + infoPara self.textBuf.set_text(self.infoText) def recallSliderValue( self, num ): -- cgit v0.9.1