Merge pull request #8821 from RomanPudashkin/instruments_panel_restoring_state

Eism · dylan.nicholson · commit 5c720653de1b · 2021-08-10T17:10:46.000+10:00
[MU4] Various fixes for the instruments panel
diff --git a/src/engraving/libmscore/excerpt.cpp b/src/engraving/libmscore/excerpt.cpp
@@ -437,7 +437,7 @@ void MasterScore::deleteExcerpt(Excerpt* excerpt)
     undo(new RemoveExcerpt(excerpt));
 }
 
-void MasterScore::initExcerpt(Excerpt* excerpt, bool fakeUndo)
+void MasterScore::initAndAddExcerpt(Excerpt* excerpt, bool fakeUndo)
 {
     Score* score = new Score(masterScore());
     excerpt->setPartScore(score);
@@ -1371,7 +1371,6 @@ QList<Excerpt*> Excerpt::createExcerptsFromParts(const QList<Part*>& parts)
 
     for (Part* part : parts) {
         Excerpt* excerpt = new Excerpt(part->masterScore());
-
         excerpt->parts().append(part);
 
         for (int i = part->startTrack(), j = 0; i < part->endTrack(); ++i, ++j) {
diff --git a/src/engraving/libmscore/masterscore.h b/src/engraving/libmscore/masterscore.h
@@ -168,7 +168,7 @@ class MasterScore : public Score
     void addExcerpt(Excerpt*, int index=-1);
     void removeExcerpt(Excerpt*);
     void deleteExcerpt(Excerpt*);
-    void initExcerpt(Excerpt*, bool);
+    void initAndAddExcerpt(Excerpt*, bool);
 
     void setPlaybackScore(Score*);
     Score* playbackScore() { return _playbackScore; }
diff --git a/src/engraving/libmscore/score.cpp b/src/engraving/libmscore/score.cpp
@@ -441,7 +441,7 @@ Score* Score::clone()
         }
     }
 
-    masterScore()->initExcerpt(excerpt, true);
+    masterScore()->initAndAddExcerpt(excerpt, true);
     masterScore()->removeExcerpt(excerpt);
 
     return excerpt->partScore();
diff --git a/src/engraving/tests/tst_spanners.cpp b/src/engraving/tests/tst_spanners.cpp
@@ -310,7 +310,7 @@ void TestSpanners::spanners05()
     parts.append(score->parts().at(0));
 
     Excerpt* ex = new Excerpt(score);
-    score->initExcerpt(ex, false);
+    score->initAndAddExcerpt(ex, false);
     ex->setTitle(parts.front()->longName());
     ex->setParts(parts);
 
@@ -621,7 +621,7 @@ void TestSpanners::spanners14()
     parts.append(score->parts().at(0));
 
     Excerpt* ex = new Excerpt(score);
-    score->initExcerpt(ex, false);
+    score->initAndAddExcerpt(ex, false);
 
     ex->setTitle(parts.front()->longName());
     ex->setParts(parts);
diff --git a/src/framework/global/id.h b/src/framework/global/id.h
@@ -70,6 +70,11 @@ inline bool containsId(const IDList& list, const ID& id)
 {
     return std::find(list.cbegin(), list.cend(), id) != list.cend();
 }
+
+inline uint qHash(const ID& id)
+{
+    return ::qHash(id.toUint64());
+}
 }
 
 #endif // MU_FRAMEWORK_ID_H
diff --git a/src/instrumentsscene/view/abstractinstrumentspaneltreeitem.cpp b/src/instrumentsscene/view/abstractinstrumentspaneltreeitem.cpp
@@ -100,11 +100,6 @@ void AbstractInstrumentsPanelTreeItem::setParentItem(AbstractInstrumentsPanelTre
     m_parent = parent;
 }
 
