Added test for filtering of voices
This commit is contained in:
Bartlomiej Lewandowski
parent
6d00168649
commit
f19309d1b7
7 changed files with 606 additions and 0 deletions
|
|
@ -0,0 +1,63 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<StaffList version="1.24" tick="0" len="1920" staff="0" staves="1">
|
||||
<Staff id="0">
|
||||
<voice id="0">0</voice>
|
||||
<voice id="1">0</voice>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>72</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>76</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Staff>
|
||||
</StaffList>
|
||||
25
mtest/libmscore/selectionfilter/selectionfilter17-ref.xml
Normal file
25
mtest/libmscore/selectionfilter/selectionfilter17-ref.xml
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<StaffList version="1.24" tick="0" len="1920" staff="0" staves="1">
|
||||
<Staff id="0">
|
||||
<voice id="1">0</voice>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Staff>
|
||||
</StaffList>
|
||||
205
mtest/libmscore/selectionfilter/selectionfilter17.mscx
Normal file
205
mtest/libmscore/selectionfilter/selectionfilter17.mscx
Normal file
|
|
@ -0,0 +1,205 @@
|
|||
<?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="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">selection-filter-fingering</metaTag>
|
||||
<PageList>
|
||||
<Page>
|
||||
<System>
|
||||
</System>
|
||||
<System>
|
||||
</System>
|
||||
</Page>
|
||||
</PageList>
|
||||
<Part>
|
||||
<Staff id="1">
|
||||
<StaffType group="pitched">
|
||||
<name>Standard</name>
|
||||
</StaffType>
|
||||
<bracket type="-1" span="0"/>
|
||||
</Staff>
|
||||
<trackName>Violin</trackName>
|
||||
<Instrument>
|
||||
<longName pos="0">Violin</longName>
|
||||
<shortName pos="0">Vln.</shortName>
|
||||
<trackName>Violin</trackName>
|
||||
<minPitchP>55</minPitchP>
|
||||
<maxPitchP>103</maxPitchP>
|
||||
<minPitchA>55</minPitchA>
|
||||
<maxPitchA>88</maxPitchA>
|
||||
<StringData>
|
||||
<frets>24</frets>
|
||||
<string>55</string>
|
||||
<string>62</string>
|
||||
<string>69</string>
|
||||
<string>76</string>
|
||||
</StringData>
|
||||
<Articulation>
|
||||
<velocity>100</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="staccato">
|
||||
<velocity>100</velocity>
|
||||
<gateTime>50</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="tenuto">
|
||||
<velocity>100</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="sforzato">
|
||||
<velocity>120</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Channel>
|
||||
<program value="40"/>
|
||||
</Channel>
|
||||
<Channel name="pizzicato">
|
||||
<program value="45"/>
|
||||
</Channel>
|
||||
<Channel name="tremolo">
|
||||
<program value="44"/>
|
||||
</Channel>
|
||||
</Instrument>
|
||||
</Part>
|
||||
<Staff id="1">
|
||||
<VBox>
|
||||
<height>10</height>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<text>selection-filter-voice1
|
||||
</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
<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>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>72</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>76</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<BarLine>
|
||||
<subtype>normal</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="2">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration z="4" n="4"/>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>normal</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
<Measure number="3">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration z="4" n="4"/>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>normal</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
<Measure number="4">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration z="4" n="4"/>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>end</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
</Staff>
|
||||
</Score>
|
||||
</museScore>
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<StaffList version="1.24" tick="0" len="1920" staff="0" staves="1">
|
||||
<Staff id="0">
|
||||
<voice id="0">0</voice>
|
||||
<voice id="1">0</voice>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>72</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>76</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Staff>
|
||||
</StaffList>
|
||||
43
mtest/libmscore/selectionfilter/selectionfilter18-ref.xml
Normal file
43
mtest/libmscore/selectionfilter/selectionfilter18-ref.xml
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<StaffList version="1.24" tick="0" len="1920" staff="0" staves="1">
|
||||
<Staff id="0">
|
||||
<voice id="0">0</voice>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>72</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>76</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>0</track>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<track>0</track>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Staff>
|
||||
</StaffList>
|
||||
205
mtest/libmscore/selectionfilter/selectionfilter18.mscx
Normal file
205
mtest/libmscore/selectionfilter/selectionfilter18.mscx
Normal file
|
|
@ -0,0 +1,205 @@
|
|||
<?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="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">selection-filter-fingering</metaTag>
|
||||
<PageList>
|
||||
<Page>
|
||||
<System>
|
||||
</System>
|
||||
<System>
|
||||
</System>
|
||||
</Page>
|
||||
</PageList>
|
||||
<Part>
|
||||
<Staff id="1">
|
||||
<StaffType group="pitched">
|
||||
<name>Standard</name>
|
||||
</StaffType>
|
||||
<bracket type="-1" span="0"/>
|
||||
</Staff>
|
||||
<trackName>Violin</trackName>
|
||||
<Instrument>
|
||||
<longName pos="0">Violin</longName>
|
||||
<shortName pos="0">Vln.</shortName>
|
||||
<trackName>Violin</trackName>
|
||||
<minPitchP>55</minPitchP>
|
||||
<maxPitchP>103</maxPitchP>
|
||||
<minPitchA>55</minPitchA>
|
||||
<maxPitchA>88</maxPitchA>
|
||||
<StringData>
|
||||
<frets>24</frets>
|
||||
<string>55</string>
|
||||
<string>62</string>
|
||||
<string>69</string>
|
||||
<string>76</string>
|
||||
</StringData>
|
||||
<Articulation>
|
||||
<velocity>100</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="staccato">
|
||||
<velocity>100</velocity>
|
||||
<gateTime>50</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="tenuto">
|
||||
<velocity>100</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Articulation name="sforzato">
|
||||
<velocity>120</velocity>
|
||||
<gateTime>100</gateTime>
|
||||
</Articulation>
|
||||
<Channel>
|
||||
<program value="40"/>
|
||||
</Channel>
|
||||
<Channel name="pizzicato">
|
||||
<program value="45"/>
|
||||
</Channel>
|
||||
<Channel name="tremolo">
|
||||
<program value="44"/>
|
||||
</Channel>
|
||||
</Instrument>
|
||||
</Part>
|
||||
<Staff id="1">
|
||||
<VBox>
|
||||
<height>10</height>
|
||||
<Text>
|
||||
<style>Title</style>
|
||||
<text>selection-filter-voice2
|
||||
</text>
|
||||
</Text>
|
||||
</VBox>
|
||||
<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>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>72</pitch>
|
||||
<tpc>14</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>76</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<durationType>quarter</durationType>
|
||||
<Note>
|
||||
<pitch>74</pitch>
|
||||
<tpc>16</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<BarLine>
|
||||
<subtype>normal</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
<tick>0</tick>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
<Chord>
|
||||
<track>1</track>
|
||||
<durationType>half</durationType>
|
||||
<Note>
|
||||
<track>1</track>
|
||||
<pitch>64</pitch>
|
||||
<tpc>18</tpc>
|
||||
</Note>
|
||||
</Chord>
|
||||
</Measure>
|
||||
<Measure number="2">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration z="4" n="4"/>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>normal</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
<Measure number="3">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration z="4" n="4"/>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>normal</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
<Measure number="4">
|
||||
<Rest>
|
||||
<durationType>measure</durationType>
|
||||
<duration z="4" n="4"/>
|
||||
</Rest>
|
||||
<BarLine>
|
||||
<subtype>end</subtype>
|
||||
<span>1</span>
|
||||
</BarLine>
|
||||
</Measure>
|
||||
</Staff>
|
||||
</Score>
|
||||
</museScore>
|
||||
|
|
@ -48,6 +48,8 @@ class TestSelectionFilter : public QObject, public MTest
|
|||
void filterOtherText() { testFilter(14,SelectionFilterType::OTHER_TEXT); }
|
||||
void filterOtherLine() { testFilterSpanner(15,SelectionFilterType::OTHER_LINE); }
|
||||
void filterTremolo() { testFilter(16,SelectionFilterType::TREMOLO); }
|
||||
void filterVoice1() { testFilter(17,SelectionFilterType::FIRST_VOICE); }
|
||||
void filterVoice2() { testFilter(18,SelectionFilterType::SECOND_VOICE); }
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue