Guitar harmonics base class

musescore · May 21, 2021 · 59c9979 · 59c9979
1 parent 1bad027
commit 59c9979
Show file tree

Hide file tree

Showing 5 changed files with 673 additions and 1 deletion.
diff --git a/src/libmscore/CMakeLists.txt b/src/libmscore/CMakeLists.txt
@@ -207,6 +207,8 @@ set(MODULE_SRC
     pedal.h
     pitch.cpp
     pitch.h
+    pitchadjuster.cpp
+    pitchadjuster.h
     pitchspelling.cpp
     pitchspelling.h
     pitchvalue.h

diff --git a/src/libmscore/note.cpp b/src/libmscore/note.cpp
@@ -726,6 +726,7 @@ Note::Note(const Note& n, bool link)
     _accidental        = 0;
     _cachedNoteheadSym = n._cachedNoteheadSym;
     _cachedSymNull     = n._cachedSymNull;
+    _pitchAdjuster     = n._pitchAdjuster;
 
     if (n._accidental) {
         add(new Accidental(*(n._accidental)));
@@ -1467,6 +1468,7 @@ void Note::write(XmlWriter& xml) const
                     Pid::GHOST, Pid::HEAD_TYPE, Pid::VELO_TYPE, Pid::FIXED, Pid::FIXED_LINE }) {
         writeProperty(xml, id);
     }
+    _pitchAdjuster.write(xml);
 
     for (Spanner* e : _spannerFor) {
         e->writeSpannerStart(xml, this, track());
@@ -1643,6 +1645,8 @@ bool Note::readProperties(XmlReader& e)
         NoteDot* dot = new NoteDot(score());
         dot->read(e);
         add(dot);
+    } else if (tag == "pitchAdjust") {
+        _pitchAdjuster.read(e);
     } else if (tag == "Events") {
         _playEvents.clear();        // remove default event
         while (e.readNextStartElement()) {
@@ -2581,7 +2585,7 @@ int Note::ppitch() const
         }
     }
 
-    return _pitch + ottaveCapoFret();
+    return _pitch + ottaveCapoFret() + _pitchAdjuster.getAlter();
 }
 
 //---------------------------------------------------------

diff --git a/src/libmscore/note.h b/src/libmscore/note.h
@@ -37,6 +37,7 @@
 #include "shape.h"
 #include "key.h"
 #include "sym.h"
+#include "pitchadjuster.h"
 
 namespace Ms {
 class Tie;
@@ -310,6 +311,8 @@ class Note final : public Element
 
     QString _fretString;
 
+    PitchAdjuster _pitchAdjuster;  // guitar harmonics
+
     void startDrag(EditData&) override;
     QRectF drag(EditData& ed) override;
     void endDrag(EditData&) override;