refactor instrument remove

GUI/Models/InstrumentModel.cpp

@@ -122,6 +122,13 @@ bool InstrumentModel::instrumentExists(const QString& instrumentId) const
     return findInstrumentById(instrumentId) != nullptr;
 }
 
+void InstrumentModel::removeInstrument(InstrumentItem* instrument)
+{
+    if (instrument != nullptr)
+        if (const auto index = indexOfItem(instrument); index.isValid())
+            removeRows(index.row(), 1, index.parent());
+}
+
 void InstrumentModel::onRowsChange(const QModelIndex& parent, int, int)
 {
     // valid parent means not an instrument (which is top level item) but something below

GUI/Models/InstrumentModel.h

@@ -42,6 +42,8 @@ public:
     InstrumentItem* findInstrumentById(const QString& instrumentId) const;
     bool instrumentExists(const QString& instrumentId) const;
 
+    void removeInstrument(InstrumentItem* instrument);
+
 signals:
     void instrumentAddedOrRemoved();
     void instrumentNameChanged(const InstrumentItem* instrument);

GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp

@@ -144,22 +144,14 @@ void InstrumentSelectorWidget::onNewDepthProbe()
 //! Removes currently selected instrument.
 void InstrumentSelectorWidget::onRemove()
 {
-    QModelIndex index = selectionModel()->selectedIndexes().front();
-
-    if (index.isValid())
-        m_model->removeRows(index.row(), 1, QModelIndex());
-
+    m_instrumentModel->removeInstrument(currentInstrumentItem());
     updateSelection();
 }
 
 //! Makes a copy of the currently selected instrument.
 void InstrumentSelectorWidget::onCopy()
 {
-    QModelIndex index = selectionModel()->selectedIndexes().front();
-    if (!index.isValid())
-        return;
-
-    const InstrumentItem* toBeCopied = dynamic_cast<InstrumentItem*>(m_model->itemForIndex(index));
+    const InstrumentItem* toBeCopied = currentInstrumentItem();
     if (toBeCopied == nullptr)
         return;
 
@@ -211,3 +203,15 @@ template <class Instrument> void InstrumentSelectorWidget::newInstrument()
     instrument->setItemName(suggestInstrumentName(instrument->defaultName()));
     selectionModel()->select(m_model->indexOfItem(instrument), QItemSelectionModel::ClearAndSelect);
 }
+
+InstrumentItem* InstrumentSelectorWidget::currentInstrumentItem()
+{
+    if (selectionModel()->selectedIndexes().isEmpty())
+        return nullptr;
+
+    QModelIndex index = selectionModel()->selectedIndexes().front();
+    if (!index.isValid())
+        return nullptr;
+
+    return dynamic_cast<InstrumentItem*>(m_model->itemForIndex(index));
+}

GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h

@@ -19,6 +19,7 @@
 
 class InstrumentModel;
 class QAction;
+class InstrumentItem;
 
 //! Instrument selector on the left side of InstrumentView.
 
@@ -47,6 +48,7 @@ private:
     QString suggestInstrumentName(const QString& currentName);
     QMap<QString, int> mapOfNames();
     template <class Instrument> void newInstrument();
+    InstrumentItem* currentInstrumentItem();
 
     InstrumentModel* m_instrumentModel;