fix last commit

musescore · Apr 9, 2014 · 4532ce1 · 4532ce1
1 parent d280091
commit 4532ce1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -2424,7 +2424,7 @@ Measure* Chord::measure() const
 
 void Chord::sortNotes()
       {
-      printf("Chord::sortNotes\n");
+      // printf("Chord::sortNotes\n");
       std::sort(notes().begin(), notes().end(),
          [](const Note* a,const Note* b)->bool { return b->line() < a->line(); }
          // [](const Note* a,const Note* b)->bool { return a->pitch() < b->pitch(); }

diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -286,6 +286,7 @@ inline int Note::concertPitchIdx() const
 void Note::setPitch(int val)
       {
       _pitch = restrict(val, 0, 127);
+#if 0
       int pitchOffset = 0;
       if (score()) {
             Part* part = staff() ? staff()->part() : 0;
@@ -298,13 +299,16 @@ void Note::setPitch(int val)
             if (chord()->measure())
                   chord()->measure()->updateAccidentals(chord()->staffIdx());
             }
+#endif
       }
 
 void Note::setPitch(int pitch, int tpc1, int tpc2)
       {
-      setPitch(pitch);
+      Q_ASSERT(tpcIsValid(tpc1));
+      Q_ASSERT(tpcIsValid(tpc2));
       _tpc[0] = tpc1;
       _tpc[1] = tpc2;
+      setPitch(pitch);
       }
 
 //---------------------------------------------------------
@@ -334,6 +338,8 @@ void Note::setTpcFromPitch()
       {
       _tpc[0] = tpcFromPitch(_pitch);
       _tpc[1] = tpcFromPitch(_pitch - transposition());
+      Q_ASSERT(tpcIsValid(_tpc[0]));
+      Q_ASSERT(tpcIsValid(_tpc[1]));
       }
 
 //---------------------------------------------------------

diff --git a/mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx b/mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx
@@ -414,20 +414,20 @@
         <Chord>
           <lid>7</lid>
           <durationType>whole</durationType>
-          <Note>
-            <lid>8</lid>
-            <pitch>53</pitch>
-            <tpc>13</tpc>
-            <fret>8</fret>
-            <string>4</string>
-            </Note>
           <Note>
             <lid>9</lid>
             <pitch>50</pitch>
             <tpc>16</tpc>
             <fret>0</fret>
             <string>3</string>
             </Note>
+          <Note>
+            <lid>8</lid>
+            <pitch>53</pitch>
+            <tpc>13</tpc>
+            <fret>8</fret>
+            <string>4</string>
+            </Note>
           <Note>
             <lid>10</lid>
             <pitch>57</pitch>

diff --git a/mtest/guitarpro/updateReference b/mtest/guitarpro/updateReference
diff --git a/mtest/musicxml/io/testMeasureLength_ref.xml b/mtest/musicxml/io/testMeasureLength_ref.xml
@@ -161,8 +161,8 @@
     <measure number="2">
       <note>
         <pitch>
-          <step>A</step>
-          <octave>4</octave>
+          <step>C</step>
+          <octave>5</octave>
           </pitch>
         <duration>1</duration>
         <voice>1</voice>
@@ -172,8 +172,8 @@
       <note>
         <chord/>
         <pitch>
-          <step>C</step>
-          <octave>5</octave>
+          <step>A</step>
+          <octave>4</octave>
           </pitch>
         <duration>1</duration>
         <voice>1</voice>

diff --git a/mtest/testutils.cpp b/mtest/testutils.cpp
@@ -146,6 +146,7 @@ Score* MTest::readCreatedScore(const QString& name)
             delete score;
             return 0;
             }
+      score->updateNotes();
       return score;
       }