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

small fixes for save/restore barlines

Browse source
This commit is contained in:
Werner Schweer 2016-12-28 17:20:02 +01:00
parent c411e79809
commit 22454df70e
5 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libmscore/barline.cpp
View file

@ -349,6 +349,11 @@ void BarLine::draw(QPainter* painter) const
painter->setPen(pen);
switch (barLineType()) {
case BarLineType::UNKNOWN:
case BarLineType::NORMAL:
painter->drawLine(QLineF(lw, y1, lw, y2));
break;
case BarLineType::BROKEN:
pen.setStyle(Qt::DashLine);
painter->setPen(pen);
@ -359,10 +364,6 @@ void BarLine::draw(QPainter* painter) const
pen.setStyle(Qt::DotLine);
painter->setPen(pen);
case BarLineType::NORMAL:
painter->drawLine(QLineF(lw, y1, lw, y2));
break;
case BarLineType::END:
{
qreal lw2 = score()->styleP(StyleIdx::endBarWidth) * _mag;
@ -511,7 +512,7 @@ void BarLine::write(XmlWriter& xml) const
void BarLine::read(XmlReader& e)
{
resetProperty(P_ID::BARLINE_TYPE);
// resetProperty(P_ID::BARLINE_TYPE);
resetProperty(P_ID::BARLINE_SPAN);
resetProperty(P_ID::BARLINE_SPAN_FROM);
resetProperty(P_ID::BARLINE_SPAN_TO);
@ -965,9 +966,7 @@ qreal BarLine::layoutWidth(Score* score, BarLineType type, qreal mag)
case BarLineType::BROKEN:
case BarLineType::NORMAL:
case BarLineType::DOTTED:
break;
default:
qDebug("illegal barline type %d", int(type));
case BarLineType::UNKNOWN:
break;
}
return dw;

2
libmscore/barline.h
View file

@ -62,7 +62,7 @@ class BarLine : public Element {
char _spanStaff { false }; // span barline to next staff if true
char _spanFrom { 0 }; // line number on start and end staves
char _spanTo { 0 };
BarLineType _barLineType { BarLineType::NORMAL };
BarLineType _barLineType { BarLineType::UNKNOWN };
mutable qreal y1;
mutable qreal y2;
ElementList _el; ///< fermata or other articulations

4
libmscore/measure.cpp
View file

@ -1861,7 +1861,6 @@ void Measure::read(XmlReader& e, int staffIdx)
else if (tag == "BarLine") {
BarLine* barLine = new BarLine(score());
barLine->setTrack(e.track());
barLine->read(e);
//
// StartRepeatBarLine: at rtick == 0, always BarLineType::START_REPEAT
@ -1889,6 +1888,7 @@ void Measure::read(XmlReader& e, int staffIdx)
segment = getSegmentR(st, t);
segment->add(barLine);
}
barLine->read(e);
barLine->layout();
}
else if (tag == "Chord") {
@ -3341,7 +3341,7 @@ qreal Measure::createEndBarLines(bool isLastMeasureInSystem)
// and its not a repeat start/end barline (forced)
if (bl->barLineType() != t) {
if (bl->generated())
if (bl->generated() || bl->barLineType() == BarLineType::UNKNOWN)
bl->setBarLineType(t);
else {
if (force) {

1
libmscore/mscore.h
View file

@ -371,6 +371,7 @@ MS_QML_ENUM(TextStyleType, signed char,\
//---------------------------------------------------------
MS_QML_ENUM(BarLineType, int,\
UNKNOWN = 0,
NORMAL = 1,\
DOUBLE = 2,\
START_REPEAT = 4,\

18
mscore/inspector/inspector_barline.ui
View file

@ -162,16 +162,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="span">
<property name="accessibleName">
<string>Span</string>
</property>
<property name="minimum">
<number>1</number>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="resetSpan">
<property name="toolTip">
@ -289,6 +279,13 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="span">
<property name="text">
<string>Span to next staff</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -297,7 +294,6 @@
<tabstops>
<tabstop>type</tabstop>
<tabstop>resetType</tabstop>
<tabstop>span</tabstop>
<tabstop>resetSpan</tabstop>
<tabstop>spanFrom</tabstop>
<tabstop>resetSpanFrom</tabstop>