Skip to content

Commit

Permalink
Merge pull request #1566 from MarcSabatella/concert-pitch-mtests
Browse files Browse the repository at this point in the history 
update/add mtest for concert pitch fixes
  • Loading branch information
@lasconic
lasconic committed Dec 20, 2014
2 parents 9f4e838 + e5d7a10 commit 80a58a9
Show file tree
Hide file tree
Showing 7 changed files with 570 additions and 3 deletions.
225 changes: 225 additions & 0 deletions mtest/libmscore/keysig/concert-pitch-01-ref.mscx
View file
Original file line number Diff line number Diff line change
@@ -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 ...t/libmscore/keysig/concert-pitch-ref.mscx → ...ibmscore/keysig/concert-pitch-02-ref.mscx
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion mtest/libmscore/keysig/tst_keysig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion mtest/libmscore/keysig/updateReference
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 80a58a9

Please sign in to comment.