MuseScore/libmscore/barline.cpp

1518 lines
62 KiB
C++
Raw Normal View History

2012-05-26 14:26:10 +02:00
//=============================================================================
// MuseScore
// Music Composition & Notation
//
// Copyright (C) 2002-2011 Werner Schweer
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2
// as published by the Free Software Foundation and appearing in
// the file LICENCE.GPL
//=============================================================================
#include "barline.h"
#include "score.h"
#include "sym.h"
#include "staff.h"
#include "system.h"
#include "measure.h"
#include "segment.h"
#include "articulation.h"
#include "stafftype.h"
2014-04-09 16:09:21 +02:00
#include "xml.h"
#include "marker.h"
2012-05-26 14:26:10 +02:00
2013-05-13 18:49:17 +02:00
namespace Ms {
2012-10-14 00:35:11 +02:00
//---------------------------------------------------------
// static members init
//---------------------------------------------------------
qreal BarLine::yoff1 = 0.0;
qreal BarLine::yoff2 = 0.0;
bool BarLine::ctrlDrag = false;
bool BarLine::shiftDrag = false;
int BarLine::_origSpan, BarLine::_origSpanFrom, BarLine::_origSpanTo;
2012-10-14 00:35:11 +02:00
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
// barLineNames
// must be synchronized with enum BarLineType
//---------------------------------------------------------
static const char* barLineNames[] = {
2015-02-25 11:54:31 +01:00
"normal",
"double",
"start-repeat",
"end-repeat",
"dashed",
"end",
"end-start-repeat",
"dotted"
2012-05-26 14:26:10 +02:00
};
2015-02-25 11:54:31 +01:00
static const BarLineTableItem barLineTable[] {
{ BarLineType::NORMAL, QT_TRANSLATE_NOOP("Palette", "Normal barline") },
{ BarLineType::BROKEN, QT_TRANSLATE_NOOP("Palette", "Dashed barline") },
{ BarLineType::DOTTED, QT_TRANSLATE_NOOP("Palette", "Dotted barline") },
{ BarLineType::END, QT_TRANSLATE_NOOP("Palette", "End bar barline") },
{ BarLineType::DOUBLE, QT_TRANSLATE_NOOP("Palette", "Double barline") },
{ BarLineType::START_REPEAT, QT_TRANSLATE_NOOP("Palette", "Start repeat") },
{ BarLineType::END_REPEAT, QT_TRANSLATE_NOOP("Palette", "End repeat") },
{ BarLineType::END_START_REPEAT, QT_TRANSLATE_NOOP("Palette", "End-start repeat") },
};
//---------------------------------------------------------
// barLineTableSize
//---------------------------------------------------------
unsigned int BarLine::barLineTableSize()
{
return sizeof(barLineTable)/sizeof(*barLineTable);
}
2014-03-24 11:50:26 +01:00
//---------------------------------------------------------
2015-02-25 11:54:31 +01:00
// barLineTableItem
2014-03-24 11:50:26 +01:00
//---------------------------------------------------------
2015-02-25 11:54:31 +01:00
BarLineTableItem BarLine::barLineTableItem(int i)
2014-03-24 11:50:26 +01:00
{
2015-02-25 11:54:31 +01:00
return barLineTable[i];
2014-03-24 11:50:26 +01:00
}
//---------------------------------------------------------
2015-02-25 11:54:31 +01:00
// userTypeName
//---------------------------------------------------------
2015-02-25 11:54:31 +01:00
QString BarLine::userTypeName(BarLineType t)
{
for (const auto& i : barLineTable) {
if (i.type == t)
return qApp->translate("Palette", i.name);
}
return QString();
}
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
// BarLine
//---------------------------------------------------------
BarLine::BarLine(Score* s)
: Element(s)
{
setHeight(DEFAULT_BARLINE_TO/2 * spatium()); // for use in palettes
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// setSpan
//---------------------------------------------------------
void BarLine::setSpan(int val)
{
_span = val;
updateCustomSpan();
}
//---------------------------------------------------------
// setSpanFrom
//---------------------------------------------------------
void BarLine::setSpanFrom(int val)
{
_spanFrom = val;
updateCustomSpan();
}
//---------------------------------------------------------
// setSpanTo
//---------------------------------------------------------
void BarLine::setSpanTo(int val)
{
_spanTo = val;
updateCustomSpan();
}
//---------------------------------------------------------
// mag
//---------------------------------------------------------
qreal BarLine::mag() const
{
qreal m = staff() ? staff()->mag() : 1.0;
return m;
}
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
// pagePos
//---------------------------------------------------------
QPointF BarLine::pagePos() const
{
if (parent() == 0)
return pos();
System* system;
if (parent()->type() != Element::Type::SEGMENT)
system = static_cast<System*>(parent());
else
system = static_cast<Segment*>(parent())->measure()->system();
2012-05-26 14:26:10 +02:00
qreal yp = y();
if (system) {
// get first not hidden staff
int staffIdx1 = staffIdx();
Staff* staff1 = score()->staff(staffIdx1);
SysStaff* sysStaff1 = system->staff(staffIdx1);
while ( staff1 && sysStaff1 && !(sysStaff1->show() && staff1->show()) ) {
staffIdx1++;
staff1 = score()->staff(staffIdx1);
sysStaff1 = system->staff(staffIdx1);
}
yp += system->staffYpage(staffIdx1);
}
2012-05-26 14:26:10 +02:00
return QPointF(pageX(), yp);
}
2013-07-23 19:08:24 +02:00
//---------------------------------------------------------
// canvasPos
//---------------------------------------------------------
QPointF BarLine::canvasPos() const
{
QPointF p(pagePos());
Element* e = parent();
while (e) {
if (e->type() == Element::Type::PAGE) {
2013-07-23 19:08:24 +02:00
p += e->pos();
break;
}
e = e->parent();
}
return p;
}
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
// getY
//---------------------------------------------------------
void BarLine::getY(qreal* y1, qreal* y2) const
{
2012-10-14 00:35:11 +02:00
qreal _spatium = spatium();
2015-01-05 17:55:06 +01:00
int span = _span;
if (parent()) {
2012-05-26 14:26:10 +02:00
int staffIdx1 = staffIdx();
int staffIdx2 = staffIdx1 + _span - 1;
if (staffIdx2 >= score()->nstaves()) {
qDebug("BarLine: bad _span %d", _span);
2012-05-26 14:26:10 +02:00
staffIdx2 = score()->nstaves() - 1;
}
Measure* measure;
System* system;
SysStaff* sysStaff0 = nullptr; // top staff for barline in system
2015-01-05 17:55:06 +01:00
bool systemBarLine;
if (parent()->type() == Element::Type::SEGMENT) {
Segment* segment = static_cast<Segment*>(parent());
measure = segment->measure();
system = measure->system();
if (system)
sysStaff0 = system->staff(staffIdx1);
2015-01-05 17:55:06 +01:00
systemBarLine = false;
}
else {
system = static_cast<System*>(parent());
sysStaff0 = system->staff(staffIdx1);
measure = system->firstMeasure();
2015-01-05 17:55:06 +01:00
for (int i = staffIdx1; i < staffIdx2; ++i) {
if (!score()->staff(i)->hideSystemBarLine()) {
span -= (i - staffIdx1);
staffIdx1 = i;
break;
}
}
systemBarLine = true;
}
2013-01-25 21:17:04 +01:00
if (measure) {
// test start and end staff visibility
2015-01-05 17:55:06 +01:00
int nstaves = score()->nstaves();
Staff* staff1 = score()->staff(staffIdx1);
Staff* staff2 = score()->staff(staffIdx2);
SysStaff* sysStaff1 = system->staff(staffIdx1);
SysStaff* sysStaff2 = system->staff(staffIdx2);
while (span > 0) {
// if start staff not shown, reduce span and move one staff down
2015-01-05 17:55:06 +01:00
if ( !(sysStaff1->show() && staff1->show()) ) {
span--;
if (staffIdx1 >= nstaves-1) // running out of staves?
break;
sysStaff1 = system->staff(++staffIdx1);
staff1 = score()->staff(staffIdx1);
}
// if end staff not shown, reduce span and move one staff up
else if ( !(sysStaff2->show() && staff2->show()) ) {
span--;
if (staffIdx2 == 0)
break;
sysStaff2 = system->staff(--staffIdx2);
staff2 = score()->staff(staffIdx2);
}
// if both staves shown, exit loop
else
break;
}
// if no longer any span, set 0 length and exit
if (span <= 0) {
*y1 = *y2 = 0;
return;
}
// both staffIdx1 and staffIdx2 are shown: compute corresponding line length
2013-01-25 21:17:04 +01:00
StaffLines* l1 = measure->staffLines(staffIdx1);
StaffLines* l2 = measure->staffLines(staffIdx2);
qreal yp = 0.0;
if (systemBarLine) {
// system initial barline, parent is system
// base y on top staff for barline
// system barline span already accounts for staff visibility
yp = sysStaff0->y();
}
else if (system) {
// ordinary barline within system, parent is measure
// base y on top visible staff in barline span
// after skipping ones with hideSystemBarLine set
yp = sysStaff1->y();
}
2013-01-25 21:17:04 +01:00
*y1 = l1->y1() - yp;
2013-05-28 15:42:02 +02:00
*y1 += (_spanFrom * staff1->lineDistance() * staff1->spatium()) / 2;
2013-01-25 21:17:04 +01:00
*y2 = l2->y1() - yp;
2013-05-28 15:42:02 +02:00
*y2 += (_spanTo * staff2->lineDistance() * staff2->spatium()) / 2;
2013-01-25 21:17:04 +01:00
}
2012-05-26 14:26:10 +02:00
}
else {
// for use in palette
*y1 = _spanFrom * _spatium / 2;
*y2 = _spanTo * _spatium / 2;
2012-05-26 14:26:10 +02:00
}
if (selected()) {
*y1 += yoff1;
*y2 += yoff2;
}
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// drawDots
//---------------------------------------------------------
void BarLine::drawDots(QPainter* painter, qreal x) const
{
qreal _spatium = spatium();
if (parent() == 0) { // for use in palette
2014-01-07 13:17:03 +01:00
drawSymbol(SymId::repeatDot, painter, QPointF(x, 2.0 * _spatium));
drawSymbol(SymId::repeatDot, painter, QPointF(x, 3.0 * _spatium));
2012-05-26 14:26:10 +02:00
}
else if (parent()->type() == Element::Type::SEGMENT) {
System* system = static_cast<Segment*>(parent())->measure()->system();
int staffIdx1 = staffIdx();
// find first visible staff
Staff* staff1 = score()->staff(staffIdx1);
SysStaff* sysStaff1 = system->staff(staffIdx1);
while ( staff1 && sysStaff1 && !(sysStaff1->show() && staff1->show()) ) {
staffIdx1++;
staff1 = score()->staff(staffIdx1);
sysStaff1 = system->staff(staffIdx1);
}
int staffIdx2 = staffIdx1 + _span - 1;
int sp = _span;
if (staffIdx2 >= score()->nstaves()) {
qDebug("BarLine: bad _span %d", _span);
staffIdx2 = score()->nstaves() - 1;
sp = staffIdx2 - staffIdx1 + 1;
}
qreal dy = sysStaff1->y();
for (int i = 0; i < sp; ++i) {
Staff* staff = score()->staff(staffIdx1 + i);
SysStaff* sysStaff = system->staff(staffIdx1 + i);
if (sysStaff->show()) {
StaffType* st = staff->staffType();
qreal doty1 = (st->doty1() + .5) * _spatium;
qreal doty2 = (st->doty2() + .5) * _spatium;
2012-05-26 14:26:10 +02:00
qreal staffy = sysStaff->y() - dy;
2012-05-26 14:26:10 +02:00
drawSymbol(SymId::repeatDot, painter, QPointF(x, staffy + doty1));
drawSymbol(SymId::repeatDot, painter, QPointF(x, staffy + doty2));
}
2012-05-26 14:26:10 +02:00
}
}
}
//---------------------------------------------------------
// draw
//---------------------------------------------------------
void BarLine::draw(QPainter* painter) const
{
// get line length and do nothing if 0 (or near enough)
2012-05-26 14:26:10 +02:00
qreal y1, y2;
getY(&y1, &y2);
if (y2-y1 < 0.1)
return;
qreal _spatium = score()->styleB(StyleIdx::scaleBarlines) ? spatium() : score()->spatium();
qreal lw = score()->styleS(StyleIdx::barWidth).val() * _spatium;
2012-05-26 14:26:10 +02:00
QPen pen(curColor(), lw, Qt::SolidLine, Qt::FlatCap);
painter->setPen(pen);
switch(barLineType()) {
case BarLineType::BROKEN:
2012-05-26 14:26:10 +02:00
pen.setStyle(Qt::DashLine);
painter->setPen(pen);
painter->drawLine(QLineF(lw * .5, y1, lw * .5, y2));
break;
case BarLineType::DOTTED:
pen.setStyle(Qt::DotLine);
painter->setPen(pen);
2012-05-26 14:26:10 +02:00
case BarLineType::NORMAL:
2012-05-26 14:26:10 +02:00
painter->drawLine(QLineF(lw * .5, y1, lw * .5, y2));
break;
case BarLineType::END:
2012-05-26 14:26:10 +02:00
{
qreal lw2 = score()->styleS(StyleIdx::endBarWidth).val() * _spatium;
qreal d = score()->styleS(StyleIdx::endBarDistance).val() * _spatium;
2012-05-26 14:26:10 +02:00
painter->drawLine(QLineF(lw * .5, y1, lw * .5, y2));
pen.setWidthF(lw2);
painter->setPen(pen);
qreal x = d + lw2 * .5 + lw;
painter->drawLine(QLineF(x, y1, x, y2));
}
break;
case BarLineType::DOUBLE:
2012-05-26 14:26:10 +02:00
{
lw = score()->styleS(StyleIdx::doubleBarWidth).val() * _spatium;
qreal d = score()->styleS(StyleIdx::doubleBarDistance).val() * _spatium;
2012-05-26 14:26:10 +02:00
pen.setWidthF(lw);
painter->setPen(pen);
qreal x = lw * .5;
painter->drawLine(QLineF(x, y1, x, y2));
x += d + lw;
painter->drawLine(QLineF(x, y1, x, y2));
}
break;
case BarLineType::START_REPEAT:
2012-05-26 14:26:10 +02:00
{
qreal lw2 = score()->styleS(StyleIdx::endBarWidth).val() * _spatium;
qreal d1 = score()->styleS(StyleIdx::endBarDistance).val() * _spatium;
2012-05-26 14:26:10 +02:00
qreal x2 = lw2 * .5; // thick line (lw2)
qreal x1 = lw2 + d1 + lw * .5; // thin line (lw)
qreal x0 = lw2 + d1 + lw + d1; // dot position
drawDots(painter, x0);
painter->drawLine(QLineF(x1, y1, x1, y2));
pen.setWidthF(lw2);
painter->setPen(pen);
painter->drawLine(QLineF(x2, y1, x2, y2));
2014-05-26 15:31:36 +02:00
if (score()->styleB(StyleIdx::repeatBarTips)) {
2013-11-07 16:05:00 +01:00
drawSymbol(SymId::bracketTop, painter, QPointF(0.0, y1));
drawSymbol(SymId::bracketBottom, painter, QPointF(0.0, y2));
2012-05-26 14:26:10 +02:00
}
}
break;
case BarLineType::END_REPEAT:
2012-05-26 14:26:10 +02:00
{
qreal lw2 = score()->styleS(StyleIdx::endBarWidth).val() * _spatium;
qreal d1 = score()->styleS(StyleIdx::endBarDistance).val() * _spatium;
qreal dotw = symWidth(SymId::repeatDot);
2012-05-26 14:26:10 +02:00
qreal x1 = dotw + d1 + lw * .5;
qreal x2 = dotw + d1 + lw + d1 + lw2 * .5;
drawDots(painter, 0.0);
painter->drawLine(QLineF(x1, y1, x1, y2));
pen.setWidthF(lw2);
painter->setPen(pen);
painter->drawLine(QLineF(x2, y1, x2, y2));
2014-05-26 15:31:36 +02:00
if (score()->styleB(StyleIdx::repeatBarTips)) {
2012-05-26 14:26:10 +02:00
qreal x = x2 + lw2 * .5;
2014-02-19 19:13:21 +01:00
qreal w1 = symBbox(SymId::reversedBracketTop).width();
drawSymbol(SymId::reversedBracketTop, painter, QPointF(x - w1, y1));
drawSymbol(SymId::reversedBracketBottom, painter, QPointF(x - w1, y2));
2012-05-26 14:26:10 +02:00
}
}
break;
case BarLineType::END_START_REPEAT:
2012-05-26 14:26:10 +02:00
{
qreal lw2 = score()->styleS(StyleIdx::endBarWidth).val() * _spatium;
qreal d1 = score()->styleS(StyleIdx::endBarDistance).val() * _spatium;
qreal dotw = symWidth(SymId::repeatDot);
2012-05-26 14:26:10 +02:00
qreal x1 = dotw + d1 + lw * .5; // thin bar
qreal x2 = dotw + d1 + lw + d1 + lw2 * .5; // thick bar
qreal x3 = dotw + d1 + lw + d1 + lw2 + d1 + lw * .5; // thin bar
qreal x4 = dotw + d1 + lw + d1 + lw2 + d1 + lw + d1; // dot position
drawDots(painter, .0);
drawDots(painter, x4);
painter->drawLine(QLineF(x1, y1, x1, y2));
pen.setWidthF(lw2);
painter->setPen(pen);
painter->drawLine(QLineF(x2, y1, x2, y2));
pen.setWidthF(lw);
painter->setPen(pen);
painter->drawLine(QLineF(x3, y1, x3, y2));
2014-05-26 15:31:36 +02:00
if (score()->styleB(StyleIdx::repeatBarTips)) {
qreal x = x2;
2014-02-19 19:13:21 +01:00
qreal w1 = symBbox(SymId::reversedBracketTop).width();
2013-11-07 16:05:00 +01:00
drawSymbol(SymId::bracketTop, painter, QPointF(x, y1));
drawSymbol(SymId::bracketBottom, painter, QPointF(x, y2));
2014-02-19 19:13:21 +01:00
drawSymbol(SymId::reversedBracketTop, painter, QPointF(x - w1, y1));
drawSymbol(SymId::reversedBracketBottom, painter, QPointF(x - w1, y2));
}
2012-05-26 14:26:10 +02:00
}
break;
}
}
//---------------------------------------------------------
// write
//---------------------------------------------------------
void BarLine::write(Xml& xml) const
{
xml.stag("BarLine");
xml.tag("subtype", barLineTypeName());
if (_customSubtype)
xml.tag("customSubtype", _customSubtype);
// if any span value is different from staff's, output all values
if ( (staff() && ( _span != staff()->barLineSpan()
|| _spanFrom != staff()->barLineFrom()
|| _spanTo != staff()->barLineTo()
)
)
|| !staff()) // (palette bar lines have no staff: output all values)
2012-10-14 00:35:11 +02:00
xml.tag(QString("span from=\"%1\" to=\"%2\"").arg(_spanFrom).arg(_spanTo), _span);
// if no custom value, output _span only (as in previous code)
else
xml.tag("span", _span);
2012-05-26 14:26:10 +02:00
foreach(const Element* e, _el)
e->write(xml);
Element::writeProperties(xml);
xml.etag();
}
//---------------------------------------------------------
// read
//---------------------------------------------------------
2013-01-11 18:10:18 +01:00
void BarLine::read(XmlReader& e)
2012-05-26 14:26:10 +02:00
{
2012-10-14 00:35:11 +02:00
// if bar line belongs to a staff, span values default to staff values
2013-01-11 18:10:18 +01:00
if (staff()) {
_span = staff()->barLineSpan();
_spanFrom = staff()->barLineFrom();
_spanTo = staff()->barLineTo();
}
while (e.readNextStartElement()) {
const QStringRef& tag(e.name());
2012-05-26 14:26:10 +02:00
if (tag == "subtype") {
bool ok;
2013-01-11 18:10:18 +01:00
const QString& val(e.readElementText());
2012-05-26 14:26:10 +02:00
int i = val.toInt(&ok);
if (!ok)
setBarLineType(val);
2012-05-26 14:26:10 +02:00
else {
BarLineType ct = BarLineType::NORMAL;
2012-05-26 14:26:10 +02:00
switch (i) {
default:
case 0: ct = BarLineType::NORMAL; break;
case 1: ct = BarLineType::DOUBLE; break;
case 2: ct = BarLineType::START_REPEAT; break;
case 3: ct = BarLineType::END_REPEAT; break;
case 4: ct = BarLineType::BROKEN; break;
case 5: ct = BarLineType::END; break;
case 6: ct = BarLineType::END_START_REPEAT; break;
case 7: ct = BarLineType::DOTTED; break;
2012-05-26 14:26:10 +02:00
}
Bar lines: fixing custom type and generated management There are some inconsistencies in the current management of bar line `_generated` flag and user-modified type: - Bar lines created by the New Score Wizard are flagged as non-generated, as well as bar lines of measures manually **appended** by the user, while bar lines of measures **inserted** are flagged as generated. - If a generated bar line is individually changed of typed, it remains flagged as generated, it is not saved and the change is lost upon saving and re-loading. - The management of the internal flag `BarLine::_customSubtype` is not always consistent. - The `Measure::_endBarLineGenerated` flag was not always restored properly by undo. This PR introduces the following fixes: - The `_generated` flag is consistently used for bar lines whose type can be reconstructed from the context and then do not need to be saved to the output file. - Normal bar lines are **always** created as generated: initially created by the Wizard, manually appended or inserted. - Bar lines with custom type (i.e. different from the type which can be expected according to the bar line context) are always flagged as non-generated, ensuring the custom type is written to the output file. - The `Measure::_endBarLineGenerated` flag is stored by `ChangeEndBarLineType()` and restore upon undo. - Some test reference scores, based on the inconsistent bar line `_generated` flag, have been uniformed. Notes: - Tests about measure (and then bar line) appending, inserting and relative undo's are already included in the `tst_parts` test suite. - Some inconsistencies remain in the management of custom bar line span and of system-initial bar lines: for the sake of simplicity, they will be dealt with in separate PR's.
2014-09-06 10:36:35 +02:00
_barLineType = ct; // set type directly, without triggering setBarLineType() checks
2012-05-26 14:26:10 +02:00
}
if (parent() && parent()->type() == Element::Type::SEGMENT) {
2014-03-24 13:23:54 +01:00
Measure* m = static_cast<Segment*>(parent())->measure();
if (barLineType() != m->endBarLineType())
_customSubtype = true;
}
2012-05-26 14:26:10 +02:00
}
else if (tag == "customSubtype")
_customSubtype = e.readInt();
2012-10-14 00:35:11 +02:00
else if (tag == "span") {
_spanFrom = e.intAttribute("from", _spanFrom);
_spanTo = e.intAttribute("to", _spanTo);
_span = e.readInt();
if (_spanTo == UNKNOWN_BARLINE_TO)
_spanTo = staff() ? (staff()->lines() - 1) * 2 : 8;
// WARNING: following statements assume staff and staff bar line spans are correctly set
// ws: _spanTo can be UNKNOWN_BARLINE_TO
2013-01-11 18:10:18 +01:00
if (staff() && (_span != staff()->barLineSpan()
|| _spanFrom != staff()->barLineFrom()
|| ((staff()->barLineTo() != UNKNOWN_BARLINE_TO) && (_spanTo != staff()->barLineTo())))
) {
_customSpan = true;
}
2012-10-14 00:35:11 +02:00
}
2012-05-26 14:26:10 +02:00
else if (tag == "Articulation") {
Articulation* a = new Articulation(score());
a->read(e);
add(a);
}
else if (!Element::readProperties(e))
2013-01-11 18:10:18 +01:00
e.unknown();
2012-05-26 14:26:10 +02:00
}
}
//---------------------------------------------------------
// space
//---------------------------------------------------------
Space BarLine::space() const
{
return Space(0.0, width());
}
//---------------------------------------------------------
// acceptDrop
//---------------------------------------------------------
2014-08-13 21:01:21 +02:00
bool BarLine::acceptDrop(const DropData& data) const
2012-05-26 14:26:10 +02:00
{
2014-08-13 21:01:21 +02:00
Element::Type type = data.element->type();
if (type == Element::Type::BAR_LINE) {
if (parent() && parent()->type() == Element::Type::SEGMENT)
return true;
// accept drop to system bar line only if no span change
// and type is not structural (repeat or end)
if (parent() && parent()->type() == Element::Type::SYSTEM) {
2014-08-13 21:01:21 +02:00
BarLine* b = static_cast<BarLine*>(data.element);
return (b->spanFrom() == 0 && b->spanTo() == DEFAULT_BARLINE_TO
&& (b->barLineType() == BarLineType::BROKEN || b->barLineType() == BarLineType::DOTTED
|| b->barLineType() == BarLineType::NORMAL || b->barLineType() == BarLineType::DOUBLE));
}
}
else {
return (type == Element::Type::ARTICULATION
&& parent()
&& parent()->type() == Element::Type::SEGMENT
&& static_cast<Segment*>(parent())->segmentType() == Segment::Type::EndBarLine);
}
return false;
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// drop
//---------------------------------------------------------
Element* BarLine::drop(const DropData& data)
{
Element* e = data.element;
Element::Type type = e->type();
if (type == Element::Type::BAR_LINE) {
2012-05-26 14:26:10 +02:00
BarLine* bl = static_cast<BarLine*>(e);
BarLineType st = bl->barLineType();
// if no change in subtype or no change in span, do nothing
if (st == barLineType() && bl->spanFrom() == 0 && bl->spanTo() == DEFAULT_BARLINE_TO) {
2012-05-26 14:26:10 +02:00
delete e;
return 0;
}
// system left-side bar line: route type change to first measure of system
if (parent()->type() == Element::Type::SYSTEM) {
Measure* m = static_cast<System*>(parent())->firstMeasure();
if (m && m->systemInitialBarLineType() != bl->barLineType())
2014-12-08 13:36:52 +01:00
m->undoChangeProperty(P_ID::SYSTEM_INITIAL_BARLINE_TYPE, int(bl->barLineType()));
2012-10-17 20:22:24 +02:00
delete e;
return 0;
}
// parent is a segment
Measure* m = static_cast<Segment*>(parent())->measure();
// check if the new property can apply to this single bar line
bool oldRepeat = (barLineType() == BarLineType::START_REPEAT || barLineType() == BarLineType::END_REPEAT
|| barLineType() == BarLineType::END_START_REPEAT);
bool newRepeat = (bl->barLineType() == BarLineType::START_REPEAT || bl->barLineType() == BarLineType::END_REPEAT
|| bl->barLineType() == BarLineType::END_START_REPEAT);
// if ctrl was used and repeats are not involved,
// or if drop refers to span rather than subtype =>
// single bar line drop
if (((data.modifiers & Qt::ControlModifier) && !oldRepeat && !newRepeat) || (bl->spanFrom() != 0 || bl->spanTo() != DEFAULT_BARLINE_TO) ) {
// if drop refers to span, update this bar line span
if (bl->spanFrom() != 0 || bl->spanTo() != DEFAULT_BARLINE_TO) {
// if dropped spanFrom or spanTo are below the middle of standard staff (5 lines)
2012-11-11 01:50:57 +01:00
// adjust to the number of syaff lines
int bottomSpan = (staff()->lines()-1) * 2;
int spanFrom = bl->spanFrom() > 4 ? bottomSpan - (8 - bl->spanFrom()) : bl->spanFrom();
int spanTo = bl->spanTo() > 4 ? bottomSpan - (8 - bl->spanTo()) : bl->spanTo();
score()->undoChangeSingleBarLineSpan(this, 1, spanFrom, spanTo);
}
// if drop refers to subtype, update this bar line subtype
else {
// score()->undoChangeBarLine(m, bl->barLineType());
2014-05-26 18:18:01 +02:00
score()->undoChangeProperty(this, P_ID::SUBTYPE, int(bl->barLineType()));
}
delete e;
return 0;
}
// drop applies to all bar lines of the measure
if (st == BarLineType::START_REPEAT) {
2012-05-26 14:26:10 +02:00
m = m->nextMeasure();
if (m == 0) {
delete e;
return 0;
}
}
score()->undoChangeBarLine(m, bl->barLineType());
delete e;
return 0;
2012-05-26 14:26:10 +02:00
}
else if (type == Element::Type::ARTICULATION) {
2012-05-26 14:26:10 +02:00
Articulation* atr = static_cast<Articulation*>(e);
atr->setParent(this);
atr->setTrack(track());
score()->undoAddElement(atr);
return atr;
}
return 0;
}
//---------------------------------------------------------
// updateGrips
//---------------------------------------------------------
void BarLine::updateGrips(Grip* defaultGrip, QVector<QRectF>& grip) const
2012-05-26 14:26:10 +02:00
{
*defaultGrip = Grip::END;
2014-05-26 15:31:36 +02:00
qreal lw = point(score()->styleS(StyleIdx::barWidth));
2012-05-26 14:26:10 +02:00
qreal y1, y2;
getY(&y1, &y2);
2012-10-14 00:35:11 +02:00
grip[0].translate(QPointF(lw * .5, y1) + pagePos());
grip[1].translate(QPointF(lw * .5, y2) + pagePos());
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// startEdit
//---------------------------------------------------------
void BarLine::startEdit(MuseScoreView*, const QPointF&)
{
// keep a copy of original span values
_origSpan = _span;
_origSpanFrom = _spanFrom;
_origSpanTo = _spanTo;
}
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
// endEdit
//---------------------------------------------------------
void BarLine::endEdit()
{
shiftDrag = false;
// if no change, do nothing
if (_span == _origSpan &&_spanFrom == _origSpanFrom && _spanTo == _origSpanTo) {
ctrlDrag = false;
return;
}
// if bar line has custom span, assume any span edit is local to this bar line
if (_customSpan == true)
ctrlDrag = true;
// if bar line belongs to a system (system-initial bar line), edit is local
if (parent() && parent()->type() == Element::Type::SYSTEM)
ctrlDrag = true;
// for mid-measure barlines, edit is local
bool midMeasure = false;
if (parent()->type() == Element::Type::SEGMENT
&& static_cast<Segment*>(parent())->segmentType() == Segment::Type::BarLine) {
ctrlDrag = true;
midMeasure = true;
}
if (ctrlDrag) { // if single bar line edit
ctrlDrag = false;
_customSpan = true; // mark bar line as custom spanning
int newSpan = _span; // copy edited span values
int newSpanFrom = _spanFrom;
int newSpanTo = _spanTo;
_span = _origSpan; // restore original span values
_spanFrom = _origSpanFrom;
_spanTo = _origSpanTo;
// for mid-measure barline in root score, update parts
if (midMeasure && score()->parentScore() == nullptr && score()->excerpts().size() > 0) {
int currIdx = staffIdx();
Measure* m = static_cast<Segment*>(parent())->measure();
// change linked barlines as necessary
int lastIdx = currIdx + qMax(_span, newSpan);
for (int idx = currIdx; idx < lastIdx; ++idx) {
Staff* staff = score()->staff(idx);
LinkedStaves* ls = staff->linkedStaves();
if (ls) {
for (Staff* lstaff : ls->staves()) {
Score* lscore = lstaff->score();
// don't change barlines in root score
if (lscore == staff->score())
continue;
// change barline only in top staff of part
if (lstaff != lscore->staff(0))
continue;
int spannedStaves = qMax(currIdx + newSpan - idx, 0);
int lNewSpan = qMin(spannedStaves, lscore->nstaves());
Measure* lm = lscore->tick2measure(m->tick());
Segment* lseg = lm->undoGetSegment(Segment::Type::BarLine, tick());
BarLine* lbl = static_cast<BarLine*>(lseg->element(0));
if (lbl) {
// already a barline here
if (lNewSpan > 0) {
// keep barline, but update span if necessary
if (lbl->span() != lNewSpan)
lbl->undoChangeProperty(P_ID::BARLINE_SPAN, lNewSpan);
}
else {
// remove barline
lbl->unlink();
lbl->score()->undoRemoveElement(lbl);
}
}
else {
// new barline needed
lbl = static_cast<BarLine*>(linkedClone());
lbl->setSpan(lNewSpan);
lbl->setTrack(lstaff->idx() * VOICES);
lbl->setScore(lscore);
lbl->setParent(lseg);
lscore->undoAddElement(lbl);
}
}
}
}
}
score()->undoChangeSingleBarLineSpan(this, newSpan, newSpanFrom, newSpanTo);
return;
}
2012-11-11 01:50:57 +01:00
// if same as staff settings, do nothing
2012-10-14 00:35:11 +02:00
if (staff()->barLineSpan() == _span && staff()->barLineFrom() == _spanFrom && staff()->barLineTo() == _spanTo)
2012-05-26 14:26:10 +02:00
return;
int idx1 = staffIdx();
if (_span != staff()->barLineSpan()) {
2012-10-14 00:35:11 +02:00
// if now bar lines span more staves
if (_span > staff()->barLineSpan()) {
int idx2 = idx1 + _span;
// set span 0 to all additional staves
for (int idx = idx1 + 1; idx < idx2; ++idx)
// mensurstrich special case:
// if line spans to top line of a stave AND current staff is
// the last spanned staff BUT NOT the last score staff
// keep its bar lines
// otherwise remove them
if (_spanTo > 0 || !(idx == idx2-1 && idx != score()->nstaves()-1) )
score()->undoChangeBarLineSpan(score()->staff(idx), 0, 0,
(score()->staff(idx)->lines()-1)*2);
2012-10-14 00:35:11 +02:00
}
// if now bar lines span fewer staves
else {
int idx1 = staffIdx() + _span;
int idx2 = staffIdx() + staff()->barLineSpan();
2012-11-11 01:50:57 +01:00
// set standard span for each no-longer-spanned staff
for (int idx = idx1; idx < idx2; ++idx) {
Staff* staff = score()->staff(idx);
int lines = staff->lines();
int spanFrom = lines == 1 ? BARLINE_SPAN_1LINESTAFF_FROM : 0;
int spanTo = lines == 1 ? BARLINE_SPAN_1LINESTAFF_TO : (lines - 1) * 2;
score()->undoChangeBarLineSpan(staff, 1, spanFrom, spanTo);
}
2012-10-14 00:35:11 +02:00
}
2012-05-26 14:26:10 +02:00
}
2012-05-26 14:26:10 +02:00
// update span for the staff the edited bar line belongs to
2012-10-14 00:35:11 +02:00
score()->undoChangeBarLineSpan(staff(), _span, _spanFrom, _spanTo);
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// editDrag
//---------------------------------------------------------
void BarLine::editDrag(const EditData& ed)
{
2012-10-14 00:35:11 +02:00
qreal lineDist = staff()->lineDistance() * spatium();
qreal min, max, lastmax, y1, y2;
getY(&y1, &y2);
y1 -= yoff1; // current positions of barline ends, ignoring any in-process dragging
y2 -= yoff2;
if (ed.curGrip == Grip::START) {
2015-04-10 04:39:14 +02:00
// min offset for top grip is line -1 (-2 for 1-line staves)
2012-10-14 00:35:11 +02:00
// max offset is 1 line above bottom grip or 1 below last staff line, whichever comes first
2015-04-10 04:39:14 +02:00
min = -y1 - (staff()->lines() == 1 ? lineDist * 2 : lineDist);
2012-10-14 00:35:11 +02:00
max = y2 - y1 - lineDist; // 1 line above bottom grip
lastmax = (staff()->lines() - _spanFrom/2) * lineDist; // 1 line below last staff line
if (lastmax < max)
2012-10-14 00:35:11 +02:00
max = lastmax;
// update yoff1 and bring it within limits
yoff1 += ed.delta.y();
if (yoff1 < min)
2012-10-14 00:35:11 +02:00
yoff1 = min;
if (yoff1 > max)
2012-10-14 00:35:11 +02:00
yoff1 = max;
}
else {
// min for bottom grip is 1 line below top grip
// no max
min = y1 - y2 + lineDist;
// update yoff2 and bring it within limit
yoff2 += ed.delta.y();
if (yoff2 < min)
2012-10-14 00:35:11 +02:00
yoff2 = min;
}
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// endEditDrag
2012-10-14 00:35:11 +02:00
// snap to nearest staff / staff line
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
void BarLine::endEditDrag()
{
if (yoff1 == 0.0 && yoff2 == 0.0) // if no drag, do nothing
return;
2012-10-14 00:35:11 +02:00
qreal y1, y2;
getY(&y1, &y2);
qreal ay0 = pagePos().y();
qreal ay2 = ay0 + y2; // absolute (page-relative) bar line bottom coord
2012-05-26 14:26:10 +02:00
int staffIdx1 = staffIdx();
int staffIdx2;
System* syst;
if (parent()->type() == Element::Type::SYSTEM) {
syst = static_cast<System*>(parent());
}
else {
syst = static_cast<Segment*>(parent())->measure()->system();
}
qreal systTopY = syst->pagePos().y();
2012-10-14 00:35:11 +02:00
// determine new span value
int numOfStaves = syst->staves()->size();
if (staffIdx1 + 1 >= numOfStaves)
// if initial staff is last staff, ending staff must be the same
2012-05-26 14:26:10 +02:00
staffIdx2 = staffIdx1;
2012-10-14 00:35:11 +02:00
2012-05-26 14:26:10 +02:00
else {
2012-10-14 00:35:11 +02:00
// if there are other staves after it, look for staff nearest to bar line bottom coord
qreal staff1TopY = syst->staff(staffIdx1)->y() + systTopY;
for (staffIdx2 = staffIdx1 + 1; staffIdx2 < numOfStaves; ++staffIdx2) {
// compute 1st staff height, absolute top Y of 2nd staff and height of blank between the staves
Staff * staff1 = score()->staff(staffIdx2-1);
qreal staff1Hght = (staff1->lines()-1) * staff1->lineDistance() * spatium();
qreal staff2TopY = systTopY + syst->staff(staffIdx2)->y();
qreal blnkBtwnStaff = staff2TopY - staff1TopY - staff1Hght;
// if bar line bottom coord is above than mid-way of blank between staves...
if (ay2 < (staff1TopY + staff1Hght + blnkBtwnStaff * .5))
break; // ...staff 1 is ending staff
// if bar line is below, advance to next staff
staff1TopY = staff2TopY;
2012-05-26 14:26:10 +02:00
}
staffIdx2 -= 1;
}
int newSpan = staffIdx2 - staffIdx1 + 1;
2012-10-14 00:35:11 +02:00
// determine new spanFrom and spanTo values
int newSpanFrom, newSpanTo;
Staff * staff2 = score()->staff(staffIdx2);
int Staff1lines = staff()->lines();
int Staff2lines = staff2->lines();
if (shiftDrag) { // if precision dragging
newSpanFrom = _spanFrom;
if (yoff1 != 0.0) {
// round bar line top coord to nearest line of 1st staff (in half line dist units)
newSpanFrom = ((int)floor(y1 / (staff()->lineDistance() * spatium()) + 0.5 )) * 2;
// min = 1 line dist above 1st staff line | max = 1 line dist below last staff line
2015-04-10 04:39:14 +02:00
// except for 1-line staves
int minFrom = Staff1lines == 1 ? BARLINE_SPAN_1LINESTAFF_FROM : MIN_BARLINE_SPAN_FROMTO;
if (newSpanFrom < minFrom)
newSpanFrom = minFrom;
if (newSpanFrom > Staff1lines * 2)
newSpanFrom = Staff1lines * 2;
}
2012-10-14 00:35:11 +02:00
newSpanTo = _spanTo;
if (yoff2 != 0.0) {
// round bar line bottom coord to nearest line of 2nd staff (in half line dist units)
qreal staff2TopY = systTopY + syst->staff(staffIdx2)->y();
newSpanTo = ((int)floor( (ay2 - staff2TopY) / (staff2->lineDistance() * spatium()) + 0.5 )) * 2;
// min = 1 line dist above 1st staff line | max = 1 line dist below last staff line
2015-04-10 04:39:14 +02:00
int maxTo = Staff2lines == 1 ? BARLINE_SPAN_1LINESTAFF_TO : Staff2lines * 2;
if (newSpanTo < MIN_BARLINE_SPAN_FROMTO)
newSpanTo = MIN_BARLINE_SPAN_FROMTO;
2015-04-10 04:39:14 +02:00
if (newSpanTo > maxTo)
newSpanTo = maxTo;
}
// shiftDrag = false; // NO: a last call to this function is made when exiting editing:
} // it would find shiftDrag = false and reset extrema to coarse resolution
else { // if coarse dragging
2015-04-10 04:39:14 +02:00
newSpanFrom = Staff1lines == 1 ? BARLINE_SPAN_1LINESTAFF_FROM: 0;
newSpanTo = Staff2lines == 1 ? BARLINE_SPAN_1LINESTAFF_TO : (Staff2lines - 1) * 2;
}
2014-04-09 16:09:21 +02:00
// if any value changed, update
if (newSpan != _span || newSpanFrom != _spanFrom || newSpanTo != _spanTo) {
2012-10-14 00:35:11 +02:00
_span = newSpan;
_spanFrom = newSpanFrom;
_spanTo = newSpanTo;
}
yoff1 = yoff2 = 0.0;
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
2012-08-02 18:33:43 +02:00
// layoutWidth
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
2012-08-02 18:33:43 +02:00
qreal BarLine::layoutWidth(Score* score, BarLineType type, qreal mag)
2012-05-26 14:26:10 +02:00
{
qreal _spatium = score->spatium();
if (score->styleB(StyleIdx::scaleBarlines))
_spatium *= mag;
2014-05-26 15:31:36 +02:00
qreal dw = score->styleS(StyleIdx::barWidth).val() * _spatium;
2012-05-26 14:26:10 +02:00
qreal dotwidth = score->scoreFont()->width(SymId::repeatDot, mag);
2012-08-02 18:33:43 +02:00
switch(type) {
case BarLineType::DOUBLE:
2014-05-26 15:31:36 +02:00
dw = (score->styleS(StyleIdx::doubleBarWidth) * 2
+ score->styleS(StyleIdx::doubleBarDistance)).val() * _spatium;
2012-05-26 14:26:10 +02:00
break;
case BarLineType::START_REPEAT:
2014-05-26 15:31:36 +02:00
dw += dotwidth + (score->styleS(StyleIdx::endBarWidth)
+ 2 * score->styleS(StyleIdx::endBarDistance)).val() * _spatium;
2012-05-26 14:26:10 +02:00
break;
case BarLineType::END_REPEAT:
2014-05-26 15:31:36 +02:00
dw += dotwidth + (score->styleS(StyleIdx::endBarWidth)
+ 2 * score->styleS(StyleIdx::endBarDistance)).val() * _spatium;
2012-05-26 14:26:10 +02:00
break;
case BarLineType::END:
2014-05-26 15:31:36 +02:00
dw += (score->styleS(StyleIdx::endBarWidth)
+ score->styleS(StyleIdx::endBarDistance)).val() * _spatium;
2012-05-26 14:26:10 +02:00
break;
case BarLineType::END_START_REPEAT:
2014-05-26 15:31:36 +02:00
dw += 2 * dotwidth + (score->styleS(StyleIdx::barWidth)
+ score->styleS(StyleIdx::endBarWidth)
+ 4 * score->styleS(StyleIdx::endBarDistance)).val() * _spatium;
2012-05-26 14:26:10 +02:00
break;
case BarLineType::BROKEN:
case BarLineType::NORMAL:
case BarLineType::DOTTED:
2012-05-26 14:26:10 +02:00
break;
default:
qDebug("illegal bar line type");
2012-05-26 14:26:10 +02:00
break;
}
2012-08-02 18:33:43 +02:00
return dw;
}
//---------------------------------------------------------
// layout
//---------------------------------------------------------
void BarLine::layout()
{
qreal y1, y2;
getY(&y1, &y2);
// if bar line does not belong to a system, has a staff and staff is set to hide bar lines, set null bbox
if (parent() && parent()->type() != Element::Type::SYSTEM && staff() && !staff()->staffType()->showBarlines())
setbbox(QRectF());
// bar lines not hidden
else {
qreal dw = layoutWidth(score(), barLineType(), mag());
QRectF r(0.0, y1, dw, y2-y1);
2014-05-26 15:31:36 +02:00
if (score()->styleB(StyleIdx::repeatBarTips)) {
switch (barLineType()) {
case BarLineType::START_REPEAT:
2013-11-11 15:11:28 +01:00
r |= symBbox(SymId::bracketTop).translated(0, y1);
r |= symBbox(SymId::bracketBottom).translated(0, y2);
break;
case BarLineType::END_REPEAT:
2014-02-19 19:13:21 +01:00
{
qreal w1 = symBbox(SymId::reversedBracketTop).width();
r |= symBbox(SymId::reversedBracketTop).translated(dw - w1, y1);
r |= symBbox(SymId::reversedBracketBottom).translated(dw - w1, y2);
break;
2014-02-19 19:13:21 +01:00
}
case BarLineType::END_START_REPEAT:
{
2014-05-26 15:31:36 +02:00
qreal lw = point(score()->styleS(StyleIdx::barWidth));
qreal lw2 = point(score()->styleS(StyleIdx::endBarWidth));
qreal d1 = point(score()->styleS(StyleIdx::endBarDistance));
qreal dotw = symWidth(SymId::repeatDot);
qreal x = dotw + 2 * d1 + lw + lw2 * .5; // thick bar
2014-02-19 19:13:21 +01:00
qreal w1 = symBbox(SymId::reversedBracketTop).width();
2013-11-11 15:11:28 +01:00
r |= symBbox(SymId::bracketTop).translated(x, y1);
r |= symBbox(SymId::bracketBottom).translated(x, y2);
2014-02-19 19:13:21 +01:00
r |= symBbox(SymId::reversedBracketTop).translated(x - w1 , y1);
r |= symBbox(SymId::reversedBracketBottom).translated(x - w1, y2);
}
break;
default:
break;
}
2012-05-26 14:26:10 +02:00
}
setbbox(r);
2012-05-26 14:26:10 +02:00
}
// in any case, lay out attached elements
foreach (Element* e, _el) {
2012-05-26 14:26:10 +02:00
e->layout();
if (e->type() == Element::Type::ARTICULATION) {
Articulation* a = static_cast<Articulation*>(e);
MScore::Direction dir = a->direction();
qreal distance = 0.5 * spatium();
qreal x = width() * .5;
if (dir == MScore::Direction::DOWN) {
2012-05-26 14:26:10 +02:00
qreal botY = y2 + distance;
a->setPos(QPointF(x, botY));
}
else {
qreal topY = y1 - distance;
a->setPos(QPointF(x, topY));
}
2012-05-26 14:26:10 +02:00
}
}
}
//---------------------------------------------------------
// shape
//---------------------------------------------------------
QPainterPath BarLine::shape() const
{
QPainterPath p;
qreal d = spatium() * .3;
p.addRect(bbox().adjusted(-d, .0, d, .0));
return p;
}
//---------------------------------------------------------
// tick
//---------------------------------------------------------
int BarLine::tick() const
{
return (parent() && parent()->type() == Element::Type::SEGMENT)
? static_cast<Segment*>(parent())->tick() : 0;
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// barLineTypeName
//
// Instance form returning the name string of the bar line type and
// static form returning the name string for an arbitrary bar line type.
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
QString BarLine::barLineTypeName() const
2012-05-26 14:26:10 +02:00
{
return QString(barLineNames[int(barLineType())]);
2012-05-26 14:26:10 +02:00
}
QString BarLine::barLineTypeName(BarLineType t)
{
return QString(barLineNames[int(t)]);
}
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
// setBarLineType
Bar lines: fixing custom type and generated management There are some inconsistencies in the current management of bar line `_generated` flag and user-modified type: - Bar lines created by the New Score Wizard are flagged as non-generated, as well as bar lines of measures manually **appended** by the user, while bar lines of measures **inserted** are flagged as generated. - If a generated bar line is individually changed of typed, it remains flagged as generated, it is not saved and the change is lost upon saving and re-loading. - The management of the internal flag `BarLine::_customSubtype` is not always consistent. - The `Measure::_endBarLineGenerated` flag was not always restored properly by undo. This PR introduces the following fixes: - The `_generated` flag is consistently used for bar lines whose type can be reconstructed from the context and then do not need to be saved to the output file. - Normal bar lines are **always** created as generated: initially created by the Wizard, manually appended or inserted. - Bar lines with custom type (i.e. different from the type which can be expected according to the bar line context) are always flagged as non-generated, ensuring the custom type is written to the output file. - The `Measure::_endBarLineGenerated` flag is stored by `ChangeEndBarLineType()` and restore upon undo. - Some test reference scores, based on the inconsistent bar line `_generated` flag, have been uniformed. Notes: - Tests about measure (and then bar line) appending, inserting and relative undo's are already included in the `tst_parts` test suite. - Some inconsistencies remain in the management of custom bar line span and of system-initial bar lines: for the sake of simplicity, they will be dealt with in separate PR's.
2014-09-06 10:36:35 +02:00
//
// Set the bar line type from the type name string.
// Does not update _customSubtype or _generated flags: to be used when reading from a score file
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
void BarLine::setBarLineType(const QString& s)
2012-05-26 14:26:10 +02:00
{
for (unsigned i = 0; i < sizeof(barLineNames)/sizeof(*barLineNames); ++i) {
if (barLineNames[i] == s) {
_barLineType = BarLineType(i);
2012-05-26 14:26:10 +02:00
return;
}
}
_barLineType = BarLineType::NORMAL;
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// scanElements
//---------------------------------------------------------
void BarLine::scanElements(void* data, void (*func)(void*, Element*), bool all)
{
// if no width (staff has bar lines turned off) and not all requested, do nothing
if (width() == 0.0 && !all)
return;
2012-05-26 14:26:10 +02:00
func(data, this);
foreach(Element* e, _el)
e->scanElements(data, func, all);
}
//---------------------------------------------------------
// add
//---------------------------------------------------------
void BarLine::add(Element* e)
{
if (parent() && parent()->type() != Element::Type::SEGMENT) {
delete e;
return;
}
2014-05-30 13:35:44 +02:00
e->setParent(this);
2012-05-26 14:26:10 +02:00
switch(e->type()) {
case Element::Type::ARTICULATION:
2013-03-25 16:27:20 +01:00
_el.push_back(e);
2012-05-26 14:26:10 +02:00
setGenerated(false);
if (parent() && parent()->parent())
static_cast<Measure*>(parent()->parent())->setEndBarLineGenerated(false);
2012-05-26 14:26:10 +02:00
break;
default:
qDebug("BarLine::add() not impl. %s", e->name());
delete e;
2012-05-26 14:26:10 +02:00
break;
}
}
//---------------------------------------------------------
// remove
//---------------------------------------------------------
void BarLine::remove(Element* e)
{
switch(e->type()) {
case Element::Type::ARTICULATION:
2012-05-26 14:26:10 +02:00
if (!_el.remove(e))
qDebug("BarLine::remove(): cannot find %s", e->name());
2012-05-26 14:26:10 +02:00
break;
default:
qDebug("BarLine::remove() not impl. %s", e->name());
2012-05-26 14:26:10 +02:00
break;
}
}
//---------------------------------------------------------
// updateCustomSpan
//---------------------------------------------------------
void BarLine::updateCustomSpan()
{
Bar lines: Fix custom span and generated management. This PR should complete the revision of bar line flag managements. - Make sure single bar line span changes affect both the `_customSpan` and the `_generated` flags. - Make sure that manually bringing a custom-spanned bar line to default span resets the `_customSpan` flag and, if no other customization is in effect. the `_generated` flag. - Deleting a measure bar line resets it to default configuration. - Fix a missing initialization of `Measure::_endBarLineColor` variable. - To simplify tests and debug, check boxes for the `BarLine::_customSpan` and the `BarLine::_customSubtype` have been added to the debugger dialogue box. As far as system-initial bar lines are concerned, they were made un-editable by a recent commit (https://github.com/musescore/MuseScore/pull/1300). This PR add a few consistency changes: - system-initial bar lines do not accept drops; - they are not saved to score output files and are ignored when reading from them; - their internal `_customSybtype` and _customSpan` flags are always false; - they do not show up in the Inspector (if a system bar line is selected, the Inspector remains blank) This PR DOES NOT include the special system-initial double bar management recently discussed. This will be part of a specific PR in the next days. Together with previous PR's, this should ensure that: - bar lines are written to a score output file only when some customization is in effect which cannot be reconstructed when reading back; - any measure bar line can be edited; - any measure bar line user edit is saved, written to the score file and read back properly; - no system bar line edit is possible.
2014-09-11 01:31:10 +02:00
// system bar line span is internally managed: _customSpan can never be true
if (parent() && parent()->type() == Element::Type::SYSTEM) {
_customSpan = false;
return;
}
// span is custom if barline belongs to a staff and any of the staff span params is different from barline's
// if no staff or same span params as staff, span is not custom
Bar lines: Fix custom span and generated management. This PR should complete the revision of bar line flag managements. - Make sure single bar line span changes affect both the `_customSpan` and the `_generated` flags. - Make sure that manually bringing a custom-spanned bar line to default span resets the `_customSpan` flag and, if no other customization is in effect. the `_generated` flag. - Deleting a measure bar line resets it to default configuration. - Fix a missing initialization of `Measure::_endBarLineColor` variable. - To simplify tests and debug, check boxes for the `BarLine::_customSpan` and the `BarLine::_customSubtype` have been added to the debugger dialogue box. As far as system-initial bar lines are concerned, they were made un-editable by a recent commit (https://github.com/musescore/MuseScore/pull/1300). This PR add a few consistency changes: - system-initial bar lines do not accept drops; - they are not saved to score output files and are ignored when reading from them; - their internal `_customSybtype` and _customSpan` flags are always false; - they do not show up in the Inspector (if a system bar line is selected, the Inspector remains blank) This PR DOES NOT include the special system-initial double bar management recently discussed. This will be part of a specific PR in the next days. Together with previous PR's, this should ensure that: - bar lines are written to a score output file only when some customization is in effect which cannot be reconstructed when reading back; - any measure bar line can be edited; - any measure bar line user edit is saved, written to the score file and read back properly; - no system bar line edit is possible.
2014-09-11 01:31:10 +02:00
Staff* stf = staff();
_customSpan = stf && (stf->barLineSpan() != _span || stf->barLineFrom() != _spanFrom || stf->barLineTo() != _spanTo);
updateGenerated(!_customSpan);
}
Bar lines: fixing custom type and generated management There are some inconsistencies in the current management of bar line `_generated` flag and user-modified type: - Bar lines created by the New Score Wizard are flagged as non-generated, as well as bar lines of measures manually **appended** by the user, while bar lines of measures **inserted** are flagged as generated. - If a generated bar line is individually changed of typed, it remains flagged as generated, it is not saved and the change is lost upon saving and re-loading. - The management of the internal flag `BarLine::_customSubtype` is not always consistent. - The `Measure::_endBarLineGenerated` flag was not always restored properly by undo. This PR introduces the following fixes: - The `_generated` flag is consistently used for bar lines whose type can be reconstructed from the context and then do not need to be saved to the output file. - Normal bar lines are **always** created as generated: initially created by the Wizard, manually appended or inserted. - Bar lines with custom type (i.e. different from the type which can be expected according to the bar line context) are always flagged as non-generated, ensuring the custom type is written to the output file. - The `Measure::_endBarLineGenerated` flag is stored by `ChangeEndBarLineType()` and restore upon undo. - Some test reference scores, based on the inconsistent bar line `_generated` flag, have been uniformed. Notes: - Tests about measure (and then bar line) appending, inserting and relative undo's are already included in the `tst_parts` test suite. - Some inconsistencies remain in the management of custom bar line span and of system-initial bar lines: for the sake of simplicity, they will be dealt with in separate PR's.
2014-09-06 10:36:35 +02:00
//---------------------------------------------------------
// updateCustomType
//
// Turns off _customSubtype flag if bar line type is the same of the context it is in
// (usually the endBarLineType of the measure); turns it on otherwise.
//---------------------------------------------------------
void BarLine::updateCustomType()
{
BarLineType refType = BarLineType::NORMAL;
if (parent()) {
if (parent()->type() == Element::Type::SEGMENT) {
Segment* seg = static_cast<Segment*>(parent());
switch (seg->segmentType()) {
case Segment::Type::StartRepeatBarLine:
// if a start-repeat segment, ref. type is START_REPEAT
// if measure has relevant repeat flag or none if measure hasn't
refType = (seg->measure()->repeatFlags() & Repeat::START) != 0
? BarLineType::START_REPEAT : BarLineType(-1);
break;
case Segment::Type::BarLine:
// if a non-end-measure bar line, type is always custom
refType = BarLineType(-1); // use an invalid type
break;
case Segment::Type::EndBarLine:
// if end-measure bar line, reference type is the measure endBarLinetype
refType = seg->measure()->endBarLineType();
break;
default: // keep lint happy!
break;
}
}
Bar lines: Fix custom span and generated management. This PR should complete the revision of bar line flag managements. - Make sure single bar line span changes affect both the `_customSpan` and the `_generated` flags. - Make sure that manually bringing a custom-spanned bar line to default span resets the `_customSpan` flag and, if no other customization is in effect. the `_generated` flag. - Deleting a measure bar line resets it to default configuration. - Fix a missing initialization of `Measure::_endBarLineColor` variable. - To simplify tests and debug, check boxes for the `BarLine::_customSpan` and the `BarLine::_customSubtype` have been added to the debugger dialogue box. As far as system-initial bar lines are concerned, they were made un-editable by a recent commit (https://github.com/musescore/MuseScore/pull/1300). This PR add a few consistency changes: - system-initial bar lines do not accept drops; - they are not saved to score output files and are ignored when reading from them; - their internal `_customSybtype` and _customSpan` flags are always false; - they do not show up in the Inspector (if a system bar line is selected, the Inspector remains blank) This PR DOES NOT include the special system-initial double bar management recently discussed. This will be part of a specific PR in the next days. Together with previous PR's, this should ensure that: - bar lines are written to a score output file only when some customization is in effect which cannot be reconstructed when reading back; - any measure bar line can be edited; - any measure bar line user edit is saved, written to the score file and read back properly; - no system bar line edit is possible.
2014-09-11 01:31:10 +02:00
// if parent is not a segment, it can only be a system and for systems
// bar line type is internally managed and _customSubtype can never be true
else {
_customSubtype = false;
return;
}
Bar lines: fixing custom type and generated management There are some inconsistencies in the current management of bar line `_generated` flag and user-modified type: - Bar lines created by the New Score Wizard are flagged as non-generated, as well as bar lines of measures manually **appended** by the user, while bar lines of measures **inserted** are flagged as generated. - If a generated bar line is individually changed of typed, it remains flagged as generated, it is not saved and the change is lost upon saving and re-loading. - The management of the internal flag `BarLine::_customSubtype` is not always consistent. - The `Measure::_endBarLineGenerated` flag was not always restored properly by undo. This PR introduces the following fixes: - The `_generated` flag is consistently used for bar lines whose type can be reconstructed from the context and then do not need to be saved to the output file. - Normal bar lines are **always** created as generated: initially created by the Wizard, manually appended or inserted. - Bar lines with custom type (i.e. different from the type which can be expected according to the bar line context) are always flagged as non-generated, ensuring the custom type is written to the output file. - The `Measure::_endBarLineGenerated` flag is stored by `ChangeEndBarLineType()` and restore upon undo. - Some test reference scores, based on the inconsistent bar line `_generated` flag, have been uniformed. Notes: - Tests about measure (and then bar line) appending, inserting and relative undo's are already included in the `tst_parts` test suite. - Some inconsistencies remain in the management of custom bar line span and of system-initial bar lines: for the sake of simplicity, they will be dealt with in separate PR's.
2014-09-06 10:36:35 +02:00
}
_customSubtype = (_barLineType != refType);
updateGenerated(!_customSubtype); // if _customSubType, _genereated is surely false
}
//---------------------------------------------------------
// updateGenerated
//
// Sets the _generated status flag by checking all the bar line properties are at default values.
//
// canBeTrue: optional parameter; if set to false, the _generated flag is unconditionally set to false
// without checking the individual properties; to be used when a non-default condition is already known
// to speed up the function.
//---------------------------------------------------------
void BarLine::updateGenerated(bool canBeTrue)
{
if (!canBeTrue)
setGenerated(false);
else {
bool generatedType = !_customSubtype; // if customSubType, assume not generated
if (parent()) {
if (parent()->type() == Element::Type::SEGMENT) {
// if bar line belongs to an EndBarLine segment,
// combine with measure endBarLineGenerated flag
if (static_cast<Segment*>(parent())->segmentType() == Segment::Type::EndBarLine)
generatedType &= static_cast<Segment*>(parent())->measure()->endBarLineGenerated();
// if any other segment (namely, StartBarLine and BarLine), bar line is not generated
else
generatedType = false;
}
Bar lines: fixing custom type and generated management There are some inconsistencies in the current management of bar line `_generated` flag and user-modified type: - Bar lines created by the New Score Wizard are flagged as non-generated, as well as bar lines of measures manually **appended** by the user, while bar lines of measures **inserted** are flagged as generated. - If a generated bar line is individually changed of typed, it remains flagged as generated, it is not saved and the change is lost upon saving and re-loading. - The management of the internal flag `BarLine::_customSubtype` is not always consistent. - The `Measure::_endBarLineGenerated` flag was not always restored properly by undo. This PR introduces the following fixes: - The `_generated` flag is consistently used for bar lines whose type can be reconstructed from the context and then do not need to be saved to the output file. - Normal bar lines are **always** created as generated: initially created by the Wizard, manually appended or inserted. - Bar lines with custom type (i.e. different from the type which can be expected according to the bar line context) are always flagged as non-generated, ensuring the custom type is written to the output file. - The `Measure::_endBarLineGenerated` flag is stored by `ChangeEndBarLineType()` and restore upon undo. - Some test reference scores, based on the inconsistent bar line `_generated` flag, have been uniformed. Notes: - Tests about measure (and then bar line) appending, inserting and relative undo's are already included in the `tst_parts` test suite. - Some inconsistencies remain in the management of custom bar line span and of system-initial bar lines: for the sake of simplicity, they will be dealt with in separate PR's.
2014-09-06 10:36:35 +02:00
// if bar line does not belongs to a segment, it belongs to a system and is generated only if NORMAL
else
generatedType = (_barLineType == BarLineType::NORMAL);
}
Bar lines: fixing custom type and generated management There are some inconsistencies in the current management of bar line `_generated` flag and user-modified type: - Bar lines created by the New Score Wizard are flagged as non-generated, as well as bar lines of measures manually **appended** by the user, while bar lines of measures **inserted** are flagged as generated. - If a generated bar line is individually changed of typed, it remains flagged as generated, it is not saved and the change is lost upon saving and re-loading. - The management of the internal flag `BarLine::_customSubtype` is not always consistent. - The `Measure::_endBarLineGenerated` flag was not always restored properly by undo. This PR introduces the following fixes: - The `_generated` flag is consistently used for bar lines whose type can be reconstructed from the context and then do not need to be saved to the output file. - Normal bar lines are **always** created as generated: initially created by the Wizard, manually appended or inserted. - Bar lines with custom type (i.e. different from the type which can be expected according to the bar line context) are always flagged as non-generated, ensuring the custom type is written to the output file. - The `Measure::_endBarLineGenerated` flag is stored by `ChangeEndBarLineType()` and restore upon undo. - Some test reference scores, based on the inconsistent bar line `_generated` flag, have been uniformed. Notes: - Tests about measure (and then bar line) appending, inserting and relative undo's are already included in the `tst_parts` test suite. - Some inconsistencies remain in the management of custom bar line span and of system-initial bar lines: for the sake of simplicity, they will be dealt with in separate PR's.
2014-09-06 10:36:35 +02:00
// set to generated only if all properties are non-customized
setGenerated(
color() == MScore::defaultColor
&& _visible == true
&& generatedType == true
&& _customSpan == false
);
}
}
2012-05-26 14:26:10 +02:00
//---------------------------------------------------------
// getProperty
//---------------------------------------------------------
2012-08-10 17:01:35 +02:00
QVariant BarLine::getProperty(P_ID id) const
2012-05-26 14:26:10 +02:00
{
switch (id) {
2014-05-26 18:18:01 +02:00
case P_ID::SUBTYPE:
return int(_barLineType);
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN:
return span();
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN_FROM:
return spanFrom();
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN_TO:
return spanTo();
default:
break;
}
2012-08-10 17:01:35 +02:00
return Element::getProperty(id);
2012-05-26 14:26:10 +02:00
}
//---------------------------------------------------------
// setProperty
//---------------------------------------------------------
2012-08-10 17:01:35 +02:00
bool BarLine::setProperty(P_ID id, const QVariant& v)
2012-05-26 14:26:10 +02:00
{
switch(id) {
2014-05-26 18:18:01 +02:00
case P_ID::SUBTYPE:
Bar lines: fixing custom type and generated management There are some inconsistencies in the current management of bar line `_generated` flag and user-modified type: - Bar lines created by the New Score Wizard are flagged as non-generated, as well as bar lines of measures manually **appended** by the user, while bar lines of measures **inserted** are flagged as generated. - If a generated bar line is individually changed of typed, it remains flagged as generated, it is not saved and the change is lost upon saving and re-loading. - The management of the internal flag `BarLine::_customSubtype` is not always consistent. - The `Measure::_endBarLineGenerated` flag was not always restored properly by undo. This PR introduces the following fixes: - The `_generated` flag is consistently used for bar lines whose type can be reconstructed from the context and then do not need to be saved to the output file. - Normal bar lines are **always** created as generated: initially created by the Wizard, manually appended or inserted. - Bar lines with custom type (i.e. different from the type which can be expected according to the bar line context) are always flagged as non-generated, ensuring the custom type is written to the output file. - The `Measure::_endBarLineGenerated` flag is stored by `ChangeEndBarLineType()` and restore upon undo. - Some test reference scores, based on the inconsistent bar line `_generated` flag, have been uniformed. Notes: - Tests about measure (and then bar line) appending, inserting and relative undo's are already included in the `tst_parts` test suite. - Some inconsistencies remain in the management of custom bar line span and of system-initial bar lines: for the sake of simplicity, they will be dealt with in separate PR's.
2014-09-06 10:36:35 +02:00
setBarLineType(BarLineType(v.toInt()));
break;
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN:
setSpan(v.toInt());
break;
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN_FROM:
setSpanFrom(v.toInt());
break;
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN_TO:
setSpanTo(v.toInt());
break;
default:
return Element::setProperty(id, v);
}
2012-05-26 14:26:10 +02:00
score()->setLayoutAll(true);
2012-08-10 17:01:35 +02:00
return true;
2012-05-26 14:26:10 +02:00
}
2012-10-17 20:22:24 +02:00
//---------------------------------------------------------
// propertyDefault
//---------------------------------------------------------
QVariant BarLine::propertyDefault(P_ID propertyId) const
{
switch(propertyId) {
2014-05-26 18:18:01 +02:00
case P_ID::SUBTYPE:
// default subtype is the subtype of the measure, if any
if (parent() && parent()->type() == Element::Type::SEGMENT && static_cast<Segment*>(parent())->measure() )
return int(static_cast<Segment*>(parent())->measure()->endBarLineType());
return int(BarLineType::NORMAL);
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN:
// if there is a staff, default span is staff span
if (staff())
return staff()->barLineSpan();
// if no staff, default span is 1
return 1;
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN_FROM:
// if there is a staff, default From span is staff From span
if (staff())
return staff()->barLineFrom();
// if no staff, default From is from top
return 0;
2014-05-26 18:18:01 +02:00
case P_ID::BARLINE_SPAN_TO:
// if there is a staff, default To span is staff To span
if (staff())
return staff()->barLineTo();
// if no staff, assume a standard 5-line setup
return DEFAULT_BARLINE_TO;
default:
break;
}
return Element::propertyDefault(propertyId);
}
2013-05-13 18:49:17 +02:00
//---------------------------------------------------------
// nextElement
//---------------------------------------------------------
Element* BarLine::nextElement()
{
if (parent()->type() == Element::Type::SEGMENT)
return static_cast<Segment*>(parent())->firstInNextSegments(score()->inputState().prevTrack() / VOICES);
return parent()->nextElement();
}
//---------------------------------------------------------
// prevElement
//---------------------------------------------------------
Element* BarLine::prevElement()
{
if (parent()->type() == Element::Type::SEGMENT)
return static_cast<Segment*>(parent())->lastInPrevSegments(score()->inputState().prevTrack() / VOICES);
return parent()->prevElement();
}
//---------------------------------------------------------
// accessibleInfo
//---------------------------------------------------------
QString BarLine::accessibleInfo()
{
2015-02-25 11:54:31 +01:00
return QString("%1: %2").arg(Element::accessibleInfo()).arg(BarLine::userTypeName(this->barLineType()));
}
//---------------------------------------------------------
// accessibleExtraInfo
//---------------------------------------------------------
QString BarLine::accessibleExtraInfo()
{
if (parent()->type() == Element::Type::SEGMENT) {
Segment* seg = static_cast<Segment*>(parent());
QString rez = "";
foreach (Element* e, *el()) {
if (!score()->selectionFilter().canSelect(e)) continue;
rez = QString("%1 %2").arg(rez).arg(e->screenReaderInfo());
}
foreach (Element* e, seg->annotations()) {
if (!score()->selectionFilter().canSelect(e)) continue;
if (e->track() == track())
rez = QString("%1 %2").arg(rez).arg(e->screenReaderInfo());
}
Measure* m = seg->measure();
if (m) {
//jumps
foreach (Element* e, m->el()) {
if (!score()->selectionFilter().canSelect(e)) continue;
if (e->type() == Element::Type::JUMP)
rez= QString("%1 %2").arg(rez).arg(e->screenReaderInfo());
if (e->type() == Element::Type::MARKER) {
Marker* m = static_cast<Marker*>(e);
if (m->markerType() == Marker::Type::FINE)
rez = QString("%1 %2").arg(rez).arg(e->screenReaderInfo());
}
}
//markers
Measure* nextM = m->nextMeasureMM();
if (nextM) {
foreach (Element* e, nextM->el()) {
if (!score()->selectionFilter().canSelect(e)) continue;
if (e->type() == Element::Type::MARKER)
if (static_cast<Marker*>(e)->markerType() == Marker::Type::FINE)
continue; //added above^
rez = QString("%1 %2").arg(rez).arg(e->screenReaderInfo());
}
}
}
int tick = seg->tick();
auto spanners = score()->spannerMap().findOverlapping(tick, tick);
for (auto i = spanners.begin(); i < spanners.end(); i++) {
::Interval<Spanner*> interval = *i;
Spanner* s = interval.value;
if (!score()->selectionFilter().canSelect(s)) continue;
if (s->type() == Element::Type::VOLTA) {
if (s->tick() == tick)
rez = tr("%1 Start of %2").arg(rez).arg(s->screenReaderInfo());
if (s->tick2() == tick)
rez = tr("%1 End of %2").arg(rez).arg(s->screenReaderInfo());
}
}
return rez;
}
return Element::accessibleExtraInfo();
}
2013-05-13 18:49:17 +02:00
}