Added proofreading via notehead colours

Author: miiizen

src/engraving/libmscore/harppedaldiagram.cpp

@@ -66,6 +66,34 @@ static const ElementStyle harpPedalTextDiagramStyle {
 };
 
 // HarpPedalDiagram
+void HarpPedalDiagram::setPlayablePitches()
+{
+    std::vector<int> playablePitches;
+    const std::map<HarpStringType, int> string2pitch = {
+        { HarpStringType::C, 0 },
+        { HarpStringType::D, 2 },
+        { HarpStringType::E, 4 },
+        { HarpStringType::F, 5 },
+        { HarpStringType::G, 7 },
+        { HarpStringType::A, 9 },
+        { HarpStringType::B, 11 }
+    };
+    const std::map<PedalPosition, int> position2delta = {
+        { PedalPosition::FLAT, -1 },
+        { PedalPosition::NATURAL, 0 },
+        { PedalPosition::SHARP, 1 }
+    };
+
+    for (int i = 0; i < _pedalState.size(); i++) {
+        int stringPitch = string2pitch.at(HarpStringType(i));
+        int delta = position2delta.at(_pedalState[i]);
+        int resPitch = (((stringPitch + delta)) % 12 + 12) % 12;
+        playablePitches.push_back(resPitch);
+    }
+
+    _playablePitches = playablePitches;
+}
+
 HarpPedalDiagram::HarpPedalDiagram(Segment* parent)
     : TextBase(ElementType::HARP_DIAGRAM, parent, TextStyleType::HARP_PEDAL_DIAGRAM, ElementFlag::MOVABLE | ElementFlag::ON_STAFF)
 {
@@ -91,6 +119,7 @@ void HarpPedalDiagram::layout()
 void HarpPedalDiagram::setPedalState(std::vector<PedalPosition> state)
 {
     _pedalState = state;
+    setPlayablePitches();
 }
 
 void HarpPedalDiagram::setIsDiagram(bool diagram)
@@ -110,6 +139,7 @@ void HarpPedalDiagram::setIsDiagram(bool diagram)
 void HarpPedalDiagram::setPedal(HarpStringType harpString, PedalPosition pedal)
 {
     _pedalState.at(harpString) = pedal;
+    setPlayablePitches();
 }
 
 String HarpPedalDiagram::createDiagramText()
@@ -143,7 +173,7 @@ String HarpPedalDiagram::createDiagramText()
             = { PedalPosition::UNSET, PedalPosition::UNSET, PedalPosition::UNSET, PedalPosition::UNSET, PedalPosition::UNSET,
                 PedalPosition::UNSET, PedalPosition::UNSET };
         std::vector<PedalPosition> prevState;
-        HarpPedalDiagram* prevDiagram = searchPrevDiagram();
+        HarpPedalDiagram* prevDiagram = searchPrevDiagram(segment());
 
         if (prevDiagram != nullptr) {
             // If states are the same work backwards until we find the first difference then calculate from there
@@ -156,7 +186,7 @@ String HarpPedalDiagram::createDiagramText()
                     break;
                 }
                 // Check if there's a diagram before.  If not, start of score and use init state
-                prevDiagram = prevDiagram->searchPrevDiagram();
+                prevDiagram = prevDiagram->searchPrevDiagram(segment());
                 if (prevDiagram != nullptr) {
                     prevState = prevDiagram->getPedalState();
                 } else {
@@ -210,7 +240,7 @@ void HarpPedalDiagram::updateDiagramText()
     undoChangeProperty(Pid::TEXT, createDiagramText(), PropertyFlags::STYLED);
 
     // Check if next diagrams are text and update if neccessary
-    HarpPedalDiagram* nextDiagram = searchNextDiagram();
+    HarpPedalDiagram* nextDiagram = searchNextDiagram(segment());
     if (!nextDiagram || nextDiagram->isDiagram()) {
         return;
     }
@@ -219,10 +249,10 @@ void HarpPedalDiagram::updateDiagramText()
 }
 
 // Goes through all previous segments until one with a harp pedal diagram is found
-HarpPedalDiagram* HarpPedalDiagram::searchPrevDiagram()
+HarpPedalDiagram* HarpPedalDiagram::searchPrevDiagram(Segment* seg)
 {
-    if (segment() != nullptr) {
-        Segment* prevSeg = segment()->prev1();
+    if (seg != nullptr) {
+        Segment* prevSeg = seg->prev1();
 
         while (prevSeg != nullptr) {
             for (EngravingItem* e : prevSeg->annotations()) {
@@ -238,10 +268,10 @@ HarpPedalDiagram* HarpPedalDiagram::searchPrevDiagram()
 }
 
 // Goes through all next segments until one with a harp pedal diagram is found
-HarpPedalDiagram* HarpPedalDiagram::searchNextDiagram()
+HarpPedalDiagram* HarpPedalDiagram::searchNextDiagram(Segment* seg)
 {
-    if (segment() != nullptr) {
-        Segment* nextSeg = segment()->next1();
+    if (seg != nullptr) {
+        Segment* nextSeg = seg->next1();
 
         while (nextSeg != nullptr) {
             for (EngravingItem* e : nextSeg->annotations()) {
@@ -256,6 +286,16 @@ HarpPedalDiagram* HarpPedalDiagram::searchNextDiagram()
     return nullptr;
 }
 
+bool HarpPedalDiagram::isPitchPlayable(int pitch)
+{
+    pitch = pitch % 12;
+
+    if (std::find(_playablePitches.begin(), _playablePitches.end(), pitch) != _playablePitches.end()) {
+        return true;
+    }
+    return false;
+}
+
 void HarpPedalDiagram::read(XmlReader& xml)
 {
     while (xml.readNextStartElement()) {

src/engraving/libmscore/harppedaldiagram.h

@@ -24,6 +24,7 @@
 #define __HARPPEDALDIAGRAM_H__
 
 #include "textbase.h"
+#include "pitchspelling.h"
 
 using namespace mu;
 //using namespace mu::engraving;
@@ -46,8 +47,12 @@ class HarpPedalDiagram final : public TextBase
 {
     std::vector<PedalPosition> _pedalState;
 
+    std::vector<int> _playablePitches;
+
     bool _isDiagram = true;
 
+    void setPlayablePitches();
+
 public:
     HarpPedalDiagram(Segment* parent);
     HarpPedalDiagram(const HarpPedalDiagram& h);
@@ -83,10 +88,10 @@ class HarpPedalDiagram final : public TextBase
 
     void updateDiagramText();
 
-private:
+    static HarpPedalDiagram* searchPrevDiagram(Segment* seg);
+    static HarpPedalDiagram* searchNextDiagram(Segment* seg);
 
-    HarpPedalDiagram* searchPrevDiagram();
-    HarpPedalDiagram* searchNextDiagram();
+    bool isPitchPlayable(int pitch);
 };
 } // namespace mu::engraving
 

src/engraving/libmscore/note.cpp

@@ -1436,6 +1436,13 @@ void Note::draw(mu::draw::Painter* painter) const
                 painter->setPen(selected() ? engravingConfiguration()->warningSelectedColor() : engravingConfiguration()->warningColor());
             }
         }
+        // Warn if notes are unplayable based on previous harp diagram setting
+        if (chord() && chord()->segment() && staff() && !score()->printing() && !staff()->isDrumStaff(chord()->tick())) {
+            HarpPedalDiagram* prevDiagram = HarpPedalDiagram::searchPrevDiagram(chord()->segment()->next1());
+            if (prevDiagram && !prevDiagram->isPitchPlayable(ppitch())) {
+                painter->setPen(selected() ? engravingConfiguration()->warningSelectedColor() : engravingConfiguration()->warningColor());
+            }
+        }
         // draw blank notehead to avoid staff and ledger lines
         if (_cachedSymNull != SymId::noSym) {
             painter->save();