-QList<AbstractInstrumentsPanelTreeItem*> AbstractInstrumentsPanelTreeItem::childrenItems() const
-{
-    return m_children;
-}
-
 bool AbstractInstrumentsPanelTreeItem::isEmpty() const
 {
     return m_children.isEmpty();
@@ -130,6 +125,15 @@ AbstractInstrumentsPanelTreeItem* AbstractInstrumentsPanelTreeItem::childAtRow(c
     return m_children.at(row);
 }
 
+int AbstractInstrumentsPanelTreeItem::indexOf(const AbstractInstrumentsPanelTreeItem* item) const
+{
+    IF_ASSERT_FAILED(item) {
+        return -1;
+    }
+
+    return m_children.indexOf(const_cast<AbstractInstrumentsPanelTreeItem*>(item));
+}
+
 void AbstractInstrumentsPanelTreeItem::appendChild(AbstractInstrumentsPanelTreeItem* child)
 {
     if (!child) {
@@ -211,7 +215,7 @@ int AbstractInstrumentsPanelTreeItem::row() const
         return 0;
     }
 
-    return parentItem()->childrenItems().indexOf(const_cast<AbstractInstrumentsPanelTreeItem*>(this));
+    return parentItem()->indexOf(this);
 }
 
 void AbstractInstrumentsPanelTreeItem::setType(InstrumentsTreeItemType::ItemType type)
diff --git a/src/instrumentsscene/view/abstractinstrumentspaneltreeitem.h b/src/instrumentsscene/view/abstractinstrumentspaneltreeitem.h
@@ -64,11 +64,11 @@ class AbstractInstrumentsPanelTreeItem : public QObject
     AbstractInstrumentsPanelTreeItem* parentItem() const;
     void setParentItem(AbstractInstrumentsPanelTreeItem* parent);
 
-    QList<AbstractInstrumentsPanelTreeItem*> childrenItems() const;
     bool isEmpty() const;
 
     AbstractInstrumentsPanelTreeItem* childAtId(const ID& id) const;
     AbstractInstrumentsPanelTreeItem* childAtRow(const int row) const;
+    int indexOf(const AbstractInstrumentsPanelTreeItem* item) const;
 
     void appendChild(AbstractInstrumentsPanelTreeItem* child);
     void insertChild(AbstractInstrumentsPanelTreeItem* child, const int beforeRow);
diff --git a/src/instrumentsscene/view/instrumentspaneltreemodel.cpp b/src/instrumentsscene/view/instrumentspaneltreemodel.cpp
@@ -136,6 +136,31 @@ void InstrumentsPanelTreeModel::setupStavesConnections(const ID& stavesPartId)
     });
 }
 
