Merge pull request #29774 from mike-spa/moreFretDiagramImprovements

More fret diagram improvements

Author: miiizen

src/engraving/dom/edit.cpp

@@ -3980,11 +3980,7 @@ void Score::cmdDeleteSelection()
                     FretDiagram* fretDiagram = toFretDiagram(e);
                     Harmony* harmony = fretDiagram->harmony();
                     if (harmony) {
-                        for (EngravingObject* o: fretDiagram->linkList()) {
-                            FretDiagram* linkedDiagram = toFretDiagram(o);
-                            Harmony* linkedHarmony = linkedDiagram->harmony();
-                            undo(new FretLinkHarmony(linkedDiagram, linkedHarmony, true /* unlink */));
-                        }
+                        undoChangeParent(harmony, fretDiagram->segment(), track2staff(fretDiagram->track()));
                         elSelectedAfterDeletion = harmony;
                     }
                 } else if (e->isHarmony()) {
@@ -6987,21 +6983,7 @@ void Score::undoAddElement(EngravingItem* element, bool addToLinkedStaves, bool
             ne->setTrack(linkedTrack);
             ne->setParent(seg);
 
-            // make harmony child of fret diagram if possible
-            if (ne->isHarmony()) {
-                for (EngravingItem* segel : segment->annotations()) {
-                    if (segel && segel->isFretDiagram() && segel->track() == linkedTrack && !toFretDiagram(segel)->harmony()) {
-                        segel->add(ne);
-                        break;
-                    }
-                }
-            } else if (ne->isFretDiagram()) {
-                // update track of child harmony
-                FretDiagram* fd = toFretDiagram(ne);
-                if (fd->harmony()) {
-                    fd->harmony()->setTrack(linkedTrack);
-                }
-            } else if (ne->isStringTunings()) {
+            if (ne->isStringTunings()) {
                 StringTunings* stringTunings = toStringTunings(ne);
                 if (stringTunings->stringData()->isNull()) {
                     const StringData* stringData = stringTunings->part()->stringData(tick, staff->idx());

src/engraving/dom/fret.cpp

@@ -804,21 +804,6 @@ std::vector<String> FretDiagram::patternHarmonies(const String& pattern)
     return muse::value(s_diagramPatternToHarmoniesMap, pattern);
 }
 
-void FretDiagram::applyAlignmentToHarmony()
-{
-    if (m_harmony->propertyFlags(Pid::OFFSET) == PropertyFlags::STYLED) {
-        m_harmony->resetProperty(Pid::OFFSET);
-    }
-
-    m_harmony->setProperty(Pid::ALIGN, Align(AlignH::HCENTER, AlignV::BASELINE));
-    m_harmony->setPropertyFlags(Pid::ALIGN, PropertyFlags::UNSTYLED);
-}
-
-void FretDiagram::resetHarmonyAlignment()
-{
-    m_harmony->resetProperty(Pid::ALIGN);
-}
-
 //---------------------------------------------------------
 //   clear
 //---------------------------------------------------------
@@ -946,38 +931,6 @@ void FretDiagram::setHarmony(String harmonyText)
     triggerLayout();
 }
 
-void FretDiagram::linkHarmony(Harmony* harmony)
-{
-    m_harmony = harmony;
-
-    setParent(harmony->explicitParent());
-    harmony->setParent(this);
-
-    //! on the same lavel as diagram
-    m_harmony->setZ(z());
-
-    if (Segment* segment = this->segment()) {
-        segment->removeAnnotation(harmony);
-    }
-
-    m_harmony->setTrack(track());
-
-    applyAlignmentToHarmony();
-}
-
-void FretDiagram::unlinkHarmony()
-{
-    m_harmony->setTrack(track());
-
-    resetHarmonyAlignment();
-
-    m_harmony->setZ(-1);
-
-    segment()->add(m_harmony);
-
-    m_harmony = nullptr;
-}
-
 //---------------------------------------------------------
 //   add
 //---------------------------------------------------------
@@ -990,9 +943,6 @@ void FretDiagram::add(EngravingItem* e)
 
         m_harmony->setTrack(track());
 
-        //! on the same lavel as diagram
-        m_harmony->setZ(z());
-
         if (m_harmony->harmonyName().empty()) {
             if (s_diagramPatternToHarmoniesMap.empty()) {
                 readHarmonyToDiagramFile(HARMONY_TO_DIAGRAM_FILE_PATH);
@@ -1007,7 +957,9 @@ void FretDiagram::add(EngravingItem* e)
             }
         }
 
-        applyAlignmentToHarmony();
+        m_harmony->resetProperty(Pid::OFFSET);
+        m_harmony->setProperty(Pid::ALIGN, Align(AlignH::HCENTER, AlignV::BASELINE));
+        m_harmony->setPropertyFlags(Pid::ALIGN, PropertyFlags::UNSTYLED);
 
         e->added();
     } else {
@@ -1355,7 +1307,7 @@ FretDiagram* FretDiagram::makeFromHarmonyOrFretDiagram(const EngravingItem* harm
 
         fretDiagram->updateDiagram(harmony->plainText());
 
-        fretDiagram->linkHarmony(harmony);
+        fretDiagram->add(harmony);
     } else if (harmonyOrFretDiagram->isHarmony() && harmonyOrFretDiagram->parentItem()->isFretDiagram()) {
         fretDiagram = toFretDiagram(harmonyOrFretDiagram->parentItem())->clone();
     } else if (harmonyOrFretDiagram->isFretDiagram()) {

src/engraving/dom/fret.h

@@ -209,8 +209,6 @@ class FretDiagram final : public EngravingItem
     String harmonyText() const;
     Harmony* harmony() const { return m_harmony; }
     void setHarmony(String harmonyText);
-    void linkHarmony(Harmony* harmony);
-    void unlinkHarmony();
 
     std::vector<FretItem::Dot> dot(int s, int f = 0) const;
     FretItem::Marker marker(int s) const;
@@ -302,9 +300,6 @@ class FretDiagram final : public EngravingItem
 
     static void applyDiagramPattern(FretDiagram* diagram, const String& pattern);
 
-    void applyAlignmentToHarmony();
-    void resetHarmonyAlignment();
-
     int m_strings = 0;
     int m_frets = 0;
     int m_fretOffset = 0;

src/engraving/dom/undo.cpp

@@ -3557,31 +3557,6 @@ void ChangeTieJumpPointActive::flip(EditData*)
     m_active = oldActive;
 }
 
-FretLinkHarmony::FretLinkHarmony(FretDiagram* diagram, Harmony* harmony, bool unlink)
-{
-    m_fretDiagram = diagram;
-    m_harmony = harmony;
-    m_unlink = unlink;
-}
-
-void FretLinkHarmony::undo(EditData*)
-{
-    if (m_unlink) {
-        m_fretDiagram->linkHarmony(m_harmony);
-    } else {
-        m_fretDiagram->unlinkHarmony();
-    }
-}
-
-void FretLinkHarmony::redo(EditData*)
-{
-    if (m_unlink) {
-        m_fretDiagram->unlinkHarmony();
-    } else {
-        m_fretDiagram->linkHarmony(m_harmony);
-    }
-}
-
 RemoveFretDiagramFromFretBox::RemoveFretDiagramFromFretBox(FretDiagram* f)
     : m_fretDiagram(f)
 {

src/engraving/dom/undo.h

@@ -159,7 +159,6 @@ enum class CommandType : signed char {
     FretMarker,
     FretBarre,
     FretClear,
-    FretLinkHarmony,
     RemoveFretDiagramFromFretBox,
 
     // Harmony
@@ -1806,25 +1805,6 @@ class FretClear : public UndoCommand
     UNDO_CHANGED_OBJECTS({ diagram })
 };
 
-class FretLinkHarmony : public UndoCommand
-{
-    OBJECT_ALLOCATOR(engraving, FretLinkHarmony)
-
-    FretDiagram* m_fretDiagram = nullptr;
-    Harmony* m_harmony = nullptr;
-    bool m_unlink = false;
-
-    void undo(EditData*) override;
-    void redo(EditData*) override;
-
-public:
-    FretLinkHarmony(FretDiagram*, Harmony*, bool unlink = false);
-
-    UNDO_TYPE(CommandType::FretLinkHarmony)
-    UNDO_NAME("FretLinkHarmony")
-    UNDO_CHANGED_OBJECTS({ m_fretDiagram })
-};
-
 class RemoveFretDiagramFromFretBox : public UndoCommand
 {
     OBJECT_ALLOCATOR(engraving, RemoveFretDiagramFromFretBox)

src/engraving/types/types.h

@@ -128,8 +128,8 @@ enum class ElementType : unsigned char {
     REHEARSAL_MARK,
     INSTRUMENT_CHANGE,
     STAFFTYPE_CHANGE,
-    HARMONY,
     FRET_DIAGRAM,
+    HARMONY,
     HARP_DIAGRAM,
     BEND,
     TREMOLOBAR,

src/inspector/models/notation/frames/fretframe/fretframechordssettingsmodel.cpp

@@ -55,12 +55,15 @@ void FretFrameChordsSettingsModel::requestElements()
 
     m_chordListModel->setFBox(fretBox());
     m_chordListModel->load();
+
+    updateHasInvisibleChords();
 }
 
 void FretFrameChordsSettingsModel::loadProperties()
 {
     loadProperties({ Pid::FRET_FRAME_DIAGRAMS_ORDER });
     m_chordListModel->load();
+    updateHasInvisibleChords();
 }
 
 void FretFrameChordsSettingsModel::resetProperties()
@@ -81,6 +84,7 @@ void FretFrameChordsSettingsModel::onNotationChanged(const engraving::PropertyId
                                                      const engraving::StyleIdSet&)
 {
     loadProperties(changedPropertyIdSet);
+    updateHasInvisibleChords();
 }
 
 void FretFrameChordsSettingsModel::loadProperties(const engraving::PropertyIdSet& propertyIdSet)
@@ -90,6 +94,26 @@ void FretFrameChordsSettingsModel::loadProperties(const engraving::PropertyIdSet
     }
 }
 
+void FretFrameChordsSettingsModel::updateHasInvisibleChords()
+{
+    bool hasInvisibleChords = false;
+
+    const FBox* fbox = fretBox();
+    if (fbox) {
+        for (EngravingItem* item : fbox->el()) {
+            if (!item->visible()) {
+                hasInvisibleChords = true;
+                break;
+            }
+        }
+    }
+
+    if (hasInvisibleChords != m_hasInvisibleChords) {
+        m_hasInvisibleChords = hasInvisibleChords;
+        emit hasInvisibleChordsChanged(m_hasInvisibleChords);
+    }
+}
+
 FretFrameChordListModel* FretFrameChordsSettingsModel::chordListModel() const
 {
     return m_chordListModel.get();
@@ -99,3 +123,27 @@ PropertyItem* FretFrameChordsSettingsModel::listOrder() const
 {
     return m_listOrder;
 }
+
+bool FretFrameChordsSettingsModel::hasInvisibleChords() const
+{
+    return m_hasInvisibleChords;
+}
+
+void FretFrameChordsSettingsModel::resetList()
+{
+    beginCommand(TranslatableString("undoableAction", "Reset Fret Diagram Legend chords list"));
+
+    FBox* fbox = fretBox();
+    if (fbox) {
+        fbox->undoResetProperty(Pid::FRET_FRAME_DIAGRAMS_ORDER);
+
+        for (EngravingItem* item : fbox->el()) {
+            item->undoResetProperty(Pid::VISIBLE);
+        }
+    }
+
+    updateNotation();
+    endCommand();
+
+    loadProperties();
+}

src/inspector/models/notation/frames/fretframe/fretframechordssettingsmodel.h

@@ -43,6 +43,8 @@ class FretFrameChordsSettingsModel : public AbstractInspectorModel, public muse:
 
     Q_PROPERTY(PropertyItem * listOrder READ listOrder CONSTANT)
 
+    Q_PROPERTY(bool hasInvisibleChords READ hasInvisibleChords NOTIFY hasInvisibleChordsChanged)
+
     muse::Inject<context::IGlobalContext> globalContext = { this };
 
 public:
@@ -51,6 +53,12 @@ class FretFrameChordsSettingsModel : public AbstractInspectorModel, public muse:
     FretFrameChordListModel* chordListModel() const;
 
     PropertyItem* listOrder() const;
+    bool hasInvisibleChords() const;
+
+    Q_INVOKABLE void resetList();
+
+signals:
+    void hasInvisibleChordsChanged(bool hasInvisible);
 
 private:
     engraving::FBox* fretBox() const;
@@ -64,8 +72,11 @@ class FretFrameChordsSettingsModel : public AbstractInspectorModel, public muse:
 
     void loadProperties(const mu::engraving::PropertyIdSet& propertyIdSet);
 
+    void updateHasInvisibleChords();
+
     std::shared_ptr<FretFrameChordListModel> m_chordListModel;
 
     PropertyItem* m_listOrder = nullptr;
+    bool m_hasInvisibleChords = false;
 };
 }

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/FretFrameChordsControlPanel.qml

@@ -40,13 +40,15 @@ RowLayout {
 
     property bool isMovingUpAvailable: false
     property bool isMovingDownAvailable: false
+    property bool hasInvisibleChords: false
 
     height: childrenRect.height
 
     spacing: 6
 
     signal moveSelectionUpRequested()
     signal moveSelectionDownRequested()
+    signal resetListRequested();
 
     FlatButton {
         id: upBotton
@@ -92,10 +94,10 @@ RowLayout {
         navigation.row: downButton.navigation.row + 1
         navigation.accessible.name: qsTrc("inspector", "Reset chord list")
 
-        enabled: root.listOrderItem.isModified
+        enabled: root.listOrderItem.isModified || root.hasInvisibleChords
 
         onClicked: {
-            root.listOrderItem.resetToDefault()
+            root.resetListRequested()
         }
     }
 }

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/FretFrameChordsTab.qml

@@ -55,6 +55,7 @@ FocusableItem {
             anchors.rightMargin: root.sideMargin
 
             listOrderItem: root.model ? root.model.listOrder : null
+            hasInvisibleChords: root.model ? root.model.hasInvisibleChords : null
 
             isMovingUpAvailable: view.model ? view.model.isMovingUpAvailable : false
             isMovingDownAvailable: view.model ? view.model.isMovingDownAvailable : false
@@ -73,6 +74,10 @@ FocusableItem {
                 view.model.moveSelectionDown()
                 Qt.callLater(view.positionViewAtSelectedItems)
             }
+
+            onResetListRequested: {
+                root.model.resetList()
+            }
         }
 
         FretFrameChordsView {