— Prise en charge des altérations ;

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

diff --git a/src/songs/musicxmltosong.py b/src/songs/musicxmltosong.py
index 016593a..ffb5247 100755 (executable)
--- a/src/songs/musicxmltosong.py
+++ b/src/songs/musicxmltosong.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 converstion d'un fichier musicxml en objet song minwii.
 
@@ -8,6 +9,7 @@ import sys
 from types import StringTypes
 from xml.dom.minidom import parse
 from optparse import OptionParser
+from Song import Song
 
 # Do4 <=> midi 60
 OCTAVE_REF = 4
@@ -23,20 +25,35 @@ _marker = []
 
 class Note(object) :
     def __init__(self, node, divisions) :
-        self.name = _getNodeValue(node, 'pitch/step')
+        self.step = _getNodeValue(node, 'pitch/step')
         self.octave = int(_getNodeValue(node, 'pitch/octave'))
+        self.alter = int(_getNodeValue(node, 'pitch/alter', 0))
         self._duration = float(_getNodeValue(node, 'duration'))
+        self.lyric = _getNodeValue(node, 'lyric/text')
+
         self.divisions = divisions
     
     @property
     def midi(self) :
-        mid = DIATO_SCALE[self.name]
+        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 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
+        
         
 
 
@@ -51,7 +68,7 @@ def _getNodeValue(node, path, default=_marker) :
         else :
             return default
 
-def musicXml2Song(input, output) :
+def musicXml2Song(input, output, partIndex=0, printNotes=False) :
     if isinstance(input, StringTypes) :
         input = open(input, 'r')
     
@@ -62,27 +79,47 @@ def musicXml2Song(input, output) :
     assert doc.nodeName == u'score-partwise'
     
     parts = doc.getElementsByTagName('part')
-    # on suppose que la première partie est le chant
-    leadPart = parts[0]
+    leadPart = parts[partIndex]
     
     # 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)
-            print note.name, note.octave, note.midi, note.duration
+            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() :
     usage = "%prog musicXmlFile.xml outputSongFile.smwi [options]"
     op = OptionParser(usage)
+    op.add_option("-i", "--part-index", dest="partIndex"
+                 , default = 0
+                 , help = "Index de la partie qui contient le champ.")
+    op.add_option("-p", '--print', dest='printNotes'
+                  , action="store_true"
+                  , default = False
+                  , help = "Affiche les notes sur la sortie standard (debug)")
     
     options, args = op.parse_args()
+    
     if len(args) != 2 :
         raise SystemExit(op.format_help())
     
-    musicXml2Song(*args)
+    musicXml2Song(args[0], args[1], partIndex=options.partIndex, printNotes=options.printNotes)