Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix #299644: add support for fret diagram rotation #5744

Merged
merged 2 commits into from
May 2, 2020
Merged

fix #299644: add support for fret diagram rotation #5744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e40d48
fix #299644: add support for fret diagram rotation
jthistle Feb 21, 2020
3e86e5f
update vtest ref file generation script
jthistle Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 112 additions & 43 deletions libmscore/fret.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ static const ElementStyle fretStyle {
{ Sid::fretFrets, Pid::FRET_FRETS },
{ Sid::fretNut, Pid::FRET_NUT },
{ Sid::fretMinDistance, Pid::MIN_DISTANCE },
{ Sid::fretOrientation, Pid::ORIENTATION },
};

//---------------------------------------------------------
Expand Down Expand Up @@ -68,6 +69,7 @@ FretDiagram::FretDiagram(const FretDiagram& f)
_markers = f._markers;
_barres = f._barres;
_showNut = f._showNut;
_orientation= f._orientation;

if (f._harmony) {
Harmony* h = new Harmony(*f._harmony);
Expand Down Expand Up @@ -267,6 +269,13 @@ void FretDiagram::init(StringData* stringData, Chord* chord)

void FretDiagram::draw(QPainter* painter) const
{
QPointF translation = -QPointF(stringDist * (_strings - 1), 0);
if (_orientation == Orientation::HORIZONTAL) {
painter->save();
painter->rotate(-90);
painter->translate(translation);
}

// Init pen and other values
qreal _spatium = spatium() * _userMag;
QPen pen(curColor());
Expand Down Expand Up @@ -296,18 +305,10 @@ void FretDiagram::draw(QPainter* painter) const
painter->drawLine(QLineF(0.0, y, x2, y));
}

// Setup the font for the markers
QFont scaledFont(font);
scaledFont.setPointSizeF(font.pointSize() * _userMag * (spatium() / SPATIUM20));
QFontMetricsF fm(scaledFont, MScore::paintDevice());
scaledFont.setPointSizeF(scaledFont.pointSizeF() * MScore::pixelRatio);

painter->setFont(scaledFont);

// dotd is the diameter of a dot
qreal dotd = _spatium * .49 * score()->styleD(Sid::fretDotSize);

// Draw dots, sym pen is used to draw them
// Draw dots, sym pen is used to draw them (and markers)
QPen symPen(pen);
symPen.setCapStyle(Qt::RoundCap);
qreal symPenWidth = stringLw * 1.2;
Expand Down Expand Up @@ -356,19 +357,24 @@ void FretDiagram::draw(QPainter* painter) const
}

// Draw markers
painter->setPen(pen);
symPen.setWidthF(symPenWidth * 1.2);
painter->setBrush(Qt::NoBrush);
painter->setPen(symPen);
for (auto const& i : _markers) {
int string = i.first;
FretItem::Marker marker = i.second;
if (!marker.exists())
continue;

QChar markerChar = FretItem::markerToChar(marker.mtype);

qreal x = stringDist * string;
qreal y = -fretDist * .3 - fm.ascent();
painter->drawText(QRectF(x, y, .0, .0),
Qt::AlignHCenter|Qt::TextDontClip, markerChar);
qreal x = stringDist * string - markerSize * .5;
qreal y = -fretDist - markerSize * .5;
if (marker.mtype == FretMarkerType::CIRCLE) {
painter->drawEllipse(QRectF(x, y, markerSize, markerSize));
}
else if (marker.mtype == FretMarkerType::CROSS) {
painter->drawLine(QPointF(x, y), QPointF(x + markerSize, y + markerSize));
painter->drawLine(QPointF(x, y + markerSize), QPointF(x + markerSize, y));
}
}

