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

Add tests for note off times simplification

Browse source
This commit is contained in:
Andrey M. Tokarev 2014-05-07 23:43:41 +04:00
parent f25c38fa96
commit 86a0479946
13 changed files with 865 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
mtest/importmidi/simplify_16th_staccato.mid Normal file
View file

Binary file not shown.

113
mtest/importmidi/simplify_16th_staccato.mscx Normal file
View file

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<page-layout>
<page-height>1683.78</page-height>
<page-width>1190.55</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>56.6929</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>56.6929</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="copyright"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
</PageList>
<Part>
<Staff id="1">
<type>0</type>
</Staff>
<trackName>Grand Piano</trackName>
<Instrument>
<longName pos="0">Grand Piano</longName>
<trackName></trackName>
<Channel>
<program value="0"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<KeySig>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Chord>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>77</pitch>
<tpc>13</tpc>
<velocity>80</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Chord>
<dots>1</dots>
<durationType>quarter</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>77</pitch>
<tpc>13</tpc>
<velocity>80</velocity>
<veloType>user</veloType>
</Note>
</Chord>
</Measure>
</Staff>
</Score>
</museScore>

BIN
mtest/importmidi/simplify_32nd_staccato.mid Normal file
View file

Binary file not shown.

150
mtest/importmidi/simplify_32nd_staccato.mscx Normal file
View file

@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<page-layout>
<page-height>1683.78</page-height>
<page-width>1190.55</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>56.6929</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>56.6929</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="copyright"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
</PageList>
<Part>
<Staff id="1">
<type>0</type>
</Staff>
<trackName>Grand Piano</trackName>
<Instrument>
<longName pos="0">Grand Piano</longName>
<trackName></trackName>
<Channel>
<program value="0"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<KeySig>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Chord>
<durationType>eighth</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>64</pitch>
<tpc>18</tpc>
<velocity>90</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>64</pitch>
<tpc>18</tpc>
<velocity>83</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Chord>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>64</pitch>
<tpc>18</tpc>
<velocity>103</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Chord>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>64</pitch>
<tpc>18</tpc>
<velocity>83</velocity>
<veloType>user</veloType>
</Note>
</Chord>
</Measure>
</Staff>
</Score>
</museScore>

BIN
mtest/importmidi/simplify_4th_dotted_tied.mid Normal file
View file

Binary file not shown.

100
mtest/importmidi/simplify_4th_dotted_tied.mscx Normal file
View file

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<page-layout>
<page-height>1683.78</page-height>
<page-width>1190.55</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>56.6929</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>56.6929</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="copyright"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
</PageList>
<Part>
<Staff id="1">
<type>0</type>
</Staff>
<trackName>Grand Piano</trackName>
<Instrument>
<longName pos="0">Grand Piano</longName>
<trackName></trackName>
<Channel>
<program value="0"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<KeySig>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Chord>
<durationType>half</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>65</pitch>
<tpc>13</tpc>
<velocity>73</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>66</pitch>
<tpc>20</tpc>
<velocity>55</velocity>
<veloType>user</veloType>
</Note>
</Chord>
</Measure>
</Staff>
</Score>
</museScore>

BIN
mtest/importmidi/simplify_8th_dont.mid Normal file
View file

Binary file not shown.

139
mtest/importmidi/simplify_8th_dont.mscx Normal file
View file

@ -0,0 +1,139 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<page-layout>
<page-height>1683.78</page-height>
<page-width>1190.55</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>56.6929</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>56.6929</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="copyright"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
</PageList>
<Part>
<Staff id="1">
<type>0</type>
</Staff>
<trackName>Grand Piano</trackName>
<Instrument>
<longName pos="0">Grand Piano</longName>
<trackName></trackName>
<Channel>
<program value="0"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<KeySig>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Chord>
<durationType>eighth</durationType>
<Note>
<Tie id="2">
</Tie>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>60</pitch>
<tpc>14</tpc>
<velocity>80</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Note>
<Tie id="3">
</Tie>
<endSpanner id="2"/>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>60</pitch>
<tpc>14</tpc>
<velocity>80</velocity>
<veloType>user</veloType>
</Note>
</Chord>
</Measure>
<Measure number="2">
<Chord>
<durationType>eighth</durationType>
<Note>
<endSpanner id="3"/>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>60</pitch>
<tpc>14</tpc>
<velocity>80</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Rest>
<durationType>eighth</durationType>
</Rest>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Rest>
<durationType>half</durationType>
</Rest>
</Measure>
</Staff>
</Score>
</museScore>

BIN
mtest/importmidi/simplify_8th_dotted_no_staccato.mid Normal file
View file

