diff options
author | Oli <olivier.belanger@umontreal.ca> | 2007-10-10 01:58:56 (GMT) |
---|---|---|
committer | Oli <olivier.belanger@umontreal.ca> | 2007-10-10 01:58:56 (GMT) |
commit | f43d483d7817cdaf36a734af299a9604d5420519 (patch) | |
tree | 1e7ea3f2191bee9da14c44f679b21abc28cf71ad | |
parent | 7400fb60ca6b454330996cc5b2c425b8c1e366c9 (diff) |
meta algo presets
-rw-r--r-- | TamTamEdit.activity/Edit/EditToolbars.py | 2 | ||||
-rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 4 | ||||
-rwxr-xr-x | common/Generation/GenerationConstants.py | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/TamTamEdit.activity/Edit/EditToolbars.py b/TamTamEdit.activity/Edit/EditToolbars.py index e8c9b10..95e3ab8 100644 --- a/TamTamEdit.activity/Edit/EditToolbars.py +++ b/TamTamEdit.activity/Edit/EditToolbars.py @@ -669,7 +669,7 @@ class generationPalette(Palette): return self.edit.setPageGenerateMode(mode) self.edit.generate(self.getGenerationParameters()) - # print self.rythmDensity, self.rythmRegularity,self.pitchRegularity,self.pitchStep, self.duration, self.silence,self.pattern + print self.rythmDensity, self.rythmRegularity,self.pitchRegularity,self.pitchStep, self.duration, self.silence,self.pattern self.popdown(True) ############ generate a preview melody ##############s diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index 354d59f..0c9f125 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -405,7 +405,7 @@ class MainWindow( gtk.EventBox ): self.tuneInterface.selectPages( self.noteDB.getTune() ) - beats = random.randint(3,8) + beats = random.randint(3,6) stream = [] for page in self.noteDB.getTune(): stream += [ page, beats ] @@ -481,7 +481,7 @@ class MainWindow( gtk.EventBox ): Config.INSTRUMENTS[random.choice(drumsPickup)] ] def chooseGenParams(self): - choose = [random.randint(0,13) for x in range(4)] + choose = [random.randint(0,16) for x in range(4)] density = [GenerationConstants.RYTHM_DENSITY_BANK[i] for i in choose] rytReg = [GenerationConstants.RYTHM_REGU_BANK[i] for i in choose] step = [GenerationConstants.PITCH_STEP_BANK[i] for i in choose] diff --git a/common/Generation/GenerationConstants.py b/common/Generation/GenerationConstants.py index 55b9527..9704048 100755 --- a/common/Generation/GenerationConstants.py +++ b/common/Generation/GenerationConstants.py @@ -31,13 +31,13 @@ class GenerationConstants: # Default parameters for algorithmic generation - RYTHM_DENSITY_BANK = [.38, .26, .82, 1, 1, .91, 1, .91, .91, .32, 1, 1, .83, .6] - RYTHM_REGU_BANK = [.94, .95, .89, 1, 1, .75, 1, .75, .84, .93, 1, 1, .87, .62] - PITCH_REGU_BANK = [.04, 0, 0, .36, .35, .57, 0, 0, 0, 0, .28, .77, 0, 0] - PITCH_STEP_BANK = [.28, .48, .39, .4, 1, .55, .29, .15, .4, .26, .25, 1, .33, .22] - DURATION_BANK = [1, 1, 1, 1, 1, 1, 1, 1, .65, .86, 1, 1, .82, 1] - SILENCE_BANK = [.07, 0, .17, 0, .17, .17, .2, .32, .33, .08, .06, .11, .11, .06] - PATTERN_BANK = [0,0,0,1,1,1,2,2,2,2,3,3,3,3] + RYTHM_DENSITY_BANK = [.38, .26, .82, .48, .56, 1, 1, .91, 1, .91, .91, .32, 1, 1, .83, .6, .88] + RYTHM_REGU_BANK = [.94, .95, .89, .73, .8, 1, 1, .75, 1, .75, .84, .93, 1, 1, .87, .62, .8] + PITCH_REGU_BANK = [.04, 0, 0, .22, 0, .36, .35, .57, 0, 0, 0, 0, .28, .77, 0, 0, 0] + PITCH_STEP_BANK = [.28, .48, .39, .38, .27, .4, 1, .55, .29, .15, .4, .26, .25, 1, .33, .22, .27] + DURATION_BANK = [1, 1, 1, .97, 1, 1, 1, 1, 1, 1, .65, .86, 1, 1, .82, 1, .78] + SILENCE_BANK = [.07, 0, .17, .28, .21, 0, .17, .17, .2, .32, .33, .08, .06, .11, .11, .06, .37] + PATTERN_BANK = [0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,3] SCALE_BANK = [MAJOR, NATURAL_MINOR, LYDIEN, HARMONIC_MINOR, MYXOLYDIEN] chooseDefault = random.randint(0,4) |