Fix #214996 - Display measure number range for multimeasure rests #3179
Conversation
|
Same remarks than for the other PR:
|
emeraldimp
changed the title
libmscore/read114.cpp
Outdated
| @@ -119,6 +119,7 @@ static const StyleVal2 style114[] = { | |||
| { StyleIdx::pageNumberOddEven, QVariant(true) }, | |||
| { StyleIdx::showMeasureNumber, QVariant(true) }, | |||
| { StyleIdx::showMeasureNumberOne, QVariant(false) }, | |||
| { StyleIdx::showMeasureNumberRange, QVariant(false) }, | |||
There was a problem hiding this comment.
Is this needed? 1.x files would never have this set.
libmscore/read206.cpp
Outdated
| @@ -149,6 +149,7 @@ struct StyleVal2 { | |||
| { StyleIdx::pageNumberOddEven, QVariant(true) }, | |||
| { StyleIdx::showMeasureNumber, QVariant(true) }, | |||
| { StyleIdx::showMeasureNumberOne, QVariant(false) }, | |||
| { StyleIdx::showMeasureNumberRange, QVariant(false) }, | |||
There was a problem hiding this comment.
Is this needed? 2.x files most probably would not have this set, unless it can get added in a backward compatible way, i.e. in a way that 2.0, 2.0.1 etc. can read without any negative effect
libmscore/measure.cpp
Outdated
| if (smn) | ||
| if (smn && _mmRestCount && score()->styleB(StyleIdx::createMultiMeasureRests) && score()->styleB(StyleIdx::showMeasureNumberRange)) { | ||
| s = QString("%1 - %2").arg(no() + 1).arg(no() + _mmRestCount); | ||
| } else if (smn) { |
There was a problem hiding this comment.
I'd rather have an if (smn) { if (_mmRestCount && score()->styleB(StyleIdx::createMultiMeasureRests) && score()->styleB(StyleIdx::showMeasureNumberRange)) s = QString("%1 - %2").arg(no() + 1).arg(no() + _mmRestCount); else s = QString("%1").arg(no() + 1); }
mscore/editstyle.cpp
Outdated
| @@ -799,6 +800,9 @@ void EditStyle::setValues() | |||
| radioKeySigNatNone->setChecked (lstyle.value(StyleIdx::keySigNaturals).toInt() == int(KeySigNatural::NONE)); | |||
| radioKeySigNatBefore->setChecked(lstyle.value(StyleIdx::keySigNaturals).toInt() == int(KeySigNatural::BEFORE)); | |||
| radioKeySigNatAfter->setChecked (lstyle.value(StyleIdx::keySigNaturals).toInt() == int(KeySigNatural::AFTER)); | |||
|
|
|||
| showMeasureNumberRange->setChecked(lstyle.value(StyleIdx::showMeasureNumberRange).toBool()); | |||
|
|
|||
There was a problem hiding this comment.
Why that extra empty line?
mscore/editstyle.ui
Outdated
| <item row="2" column="0"> | ||
| <widget class="QCheckBox" name="showMeasureNumberRange"> | ||
| <property name="text"> | ||
| <string>Display Measure Number Range</string> |
There was a problem hiding this comment.
Sentence case here I think, Display measure number range
|
@emeraldimp hi! Are you still around? |
|
@anatoly-os Sure am! |
|
This PR needs a rebase. |
|
Quite a few mtests fail on Travis-CI, apparently with crashes, at least some of which due to failed assertions: |
|
Yes, I'm aware. I will let you know when it's ready. |
|
It's clear I'm not going to finish this. I wrote this over a year ago, and it took that long to get any traction. It's destined for a version that will release... who knows when, but probably in a couple more years. It's not interesting, rewarding or fun to work on. If anyone else is interested in this functionality, they're welcome to it; otherwise feel free to close. |
| @@ -154,7 +154,6 @@ struct StyleVal2 { | |||
| { Sid::pageNumberOddEven, QVariant(true) }, | |||
| { Sid::showMeasureNumber, QVariant(true) }, | |||
| { Sid::showMeasureNumberOne, QVariant(false) }, | |||
| { Sid::measureNumberInterval, QVariant(5) }, | |||
There was a problem hiding this comment.
I have the feeling this removal is causing the crashes in mtest
|
The request is not approved by feature request and related discussion. Taking into account the fact that Behind Bars doesn't have specific info about measure rests, I'm closing the PR. |
This pull request is to allow users to configure the display of measure number ranges for multimeasure rests. It is meant to be fairly flexible; if the multimeasure rest doesn't encompass (start on or extend over) a measure at the desired interval, then it will not show, but otherwise it will (if the setting is enabled).
I debated where to add the setting, whether to put it with the multimeasure rest settings in Score, or with the measure number settings in Header, Footer, Numbers. I eventually put it in Score.
Note that it does NOT handle the case where the measure numbers are altered within the MMR. I suspect it would be better to break the MMR in that case and print a new measure number.
Updated from #3175 to be based on master and follow spacing convention