generator uses an array of beats per page

2 files changed, 10 insertions, 21 deletions

diff --git a/Generation/GenerationParametersWindow.py b/Generation/GenerationParametersWindow.py
index 921c6d9..dea630f 100755
--- a/Generation/GenerationParametersWindow.py
+++ b/Generation/GenerationParametersWindow.py
@@ -11,18 +11,7 @@ import Config
 class GenerationParametersWindow( gtk.VBox ):
     def __init__( self, generateFunction, variateFunction, handleCloseWindowCallback ):
         gtk.VBox.__init__( self )
-        #gtk.Window.__init__( self, gtk.WINDOW_TOPLEVEL )
-        #self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
-        #self.set_position( gtk.WIN_POS_CENTER )
-        #self.set_default_size(30, 300)
-        #self.move(300, 20)
-        #self.set_border_width(0)
-        #self.set_decorated(False)
-        #self.mainBox = RoundVBox(fillcolor="#FFF", bordercolor="#FFF")
-        #self.mainBox.set_radius(10)
-
         self.handleCloseWindowCallback = handleCloseWindowCallback
-        #self.connect( "delete_event", handleCloseWindowCallback )
 
         self.rythmMethod = GenerationConstants.DEFAULT_RYTHM_METHOD
         self.pitchMethod = GenerationConstants.DEFAULT_PITCH_METHOD
@@ -351,7 +340,7 @@ class GenerationParametersWindow( gtk.VBox ):
                                      self.pitchStep,
                                      self.pitchRegularity,
                                      self.duration,
-                                    self.silence,
+                                     self.silence,
                                      self.rythmMethod,
                                      self.pitchMethod,
                                      self.pattern,
diff --git a/Generation/Generator.py b/Generation/Generator.py
index 794199b..5d590c2 100755
--- a/Generation/Generator.py
+++ b/Generation/Generator.py
@@ -40,7 +40,7 @@ def generator1(
         volume,     # [trackId: float(volume) ]
         instrument, # [trackId: instrument]
         tempo,      # integer bpm
-        nbeats,     # integer
+        nbeats,     # map [ pageId : beats ]
         trackIds,   # list of trackIds to generate
         pageIds,    # list of pageIds to generate
         trackDictionary # map [ trackId : [ pageId : events ] ]
@@ -92,7 +92,7 @@ def generator1(
 
     def pageGenerate( parameters, trackId, pageId, selectedPageCount, lastPageId, trackOfNotes, drumPitch = None ):
         trackNotes = trackOfNotes
-        barLength = Config.TICKS_PER_BEAT * nbeats
+        barLength = Config.TICKS_PER_BEAT * nbeats[ pageId ]
         if drumPitch:
             currentInstrument = Config.INSTRUMENTS[instrument[ trackId ]].kit[drumPitch[0]].name
         else:
@@ -131,10 +131,10 @@ def generator1(
 
 ################################################################################## 
     #  begin generate() 
-    harmonicSequence = []
-    for i in range( nbeats ):
-        harmonicSequence.append( 
-                GenerationConstants.CHORDS_TABLE[ makeHarmonicSequence.getNextValue( 2, len( GenerationConstants.CHORDS_TABLE ) - 1 ) ] )
+#    harmonicSequence = []
+#    for i in range( nbeats ):
+#        harmonicSequence.append( 
+#                GenerationConstants.CHORDS_TABLE[ makeHarmonicSequence.getNextValue( 2, len( GenerationConstants.CHORDS_TABLE ) - 1 ) ] )
  
     for trackId in trackIds:
         if instrument[ trackId ][0:4] == 'drum':
@@ -172,7 +172,7 @@ def variate(
         volume,     # [trackId: float(volume) ]
         instrument, # [trackId: instrument]
         tempo,      # integer bpm
-        nbeats,     # integer
+        nbeats,     # map [ pageId : beats ]
         trackIds,   # list of trackIds to generate
         pageIds,    # list of pageIds to generate
         trackDictionary # map [ trackId : [ pageId : events ] ]
@@ -198,10 +198,10 @@ def variate(
             for note in tempTrackNotes:
                 trackNotes.append( note.clone() )
         if parameters.rythmVariation == 1:
-            for note in rythmReverse.getNewList( tempTrackNotes, nbeats ):
+            for note in rythmReverse.getNewList( tempTrackNotes, nbeats[ pageId ] ):
                 trackNotes.append( note.clone() )
         if parameters.rythmVariation == 2:
-            for note in rythmShuffle.getNewList( tempTrackNotes , nbeats):
+            for note in rythmShuffle.getNewList( tempTrackNotes , nbeats[ pageId ] ):
                 trackNotes.append( note.clone() )
 
         #del trackDictionary[ trackId ][ pageId ]