More elegant implementation of the change communication regarding instrument view

GUI/Views/InstrumentWidgets/InstrumentEditor.cpp

@@ -131,8 +131,6 @@ void InstrumentEditor::setItem(InstrumentItem* item)
 
 void InstrumentEditor::onInstrumentNameChanged()
 {
-    if (m_item) {
+    if (m_item)
         m_item->setItemName(m_nameLineEdit->text());
-        emit instrumentNameChanged();
-    }
 }

GUI/Views/InstrumentWidgets/InstrumentEditor.h

@@ -40,9 +40,6 @@ public:
 
     void setItem(InstrumentItem* instrument);
 
-signals:
-    void instrumentNameChanged();
-
 private slots:
     void onInstrumentNameChanged();
 

GUI/Views/InstrumentWidgets/InstrumentListModel.cpp

@@ -66,6 +66,15 @@ InstrumentListModel::InstrumentListModel(InstrumentModel* instruments, QObject*
     m_specularIcon.addPixmap(QPixmap(":/images/specular_instrument_shaded.svg"), QIcon::Normal);
     m_depthProbeIcon.addPixmap(QPixmap(":/images/depth_instrument.svg"), QIcon::Selected);
     m_depthProbeIcon.addPixmap(QPixmap(":/images/depth_instrument_shaded.svg"), QIcon::Normal);
+
+    for (InstrumentItem* instrument : m_instruments->instrumentItems())
+        attachToInstrument(instrument);
+}
+
+InstrumentListModel::~InstrumentListModel()
+{
+    for (InstrumentItem* instrument : m_instruments->instrumentItems())
+        detachFromInstrument(instrument);
 }
 
 int InstrumentListModel::rowCount(const QModelIndex&) const
@@ -129,7 +138,9 @@ QModelIndex InstrumentListModel::addNewDepthProbeInstrument()
 void InstrumentListModel::removeInstrument(const QModelIndex& index)
 {
     beginRemoveRows(QModelIndex(), index.row(), index.row());
-    m_instruments->removeInstrument(instrumentForIndex(index));
+    InstrumentItem* instrument = instrumentForIndex(index);
+    detachFromInstrument(instrument);
+    m_instruments->removeInstrument(instrument);
     endRemoveRows();
 }
 
@@ -149,6 +160,7 @@ QModelIndex InstrumentListModel::copyInstrument(const InstrumentItem* source)
     beginInsertRows(QModelIndex(), row, row);
     InstrumentItem* copy = m_instruments->insertCopy(*source);
     copy->setItemName(copyName);
+    attachToInstrument(copy);
     endInsertRows();
 
     return m_instruments->indexOfItem(copy);
@@ -166,7 +178,31 @@ template <class Instrument> QModelIndex InstrumentListModel::addNewInstrument()
     beginInsertRows(QModelIndex(), row, row);
     Instrument* instrument = m_instruments->insertItem<Instrument>();
     instrument->setItemName(name);
+    attachToInstrument(instrument);
     endInsertRows();
 
     return m_instruments->indexOfItem(instrument);
 }
+
+void InstrumentListModel::attachToInstrument(InstrumentItem* instrument)
+{
+    instrument->mapper()->setOnPropertyChange
+        (std::bind(&InstrumentListModel::notifyInstrumentPropertyChange, this, instrument,
+                   std::placeholders::_1), this);
+}
+
+void InstrumentListModel::detachFromInstrument(InstrumentItem* instrument)
+{
+    instrument->mapper()->unsubscribe(this);
+}
+
+void InstrumentListModel::notifyInstrumentPropertyChange(InstrumentItem* instrument,
+                                                         const QString& property)
+{
+    if (SessionItem::isItemNamePropertyName(property)) {
+        QVector<InstrumentItem*> instruments = m_instruments->instrumentItems();
+        int i = instruments.indexOf(instrument);
+        if (i != -1)
+            emit dataChanged(index(i,0),index(i,0));
+    }
+}

GUI/Views/InstrumentWidgets/InstrumentListModel.h

@@ -26,6 +26,7 @@ class InstrumentListModel : public QAbstractListModel {
 
 public:
     InstrumentListModel(InstrumentModel* instruments, QObject* parent = nullptr);
+    ~InstrumentListModel();
 
     virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
@@ -50,6 +51,10 @@ public:
 private:
     template <class Instrument> QModelIndex addNewInstrument();
 
+    void attachToInstrument(InstrumentItem* item);
+    void detachFromInstrument(InstrumentItem* item);
+    void notifyInstrumentPropertyChange(InstrumentItem* instrument, const QString& property);
+
 private:
     InstrumentModel* m_instruments;
 

GUI/Views/InstrumentWidgets/InstrumentListView.cpp

@@ -146,11 +146,6 @@ QList<QAction*> InstrumentListView::toolbarActions() const
             m_loadFromLibraryAction};
 }
 
-void InstrumentListView::updateSelectedInstrument()
-{
-    update();
-}
-
 void InstrumentListView::onItemSelectionChanged()
 {
     updateActions();

GUI/Views/InstrumentWidgets/InstrumentListView.h

@@ -41,9 +41,6 @@ public:
 signals:
     void instrumentSelected(InstrumentItem* instrument);
 
-public slots:
-    void updateSelectedInstrument();
-
 private slots:
     void onItemSelectionChanged();
     void onNewGisas();

GUI/Views/InstrumentWidgets/InstrumentView.cpp

@@ -44,9 +44,6 @@ InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
     connect(m_instrumentListView, &InstrumentListView::instrumentSelected, this,
             &InstrumentView::onInstrumentSelected);
 
-    connect(m_instrumentEditor, &InstrumentEditor::instrumentNameChanged, m_instrumentListView,
-            &InstrumentListView::updateSelectedInstrument);
-
     onInstrumentSelected(nullptr);
 }