+void InstrumentsPanelTreeModel::listenSelectionChanged()
+{
+    m_notation->interaction()->selectionChanged().onNotify(this, [this]() {
+        std::vector<Element*> selectedElements = m_notation->interaction()->selection()->elements();
+
+        if (selectedElements.empty()) {
+            m_selectionModel->clear();
+            return;
+        }
+
+        QSet<ID> selectedPartIdSet;
+        for (const Element* element : selectedElements) {
+            selectedPartIdSet << element->part()->id();
+        }
+
+        for (const ID& selectedPartId : selectedPartIdSet) {
+            AbstractInstrumentsPanelTreeItem* item = m_rootItem->childAtId(selectedPartId);
+
+            if (item) {
+                m_selectionModel->select(createIndex(item->row(), 0, item));
+            }
+        }
+    });
+}
+
 void InstrumentsPanelTreeModel::clear()
 {
     beginResetModel();
@@ -174,6 +199,7 @@ void InstrumentsPanelTreeModel::load()
     endResetModel();
 
     setupPartsConnections();
+    listenSelectionChanged();
 
     emit isEmptyChanged();
     emit isAddingAvailableChanged(true);
diff --git a/src/instrumentsscene/view/instrumentspaneltreemodel.h b/src/instrumentsscene/view/instrumentspaneltreemodel.h
@@ -110,6 +110,7 @@ private slots:
 
     void setupPartsConnections();
     void setupStavesConnections(const ID& stavesPartId);
+    void listenSelectionChanged();
 
     void clear();
     void deleteItems();
diff --git a/src/notation/iexcerptnotation.h b/src/notation/iexcerptnotation.h
@@ -32,11 +32,12 @@ using IExcerptNotationPtr = std::shared_ptr<IExcerptNotation>;
 class IExcerptNotation
 {
 public:
+    virtual ~IExcerptNotation() = default;
 
     virtual bool isInited() const = 0;
 
-    virtual void setTitle(const QString& title) = 0;
     virtual QString title() const = 0;
+    virtual void setTitle(const QString& title) = 0;
 
     virtual INotationPtr notation() = 0;
     virtual IExcerptNotationPtr clone() const = 0;
diff --git a/src/notation/internal/excerptnotation.cpp b/src/notation/internal/excerptnotation.cpp
@@ -48,52 +48,49 @@ ExcerptNotation::~ExcerptNotation()
     setScore(nullptr);
 }
 
-void ExcerptNotation::setTitle(const QString& title)
+bool ExcerptNotation::isInited() const
 {
-    if (m_excerpt) {
-        m_excerpt->setTitle(title);
-    }
+    return m_isInited;
 }
 
-QString ExcerptNotation::title() const
+void ExcerptNotation::init()
 {
-    return m_excerpt ? m_excerpt->title() : QString();
-}
+    if (m_isInited) {
+        return;
+    }
 
-INotationPtr ExcerptNotation::notation()
-{
-    return shared_from_this();
+    setScore(m_excerpt->partScore());
+    m_isInited = true;
 }
 
 Ms::Excerpt* ExcerptNotation::excerpt() const
 {
     return m_excerpt;
 }
 
-void ExcerptNotation::setExcerpt(Ms::Excerpt* excerpt)
+QString ExcerptNotation::title() const
 {
-    m_excerpt = excerpt;
+    return m_excerpt ? m_excerpt->title() : QString();
 }
 
-void ExcerptNotation::init()
+void ExcerptNotation::setTitle(const QString& title)
 {
-    if (!m_excerpt) {
-        return;
+    if (m_excerpt) {
+        m_excerpt->setTitle(title);
     }
-
-    m_excerpt->oscore()->initExcerpt(m_excerpt, false);
-    setScore(m_excerpt->partScore());
-
-    m_isInited = true;
 }
 
-bool ExcerptNotation::isInited() const
+INotationPtr ExcerptNotation::notation()
 {
-    return m_isInited;
+    return shared_from_this();
 }
 
 IExcerptNotationPtr ExcerptNotation::clone() const
 {
+    if (!m_excerpt) {
+        return nullptr;
+    }
+
     Ms::Excerpt* copy = new Ms::Excerpt(*m_excerpt);
     return std::make_shared<ExcerptNotation>(copy);
 }
diff --git a/src/notation/internal/excerptnotation.h b/src/notation/internal/excerptnotation.h
@@ -42,17 +42,15 @@ class ExcerptNotation : public IExcerptNotation, public Notation, public std::en
     bool isInited() const override;
     void init();
 
-    void setTitle(const QString& title) override;
+    Ms::Excerpt* excerpt() const;
+
     QString title() const override;
+    void setTitle(const QString& title) override;
 
     INotationPtr notation() override;
     IExcerptNotationPtr clone() const override;
 
-    Ms::Excerpt* excerpt() const;
-    void setExcerpt(Ms::Excerpt* excerpt);
-
 private:
-
     Ms::Excerpt* m_excerpt = nullptr;
     bool m_isInited = false;
 };
diff --git a/src/notation/internal/masternotation.cpp b/src/notation/internal/masternotation.cpp
@@ -79,7 +79,7 @@ void MasterNotation::setMasterScore(Ms::MasterScore* score)
 
     setScore(score);
 
-    initExcerpts(masterScore()->excerpts());
+    initExcerptNotations(masterScore()->excerpts());
 }
 
 Ms::MasterScore* MasterNotation::masterScore() const
@@ -392,7 +392,8 @@ mu::Ret MasterNotation::setupNewScore(Ms::MasterScore* score, Ms::MasterScore* t
     }
 
     setScore(score);
-    initExcerpts(excerpts);
+    initExcerptNotations(excerpts);
+    addExcerptsToMasterScore(excerpts);
 
     score->setExcerptsChanged(true);
 
@@ -425,6 +426,10 @@ mu::ValNt<bool> MasterNotation::needSave() const
 
 void MasterNotation::addExcerpts(const ExcerptNotationList& excerpts)
 {
+    if (excerpts.empty()) {
+        return;
+    }
+
     undoStack()->prepareChanges();
 
     ExcerptNotationList result = m_excerpts.val;
@@ -435,11 +440,12 @@ void MasterNotation::addExcerpts(const ExcerptNotationList& excerpts)
         }
 
         ExcerptNotation* excerptNotationImpl = get_impl(excerptNotation);
