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

fix segment type in debugger; fix start repeat barline

Browse source
This commit is contained in:
ws 2014-01-07 11:42:17 +01:00
parent 30e0623efe
commit fa70cab643
3 changed files with 36 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libmscore/measure.cpp
View file

@ -1806,9 +1806,15 @@ void Measure::read(XmlReader& e, int staffIdx)
barLine->setTrack(e.track());
barLine->read(e);
Segment::SegmentType st;
//
// SegStartRepeatBarLine: always at the beginning tick of a measure
// SegBarLine: in the middle of a measure, has no semantic
// SegEndBarLine: at the end tick of a measure
if ((e.tick() != tick()) && (e.tick() != (tick() + ticks())))
st = Segment::SegBarLine; // this is a mid measure bar line
else if (barLine->barLineType() == START_REPEAT)
st = Segment::SegBarLine;
else if (barLine->barLineType() == START_REPEAT && e.tick() == tick())
st = Segment::SegStartRepeatBarLine;
else {
setEndBarLineType(barLine->barLineType(), false, true);

4
mscore/debugger/debugger.cpp
View file

@ -785,8 +785,6 @@ SegmentView::SegmentView()
Segment::SegBarLine, Segment::SegChordRest, Segment::SegBreath, Segment::SegEndBarLine,
Segment::SegTimeSigAnnounce, Segment::SegKeySigAnnounce
};
for (Segment::SegmentType t : segmentTypes)
sb.segmentType->addItem(Segment::subTypeName(t), int(t));
connect(sb.lyrics, SIGNAL(itemClicked(QListWidgetItem*)), SLOT(gotoElement(QListWidgetItem*)));
connect(sb.spannerFor, SIGNAL(itemClicked(QListWidgetItem*)), SLOT(gotoElement(QListWidgetItem*)));
connect(sb.spannerBack, SIGNAL(itemClicked(QListWidgetItem*)), SLOT(gotoElement(QListWidgetItem*)));
@ -819,7 +817,7 @@ void SegmentView::setElement(Element* e)
sb.ticks->setValue(ticks);
sb.tick->setValue(s->tick());
sb.rtick->setValue(s->rtick());
sb.segmentType->setCurrentIndex(idx);
sb.segmentType->setText(s->subTypeName());
sb.lyrics->clear();
// Score* cs = e->score();

85
mscore/debugger/segment.ui
View file

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>564</width>
<width>800</width>
<height>347</height>
</rect>
</property>
@ -17,7 +17,16 @@
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>8</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>8</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
<item>
@ -199,62 +208,6 @@
</property>
</widget>
</item>
<item row="0" column="3" colspan="2">
<widget class="QComboBox" name="segmentType">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string notr="true"/>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text">
<string notr="true">Clef Segment</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Key Signature</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Time Signature</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Begin Repeat</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Chord/Rest</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Breath Segment</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">End Bar Line</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Time Signature Announce</string>
</property>
</item>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_10">
<property name="toolTip">
@ -291,6 +244,22 @@
</property>
</widget>
</item>
<item row="0" column="3" colspan="2">
<widget class="QLabel" name="segmentType">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>