Completed changes for numericMIDI 18.01.2017

All test scores now compile, and create <score:midi> elements having the form documented in Moritz issue #2. Final bug fixes: InputVoices must contain InputRestDefs, not MidiRestDefs. This error corrected in both Study3Sketch2Algorithm.cs and Block.cs.
notator · Jan 18, 2017 · 1106967 · 1106967
1 parent b44b0d6
commit 1106967
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Moritz.Algorithm/Study 3.2/Study3Sketch2Algorithm.cs b/Moritz.Algorithm/Study 3.2/Study3Sketch2Algorithm.cs
@@ -109,7 +109,7 @@ private InputVoiceDef GetBar1InputVoiceDef(Seq bar1Seq)
                 MidiChordDef tmcd = tIud as MidiChordDef;
                 if(tRestDef != null)
                 {
-                    MidiRestDef iRestDef = new MidiRestDef(tRestDef.MsPositionReFirstUD, tRestDef.MsDuration);
+                    InputRestDef iRestDef = new InputRestDef(tRestDef.MsPositionReFirstUD, tRestDef.MsDuration);
                     ivd.Add(iRestDef);
                 }
                 else if(tmcd != null)

diff --git a/Moritz.Spec/Block.cs b/Moritz.Spec/Block.cs
@@ -261,14 +261,28 @@ protected void Blockify()
                     int startRestMsDuration = voiceDef.MsPositionReContainer;
                     if(startRestMsDuration > 0)
                     {
-                        voiceDef.Insert(0, new MidiRestDef(0, startRestMsDuration));
+                        if(voiceDef is InputVoiceDef)
+                        {
+                            voiceDef.Insert(0, new InputRestDef(0, startRestMsDuration));
+                        }
+                        else
+                        {
+                            voiceDef.Insert(0, new MidiRestDef(0, startRestMsDuration));
+                        }
                     }
 
                     int endOfTrkMsPositionReFirstIUD = voiceDef.EndMsPositionReFirstIUD;
                     int endRestMsDuration = blockMsDuration - endOfTrkMsPositionReFirstIUD;
                     if(endRestMsDuration > 0)
                     {
-                        voiceDef.UniqueDefs.Add(new MidiRestDef(endOfTrkMsPositionReFirstIUD, endRestMsDuration));
+                        if(voiceDef is InputVoiceDef)
+                        {
+                            voiceDef.UniqueDefs.Add(new InputRestDef(endOfTrkMsPositionReFirstIUD, endRestMsDuration));
+                        }
+                        else
+                        {
+                            voiceDef.UniqueDefs.Add(new MidiRestDef(endOfTrkMsPositionReFirstIUD, endRestMsDuration));
+                        }
                     }
                     voiceDef.AgglomerateRests();
                 }

diff --git a/Moritz.Spec/InputChordDef.cs b/Moritz.Spec/InputChordDef.cs
@@ -73,7 +73,7 @@ public void Transpose(int interval)
 
         public override string ToString()
         {
-            return ("MsPositionReFirstIUD=" + MsPositionReFirstUD.ToString() + " MsDuration=" + MsDuration.ToString() + " InputChordDef");
+            return ("InputChordDef: MsPositionReFirstIUD=" + MsPositionReFirstUD.ToString() + " MsDuration=" + MsDuration.ToString());
         }
 
         /// <summary>