Création d'une classe Tone dont hérite Note.

[minwii.git] / src / songs / musicxmltosong.py

diff --git a/src/songs/musicxmltosong.py b/src/songs/musicxmltosong.py
index d24d81a..7eedf53 100755 (executable)
--- a/src/songs/musicxmltosong.py
+++ b/src/songs/musicxmltosong.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
 # -*- coding: utf-8 -*-
 """

-converstion d'un fichier musicxml en objet song minwii.
+conversion d'un fichier musicxml en objet song minwii.

 
 $Id$
 $URL$
 
 $Id$
 $URL$


@@ -22,6 +22,20 @@ DIATO_SCALE = {'C' : 60,
                'A' : 69,
                'B' : 71}
 
                'A' : 69,
                'B' : 71}
 

+CHROM_SCALE = {  0 : ('C',  0),
+                 1 : ('C',  1),
+                 2 : ('D',  0),
+                 3 : ('E', -1),
+                 4 : ('E',  0),
+                 5 : ('F',  0),
+                 6 : ('F',  1),
+                 7 : ('G',  0),
+                 8 : ('G',  1),
+                 9 : ('A',  0),
+                10 : ('B', -1),
+                11 : ('B',  0)}
+
+

 FR_NOTES = {'C' : u'Do',
             'D' : u'Ré',
             'E' : u'Mi',
 FR_NOTES = {'C' : u'Do',
             'D' : u'Ré',
             'E' : u'Mi',


@@ -108,9 +122,14 @@ class Part(object) :
         verse.append(self.notes[-1])
         
     
         verse.append(self.notes[-1])
         
     

-    def iterNotes(self) :
+    def iterNotes(self, indefinitely=True) :

         "exécution de la chanson avec l'alternance couplets / refrains"
         "exécution de la chanson avec l'alternance couplets / refrains"

-        for verse in cycle(self.verses) :
+        print 'indefinitely', indefinitely
+        if indefinitely == False :
+            iterable = self.verses
+        else :
+            iterable = cycle(self.verses)
+        for verse in iterable :

             print "---partie---"
             repeats = len(verse[0].lyrics)
             if repeats > 1 :
             print "---partie---"
             repeats = len(verse[0].lyrics)
             if repeats > 1 :


@@ -128,7 +147,7 @@ class Part(object) :
                     yield note, 0
         
     def pprint(self) :
                     yield note, 0
         
     def pprint(self) :

-        for note, verseIndex in self.iterNotes() :
+        for note, verseIndex in self.iterNotes(indefinitely=False) :

             print note, note.lyrics[verseIndex]
 
 
             print note, note.lyrics[verseIndex]
 
 


@@ -171,9 +190,56 @@ class Barline(object) :
         return '|'
 
     __repr__ = __str__
         return '|'
 
     __repr__ = __str__

+
+
+class Tone(object) :
+    
+    @staticmethod
+    def midi_to_step_alter_octave(midi):
+        stepIndex = midi % 12
+        step, alter = CHROM_SCALE[stepIndex]
+        octave = midi / 12 - 1
+        return step, alter, octave
+    
+    
+    def __init__(self, *args) :
+        if len(args) == 3 :
+            self.step, self.alter, self.octave = args
+        elif len(args) == 1 :
+            midi = args[0]
+            self.step, self.alter, self.octave = Tone.midi_to_step_alter_octave(midi)
+
+    @property
+    def midi(self) :
+        mid = DIATO_SCALE[self.step]
+        mid = mid + (self.octave - OCTAVE_REF) * 12
+        mid = mid + self.alter
+        return mid
+
+    
+    @property
+    def name(self) :
+        name = '%s%d' % (self.step, self.octave)
+        if self.alter < 0 :
+            alterext = 'b'
+        else :
+            alterext = '#'
+        name = '%s%s' % (name, abs(self.alter) * alterext)
+        return name
+
+    @property
+    def nom(self) :
+        name = FR_NOTES[self.step]
+        if self.alter < 0 :
+            alterext = 'b'
+        else :
+            alterext = '#'
+        name = '%s%s' % (name, abs(self.alter) * alterext)
+        return name
+        

         
 
         
 

-class Note(object) :
+class Note(Tone) :

     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
     
     def __init__(self, node, divisions, previous) :
     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
     
     def __init__(self, node, divisions, previous) :


@@ -207,36 +273,36 @@ class Note(object) :
         self._duration = self.duration + note.duration
         self.divisions = 1
     
         self._duration = self.duration + note.duration
         self.divisions = 1
     

-    @property
-    def midi(self) :
-        mid = DIATO_SCALE[self.step]
-        mid = mid + (self.octave - OCTAVE_REF) * 12
-        mid = mid + self.alter
-        return mid
+#    @property
+#    def midi(self) :
+#        mid = DIATO_SCALE[self.step]
+#        mid = mid + (self.octave - OCTAVE_REF) * 12
+#        mid = mid + self.alter
+#        return mid

     
     @property
     def duration(self) :
         return self._duration / self.divisions
     
     
     @property
     def duration(self) :
         return self._duration / self.divisions
     

-    @property
-    def name(self) :
-        name = '%s%d' % (self.step, self.octave)
-        if self.alter < 0 :
-            alterext = 'b'
-        else :
-            alterext = '#'
-        name = '%s%s' % (name, abs(self.alter) * alterext)
-        return name
-    
-    @property
-    def nom(self) :
-        name = FR_NOTES[self.step]
-        if self.alter < 0 :
-            alterext = 'b'
-        else :
-            alterext = '#'
-        name = '%s%s' % (name, abs(self.alter) * alterext)
-        return name
+#    @property
+#    def name(self) :
+#        name = '%s%d' % (self.step, self.octave)
+#        if self.alter < 0 :
+#            alterext = 'b'
+#        else :
+#            alterext = '#'
+#        name = '%s%s' % (name, abs(self.alter) * alterext)
+#        return name
+#    
+#    @property
+#    def nom(self) :
+#        name = FR_NOTES[self.step]
+#        if self.alter < 0 :
+#            alterext = 'b'
+#        else :
+#            alterext = '#'
+#        name = '%s%s' % (name, abs(self.alter) * alterext)
+#        return name

     
     @property
     def column(self):
     
     @property
     def column(self):


@@ -300,30 +366,9 @@ def musicXml2Song(input, partIndex=0, printNotes=False) :
     return part
 
     
     return part
 
     

-    # divisions de la noire
-#    divisions = 0
-#    midiNotes, durations, lyrics = [], [], []
-#
-#    for measureNode in leadPart.getElementsByTagName('measure') :
-#        divisions = int(_getNodeValue(measureNode, 'attributes/divisions', divisions))
-#        for noteNode in measureNode.getElementsByTagName('note') :
-#            note = Note(noteNode, divisions)
-#            if printNotes :
-#                print note.name, note.midi, note.duration, note.lyric
-#            midiNotes.append(note.midi)
-#            durations.append(note.duration)
-#            lyrics.append(note.lyric)
-#    
-#    song = Song(None,
-#                midiNoteNumbers = midiNotes,
-#                noteLengths = durations,
-#                lyrics = lyrics,
-#                notesInExtendedScale=None)
-#    song.save(output)
-    

     
 def main() :
     
 def main() :

-    usage = "%prog musicXmlFile.xml outputSongFile.smwi [options]"
+    usage = "%prog musicXmlFile.xml [options]"

     op = OptionParser(usage)
     op.add_option("-i", "--part-index", dest="partIndex"
                  , default = 0
     op = OptionParser(usage)
     op.add_option("-i", "--part-index", dest="partIndex"
                  , default = 0