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

convert unnamed enum to enum class CrossMeasure

Browse source
This commit is contained in:
Joachim Schmitz 2014-05-21 15:41:23 +02:00
parent 9b45470394
commit 93799b7c58
9 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libmscore/chord.cpp
View file

@ -196,7 +196,7 @@ Chord::Chord(Score* s)
_stemSlash = 0;
_noStem = false;
_playEventType = PlayEventType::Auto;
_crossMeasure = CROSSMEASURE_UNKNOWN;
_crossMeasure = CrossMeasure::UNKNOWN;
_graceIndex = 0;
setFlags(ELEMENT_MOVABLE | ELEMENT_ON_STAFF);
}
@ -238,7 +238,7 @@ Chord::Chord(const Chord& c)
if (c._tremolo && !c._tremolo->twoNotes())
add(new Tremolo(*(c._tremolo)));
_noteType = c._noteType;
_crossMeasure = CROSSMEASURE_UNKNOWN;
_crossMeasure = CrossMeasure::UNKNOWN;
for (Element* e : c.el()) {
if (e->type() == Element::CHORDLINE) {
ChordLine* cl = static_cast<ChordLine*>(e);
@ -2148,14 +2148,14 @@ void Chord::layoutTablature()
void Chord::crossMeasureSetup(bool on)
{
if (!on) {
if (_crossMeasure != CROSSMEASURE_UNKNOWN) {
_crossMeasure = CROSSMEASURE_UNKNOWN;
if (_crossMeasure != CrossMeasure::UNKNOWN) {
_crossMeasure = CrossMeasure::UNKNOWN;
layoutStem1();
}
return;
}
if (_crossMeasure == CROSSMEASURE_UNKNOWN) {
int tempCross = CROSSMEASURE_NONE; // assume no cross-measure modification
if (_crossMeasure == CrossMeasure::UNKNOWN) {
CrossMeasure tempCross = CrossMeasure::NONE; // assume no cross-measure modification
// if chord has only one note and note is tied forward
if(notes().size() == 1 && _notes[0]->tieFor()) {
Chord* tiedChord = _notes[0]->tieFor()->endNote()->chord();
@ -2168,14 +2168,14 @@ void Chord::crossMeasureSetup(bool on)
// if duration can be expressed as a single duration
// apply cross-measure modification
if(durList.size() == 1) {
_crossMeasure = tempCross = CROSSMEASURE_FIRST;
_crossMeasure = tempCross = CrossMeasure::FIRST;
_crossMeasureTDur = durList[0];
layoutStem1();
}
}
_crossMeasure = tempCross;
tiedChord->setCrossMeasure(tempCross == CROSSMEASURE_FIRST ?
CROSSMEASURE_SECOND : CROSSMEASURE_NONE);
tiedChord->setCrossMeasure(tempCross == CrossMeasure::FIRST ?
CrossMeasure::SECOND : CrossMeasure::NONE);
}
}
}

10
libmscore/chordrest.cpp
View file

@ -71,7 +71,7 @@ ChordRest::ChordRest(Score* s)
_beamMode = BeamMode::AUTO;
_up = true;
_small = false;
_crossMeasure = CROSSMEASURE_UNKNOWN;
_crossMeasure = CrossMeasure::UNKNOWN;
}
ChordRest::ChordRest(const ChordRest& cr)
@ -849,25 +849,25 @@ void ChordRest::setBeam(Beam* b)
void ChordRest::setDurationType(TDuration::DurationType t)
{
_durationType.setType(t);
_crossMeasure = CROSSMEASURE_UNKNOWN;
_crossMeasure = CrossMeasure::UNKNOWN;
}
void ChordRest::setDurationType(const QString& s)
{
_durationType.setType(s);
_crossMeasure = CROSSMEASURE_UNKNOWN;
_crossMeasure = CrossMeasure::UNKNOWN;
}
void ChordRest::setDurationType(int ticks)
{
_durationType.setVal(ticks);
_crossMeasure = CROSSMEASURE_UNKNOWN;
_crossMeasure = CrossMeasure::UNKNOWN;
}
void ChordRest::setDurationType(const TDuration& v)
{
_durationType = v;
_crossMeasure = CROSSMEASURE_UNKNOWN;
_crossMeasure = CrossMeasure::UNKNOWN;
}
//---------------------------------------------------------

24
libmscore/chordrest.h
View file

@ -18,11 +18,11 @@
namespace Ms {
enum {
CROSSMEASURE_UNKNOWN = -1,
CROSSMEASURE_NONE = 0,
CROSSMEASURE_FIRST,
CROSSMEASURE_SECOND
enum class CrossMeasure : signed char {
UNKNOWN = -1,
NONE = 0,
FIRST,
SECOND
};
class Score;
@ -65,7 +65,7 @@ class ChordRest : public DurationElement {
bool _small;
// CrossMeasure: combine 2 tied notes if across a bar line and can be combined in a single duration
char _crossMeasure; ///< 0: no cross-measure modification; 1: 1st note of a mod.; -1: 2nd note
CrossMeasure _crossMeasure; ///< 0: no cross-measure modification; 1: 1st note of a mod.; -1: 2nd note
TDuration _crossMeasureTDur; ///< the total Duration type of the combined notes
Space _space; // cached value from layout
@ -120,7 +120,7 @@ class ChordRest : public DurationElement {
void layoutArticulations();
const TDuration& durationType() const { return _crossMeasure == CROSSMEASURE_FIRST ?
const TDuration& durationType() const { return _crossMeasure == CrossMeasure::FIRST ?
_crossMeasureTDur : _durationType; }
const TDuration& actualDurationType() const { return _durationType; }
void setDurationType(TDuration::DurationType t);
@ -128,10 +128,10 @@ class ChordRest : public DurationElement {
void setDurationType(int ticks);
void setDurationType(const TDuration& v);
void setDots(int n) { _durationType.setDots(n); }
int dots() const { return _crossMeasure == CROSSMEASURE_FIRST ? _crossMeasureTDur.dots()
: (_crossMeasure == CROSSMEASURE_SECOND ? 0 : _durationType.dots()); }
int dots() const { return _crossMeasure == CrossMeasure::FIRST ? _crossMeasureTDur.dots()
: (_crossMeasure == CrossMeasure::SECOND ? 0 : _durationType.dots()); }
int actualDots() const { return _durationType.dots(); }
int durationTypeTicks() { return _crossMeasure == CROSSMEASURE_FIRST ? _crossMeasureTDur.ticks()
int durationTypeTicks() { return _crossMeasure == CrossMeasure::FIRST ? _crossMeasureTDur.ticks()
: _durationType.ticks(); }
virtual void setTrack(int val);
@ -146,8 +146,8 @@ class ChordRest : public DurationElement {
virtual void remove(Element*);
void removeDeleteBeam(bool beamed = false);
int crossMeasure() const { return _crossMeasure; }
void setCrossMeasure(int val) { _crossMeasure = val; }
CrossMeasure crossMeasure() const { return _crossMeasure; }
void setCrossMeasure(CrossMeasure val) { _crossMeasure = val; }
virtual void crossMeasureSetup(bool /*on*/) { }
virtual QVariant getProperty(P_ID propertyId) const;

2
libmscore/hook.cpp
View file

@ -75,7 +75,7 @@ void Hook::layout()
void Hook::draw(QPainter* painter) const
{
// hide if belonging to the second chord of a cross-measure pair
if (chord() && chord()->crossMeasure() == CROSSMEASURE_SECOND)
if (chord() && chord()->crossMeasure() == CrossMeasure::SECOND)
return;
Symbol::draw(painter);
}

2
libmscore/layout.cpp
View file

@ -1136,7 +1136,7 @@ void Score::layoutStage2()
// 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)
if (cr->durationType().hooks() > 0 && cr->crossMeasure() == CROSSMEASURE_SECOND)
if (cr->durationType().hooks() > 0 && cr->crossMeasure() == CrossMeasure::SECOND)
bm = BeamMode::NONE;
if (cr->measure() != measure) {
if (measure && !beamModeMid(bm)) {

2
libmscore/ledgerline.cpp
View file

@ -69,7 +69,7 @@ void LedgerLine::layout()
void LedgerLine::draw(QPainter* painter) const
{
if(chord()->crossMeasure() == CROSSMEASURE_SECOND)
if(chord()->crossMeasure() == CrossMeasure::SECOND)
return;
Line::draw(painter);
}

2
libmscore/note.cpp
View file

@ -701,7 +701,7 @@ void Note::draw(QPainter* painter) const
else {
// skip drawing, if second note of a cross-measure value
if (chord()->crossMeasure() == CROSSMEASURE_SECOND)
if (chord()->crossMeasure() == CrossMeasure::SECOND)
return;
//
// warn if pitch extends usable range of instrument

2
libmscore/slur.cpp
View file

@ -71,7 +71,7 @@ void SlurSegment::draw(QPainter* painter) const
// hide tie toward the second chord of a cross-measure value
if ((slurTie()->type() == TIE)
&& (static_cast<Tie*>(slurTie())->endNote())
&& (static_cast<Tie*>(slurTie())->endNote()->chord()->crossMeasure() == CROSSMEASURE_SECOND))
&& (static_cast<Tie*>(slurTie())->endNote()->chord()->crossMeasure() == CrossMeasure::SECOND))
return;
QPen pen(curColor());

2
libmscore/stem.cpp
View file

@ -137,7 +137,7 @@ void Stem::spatiumChanged(qreal oldValue, qreal newValue)
void Stem::draw(QPainter* painter) const
{
// hide if second chord of a cross-measure pair
if (chord() && chord()->crossMeasure() == CROSSMEASURE_SECOND)
if (chord() && chord()->crossMeasure() == CrossMeasure::SECOND)
return;
Staff* st = staff();