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

fixed testLines1 and testLines2

Browse source
This commit is contained in:
Leon Vinken 2012-09-01 15:29:12 +02:00
parent 58456bf9e1
commit 1a84d50423
4 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
mscore/importxml.cpp
View file

@ -2552,35 +2552,15 @@ static void setSLinePlacement(SLine* sli, float s, const QString pl, bool hasYof
float offs = 0.0;
if (hasYoff) offs = yoff;
else {
// MuseScore 1.x compatible offsets
if (pl == "above")
offs = 0;
offs = -5;
else if (pl == "below")
offs = 10;
offs = 9;
else
qDebug("setSLinePlacement invalid placement '%s'", qPrintable(pl));
}
// there is no line segment without calling layout();
// layout() only works after SLine is inserted in the score.
// LineSegment* ls = (LineSegment*)sli->spannerSegments().front();
// ls->setUserOff(QPointF(0, offs * s));
// alternative:
// sli->setUserOff(QPointF(0, offs * s));
// alternative:
/*
// TODO is this necessary ?
foreach(SpannerSegment* seg, sli->spannerSegments())
delete seg;
sli->spannerSegments().clear();
// end TODO is this necessary ?
*/
LineSegment* ls = sli->createLineSegment();
// ls->setUserOff(QPointF());
ls->setReadPos(QPointF(0, offs * s));
sli->add(ls);
sli->setYoff(offs);
qDebug(" -> offs*s=%g", offs * s);
}
@ -3032,16 +3012,9 @@ void MusicXml::direction(Measure* measure, int staff, QDomElement e)
pedal = new Pedal(score);
pedal->setTrack((staff + rstaff) * VOICES);
if (placement == "") placement = "below";
/* original:
setSLinePlacement(pedal,
score->spatium(), placement,
hasYoffset, yoffset);
*/
// TODO LVIFIX: following is a hack, as it overrules the MusicXML offset:
// but for the time being it places pedal marks at a reasonable location
setSLinePlacement(pedal,
score->spatium(), placement,
true, 0);
spanners[pedal] = QPair<int, int>(tick, -1);
qDebug("wedge pedal=%p inserted at first tick %d", pedal, tick);
}

BIN
test/musicxml/testLines1.pdf
View file

Binary file not shown.

BIN
test/musicxml/testLines2.pdf
View file

Binary file not shown.

4
test/musicxml/testLines2_ref.xml
View file

@ -216,7 +216,7 @@
<type>quarter</type>
<stem>down</stem>
</note>
<direction placement="above">
<direction placement="below">
<direction-type>
<bracket type="start" number="1" line-end="none" line-type="solid"/>
</direction-type>
@ -241,7 +241,7 @@
<type>quarter</type>
<stem>down</stem>
</note>
<direction placement="above">
<direction placement="below">
<direction-type>
<bracket type="stop" number="1" line-end="none"/>
</direction-type>