Binary file not shown.

119
mtest/importmidi/simplify_8th_dotted_no_staccato.mscx Normal file
View file

@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<page-layout>
<page-height>1683.78</page-height>
<page-width>1190.55</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>56.6929</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>56.6929</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="copyright"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
</PageList>
<Part>
<Staff id="1">
<type>0</type>
</Staff>
<trackName>Grand Piano</trackName>
<Instrument>
<longName pos="0">Grand Piano</longName>
<trackName></trackName>
<Channel>
<program value="0"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<KeySig>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Chord>
<durationType>quarter</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>65</pitch>
<tpc>13</tpc>
<velocity>56</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>65</pitch>
<tpc>13</tpc>
<velocity>66</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<durationType>quarter</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>64</pitch>
<tpc>18</tpc>
<velocity>73</velocity>
<veloType>user</veloType>
</Note>
</Chord>
</Measure>
</Staff>
</Score>
</museScore>

BIN
mtest/importmidi/simplify_triplet_staccato.mid Normal file
View file

Binary file not shown.

236
mtest/importmidi/simplify_triplet_staccato.mscx Normal file
View file

@ -0,0 +1,236 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="1.24">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<page-layout>
<page-height>1683.78</page-height>
<page-width>1190.55</page-width>
<page-margins type="even">
<left-margin>56.6929</left-margin>
<right-margin>56.6929</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>56.6929</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="copyright"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></metaTag>
<PageList>
</PageList>
<Part>
<Staff id="1">
<type>0</type>
</Staff>
<trackName>Grand Piano</trackName>
<Instrument>
<longName pos="0">Grand Piano</longName>
<trackName></trackName>
<Channel>
<program value="0"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure number="1">
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
</Clef>
<KeySig>
<accidental>0</accidental>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
<showCourtesySig>1</showCourtesySig>
</TimeSig>
<Chord>
<durationType>eighth</durationType>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>63</pitch>
<tpc>11</tpc>
<velocity>66</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>1000</len>
</Event>
</Events>
<pitch>63</pitch>
<tpc>11</tpc>
<velocity>73</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Rest>
<durationType>quarter</durationType>
</Rest>
<Tuplet id="1">
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
</Tuplet>
<Chord>
<Tuplet>1</Tuplet>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>666</len>
</Event>
</Events>
<pitch>59</pitch>
<tpc>19</tpc>
<velocity>73</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<Tuplet>1</Tuplet>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>666</len>
</Event>
</Events>
<pitch>60</pitch>
<tpc>14</tpc>
<velocity>83</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<Tuplet>1</Tuplet>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>666</len>
</Event>
</Events>
<pitch>63</pitch>
<tpc>11</tpc>
<velocity>103</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Tuplet id="2">
<normalNotes>2</normalNotes>
<actualNotes>3</actualNotes>
<baseNote>eighth</baseNote>
</Tuplet>
<Chord>
<Tuplet>2</Tuplet>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>666</len>
</Event>
</Events>
<pitch>66</pitch>
<tpc>20</tpc>
<velocity>124</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<Tuplet>2</Tuplet>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>666</len>
</Event>
</Events>
<pitch>65</pitch>
<tpc>13</tpc>
<velocity>72</velocity>
<veloType>user</veloType>
</Note>
</Chord>
<Chord>
<Tuplet>2</Tuplet>
<durationType>eighth</durationType>
<Articulation>
<subtype>staccato</subtype>
</Articulation>
<Note>
<Events>
<Event>
<pitch>0</pitch>
<ontime>0</ontime>
<len>666</len>
</Event>
</Events>
<pitch>63</pitch>
<tpc>11</tpc>
<velocity>103</velocity>
<veloType>user</veloType>
</Note>
</Chord>
</Measure>
</Staff>
</Score>
</museScore>

8
mtest/importmidi/tst_importmidi.cpp
View file

@ -240,6 +240,14 @@ class TestImportMidi : public QObject, public MTest
void clefTied() { noSimplification("clef_tied"); }
void clefMelody() { noSimplification("clef_melody"); }
void clefPrev() { noSimplification("clef_prev"); }
// notation simplification
void simplify16thStaccato() { mf("simplify_16th_staccato"); }
void simplify8thDont() { mf("simplify_8th_dont"); }
void simplify32ndStaccato() { mf("simplify_32nd_staccato"); }
void simplify8thDottedNoStaccato() { mf("simplify_8th_dotted_no_staccato"); }
void simplify4thDottedTied() { mf("simplify_4th_dotted_tied"); }
void simplifyTripletStaccato() { mf("simplify_triplet_staccato"); }
};
//---------------------------------------------------------