Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MU4] Move ScoreAccessibility::barbeat(Element) to Element::barbeat() #5096

Closed
wants to merge 1 commit into from
Closed

[MU4] Move ScoreAccessibility::barbeat(Element) to Element::barbeat() #5096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions libmscore/element.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2430,4 +2430,53 @@ void Element::autoplaceMeasureElement(bool add)
setOffsetChanged(false);
}

//---------------------------------------------------------
// barbeat
//---------------------------------------------------------

std::pair<int, float> Element::barbeat() const
{
int bar = 0;
int beat = 0;
int ticks = 0;
TimeSigMap* tsm = this->score()->sigmap();
const Element* p = this;
int ticksB = ticks_beat(tsm->timesig(0).timesig().denominator());
while(p && p->type() != ElementType::SEGMENT && p->type() != ElementType::MEASURE)
p = p->parent();

if (!p) {
return std::pair<int, float>(0, 0.0F);
}
else if (p->type() == ElementType::SEGMENT) {
const Segment* seg = static_cast<const Segment*>(p);
tsm->tickValues(seg->tick().ticks(), &bar, &beat, &ticks);
ticksB = ticks_beat(tsm->timesig(seg->tick().ticks()).timesig().denominator());
}
else if (p->type() == ElementType::MEASURE) {
const Measure* m = static_cast<const Measure*>(p);
bar = m->no();
beat = -1;
ticks = 0;
}
return std::pair<int,float>(bar + 1, beat + 1 + ticks / static_cast<float>(ticksB));
}

//---------------------------------------------------------
// accessibleBarbeat
//---------------------------------------------------------

QString Element::accessibleBarbeat() const
{
QString barsAndBeats = "";
std::pair<int, float>bar_beat = barbeat();
if (bar_beat.first) {
barsAndBeats += "; " + QObject::tr("Measure: %1").arg(QString::number(bar_beat.first));
if (bar_beat.second)
barsAndBeats += "; " + QObject::tr("Beat: %1").arg(QString::number(bar_beat.second));
}
if (staffIdx() + 1)
barsAndBeats += "; " + QObject::tr("Staff: %1").arg(QString::number(staffIdx() + 1));
return barsAndBeats;
}
}
2 changes: 2 additions & 0 deletions libmscore/element.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ class Element : public ScoreElement {
virtual bool isElement() const override { return true; }

qreal spatium() const;
std::pair<int, float>barbeat() const;
QString accessibleBarbeat() const;

inline void setFlag(ElementFlag f, bool v) { if (v) _flags |= f; else _flags &= ~ElementFlags(f); }
inline void setFlag(ElementFlag f, bool v) const { if (v) _flags |= f; else _flags &= ~ElementFlags(f); }
Expand Down
48 changes: 8 additions & 40 deletions mscore/scoreaccessibility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ void ScoreAccessibility::currentInfoChanged()
QString barsAndBeats = "";
if (el->isSpanner()){
Spanner* s = static_cast<Spanner*>(el);
std::pair<int, float> bar_beat = barbeat(s->startSegment());
barsAndBeats += tr("Start Measure: %1; Start Beat: %2").arg(QString::number(bar_beat.first)).arg(QString::number(bar_beat.second));
std::pair<int, float> bar_beat = s->startSegment()->barbeat();
barsAndBeats += " " + tr("Start Measure: %1; Start Beat: %2").arg(QString::number(bar_beat.first)).arg(QString::number(bar_beat.second));
Segment* seg = s->endSegment();
if(!seg)
seg = score->lastSegment()->prev1MM(SegmentType::ChordRest);
Expand All @@ -135,11 +135,11 @@ void ScoreAccessibility::currentInfoChanged()
s->type() != ElementType::TIE )
seg = seg->prev1MM(SegmentType::ChordRest);

bar_beat = barbeat(seg);
bar_beat = seg->barbeat();
barsAndBeats += "; " + tr("End Measure: %1; End Beat: %2").arg(QString::number(bar_beat.first)).arg(QString::number(bar_beat.second));
}
else {
std::pair<int, float>bar_beat = barbeat(el);
std::pair<int, float>bar_beat = el->barbeat();
if (bar_beat.first) {
barsAndBeats += " " + tr("Measure: %1").arg(QString::number(bar_beat.first));
if (bar_beat.second)
Expand All @@ -149,12 +149,12 @@ void ScoreAccessibility::currentInfoChanged()

QString rez = e->accessibleInfo();
if (!barsAndBeats.isEmpty())
rez += "; " + barsAndBeats;
rez += ";" + barsAndBeats;

QString staff = "";
if (e->staffIdx() + 1) {
staff = tr("Staff %1").arg(QString::number(e->staffIdx() + 1));
rez = QString("%1; %2").arg(rez).arg(staff);
rez += "; " + tr("Staff: %1").arg(QString::number(e->staffIdx() + 1));
}

statusBarLabel->setText(rez);
Expand All @@ -165,7 +165,7 @@ void ScoreAccessibility::currentInfoChanged()
QString barsAndBeats = "";
std::pair<int, float> bar_beat;

bar_beat = barbeat(score->selection().startSegment());
bar_beat = score->selection().startSegment()->barbeat();
barsAndBeats += " " + tr("Start Measure: %1; Start Beat: %2").arg(QString::number(bar_beat.first)).arg(QString::number(bar_beat.second));
Segment* endSegment = score->selection().endSegment();

Expand All @@ -174,7 +174,7 @@ void ScoreAccessibility::currentInfoChanged()
else
endSegment = endSegment->prev1MM();

bar_beat = barbeat(endSegment);
bar_beat = endSegment->barbeat();
barsAndBeats += " " + tr("End Measure: %1; End Beat: %2").arg(QString::number(bar_beat.first)).arg(QString::number(bar_beat.second));
statusBarLabel->setText(tr("Range Selection") + barsAndBeats);
score->setAccessibleInfo(tr("Range Selection") + barsAndBeats);
Expand Down Expand Up @@ -217,36 +217,4 @@ void ScoreAccessibility::updateAccessibilityInfo()
QAccessibleValueChangeEvent ev(obj, w->score()->accessibleInfo());
QAccessible::updateAccessibility(&ev);
}

std::pair<int, float> ScoreAccessibility::barbeat(Element *e)
{
if (!e) {
return std::pair<int, float>(0, 0.0F);
}

int bar = 0;
int beat = 0;
int ticks = 0;
TimeSigMap* tsm = e->score()->sigmap();
Element* p = e;
int ticksB = ticks_beat(tsm->timesig(0).timesig().denominator());
while(p && p->type() != ElementType::SEGMENT && p->type() != ElementType::MEASURE)
p = p->parent();

if (!p) {
return std::pair<int, float>(0, 0.0F);
}
else if (p->type() == ElementType::SEGMENT) {
Segment* seg = static_cast<Segment*>(p);
tsm->tickValues(seg->tick().ticks(), &bar, &beat, &ticks);
ticksB = ticks_beat(tsm->timesig(seg->tick().ticks()).timesig().denominator());
}
else if (p->type() == ElementType::MEASURE) {
Measure* m = static_cast<Measure*>(p);
bar = m->no();
beat = -1;
ticks = 0;
}
return pair<int,float>(bar + 1, beat + 1 + ticks / static_cast<float>(ticksB));
}
}
1 change: 0 additions & 1 deletion mscore/scoreaccessibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class ScoreAccessibility : public QObject {
QMainWindow* mainWindow;
QLabel* statusBarLabel;
ScoreAccessibility(QMainWindow* statusBar);
std::pair<int, float>barbeat(Element* e);

public:
~ScoreAccessibility();
Expand Down