Always use Harmony::plainText to refer to diagrams

Especially for ordering from Layout panel, because the title may contain special characters

Author: mike-spa

src/engraving/dom/box.cpp

@@ -769,7 +769,7 @@ void FBox::init()
 
     StringList currentDiagrams;
     for (EngravingItem* item : el()) {
-        currentDiagrams.push_back(toFretDiagram(item)->harmony()->harmonyName().toLower());
+        currentDiagrams.push_back(toFretDiagram(item)->harmonyText().toLower());
     }
 
     if (!m_invisibleDiagrams.empty()) {
@@ -950,13 +950,16 @@ ElementList FBox::orderedElements(bool includeInvisible) const
 {
     ElementList elements = el();
     const StringList& diagramsOrder = this->diagramsOrder();
+    if (diagramsOrder.empty()) {
+        return elements;
+    }
 
     std::sort(elements.begin(), elements.end(), [&diagramsOrder](const EngravingItem* a, const EngravingItem* b) {
         const FretDiagram* diagramA = toFretDiagram(a);
-        const String diagramAHarmonyName = diagramA->harmony()->harmonyName().toLower();
+        const String diagramAHarmonyName = diagramA->harmonyText().toLower();
 
         const FretDiagram* diagramB = toFretDiagram(b);
-        const String diagramBHarmonyName = diagramB->harmony()->harmonyName().toLower();
+        const String diagramBHarmonyName = diagramB->harmonyText().toLower();
 
         auto itA = std::find(diagramsOrder.begin(), diagramsOrder.end(), diagramAHarmonyName);
         auto itB = std::find(diagramsOrder.begin(), diagramsOrder.end(), diagramBHarmonyName);
@@ -969,7 +972,7 @@ ElementList FBox::orderedElements(bool includeInvisible) const
 
         muse::remove_if(elements, [&invisibleDiagrams](const EngravingItem* element){
             const FretDiagram* diagram = toFretDiagram(element);
-            const String diagramHarmonyName = diagram->harmony()->harmonyName().toLower();
+            const String diagramHarmonyName = diagram->harmonyText().toLower();
             return muse::contains(invisibleDiagrams, diagramHarmonyName);
         });
     }

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

@@ -43,6 +43,16 @@ void FretFrameChordItem::setTitle(const QString& title)
     emit titleChanged();
 }
 
+QString FretFrameChordItem::plainText() const
+{
+    return m_plainText;
+}
+
+void FretFrameChordItem::setPlainText(const QString& plainText)
+{
+    m_plainText = plainText;
+}
+
 bool FretFrameChordItem::isVisible() const
 {
     return m_isVisible;

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

@@ -38,6 +38,9 @@ class FretFrameChordItem : public muse::uicomponents::SelectableItemListModel::I
     QString title() const;
     void setTitle(const QString& title);
 
+    QString plainText() const; // same as title but without special characters
+    void setPlainText(const QString& plainText);
+
     bool isVisible() const;
     void setIsVisible(bool visible);
 
@@ -49,6 +52,7 @@ class FretFrameChordItem : public muse::uicomponents::SelectableItemListModel::I
 private:
     QString m_id;
     QString m_title;
+    QString m_plainText;
     bool m_isVisible = false;
 };
 }

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

@@ -63,6 +63,7 @@ void FretFrameChordListModel::load()
         FretDiagram* diagram = toFretDiagram(element);
         auto chordItem = new FretFrameChordItem(this);
         chordItem->setTitle(harmonyName(diagram->harmony()));
+        chordItem->setPlainText(diagram->harmonyText());
 
         chordItem->setIsVisible(!muse::contains(invisibleDiagrams, diagram->harmony()->harmonyName().toLower()));
 
@@ -201,7 +202,7 @@ void FretFrameChordListModel::saveOrder()
 
     for (const Item* item: items()) {
         const FretFrameChordItem* chordItem = dynamic_cast<const FretFrameChordItem*>(item);
-        newOrder.push_back(String::fromQString(chordItem->title()));
+        newOrder.push_back(String::fromQString(chordItem->plainText()));
     }
 
     m_fretBox->undoReorderElements(newOrder);