LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1566 from MarcSabatella/concert-pitch-mtests

Browse source 
update/add mtest for concert pitch fixes
This commit is contained in:
Nicolas Froment 2014-12-20 22:41:21 +01:00
commit 80a58a987e
7 changed files with 570 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

225
mtest/libmscore/keysig/concert-pitch-01-ref.mscx Normal file
View file

@ -0,0 +1,225 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<concertPitch>1</concertPitch>
<page-layout>
<page-height>1584</page-height>
<page-width>1224</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>90.1417</right-margin>
<top-margin>56.6929</top-margin>
<bottom-margin>113.386</bottom-margin>
</page-margins>
<page-margins type="odd">
<left-margin>56.6929</left-margin>
<right-margin>90.1417</right-margin>
<top-margin>56.6929</top-margin>
<bottom-margin>113.386</bottom-margin>
</page-margins>
</page-layout>
<Spatium>1.76389</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer"></metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
<Page>
</Page>
</PageList>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<bracket type="-1" span="0"/>
</Staff>
<trackName>Alto Saxophone</trackName>
<Instrument>
<longName pos="0">Alto Saxophone</longName>
<shortName pos="0">A. Sax.</shortName>
<trackName>Alto Saxophone</trackName>
<minPitchP>49</minPitchP>
<maxPitchP>87</maxPitchP>
<minPitchA>49</minPitchA>
<maxPitchA>82</maxPitchA>
<transposeDiatonic>-5</transposeDiatonic>
<transposeChromatic>-9</transposeChromatic>
<instrumentId>wind.reed.saxophone.alto</instrumentId>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<program value="65"/>
</Channel>
</Instrument>
</Part>
<Part>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<defaultConcertClef>G8vb</defaultConcertClef>
<defaultTransposingClef>G</defaultTransposingClef>
<bracket type="-1" span="0"/>
</Staff>
<trackName>Tenor Saxophone</trackName>
<Instrument>
<longName pos="0">Tenor Saxophone</longName>
<shortName pos="0">T. Sax.</shortName>
<trackName>Tenor Saxophone</trackName>
<minPitchP>44</minPitchP>
<maxPitchP>82</maxPitchP>
<minPitchA>44</minPitchA>
<maxPitchA>77</maxPitchA>
<transposeDiatonic>-8</transposeDiatonic>
<transposeChromatic>-14</transposeChromatic>
<instrumentId>wind.reed.saxophone.tenor</instrumentId>
<concertClef>G8vb</concertClef>
<transposingClef>G</transposingClef>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<program value="66"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="1">
<KeySig>
<accidental>-4</accidental>
</KeySig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="1">
<KeySig>
<accidental>0</accidental>
</KeySig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Staff id="2">
<Measure number="1">
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="1">
<KeySig>
<accidental>-4</accidental>
</KeySig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
</Measure>
<Measure number="1">
<KeySig>
<accidental>0</accidental>
</KeySig>
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>
</museScore>

0
mtest/libmscore/keysig/concert-pitch-ref.mscx → mtest/libmscore/keysig/concert-pitch-02-ref.mscx
View file

3
mtest/libmscore/keysig/tst_keysig.cpp
View file

@ -116,8 +116,9 @@ void TestKeySig::concertPitch()
{
Score* score = readScore(DIR + "concert-pitch.mscx");
score->cmdConcertPitchChanged(true, true);
QVERIFY(saveCompareScore(score, "concert-pitch-01-test.mscx", DIR + "concert-pitch-01-ref.mscx"));
score->cmdConcertPitchChanged(false, true);
QVERIFY(saveCompareScore(score, "concert-pitch-test.mscx", DIR + "concert-pitch-ref.mscx"));
QVERIFY(saveCompareScore(score, "concert-pitch-02-test.mscx", DIR + "concert-pitch-02-ref.mscx"));
}
QTEST_MAIN(TestKeySig)

3
mtest/libmscore/keysig/updateReference
View file

@ -4,4 +4,5 @@ cp ../../../build.debug/mtest/libmscore/keysig/keysig01-test.mscx keysig01-ref.m
cp ../../../build.debug/mtest/libmscore/keysig/keysig02-test.mscx keysig02-ref.mscx
cp ../../../build.debug/mtest/libmscore/keysig/keysig03-test.mscx keysig.mscx
cp ../../../build.debug/mtest/libmscore/keysig/concert-pitch-01-test.mscx concert-pitch-01-ref.mscx
cp ../../../build.debug/mtest/libmscore/keysig/concert-pitch-02-test.mscx concert-pitch-02-ref.mscx

161
mtest/libmscore/note/tpc-transpose-ref.mscx Normal file
View file

