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

fix #109811: disable debug code; fix mtest copypastesymbollist

Browse source
This commit is contained in:
ws 2016-05-04 09:54:52 +02:00
parent 32c3100f80
commit e69616a654
20 changed files with 6 additions and 337 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/shape.h
View file

@ -15,7 +15,9 @@
namespace Ms {
#define DEBUG_SHAPES
#ifndef NDEBUG
// #define DEBUG_SHAPES // enable shape debugging
#endif
class Segment;

6
mtest/CMakeLists.txt
View file

@ -167,7 +167,7 @@ subdirs (
libmscore/clef_courtesy
libmscore/concertpitch
libmscore/copypaste
# libmscore/copypastesymbollist # FAIL
libmscore/copypastesymbollist # FAIL
libmscore/dynamic
# libmscore/earlymusic # FAIL
libmscore/element
@ -186,8 +186,8 @@ subdirs (
libmscore/selectionfilter
libmscore/selectionrangedelete
# libmscore/spanners # FAIL
libmscore/split # FAIL
libmscore/splitstaff # FAIL
libmscore/split
libmscore/splitstaff
libmscore/timesig
libmscore/tools # some tests disabled
libmscore/transpose

4
mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-ref.mscx
View file

@ -436,10 +436,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

4
mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest-ref.mscx
View file

@ -222,10 +222,6 @@
<Rest>
<durationType>half</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

24
mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation-rest.mscx
View file

@ -157,40 +157,24 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</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>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -217,10 +201,6 @@
<Rest>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="6">
<Chord>
@ -236,10 +216,6 @@
<Rest>
<durationType>half</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

32
mtest/libmscore/copypastesymbollist/copypastesymbollist-articulation.mscx
View file

@ -123,10 +123,6 @@
<tpc>18</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="2">
<Chord>
@ -159,10 +155,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="3">
<Chord>
@ -245,10 +237,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="4">
<Chord>
@ -261,10 +249,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -295,10 +279,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="6">
<Chord>
@ -357,10 +337,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="7">
<Chord>
@ -377,10 +353,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="8">
<Chord>
@ -390,10 +362,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

5
mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01-ref.mscx
View file

@ -208,11 +208,6 @@
<root>13</root>
<name>7</name>
</Harmony>
<tick>15360</tick>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

32
mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01.mscx
View file

@ -100,10 +100,6 @@
<name>7</name>
</Harmony>
<tick>1920</tick>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="2">
<Harmony>
@ -120,10 +116,6 @@
<name>7</name>
</Harmony>
<tick>3840</tick>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="3">
<Harmony>
@ -140,10 +132,6 @@
<name>7</name>
</Harmony>
<tick>5760</tick>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="4">
<Harmony>
@ -160,50 +148,30 @@
<name>7</name>
</Harmony>
<tick>7680</tick>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="6">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="7">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="8">
<Rest>
<durationType>measure</durationType>
<duration z="4" n="4"/>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

4
mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-ref.mscx
View file

@ -370,10 +370,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

32
mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames.mscx
View file

@ -117,10 +117,6 @@
<tpc>18</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="2">
<Harmony>
@ -147,10 +143,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="3">
<Harmony>
@ -227,10 +219,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="4">
<Harmony>
@ -243,10 +231,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -277,10 +261,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="6">
<Beam id="3">
@ -351,10 +331,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="7">
<Chord>
@ -364,10 +340,6 @@
<tpc>18</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="8">
<Chord>
@ -377,10 +349,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

4
mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest-ref.mscx
View file

@ -225,10 +225,6 @@
<Rest>
<durationType>half</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

24
mtest/libmscore/copypastesymbollist/copypastesymbollist-fermata-rest.mscx
View file

@ -157,40 +157,24 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</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>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -217,10 +201,6 @@
<Rest>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="6">
<Chord>
@ -236,10 +216,6 @@
<Rest>
<durationType>half</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

4
mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass-ref.mscx
View file

@ -481,10 +481,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

32
mtest/libmscore/copypastesymbollist/copypastesymbollist-figuredbass.mscx
View file

@ -137,10 +137,6 @@
<tpc>18</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="2">
<FiguredBass>
@ -189,10 +185,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="3">
<FiguredBass>
@ -271,10 +263,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="4">
<Chord>
@ -284,10 +272,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -318,10 +302,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="6">
<Chord>
@ -380,10 +360,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="7">
<Chord>
@ -400,10 +376,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="8">
<Chord>
@ -413,10 +385,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

4
mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics-ref.mscx
View file

@ -432,10 +432,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

32
mtest/libmscore/copypastesymbollist/copypastesymbollist-lyrics.mscx
View file

@ -130,10 +130,6 @@
<tpc>18</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="2">
<Chord>
@ -166,10 +162,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="3">
<Chord>
@ -253,10 +245,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="4">
<Chord>
@ -271,10 +259,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -305,10 +289,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="6">
<Chord>
@ -367,10 +347,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="7">
<Chord>
@ -387,10 +363,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="8">
<Chord>
@ -400,10 +372,6 @@
<tpc>14</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

8
mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01-ref.mscx
View file

@ -264,10 +264,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Staff id="2">
@ -381,10 +377,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

40
mtest/libmscore/copypastesymbollist/copypastesymbollist-range-01.mscx
View file

@ -207,40 +207,24 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</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>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -271,10 +255,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Staff id="2">
@ -331,40 +311,24 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</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>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -395,10 +359,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

8
mtest/libmscore/copypastesymbollist/copypastesymbollist-range-ref.mscx
View file

@ -264,10 +264,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Staff id="2">
@ -369,10 +365,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>

40
mtest/libmscore/copypastesymbollist/copypastesymbollist-range.mscx
View file

@ -207,40 +207,24 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</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>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -271,10 +255,6 @@
<tpc>16</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
<Staff id="2">
@ -331,40 +311,24 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>normal</subtype>
<span>1</span>
</BarLine>
</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>normal</subtype>
<span>1</span>
</BarLine>
</Measure>
<Measure number="5">
<Chord>
@ -395,10 +359,6 @@
<tpc>13</tpc>
</Note>
</Chord>
<BarLine>
<subtype>end</subtype>
<span>1</span>
</BarLine>
</Measure>
</Staff>
</Score>