2012-05-26 14:26:10 +02:00
|
|
|
//=============================================================================
|
|
|
|
// MuseScore
|
|
|
|
// Music Composition & Notation
|
|
|
|
//
|
2016-01-04 14:48:58 +01:00
|
|
|
// Copyright (C) 2002-2016 Werner Schweer
|
2012-05-26 14:26:10 +02:00
|
|
|
//
|
|
|
|
// 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
|
|
|
|
//=============================================================================
|
|
|
|
|
2014-12-13 17:40:39 +01:00
|
|
|
#include "accidental.h"
|
2012-05-26 14:26:10 +02:00
|
|
|
#include "barline.h"
|
|
|
|
#include "beam.h"
|
2014-12-13 17:40:39 +01:00
|
|
|
#include "box.h"
|
|
|
|
#include "chord.h"
|
|
|
|
#include "clef.h"
|
|
|
|
#include "element.h"
|
2012-05-26 14:26:10 +02:00
|
|
|
#include "fingering.h"
|
2014-12-13 17:40:39 +01:00
|
|
|
#include "glissando.h"
|
|
|
|
#include "harmony.h"
|
|
|
|
#include "key.h"
|
|
|
|
#include "keysig.h"
|
2012-05-26 14:26:10 +02:00
|
|
|
#include "layoutbreak.h"
|
|
|
|
#include "layout.h"
|
2012-08-01 18:00:27 +02:00
|
|
|
#include "lyrics.h"
|
2014-12-13 17:40:39 +01:00
|
|
|
#include "marker.h"
|
|
|
|
#include "measure.h"
|
|
|
|
#include "mscore.h"
|
2014-02-22 11:19:44 +01:00
|
|
|
#include "notedot.h"
|
2014-12-13 17:40:39 +01:00
|
|
|
#include "note.h"
|
|
|
|
#include "ottava.h"
|
|
|
|
#include "page.h"
|
|
|
|
#include "part.h"
|
|
|
|
#include "repeat.h"
|
|
|
|
#include "score.h"
|
|
|
|
#include "segment.h"
|
|
|
|
#include "sig.h"
|
|
|
|
#include "slur.h"
|
|
|
|
#include "staff.h"
|
|
|
|
#include "stem.h"
|
|
|
|
#include "style.h"
|
|
|
|
#include "sym.h"
|
|
|
|
#include "system.h"
|
|
|
|
#include "text.h"
|
|
|
|
#include "tie.h"
|
|
|
|
#include "timesig.h"
|
2014-05-15 13:42:03 +02:00
|
|
|
#include "tremolo.h"
|
2014-12-13 17:40:39 +01:00
|
|
|
#include "tuplet.h"
|
|
|
|
#include "undo.h"
|
|
|
|
#include "utils.h"
|
|
|
|
#include "volta.h"
|
2016-01-04 14:48:58 +01:00
|
|
|
#include "breath.h"
|
|
|
|
#include "tempotext.h"
|
2016-02-10 13:40:34 +01:00
|
|
|
#include "systemdivider.h"
|
2016-05-19 13:15:34 +02:00
|
|
|
#include "hook.h"
|
2016-05-25 12:10:52 +02:00
|
|
|
#include "ambitus.h"
|
2016-07-19 20:35:06 +02:00
|
|
|
#include "hairpin.h"
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2013-05-13 18:49:17 +02:00
|
|
|
namespace Ms {
|
|
|
|
|
2014-12-30 21:14:31 +01:00
|
|
|
// #define PAGE_DEBUG
|
|
|
|
|
2015-01-05 13:17:04 +01:00
|
|
|
#ifdef PAGE_DEBUG
|
|
|
|
#define PAGEDBG(...) qDebug(__VA_ARGS__)
|
|
|
|
#else
|
|
|
|
#define PAGEDBG(...) ;
|
|
|
|
#endif
|
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// rebuildBspTree
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
void Score::rebuildBspTree()
|
|
|
|
{
|
2014-11-23 13:34:03 +01:00
|
|
|
for (Page* page : _pages)
|
|
|
|
page->rebuildBspTree();
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
|
|
|
// searchNote
|
|
|
|
// search for note or rest before or at tick position tick
|
|
|
|
// in staff
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
ChordRest* Score::searchNote(int tick, int track) const
|
|
|
|
{
|
|
|
|
ChordRest* ipe = 0;
|
2014-06-25 11:46:10 +02:00
|
|
|
Segment::Type st = Segment::Type::ChordRest;
|
2015-02-14 01:18:41 +01:00
|
|
|
for (Segment* segment = firstSegment(st); segment; segment = segment->next1(st)) {
|
2016-02-04 17:06:32 +01:00
|
|
|
ChordRest* cr = segment->cr(track);
|
2012-12-06 09:19:59 +01:00
|
|
|
if (!cr)
|
|
|
|
continue;
|
|
|
|
if (cr->tick() == tick)
|
|
|
|
return cr;
|
|
|
|
if (cr->tick() > tick)
|
|
|
|
return ipe ? ipe : cr;
|
|
|
|
ipe = cr;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
|
|
|
// layoutChords1
|
2014-03-05 23:45:58 +01:00
|
|
|
// - layout upstem and downstem chords
|
|
|
|
// - offset as necessary to avoid conflict
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
void Score::layoutChords1(Segment* segment, int staffIdx)
|
|
|
|
{
|
|
|
|
Staff* staff = Score::staff(staffIdx);
|
|
|
|
|
2013-05-23 15:39:14 +02:00
|
|
|
if (staff->isTabStaff())
|
2012-05-26 14:26:10 +02:00
|
|
|
return;
|
|
|
|
|
2016-04-27 16:33:30 +02:00
|
|
|
std::vector<Note*> upStemNotes;
|
|
|
|
std::vector<Note*> downStemNotes;
|
|
|
|
int upVoices = 0;
|
|
|
|
int downVoices = 0;
|
|
|
|
int startTrack = staffIdx * VOICES;
|
|
|
|
int endTrack = startTrack + VOICES;
|
2014-04-08 23:18:15 +02:00
|
|
|
qreal nominalWidth = noteHeadWidth() * staff->mag();
|
2016-04-27 16:33:30 +02:00
|
|
|
qreal maxUpWidth = 0.0;
|
2014-04-08 20:52:10 +02:00
|
|
|
qreal maxDownWidth = 0.0;
|
2016-04-27 16:33:30 +02:00
|
|
|
qreal maxUpMag = 0.0;
|
|
|
|
qreal maxDownMag = 0.0;
|
2014-03-05 23:45:58 +01:00
|
|
|
|
2015-01-30 19:33:54 +01:00
|
|
|
// dots and hooks can affect layout of notes as well as vice versa
|
2016-04-27 16:33:30 +02:00
|
|
|
int upDots = 0;
|
|
|
|
int downDots = 0;
|
|
|
|
bool upHooks = false;
|
|
|
|
bool downHooks = false;
|
|
|
|
|
2015-02-13 19:03:44 +01:00
|
|
|
// also check for grace notes
|
2016-04-27 16:33:30 +02:00
|
|
|
bool upGrace = false;
|
|
|
|
bool downGrace = false;
|
2014-03-08 07:43:24 +01:00
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
for (int track = startTrack; track < endTrack; ++track) {
|
2016-02-10 18:35:35 +01:00
|
|
|
Element* e = segment->element(track);
|
|
|
|
if (e && e->isChord()) {
|
2016-02-17 14:54:23 +01:00
|
|
|
Chord* chord = toChord(e);
|
2015-02-13 19:03:44 +01:00
|
|
|
bool hasGraceBefore = false;
|
2014-03-05 23:45:58 +01:00
|
|
|
for (Chord* c : chord->graceNotes()) {
|
2015-02-13 19:03:44 +01:00
|
|
|
if (c->isGraceBefore())
|
|
|
|
hasGraceBefore = true;
|
2016-02-04 17:06:32 +01:00
|
|
|
layoutChords2(c->notes(), c->up()); // layout grace note noteheads
|
|
|
|
layoutChords3(c->notes(), staff, 0); // layout grace note chords
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
2014-03-07 03:43:41 +01:00
|
|
|
if (chord->up()) {
|
|
|
|
++upVoices;
|
2016-02-06 22:03:43 +01:00
|
|
|
upStemNotes.insert(upStemNotes.end(), chord->notes().begin(), chord->notes().end());
|
2016-02-04 17:06:32 +01:00
|
|
|
upDots = qMax(upDots, chord->dots());
|
2014-04-08 23:18:15 +02:00
|
|
|
maxUpMag = qMax(maxUpMag, chord->mag());
|
2015-01-30 19:33:54 +01:00
|
|
|
if (!upHooks)
|
|
|
|
upHooks = chord->hook();
|
2015-02-13 19:03:44 +01:00
|
|
|
if (hasGraceBefore)
|
|
|
|
upGrace = true;
|
2014-03-07 03:43:41 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
++downVoices;
|
2016-02-06 22:03:43 +01:00
|
|
|
downStemNotes.insert(downStemNotes.end(), chord->notes().begin(), chord->notes().end());
|
2014-03-08 07:43:24 +01:00
|
|
|
downDots = qMax(downDots, chord->dots());
|
2014-04-08 23:18:15 +02:00
|
|
|
maxDownMag = qMax(maxDownMag, chord->mag());
|
2015-01-30 19:33:54 +01:00
|
|
|
if (!downHooks)
|
|
|
|
downHooks = chord->hook();
|
2015-02-13 19:03:44 +01:00
|
|
|
if (hasGraceBefore)
|
|
|
|
downGrace = true;
|
2014-03-07 03:43:41 +01:00
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
2014-03-05 23:45:58 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (upVoices + downVoices) {
|
|
|
|
// TODO: use track as secondary sort criteria?
|
|
|
|
// otherwise there might be issues with unisons between voices
|
|
|
|
// in some corner cases
|
2014-03-05 23:45:58 +01:00
|
|
|
|
2016-04-27 16:33:30 +02:00
|
|
|
maxUpWidth = nominalWidth * maxUpMag;
|
2016-01-04 14:48:58 +01:00
|
|
|
maxDownWidth = nominalWidth * maxDownMag;
|
2014-04-08 20:52:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// layout upstem noteheads
|
|
|
|
if (upVoices > 1) {
|
|
|
|
qSort(upStemNotes.begin(), upStemNotes.end(),
|
|
|
|
[](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } );
|
2015-02-18 07:47:16 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (upVoices) {
|
|
|
|
qreal hw = layoutChords2(upStemNotes, true);
|
|
|
|
maxUpWidth = qMax(maxUpWidth, hw);
|
2015-02-18 07:47:16 +01:00
|
|
|
}
|
2014-03-05 23:45:58 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// layout downstem noteheads
|
|
|
|
if (downVoices > 1) {
|
|
|
|
qSort(downStemNotes.begin(), downStemNotes.end(),
|
|
|
|
[](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } );
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (downVoices) {
|
|
|
|
qreal hw = layoutChords2(downStemNotes, false);
|
|
|
|
maxDownWidth = qMax(maxDownWidth, hw);
|
|
|
|
}
|
|
|
|
|
2016-02-06 11:41:16 +01:00
|
|
|
qreal sp = staff->spatium();
|
|
|
|
qreal upOffset = 0.0; // offset to apply to upstem chords
|
|
|
|
qreal downOffset = 0.0; // offset to apply to downstem chords
|
|
|
|
qreal dotAdjust = 0.0; // additional chord offset to account for dots
|
|
|
|
qreal dotAdjustThreshold = 0.0; // if it exceeds this amount
|
2016-01-04 14:48:58 +01:00
|
|
|
|
|
|
|
// centering adjustments for whole note, breve, and small chords
|
|
|
|
qreal centerUp = 0.0; // offset to apply in order to center upstem chords
|
|
|
|
qreal oversizeUp = 0.0; // adjustment to oversized upstem chord needed if laid out to the right
|
|
|
|
qreal centerDown = 0.0; // offset to apply in order to center downstem chords
|
|
|
|
qreal centerAdjustUp = 0.0; // adjustment to upstem chord needed after centering donwstem chord
|
|
|
|
qreal centerAdjustDown = 0.0; // adjustment to downstem chord needed after centering upstem chord
|
|
|
|
|
|
|
|
// only center chords if they differ from nominal by at least this amount
|
|
|
|
// this avoids unnecessary centering on differences due only to floating point roundoff
|
|
|
|
// it also allows for the possibility of disabling centering
|
|
|
|
// for notes only "slightly" larger than nominal, like half notes
|
|
|
|
// but this will result in them not being aligned with each other between voices
|
|
|
|
// unless you change to left alignment as described in the comments below
|
|
|
|
qreal centerThreshold = 0.01 * sp;
|
|
|
|
|
|
|
|
// amount by which actual width exceeds nominal, adjusted for staff mag() only
|
|
|
|
qreal headDiff = maxUpWidth - nominalWidth;
|
|
|
|
// amount by which actual width exceeds nominal, adjusted for staff & chord/note mag()
|
|
|
|
qreal headDiff2 = maxUpWidth - nominalWidth * (maxUpMag / staff->mag());
|
|
|
|
if (headDiff > centerThreshold) {
|
|
|
|
// larger than nominal
|
|
|
|
centerUp = headDiff * -0.5;
|
|
|
|
// maxUpWidth is true width, but we no longer will care about that
|
|
|
|
// instead, we care only about portion to right of origin
|
|
|
|
maxUpWidth += centerUp;
|
|
|
|
// to left align rather than center, delete both of the above
|
|
|
|
if (headDiff2 > centerThreshold) {
|
|
|
|
// if max notehead is wider than nominal with chord/note mag() applied
|
|
|
|
// then noteheads extend to left of origin
|
|
|
|
// because stemPosX() is based on nominal width
|
|
|
|
// so we need to correct for that too
|
|
|
|
centerUp += headDiff2;
|
|
|
|
oversizeUp = headDiff2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (-headDiff > centerThreshold) {
|
|
|
|
// smaller than nominal
|
|
|
|
centerUp = -headDiff * 0.5;
|
|
|
|
if (headDiff2 > centerThreshold) {
|
|
|
|
// max notehead is wider than nominal with chord/note mag() applied
|
|
|
|
// perform same adjustment as above
|
|
|
|
centerUp += headDiff2;
|
|
|
|
oversizeUp = headDiff2;
|
|
|
|
}
|
|
|
|
centerAdjustDown = centerUp;
|
|
|
|
}
|
|
|
|
|
|
|
|
headDiff = maxDownWidth - nominalWidth;
|
|
|
|
if (headDiff > centerThreshold) {
|
|
|
|
// larger than nominal
|
|
|
|
centerDown = headDiff * -0.5;
|
|
|
|
// to left align rather than center, change the above to
|
|
|
|
//centerAdjustUp = headDiff;
|
|
|
|
maxDownWidth = nominalWidth - centerDown;
|
|
|
|
}
|
|
|
|
else if (-headDiff > centerThreshold) {
|
|
|
|
// smaller than nominal
|
|
|
|
centerDown = -headDiff * 0.5;
|
|
|
|
centerAdjustUp = centerDown;
|
|
|
|
}
|
|
|
|
|
|
|
|
// handle conflict between upstem and downstem chords
|
|
|
|
|
|
|
|
if (upVoices && downVoices) {
|
2016-02-06 22:03:43 +01:00
|
|
|
Note* bottomUpNote = upStemNotes.front();
|
2016-04-27 16:33:30 +02:00
|
|
|
Note* topDownNote = downStemNotes.back();
|
2016-01-04 14:48:58 +01:00
|
|
|
int separation;
|
|
|
|
if (bottomUpNote->chord()->staffMove() == topDownNote->chord()->staffMove())
|
|
|
|
separation = topDownNote->line() - bottomUpNote->line();
|
|
|
|
else
|
|
|
|
separation = 2; // no conflict
|
2016-02-06 22:03:43 +01:00
|
|
|
QVector<Note*> overlapNotes;
|
|
|
|
overlapNotes.reserve(8);
|
2016-01-04 14:48:58 +01:00
|
|
|
|
|
|
|
if (separation == 1) {
|
|
|
|
// second
|
|
|
|
downOffset = maxUpWidth;
|
|
|
|
// align stems if present, leave extra room if not
|
|
|
|
if (topDownNote->chord()->stem() && bottomUpNote->chord()->stem())
|
|
|
|
downOffset -= topDownNote->chord()->stem()->lineWidth();
|
2014-03-05 23:45:58 +01:00
|
|
|
else
|
2016-01-04 14:48:58 +01:00
|
|
|
downOffset += 0.1 * sp;
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
else if (separation < 1) {
|
|
|
|
|
|
|
|
// overlap (possibly unison)
|
|
|
|
|
|
|
|
// build list of overlapping notes
|
|
|
|
for (int i = 0, n = upStemNotes.size(); i < n; ++i) {
|
|
|
|
if (upStemNotes[i]->line() >= topDownNote->line() - 1)
|
|
|
|
overlapNotes.append(upStemNotes[i]);
|
|
|
|
else
|
|
|
|
break;
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
for (int i = downStemNotes.size() - 1; i >= 0; --i) {
|
|
|
|
if (downStemNotes[i]->line() <= bottomUpNote->line() + 1)
|
|
|
|
overlapNotes.append(downStemNotes[i]);
|
|
|
|
else
|
2014-03-05 23:45:58 +01:00
|
|
|
break;
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
qSort(overlapNotes.begin(), overlapNotes.end(),
|
|
|
|
[](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } );
|
|
|
|
|
|
|
|
// determine nature of overlap
|
|
|
|
bool shareHeads = true; // can all overlapping notes share heads?
|
|
|
|
bool matchPending = false; // looking for a unison match
|
|
|
|
bool conflictUnison = false; // unison found
|
|
|
|
bool conflictSecondUpHigher = false; // second found
|
|
|
|
bool conflictSecondDownHigher = false; // second found
|
|
|
|
int lastLine = 1000;
|
|
|
|
Note* p = overlapNotes[0];
|
|
|
|
for (int i = 0, count = overlapNotes.size(); i < count; ++i) {
|
|
|
|
Note* n = overlapNotes[i];
|
|
|
|
NoteHead::Type nHeadType;
|
|
|
|
NoteHead::Type pHeadType;
|
|
|
|
Chord* nchord = n->chord();
|
|
|
|
Chord* pchord = p->chord();
|
|
|
|
if (n->mirror()) {
|
2014-03-05 23:45:58 +01:00
|
|
|
if (separation < 0) {
|
2016-01-04 14:48:58 +01:00
|
|
|
// don't try to share heads if there is any mirroring
|
2014-03-05 23:45:58 +01:00
|
|
|
shareHeads = false;
|
2016-01-04 14:48:58 +01:00
|
|
|
// don't worry about conflicts involving mirrored notes
|
|
|
|
continue;
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
int line = n->line();
|
|
|
|
int d = lastLine - line;
|
|
|
|
switch (d) {
|
|
|
|
case 0:
|
|
|
|
// unison
|
|
|
|
conflictUnison = true;
|
|
|
|
matchPending = false;
|
|
|
|
nHeadType = (n->headType() == NoteHead::Type::HEAD_AUTO) ? n->chord()->durationType().headType() : n->headType();
|
|
|
|
pHeadType = (p->headType() == NoteHead::Type::HEAD_AUTO) ? p->chord()->durationType().headType() : p->headType();
|
|
|
|
// the most important rules for sharing noteheads on unisons between voices are
|
|
|
|
// that notes must be one same line with same tpc
|
|
|
|
// noteheads must be unmirrored and of same group
|
|
|
|
// and chords must be same size (or else sharing code won't work)
|
|
|
|
if (n->headGroup() != p->headGroup() || n->tpc() != p->tpc() || n->mirror() || p->mirror() || nchord->small() != pchord->small()) {
|
|
|
|
shareHeads = false;
|
2014-04-22 04:04:43 +02:00
|
|
|
}
|
|
|
|
else {
|
2016-01-04 14:48:58 +01:00
|
|
|
// noteheads are potentially shareable
|
|
|
|
// it is more subjective at this point
|
|
|
|
// current default is to require *either* of the following:
|
|
|
|
// 1) both chords have same number of dots, both have stems, and both noteheads are same type and are full size (automatic match)
|
|
|
|
// or 2) one or more of the noteheads is not of type AUTO, but is explicitly set to match the other (user-forced match)
|
|
|
|
// or 3) exactly one of the noteheads is invisible (user-forced match)
|
|
|
|
// thus user can force notes to be shared despite differing number of dots or either being stemless
|
|
|
|
// by setting one of the notehead types to match the other or by making one notehead invisible
|
|
|
|
// TODO: consider adding a style option, staff properties, or note property to control sharing
|
|
|
|
if ((nchord->dots() != pchord->dots() || !nchord->stem() || !pchord->stem() || nHeadType != pHeadType || n->small() || p->small()) &&
|
|
|
|
((n->headType() == NoteHead::Type::HEAD_AUTO && p->headType() == NoteHead::Type::HEAD_AUTO) || nHeadType != pHeadType) &&
|
|
|
|
(n->visible() == p->visible())) {
|
|
|
|
shareHeads = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
// second
|
|
|
|
// trust that this won't be a problem for single unison
|
|
|
|
if (separation < 0) {
|
|
|
|
if (n->chord()->up())
|
|
|
|
conflictSecondUpHigher = true;
|
2014-04-22 04:04:43 +02:00
|
|
|
else
|
2016-01-04 14:48:58 +01:00
|
|
|
conflictSecondDownHigher = true;
|
|
|
|
shareHeads = false;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// no conflict
|
|
|
|
if (matchPending)
|
|
|
|
shareHeads = false;
|
|
|
|
matchPending = true;
|
|
|
|
}
|
|
|
|
p = n;
|
|
|
|
lastLine = line;
|
|
|
|
}
|
|
|
|
if (matchPending)
|
|
|
|
shareHeads = false;
|
|
|
|
|
|
|
|
// calculate offsets
|
|
|
|
if (shareHeads) {
|
|
|
|
for (int i = overlapNotes.size() - 1; i >= 1; i -= 2) {
|
|
|
|
Note* p = overlapNotes[i-1];
|
|
|
|
Note* n = overlapNotes[i];
|
|
|
|
if (!(p->chord()->isNudged() || n->chord()->isNudged())) {
|
|
|
|
if (p->chord()->dots() == n->chord()->dots()) {
|
|
|
|
// hide one set dots
|
|
|
|
bool onLine = !(p->line() & 1);
|
|
|
|
if (onLine) {
|
|
|
|
// hide dots for lower voice
|
|
|
|
if (p->voice() & 1)
|
|
|
|
p->setDotsHidden(true);
|
|
|
|
else
|
|
|
|
n->setDotsHidden(true);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// hide dots for upper voice
|
|
|
|
if (!(p->voice() & 1))
|
|
|
|
p->setDotsHidden(true);
|
|
|
|
else
|
|
|
|
n->setDotsHidden(true);
|
|
|
|
}
|
2014-04-22 04:04:43 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
// formerly we hid noteheads in an effort to fix playback
|
|
|
|
// but this doesn't work for cases where noteheads cannot be shared
|
|
|
|
// so better to solve the problem elsewhere
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else if (conflictUnison && separation == 0 && (!downGrace || upGrace))
|
|
|
|
downOffset = maxUpWidth + 0.3 * sp;
|
|
|
|
else if (conflictUnison)
|
|
|
|
upOffset = maxDownWidth + 0.3 * sp;
|
|
|
|
else if (conflictSecondUpHigher)
|
|
|
|
upOffset = maxDownWidth + 0.2 * sp;
|
|
|
|
else if ((downHooks && !upHooks) && !(upDots && !downDots))
|
2014-03-08 07:43:24 +01:00
|
|
|
downOffset = maxUpWidth + 0.3 * sp;
|
2016-01-04 14:48:58 +01:00
|
|
|
else if (conflictSecondDownHigher) {
|
|
|
|
if (downDots && !upDots)
|
|
|
|
downOffset = maxUpWidth + 0.3 * sp;
|
|
|
|
else {
|
|
|
|
upOffset = maxDownWidth - 0.2 * sp;
|
|
|
|
if (downHooks)
|
|
|
|
upOffset += 0.3 * sp;
|
|
|
|
}
|
|
|
|
}
|
2015-01-30 19:33:54 +01:00
|
|
|
else {
|
2016-01-04 14:48:58 +01:00
|
|
|
// no direct conflict, so parts can overlap (downstem on left)
|
|
|
|
// just be sure that stems clear opposing noteheads
|
|
|
|
qreal clearLeft = 0.0, clearRight = 0.0;
|
|
|
|
if (topDownNote->chord()->stem())
|
|
|
|
clearLeft = topDownNote->chord()->stem()->lineWidth() + 0.3 * sp;
|
|
|
|
if (bottomUpNote->chord()->stem())
|
|
|
|
clearRight = bottomUpNote->chord()->stem()->lineWidth() + qMax(maxDownWidth - maxUpWidth, 0.0) + 0.3 * sp;
|
|
|
|
else
|
|
|
|
downDots = 0; // no need to adjust for dots in this case
|
|
|
|
upOffset = qMax(clearLeft, clearRight);
|
|
|
|
if (downHooks) {
|
|
|
|
// we will need more space to avoid collision with hook
|
|
|
|
// but we won't need as much dot adjustment
|
|
|
|
upOffset = qMax(upOffset, maxDownWidth + 0.1 * sp);
|
|
|
|
dotAdjustThreshold = maxUpWidth - 0.3 * sp;
|
|
|
|
}
|
|
|
|
// if downstem chord is small, don't center
|
|
|
|
// and we might not need as much dot adjustment either
|
|
|
|
if (centerDown > 0.0) {
|
|
|
|
centerDown = 0.0;
|
|
|
|
centerAdjustUp = 0.0;
|
|
|
|
dotAdjustThreshold = (upOffset - maxDownWidth) + maxUpWidth - 0.3 * sp;
|
|
|
|
}
|
2015-01-30 19:33:54 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
|
2014-03-08 07:43:24 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
|
|
|
|
// adjust for dots
|
|
|
|
if ((upDots && !downDots) || (downDots && !upDots)) {
|
|
|
|
// only one sets of dots
|
|
|
|
// place between chords
|
|
|
|
int dots;
|
|
|
|
qreal mag;
|
|
|
|
if (upDots) {
|
|
|
|
dots = upDots;
|
|
|
|
mag = maxUpMag;
|
2015-01-30 19:33:54 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
|
|
|
dots = downDots;
|
|
|
|
mag = maxDownMag;
|
2014-08-11 06:57:11 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal dotWidth = segment->symWidth(SymId::augmentationDot);
|
|
|
|
// first dot
|
2016-03-02 13:20:19 +01:00
|
|
|
dotAdjust = styleP(StyleIdx::dotNoteDistance) + dotWidth;
|
2016-01-04 14:48:58 +01:00
|
|
|
// additional dots
|
|
|
|
if (dots > 1)
|
2016-03-02 13:20:19 +01:00
|
|
|
dotAdjust += styleP(StyleIdx::dotDotDistance) * (dots - 1);
|
2016-01-04 14:48:58 +01:00
|
|
|
dotAdjust *= mag;
|
|
|
|
// only by amount over threshold
|
|
|
|
dotAdjust = qMax(dotAdjust - dotAdjustThreshold, 0.0);
|
2014-03-07 03:43:41 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (separation == 1)
|
|
|
|
dotAdjust += 0.1 * sp;
|
2014-03-08 07:43:24 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// apply chord offsets
|
|
|
|
for (int track = startTrack; track < endTrack; ++track) {
|
2016-02-10 18:35:35 +01:00
|
|
|
Element* e = segment->element(track);
|
|
|
|
if (e && e->isChord()) {
|
2016-02-17 14:54:23 +01:00
|
|
|
Chord* chord = toChord(e);
|
2016-01-04 14:48:58 +01:00
|
|
|
if (chord->up()) {
|
|
|
|
if (upOffset != 0.0) {
|
|
|
|
chord->rxpos() += upOffset + centerAdjustUp + oversizeUp;
|
|
|
|
if (downDots && !upDots)
|
|
|
|
chord->rxpos() += dotAdjust;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
chord->rxpos() += centerUp;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (downOffset != 0.0) {
|
|
|
|
chord->rxpos() += downOffset + centerAdjustDown;
|
|
|
|
if (upDots && !downDots)
|
|
|
|
chord->rxpos() += dotAdjust;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
chord->rxpos() += centerDown;
|
|
|
|
}
|
2014-04-08 23:18:15 +02:00
|
|
|
}
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// layout chords
|
2016-02-06 22:03:43 +01:00
|
|
|
std::vector<Note*> notes;
|
2016-01-04 14:48:58 +01:00
|
|
|
if (upVoices)
|
2016-02-06 22:03:43 +01:00
|
|
|
notes.insert(notes.end(), upStemNotes.begin(), upStemNotes.end());
|
2016-01-04 14:48:58 +01:00
|
|
|
if (downVoices)
|
2016-02-06 22:03:43 +01:00
|
|
|
notes.insert(notes.end(), downStemNotes.begin(), downStemNotes.end());
|
2016-01-04 14:48:58 +01:00
|
|
|
if (upVoices + downVoices > 1)
|
|
|
|
qSort(notes.begin(), notes.end(),
|
|
|
|
[](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } );
|
|
|
|
layoutChords3(notes, staff, segment);
|
2014-04-08 20:52:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (int track = startTrack; track < endTrack; ++track) {
|
|
|
|
Element* e = segment->element(track);
|
2016-01-04 14:48:58 +01:00
|
|
|
if (e)
|
|
|
|
e->layout();
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
2013-06-10 21:13:04 +02:00
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2014-03-05 23:45:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// layoutChords2
|
2014-03-09 07:09:40 +01:00
|
|
|
// - determine which notes need mirroring
|
2014-03-16 07:55:39 +01:00
|
|
|
// - this is called once for each stem direction
|
|
|
|
// eg, once for voices 1&3, once for 2&4
|
|
|
|
// with all notes combined and sorted to resemble one chord
|
2014-04-08 20:52:10 +02:00
|
|
|
// - return maximum non-mirrored notehead width
|
2014-03-05 23:45:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-02-06 22:03:43 +01:00
|
|
|
qreal Score::layoutChords2(std::vector<Note*>& notes, bool up)
|
2013-06-10 21:13:04 +02:00
|
|
|
{
|
2012-05-26 14:26:10 +02:00
|
|
|
int startIdx, endIdx, incIdx;
|
2014-04-08 20:52:10 +02:00
|
|
|
qreal maxWidth = 0.0;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2014-03-05 23:45:58 +01:00
|
|
|
// loop in correct direction so that first encountered notehead wins conflict
|
|
|
|
if (up) {
|
|
|
|
// loop bottom up
|
2012-05-26 14:26:10 +02:00
|
|
|
startIdx = 0;
|
2014-03-05 23:45:58 +01:00
|
|
|
endIdx = notes.size();
|
|
|
|
incIdx = 1;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
else {
|
2014-03-05 23:45:58 +01:00
|
|
|
// loop top down
|
2012-05-26 14:26:10 +02:00
|
|
|
startIdx = notes.size() - 1;
|
2014-03-05 23:45:58 +01:00
|
|
|
endIdx = -1;
|
|
|
|
incIdx = -1;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-05-03 01:21:42 +02:00
|
|
|
int ll = 1000; // line of previous notehead
|
2014-03-05 23:45:58 +01:00
|
|
|
// hack: start high so first note won't show as conflict
|
2014-05-07 05:56:46 +02:00
|
|
|
bool lvisible = false; // was last note visible?
|
2016-05-03 01:21:42 +02:00
|
|
|
bool mirror = false; // should current notehead be mirrored?
|
2014-05-07 05:56:46 +02:00
|
|
|
// value is retained and may be used on next iteration
|
|
|
|
// to track mirror status of previous note
|
2016-05-03 01:21:42 +02:00
|
|
|
bool isLeft = notes[startIdx]->chord()->up(); // is notehead on left?
|
2014-05-07 05:56:46 +02:00
|
|
|
int lmove = notes[startIdx]->chord()->staffMove(); // staff offset of last note (for cross-staff beaming)
|
2012-05-26 14:26:10 +02:00
|
|
|
|
|
|
|
for (int idx = startIdx; idx != endIdx; idx += incIdx) {
|
2014-03-05 23:45:58 +01:00
|
|
|
Note* note = notes[idx]; // current note
|
|
|
|
int line = note->line(); // line of current note
|
2012-05-26 14:26:10 +02:00
|
|
|
Chord* chord = note->chord();
|
2014-05-07 05:56:46 +02:00
|
|
|
int move = chord->staffMove(); // staff offset of current note
|
2014-03-05 23:45:58 +01:00
|
|
|
|
|
|
|
// there is a conflict
|
2014-05-07 05:56:46 +02:00
|
|
|
// if this is same or adjacent line as previous note (and chords are on same staff!)
|
|
|
|
// but no need to do anything about it if either note is invisible
|
|
|
|
bool conflict = (qAbs(ll - line) < 2) && (lmove == move) && note->visible() && lvisible;
|
2014-03-05 23:45:58 +01:00
|
|
|
|
|
|
|
// this note is on opposite side of stem as previous note
|
|
|
|
// if there is a conflict
|
|
|
|
// or if this the first note *after* a conflict
|
|
|
|
if (conflict || (chord->up() != isLeft))
|
2012-05-26 14:26:10 +02:00
|
|
|
isLeft = !isLeft;
|
|
|
|
|
2014-05-07 05:56:46 +02:00
|
|
|
// determine if we would need to mirror current note
|
|
|
|
// to get it to the correct side
|
|
|
|
// this would be needed to get a note to left or downstem or right of upstem
|
|
|
|
// whether or not we actually do this is determined later (based on user mirror property)
|
|
|
|
bool nmirror = (chord->up() != isLeft);
|
|
|
|
|
2014-05-09 18:17:52 +02:00
|
|
|
// by default, notes and dots are not hidden
|
2016-05-03 01:21:42 +02:00
|
|
|
// this may be changed later to allow unisons to share noteheads
|
2012-05-26 14:26:10 +02:00
|
|
|
note->setHidden(false);
|
2014-02-22 11:19:44 +01:00
|
|
|
note->setDotsHidden(false);
|
|
|
|
|
2014-05-07 05:56:46 +02:00
|
|
|
// be sure chord position is initialized
|
|
|
|
// chord may be moved to the right later
|
|
|
|
// if there are conflicts between voices
|
2012-05-26 14:26:10 +02:00
|
|
|
chord->rxpos() = 0.0;
|
|
|
|
|
2014-05-07 05:56:46 +02:00
|
|
|
// let user mirror property override the default we calculated
|
2014-06-26 10:53:57 +02:00
|
|
|
if (note->userMirror() == MScore::DirectionH::AUTO) {
|
2012-05-26 14:26:10 +02:00
|
|
|
mirror = nmirror;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
mirror = note->chord()->up();
|
2014-06-26 10:53:57 +02:00
|
|
|
if (note->userMirror() == MScore::DirectionH::LEFT)
|
2012-05-26 14:26:10 +02:00
|
|
|
mirror = !mirror;
|
|
|
|
}
|
|
|
|
note->setMirror(mirror);
|
2014-05-07 05:56:46 +02:00
|
|
|
|
|
|
|
// accumulate return value
|
2014-04-08 20:52:10 +02:00
|
|
|
if (!mirror)
|
|
|
|
maxWidth = qMax(maxWidth, note->headWidth());
|
2014-05-07 05:56:46 +02:00
|
|
|
|
|
|
|
// prepare for next iteration
|
2016-02-06 22:03:43 +01:00
|
|
|
lvisible = note->visible();
|
|
|
|
lmove = move;
|
|
|
|
ll = line;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2014-04-08 20:52:10 +02:00
|
|
|
return maxWidth;
|
2014-03-05 23:45:58 +01:00
|
|
|
}
|
|
|
|
|
2014-03-12 22:52:59 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// AcEl
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
struct AcEl {
|
|
|
|
Note* note;
|
|
|
|
qreal x; // actual x position of this accidental relative to origin
|
|
|
|
qreal top; // top of accidental bbox relative to staff
|
|
|
|
qreal bottom; // bottom of accidental bbox relative to staff
|
|
|
|
int line; // line of note
|
2014-03-19 06:22:12 +01:00
|
|
|
int next; // index of next accidental of same pitch class (ascending list)
|
2014-03-14 01:19:36 +01:00
|
|
|
qreal width; // width of accidental
|
2014-03-16 07:55:39 +01:00
|
|
|
qreal ascent; // amount (in sp) vertical strokes extend above body
|
|
|
|
qreal descent; // amount (in sp) vertical strokes extend below body
|
|
|
|
qreal rightClear; // amount (in sp) to right of last vertical stroke above body
|
|
|
|
qreal leftClear; // amount (in sp) to left of last vertical stroke below body
|
2014-03-12 22:52:59 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
|
|
|
// resolveAccidentals
|
2014-05-12 19:13:48 +02:00
|
|
|
// lx = calculated position of rightmost edge of left accidental relative to origin
|
2014-03-12 22:52:59 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2014-05-14 05:39:02 +02:00
|
|
|
static bool resolveAccidentals(AcEl* left, AcEl* right, qreal& lx, qreal pd, qreal sp)
|
2014-03-12 22:52:59 +01:00
|
|
|
{
|
|
|
|
AcEl* upper;
|
|
|
|
AcEl* lower;
|
|
|
|
if (left->line >= right->line) {
|
|
|
|
upper = right;
|
|
|
|
lower = left;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
upper = left;
|
|
|
|
lower = right;
|
|
|
|
}
|
|
|
|
|
2014-03-16 07:55:39 +01:00
|
|
|
qreal gap = lower->top - upper->bottom;
|
2014-03-12 22:52:59 +01:00
|
|
|
|
2014-03-16 07:55:39 +01:00
|
|
|
// no conflict at all if there is sufficient vertical gap between accidentals
|
2014-08-10 19:39:52 +02:00
|
|
|
// the arrangement of accidentals into columns assumes accidentals an octave apart *do* clear
|
|
|
|
if (gap >= pd || lower->line - upper->line >= 7)
|
2014-03-12 22:52:59 +01:00
|
|
|
return false;
|
2014-03-16 07:55:39 +01:00
|
|
|
|
2014-05-12 05:00:54 +02:00
|
|
|
qreal allowableOverlap = qMax(upper->descent, lower->ascent) - pd;
|
2014-03-16 07:55:39 +01:00
|
|
|
|
|
|
|
// accidentals that are "close" (small gap or even slight overlap)
|
2014-08-10 19:39:52 +02:00
|
|
|
if (qAbs(gap) <= 0.33 * sp) {
|
2014-03-16 07:55:39 +01:00
|
|
|
// acceptable with slight offset
|
|
|
|
// if one of the accidentals can subsume the overlap
|
|
|
|
// and both accidentals allow it
|
|
|
|
if (-gap <= allowableOverlap && qMin(upper->descent, lower->ascent) > 0.0) {
|
2014-05-12 19:13:48 +02:00
|
|
|
qreal align = qMin(left->width, right->width);
|
2014-03-16 07:55:39 +01:00
|
|
|
lx = qMin(lx, right->x + align - pd);
|
2014-05-12 19:13:48 +02:00
|
|
|
return true;
|
2014-03-16 07:55:39 +01:00
|
|
|
}
|
2014-03-12 22:52:59 +01:00
|
|
|
}
|
|
|
|
|
2014-05-12 19:13:48 +02:00
|
|
|
// amount by which overlapping accidentals will be separated
|
|
|
|
// for example, the vertical stems of two flat signs
|
|
|
|
// these need more space than we would need between non-overlapping accidentals
|
2014-05-14 05:39:02 +02:00
|
|
|
qreal overlapShift = pd * 1.41;
|
2014-05-12 19:13:48 +02:00
|
|
|
|
2014-03-16 07:55:39 +01:00
|
|
|
// accidentals with more significant overlap
|
|
|
|
// acceptable if one accidental can subsume overlap
|
|
|
|
if (left == lower && -gap <= allowableOverlap) {
|
|
|
|
qreal offset = qMax(left->rightClear, right->leftClear);
|
2014-05-12 19:13:48 +02:00
|
|
|
offset = qMin(offset, left->width) - overlapShift;
|
|
|
|
lx = qMin(lx, right->x + offset);
|
|
|
|
return true;
|
2014-03-12 22:52:59 +01:00
|
|
|
}
|
|
|
|
|
2014-03-16 07:55:39 +01:00
|
|
|
// accidentals with even more overlap
|
|
|
|
// can work if both accidentals can subsume overlap
|
2014-05-12 05:00:54 +02:00
|
|
|
if (left == lower && -gap <= upper->descent + lower->ascent - pd) {
|
2014-05-12 19:13:48 +02:00
|
|
|
qreal offset = qMin(left->rightClear, right->leftClear) - overlapShift;
|
2014-03-16 07:55:39 +01:00
|
|
|
if (offset > 0.0) {
|
2014-05-12 19:13:48 +02:00
|
|
|
lx = qMin(lx, right->x + offset);
|
|
|
|
return true;
|
2014-03-16 07:55:39 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// otherwise, there is real conflict
|
2014-05-12 19:13:48 +02:00
|
|
|
lx = qMin(lx, right->x - pd);
|
2014-03-12 22:52:59 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-03-14 01:19:36 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// layoutAccidental
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-02-06 22:03:43 +01:00
|
|
|
static qreal layoutAccidental(AcEl* me, AcEl* above, AcEl* below, qreal colOffset, QVector<Note*>& leftNotes, qreal pnd, qreal pd, qreal sp)
|
2014-03-14 01:19:36 +01:00
|
|
|
{
|
2014-03-19 06:22:12 +01:00
|
|
|
qreal lx = colOffset;
|
2014-08-10 19:39:52 +02:00
|
|
|
Accidental* acc = me->note->accidental();
|
|
|
|
qreal mag = acc->mag();
|
|
|
|
pnd *= mag;
|
|
|
|
pd *= mag;
|
2014-03-14 01:19:36 +01:00
|
|
|
|
|
|
|
// extra space for ledger lines
|
2014-03-14 22:50:25 +01:00
|
|
|
if (me->line <= -2 || me->line >= me->note->staff()->lines() * 2)
|
2014-03-19 06:22:12 +01:00
|
|
|
lx = qMin(lx, -0.2 * sp);
|
2014-03-14 01:19:36 +01:00
|
|
|
|
|
|
|
// clear left notes
|
|
|
|
int lns = leftNotes.size();
|
|
|
|
for (int i = 0; i < lns; ++i) {
|
|
|
|
Note* ln = leftNotes[i];
|
|
|
|
int lnLine = ln->line();
|
2014-03-16 07:55:39 +01:00
|
|
|
qreal lnTop = (lnLine - 1) * 0.5 * sp;
|
2014-03-14 01:19:36 +01:00
|
|
|
qreal lnBottom = lnTop + sp;
|
2014-03-16 07:55:39 +01:00
|
|
|
if (me->top - lnBottom <= pnd && lnTop - me->bottom <= pnd) {
|
2014-03-14 01:19:36 +01:00
|
|
|
// undercut note above if possible
|
2014-05-12 05:00:54 +02:00
|
|
|
if (lnBottom - me->top <= me->ascent - pnd)
|
2014-08-10 19:39:52 +02:00
|
|
|
lx = qMin(lx, ln->x() + ln->chord()->x() + me->rightClear);
|
2014-03-14 01:19:36 +01:00
|
|
|
else
|
2014-08-10 19:39:52 +02:00
|
|
|
lx = qMin(lx, ln->x() + ln->chord()->x());
|
2014-03-14 01:19:36 +01:00
|
|
|
}
|
|
|
|
else if (lnTop > me->bottom)
|
|
|
|
break;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2014-03-14 01:19:36 +01:00
|
|
|
// clear other accidentals
|
|
|
|
bool conflictAbove = false;
|
|
|
|
bool conflictBelow = false;
|
|
|
|
|
|
|
|
if (above)
|
2014-05-14 05:39:02 +02:00
|
|
|
conflictAbove = resolveAccidentals(me, above, lx, pd, sp);
|
2014-03-14 01:19:36 +01:00
|
|
|
if (below)
|
2014-05-14 05:39:02 +02:00
|
|
|
conflictBelow = resolveAccidentals(me, below, lx, pd, sp);
|
2014-05-12 19:13:48 +02:00
|
|
|
if (conflictAbove || conflictBelow)
|
|
|
|
me->x = lx - acc->width() - acc->bbox().x();
|
|
|
|
else if (colOffset != 0.0)
|
2014-08-10 19:39:52 +02:00
|
|
|
me->x = lx - pd - acc->width() - acc->bbox().x();
|
2014-03-14 01:19:36 +01:00
|
|
|
else
|
2014-08-10 19:39:52 +02:00
|
|
|
me->x = lx - pnd - acc->width() - acc->bbox().x();
|
2014-03-19 06:22:12 +01:00
|
|
|
|
|
|
|
return me->x;
|
2014-03-14 01:19:36 +01:00
|
|
|
}
|
|
|
|
|
2014-03-05 23:45:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// layoutChords3
|
|
|
|
// - calculate positions of notes, accidentals, dots
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-02-06 22:03:43 +01:00
|
|
|
void Score::layoutChords3(std::vector<Note*>& notes, Staff* staff, Segment* segment)
|
2014-03-05 23:45:58 +01:00
|
|
|
{
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------
|
|
|
|
// layout accidentals
|
|
|
|
// find column for dots
|
|
|
|
//---------------------------------------------------
|
|
|
|
|
2016-02-06 22:03:43 +01:00
|
|
|
QVector<Note*> leftNotes; // notes to left of origin
|
|
|
|
leftNotes.reserve(8);
|
|
|
|
QVector<AcEl> aclist; // accidentals
|
|
|
|
aclist.reserve(8);
|
|
|
|
|
2014-03-19 06:22:12 +01:00
|
|
|
// track columns of octave-separated accidentals
|
|
|
|
int columnBottom[7] = { -1, -1, -1, -1, -1, -1, -1 };
|
2013-05-22 14:12:47 +02:00
|
|
|
|
2014-03-12 22:52:59 +01:00
|
|
|
qreal sp = staff->spatium();
|
2015-09-01 06:19:20 +02:00
|
|
|
qreal stepDistance = sp * staff->logicalLineDistance() * .5;
|
2013-05-29 12:21:42 +02:00
|
|
|
int stepOffset = staff->staffType()->stepOffset();
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-05-03 01:21:42 +02:00
|
|
|
qreal lx = 10000.0; // leftmost notehead position
|
2014-04-08 20:52:10 +02:00
|
|
|
qreal upDotPosX = 0.0;
|
|
|
|
qreal downDotPosX = 0.0;
|
2013-06-27 15:00:08 +02:00
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
int nNotes = notes.size();
|
2014-03-19 06:22:12 +01:00
|
|
|
int nAcc = 0;
|
2012-05-26 14:26:10 +02:00
|
|
|
for (int i = nNotes-1; i >= 0; --i) {
|
|
|
|
Note* note = notes[i];
|
|
|
|
Accidental* ac = note->accidental();
|
2014-11-15 21:28:16 +01:00
|
|
|
if (ac && !note->fixed()) {
|
2012-05-26 14:26:10 +02:00
|
|
|
ac->layout();
|
|
|
|
AcEl acel;
|
2014-03-12 22:52:59 +01:00
|
|
|
acel.note = note;
|
2014-03-19 06:22:12 +01:00
|
|
|
int line = note->line();
|
|
|
|
acel.line = line;
|
2014-03-12 22:52:59 +01:00
|
|
|
acel.x = 0.0;
|
2014-03-19 06:22:12 +01:00
|
|
|
acel.top = line * 0.5 * sp + ac->bbox().top();
|
|
|
|
acel.bottom = line * 0.5 * sp + ac->bbox().bottom();
|
2014-03-16 07:55:39 +01:00
|
|
|
acel.width = ac->width();
|
2014-05-12 05:00:54 +02:00
|
|
|
QPointF bboxNE = ac->symBbox(ac->symbol()).topRight();
|
|
|
|
QPointF bboxSW = ac->symBbox(ac->symbol()).bottomLeft();
|
|
|
|
QPointF cutOutNE = ac->symCutOutNE(ac->symbol());
|
|
|
|
QPointF cutOutSW = ac->symCutOutSW(ac->symbol());
|
|
|
|
if (!cutOutNE.isNull()) {
|
|
|
|
acel.ascent = cutOutNE.y() - bboxNE.y();
|
|
|
|
acel.rightClear = bboxNE.x() - cutOutNE.x();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
acel.ascent = 0.0;
|
|
|
|
acel.rightClear = 0.0;
|
|
|
|
}
|
|
|
|
if (!cutOutSW.isNull()) {
|
|
|
|
acel.descent = bboxSW.y() - cutOutSW.y();
|
|
|
|
acel.leftClear = cutOutSW.x() - bboxSW.x();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
acel.descent = 0.0;
|
|
|
|
acel.leftClear = 0.0;
|
|
|
|
}
|
2014-03-19 06:22:12 +01:00
|
|
|
int pitchClass = (line + 700) % 7;
|
|
|
|
acel.next = columnBottom[pitchClass];
|
|
|
|
columnBottom[pitchClass] = nAcc;
|
|
|
|
aclist.append(acel);
|
|
|
|
++nAcc;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2013-05-22 14:12:47 +02:00
|
|
|
|
2014-09-08 08:38:06 +02:00
|
|
|
qreal hw = note->headWidth(); // actual head width, including note & chord mag
|
2013-05-22 14:12:47 +02:00
|
|
|
Chord* chord = note->chord();
|
2013-06-04 18:29:14 +02:00
|
|
|
bool _up = chord->up();
|
2014-09-08 08:38:06 +02:00
|
|
|
qreal stemX = chord->stemPosX(); // stem position for nominal notehead, but allowing for mag
|
|
|
|
|
2014-04-08 20:52:10 +02:00
|
|
|
qreal overlapMirror;
|
2016-04-27 16:33:30 +02:00
|
|
|
Stem* stem = chord->stem();
|
|
|
|
if (stem)
|
|
|
|
overlapMirror = stem->lineWidth();
|
2014-06-25 22:01:26 +02:00
|
|
|
else if (chord->durationType().headType() == NoteHead::Type::HEAD_WHOLE)
|
2016-03-02 13:20:19 +01:00
|
|
|
overlapMirror = styleP(StyleIdx::stemWidth) * chord->mag();
|
2013-05-22 14:12:47 +02:00
|
|
|
else
|
2014-04-08 20:52:10 +02:00
|
|
|
overlapMirror = 0.0;
|
2013-05-22 14:12:47 +02:00
|
|
|
|
|
|
|
qreal x;
|
|
|
|
if (note->mirror()) {
|
|
|
|
if (_up)
|
2014-04-08 20:52:10 +02:00
|
|
|
x = stemX - overlapMirror;
|
2013-05-22 14:12:47 +02:00
|
|
|
else
|
2014-04-08 20:52:10 +02:00
|
|
|
x = stemX - hw + overlapMirror;
|
2013-05-22 14:12:47 +02:00
|
|
|
}
|
|
|
|
else {
|
2014-04-08 20:52:10 +02:00
|
|
|
if (_up)
|
|
|
|
x = stemX - hw;
|
|
|
|
else
|
|
|
|
x = 0.0;
|
2013-05-22 14:12:47 +02:00
|
|
|
}
|
2014-04-08 20:52:10 +02:00
|
|
|
|
2013-05-22 14:12:47 +02:00
|
|
|
note->rypos() = (note->line() + stepOffset) * stepDistance;
|
|
|
|
note->rxpos() = x;
|
2014-05-21 00:43:28 +02:00
|
|
|
// we need to do this now
|
|
|
|
// or else note pos / readPos / userOff will be out of sync
|
|
|
|
// and we rely on note->x() throughout the layout process
|
|
|
|
note->adjustReadPos();
|
2014-03-12 22:52:59 +01:00
|
|
|
|
2014-04-08 20:52:10 +02:00
|
|
|
// find leftmost non-mirrored note to set as X origin for accidental layout
|
|
|
|
// a mirrored note that extends to left of segment X origin
|
|
|
|
// will displace accidentals only if there is conflict
|
2014-05-21 00:43:28 +02:00
|
|
|
qreal sx = x + chord->x(); // segment-relative X position of note
|
2014-05-19 21:08:50 +02:00
|
|
|
if (note->mirror() && !chord->up() && sx < 0.0)
|
2014-03-12 22:52:59 +01:00
|
|
|
leftNotes.append(note);
|
2014-04-08 20:52:10 +02:00
|
|
|
else if (sx < lx)
|
|
|
|
lx = sx;
|
2013-06-04 18:29:14 +02:00
|
|
|
|
2014-04-08 20:52:10 +02:00
|
|
|
qreal xx = x + hw + chord->pos().x();
|
2014-04-02 20:31:37 +02:00
|
|
|
|
2014-04-08 20:52:10 +02:00
|
|
|
if (chord->dots()) {
|
|
|
|
if (chord->up())
|
|
|
|
upDotPosX = qMax(upDotPosX, xx);
|
|
|
|
else
|
|
|
|
downDotPosX = qMax(downDotPosX, xx);
|
2016-03-02 13:20:19 +01:00
|
|
|
Direction dotPosition = note->userDotPosition();
|
2014-04-02 20:31:37 +02:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
if (dotPosition == Direction::AUTO && nNotes > 1 && note->visible() && !note->dotsHidden()) {
|
2014-04-02 20:31:37 +02:00
|
|
|
// resolve dot conflicts
|
|
|
|
int line = note->line();
|
|
|
|
Note* above = (i < nNotes - 1) ? notes[i+1] : 0;
|
2014-05-07 05:56:46 +02:00
|
|
|
if (above && (!above->visible() || above->dotsHidden()))
|
|
|
|
above = 0;
|
2014-04-02 20:31:37 +02:00
|
|
|
int intervalAbove = above ? line - above->line() : 1000;
|
|
|
|
Note* below = (i > 0) ? notes[i-1] : 0;
|
2014-05-07 05:56:46 +02:00
|
|
|
if (below && (!below->visible() || below->dotsHidden()))
|
|
|
|
below = 0;
|
2014-04-02 20:31:37 +02:00
|
|
|
int intervalBelow = below ? below->line() - line : 1000;
|
|
|
|
if ((line & 1) == 0) {
|
|
|
|
// line
|
|
|
|
if (intervalAbove == 1 && intervalBelow != 1)
|
2016-03-02 13:20:19 +01:00
|
|
|
dotPosition = Direction::DOWN;
|
2014-05-07 05:56:46 +02:00
|
|
|
else if (intervalBelow == 1 && intervalAbove != 1)
|
2016-03-02 13:20:19 +01:00
|
|
|
dotPosition = Direction::UP;
|
2014-04-02 20:31:37 +02:00
|
|
|
else if (intervalAbove == 0 && above->chord()->dots()) {
|
|
|
|
// unison
|
|
|
|
if (((above->voice() & 1) == (note->voice() & 1))) {
|
2016-03-02 13:20:19 +01:00
|
|
|
above->setDotY(Direction::UP);
|
|
|
|
dotPosition = Direction::DOWN;
|
2014-04-02 20:31:37 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// space
|
|
|
|
if (intervalAbove == 0 && above->chord()->dots()) {
|
|
|
|
// unison
|
|
|
|
if (!(note->voice() & 1))
|
2016-03-02 13:20:19 +01:00
|
|
|
dotPosition = Direction::UP;
|
2014-04-02 20:31:37 +02:00
|
|
|
else {
|
|
|
|
if (!(above->voice() & 1))
|
2016-03-02 13:20:19 +01:00
|
|
|
above->setDotY(Direction::UP);
|
2014-04-02 20:31:37 +02:00
|
|
|
else
|
2016-03-02 13:20:19 +01:00
|
|
|
dotPosition = Direction::DOWN;
|
2014-04-02 20:31:37 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
note->setDotY(dotPosition);
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2013-05-22 14:12:47 +02:00
|
|
|
|
2014-03-08 07:43:24 +01:00
|
|
|
if (segment) {
|
2014-04-08 20:52:10 +02:00
|
|
|
// align all dots for segment/staff
|
|
|
|
// it would be possible to dots for up & down chords separately
|
|
|
|
// this would require space to have been allocated previously
|
|
|
|
// when calculating chord offsets
|
|
|
|
segment->setDotPosX(staff->idx(), qMax(upDotPosX, downDotPosX));
|
2014-03-08 07:43:24 +01:00
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
|
|
|
if (nAcc == 0)
|
|
|
|
return;
|
2014-03-14 01:19:36 +01:00
|
|
|
|
2016-02-06 22:03:43 +01:00
|
|
|
QVector<int> umi;
|
2016-03-02 13:20:19 +01:00
|
|
|
qreal pd = styleP(StyleIdx::accidentalDistance);
|
|
|
|
qreal pnd = styleP(StyleIdx::accidentalNoteDistance);
|
2014-03-19 06:22:12 +01:00
|
|
|
qreal colOffset = 0.0;
|
|
|
|
|
|
|
|
if (nAcc >= 2 && aclist[nAcc-1].line - aclist[0].line >= 7) {
|
|
|
|
|
|
|
|
// accidentals spread over an octave or more
|
|
|
|
// set up columns for accidentals with octave matches
|
|
|
|
// these will start at right and work to the left
|
|
|
|
// unmatched accidentals will use zig zag approach (see below)
|
|
|
|
// starting to the left of the octave columns
|
|
|
|
|
|
|
|
qreal minX = 0.0;
|
|
|
|
int columnTop[7] = { -1, -1, -1, -1, -1, -1, -1 };
|
|
|
|
|
|
|
|
// find columns of octaves
|
|
|
|
for (int pc = 0; pc < 7; ++pc) {
|
|
|
|
if (columnBottom[pc] == -1)
|
|
|
|
continue;
|
|
|
|
// calculate column height
|
2014-03-20 19:38:41 +01:00
|
|
|
for (int j = columnBottom[pc]; j != -1; j = aclist[j].next)
|
2014-03-19 06:22:12 +01:00
|
|
|
columnTop[pc] = j;
|
|
|
|
}
|
2013-06-27 15:00:08 +02:00
|
|
|
|
2014-03-19 06:22:12 +01:00
|
|
|
// compute reasonable column order
|
|
|
|
// use zig zag
|
2016-02-06 22:03:43 +01:00
|
|
|
QVector<int> column;
|
|
|
|
QVector<int> unmatched;
|
2014-03-19 06:22:12 +01:00
|
|
|
int n = nAcc - 1;
|
|
|
|
for (int i = 0; i <= n; ++i, --n) {
|
|
|
|
int pc = (aclist[i].line + 700) % 7;
|
2014-03-20 19:38:41 +01:00
|
|
|
if (aclist[columnTop[pc]].line != aclist[columnBottom[pc]].line) {
|
|
|
|
if (!column.contains(pc))
|
|
|
|
column.append(pc);
|
2014-03-19 06:22:12 +01:00
|
|
|
}
|
2014-03-20 19:38:41 +01:00
|
|
|
else
|
|
|
|
unmatched.append(i);
|
2014-03-19 06:22:12 +01:00
|
|
|
if (i == n)
|
|
|
|
break;
|
|
|
|
pc = (aclist[n].line + 700) % 7;
|
2014-03-20 19:38:41 +01:00
|
|
|
if (aclist[columnTop[pc]].line != aclist[columnBottom[pc]].line) {
|
|
|
|
if (!column.contains(pc))
|
|
|
|
column.append(pc);
|
2014-03-19 06:22:12 +01:00
|
|
|
}
|
2014-03-20 19:38:41 +01:00
|
|
|
else
|
|
|
|
unmatched.append(n);
|
2014-03-19 06:22:12 +01:00
|
|
|
}
|
2014-03-20 19:38:41 +01:00
|
|
|
int nColumns = column.size();
|
|
|
|
int nUnmatched = unmatched.size();
|
|
|
|
|
|
|
|
// handle unmatched accidentals
|
|
|
|
for (int i = 0; i < nUnmatched; ++i) {
|
|
|
|
// first try to slot it into an existing column
|
|
|
|
AcEl* me = &aclist[unmatched[i]];
|
|
|
|
// find column
|
|
|
|
bool found = false;
|
|
|
|
for (int j = 0; j < nColumns; ++j) {
|
|
|
|
int pc = column[j];
|
|
|
|
int above = -1;
|
|
|
|
int below = -1;
|
|
|
|
// find slot within column
|
|
|
|
for (int k = columnBottom[pc]; k != -1; k = aclist[k].next) {
|
|
|
|
if (aclist[k].line < me->line) {
|
|
|
|
above = k;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
below = k;
|
|
|
|
}
|
|
|
|
// check to see if accidental can fit in slot
|
2014-08-10 19:39:52 +02:00
|
|
|
qreal myPd = pd * me->note->accidental()->mag();
|
2014-03-20 19:38:41 +01:00
|
|
|
bool conflict = false;
|
|
|
|
if (above != -1 && me->top - aclist[above].bottom < myPd)
|
|
|
|
conflict = true;
|
|
|
|
else if (below != -1 && aclist[below].top - me->bottom < myPd)
|
|
|
|
conflict = true;
|
|
|
|
if (!conflict) {
|
|
|
|
// insert into column
|
|
|
|
found = true;
|
|
|
|
me->next = above;
|
|
|
|
if (above == -1)
|
|
|
|
columnTop[pc] = unmatched[i];
|
|
|
|
if (below != -1)
|
|
|
|
aclist[below].next = unmatched[i];
|
|
|
|
else
|
|
|
|
columnBottom[pc] = unmatched[i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// if no slot found, then add to list of unmatched accidental indices
|
|
|
|
if (!found)
|
2016-02-06 22:03:43 +01:00
|
|
|
umi.push_back(unmatched[i]);
|
2014-03-20 19:38:41 +01:00
|
|
|
}
|
|
|
|
nAcc = umi.size();
|
|
|
|
if (nAcc > 1)
|
|
|
|
qSort(umi);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2014-03-19 06:22:12 +01:00
|
|
|
// lay out columns
|
|
|
|
for (int i = 0; i < nColumns; ++i) {
|
|
|
|
int pc = column[i];
|
|
|
|
AcEl* below = 0;
|
|
|
|
// lay out accidentals
|
|
|
|
for (int j = columnBottom[pc]; j != -1; j = aclist[j].next) {
|
|
|
|
qreal x = layoutAccidental(&aclist[j], 0, below, colOffset, leftNotes, pnd, pd, sp);
|
|
|
|
minX = qMin(minX, x);
|
|
|
|
below = &aclist[j];
|
|
|
|
}
|
|
|
|
// align within column
|
|
|
|
int next = -1;
|
|
|
|
for (int j = columnBottom[pc]; j != -1; j = next) {
|
|
|
|
next = aclist[j].next;
|
|
|
|
if (next != -1 && aclist[j].line == aclist[next].line)
|
|
|
|
continue;
|
|
|
|
aclist[j].x = minX;
|
|
|
|
}
|
|
|
|
// move to next column
|
|
|
|
colOffset = minX;
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2014-03-19 06:22:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
for (int i = 0; i < nAcc; ++i)
|
2016-02-06 22:03:43 +01:00
|
|
|
umi.push_back(i);
|
2014-03-19 06:22:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (nAcc) {
|
|
|
|
|
|
|
|
// for accidentals with no octave matches, use zig zag approach
|
|
|
|
// layout right to left in pairs, (next) highest then lowest
|
2014-03-13 07:52:59 +01:00
|
|
|
|
2014-03-19 06:22:12 +01:00
|
|
|
AcEl* me = &aclist[umi[0]];
|
|
|
|
AcEl* above = 0;
|
|
|
|
AcEl* below = 0;
|
|
|
|
|
|
|
|
// layout top accidental
|
|
|
|
layoutAccidental(me, above, below, colOffset, leftNotes, pnd, pd, sp);
|
|
|
|
|
|
|
|
// layout bottom accidental
|
|
|
|
int n = nAcc - 1;
|
|
|
|
if (n > 0) {
|
2014-03-13 07:52:59 +01:00
|
|
|
above = me;
|
2014-03-19 06:22:12 +01:00
|
|
|
me = &aclist[umi[n]];
|
|
|
|
layoutAccidental(me, above, below, colOffset, leftNotes, pnd, pd, sp);
|
|
|
|
}
|
|
|
|
|
|
|
|
// layout middle accidentals
|
|
|
|
if (n > 1) {
|
|
|
|
for (int i = 1; i < n; ++i, --n) {
|
|
|
|
// next highest
|
|
|
|
below = me;
|
|
|
|
me = &aclist[umi[i]];
|
|
|
|
layoutAccidental(me, above, below, colOffset, leftNotes, pnd, pd, sp);
|
|
|
|
if (i == n - 1)
|
|
|
|
break;
|
|
|
|
// next lowest
|
|
|
|
above = me;
|
|
|
|
me = &aclist[umi[n-1]];
|
|
|
|
layoutAccidental(me, above, below, colOffset, leftNotes, pnd, pd, sp);
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2014-03-19 06:22:12 +01:00
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2013-05-22 14:12:47 +02:00
|
|
|
for (const AcEl& e : aclist) {
|
2014-05-21 00:43:28 +02:00
|
|
|
// even though we initially calculate accidental position relative to segment
|
|
|
|
// we must record pos for accidental relative to note,
|
|
|
|
// since pos is always interpreted relative to parent
|
2013-05-22 14:12:47 +02:00
|
|
|
Note* note = e.note;
|
2014-03-09 07:09:40 +01:00
|
|
|
qreal x = e.x + lx - (note->x() + note->chord()->x());
|
2012-05-26 14:26:10 +02:00
|
|
|
note->accidental()->setPos(x, 0);
|
|
|
|
note->accidental()->adjustReadPos();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-26 07:45:09 +02:00
|
|
|
#define beamModeMid(a) (a == Beam::Mode::MID || a == Beam::Mode::BEGIN32 || a == Beam::Mode::BEGIN64)
|
|
|
|
|
2013-06-16 23:33:37 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// beamGraceNotes
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2014-05-15 13:42:03 +02:00
|
|
|
void Score::beamGraceNotes(Chord* mainNote, bool after)
|
2013-06-16 23:33:37 +02:00
|
|
|
{
|
2013-11-24 20:39:58 +01:00
|
|
|
ChordRest* a1 = 0; // start of (potential) beam
|
|
|
|
Beam* beam = 0; // current beam
|
2014-06-26 07:45:09 +02:00
|
|
|
Beam::Mode bm = Beam::Mode::AUTO;
|
2016-02-06 22:03:43 +01:00
|
|
|
QVector<Chord*> graceNotes = after ? mainNote->graceNotesAfter() : mainNote->graceNotesBefore();
|
2015-02-19 10:28:25 +01:00
|
|
|
|
2016-02-04 11:27:47 +01:00
|
|
|
for (ChordRest* cr : graceNotes) {
|
2013-11-24 20:39:58 +01:00
|
|
|
bm = Groups::endBeam(cr);
|
2014-06-26 07:45:09 +02:00
|
|
|
if ((cr->durationType().type() <= TDuration::DurationType::V_QUARTER) || (bm == Beam::Mode::NONE)) {
|
2013-11-24 20:39:58 +01:00
|
|
|
if (beam) {
|
|
|
|
beam->layoutGraceNotes();
|
|
|
|
beam = 0;
|
|
|
|
}
|
|
|
|
if (a1) {
|
2016-01-04 14:48:58 +01:00
|
|
|
a1->removeDeleteBeam(false);
|
2013-11-24 20:39:58 +01:00
|
|
|
a1 = 0;
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
cr->removeDeleteBeam(false);
|
2013-11-24 20:39:58 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (beam) {
|
2014-06-26 07:45:09 +02:00
|
|
|
bool beamEnd = bm == Beam::Mode::BEGIN;
|
2013-11-24 20:39:58 +01:00
|
|
|
if (!beamEnd) {
|
|
|
|
cr->removeDeleteBeam(true);
|
|
|
|
beam->add(cr);
|
|
|
|
cr = 0;
|
2014-06-26 07:45:09 +02:00
|
|
|
beamEnd = (bm == Beam::Mode::END);
|
2013-11-24 20:39:58 +01:00
|
|
|
}
|
|
|
|
if (beamEnd) {
|
|
|
|
beam->layoutGraceNotes();
|
|
|
|
beam = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!cr)
|
|
|
|
continue;
|
|
|
|
if (a1 == 0)
|
|
|
|
a1 = cr;
|
|
|
|
else {
|
2014-06-26 07:45:09 +02:00
|
|
|
if (!beamModeMid(bm) && (bm == Beam::Mode::BEGIN)) {
|
2016-01-04 14:48:58 +01:00
|
|
|
a1->removeDeleteBeam(false);
|
2013-11-24 20:39:58 +01:00
|
|
|
a1 = cr;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
beam = a1->beam();
|
|
|
|
if (beam == 0 || beam->elements().front() != a1) {
|
|
|
|
beam = new Beam(this);
|
|
|
|
beam->setGenerated(true);
|
|
|
|
beam->setTrack(mainNote->track());
|
|
|
|
a1->removeDeleteBeam(true);
|
|
|
|
beam->add(a1);
|
|
|
|
}
|
|
|
|
cr->removeDeleteBeam(true);
|
|
|
|
beam->add(cr);
|
|
|
|
a1 = 0;
|
|
|
|
}
|
|
|
|
}
|
2013-07-10 18:01:37 +02:00
|
|
|
}
|
2013-11-24 20:39:58 +01:00
|
|
|
if (beam)
|
|
|
|
beam->layoutGraceNotes();
|
|
|
|
else if (a1)
|
2016-01-04 14:48:58 +01:00
|
|
|
a1->removeDeleteBeam(false);
|
2013-06-16 23:33:37 +02:00
|
|
|
}
|
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// layoutSpanner
|
|
|
|
// called after dragging a staff
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::layoutSpanner()
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
int tracks = ntracks();
|
2012-05-26 14:26:10 +02:00
|
|
|
for (int track = 0; track < tracks; ++track) {
|
2016-01-04 14:48:58 +01:00
|
|
|
for (Segment* segment = firstSegment(); segment; segment = segment->next1()) {
|
|
|
|
if (track == tracks-1) {
|
|
|
|
int n = segment->annotations().size();
|
|
|
|
for (int i = 0; i < n; ++i)
|
|
|
|
segment->annotations().at(i)->layout();
|
|
|
|
}
|
2016-02-17 14:54:23 +01:00
|
|
|
Chord* c = toChord(segment->element(track));
|
2016-02-10 18:35:35 +01:00
|
|
|
if (c && c->isChord()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
c->layoutStem();
|
|
|
|
for (Note* n : c->notes()) {
|
|
|
|
Tie* tie = n->tieFor();
|
|
|
|
if (tie)
|
|
|
|
tie->layout();
|
|
|
|
for (Spanner* sp : n->spannerFor())
|
|
|
|
sp->layout();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rebuildBspTree();
|
|
|
|
}
|
2015-01-21 11:55:36 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//-------------------------------------------------------------------
|
|
|
|
// addSystemHeader
|
|
|
|
/// Add elements to make this measure suitable as the first measure
|
|
|
|
/// of a system.
|
|
|
|
// The system header can contain a starting BarLine, a Clef,
|
|
|
|
// a KeySig and a RepeatBarLine.
|
|
|
|
//-------------------------------------------------------------------
|
2015-01-21 11:55:36 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::addSystemHeader(Measure* m, bool isFirstSystem)
|
|
|
|
{
|
|
|
|
m->setHasSystemHeader(true);
|
|
|
|
const int tick = m->tick();
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
int nVisible = 0;
|
|
|
|
int staffIdx = 0;
|
2016-02-04 11:27:47 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for (Staff* staff : _staves) {
|
|
|
|
// At this time we don't know which staff is visible or not...
|
|
|
|
// but let's not create the key/clef if there were no visible before this layout
|
|
|
|
// sometimes we will be right, other time it will take another layout to be right...
|
2014-11-15 17:23:20 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (!m->system()->staff(staffIdx)->show()) {
|
|
|
|
++staffIdx;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
++nVisible;
|
2013-05-27 19:07:03 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
KeySig* keysig = 0;
|
|
|
|
Clef* clef = 0;
|
|
|
|
const int strack = staffIdx * VOICES;
|
2014-11-15 17:23:20 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// we assume that keysigs and clefs are only in the first
|
|
|
|
// track (voice 0) of a staff
|
|
|
|
|
|
|
|
KeySigEvent keyIdx = staff->keySigEvent(tick);
|
|
|
|
|
|
|
|
for (Segment* seg = m->first(); seg; seg = seg->next()) {
|
|
|
|
// search only up to the first ChordRest/StartRepeatBarLine
|
2016-03-18 09:29:16 +01:00
|
|
|
if (seg->isType(Segment::Type::ChordRest | Segment::Type::StartRepeatBarLine))
|
|
|
|
break;
|
2016-01-04 14:48:58 +01:00
|
|
|
Element* el = seg->element(strack);
|
|
|
|
if (!el)
|
|
|
|
continue;
|
|
|
|
switch (el->type()) {
|
|
|
|
case Element::Type::KEYSIG:
|
2016-02-17 14:54:23 +01:00
|
|
|
keysig = toKeySig(el);
|
2016-01-04 14:48:58 +01:00
|
|
|
break;
|
|
|
|
case Element::Type::CLEF:
|
2016-02-17 14:54:23 +01:00
|
|
|
clef = toClef(el);
|
2016-01-04 14:48:58 +01:00
|
|
|
clef->setSmall(false);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2014-11-15 17:23:20 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-04-20 18:56:08 +02:00
|
|
|
// keep key sigs in TABs: TABs themselves should hide them
|
|
|
|
bool needKeysig = isFirstSystem || styleB(StyleIdx::genKeysig);
|
|
|
|
|
|
|
|
// If we need a Key::C KeySig (which would be invisible) and there is
|
|
|
|
// a courtesy key sig, dont create it and switch generated flags.
|
|
|
|
// This avoids creating an invisible KeySig which can distort layout.
|
|
|
|
|
|
|
|
KeySig* ksAnnounce = 0;
|
|
|
|
if (needKeysig && (keyIdx.key() == Key::C)) {
|
|
|
|
Measure* pm = m->prevMeasure();
|
|
|
|
if (pm && pm->hasCourtesyKeySig()) {
|
|
|
|
Segment* ks = pm->first(Segment::Type::KeySigAnnounce);
|
|
|
|
if (ks) {
|
|
|
|
ksAnnounce = toKeySig(ks->element(strack));
|
|
|
|
if (ksAnnounce) {
|
|
|
|
needKeysig = false;
|
|
|
|
if (keysig) {
|
|
|
|
ksAnnounce->setGenerated(false);
|
|
|
|
keysig->setGenerated(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-02-12 19:14:24 +01:00
|
|
|
}
|
2014-11-10 20:08:53 +01:00
|
|
|
|
2016-04-20 18:56:08 +02:00
|
|
|
needKeysig = needKeysig && (keyIdx.key() != Key::C || keyIdx.custom() || keyIdx.isAtonal());
|
|
|
|
needKeysig = needKeysig || (keysig && !keysig->generated()); // dont remove user modified keysigs
|
|
|
|
|
|
|
|
if (needKeysig) {
|
|
|
|
if (!keysig) {
|
|
|
|
//
|
|
|
|
// create missing key signature
|
|
|
|
//
|
|
|
|
keysig = new KeySig(this);
|
|
|
|
keysig->setKeySigEvent(keyIdx);
|
|
|
|
keysig->setTrack(strack);
|
|
|
|
keysig->setGenerated(true);
|
|
|
|
Segment* seg = m->undoGetSegment(Segment::Type::KeySig, tick);
|
|
|
|
keysig->setParent(seg);
|
|
|
|
undo(new AddElement(keysig));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (!(keysig->keySigEvent() == keyIdx))
|
|
|
|
undo(new ChangeKeySig(keysig, keyIdx, keysig->showCourtesy()));
|
|
|
|
}
|
2016-02-12 19:14:24 +01:00
|
|
|
keysig->layout(); // hide naturals may have changed
|
|
|
|
keysig->segment()->createShape(staffIdx);
|
|
|
|
}
|
2016-04-20 18:56:08 +02:00
|
|
|
else if (keysig) {
|
|
|
|
undoRemoveElement(keysig);
|
|
|
|
keysig = 0;
|
|
|
|
}
|
2016-02-12 19:14:24 +01:00
|
|
|
|
2016-04-21 13:50:01 +02:00
|
|
|
StaffType* staffType = staff->staffType();
|
|
|
|
bool showClef = staffType->genClef() && (isFirstSystem || styleB(StyleIdx::genClef));
|
|
|
|
if (showClef) {
|
2016-02-04 11:27:47 +01:00
|
|
|
ClefTypeList cl = staff->clefType(tick);
|
2016-01-04 14:48:58 +01:00
|
|
|
if (!clef) {
|
|
|
|
//
|
|
|
|
// create missing clef
|
|
|
|
//
|
|
|
|
clef = new Clef(this);
|
|
|
|
clef->setTrack(strack);
|
|
|
|
clef->setSmall(false);
|
|
|
|
clef->setGenerated(true);
|
|
|
|
|
2016-02-04 11:27:47 +01:00
|
|
|
Segment* s = m->undoGetSegment(Segment::Type::Clef, tick);
|
2016-01-04 14:48:58 +01:00
|
|
|
clef->setParent(s);
|
2016-02-04 11:27:47 +01:00
|
|
|
clef->setClefType(cl);
|
2016-01-04 14:48:58 +01:00
|
|
|
undo(new AddElement(clef));
|
|
|
|
clef->layout();
|
|
|
|
s->createShape(staffIdx);
|
|
|
|
}
|
2016-03-18 09:29:16 +01:00
|
|
|
else {
|
2016-01-04 14:48:58 +01:00
|
|
|
if (cl != clef->clefTypeList()) {
|
|
|
|
undo(new ChangeClefType(clef, cl._concertClef, cl._transposingClef));
|
|
|
|
clef->layout();
|
|
|
|
clef->segment()->createShape(staffIdx);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
2016-03-18 09:29:16 +01:00
|
|
|
if (clef) {
|
2016-01-04 14:48:58 +01:00
|
|
|
undo(new RemoveElement(clef));
|
2016-03-18 09:29:16 +01:00
|
|
|
if (clef->segment())
|
|
|
|
clef->segment()->createShape(staffIdx);
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
++staffIdx;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-02-04 11:27:47 +01:00
|
|
|
m->setStartRepeatBarLine();
|
|
|
|
|
2016-07-08 10:43:09 +02:00
|
|
|
//
|
|
|
|
// create systemic barline
|
|
|
|
// new behaviour: depends on number of total staves
|
|
|
|
// old behaviour: depends on number of visible staves
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
BarLine* bl = 0;
|
2016-03-02 13:20:19 +01:00
|
|
|
Segment* s = m->findSegment(Segment::Type::BeginBarLine, tick);
|
2016-05-02 13:41:41 +02:00
|
|
|
if (s)
|
2016-02-17 14:54:23 +01:00
|
|
|
bl = toBarLine(s->element(0));
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-07-08 10:43:09 +02:00
|
|
|
int n = score()->nstaves();
|
|
|
|
if ((n > 1 && score()->styleB(StyleIdx::startBarlineMultiple)) || (n == 1 && score()->styleB(StyleIdx::startBarlineSingle))) {
|
2016-01-04 14:48:58 +01:00
|
|
|
if (!bl) {
|
|
|
|
bl = new BarLine(this);
|
|
|
|
bl->setTrack(0);
|
|
|
|
bl->setGenerated(true);
|
|
|
|
|
|
|
|
Segment* seg = m->undoGetSegment(Segment::Type::BeginBarLine, tick);
|
|
|
|
bl->setParent(seg);
|
|
|
|
bl->layout();
|
|
|
|
undo(new AddElement(bl));
|
2016-02-04 11:27:47 +01:00
|
|
|
seg->createShapes();
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-07-08 10:43:09 +02:00
|
|
|
bl->setSpan(n);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else if (bl)
|
|
|
|
score()->undoRemoveElement(bl);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// cautionaryWidth
|
|
|
|
// Compute the width of required courtesy of time signature
|
|
|
|
// and key signature elements if m were the last measure
|
|
|
|
// in a staff.
|
|
|
|
// Return hasCourtesy == true if courtesy elements are
|
|
|
|
// already present. The value is undefined if no
|
|
|
|
// courtesy elements are required.
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal Score::cautionaryWidth(Measure* m, bool& hasCourtesy)
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
hasCourtesy = false;
|
|
|
|
if (m == 0)
|
|
|
|
return 0.0;
|
|
|
|
Measure* nm = m->nextMeasure();
|
|
|
|
if (nm == 0 || (m->sectionBreak() && _layoutMode != LayoutMode::FLOAT))
|
|
|
|
return 0.0;
|
2014-08-27 14:35:39 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
int tick = m->endTick();
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// locate a time sig. in the next measure and, if found,
|
|
|
|
// check if it has caut. sig. turned off
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
Segment* ns = nm->findSegment(Segment::Type::TimeSig, tick);
|
|
|
|
bool showCourtesy = styleB(StyleIdx::genCourtesyTimesig);
|
2014-06-02 13:07:19 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal w = 0.0;
|
|
|
|
if (showCourtesy && ns) {
|
2016-02-17 14:54:23 +01:00
|
|
|
TimeSig* ts = toTimeSig(ns->element(0));
|
2016-01-04 14:48:58 +01:00
|
|
|
if (ts && ts->showCourtesySig()) {
|
2016-03-02 13:20:19 +01:00
|
|
|
qreal leftMargin = styleP(StyleIdx::timesigLeftMargin);
|
2016-01-04 14:48:58 +01:00
|
|
|
Segment* s = m->findSegment(Segment::Type::TimeSigAnnounce, tick);
|
|
|
|
if (s && s->element(0)) {
|
2016-02-17 14:54:23 +01:00
|
|
|
w = s->element(0)->width() + leftMargin;
|
2016-01-04 14:48:58 +01:00
|
|
|
hasCourtesy = true;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ts->layout();
|
|
|
|
w = ts->width() + leftMargin;
|
|
|
|
hasCourtesy = false;
|
2015-02-17 20:22:24 +01:00
|
|
|
}
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// courtesy key signatures
|
2013-09-19 15:08:54 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
showCourtesy = styleB(StyleIdx::genCourtesyKeysig);
|
|
|
|
ns = nm->findSegment(Segment::Type::KeySig, tick);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal wwMax = 0.0;
|
|
|
|
if (showCourtesy && ns) {
|
2016-03-02 13:20:19 +01:00
|
|
|
qreal leftMargin = styleP(StyleIdx::keysigLeftMargin);
|
2016-01-04 14:48:58 +01:00
|
|
|
for (int staffIdx = 0; staffIdx < _staves.size(); ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-02-17 14:54:23 +01:00
|
|
|
KeySig* nks = toKeySig(ns->element(track));
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (nks && nks->showCourtesy() && !nks->generated()) {
|
|
|
|
Segment* s = m->findSegment(Segment::Type::KeySigAnnounce, tick);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (s && s->element(track)) {
|
|
|
|
wwMax = qMax(wwMax, s->element(track)->width() + leftMargin);
|
|
|
|
hasCourtesy = true;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
nks->layout();
|
|
|
|
wwMax = qMax(wwMax, nks->width() + leftMargin);
|
|
|
|
//hasCourtesy = false;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2013-10-02 10:26:09 +02:00
|
|
|
}
|
2014-07-09 18:05:58 +02:00
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
w += wwMax;
|
2014-07-09 18:05:58 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
return w; //* 1.5
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2013-07-23 18:49:26 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// hideEmptyStaves
|
2013-07-23 18:49:26 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::hideEmptyStaves(System* system, bool isFirstSystem)
|
2013-07-23 18:49:26 +02:00
|
|
|
{
|
2016-04-19 16:56:28 +02:00
|
|
|
int staves = _staves.size();
|
2016-01-04 14:48:58 +01:00
|
|
|
int staffIdx = 0;
|
|
|
|
bool systemIsEmpty = true;
|
2012-06-10 10:35:17 +02:00
|
|
|
|
2016-04-19 16:56:28 +02:00
|
|
|
for (Staff* staff : _staves) {
|
|
|
|
SysStaff* ss = system->staff(staffIdx);
|
|
|
|
// bool oldShow = ss->show();
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
Staff::HideMode hideMode = staff->hideWhenEmpty();
|
2016-04-19 16:56:28 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (hideMode == Staff::HideMode::ALWAYS
|
|
|
|
|| (styleB(StyleIdx::hideEmptyStaves)
|
|
|
|
&& (staves > 1)
|
|
|
|
&& !(isFirstSystem && styleB(StyleIdx::dontHideStavesInFirstSystem))
|
|
|
|
&& hideMode != Staff::HideMode::NEVER)) {
|
|
|
|
bool hideStaff = true;
|
2016-04-19 16:56:28 +02:00
|
|
|
for (MeasureBase* m : system->measures()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (!m->isMeasure())
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
2016-02-17 14:54:23 +01:00
|
|
|
Measure* measure = toMeasure(m);
|
2016-01-04 14:48:58 +01:00
|
|
|
if (!measure->isMeasureRest(staffIdx)) {
|
|
|
|
hideStaff = false;
|
2012-05-26 14:26:10 +02:00
|
|
|
break;
|
2015-02-14 15:10:35 +01:00
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
// check if notes moved into this staff
|
|
|
|
Part* part = staff->part();
|
|
|
|
int n = part->nstaves();
|
|
|
|
if (hideStaff && (n > 1)) {
|
|
|
|
int idx = part->staves()->front()->idx();
|
|
|
|
for (int i = 0; i < part->nstaves(); ++i) {
|
|
|
|
int st = idx + i;
|
2014-09-02 19:54:36 +02:00
|
|
|
|
2016-02-04 17:06:32 +01:00
|
|
|
foreach (MeasureBase* mb, system->measures()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (!mb->isMeasure())
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
2016-02-17 14:54:23 +01:00
|
|
|
Measure* m = toMeasure(mb);
|
2016-01-04 14:48:58 +01:00
|
|
|
for (Segment* s = m->first(Segment::Type::ChordRest); s; s = s->next(Segment::Type::ChordRest)) {
|
|
|
|
for (int voice = 0; voice < VOICES; ++voice) {
|
2016-02-04 17:06:32 +01:00
|
|
|
ChordRest* cr = s->cr(st * VOICES + voice);
|
2016-02-06 11:41:16 +01:00
|
|
|
if (cr == 0 || cr->isRest())
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
|
|
|
int staffMove = cr->staffMove();
|
|
|
|
if (staffIdx == st + staffMove) {
|
|
|
|
hideStaff = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!hideStaff)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!hideStaff)
|
|
|
|
break;
|
|
|
|
}
|
2014-09-02 19:54:36 +02:00
|
|
|
}
|
2016-04-19 16:56:28 +02:00
|
|
|
ss->setShow(hideStaff ? false : staff->show());
|
|
|
|
if (ss->show())
|
2016-01-04 14:48:58 +01:00
|
|
|
systemIsEmpty = false;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
systemIsEmpty = false;
|
2016-04-19 16:56:28 +02:00
|
|
|
ss->setShow(true);
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2013-10-28 15:52:32 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
#if 0
|
2016-04-19 16:56:28 +02:00
|
|
|
if (oldShow != s->show()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
foreach (MeasureBase* mb, system->measures()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (!mb->isMeasure())
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
|
|
|
static_cast<Measure*>(mb)->createEndBarLines();
|
2013-09-20 17:21:12 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-04-19 16:56:28 +02:00
|
|
|
#endif
|
2016-01-04 14:48:58 +01:00
|
|
|
++staffIdx;
|
|
|
|
}
|
|
|
|
if (systemIsEmpty) {
|
2016-04-19 16:56:28 +02:00
|
|
|
for (Staff* staff : _staves) {
|
|
|
|
SysStaff* ss = system->staff(staff->idx());
|
|
|
|
if (staff->showIfEmpty() && !ss->show()) {
|
|
|
|
ss->setShow(true);
|
|
|
|
systemIsEmpty = false;
|
2013-09-20 17:21:12 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
}
|
2016-04-19 16:56:28 +02:00
|
|
|
// dont allow a complete empty system
|
|
|
|
if (systemIsEmpty) {
|
|
|
|
Staff* staff = _staves.front();
|
|
|
|
SysStaff* ss = system->staff(staff->idx());
|
|
|
|
ss->setShow(true);
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2013-09-20 17:21:12 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// addPage
|
|
|
|
//---------------------------------------------------------
|
2015-02-25 10:48:39 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
Page* Score::addPage()
|
|
|
|
{
|
|
|
|
Page* page = new Page(this);
|
|
|
|
page->setNo(_pages.size());
|
|
|
|
_pages.push_back(page);
|
|
|
|
return page;
|
|
|
|
}
|
2014-04-24 16:06:38 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// connectTies
|
|
|
|
/// Rebuild tie connections.
|
|
|
|
//---------------------------------------------------------
|
2014-05-31 12:03:21 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::connectTies(bool silent)
|
|
|
|
{
|
|
|
|
int tracks = nstaves() * VOICES;
|
|
|
|
Measure* m = firstMeasure();
|
|
|
|
if (!m)
|
|
|
|
return;
|
|
|
|
Segment::Type st = Segment::Type::ChordRest;
|
|
|
|
for (Segment* s = m->first(st); s; s = s->next1(st)) {
|
|
|
|
for (int i = 0; i < tracks; ++i) {
|
|
|
|
Chord* c = static_cast<Chord*>(s->element(i));
|
2016-02-06 11:41:16 +01:00
|
|
|
if (c == 0 || !c->isChord())
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
2016-02-06 22:03:43 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for (Note* n : c->notes()) {
|
|
|
|
// connect a tie without end note
|
|
|
|
Tie* tie = n->tieFor();
|
|
|
|
if (tie && !tie->endNote()) {
|
|
|
|
Note* nnote;
|
|
|
|
if (_mscVersion <= 114)
|
|
|
|
nnote = searchTieNote114(n);
|
|
|
|
else
|
|
|
|
nnote = searchTieNote(n);
|
|
|
|
if (nnote == 0) {
|
|
|
|
if (!silent) {
|
|
|
|
qDebug("next note at %d track %d for tie not found (version %d)", s->tick(), i, _mscVersion);
|
|
|
|
delete tie;
|
|
|
|
n->setTieFor(0);
|
2013-09-19 15:08:54 +02:00
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
|
|
|
tie->setEndNote(nnote);
|
|
|
|
nnote->setTieBack(tie);
|
|
|
|
}
|
2013-09-19 15:08:54 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
// connect a glissando without initial note (old glissando format)
|
|
|
|
for (Spanner* spanner : n->spannerBack()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (spanner->isGlissando() && !spanner->startElement()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
Note* initialNote = Glissando::guessInitialNote(n->chord());
|
|
|
|
n->removeSpannerBack(spanner);
|
2016-02-15 12:23:28 +01:00
|
|
|
if (initialNote) {
|
2016-01-04 14:48:58 +01:00
|
|
|
spanner->setStartElement(initialNote);
|
|
|
|
spanner->setEndElement(n);
|
|
|
|
spanner->setTick(initialNote->chord()->tick());
|
|
|
|
spanner->setTick2(n->chord()->tick());
|
|
|
|
spanner->setTrack(n->track());
|
|
|
|
spanner->setTrack2(n->track());
|
|
|
|
spanner->setParent(initialNote);
|
|
|
|
initialNote->add(spanner);
|
2014-05-31 12:03:21 +02:00
|
|
|
}
|
2013-09-19 17:17:22 +02:00
|
|
|
else {
|
2016-01-04 14:48:58 +01:00
|
|
|
delete spanner;
|
2013-09-19 17:17:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
// spanner with no end element can happen during copy/paste
|
|
|
|
for (Spanner* spanner : n->spannerFor()) {
|
|
|
|
if (spanner->endElement() == nullptr) {
|
|
|
|
n->removeSpannerFor(spanner);
|
|
|
|
delete spanner;
|
2013-10-30 14:21:08 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
// connect two note tremolos
|
|
|
|
Tremolo* tremolo = c->tremolo();
|
|
|
|
if (tremolo && tremolo->twoNotes() && !tremolo->chord2()) {
|
|
|
|
for (Segment* ls = s->next1(st); ls; ls = ls->next1(st)) {
|
|
|
|
Chord* nc = static_cast<Chord*>(ls->element(i));
|
|
|
|
if (nc == 0)
|
|
|
|
continue;
|
2016-02-06 11:41:16 +01:00
|
|
|
if (!nc->isChord())
|
2016-01-04 14:48:58 +01:00
|
|
|
qDebug("cannot connect tremolo");
|
|
|
|
else {
|
|
|
|
nc->setTremolo(tremolo);
|
|
|
|
tremolo->setChords(c, nc);
|
|
|
|
// cross-measure tremolos are not supported
|
|
|
|
// but can accidentally result from copy & paste
|
|
|
|
// remove them now
|
|
|
|
if (c->measure() != nc->measure())
|
|
|
|
c->remove(tremolo);
|
2013-10-30 14:21:08 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
break;
|
2013-10-25 12:17:42 +02:00
|
|
|
}
|
|
|
|
}
|
2014-08-17 12:41:44 +02:00
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-06 12:35:34 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// layoutFingering
|
|
|
|
// - place numbers above a note execpt for the last
|
|
|
|
// staff in a multi stave part (piano)
|
|
|
|
// - does not handle chords
|
2012-09-06 12:35:34 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::layoutFingering(Fingering* f)
|
2012-09-06 12:35:34 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
if (f == 0)
|
|
|
|
return;
|
|
|
|
TextStyleType tst = f->textStyleType();
|
|
|
|
if (tst != TextStyleType::FINGERING && tst != TextStyleType::RH_GUITAR_FINGERING && tst != TextStyleType::STRING_NUMBER)
|
|
|
|
return;
|
2012-09-06 12:35:34 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
Note* note = f->note();
|
|
|
|
Chord* chord = note->chord();
|
|
|
|
Staff* staff = chord->staff();
|
|
|
|
Part* part = staff->part();
|
|
|
|
int n = part->nstaves();
|
|
|
|
bool voices = chord->measure()->hasVoices(staff->idx());
|
|
|
|
bool below = voices ? !chord->up() : (n > 1) && (staff->rstaff() == n-1);
|
|
|
|
bool tight = voices && !chord->beam();
|
2012-09-06 12:35:34 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
f->layout();
|
|
|
|
qreal x = 0.0;
|
|
|
|
qreal y = 0.0;
|
|
|
|
qreal headWidth = note->headWidth();
|
|
|
|
qreal headHeight = note->headHeight();
|
|
|
|
qreal fh = headHeight; // TODO: fingering number height
|
2014-10-21 18:57:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (chord->notes().size() == 1) {
|
|
|
|
x = headWidth * .5;
|
|
|
|
if (below) {
|
|
|
|
// place fingering below note
|
|
|
|
y = fh + spatium() * .4;
|
|
|
|
if (tight) {
|
|
|
|
y += 0.5 * spatium();
|
|
|
|
if (chord->stem())
|
|
|
|
x += 0.5 * spatium();
|
2014-10-21 18:57:43 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else if (chord->stem() && !chord->up()) {
|
|
|
|
// on stem side
|
|
|
|
y += chord->stem()->height();
|
|
|
|
x -= spatium() * .4;
|
2014-10-21 18:57:43 +02:00
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
|
|
|
// place fingering above note
|
|
|
|
y = -headHeight - spatium() * .4;
|
|
|
|
if (tight) {
|
|
|
|
y -= 0.5 * spatium();
|
|
|
|
if (chord->stem())
|
|
|
|
x -= 0.5 * spatium();
|
|
|
|
}
|
|
|
|
else if (chord->stem() && chord->up()) {
|
|
|
|
// on stem side
|
|
|
|
y -= chord->stem()->height();
|
|
|
|
x += spatium() * .4;
|
2014-10-21 18:57:43 +02:00
|
|
|
}
|
|
|
|
}
|
2012-09-06 12:35:34 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
|
|
|
x -= spatium();
|
|
|
|
}
|
|
|
|
f->setUserOff(QPointF(x, y));
|
2016-07-06 22:02:34 +02:00
|
|
|
if (x != 0 && y != 0)
|
|
|
|
f->setAutoplace(false);
|
2012-09-06 12:35:34 +02:00
|
|
|
}
|
|
|
|
|
2016-02-10 13:40:34 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// checkDivider
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
static void checkDivider(bool left, System* s, qreal sdd)
|
|
|
|
{
|
|
|
|
SystemDivider* divider = left ? s->systemDividerLeft() : s->systemDividerRight();
|
|
|
|
if (s->score()->styleB(left ? StyleIdx::dividerLeft : StyleIdx::dividerRight)) {
|
|
|
|
if (!divider) {
|
|
|
|
divider = new SystemDivider(s->score());
|
|
|
|
divider->setDividerType(left ? SystemDivider::Type::LEFT : SystemDivider::Type::RIGHT);
|
|
|
|
divider->setGenerated(true);
|
|
|
|
s->add(divider);
|
|
|
|
}
|
|
|
|
divider->layout();
|
|
|
|
divider->rypos() = divider->height() * .5 + sdd;
|
|
|
|
divider->adjustReadPos();
|
|
|
|
}
|
|
|
|
else if (divider) {
|
2016-05-25 15:30:10 +02:00
|
|
|
if (divider->generated()) {
|
2016-02-10 13:40:34 +01:00
|
|
|
s->remove(divider);
|
|
|
|
delete divider;
|
|
|
|
}
|
2016-05-25 15:30:10 +02:00
|
|
|
else
|
|
|
|
s->score()->undoRemoveElement(divider);
|
2016-02-10 13:40:34 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// layoutPage
|
2016-03-24 12:39:18 +01:00
|
|
|
// restHeight - vertical space which has to be distributed
|
|
|
|
// between systems
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
2012-09-06 12:35:34 +02:00
|
|
|
|
2016-03-24 12:39:18 +01:00
|
|
|
static void layoutPage(Page* page, qreal restHeight)
|
2016-01-04 14:48:58 +01:00
|
|
|
{
|
2016-03-24 12:39:18 +01:00
|
|
|
Score* score = page->score();
|
2016-01-04 14:48:58 +01:00
|
|
|
int gaps = 0;
|
|
|
|
int nsystems = page->systems().size();
|
|
|
|
for (int i = 0; i < nsystems - 1; ++i) {
|
|
|
|
System* s1 = page->systems().at(i);
|
|
|
|
System* s2 = page->systems().at(i+1);
|
2016-03-02 13:20:19 +01:00
|
|
|
if (s1->vbox() || s2->vbox())
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
|
|
|
++gaps;
|
|
|
|
}
|
2016-03-31 09:57:52 +02:00
|
|
|
|
2016-06-02 12:12:40 +02:00
|
|
|
if (!gaps || MScore::noVerticalStretch || score->layoutMode() == LayoutMode::SYSTEM) {
|
2016-03-24 12:39:18 +01:00
|
|
|
if (score->layoutMode() == LayoutMode::FLOAT) {
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal y = restHeight * .5;
|
|
|
|
for (System* system : page->systems())
|
|
|
|
system->move(QPointF(0.0, y));
|
|
|
|
}
|
|
|
|
// remove system dividers
|
|
|
|
for (System* s : page->systems()) {
|
2016-02-10 13:40:34 +01:00
|
|
|
SystemDivider* sd = s->systemDividerLeft();
|
|
|
|
if (sd) {
|
|
|
|
s->remove(sd);
|
|
|
|
delete sd;
|
|
|
|
}
|
|
|
|
sd = s->systemDividerRight();
|
|
|
|
if (sd) {
|
|
|
|
s->remove(sd);
|
|
|
|
delete sd;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-03-24 12:39:18 +01:00
|
|
|
const qreal maxDistance = score->styleP(StyleIdx::maxSystemDistance);
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal stretch = restHeight / gaps;
|
|
|
|
|
|
|
|
qreal yoff = 0;
|
|
|
|
for (int i = 0; i < nsystems - 1; ++i) {
|
|
|
|
System* s1 = page->systems().at(i);
|
|
|
|
System* s2 = page->systems().at(i+1);
|
2016-03-02 13:20:19 +01:00
|
|
|
if (!(s1->vbox() || s2->vbox())) {
|
2016-03-31 09:57:52 +02:00
|
|
|
qreal dist = (s2->y() + yoff) - (s1->y() + s1->height());
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal offset = stretch;
|
|
|
|
if (dist + stretch > maxDistance) { // limit stretch
|
|
|
|
offset = maxDistance - dist;
|
|
|
|
if (offset < 0)
|
|
|
|
offset = 0;
|
2012-07-31 09:48:37 +02:00
|
|
|
}
|
2016-03-31 09:57:52 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
yoff += offset;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-02-10 13:40:34 +01:00
|
|
|
// add / remove system dividers
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-02-10 13:40:34 +01:00
|
|
|
qreal sdd = (s2->y() + yoff - s1->y() - s1->height()) * .5 + s1->height();
|
|
|
|
checkDivider(true, s1, sdd);
|
|
|
|
checkDivider(false, s1, sdd);
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-02-10 13:40:34 +01:00
|
|
|
s2->rypos() += yoff;
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
}
|
2014-10-22 17:17:26 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
2016-05-02 13:41:41 +02:00
|
|
|
// Spring
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-05-02 13:41:41 +02:00
|
|
|
struct Spring {
|
2016-01-04 14:48:58 +01:00
|
|
|
int seg;
|
|
|
|
qreal stretch;
|
|
|
|
qreal fix;
|
2016-05-02 13:41:41 +02:00
|
|
|
Spring(int i, qreal s, qreal f) : seg(i), stretch(s), fix(f) {}
|
2016-01-04 14:48:58 +01:00
|
|
|
};
|
2012-09-06 12:35:34 +02:00
|
|
|
|
2016-05-02 13:41:41 +02:00
|
|
|
typedef std::multimap<qreal, Spring, std::less<qreal> > SpringMap;
|
2014-10-21 18:57:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// sff2
|
|
|
|
// compute 1/Force for a given Extend
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-05-02 13:41:41 +02:00
|
|
|
static qreal sff2(qreal width, qreal xMin, const SpringMap& springs)
|
2016-01-04 14:48:58 +01:00
|
|
|
{
|
2016-05-02 13:41:41 +02:00
|
|
|
if (width <= xMin)
|
2016-01-04 14:48:58 +01:00
|
|
|
return 0.0;
|
|
|
|
auto i = springs.begin();
|
|
|
|
qreal c = i->second.stretch;
|
|
|
|
if (c == 0.0) //DEBUG
|
|
|
|
c = 1.1;
|
|
|
|
qreal f = 0.0;
|
|
|
|
for (; i != springs.end();) {
|
|
|
|
xMin -= i->second.fix;
|
2016-05-02 13:41:41 +02:00
|
|
|
f = (width - xMin) / c;
|
2016-01-04 14:48:58 +01:00
|
|
|
++i;
|
|
|
|
if (i == springs.end() || f <= i->first)
|
2012-05-26 14:26:10 +02:00
|
|
|
break;
|
2016-01-04 14:48:58 +01:00
|
|
|
c += i->second.stretch;
|
|
|
|
}
|
|
|
|
return f;
|
|
|
|
}
|
2012-09-06 12:35:34 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// respace
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-04-07 11:18:34 +02:00
|
|
|
void Score::respace(std::vector<ChordRest*>* elements)
|
2016-01-04 14:48:58 +01:00
|
|
|
{
|
|
|
|
ChordRest* cr1 = elements->front();
|
|
|
|
ChordRest* cr2 = elements->back();
|
|
|
|
int n = elements->size();
|
|
|
|
qreal x1 = cr1->segment()->pos().x();
|
|
|
|
qreal x2 = cr2->segment()->pos().x();
|
|
|
|
|
|
|
|
qreal width[n-1];
|
|
|
|
int ticksList[n-1];
|
|
|
|
int minTick = 100000;
|
|
|
|
|
|
|
|
for (int i = 0; i < n-1; ++i) {
|
|
|
|
ChordRest* cr = (*elements)[i];
|
2016-04-07 11:18:34 +02:00
|
|
|
ChordRest* ncr = (*elements)[i+1];
|
|
|
|
width[i] = cr->shape().minHorizontalDistance(ncr->shape());
|
|
|
|
ticksList[i] = cr->duration().ticks();
|
2016-01-04 14:48:58 +01:00
|
|
|
minTick = qMin(ticksList[i], minTick);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------
|
|
|
|
// compute stretches
|
|
|
|
//---------------------------------------------------
|
|
|
|
|
2016-05-02 13:41:41 +02:00
|
|
|
SpringMap springs;
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal minimum = 0.0;
|
|
|
|
for (int i = 0; i < n-1; ++i) {
|
|
|
|
qreal w = width[i];
|
|
|
|
int t = ticksList[i];
|
|
|
|
qreal str = 1.0 + 0.865617 * log(qreal(t) / qreal(minTick));
|
|
|
|
qreal d = w / str;
|
2012-09-05 12:14:58 +02:00
|
|
|
|
2016-05-02 13:41:41 +02:00
|
|
|
springs.insert(std::pair<qreal, Spring>(d, Spring(i, str, w)));
|
2016-01-04 14:48:58 +01:00
|
|
|
minimum += w;
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------
|
|
|
|
// distribute stretch to elements
|
|
|
|
//---------------------------------------------------
|
2013-03-29 15:01:21 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal force = sff2(x2 - x1, minimum, springs);
|
|
|
|
for (auto i = springs.begin(); i != springs.end(); ++i) {
|
|
|
|
qreal stretch = force * i->second.stretch;
|
|
|
|
if (stretch < i->second.fix)
|
|
|
|
stretch = i->second.fix;
|
|
|
|
width[i->second.seg] = stretch;
|
|
|
|
}
|
|
|
|
qreal x = x1;
|
|
|
|
for (int i = 1; i < n-1; ++i) {
|
|
|
|
x += width[i-1];
|
|
|
|
ChordRest* cr = (*elements)[i];
|
|
|
|
qreal dx = x - cr->segment()->pos().x();
|
|
|
|
cr->rxpos() += dx;
|
|
|
|
}
|
2013-03-29 15:01:21 +01:00
|
|
|
}
|
|
|
|
|
2014-07-31 18:46:41 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// computeMinWidth
|
|
|
|
// return the minimum width of segment list s
|
|
|
|
// set the width for all segments
|
|
|
|
// set the x position of first segment
|
2014-07-31 18:46:41 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-02-12 14:42:06 +01:00
|
|
|
qreal Score::computeMinWidth(Segment* s, bool isFirstMeasureInSystem)
|
2013-03-29 15:01:21 +01:00
|
|
|
{
|
2016-04-21 15:34:06 +02:00
|
|
|
qreal x;
|
2016-01-04 14:48:58 +01:00
|
|
|
|
2016-04-21 15:34:06 +02:00
|
|
|
Shape ls;
|
2016-04-18 18:11:51 +02:00
|
|
|
if (s->isChordRestType()) {
|
2016-04-21 15:34:06 +02:00
|
|
|
// x = qMax(s->minLeft() + styleP(StyleIdx::minNoteDistance), styleP(StyleIdx::barNoteDistance));
|
|
|
|
x = s->minLeft() + styleP(StyleIdx::barNoteDistance);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (isFirstMeasureInSystem)
|
|
|
|
ls.add(QRectF(0.0, -1000000.0, 0.0, 2000000.0)); // left margin
|
|
|
|
else
|
|
|
|
ls.add(QRectF(0.0, 0.0, 0.0, spatium() * 4)); // simulated bar line
|
|
|
|
x = s->minLeft(ls);
|
|
|
|
|
|
|
|
if (s->isClefType())
|
|
|
|
// x = qMax(x, clefLeftMargin);
|
|
|
|
x += styleP(StyleIdx::clefLeftMargin);
|
|
|
|
else if (s->isKeySigType())
|
|
|
|
x = qMax(x, styleP(StyleIdx::keysigLeftMargin));
|
|
|
|
else if (s->isTimeSigType())
|
|
|
|
x = qMax(x, styleP(StyleIdx::timesigLeftMargin));
|
2016-04-18 18:11:51 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
|
2016-04-21 15:34:06 +02:00
|
|
|
x += s->extraLeadingSpace().val() * spatium();
|
2016-04-19 15:18:17 +02:00
|
|
|
bool isSystemHeader = isFirstMeasureInSystem;
|
|
|
|
|
2016-02-16 21:21:28 +01:00
|
|
|
for (Segment* ss = s; ss;) {
|
2016-02-08 15:10:03 +01:00
|
|
|
ss->rxpos() = x;
|
|
|
|
Segment* ns = ss->next();
|
2016-02-16 21:21:28 +01:00
|
|
|
qreal w;
|
2016-02-08 15:10:03 +01:00
|
|
|
|
2016-02-16 21:21:28 +01:00
|
|
|
if (ns) {
|
2016-04-19 15:18:17 +02:00
|
|
|
if (isSystemHeader && ns->isChordRestType()) { // this is the system header gap
|
|
|
|
w = ss->minHorizontalDistance(ns, true);
|
|
|
|
isSystemHeader = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
w = ss->minHorizontalDistance(ns, false);
|
2016-03-18 09:29:16 +01:00
|
|
|
#if 1
|
2016-02-16 21:21:28 +01:00
|
|
|
// look back for collisions with previous segments
|
2016-03-18 09:29:16 +01:00
|
|
|
// this is time consuming (ca. +5%) and probably requires more optimization
|
|
|
|
|
|
|
|
int n = 1;
|
2016-02-16 21:21:28 +01:00
|
|
|
for (Segment* ps = ss;;) {
|
|
|
|
qreal ww;
|
|
|
|
if (ps == s)
|
|
|
|
ww = ns->minLeft(ls) - ss->x();
|
|
|
|
else {
|
|
|
|
ps = ps->prev();
|
2016-03-02 13:20:19 +01:00
|
|
|
if (ps->isChordRestType())
|
|
|
|
++n;
|
2016-04-19 15:18:17 +02:00
|
|
|
ww = ps->minHorizontalDistance(ns, false) - (ss->x() - ps->x());
|
2016-02-16 21:21:28 +01:00
|
|
|
}
|
|
|
|
if (ww > w) {
|
|
|
|
// overlap !
|
|
|
|
// distribute extra space between segments ps - ss;
|
2016-03-18 09:29:16 +01:00
|
|
|
// only ChordRest segments get more space
|
|
|
|
// TODO: is there a special case n == 0 ?
|
|
|
|
|
2016-02-16 21:21:28 +01:00
|
|
|
qreal d = (ww - w) / n;
|
|
|
|
qreal xx = ps->x();
|
|
|
|
for (Segment* s = ps; s != ss;) {
|
|
|
|
Segment* ns = s->next();
|
2016-03-18 09:29:16 +01:00
|
|
|
qreal ww = s->width();
|
2016-03-02 13:20:19 +01:00
|
|
|
if (s->isChordRestType()) {
|
|
|
|
ww += d;
|
|
|
|
s->setWidth(ww);
|
|
|
|
}
|
2016-02-16 21:21:28 +01:00
|
|
|
xx += ww;
|
|
|
|
ns->rxpos() = xx;
|
|
|
|
s = ns;
|
|
|
|
}
|
2016-03-18 09:29:16 +01:00
|
|
|
w += d;
|
|
|
|
x = xx;
|
2016-02-16 21:21:28 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (ps == s)
|
|
|
|
break;
|
2016-02-08 15:10:03 +01:00
|
|
|
}
|
2016-03-02 13:20:19 +01:00
|
|
|
#endif
|
2016-02-08 15:10:03 +01:00
|
|
|
}
|
2016-02-16 21:21:28 +01:00
|
|
|
else
|
2016-03-02 13:20:19 +01:00
|
|
|
w = ss->isEndBarLineType() ? 0.0 : ss->minRight();
|
2016-02-08 15:10:03 +01:00
|
|
|
ss->setWidth(w);
|
2016-02-04 11:27:47 +01:00
|
|
|
x += w;
|
2016-02-08 15:10:03 +01:00
|
|
|
ss = ns;
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-02-04 11:27:47 +01:00
|
|
|
return x;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2012-08-02 18:33:43 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// updateBarLineSpans
|
|
|
|
/// updates bar line span(s) when the number of lines of a staff changes
|
2012-08-02 18:33:43 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::updateBarLineSpans(int idx, int linesOld, int linesNew)
|
2012-08-02 18:33:43 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
int nStaves = nstaves();
|
|
|
|
Staff* _staff;
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// scan staves and check the destination staff of each bar line span
|
|
|
|
// barLineSpan is not changed; barLineFrom and barLineTo are changed if they occur in the bottom half of a staff
|
|
|
|
// in practice, a barLineFrom/To from/to the top half of the staff is linked to the staff top line,
|
|
|
|
// a barLineFrom/To from/to the bottom half of the staff is linked to staff bottom line;
|
|
|
|
// this ensures plainchant and mensurstrich special bar lines keep their relationships to the staff lines.
|
|
|
|
// 1-line staves are traited as a special case.
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for(int sIdx = 0; sIdx < nStaves; sIdx++) {
|
|
|
|
_staff = staff(sIdx);
|
|
|
|
// if this is the modified staff
|
|
|
|
if(sIdx == idx) {
|
|
|
|
// if it has no bar line, set barLineTo to a default value
|
|
|
|
if(_staff->barLineSpan() == 0)
|
|
|
|
_staff->setBarLineTo( (linesNew-1) * 2);
|
|
|
|
// if new line count is 1, set default From for 1-line staves
|
|
|
|
else if(linesNew == 1)
|
|
|
|
_staff->setBarLineFrom(BARLINE_SPAN_1LINESTAFF_FROM);
|
|
|
|
// if old line count was 1, set default From for normal staves
|
|
|
|
else if (linesOld == 1)
|
|
|
|
_staff->setBarLineFrom(0);
|
|
|
|
// if barLineFrom was below the staff middle position
|
|
|
|
// raise or lower it to account for new number of lines
|
|
|
|
else if(_staff->barLineFrom() > linesOld - 1)
|
|
|
|
_staff->setBarLineFrom(_staff->barLineFrom() + (linesNew - linesOld)*2);
|
|
|
|
}
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// if the modified staff is the destination of the current staff bar span:
|
|
|
|
if(sIdx + _staff->barLineSpan() - 1 == idx) {
|
|
|
|
// if new line count is 1, set default To for 1-line staves
|
|
|
|
if(linesNew == 1)
|
|
|
|
_staff->setBarLineTo(BARLINE_SPAN_1LINESTAFF_TO);
|
|
|
|
// if old line count was 1, set default To for normal staves
|
|
|
|
else if (linesOld == 1)
|
|
|
|
_staff->setBarLineTo((linesNew - 1) * 2);
|
|
|
|
// if barLineTo was below its middle position, raise or lower it
|
|
|
|
else if(_staff->barLineTo() > linesOld - 1)
|
|
|
|
_staff->setBarLineTo(_staff->barLineTo() + (linesNew - linesOld)*2);
|
2012-08-02 18:33:43 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
}
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// getEmptyPage
|
|
|
|
//---------------------------------------------------------
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
Page* Score::getEmptyPage(LayoutContext& lc)
|
|
|
|
{
|
2016-03-02 13:20:19 +01:00
|
|
|
Page* page;
|
|
|
|
|
|
|
|
if (lc.curPage >= _pages.size()) {
|
|
|
|
page = addPage();
|
|
|
|
lc.pageOldSystem = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
page = _pages[lc.curPage];
|
|
|
|
lc.pageOldSystem = page->systems().empty() ? 0 : page->systems().back();
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
page->setNo(lc.curPage);
|
|
|
|
page->layout();
|
|
|
|
qreal x, y;
|
|
|
|
if (MScore::verticalOrientation()) {
|
|
|
|
x = 0.0;
|
|
|
|
y = (lc.curPage == 0) ? 0.0 : _pages[lc.curPage - 1]->pos().y() + page->height() + MScore::verticalPageGap;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
y = 0.0;
|
|
|
|
x = (lc.curPage == 0) ? 0.0 : _pages[lc.curPage - 1]->pos().x()
|
|
|
|
+ page->width()
|
|
|
|
+ (((lc.curPage+_pageNumberOffset) & 1) ? MScore::horizontalPageGapOdd : MScore::horizontalPageGapEven);
|
2012-08-02 18:33:43 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
++lc.curPage;
|
|
|
|
page->setPos(x, y);
|
|
|
|
page->systems().clear();
|
2016-03-24 12:39:18 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
return page;
|
|
|
|
}
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// getNextSystem
|
|
|
|
//---------------------------------------------------------
|
2012-08-02 18:33:43 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
System* Score::getNextSystem(LayoutContext& lc)
|
|
|
|
{
|
2016-02-06 11:41:16 +01:00
|
|
|
bool isVBox = lc.curMeasure->isVBox();
|
2016-01-04 14:48:58 +01:00
|
|
|
System* system;
|
2016-03-02 13:20:19 +01:00
|
|
|
if (lc.systemList.empty()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
system = new System(this);
|
2016-03-02 13:20:19 +01:00
|
|
|
lc.systemOldMeasure = 0;
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
|
|
|
system = lc.systemList.takeFirst();
|
2016-03-02 13:20:19 +01:00
|
|
|
lc.systemOldMeasure = system->measures().empty() ? 0 : system->measures().back();
|
2016-01-04 14:48:58 +01:00
|
|
|
system->clear(); // remove measures from system
|
|
|
|
}
|
2016-02-04 11:27:47 +01:00
|
|
|
_systems.append(system);
|
2016-01-04 14:48:58 +01:00
|
|
|
if (!isVBox) {
|
|
|
|
int nstaves = Score::nstaves();
|
|
|
|
for (int i = system->staves()->size(); i < nstaves; ++i)
|
|
|
|
system->insertStaff(i);
|
|
|
|
int dn = system->staves()->size() - nstaves;
|
|
|
|
for (int i = 0; i < dn; ++i)
|
|
|
|
system->removeStaff(system->staves()->size()-1);
|
|
|
|
}
|
2016-03-02 13:20:19 +01:00
|
|
|
lc.curSystem = system;
|
2016-01-04 14:48:58 +01:00
|
|
|
return system;
|
2012-08-02 18:33:43 +02:00
|
|
|
}
|
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// createMMRest
|
|
|
|
// create a multi measure rest from m to lm (inclusive)
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::createMMRest(Measure* m, Measure* lm, const Fraction& len)
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
int n = 1;
|
|
|
|
for (Measure* mm = m->nextMeasure(); mm; mm = mm->nextMeasure()) {
|
|
|
|
++n;
|
|
|
|
mm->setMMRestCount(-1);
|
|
|
|
if (mm->mmRest())
|
|
|
|
undo(new ChangeMMRest(mm, 0));
|
|
|
|
if (mm == lm)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
Measure* mmr = m->mmRest();
|
|
|
|
if (mmr) {
|
|
|
|
if (mmr->len() != len) {
|
|
|
|
Segment* s = mmr->findSegment(Segment::Type::EndBarLine, mmr->endTick());
|
|
|
|
mmr->setLen(len);
|
|
|
|
if (s)
|
|
|
|
s->setTick(mmr->endTick());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
mmr = new Measure(this);
|
|
|
|
mmr->setLen(len);
|
|
|
|
mmr->setTick(m->tick());
|
2016-02-11 12:16:32 +01:00
|
|
|
mmr->setPageBreak(lm->pageBreak());
|
|
|
|
mmr->setLineBreak(lm->lineBreak());
|
2016-01-04 14:48:58 +01:00
|
|
|
undo(new ChangeMMRest(m, mmr));
|
|
|
|
}
|
|
|
|
mmr->setMMRestCount(n);
|
|
|
|
mmr->setNo(m->no());
|
|
|
|
|
2016-02-11 12:16:32 +01:00
|
|
|
Segment* ss = lm->findSegment(Segment::Type::EndBarLine, lm->endTick());
|
|
|
|
if (ss) {
|
|
|
|
Segment* ds = mmr->undoGetSegment(Segment::Type::EndBarLine, lm->endTick());
|
|
|
|
for (int staffIdx = 0; staffIdx < nstaves(); ++staffIdx) {
|
|
|
|
Element* e = ss->element(staffIdx * VOICES);
|
|
|
|
if (e) {
|
|
|
|
if (!ds->element(staffIdx * VOICES)) {
|
|
|
|
Element* ee = e->clone();
|
|
|
|
ee->setParent(ds);
|
|
|
|
undoAddElement(ee);
|
|
|
|
}
|
2016-08-03 15:39:30 +02:00
|
|
|
else {
|
|
|
|
BarLine* bd = toBarLine(ds->element(staffIdx * VOICES));
|
2016-08-11 10:21:28 +02:00
|
|
|
BarLine* bs = toBarLine(e);
|
2016-08-03 15:39:30 +02:00
|
|
|
if (bd->barLineType() != bs->barLineType()) {
|
|
|
|
undoChangeProperty(bd, P_ID::BARLINE_TYPE, QVariant::fromValue(bs->barLineType()));
|
|
|
|
undoChangeProperty(bd, P_ID::GENERATED, true);
|
|
|
|
}
|
|
|
|
}
|
2016-02-11 12:16:32 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-02-04 11:27:47 +01:00
|
|
|
|
2016-02-11 12:16:32 +01:00
|
|
|
mmr->setRepeatStart(m->repeatStart() || lm->repeatStart());
|
|
|
|
mmr->setRepeatEnd(m->repeatEnd() || lm->repeatEnd());
|
2016-01-04 14:48:58 +01:00
|
|
|
|
|
|
|
ElementList oldList = mmr->takeElements();
|
|
|
|
ElementList newList = lm->el();
|
|
|
|
|
|
|
|
for (Element* e : m->el()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (e->isMarker())
|
2016-02-06 22:03:43 +01:00
|
|
|
newList.push_back(e);
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
for (Element* e : newList) {
|
|
|
|
bool found = false;
|
|
|
|
for (Element* ee : oldList) {
|
|
|
|
if (ee->type() == e->type()) {
|
|
|
|
mmr->add(ee);
|
2016-02-06 22:03:43 +01:00
|
|
|
auto i = std::find(oldList.begin(), oldList.end(), ee);
|
|
|
|
if (i != oldList.end())
|
|
|
|
oldList.erase(i);
|
2016-01-04 14:48:58 +01:00
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found)
|
|
|
|
mmr->add(e->clone());
|
|
|
|
}
|
|
|
|
for (Element* e : oldList)
|
|
|
|
delete e;
|
|
|
|
Segment* s = mmr->undoGetSegment(Segment::Type::ChordRest, mmr->tick());
|
|
|
|
for (int staffIdx = 0; staffIdx < _staves.size(); ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
if (s->element(track) == 0) {
|
|
|
|
Rest* r = new Rest(this);
|
|
|
|
r->setDurationType(TDuration::DurationType::V_MEASURE);
|
|
|
|
r->setDuration(mmr->len());
|
|
|
|
r->setTrack(track);
|
|
|
|
r->setParent(s);
|
|
|
|
undo(new AddElement(r));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// check for clefs
|
|
|
|
//
|
|
|
|
Segment* cs = lm->findSegment(Segment::Type::Clef, lm->endTick());
|
|
|
|
Segment* ns = mmr->findSegment(Segment::Type::Clef, lm->endTick());
|
|
|
|
if (cs) {
|
|
|
|
if (ns == 0)
|
|
|
|
ns = mmr->undoGetSegment(Segment::Type::Clef, lm->endTick());
|
|
|
|
for (int staffIdx = 0; staffIdx < _staves.size(); ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
Clef* clef = static_cast<Clef*>(cs->element(track));
|
|
|
|
if (clef) {
|
|
|
|
if (ns->element(track) == 0)
|
|
|
|
ns->add(clef->clone());
|
|
|
|
else {
|
|
|
|
//TODO: check if same clef
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (ns)
|
|
|
|
undo(new RemoveElement(ns));
|
2016-02-11 12:16:32 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//
|
|
|
|
// check for time signature
|
|
|
|
//
|
|
|
|
cs = m->findSegment(Segment::Type::TimeSig, m->tick());
|
|
|
|
ns = mmr->findSegment(Segment::Type::TimeSig, m->tick());
|
|
|
|
if (cs) {
|
|
|
|
if (ns == 0)
|
|
|
|
ns = mmr->undoGetSegment(Segment::Type::TimeSig, m->tick());
|
|
|
|
for (int staffIdx = 0; staffIdx < _staves.size(); ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
TimeSig* ts = static_cast<TimeSig*>(cs->element(track));
|
|
|
|
if (ts) {
|
|
|
|
TimeSig* nts = static_cast<TimeSig*>(ns->element(track));
|
|
|
|
if (!nts) {
|
|
|
|
nts = ts->clone();
|
|
|
|
nts->setParent(ns);
|
|
|
|
undo(new AddElement(nts));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
nts->setSig(ts->sig(), ts->timeSigType());
|
|
|
|
nts->layout();
|
|
|
|
}
|
2012-08-02 18:33:43 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (ns)
|
|
|
|
undo(new RemoveElement(ns));
|
2015-04-09 13:48:32 +02:00
|
|
|
|
2016-05-25 12:10:52 +02:00
|
|
|
//
|
|
|
|
// check for ambitus
|
|
|
|
//
|
|
|
|
cs = m->findSegment(Segment::Type::Ambitus, m->tick());
|
|
|
|
ns = mmr->findSegment(Segment::Type::Ambitus, m->tick());
|
|
|
|
if (cs) {
|
|
|
|
if (ns == 0)
|
|
|
|
ns = mmr->undoGetSegment(Segment::Type::Ambitus, m->tick());
|
|
|
|
for (int staffIdx = 0; staffIdx < _staves.size(); ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
Ambitus* a = toAmbitus(cs->element(track));
|
|
|
|
if (a) {
|
|
|
|
Ambitus* na = toAmbitus(ns->element(track));
|
|
|
|
if (!na) {
|
|
|
|
na = a->clone();
|
|
|
|
na->setParent(ns);
|
|
|
|
undo(new AddElement(na));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
na->initFrom(a);
|
|
|
|
na->layout();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (ns)
|
|
|
|
undo(new RemoveElement(ns));
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//
|
|
|
|
// check for key signature
|
|
|
|
//
|
|
|
|
cs = m->findSegment(Segment::Type::KeySig, m->tick());
|
|
|
|
ns = mmr->findSegment(Segment::Type::KeySig, m->tick());
|
|
|
|
if (cs) {
|
|
|
|
if (ns == 0)
|
|
|
|
ns = mmr->undoGetSegment(Segment::Type::KeySig, m->tick());
|
|
|
|
for (int staffIdx = 0; staffIdx < _staves.size(); ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
KeySig* ts = static_cast<KeySig*>(cs->element(track));
|
|
|
|
KeySig* nts = static_cast<KeySig*>(ns->element(track));
|
|
|
|
if (ts) {
|
|
|
|
if (!nts) {
|
|
|
|
KeySig* nks = ts->clone();
|
|
|
|
nks->setParent(ns);
|
|
|
|
undo(new AddElement(nks));
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
|
|
|
if (!(nts->keySigEvent() == ts->keySigEvent())) {
|
|
|
|
undo(new ChangeKeySig(nts, ts->keySigEvent(), nts->showCourtesy()));
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-02-06 22:03:43 +01:00
|
|
|
else if (ns && ns->empty())
|
2016-01-04 14:48:58 +01:00
|
|
|
undo(new RemoveElement(ns));
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//
|
|
|
|
// check for rehearsal mark etc.
|
|
|
|
//
|
|
|
|
cs = m->findSegment(Segment::Type::ChordRest, m->tick());
|
|
|
|
if (cs) {
|
|
|
|
for (Element* e : cs->annotations()) {
|
2016-02-10 18:35:35 +01:00
|
|
|
if (!(e->isRehearsalMark() || e->isTempoText() || e->isHarmony() || e->isStaffText()))
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
bool found = false;
|
|
|
|
for (Element* ee : s->annotations()) {
|
|
|
|
if (ee->type() == e->type() && ee->track() == e->track()) {
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found) {
|
|
|
|
Element* ne = e->linkedClone();
|
|
|
|
ne->setParent(s);
|
|
|
|
undo(new AddElement(ne));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-02-11 12:16:32 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for (Element* e : s->annotations()) {
|
2016-02-10 18:35:35 +01:00
|
|
|
if (!(e->isRehearsalMark() || e->isTempoText() || e->isHarmony() || e->isStaffText()))
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
|
|
|
bool found = false;
|
|
|
|
for (Element* ee : cs->annotations()) {
|
|
|
|
if (ee->type() == e->type() && ee->track() == e->track()) {
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found)
|
|
|
|
undo(new RemoveElement(e));
|
|
|
|
}
|
|
|
|
|
|
|
|
MeasureBase* nm = _showVBox ? lm->next() : lm->nextMeasure();
|
|
|
|
mmr->setNext(nm);
|
|
|
|
mmr->setPrev(m->prev());
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// validMMRestMeasure
|
|
|
|
// return true if this might be a measure in a
|
|
|
|
// multi measure rest
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
static bool validMMRestMeasure(Measure* m)
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
if (m->irregular())
|
|
|
|
return false;
|
|
|
|
|
|
|
|
int n = 0;
|
|
|
|
for (Segment* s = m->first(); s; s = s->next()) {
|
|
|
|
for (Element* e : s->annotations()) {
|
2016-02-10 18:35:35 +01:00
|
|
|
if (!(e->isRehearsalMark() || e->isTempoText() || e->isHarmony() || e->isStaffText()))
|
2016-01-04 14:48:58 +01:00
|
|
|
return false;
|
|
|
|
}
|
2016-03-02 13:20:19 +01:00
|
|
|
if (s->isChordRestType()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
bool restFound = false;
|
|
|
|
int tracks = m->mstaves().size() * VOICES;
|
|
|
|
for (int track = 0; track < tracks; ++track) {
|
|
|
|
if ((track % VOICES) == 0 && !m->score()->staff(track/VOICES)->show()) {
|
|
|
|
track += VOICES-1;
|
|
|
|
continue;
|
2015-06-29 20:07:26 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (s->element(track)) {
|
|
|
|
if (s->element(track)->type() != Element::Type::REST)
|
|
|
|
return false;
|
2016-08-11 10:21:28 +02:00
|
|
|
Rest* rest = toRest(s->element(track));
|
|
|
|
if (rest->articulations().size() > 0) // break on fermata
|
|
|
|
return false;
|
2016-01-04 14:48:58 +01:00
|
|
|
restFound = true;
|
2014-05-15 13:42:03 +02:00
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (restFound)
|
|
|
|
++n;
|
|
|
|
// measure is not empty if there is more than one rest
|
|
|
|
if (n > 1)
|
|
|
|
return false;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// breakMultiMeasureRest
|
|
|
|
// return true if this measure should start a new
|
|
|
|
// multi measure rest
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
static bool breakMultiMeasureRest(Measure* m)
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
if (m->breakMultiMeasureRest())
|
|
|
|
return true;
|
2015-12-18 01:34:32 +01:00
|
|
|
|
2016-02-04 11:27:47 +01:00
|
|
|
if (m->repeatStart()
|
|
|
|
|| (m->prevMeasure() && m->prevMeasure()->repeatEnd())
|
2016-01-04 14:48:58 +01:00
|
|
|
|| (m->prevMeasure() && (m->prevMeasure()->sectionBreak())))
|
|
|
|
return true;
|
2015-12-18 01:34:32 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
auto sl = m->score()->spannerMap().findOverlapping(m->tick(), m->endTick());
|
|
|
|
for (auto i : sl) {
|
|
|
|
Spanner* s = i.value;
|
2016-02-06 11:41:16 +01:00
|
|
|
if (s->isVolta() && (s->tick() == m->tick() || s->tick2() == m->tick()))
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
2015-12-18 01:34:32 +01:00
|
|
|
}
|
2014-10-17 03:43:54 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// break for marker in this measure
|
|
|
|
for (Element* e : m->el()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (e->isMarker()) {
|
2016-02-17 14:54:23 +01:00
|
|
|
Marker* mark = toMarker(e);
|
2016-01-04 14:48:58 +01:00
|
|
|
if (!(mark->textStyle().align() & AlignmentFlags::RIGHT))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// break for marker & jump in previous measure
|
|
|
|
Measure* pm = m->prevMeasure();
|
|
|
|
if (pm) {
|
|
|
|
for (Element* e : pm->el()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (e->isJump())
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
2016-02-06 11:41:16 +01:00
|
|
|
else if (e->isMarker()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
Marker* mark = static_cast<Marker*>(e);
|
|
|
|
if (mark->textStyle().align() & AlignmentFlags::RIGHT)
|
|
|
|
return true;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// break for end of volta
|
|
|
|
auto l = m->score()->spannerMap().findOverlapping(m->tick(), m->endTick());
|
|
|
|
for (auto isp : l) {
|
|
|
|
Spanner* s = isp.value;
|
2016-02-06 11:41:16 +01:00
|
|
|
if (s->isVolta() && (s->tick2() == m->endTick()))
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (Segment* s = m->first(); s; s = s->next()) {
|
|
|
|
for (Element* e : s->annotations()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (e->isRehearsalMark() ||
|
|
|
|
e->isTempoText() ||
|
|
|
|
((e->isHarmony() || e->isStaffText()) && (e->systemFlag() || m->score()->staff(e->staffIdx())->show())))
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
for (int staffIdx = 0; staffIdx < m->score()->nstaves(); ++staffIdx) {
|
|
|
|
if (!m->score()->staff(staffIdx)->show())
|
|
|
|
continue;
|
|
|
|
Element* e = s->element(staffIdx * VOICES);
|
|
|
|
if (!e || e->generated())
|
|
|
|
continue;
|
2016-03-02 13:20:19 +01:00
|
|
|
if (s->isStartRepeatBarLineType())
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
2016-03-02 13:20:19 +01:00
|
|
|
if (s->isType(Segment::Type::KeySig | Segment::Type::TimeSig) && m->tick())
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
2016-03-02 13:20:19 +01:00
|
|
|
if (s->isClefType()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
if (s->tick() != m->endTick() && m->tick())
|
|
|
|
return true;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (pm) {
|
2016-02-11 12:16:32 +01:00
|
|
|
Segment* s = pm->findSegment(Segment::Type::EndBarLine, pm->endTick());
|
|
|
|
if (s) {
|
|
|
|
for (int staffIdx = 0; staffIdx < s->score()->nstaves(); ++staffIdx) {
|
2016-02-17 14:54:23 +01:00
|
|
|
BarLine* bl = toBarLine(s->element(staffIdx * VOICES));
|
2016-02-11 12:16:32 +01:00
|
|
|
if (bl) {
|
|
|
|
BarLineType t = bl->barLineType();
|
2016-08-03 15:39:30 +02:00
|
|
|
if (t != BarLineType::NORMAL && t != BarLineType::BROKEN && t != BarLineType::DOTTED && !bl->generated())
|
2016-02-11 12:16:32 +01:00
|
|
|
return true;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (pm->findSegment(Segment::Type::Clef, m->tick()))
|
|
|
|
return true;
|
2014-10-17 03:43:54 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
return false;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-04-01 09:28:40 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// adjustMeasureNo
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
int LayoutContext::adjustMeasureNo(MeasureBase* m)
|
|
|
|
{
|
|
|
|
measureNo += m->noOffset();
|
|
|
|
m->setNo(measureNo);
|
|
|
|
if (!m->irregular()) // dont count measure
|
|
|
|
++measureNo;
|
|
|
|
if (m->sectionBreak())
|
|
|
|
measureNo = 0;
|
|
|
|
return measureNo;
|
|
|
|
}
|
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
2016-05-19 13:15:34 +02:00
|
|
|
// createBeams
|
|
|
|
// helper function
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-05-19 13:15:34 +02:00
|
|
|
void Score::createBeams(Measure* measure)
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
bool crossMeasure = styleB(StyleIdx::crossMeasureValues);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for (int track = 0; track < ntracks(); ++track) {
|
|
|
|
Staff* stf = staff(track2staff(track));
|
2013-09-14 02:30:40 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// dont compute beams for invisible staffs and tablature without stems
|
|
|
|
if (!stf->show() || (stf->isTabStaff() && stf->staffType()->slashStyle()))
|
2012-05-26 14:26:10 +02:00
|
|
|
continue;
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
ChordRest* a1 = 0; // start of (potential) beam
|
|
|
|
Beam* beam = 0; // current beam
|
|
|
|
Beam::Mode bm = Beam::Mode::AUTO;
|
|
|
|
ChordRest* prev = 0;
|
2016-02-11 18:20:16 +01:00
|
|
|
bool checkBeats = false;
|
|
|
|
Fraction stretch = 1;
|
2016-01-04 14:48:58 +01:00
|
|
|
QHash<int, TDuration> beatSubdivision;
|
2016-02-11 18:20:16 +01:00
|
|
|
|
|
|
|
// if this measure is simple meter (actually X/4),
|
|
|
|
// then perform a prepass to determine the subdivision of each beat
|
|
|
|
|
|
|
|
beatSubdivision.clear();
|
|
|
|
TimeSig* ts = stf->timeSig(measure->tick());
|
|
|
|
checkBeats = false;
|
|
|
|
stretch = ts ? ts->stretch() : 1;
|
|
|
|
|
2016-05-19 13:15:34 +02:00
|
|
|
const Segment::Type st = Segment::Type::ChordRest;
|
2016-02-11 18:20:16 +01:00
|
|
|
if (ts && ts->denominator() == 4) {
|
|
|
|
checkBeats = true;
|
|
|
|
for (Segment* s = measure->first(st); s; s = s->next(st)) {
|
|
|
|
ChordRest* mcr = static_cast<ChordRest*>(s->element(track));
|
|
|
|
if (mcr == 0)
|
|
|
|
continue;
|
|
|
|
int beat = ((mcr->rtick() * stretch.numerator()) / stretch.denominator()) / MScore::division;
|
|
|
|
if (beatSubdivision.contains(beat))
|
|
|
|
beatSubdivision[beat] = qMin(beatSubdivision[beat], mcr->durationType());
|
|
|
|
else
|
|
|
|
beatSubdivision[beat] = mcr->durationType();
|
|
|
|
}
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for (Segment* segment = measure->first(st); segment; segment = segment->next(st)) {
|
2016-02-06 11:41:16 +01:00
|
|
|
ChordRest* cr = segment->cr(track);
|
2016-01-04 14:48:58 +01:00
|
|
|
if (cr == 0)
|
|
|
|
continue;
|
2016-08-17 12:52:35 +02:00
|
|
|
for (Lyrics* l : cr->lyrics()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (l)
|
|
|
|
l->layout();
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// handle grace notes and cross-measure beaming
|
2016-02-06 11:41:16 +01:00
|
|
|
if (cr->isChord()) {
|
2016-02-17 14:54:23 +01:00
|
|
|
Chord* chord = toChord(cr);
|
2016-01-04 14:48:58 +01:00
|
|
|
beamGraceNotes(chord, false); // grace before
|
|
|
|
beamGraceNotes(chord, true); // grace after
|
|
|
|
// set up for cross-measure values as soon as possible
|
|
|
|
// to have all computations (stems, hooks, ...) consistent with it
|
|
|
|
if (!chord->isGrace())
|
|
|
|
chord->crossMeasureSetup(crossMeasure);
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// get defaults from time signature properties
|
2016-02-11 18:20:16 +01:00
|
|
|
bm = Groups::endBeam(cr, prev);
|
|
|
|
|
|
|
|
// perform additional context-dependent checks
|
|
|
|
if (bm == Beam::Mode::AUTO) {
|
|
|
|
// check if we need to break beams according to minimum duration in current / previous beat
|
|
|
|
if (checkBeats && cr->rtick()) {
|
|
|
|
int tick = (cr->rtick() * stretch.numerator()) / stretch.denominator();
|
|
|
|
// check if on the beat
|
|
|
|
if (tick % MScore::division == 0) {
|
|
|
|
int beat = tick / MScore::division;
|
|
|
|
// get minimum duration for this & previous beat
|
|
|
|
TDuration minDuration = qMin(beatSubdivision[beat], beatSubdivision[beat - 1]);
|
|
|
|
// re-calculate beam as if this were the duration of current chordrest
|
|
|
|
TDuration saveDuration = cr->actualDurationType();
|
|
|
|
TDuration saveCMDuration = cr->crossMeasureDurationType();
|
|
|
|
CrossMeasure saveCrossMeasVal = cr->crossMeasure();
|
|
|
|
cr->setDurationType(minDuration);
|
|
|
|
bm = Groups::endBeam(cr, prev);
|
|
|
|
cr->setDurationType(saveDuration);
|
|
|
|
cr->setCrossMeasure(saveCrossMeasVal);
|
|
|
|
cr->setCrossMeasureDurationType(saveCMDuration);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
prev = cr;
|
|
|
|
|
|
|
|
// if chord has hooks and is 2nd element of a cross-measure value
|
|
|
|
// set beam mode to NONE (do not combine with following chord beam/hook, if any)
|
2016-02-11 18:20:16 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (cr->durationType().hooks() > 0 && cr->crossMeasure() == CrossMeasure::SECOND)
|
|
|
|
bm = Beam::Mode::NONE;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if ((cr->durationType().type() <= TDuration::DurationType::V_QUARTER) || (bm == Beam::Mode::NONE)) {
|
|
|
|
if (beam) {
|
|
|
|
beam->layout1();
|
|
|
|
beam = 0;
|
|
|
|
}
|
|
|
|
if (a1) {
|
|
|
|
a1->removeDeleteBeam(false);
|
|
|
|
a1 = 0;
|
|
|
|
}
|
|
|
|
cr->removeDeleteBeam(false);
|
|
|
|
continue;
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (beam) {
|
|
|
|
bool beamEnd = (bm == Beam::Mode::BEGIN);
|
|
|
|
if (!beamEnd) {
|
|
|
|
cr->removeDeleteBeam(true);
|
|
|
|
beam->add(cr);
|
|
|
|
cr = 0;
|
|
|
|
beamEnd = (bm == Beam::Mode::END);
|
|
|
|
}
|
|
|
|
if (beamEnd) {
|
|
|
|
beam->layout1();
|
|
|
|
beam = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!cr)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (a1 == 0)
|
|
|
|
a1 = cr;
|
|
|
|
else {
|
|
|
|
if (!beamModeMid(bm)
|
|
|
|
&&
|
|
|
|
(bm == Beam::Mode::BEGIN
|
|
|
|
|| (a1->segment()->segmentType() != cr->segment()->segmentType())
|
|
|
|
|| (a1->tick() + a1->actualTicks() < cr->tick())
|
|
|
|
)
|
|
|
|
)
|
|
|
|
{
|
|
|
|
a1->removeDeleteBeam(false);
|
|
|
|
a1 = cr;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
beam = a1->beam();
|
|
|
|
if (beam == 0 || beam->elements().front() != a1) {
|
|
|
|
beam = new Beam(this);
|
|
|
|
beam->setGenerated(true);
|
|
|
|
beam->setTrack(track);
|
|
|
|
a1->removeDeleteBeam(true);
|
|
|
|
beam->add(a1);
|
|
|
|
}
|
|
|
|
cr->removeDeleteBeam(true);
|
|
|
|
beam->add(cr);
|
|
|
|
a1 = 0;
|
|
|
|
}
|
|
|
|
}
|
2015-03-10 23:22:00 +01:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
if (beam)
|
|
|
|
beam->layout1();
|
|
|
|
else if (a1)
|
|
|
|
a1->removeDeleteBeam(false);
|
2015-03-10 23:22:00 +01:00
|
|
|
}
|
2016-05-19 13:15:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
|
|
|
// getNextMeasure
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
void Score::getNextMeasure(LayoutContext& lc)
|
|
|
|
{
|
|
|
|
lc.prevMeasure = lc.curMeasure;
|
|
|
|
lc.curMeasure = lc.nextMeasure;
|
|
|
|
if (!lc.curMeasure)
|
|
|
|
lc.nextMeasure = _showVBox ? first() : firstMeasure();
|
|
|
|
else
|
|
|
|
lc.nextMeasure = _showVBox ? lc.curMeasure->next() : lc.curMeasure->nextMeasure();
|
|
|
|
if (!lc.curMeasure)
|
|
|
|
return;
|
|
|
|
|
|
|
|
int mno = lc.adjustMeasureNo(lc.curMeasure);
|
|
|
|
bool lineMode = _layoutMode == LayoutMode::LINE;
|
|
|
|
|
|
|
|
if (lineMode) {
|
|
|
|
while (lc.curMeasure && lc.curMeasure->isVBox()) {
|
|
|
|
lc.curMeasure = lc.nextMeasure;
|
|
|
|
lc.nextMeasure = lc.curMeasure->next();
|
|
|
|
}
|
|
|
|
if (!lc.curMeasure)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (lc.curMeasure->isMeasure() && score()->styleB(StyleIdx::createMultiMeasureRests)) {
|
|
|
|
Measure* m = toMeasure(lc.curMeasure);
|
|
|
|
Measure* nm = m;
|
|
|
|
Measure* lm = nm;
|
|
|
|
int n = 0;
|
|
|
|
Fraction len;
|
|
|
|
|
|
|
|
lc.measureNo = m->no();
|
|
|
|
|
|
|
|
while (validMMRestMeasure(nm)) {
|
|
|
|
MeasureBase* mb = _showVBox ? nm->next() : nm->nextMeasure();
|
|
|
|
if (breakMultiMeasureRest(nm) && n)
|
|
|
|
break;
|
|
|
|
lc.adjustMeasureNo(nm);
|
|
|
|
++n;
|
|
|
|
len += nm->len();
|
|
|
|
lm = nm;
|
2016-05-25 11:03:15 +02:00
|
|
|
if (!(mb && mb->isMeasure()))
|
2016-05-19 13:15:34 +02:00
|
|
|
break;
|
2016-05-25 11:03:15 +02:00
|
|
|
nm = toMeasure(mb);
|
2016-05-19 13:15:34 +02:00
|
|
|
}
|
|
|
|
if (n >= styleI(StyleIdx::minEmptyMeasures)) {
|
|
|
|
createMMRest(m, lm, len);
|
|
|
|
lc.curMeasure = m->mmRest();
|
|
|
|
lc.nextMeasure = _showVBox ? lm->next() : lm->nextMeasure();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (m->mmRest())
|
|
|
|
undo(new ChangeMMRest(m, 0));
|
|
|
|
m->setMMRestCount(0);
|
|
|
|
lc.measureNo = mno;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (lc.curMeasure->isMeasure() && toMeasure(lc.curMeasure)->isMMRest()) {
|
|
|
|
qDebug("mmrest: no %d += %d", lc.measureNo, toMeasure(lc.curMeasure)->mmRestCount());
|
|
|
|
lc.measureNo += toMeasure(lc.curMeasure)->mmRestCount() - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!lc.curMeasure->isMeasure()) {
|
|
|
|
lc.curMeasure->setTick(lc.tick);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------
|
|
|
|
// process one measure
|
|
|
|
//-----------------------------------------
|
|
|
|
|
|
|
|
Measure* measure = toMeasure(lc.curMeasure);
|
|
|
|
measure->moveTicks(lc.tick - measure->tick());
|
|
|
|
if (isMaster() && !lc.prevMeasure) {
|
|
|
|
// this is the first measure of a score
|
|
|
|
lc.sig = measure->len();
|
|
|
|
tempomap()->clear();
|
2016-06-24 11:58:22 +02:00
|
|
|
tempomap()->setTempo(0, 2.0);
|
2016-05-19 13:15:34 +02:00
|
|
|
sigmap()->clear();
|
|
|
|
sigmap()->add(0, SigEvent(lc.sig, measure->timesig(), 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// implement section break rest
|
|
|
|
//
|
|
|
|
if (measure->sectionBreak() && measure->pause() != 0.0)
|
|
|
|
setPause(measure->tick() + measure->ticks(), measure->pause());
|
|
|
|
|
|
|
|
//
|
|
|
|
// calculate accidentals and note lines,
|
|
|
|
// create stem and set stem direction
|
|
|
|
//
|
|
|
|
for (int staffIdx = 0; staffIdx < score()->nstaves(); ++staffIdx) {
|
|
|
|
AccidentalState as; // list of already set accidentals for this measure
|
|
|
|
Staff* staff = Score::staff(staffIdx);
|
|
|
|
as.init(staff->key(measure->tick()));
|
|
|
|
|
|
|
|
for (Segment& segment : measure->segments()) {
|
|
|
|
if (segment.isKeySigType()) {
|
|
|
|
KeySig* ks = toKeySig(segment.element(staffIdx * VOICES));
|
|
|
|
if (!ks)
|
|
|
|
continue;
|
|
|
|
as.init(staff->key(segment.tick()));
|
|
|
|
ks->layout();
|
|
|
|
}
|
|
|
|
else if (segment.isChordRestType()) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
int endTrack = track + VOICES;
|
|
|
|
for (int t = track; t < endTrack; ++t) {
|
|
|
|
ChordRest* cr = segment.cr(t);
|
|
|
|
if (cr) {
|
|
|
|
cr->layout0(&as);
|
|
|
|
cr->layoutArticulations();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-05-25 12:10:52 +02:00
|
|
|
else if (segment.isType(Segment::Type::Clef | Segment::Type::TimeSig | Segment::Type::Ambitus)) {
|
2016-05-19 13:15:34 +02:00
|
|
|
Element* e = segment.element(staffIdx * VOICES);
|
|
|
|
if (e)
|
|
|
|
e->layout();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
createBeams(measure);
|
|
|
|
|
|
|
|
for (int staffIdx = 0; staffIdx < score()->nstaves(); ++staffIdx) {
|
|
|
|
for (Segment& segment : measure->segments()) {
|
|
|
|
if (segment.isChordRestType())
|
|
|
|
layoutChords1(&segment, staffIdx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (Segment& segment : measure->segments()) {
|
|
|
|
if (segment.isBreathType()) {
|
|
|
|
qreal length = 0.0;
|
|
|
|
int tick = segment.tick();
|
|
|
|
// find longest pause
|
|
|
|
for (int i = 0, n = ntracks(); i < n; ++i) {
|
2016-06-02 11:02:18 +02:00
|
|
|
Element* e = segment.element(i);
|
|
|
|
if (e && e->isBreath()) {
|
|
|
|
Breath* b = toBreath(e);
|
2016-06-01 19:12:27 +02:00
|
|
|
b->layout();
|
2016-05-19 13:15:34 +02:00
|
|
|
length = qMax(length, b->pause());
|
2016-06-01 19:12:27 +02:00
|
|
|
}
|
2016-05-19 13:15:34 +02:00
|
|
|
}
|
|
|
|
if (length != 0.0)
|
|
|
|
setPause(tick, length);
|
|
|
|
}
|
|
|
|
else if (segment.isTimeSigType()) {
|
|
|
|
for (int staffIdx = 0; staffIdx < _staves.size(); ++staffIdx) {
|
|
|
|
TimeSig* ts = toTimeSig(segment.element(staffIdx * VOICES));
|
|
|
|
if (ts)
|
|
|
|
staff(staffIdx)->addTimeSig(ts);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (isMaster() && segment.isChordRestType()) {
|
|
|
|
for (Element* e : segment.annotations()) {
|
2016-06-14 16:00:16 +02:00
|
|
|
if (!(e->isTempoText() || e->isDynamic() || e->isRehearsalMark() || e->isStaffText()))
|
2016-05-19 13:15:34 +02:00
|
|
|
e->layout();
|
|
|
|
}
|
2016-06-24 11:58:22 +02:00
|
|
|
// TODO, this is not going to work, we just cleaned the tempomap
|
|
|
|
// it breaks the test midi/testBaroqueOrnaments.mscx where first note has stretch 2
|
|
|
|
// Also see fixTicks
|
2016-05-19 13:15:34 +02:00
|
|
|
qreal stretch = 0.0;
|
|
|
|
for (Element* e : segment.elist()) {
|
2016-08-17 12:52:35 +02:00
|
|
|
if (!e)
|
2016-05-19 13:15:34 +02:00
|
|
|
continue;
|
|
|
|
ChordRest* cr = toChordRest(e);
|
|
|
|
for (Articulation* a : cr->articulations())
|
|
|
|
stretch = qMax(a->timeStretch(), stretch);
|
|
|
|
if (stretch != 0.0 && stretch != 1.0) {
|
|
|
|
qreal otempo = tempomap()->tempo(cr->tick());
|
|
|
|
qreal ntempo = otempo / stretch;
|
|
|
|
setTempo(cr->tick(), ntempo);
|
|
|
|
int etick = cr->tick() + cr->actualTicks() - 1;
|
|
|
|
auto e = tempomap()->find(etick);
|
|
|
|
if (e == tempomap()->end())
|
|
|
|
setTempo(etick, otempo);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// update time signature map
|
|
|
|
// create event if measure len and time signature are different
|
|
|
|
// even if they are equivalent 4/4 vs 2/2
|
2016-07-09 14:22:06 +02:00
|
|
|
// also check if nominal time signature has changed
|
2016-05-19 13:15:34 +02:00
|
|
|
|
2016-07-09 14:22:06 +02:00
|
|
|
if (isMaster() && (!measure->len().identical(lc.sig)
|
|
|
|
|| (lc.prevMeasure && lc.prevMeasure->isMeasure()
|
|
|
|
&& !measure->timesig().identical(toMeasure(lc.prevMeasure)->timesig())))) {
|
2016-05-19 13:15:34 +02:00
|
|
|
lc.sig = measure->len();
|
|
|
|
sigmap()->add(lc.tick, SigEvent(lc.sig, measure->timesig(), measure->no()));
|
|
|
|
}
|
2016-02-06 11:41:16 +01:00
|
|
|
|
2016-02-11 18:20:16 +01:00
|
|
|
for (Segment& s : measure->segments()) {
|
2016-02-15 12:23:28 +01:00
|
|
|
// DEBUG: relayout grace notes as beaming/flags may have changed
|
2016-03-02 13:20:19 +01:00
|
|
|
if (s.isChordRestType()) {
|
2016-02-15 12:23:28 +01:00
|
|
|
for (Element* e : s.elist()) {
|
|
|
|
if (e && e->isChord()) {
|
2016-05-19 13:15:34 +02:00
|
|
|
Chord* chord = toChord(e);
|
|
|
|
chord->layout();
|
|
|
|
if (chord->tremolo()) // debug
|
|
|
|
chord->tremolo()->layout();
|
2016-02-15 12:23:28 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-03-02 13:20:19 +01:00
|
|
|
else if (s.isEndBarLineType())
|
2016-01-04 14:48:58 +01:00
|
|
|
continue;
|
2016-08-17 16:40:01 +02:00
|
|
|
s.createShapes();
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-05-19 13:15:34 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
lc.tick += measure->ticks();
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-04-01 14:57:24 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
// isTopBeam
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
static bool isTopBeam(ChordRest* cr)
|
|
|
|
{
|
|
|
|
if (cr->beam() && cr->beam()->elements().front() == cr) {
|
|
|
|
Beam* b = cr->beam();
|
|
|
|
bool movedUp = true;
|
|
|
|
for (ChordRest* cr1 : b->elements()) {
|
|
|
|
if (cr1->staffMove() >= 0) {
|
|
|
|
movedUp = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!b->cross() && !movedUp)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool notTopBeam(ChordRest* cr)
|
|
|
|
{
|
|
|
|
if (cr->beam() && cr->beam()->elements().front() == cr) {
|
|
|
|
Beam* b = cr->beam();
|
|
|
|
if (b->cross())
|
|
|
|
return true;
|
|
|
|
bool movedUp = true;
|
|
|
|
for (ChordRest* cr1 : b->elements()) {
|
|
|
|
if (cr1->staffMove() >= 0) {
|
|
|
|
movedUp = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (movedUp)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-07-19 14:36:09 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// collectSystem
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
System* Score::collectSystem(LayoutContext& lc)
|
|
|
|
{
|
|
|
|
if (!lc.curMeasure) {
|
|
|
|
lc.curSystem = 0;
|
|
|
|
return 0;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-06-02 12:12:40 +02:00
|
|
|
bool raggedRight = MScore::noHorizontalStretch;
|
2016-08-17 17:27:09 +02:00
|
|
|
System* system = getNextSystem(lc);
|
2016-01-04 14:48:58 +01:00
|
|
|
system->setInstrumentNames(lc.startWithLongNames);
|
2014-12-30 15:14:05 +01:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal xo;
|
2016-02-06 11:41:16 +01:00
|
|
|
if (lc.curMeasure->isHBox())
|
2016-02-17 14:54:23 +01:00
|
|
|
xo = point(toHBox(lc.curMeasure)->boxWidth());
|
2016-01-04 14:48:58 +01:00
|
|
|
else
|
|
|
|
xo = 0;
|
|
|
|
system->layoutSystem(xo);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
qreal minMeasureWidth = styleP(StyleIdx::minMeasureWidth);
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal minWidth = system->leftMargin();
|
2016-05-18 15:43:47 +02:00
|
|
|
bool firstMeasure = true;
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal measureSpacing = styleD(StyleIdx::measureSpacing);
|
|
|
|
qreal systemWidth = pageFormat()->printableWidth() * DPI;
|
2016-05-18 15:43:47 +02:00
|
|
|
bool lineMode = _layoutMode == LayoutMode::LINE;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
while (lc.curMeasure) { // collect measure for system
|
|
|
|
System* oldSystem = lc.curMeasure->system();
|
|
|
|
lc.curMeasure->setSystem(system);
|
|
|
|
system->measures().push_back(lc.curMeasure);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
qreal cautionaryW = 0.0;
|
|
|
|
qreal ww = 0.0;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-02-06 11:41:16 +01:00
|
|
|
if (lc.curMeasure->isHBox())
|
2016-02-17 14:54:23 +01:00
|
|
|
ww = point(toHBox(lc.curMeasure)->boxWidth());
|
2016-02-06 11:41:16 +01:00
|
|
|
else if (lc.curMeasure->isMeasure()) {
|
2016-02-17 14:54:23 +01:00
|
|
|
Measure* m = toMeasure(lc.curMeasure);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
if (firstMeasure) {
|
|
|
|
firstMeasure = false;
|
2016-01-04 14:48:58 +01:00
|
|
|
addSystemHeader(m, lc.firstSystem);
|
2016-02-12 14:42:06 +01:00
|
|
|
ww = computeMinWidth(m->first(), true);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-04-01 14:57:24 +02:00
|
|
|
else if (m->hasSystemHeader())
|
2016-01-04 14:48:58 +01:00
|
|
|
ww = m->minWidth1(); // without system header
|
2016-04-01 14:57:24 +02:00
|
|
|
else
|
|
|
|
ww = computeMinWidth(m->first(), false);
|
2016-04-01 18:32:10 +02:00
|
|
|
ww += m->createEndBarLines(true);
|
2016-01-04 14:48:58 +01:00
|
|
|
|
|
|
|
qreal stretch = m->userStretch() * measureSpacing;
|
|
|
|
if (stretch < 1.0)
|
|
|
|
stretch = 1.0;
|
|
|
|
ww *= stretch;
|
2016-04-06 15:28:10 +02:00
|
|
|
if (ww < minMeasureWidth)
|
|
|
|
ww = minMeasureWidth;
|
2016-04-15 17:51:51 +02:00
|
|
|
m->setWidth(ww);
|
2016-01-04 14:48:58 +01:00
|
|
|
|
|
|
|
bool hasCourtesy;
|
|
|
|
cautionaryW = cautionaryWidth(m, hasCourtesy) * stretch;
|
|
|
|
|
|
|
|
// if measure does not already have courtesy elements,
|
|
|
|
// add in the amount of space that courtesy elements would take if needed
|
|
|
|
// (if measure *does* already have courtesy elements, these are included in width already)
|
|
|
|
|
|
|
|
if (!hasCourtesy)
|
|
|
|
ww += cautionaryW;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// check if lc.curMeasure fits, remove if not
|
|
|
|
// collect at least one measure
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
if (!lineMode && (system->measures().size() > 1) && (minWidth + ww > systemWidth)) {
|
2016-01-04 14:48:58 +01:00
|
|
|
system->measures().pop_back();
|
|
|
|
lc.curMeasure->setSystem(oldSystem);
|
|
|
|
break;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
if (lc.prevMeasure && lc.prevMeasure->isMeasure() && lc.prevMeasure->system() == system) {
|
2016-02-17 14:54:23 +01:00
|
|
|
Measure* m = toMeasure(lc.prevMeasure);
|
|
|
|
qreal v = m->createEndBarLines(false);
|
2016-02-12 19:14:24 +01:00
|
|
|
qreal stretch = m->userStretch() * measureSpacing;
|
2016-01-04 14:48:58 +01:00
|
|
|
if (stretch < 1.0)
|
|
|
|
stretch = 1.0;
|
|
|
|
ww += v * stretch;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
bool pbreak;
|
|
|
|
switch (_layoutMode) {
|
|
|
|
case LayoutMode::PAGE:
|
|
|
|
case LayoutMode::SYSTEM:
|
2016-04-15 17:51:51 +02:00
|
|
|
pbreak = lc.curMeasure->pageBreak()
|
2016-01-04 14:48:58 +01:00
|
|
|
|| lc.curMeasure->lineBreak()
|
|
|
|
|| lc.curMeasure->sectionBreak()
|
2016-03-02 13:20:19 +01:00
|
|
|
|| lc.curMeasure->isVBox()
|
|
|
|
|| lc.curMeasure->isTBox();
|
2016-01-04 14:48:58 +01:00
|
|
|
break;
|
|
|
|
case LayoutMode::FLOAT:
|
|
|
|
case LayoutMode::LINE:
|
2016-05-31 20:39:17 +02:00
|
|
|
default:
|
2016-01-04 14:48:58 +01:00
|
|
|
pbreak = false;
|
2012-05-26 14:26:10 +02:00
|
|
|
break;
|
|
|
|
}
|
2016-04-18 18:11:51 +02:00
|
|
|
if (lc.rangeLayout && lc.endTick < lc.curMeasure->tick()) {
|
2016-04-15 16:44:48 +02:00
|
|
|
// TODO: we may check if another measure fits in this system
|
|
|
|
if (lc.curMeasure == lc.systemOldMeasure) {
|
|
|
|
lc.rangeDone = true;
|
|
|
|
break;
|
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-04-15 16:44:48 +02:00
|
|
|
getNextMeasure(lc);
|
2016-01-04 14:48:58 +01:00
|
|
|
minWidth += ww;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-04-15 17:51:51 +02:00
|
|
|
Element::Type nt = lc.curMeasure ? lc.curMeasure->type() : Element::Type::INVALID;
|
2016-05-18 15:43:47 +02:00
|
|
|
if (!lineMode
|
|
|
|
&& (pbreak || nt == Element::Type::VBOX || nt == Element::Type::TBOX || nt == Element::Type::FBOX
|
|
|
|
|| (minWidth + minMeasureWidth > systemWidth))) {
|
2016-04-15 16:44:48 +02:00
|
|
|
break; // break system
|
2016-04-15 17:51:51 +02:00
|
|
|
}
|
2016-04-15 16:44:48 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// whether the measure actually has courtesy elements or whether we added space for hypothetical ones,
|
|
|
|
// we should remove the width of courtesy elements for this measure from the accumulated total
|
|
|
|
// since at this point we are assuming we may be able to fit another measure
|
|
|
|
minWidth -= cautionaryW;
|
|
|
|
} // end collect measures for system
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
if (!system->vbox()) {
|
2016-02-12 19:14:24 +01:00
|
|
|
if (lc.prevMeasure && lc.prevMeasure->isMeasure())
|
2016-02-17 14:54:23 +01:00
|
|
|
toMeasure(lc.prevMeasure)->createEndBarLines(true);
|
2016-01-04 14:48:58 +01:00
|
|
|
system->removeGeneratedElements();
|
|
|
|
hideEmptyStaves(system, lc.firstSystem);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
//
|
|
|
|
// dont stretch last system row, if accumulated minWidth is <= lastSystemFillLimit
|
|
|
|
//
|
|
|
|
if (lc.curMeasure == 0 && ((minWidth / systemWidth) <= styleD(StyleIdx::lastSystemFillLimit)))
|
|
|
|
raggedRight = true;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
if (!lineMode) {
|
|
|
|
//-------------------------------------------------------
|
|
|
|
// add cautionary time/key signatures if needed
|
|
|
|
//-------------------------------------------------------
|
2015-03-09 22:07:13 +01:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
Measure* m = system->lastMeasure();
|
|
|
|
Measure* nm = m ? m->nextMeasure() : 0;
|
2016-04-20 18:56:08 +02:00
|
|
|
Segment* s;
|
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
if (m && nm) {
|
|
|
|
m->setHasSystemTrailer(false);
|
|
|
|
int tick = m->endTick();
|
|
|
|
bool isFinalMeasureOfSection = m->isFinalMeasureOfSection();
|
2016-04-21 12:20:29 +02:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
// locate a time sig. in the next measure and, if found,
|
|
|
|
// check if it has court. sig. turned off
|
|
|
|
TimeSig* ts;
|
|
|
|
Segment* tss = nm->findSegment(Segment::Type::TimeSig, tick);
|
|
|
|
bool showCourtesySig = tss && styleB(StyleIdx::genCourtesyTimesig) && !(isFinalMeasureOfSection && _layoutMode != LayoutMode::FLOAT);
|
2016-01-04 14:48:58 +01:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
if (showCourtesySig) {
|
|
|
|
ts = toTimeSig(tss->element(0));
|
|
|
|
if (ts && !ts->showCourtesySig())
|
|
|
|
showCourtesySig = false; // this key change has court. sig turned off
|
|
|
|
}
|
|
|
|
if (showCourtesySig) {
|
|
|
|
// if due, create a new courtesy time signature for each staff
|
2016-04-20 18:56:08 +02:00
|
|
|
m->setHasSystemTrailer(true);
|
2016-05-18 15:43:47 +02:00
|
|
|
s = m->undoGetSegment(Segment::Type::TimeSigAnnounce, tick);
|
|
|
|
int nstaves = Score::nstaves();
|
|
|
|
for (int track = 0; track < nstaves * VOICES; track += VOICES) {
|
|
|
|
TimeSig* nts = toTimeSig(tss->element(track));
|
|
|
|
if (!nts)
|
|
|
|
continue;
|
|
|
|
ts = toTimeSig(s->element(track));
|
|
|
|
if (!ts) {
|
|
|
|
ts = new TimeSig(this);
|
|
|
|
ts->setTrack(track);
|
|
|
|
ts->setGenerated(true);
|
|
|
|
ts->setParent(s);
|
|
|
|
undoAddElement(ts);
|
|
|
|
}
|
|
|
|
ts->setFrom(nts);
|
2016-07-18 12:34:27 +02:00
|
|
|
ts->layout();
|
|
|
|
s->createShape(track / VOICES);
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-04-20 18:56:08 +02:00
|
|
|
else {
|
2016-05-18 15:43:47 +02:00
|
|
|
// remove any existing time signatures
|
|
|
|
Segment* tss = m->findSegment(Segment::Type::TimeSigAnnounce, tick);
|
|
|
|
if (tss)
|
|
|
|
undoRemoveElement(tss);
|
|
|
|
}
|
|
|
|
|
|
|
|
// courtesy key signatures
|
|
|
|
int n = _staves.size();
|
|
|
|
bool show = m->hasCourtesyKeySig();
|
|
|
|
Segment* s;
|
|
|
|
if (show)
|
|
|
|
s = m->undoGetSegment(Segment::Type::KeySigAnnounce, tick);
|
|
|
|
else
|
|
|
|
s = m->findSegment(Segment::Type::KeySigAnnounce, tick);
|
|
|
|
|
|
|
|
Segment* clefSegment = m->findSegment(Segment::Type::Clef, tick);
|
|
|
|
|
|
|
|
for (int staffIdx = 0; staffIdx < n; ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
Staff* staff = _staves[staffIdx];
|
|
|
|
|
|
|
|
if (show) {
|
|
|
|
m->setHasSystemTrailer(true);
|
|
|
|
KeySig* ks = toKeySig(s->element(track));
|
|
|
|
KeySigEvent key2 = staff->keySigEvent(tick);
|
|
|
|
|
|
|
|
if (!ks) {
|
|
|
|
ks = new KeySig(this);
|
|
|
|
ks->setKeySigEvent(key2);
|
|
|
|
ks->setTrack(track);
|
|
|
|
ks->setGenerated(true);
|
|
|
|
ks->setParent(s);
|
|
|
|
undoAddElement(ks);
|
|
|
|
}
|
|
|
|
else if (!(ks->keySigEvent() == key2)) {
|
|
|
|
undo(new ChangeKeySig(ks, key2, ks->showCourtesy()));
|
|
|
|
}
|
|
|
|
ks->layout();
|
|
|
|
s->createShape(track / VOICES);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// remove any existent courtesy key signature
|
|
|
|
if (s && s->element(track))
|
|
|
|
undoRemoveElement(s->element(track));
|
|
|
|
}
|
|
|
|
if (clefSegment) {
|
|
|
|
Clef* clef = toClef(clefSegment->element(track));
|
|
|
|
if (clef && (!score()->styleB(StyleIdx::genCourtesyClef)
|
|
|
|
|| m->repeatEnd() || m->isFinalMeasureOfSection()
|
|
|
|
|| !clef->showCourtesy())) {
|
|
|
|
clef->clear(); // make invisible
|
|
|
|
}
|
2016-04-21 12:20:29 +02:00
|
|
|
}
|
|
|
|
}
|
2016-05-18 15:43:47 +02:00
|
|
|
//HACK to layout cautionary elements:
|
|
|
|
if (m->hasSystemTrailer())
|
|
|
|
computeMinWidth(m->first(), false);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-05-18 15:43:47 +02:00
|
|
|
system->setWidth(systemWidth);
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
minWidth = system->leftMargin();
|
|
|
|
qreal totalWeight = 0.0;
|
|
|
|
for (MeasureBase* mb : system->measures()) {
|
2016-02-06 11:41:16 +01:00
|
|
|
if (mb->isHBox())
|
2016-02-11 12:16:32 +01:00
|
|
|
minWidth += point(static_cast<Box*>(mb)->boxWidth());
|
2016-02-06 11:41:16 +01:00
|
|
|
else if (mb->isMeasure()) {
|
2016-02-17 14:54:23 +01:00
|
|
|
Measure* m = toMeasure(mb);
|
2016-02-16 21:21:28 +01:00
|
|
|
minWidth += m->width();
|
|
|
|
qreal stretch = m->userStretch();
|
|
|
|
if (stretch < 1.0)
|
|
|
|
stretch = 1.0;
|
|
|
|
totalWeight += m->ticks() * stretch;
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
}
|
2015-07-25 08:43:02 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
// stretch incomplete row
|
|
|
|
qreal rest;
|
2016-06-02 12:12:40 +02:00
|
|
|
if (lineMode || MScore::noHorizontalStretch)
|
2016-01-04 14:48:58 +01:00
|
|
|
rest = 0;
|
|
|
|
else {
|
|
|
|
rest = systemWidth - minWidth;
|
|
|
|
if (raggedRight) {
|
|
|
|
if (minWidth > rest)
|
|
|
|
rest = rest * .5;
|
|
|
|
else
|
|
|
|
rest = minWidth;
|
2015-07-25 08:43:02 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
rest /= totalWeight;
|
|
|
|
}
|
|
|
|
|
2016-02-16 21:21:28 +01:00
|
|
|
QPointF pos(system->leftMargin(), 0.0);
|
2016-01-04 14:48:58 +01:00
|
|
|
for (MeasureBase* mb : system->measures()) {
|
|
|
|
qreal ww = 0.0;
|
2016-02-06 11:41:16 +01:00
|
|
|
if (mb->isMeasure()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
mb->setPos(pos);
|
2016-02-17 14:54:23 +01:00
|
|
|
Measure* m = toMeasure(mb);
|
2016-02-16 21:21:28 +01:00
|
|
|
qreal stretch = m->userStretch();
|
2016-01-04 14:48:58 +01:00
|
|
|
if (stretch < 1.0)
|
|
|
|
stretch = 1.0;
|
2016-05-18 15:43:47 +02:00
|
|
|
if (!lineMode) {
|
|
|
|
ww = m->width() + rest * m->ticks() * stretch;
|
|
|
|
m->stretchMeasure(ww);
|
|
|
|
}
|
2016-05-24 09:18:48 +02:00
|
|
|
else {
|
|
|
|
m->stretchMeasure(m->width());
|
2016-05-18 15:43:47 +02:00
|
|
|
ww = m->width();
|
2016-05-24 09:18:48 +02:00
|
|
|
}
|
2016-06-02 10:38:36 +02:00
|
|
|
for (MStaff* ms : m->mstaves())
|
|
|
|
ms->lines->layout();
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-02-06 11:41:16 +01:00
|
|
|
else if (mb->isHBox()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
mb->setPos(pos);
|
2016-02-17 14:54:23 +01:00
|
|
|
ww = point(toHBox(mb)->boxWidth());
|
2016-01-04 14:48:58 +01:00
|
|
|
mb->layout();
|
|
|
|
}
|
2016-02-06 11:41:16 +01:00
|
|
|
else if (mb->isVBox()) {
|
2016-01-04 14:48:58 +01:00
|
|
|
mb->setPos(pos);
|
2015-07-25 08:43:02 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
pos.rx() += ww;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-05-18 15:43:47 +02:00
|
|
|
if (lineMode)
|
|
|
|
system->setWidth(pos.x());
|
2016-01-04 14:48:58 +01:00
|
|
|
|
2016-08-02 17:00:49 +02:00
|
|
|
//
|
|
|
|
// layout
|
|
|
|
// - beams
|
|
|
|
// - TempoText
|
|
|
|
// - RehearsalMark, StaffText
|
|
|
|
// - Dynamic
|
|
|
|
// - update the segment shape
|
|
|
|
//
|
|
|
|
//
|
2016-06-16 11:20:22 +02:00
|
|
|
int stick = -1;
|
|
|
|
int etick = -1;
|
2016-03-18 14:35:15 +01:00
|
|
|
for (MeasureBase* mb : system->measures()) {
|
|
|
|
if (!mb->isMeasure())
|
|
|
|
continue;
|
2016-06-16 11:20:22 +02:00
|
|
|
if (stick == -1)
|
|
|
|
stick = mb->tick();
|
|
|
|
etick = mb->endTick();
|
2016-03-18 14:35:15 +01:00
|
|
|
for (Segment* s = toMeasure(mb)->first(Segment::Type::ChordRest); s; s = s->next(Segment::Type::ChordRest)) {
|
|
|
|
for (Element* e : s->elist()) {
|
|
|
|
if (e && e->isChordRest()) {
|
|
|
|
ChordRest* cr = toChordRest(e);
|
2016-06-01 13:24:32 +02:00
|
|
|
if (isTopBeam(cr)) {
|
2016-03-18 14:35:15 +01:00
|
|
|
cr->beam()->layout();
|
2016-06-02 10:38:36 +02:00
|
|
|
s->staffShape(cr->staffIdx()).add(cr->beam()->shape().translated(-(cr->segment()->pos()+mb->pos())));
|
2016-06-01 13:24:32 +02:00
|
|
|
}
|
2016-03-18 14:35:15 +01:00
|
|
|
}
|
|
|
|
}
|
2016-05-02 13:41:41 +02:00
|
|
|
for (Element* e : s->annotations()) {
|
|
|
|
if (e->isTempoText()) {
|
|
|
|
TempoText* tt = toTempoText(e);
|
|
|
|
setTempo(tt->segment(), tt->tempo());
|
|
|
|
tt->layout();
|
2016-06-02 10:38:36 +02:00
|
|
|
if (e->visible())
|
|
|
|
s->staffShape(tt->staffIdx()).add(tt->shape());
|
2016-05-02 13:41:41 +02:00
|
|
|
}
|
2016-07-19 14:36:09 +02:00
|
|
|
else if (e->visible() && (e->isRehearsalMark() || e->isStaffText())) {
|
2016-06-03 16:51:17 +02:00
|
|
|
e->layout();
|
2016-06-03 17:54:21 +02:00
|
|
|
s->staffShape(e->staffIdx()).add(e->shape());
|
2016-06-03 16:51:17 +02:00
|
|
|
}
|
2016-07-19 14:36:09 +02:00
|
|
|
else if (e->visible() && e->isDynamic()) {
|
|
|
|
Dynamic* d = toDynamic(e);
|
|
|
|
d->layout();
|
|
|
|
|
2016-07-19 20:19:23 +02:00
|
|
|
if (d->autoplace()) {
|
|
|
|
// If dynamic is at start or end of a hairpin
|
|
|
|
// don't autoplace. This is done later on layout of hairpin
|
|
|
|
// and allows horizontal alignment of dynamic and hairpin.
|
|
|
|
|
|
|
|
int tick = d->tick();
|
|
|
|
auto si = score()->spannerMap().findOverlapping(tick, tick);
|
|
|
|
bool doAutoplace = true;
|
|
|
|
for (auto is : si) {
|
|
|
|
Spanner* sp = is.value;
|
|
|
|
sp->computeStartElement();
|
|
|
|
sp->computeEndElement();
|
|
|
|
|
|
|
|
if (sp->isHairpin()
|
|
|
|
&& (lookupDynamic(sp->startElement()) == d
|
|
|
|
|| lookupDynamic(sp->endElement()) == d))
|
|
|
|
doAutoplace = false;
|
|
|
|
}
|
|
|
|
if (doAutoplace) {
|
2016-07-19 14:36:09 +02:00
|
|
|
d->doAutoplace();
|
|
|
|
d->segment()->staffShape(d->staffIdx()).add(d->shape());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-05-02 13:41:41 +02:00
|
|
|
}
|
2016-03-18 14:35:15 +01:00
|
|
|
}
|
|
|
|
}
|
2016-06-16 11:20:22 +02:00
|
|
|
//
|
2016-08-17 12:52:35 +02:00
|
|
|
// vertical align lyrics
|
|
|
|
//
|
|
|
|
|
2016-08-18 10:22:07 +02:00
|
|
|
qreal lyricsMinTopDistance = styleP(StyleIdx::lyricsMinTopDistance);
|
|
|
|
qreal lyricsMinBottomDistance = styleP(StyleIdx::lyricsMinBottomDistance);
|
|
|
|
|
2016-08-17 12:52:35 +02:00
|
|
|
for (MeasureBase* mb : system->measures()) {
|
|
|
|
if (!mb->isMeasure())
|
|
|
|
continue;
|
|
|
|
Measure* m = toMeasure(mb);
|
|
|
|
|
|
|
|
for (int staffIdx = 0; staffIdx < nstaves(); ++staffIdx) {
|
|
|
|
int track = staffIdx * VOICES;
|
|
|
|
qreal yMax = 0.0;
|
|
|
|
|
|
|
|
// pass I : compute yMax
|
|
|
|
|
|
|
|
for (Segment& s : m->segments()) {
|
|
|
|
if (!s.isChordRestType())
|
|
|
|
continue;
|
|
|
|
ChordRest* cr = s.cr(track);
|
|
|
|
if (cr) {
|
|
|
|
Shape sh;
|
|
|
|
for (Lyrics* l : cr->lyrics()) {
|
|
|
|
if (l) {
|
|
|
|
l->rUserYoffset() = 0.0;
|
2016-08-18 10:22:07 +02:00
|
|
|
sh.add(l->bbox().translated(l->pos()));
|
2016-08-17 12:52:35 +02:00
|
|
|
}
|
|
|
|
}
|
2016-08-17 16:40:01 +02:00
|
|
|
// lyrics shapes must be moved, so first remove them from segment
|
2016-08-17 12:52:35 +02:00
|
|
|
s.staffShape(staffIdx).remove(sh);
|
2016-08-18 09:15:08 +02:00
|
|
|
|
2016-08-17 12:52:35 +02:00
|
|
|
for (Lyrics* l : cr->lyrics()) {
|
2016-08-17 16:40:01 +02:00
|
|
|
if (l && l->autoplace()) {
|
2016-08-17 12:52:35 +02:00
|
|
|
qreal y = s.staffShape(staffIdx).minVerticalDistance(sh);
|
2016-08-18 10:22:07 +02:00
|
|
|
if (y > -lyricsMinTopDistance)
|
|
|
|
yMax = qMax(yMax, y + lyricsMinTopDistance);
|
2016-08-17 12:52:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// pass II : apply yMax
|
|
|
|
|
|
|
|
for (Segment& s : m->segments()) {
|
|
|
|
if (!s.isChordRestType())
|
|
|
|
continue;
|
|
|
|
ChordRest* cr = s.cr(track);
|
|
|
|
if (cr) {
|
|
|
|
Shape sh;
|
|
|
|
for (Lyrics* l : cr->lyrics()) {
|
2016-08-17 16:40:01 +02:00
|
|
|
if (l && l->autoplace()) {
|
2016-08-17 12:52:35 +02:00
|
|
|
l->rUserYoffset() = yMax;
|
2016-08-18 10:22:07 +02:00
|
|
|
sh.add(l->bbox().translated(l->pos())
|
|
|
|
.adjusted(0.0, 0.0, 0.0, lyricsMinBottomDistance));
|
2016-08-17 12:52:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
s.staffShape(staffIdx).add(sh);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
2016-06-16 11:20:22 +02:00
|
|
|
// compute shape of measures
|
|
|
|
//
|
2016-08-02 17:00:49 +02:00
|
|
|
|
2016-06-16 11:20:22 +02:00
|
|
|
for (int si = 0; si < score()->nstaves(); ++si) {
|
|
|
|
for (MeasureBase* mb : system->measures()) {
|
|
|
|
if (!mb->isMeasure())
|
|
|
|
continue;
|
|
|
|
Measure* m = toMeasure(mb);
|
2016-06-21 18:56:15 +02:00
|
|
|
m->staffShape(si).clear();
|
2016-06-16 11:20:22 +02:00
|
|
|
for (Segment& s : m->segments())
|
2016-06-21 18:56:15 +02:00
|
|
|
m->staffShape(si).add(s.staffShape(si).translated(s.pos()));
|
|
|
|
m->staffShape(si).add(m->mstaff(si)->lines->bbox());
|
2016-06-16 11:20:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// layout SpannerSegments for current system
|
|
|
|
//
|
|
|
|
|
2016-07-01 12:42:15 +02:00
|
|
|
if (etick > stick) { // ignore vbox
|
2016-06-16 11:20:22 +02:00
|
|
|
auto spanners = score()->spannerMap().findOverlapping(stick, etick);
|
2016-07-10 12:00:57 +02:00
|
|
|
std::vector<SpannerSegment*> voltaSegments;
|
2016-06-16 11:20:22 +02:00
|
|
|
for (auto interval : spanners) {
|
|
|
|
Spanner* sp = interval.value;
|
2016-07-10 12:00:57 +02:00
|
|
|
if (sp->tick() < etick && sp->tick2() > stick) {
|
|
|
|
if (sp->isOttava() && sp->ticks() == 0) { // sanity check?
|
|
|
|
sp->setTick2(lastMeasure()->endTick());
|
|
|
|
sp->staff()->updateOttava();
|
|
|
|
}
|
|
|
|
SpannerSegment* ss = sp->layoutSystem(system); // create/layout spanner segment for this system
|
2016-07-15 14:05:51 +02:00
|
|
|
if (ss->isVoltaSegment() && ss->autoplace())
|
2016-07-10 12:00:57 +02:00
|
|
|
voltaSegments.push_back(ss);
|
2016-06-16 11:20:22 +02:00
|
|
|
}
|
2016-07-10 12:00:57 +02:00
|
|
|
}
|
|
|
|
//
|
|
|
|
// vertical align volta segments
|
|
|
|
//
|
|
|
|
if (voltaSegments.size() > 1) {
|
|
|
|
qreal y = 0;
|
|
|
|
for (SpannerSegment* ss : voltaSegments)
|
|
|
|
y = qMin(y, ss->userOff().y());
|
|
|
|
for (SpannerSegment* ss : voltaSegments)
|
|
|
|
ss->setUserYoffset(y);
|
2016-06-16 11:20:22 +02:00
|
|
|
}
|
|
|
|
for (Spanner* sp : _unmanagedSpanner) {
|
|
|
|
if (sp->tick() >= etick || sp->tick2() < stick)
|
|
|
|
continue;
|
|
|
|
sp->layout();
|
|
|
|
}
|
|
|
|
|
2016-08-02 17:00:49 +02:00
|
|
|
//
|
|
|
|
// add SpannerSegment shapes to staff shapes
|
|
|
|
//
|
2016-06-16 11:20:22 +02:00
|
|
|
|
2016-08-02 17:00:49 +02:00
|
|
|
for (MeasureBase* mb : system->measures()) {
|
|
|
|
if (!mb->isMeasure())
|
|
|
|
continue;
|
|
|
|
Measure* m = toMeasure(mb);
|
|
|
|
for (SpannerSegment* ss : system->spannerSegments()) {
|
|
|
|
Spanner* sp = ss->spanner();
|
|
|
|
if (sp->tick() < m->endTick() && sp->tick2() > m->tick()) {
|
|
|
|
// spanner shape must be translated from system coordinate space to measure coordinate space
|
|
|
|
m->staffShape(sp->staffIdx()).add(ss->shape().translated(ss->pos() - m->pos()));
|
|
|
|
}
|
2016-06-16 11:20:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
system->layout2(); // compute staff distances
|
2016-03-18 14:35:15 +01:00
|
|
|
|
2016-08-17 17:27:09 +02:00
|
|
|
Measure* lm = system->lastMeasure();
|
|
|
|
if (lm) {
|
|
|
|
lc.firstSystem = lm->sectionBreak() && _layoutMode != LayoutMode::FLOAT;
|
|
|
|
lc.startWithLongNames = lc.firstSystem && lm->sectionBreak()->startWithLongNames();
|
|
|
|
}
|
2016-03-02 13:20:19 +01:00
|
|
|
lc.systemChanged = lc.systemOldMeasure != (system->measures().empty() ? 0 : system->measures().back());
|
2016-01-04 14:48:58 +01:00
|
|
|
return system;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-03-29 16:01:44 +02:00
|
|
|
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// collectPage
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
bool Score::collectPage(LayoutContext& lc)
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-01-04 14:48:58 +01:00
|
|
|
if (!lc.curSystem)
|
|
|
|
return false;
|
2013-06-05 15:47:34 +02:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
const qreal slb = styleP(StyleIdx::staffLowerBorder);
|
|
|
|
const qreal sub = styleP(StyleIdx::staffUpperBorder);
|
2016-01-04 14:48:58 +01:00
|
|
|
bool breakPages = layoutMode() != LayoutMode::SYSTEM;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
Page* page = getEmptyPage(lc);
|
|
|
|
qreal y = page->tm();
|
|
|
|
qreal ey = page->height() - page->bm();
|
2016-04-25 10:02:21 +02:00
|
|
|
System* s1 = 0; // previous system
|
2016-01-04 14:48:58 +01:00
|
|
|
System* s2 = lc.curSystem;
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for (;;) {
|
|
|
|
//
|
|
|
|
// calculate distance to previous system
|
|
|
|
//
|
|
|
|
qreal distance;
|
2016-06-16 11:20:22 +02:00
|
|
|
if (s1) {
|
2016-01-04 14:48:58 +01:00
|
|
|
distance = s1->minDistance(s2);
|
2016-06-16 11:20:22 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
else {
|
|
|
|
// this is the first system on page
|
2016-03-02 13:20:19 +01:00
|
|
|
VBox* vbox = s2->vbox();
|
|
|
|
distance = vbox ? vbox->topGap() : sub;
|
2016-01-04 14:48:58 +01:00
|
|
|
distance = qMax(distance, -s2->minTop());
|
|
|
|
}
|
|
|
|
y += distance;
|
|
|
|
s2->setPos(page->lm(), y);
|
|
|
|
page->appendSystem(s2);
|
|
|
|
y += s2->height();
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//
|
|
|
|
// check for page break or if next system will fit on page
|
|
|
|
//
|
2016-04-15 16:44:48 +02:00
|
|
|
if (lc.rangeDone) {
|
2016-03-24 12:39:18 +01:00
|
|
|
// take next system unchanged
|
|
|
|
System* s = lc.systemList.empty() ? 0 : lc.systemList.takeFirst();
|
|
|
|
lc.curSystem = s;
|
2016-04-15 16:44:48 +02:00
|
|
|
if (s)
|
2016-03-24 12:39:18 +01:00
|
|
|
_systems.append(lc.curSystem);
|
|
|
|
}
|
2016-05-25 10:51:59 +02:00
|
|
|
else {
|
2016-03-24 12:39:18 +01:00
|
|
|
collectSystem(lc);
|
2016-05-25 10:51:59 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
System* s3 = lc.curSystem;
|
|
|
|
bool breakPage = !s3 || (breakPages && s2->pageBreak());
|
|
|
|
|
|
|
|
if (!breakPage) {
|
|
|
|
qreal dist = s2->minDistance(s3) + s3->height();
|
2016-03-02 13:20:19 +01:00
|
|
|
VBox* vbox = s3->vbox();
|
|
|
|
if (vbox)
|
|
|
|
dist += vbox->bottomGap();
|
2016-01-04 14:48:58 +01:00
|
|
|
else
|
|
|
|
dist += qMax(s3->minBottom(), slb);
|
|
|
|
breakPage = (y + dist) >= ey;
|
|
|
|
}
|
|
|
|
if (breakPage) {
|
2016-03-24 12:39:18 +01:00
|
|
|
// dont use currentSystem
|
2016-03-02 13:20:19 +01:00
|
|
|
VBox* vbox = s2->vbox();
|
|
|
|
qreal dist = vbox ? vbox->bottomGap() : qMax(s2->minBottom(), slb);
|
2016-01-04 14:48:58 +01:00
|
|
|
layoutPage(page, ey - (y + dist));
|
2012-05-26 14:26:10 +02:00
|
|
|
break;
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
|
|
|
s1 = s2; // current system becomes previous
|
|
|
|
s2 = s3; // next system becomes current
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
2016-03-02 13:20:19 +01:00
|
|
|
|
|
|
|
int stick = -1;
|
|
|
|
int tracks = nstaves() * VOICES;
|
|
|
|
for (System* s : page->systems()) {
|
|
|
|
for (MeasureBase* mb : s->measures()) {
|
|
|
|
if (!mb->isMeasure())
|
|
|
|
continue;
|
|
|
|
Measure* m = toMeasure(mb);
|
|
|
|
if (stick == -1)
|
|
|
|
stick = m->tick();
|
|
|
|
|
|
|
|
for (int track = 0; track < tracks; ++track) {
|
|
|
|
for (Segment* segment = m->first(); segment; segment = segment->next()) {
|
|
|
|
Element* e = segment->element(track);
|
|
|
|
if (!e)
|
|
|
|
continue;
|
|
|
|
if (e->isChordRest()) {
|
|
|
|
if (!staff(track2staff(track))->show())
|
|
|
|
continue;
|
|
|
|
ChordRest* cr = toChordRest(e);
|
2016-04-01 14:57:24 +02:00
|
|
|
if (notTopBeam(cr)) // layout cross staff beams
|
2016-03-02 13:20:19 +01:00
|
|
|
cr->beam()->layout();
|
|
|
|
|
|
|
|
if (cr->isChord()) {
|
|
|
|
Chord* c = toChord(cr);
|
|
|
|
for (Chord* cc : c->graceNotes()) {
|
|
|
|
if (cc->beam() && cc->beam()->elements().front() == cc)
|
|
|
|
cc->beam()->layout();
|
|
|
|
for (Note* n : cc->notes()) {
|
|
|
|
Tie* tie = n->tieFor();
|
|
|
|
if (tie)
|
|
|
|
tie->layout();
|
|
|
|
for (Spanner* sp : n->spannerFor())
|
|
|
|
sp->layout();
|
|
|
|
}
|
|
|
|
for (Element* e : cc->el()) {
|
|
|
|
if (e->isSlur())
|
|
|
|
e->layout();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
c->layoutArpeggio2();
|
|
|
|
for (Note* n : c->notes()) {
|
|
|
|
Tie* tie = n->tieFor();
|
|
|
|
if (tie)
|
|
|
|
tie->layout();
|
|
|
|
for (Spanner* sp : n->spannerFor())
|
|
|
|
sp->layout();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (e->isBarLine())
|
|
|
|
e->layout();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
m->layout2();
|
2016-06-02 14:49:05 +02:00
|
|
|
}
|
2016-03-02 13:20:19 +01:00
|
|
|
}
|
|
|
|
page->rebuildBspTree();
|
|
|
|
lc.pageChanged = lc.systemChanged || (lc.pageOldSystem != (page->systems().empty() ? 0 : page->systems().back()));
|
2016-01-04 14:48:58 +01:00
|
|
|
return true;
|
2012-05-26 14:26:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
2016-01-04 14:48:58 +01:00
|
|
|
// doLayout
|
|
|
|
// input: list of measures
|
|
|
|
// output: list of systems
|
|
|
|
// list of pages
|
2012-05-26 14:26:10 +02:00
|
|
|
//---------------------------------------------------------
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
void Score::doLayout()
|
2012-05-26 14:26:10 +02:00
|
|
|
{
|
2016-08-02 17:00:49 +02:00
|
|
|
// qDebug();
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-02-06 22:03:43 +01:00
|
|
|
if (_staves.empty() || first() == 0) {
|
2016-01-04 14:48:58 +01:00
|
|
|
// score is empty
|
|
|
|
_pages.clear();
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
Page* page = addPage();
|
|
|
|
page->layout();
|
|
|
|
page->setNo(0);
|
|
|
|
page->setPos(0.0, 0.0);
|
|
|
|
page->rebuildBspTree();
|
|
|
|
qDebug("layout: empty score");
|
|
|
|
return;
|
|
|
|
}
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
_scoreFont = ScoreFont::fontFactory(_style.value(StyleIdx::MusicalSymbolFont).toString());
|
|
|
|
_noteHeadWidth = _scoreFont->width(SymId::noteheadBlack, spatium() / SPATIUM20);
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-03-18 09:29:16 +01:00
|
|
|
if (cmdState().layoutFlags & LayoutFlag::FIX_PITCH_VELO)
|
2016-01-04 14:48:58 +01:00
|
|
|
updateVelo();
|
2016-03-18 09:29:16 +01:00
|
|
|
if (cmdState().layoutFlags & LayoutFlag::PLAY_EVENTS)
|
2016-01-04 14:48:58 +01:00
|
|
|
createPlayEvents();
|
2012-05-26 14:26:10 +02:00
|
|
|
|
2016-03-29 16:01:44 +02:00
|
|
|
LayoutContext lc;
|
2016-04-15 16:44:48 +02:00
|
|
|
lc.rangeDone = false;
|
2016-01-04 14:48:58 +01:00
|
|
|
_systems.swap(lc.systemList);
|
|
|
|
getNextMeasure(lc);
|
|
|
|
getNextMeasure(lc);
|
2012-08-01 18:00:27 +02:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
collectSystem(lc);
|
|
|
|
while (collectPage(lc))
|
|
|
|
;
|
2016-03-29 16:01:44 +02:00
|
|
|
if (_layoutMode == LayoutMode::LINE) {
|
2016-05-18 15:43:47 +02:00
|
|
|
Page* page = _pages[0];
|
2016-05-24 09:18:48 +02:00
|
|
|
page->setWidth(page->system(0)->width());
|
2016-03-29 16:01:44 +02:00
|
|
|
}
|
2013-03-26 16:25:07 +01:00
|
|
|
|
2016-07-01 10:21:13 +02:00
|
|
|
// remove not needed systems
|
|
|
|
// TODO: make undoable
|
|
|
|
for (System* system : lc.systemList) {
|
|
|
|
qDebug("delete system");
|
|
|
|
for (SpannerSegment* ss : system->spannerSegments()) {
|
|
|
|
qDebug(" delete spanner segment\n");
|
|
|
|
Spanner* spanner = ss->spanner();
|
|
|
|
spanner->spannerSegments().removeOne(ss);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// remove not needed pages
|
|
|
|
// TODO: make undoable
|
|
|
|
while (_pages.size() > lc.curPage)
|
2016-01-04 14:48:58 +01:00
|
|
|
_pages.takeLast();
|
2012-08-01 18:00:27 +02:00
|
|
|
|
2016-03-24 12:39:18 +01:00
|
|
|
for (auto s : _spanner.map()) { // TODO: this invalidates the bsp tree
|
2016-03-02 13:20:19 +01:00
|
|
|
Spanner* sp = s.second;
|
|
|
|
if (sp->isSlur())
|
|
|
|
sp->layout();
|
|
|
|
}
|
|
|
|
|
|
|
|
for (MuseScoreView* v : viewer)
|
|
|
|
v->layoutChanged();
|
|
|
|
|
|
|
|
// _mscVersion is used during read and first layout
|
|
|
|
// but then it's used for drag and drop and should be set to new version
|
|
|
|
_mscVersion = MSCVERSION; // for later drag & drop usage
|
2016-06-03 18:26:51 +02:00
|
|
|
#ifndef NDEBUG
|
|
|
|
if (MScore::showCorruptedMeasures)
|
|
|
|
sanityCheck();
|
|
|
|
#endif
|
2016-03-02 13:20:19 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------
|
|
|
|
// doLayoutRange
|
|
|
|
//---------------------------------------------------------
|
|
|
|
|
|
|
|
void Score::doLayoutRange(int stick, int etick)
|
|
|
|
{
|
2016-08-02 17:00:49 +02:00
|
|
|
// qDebug("%d-%d", stick, etick);
|
2016-06-03 10:49:40 +02:00
|
|
|
if (stick == -1 || etick == -1) {
|
|
|
|
doLayout();
|
|
|
|
return;
|
|
|
|
}
|
2016-08-04 17:29:07 +02:00
|
|
|
if (stick < 0)
|
|
|
|
stick = 0;
|
2016-03-02 13:20:19 +01:00
|
|
|
LayoutContext lc;
|
2016-03-29 16:01:44 +02:00
|
|
|
|
2016-05-18 15:43:47 +02:00
|
|
|
#if 0
|
2016-03-29 16:01:44 +02:00
|
|
|
if (_layoutMode == LayoutMode::LINE) {
|
|
|
|
_systems.swap(lc.systemList);
|
|
|
|
getNextMeasure(lc);
|
|
|
|
getNextMeasure(lc);
|
|
|
|
layoutLinear(lc);
|
|
|
|
return;
|
|
|
|
}
|
2016-05-18 15:43:47 +02:00
|
|
|
#endif
|
2016-03-29 16:01:44 +02:00
|
|
|
|
2016-03-24 12:39:18 +01:00
|
|
|
lc.rangeLayout = true;
|
2016-04-15 16:44:48 +02:00
|
|
|
lc.rangeDone = false;
|
2016-03-24 12:39:18 +01:00
|
|
|
lc.endTick = etick;
|
2016-03-02 13:20:19 +01:00
|
|
|
_scoreFont = ScoreFont::fontFactory(_style.value(StyleIdx::MusicalSymbolFont).toString());
|
|
|
|
_noteHeadWidth = _scoreFont->width(SymId::noteheadBlack, spatium() / SPATIUM20);
|
|
|
|
|
2016-03-18 09:29:16 +01:00
|
|
|
if (cmdState().layoutFlags & LayoutFlag::FIX_PITCH_VELO)
|
2016-03-02 13:20:19 +01:00
|
|
|
updateVelo();
|
2016-03-18 09:29:16 +01:00
|
|
|
if (cmdState().layoutFlags & LayoutFlag::PLAY_EVENTS)
|
2016-03-02 13:20:19 +01:00
|
|
|
createPlayEvents();
|
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------
|
2016-03-02 13:20:19 +01:00
|
|
|
// initialize layout context lc
|
2016-01-04 14:48:58 +01:00
|
|
|
//---------------------------------------------------
|
2012-08-01 18:00:27 +02:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
Measure* m = tick2measure(stick);
|
2016-03-18 09:29:16 +01:00
|
|
|
// start layout one measure earlier to handle clefs and cautionary elements
|
2016-07-08 11:57:33 +02:00
|
|
|
if (m->prevMeasureMM()) {
|
|
|
|
m = m->prevMeasureMM();
|
2016-05-25 10:51:59 +02:00
|
|
|
}
|
2016-07-10 21:27:25 +02:00
|
|
|
|
|
|
|
// if the first measure of the score is part of a multi measure rest
|
|
|
|
// m->system() will return a nullptr. We need to find the multi measure
|
|
|
|
// rest which replaces the measure range
|
|
|
|
if (!m->system() && m->hasMMRest())
|
|
|
|
m = m->mmRest();
|
|
|
|
Q_ASSERT(m->system());
|
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
Page* p = m->system()->page();
|
|
|
|
System* s = p->systems().front();
|
2012-08-01 18:00:27 +02:00
|
|
|
|
2016-04-15 16:44:48 +02:00
|
|
|
int systemIndex = _systems.indexOf(s);
|
2016-05-25 10:51:59 +02:00
|
|
|
lc.systemList = _systems.mid(systemIndex);
|
2016-03-02 13:20:19 +01:00
|
|
|
_systems.erase(_systems.begin() + systemIndex, _systems.end());
|
2016-04-15 16:44:48 +02:00
|
|
|
lc.curPage = _pages.indexOf(p);
|
|
|
|
lc.curSystem = systemIndex > 0 ? _systems[systemIndex-1] : 0;
|
2016-03-02 13:20:19 +01:00
|
|
|
lc.prevMeasure = 0;
|
|
|
|
lc.curMeasure = s->measure(0)->prev();
|
2016-05-25 10:51:59 +02:00
|
|
|
lc.nextMeasure = s->measure(0);
|
2016-03-02 13:20:19 +01:00
|
|
|
lc.measureNo = lc.nextMeasure->no();
|
|
|
|
lc.tick = lc.nextMeasure->tick();
|
2016-02-06 11:41:16 +01:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
getNextMeasure(lc);
|
|
|
|
collectSystem(lc);
|
2012-10-23 22:16:31 +02:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
//---------------------------------------------------
|
|
|
|
// layout score
|
|
|
|
//---------------------------------------------------
|
2012-10-26 11:42:54 +02:00
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
while (collectPage(lc)) {
|
2016-05-25 10:51:59 +02:00
|
|
|
Page* page = _pages[lc.curPage-1];
|
|
|
|
System* s = page->system(0);
|
|
|
|
MeasureBase* m = s->measures().back();
|
|
|
|
if (lc.rangeDone && m->tick() > etick) {
|
2016-03-02 13:20:19 +01:00
|
|
|
break;
|
2016-05-25 10:51:59 +02:00
|
|
|
}
|
2016-01-04 14:48:58 +01:00
|
|
|
}
|
2016-03-18 09:29:16 +01:00
|
|
|
if (!lc.curSystem) {
|
|
|
|
while (_pages.size() > lc.curPage) // Remove not needed pages. TODO: make undoable:
|
|
|
|
_pages.takeLast();
|
|
|
|
}
|
|
|
|
|
2016-03-02 13:20:19 +01:00
|
|
|
_systems.append(lc.systemList);
|
2012-10-26 11:42:54 +02:00
|
|
|
|
2016-01-04 14:48:58 +01:00
|
|
|
for (MuseScoreView* v : viewer)
|
|
|
|
v->layoutChanged();
|
2012-10-26 11:42:54 +02:00
|
|
|
}
|
2013-05-13 18:49:17 +02:00
|
|
|
|
|
|
|
}
|