@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<concertPitch>1</concertPitch>
<page-layout>
<page-height>1584</page-height>
<page-width>1224</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>90.1417</right-margin>
<top-margin>56.6929</top-margin>
<bottom-margin>113.386</bottom-margin>
</page-margins>
<page-margins type="odd">
<left-margin>56.6929</left-margin>
<right-margin>90.1417</right-margin>
<top-margin>56.6929</top-margin>
<bottom-margin>113.386</bottom-margin>
</page-margins>
</page-layout>
<Spatium>1.76389</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer"></metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
<Page>
<System>
</System>
</Page>
</PageList>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<bracket type="-1" span="0"/>
</Staff>
<trackName>B♭ Clarinet</trackName>
<Instrument>
<longName pos="0">B♭ Clarinet</longName>
<shortName pos="0">B♭ Cl.</shortName>
<trackName>B♭ Clarinet</trackName>
<minPitchP>50</minPitchP>
<maxPitchP>94</maxPitchP>
<minPitchA>50</minPitchA>
<maxPitchA>89</maxPitchA>
<transposeDiatonic>-1</transposeDiatonic>
<transposeChromatic>-2</transposeChromatic>
<instrumentId>wind.reed.clarinet.bflat</instrumentId>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<program value="71"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<KeySig>
<accidental>-4</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Chord>
<durationType>half</durationType>
<Note>
<Accidental>
<subtype>double flat</subtype>
</Accidental>
<pitch>62</pitch>
<tpc>4</tpc>
<tpc2>6</tpc2>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Note>
<Accidental>
<role>1</role>
<subtype>double flat</subtype>
</Accidental>
<pitch>62</pitch>
<tpc>4</tpc>
<tpc2>6</tpc2>
</Note>
</Chord>
</Measure>
<Measure number="2">
<Chord>
<durationType>half</durationType>
<Note>
<Accidental>
<subtype>double flat</subtype>
</Accidental>
<pitch>62</pitch>
<tpc>4</tpc>
<tpc2>6</tpc2>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Note>
<pitch>62</pitch>
<tpc>4</tpc>
<tpc2>6</tpc2>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>
</museScore>

150
mtest/libmscore/note/tpc-transpose.mscx Normal file
View file

@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<page-layout>
<page-height>1584</page-height>
<page-width>1224</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>90.1417</right-margin>
<top-margin>56.6929</top-margin>
<bottom-margin>113.386</bottom-margin>
</page-margins>
<page-margins type="odd">
<left-margin>56.6929</left-margin>
<right-margin>90.1417</right-margin>
<top-margin>56.6929</top-margin>
<bottom-margin>113.386</bottom-margin>
</page-margins>
</page-layout>
<Spatium>1.76389</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer"></metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
<Page>
<System>
</System>
</Page>
</PageList>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<bracket type="-1" span="0"/>
</Staff>
<trackName>B♭ Clarinet</trackName>
<Instrument>
<longName pos="0">B♭ Clarinet</longName>
<shortName pos="0">B♭ Cl.</shortName>
<trackName>B♭ Clarinet</trackName>
<minPitchP>50</minPitchP>
<maxPitchP>94</maxPitchP>
<minPitchA>50</minPitchA>
<maxPitchA>89</maxPitchA>
<transposeDiatonic>-1</transposeDiatonic>
<transposeChromatic>-2</transposeChromatic>
<instrumentId>wind.reed.clarinet.bflat</instrumentId>
<Articulation>
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<program value="71"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<KeySig>
<accidental>-2</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Chord>
<durationType>half</durationType>
<Note>
<pitch>63</pitch>
<tpc>11</tpc>
<tpc2>13</tpc2>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Note>
<pitch>63</pitch>
<tpc>11</tpc>
<tpc2>13</tpc2>
</Note>
</Chord>
</Measure>
<Measure number="2">
<Chord>
<durationType>half</durationType>
<Note>
<pitch>63</pitch>
<tpc>11</tpc>
<tpc2>13</tpc2>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Note>
<pitch>63</pitch>
<tpc>11</tpc>
<tpc2>13</tpc2>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>
</museScore>

31
mtest/libmscore/note/tst_note.cpp
View file

@ -40,6 +40,7 @@ class TestNote : public QObject, public MTest
void note();
void grace();
void tpc();
void tpcTranspose();
};
//---------------------------------------------------------
@ -361,7 +362,7 @@ void TestNote::grace()
//---------------------------------------------------------
/// tpc
/// read/write test of note tpc values
/// test of note tpc values
//---------------------------------------------------------
void TestNote::tpc()
@ -389,6 +390,34 @@ void TestNote::tpc()
}
//---------------------------------------------------------
/// tpcTranspose
/// test of note tpc values & transposition
//---------------------------------------------------------
void TestNote::tpcTranspose()
{
Score* score = readScore(DIR + "tpc-transpose.mscx");
score->doLayout();
score->startCmd();
Measure* m = score->firstMeasure();
score->select(m, SelectType::SINGLE, 0);
score->changeAccidental(Accidental::Type::FLAT);
score->endCmd();
score->startCmd();
m = m->nextMeasure();
score->select(m, SelectType::SINGLE, 0);
score->upDown(false, UpDownMode::CHROMATIC);
score->endCmd();
score->cmdConcertPitchChanged(true, true);
QVERIFY(saveCompareScore(score, "tpc-transpose-test.mscx", DIR + "tpc-transpose-ref.mscx"));
}
QTEST_MAIN(TestNote)
#include "tst_note.moc"