-        if (!excerptNotationImpl->excerpt()) {
-            excerptNotationImpl->setExcerpt(new Ms::Excerpt(masterScore()));
+
+        if (!excerptNotationImpl->isInited()) {
+            masterScore()->initAndAddExcerpt(excerptNotationImpl->excerpt(), false);
+            excerptNotationImpl->init();
         }
 
-        excerptNotationImpl->init();
         result.push_back(excerptNotation);
     }
 
@@ -450,6 +456,10 @@ void MasterNotation::addExcerpts(const ExcerptNotationList& excerpts)
 
 void MasterNotation::removeExcerpts(const ExcerptNotationList& excerpts)
 {
+    if (excerpts.empty()) {
+        return;
+    }
+
     undoStack()->prepareChanges();
 
     for (IExcerptNotationPtr excerptNotation : excerpts) {
@@ -491,14 +501,16 @@ INotationPartsPtr MasterNotation::parts() const
 
 ExcerptNotationList MasterNotation::potentialExcerpts() const
 {
-    auto excerptExists = [this](const Ms::InstrumentList* content) {
+    auto excerptExists = [this](const ID& partId) {
         for (const Ms::Excerpt* excerpt : masterScore()->excerpts()) {
-            for (const Part* part : excerpt->parts()) {
-                const Ms::InstrumentList* partInstruments = part->instruments();
+            const QList<Part*>& excerptParts = excerpt->parts();
 
-                if (partInstruments && (*partInstruments == *content)) {
-                    return true;
-                }
+            if (excerptParts.size() != 1) {
+                continue;
+            }
+
+            if (ID(excerptParts.first()->id()) == partId) {
+                return true;
             }
         }
 
@@ -507,9 +519,7 @@ ExcerptNotationList MasterNotation::potentialExcerpts() const
 
     QList<Part*> parts;
     for (Part* part : score()->parts()) {
-        const Ms::InstrumentList* content = part->instruments();
-
-        if (content && !excerptExists(content)) {
+        if (!excerptExists(part->id())) {
             parts << part;
         }
     }
@@ -532,18 +542,24 @@ void MasterNotation::onSaveCopy()
     undoStack()->stackChanged().notify();
 }
 
-void MasterNotation::initExcerpts(const QList<Ms::Excerpt*>& excerpts)
+void MasterNotation::initExcerptNotations(const QList<Ms::Excerpt*>& excerpts)
 {
     ExcerptNotationList notationExcerpts;
 
     for (Ms::Excerpt* excerpt : excerpts) {
-        IExcerptNotationPtr excerptNotation = std::make_shared<ExcerptNotation>(excerpt);
-
-        get_impl(excerptNotation)->init();
+        auto excerptNotation = std::make_shared<ExcerptNotation>(excerpt);
+        excerptNotation->init();
         excerptNotation->notation()->setOpened(true);
 
         notationExcerpts.push_back(excerptNotation);
     }
 
     doSetExcerpts(notationExcerpts);
 }
+
+void MasterNotation::addExcerptsToMasterScore(const QList<Ms::Excerpt*>& excerpts)
+{
+    for (Ms::Excerpt* excerpt : excerpts) {
+        masterScore()->initAndAddExcerpt(excerpt, false);
+    }
+}
diff --git a/src/notation/internal/masternotation.h b/src/notation/internal/masternotation.h
@@ -72,7 +72,8 @@ class MasterNotation : public IMasterNotation, public Notation, public std::enab
 
     Ms::MasterScore* masterScore() const;
 
-    void initExcerpts(const QList<Ms::Excerpt*>& excerpts);
+    void initExcerptNotations(const QList<Ms::Excerpt*>& excerpts);
+    void addExcerptsToMasterScore(const QList<Ms::Excerpt*>& excerpts);
 
     void doSetExcerpts(ExcerptNotationList excerpts);
 
diff --git a/src/notation/internal/notationparts.cpp b/src/notation/internal/notationparts.cpp
diff --git a/src/notation/internal/notationparts.h b/src/notation/internal/notationparts.h
diff --git a/src/project/internal/projectfilescontroller.cpp b/src/project/internal/projectfilescontroller.cpp

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ void MasterScore::deleteExcerpt(Excerpt* excerpt)`
`437`	`437`	`undo(new RemoveExcerpt(excerpt));`
`438`	`438`	`}`
`439`	`439`
`440`		`-void MasterScore::initExcerpt(Excerpt* excerpt, bool fakeUndo)`
	`440`	`+void MasterScore::initAndAddExcerpt(Excerpt* excerpt, bool fakeUndo)`
`441`	`441`	`{`
`442`	`442`	`Score* score = new Score(masterScore());`
`443`	`443`	`excerpt->setPartScore(score);`
`@@ -1371,7 +1371,6 @@ QList<Excerpt> Excerpt::createExcerptsFromParts(const QList<Part>& parts)`
`1371`	`1371`
`1372`	`1372`	`for (Part* part : parts) {`
`1373`	`1373`	`Excerpt* excerpt = new Excerpt(part->masterScore());`
`1374`		`-`
`1375`	`1374`	`excerpt->parts().append(part);`
`1376`	`1375`
`1377`	`1376`	`for (int i = part->startTrack(), j = 0; i < part->endTrack(); ++i, ++j) {`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ Score* Score::clone()`
`441`	`441`	`}`
`442`	`442`	`}`
`443`	`443`
`444`		`- masterScore()->initExcerpt(excerpt, true);`
	`444`	`+ masterScore()->initAndAddExcerpt(excerpt, true);`
`445`	`445`	`masterScore()->removeExcerpt(excerpt);`
`446`	`446`
`447`	`447`	`return excerpt->partScore();`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,11 @@ inline bool containsId(const IDList& list, const ID& id)`
`70`	`70`	`{`
`71`	`71`	`return std::find(list.cbegin(), list.cend(), id) != list.cend();`
`72`	`72`	`}`
	`73`	`+`
	`74`	`+inline uint qHash(const ID& id)`
	`75`	`+{`
	`76`	`+ return ::qHash(id.toUint64());`
	`77`	`+}`
`73`	`78`	`}`
`74`	`79`
`75`	`80`	`#endif // MU_FRAMEWORK_ID_H`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,6 @@ void AbstractInstrumentsPanelTreeItem::setParentItem(AbstractInstrumentsPanelTre`
`100`	`100`	`m_parent = parent;`
`101`	`101`	`}`
`102`	`102`
`103`		`-QList<AbstractInstrumentsPanelTreeItem*> AbstractInstrumentsPanelTreeItem::childrenItems() const`
`104`		`-{`
`105`		`- return m_children;`
`106`		`-}`
`107`		`-`
`108`	`103`	`bool AbstractInstrumentsPanelTreeItem::isEmpty() const`
`109`	`104`	`{`
`110`	`105`	`return m_children.isEmpty();`
`@@ -130,6 +125,15 @@ AbstractInstrumentsPanelTreeItem* AbstractInstrumentsPanelTreeItem::childAtRow(c`
`130`	`125`	`return m_children.at(row);`
`131`	`126`	`}`
`132`	`127`
	`128`	`+int AbstractInstrumentsPanelTreeItem::indexOf(const AbstractInstrumentsPanelTreeItem* item) const`
	`129`	`+{`
	`130`	`+ IF_ASSERT_FAILED(item) {`
	`131`	`+ return -1;`
	`132`	`+ }`
	`133`	`+`
	`134`	`+ return m_children.indexOf(const_cast<AbstractInstrumentsPanelTreeItem*>(item));`
	`135`	`+}`
	`136`	`+`
`133`	`137`	`void AbstractInstrumentsPanelTreeItem::appendChild(AbstractInstrumentsPanelTreeItem* child)`
`134`	`138`	`{`
`135`	`139`	`if (!child) {`
`@@ -211,7 +215,7 @@ int AbstractInstrumentsPanelTreeItem::row() const`
`211`	`215`	`return 0;`
`212`	`216`	`}`
`213`	`217`
`214`		`- return parentItem()->childrenItems().indexOf(const_cast<AbstractInstrumentsPanelTreeItem*>(this));`
	`218`	`+ return parentItem()->indexOf(this);`
`215`	`219`	`}`
`216`	`220`
`217`	`221`	`void AbstractInstrumentsPanelTreeItem::setType(InstrumentsTreeItemType::ItemType type)`