// Draw barres
Expand All @@ -389,22 +395,44 @@ void FretDiagram::draw(QPainter* painter) const
// Draw fret offset number
if (_fretOffset > 0) {
qreal fretNumMag = score()->styleD(Sid::fretNumMag);
scaledFont.setPointSizeF(scaledFont.pointSizeF() * fretNumMag);
QFont scaledFont(font);
scaledFont.setPointSizeF(font.pointSize() * _userMag * (spatium() / SPATIUM20) * MScore::pixelRatio * fretNumMag);
painter->setFont(scaledFont);
if (_numPos == 0) {
painter->drawText(QRectF(-stringDist *.4, .0, .0, fretDist),
Qt::AlignVCenter|Qt::AlignRight|Qt::TextDontClip,
QString("%1").arg(_fretOffset+1));
QString text = QString("%1").arg(_fretOffset+1);

if (_orientation == Orientation::VERTICAL) {
if (_numPos == 0) {
painter->drawText(QRectF(-stringDist * .4, .0, .0, fretDist),
Qt::AlignVCenter|Qt::AlignRight|Qt::TextDontClip, text);
}
else {
painter->drawText(QRectF(x2 + (stringDist * .4), .0, .0, fretDist),
Qt::AlignVCenter|Qt::AlignLeft|Qt::TextDontClip,
QString("%1").arg(_fretOffset+1));
}
}
else {
painter->drawText(QRectF(x2 + (stringDist * 0.4), .0, .0, fretDist),
Qt::AlignVCenter|Qt::AlignLeft|Qt::TextDontClip,
QString("%1").arg(_fretOffset+1));
else if (_orientation == Orientation::HORIZONTAL) {
painter->save();
painter->translate(-translation);
painter->rotate(90);
if (_numPos == 0) {
painter->drawText(QRectF(.0, stringDist * (_strings - 1), .0, .0),
Qt::AlignLeft|Qt::TextDontClip, text);
}
else {
painter->drawText(QRectF(.0, .0, .0, .0),
Qt::AlignBottom|Qt::AlignLeft|Qt::TextDontClip, text);
}
painter->restore();
}
painter->setFont(font);
}

// NOTE:JT possible future todo - draw fingerings

if (_orientation == Orientation::HORIZONTAL) {
painter->restore();
}
}

//---------------------------------------------------------
Expand All @@ -418,39 +446,70 @@ void FretDiagram::layout()
nutLw = (_fretOffset || !_showNut) ? stringLw : _spatium * 0.2;
stringDist = score()->styleP(Sid::fretStringSpacing) * _userMag;
fretDist = score()->styleP(Sid::fretFretSpacing) * _userMag;
markerSize = stringDist * .8;

qreal w = stringDist * (_strings - 1);
qreal h = _frets * fretDist + fretDist * .5;
qreal y = 0.0;
qreal dotd = _spatium * .49 * score()->styleD(Sid::fretDotSize);
qreal x = -((dotd+stringLw) * .5);
w += dotd + stringLw;

// Always allocate space for markers
QFont scaledFont(font);
scaledFont.setPointSize(font.pointSize() * _userMag);
QFontMetricsF fm(scaledFont, MScore::paintDevice());
y = -(fretDist * .1 + fm.height());
h -= y;
qreal w = stringDist * (_strings - 1) + markerSize;
qreal h = (_frets + 1) * fretDist + markerSize;
qreal y = -(markerSize * .5 + fretDist);
qreal x = -(markerSize * .5);

// Allocate space for fret offset number
if (_fretOffset > 0) {
QFont scaledFont(font);
scaledFont.setPointSize(font.pointSize() * _userMag);
QFontMetricsF fm(scaledFont, MScore::paintDevice());

qreal fretNumMag = score()->styleD(Sid::fretNumMag);
scaledFont.setPointSizeF(scaledFont.pointSizeF() * fretNumMag);
QFontMetricsF fm2(scaledFont, MScore::paintDevice());
qreal numw = fm2.width(QString("%1").arg(_fretOffset+1));
qreal xdiff = numw + stringDist * .4;
w += xdiff;
x += _numPos == 0 ? -xdiff : 0;
x += (_numPos == 0) == (_orientation == Orientation::VERTICAL) ? -xdiff : 0;
}

bbox().setRect(x, y, w, h);
if (_orientation == Orientation::HORIZONTAL) {
qreal tempW = w,
tempX = x;
w = h;
h = tempW;
x = y;
y = tempX;
}

setPos(-_spatium, -h - styleP(Sid::fretY) + _spatium );
bbox().setRect(x, y, w, h);

if (!parent() || !parent()->isSegment()) {
setPos(QPointF());
return;
}

// We need to get the width of the notehead/rest in order to position the fret diagram correctly
Segment* pSeg = toSegment(parent());
qreal noteheadWidth = 0;
if (pSeg->isChordRestType()) {
int idx = staff()->idx();
for (Element* e = pSeg->firstElementOfSegment(pSeg, idx); e; e = pSeg->nextElementOfSegment(pSeg, e, idx)) {
if (e->isRest()) {
Rest* r = toRest(e);
noteheadWidth = symWidth(r->sym());
break;
}
else if (e->isNote()) {
Note* n = toNote(e);
noteheadWidth = n->headWidth();
break;
}
}
}

qreal mainWidth;
if (_orientation == Orientation::VERTICAL)
mainWidth = stringDist * (_strings - 1);
else if (_orientation == Orientation::HORIZONTAL)
mainWidth = fretDist * (_frets + 0.5);
setPos((noteheadWidth - mainWidth)/2, -(h + styleP(Sid::fretY)));

autoplaceSegmentElement();

// don't display harmony in palette
Expand Down Expand Up @@ -501,14 +560,15 @@ qreal FretDiagram::centerX() const
// written, edit the writeNew function. writeOld is purely compatibility.
//---------------------------------------------------------

static const std::array<Pid, 7> pids { {
static const std::array<Pid, 8> pids { {
Pid::MIN_DISTANCE,
Pid::FRET_OFFSET,
Pid::FRET_FRETS,
Pid::FRET_STRINGS,
Pid::FRET_NUT,
Pid::MAG,
Pid::FRET_NUM_POS
Pid::FRET_NUM_POS,
Pid::ORIENTATION
} };

void FretDiagram::write(XmlWriter& xml) const
Expand Down Expand Up @@ -707,6 +767,8 @@ void FretDiagram::read(XmlReader& e)
// Check for new properties
else if (tag == "showNut")
readProperty(e, Pid::FRET_NUT);
else if (tag == "orientation")
readProperty(e, Pid::ORIENTATION);

// Then read the rest if there is no new format diagram (compatibility read)
else if (tag == "strings")
Expand Down Expand Up @@ -1118,6 +1180,7 @@ void FretDiagram::add(Element* e)
_harmony = toHarmony(e);
_harmony->setTrack(track());
_harmony->resetProperty(Pid::OFFSET);
_harmony->setProperty(Pid::ALIGN, int(Align::HCENTER | Align::TOP));
}
else
qWarning("FretDiagram: cannot add <%s>\n", e->name());
Expand Down Expand Up @@ -1278,6 +1341,9 @@ QVariant FretDiagram::getProperty(Pid propertyId) const
return fretOffset();
case Pid::FRET_NUM_POS:
return _numPos;
case Pid::ORIENTATION:
return int(_orientation);
break;
default:
return Element::getProperty(propertyId);
}
Expand Down Expand Up @@ -1308,6 +1374,9 @@ bool FretDiagram::setProperty(Pid propertyId, const QVariant& v)
case Pid::FRET_NUM_POS:
_numPos = v.toInt();
break;
case Pid::ORIENTATION:
_orientation = Orientation(v.toInt());
break;
default:
return Element::setProperty(propertyId, v);
}
Expand Down
7 changes: 7 additions & 0 deletions libmscore/fret.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ namespace Ms {
class StringData;
class Chord;

enum class Orientation : signed char {
VERTICAL,
HORIZONTAL
};

// Keep this in order - not used directly for comparisons, but the dots will appear in
// this order in fret multidot mode. See fretproperties.cpp.
enum class FretDotType : signed char {
Expand Down Expand Up @@ -125,6 +130,7 @@ class FretDiagram final : public Element {
int _fretOffset { 0 };
int _maxFrets { 24 };
bool _showNut { true };
Orientation _orientation { Orientation::VERTICAL };

// Barres are stored in the format: K: fret, V: barre struct
BarreMap _barres;
Expand All @@ -143,6 +149,7 @@ class FretDiagram final : public Element {
qreal fretDist;
QFont font;
qreal _userMag { 1.0 }; // allowed 0.1 - 10.0
qreal markerSize;
int _numPos;

void removeDot(int s, int f = 0);
Expand Down
Loading