refactor & reformat LinkManager

GUI/Views/ImportDataWidgets/LinkInstrumentManager.cpp

@@ -22,17 +22,33 @@
 #include <QMessageBox>
 #include <QPushButton>
 
+using namespace GUI::View;
+
 namespace {
-bool QuestionOnInstrumentReshaping(const QString& message);
+bool QuestionOnInstrumentReshaping(const QString& message)
+{
+    QMessageBox msgBox;
+    msgBox.setText("Instrument description conflicts with the experimental data.");
+
+    QString informative;
+    informative.append(message);
+    informative.append("\n\nDo you want to adjust the instrument to the experimental data?\n\n");
+    msgBox.setInformativeText(informative);
+
+    QPushButton* modifyInstrumentButton =
+        msgBox.addButton("Yes, please modify instrument", QMessageBox::YesRole);
+    msgBox.addButton("No, leave as it is", QMessageBox::NoRole);
+
+    msgBox.exec();
+
+    return msgBox.clickedButton() == modifyInstrumentButton;
+}
 } // namespace
 
 LinkInstrumentManager::LinkInstrumentManager(InstrumentModel* instrumentModel,
                                              RealDataModel* realDataModel)
     : m_instrumentModel(instrumentModel), m_realDataModel(realDataModel)
 {
-    ASSERT(m_instrumentModel != nullptr);
-    ASSERT(m_realDataModel != nullptr);
-
     connect(m_instrumentModel, &InstrumentModel::instrumentAddedOrRemoved, this,
             &LinkInstrumentManager::onInstrumentAddedOrRemoved);
 
@@ -40,9 +56,6 @@ LinkInstrumentManager::LinkInstrumentManager(InstrumentModel* instrumentModel,
             &LinkInstrumentManager::onInstrumentChanged);
 }
 
-//! Returns true if RealDataItem can be linked to the instrument (same number of bins).
-//! Also offers dialog to adjust instrument to match shape of real data.
-
 bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realDataItem,
                                                     const QString& identifier,
                                                     bool quiet /*= false*/)
@@ -53,9 +66,7 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realData
     if (!instrumentItem)
         return true;
 
-    const bool isCompatible =
-        GUI::View::ImportDataUtils::Compatible(*instrumentItem, *realDataItem);
-    if (!isCompatible) {
+    if (!ImportDataUtils::Compatible(*instrumentItem, *realDataItem)) {
         if (!quiet)
             QMessageBox::warning(baWin, "Can't link to instrument",
                                  "Can't link, data is incompatible with the instrument.");
@@ -74,8 +85,7 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realData
     QString message =
         realDataItem->holdsDimensionalData()
             ? "Experimental data carries information on the range/points of measurement."
-            : GUI::View::ImportDataUtils::printShapeMessage(instrumentItem->shape(),
-                                                            realDataItem->shape());
+            : ImportDataUtils::printShapeMessage(instrumentItem->shape(), realDataItem->shape());
     if (!QuestionOnInstrumentReshaping(message))
         return false;
 
@@ -85,61 +95,21 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realData
 
 void LinkInstrumentManager::onInstrumentChanged(const InstrumentItem* instrument)
 {
-    ASSERT(instrument != nullptr);
-
     // Run through all RealDataItem and refresh linking to match possible change in detector
     // axes definition.
-    for (auto realDataItem : linkedRealDataItems(instrument))
-        if (!instrument->alignedWith(realDataItem))
-            realDataItem->clearInstrumentId();
-        else
-            realDataItem->updateToInstrument(instrument);
+    for (auto realDataItem : m_realDataModel->realDataItems())
+        if (realDataItem->instrumentId() == instrument->id()) {
+            if (!instrument->alignedWith(realDataItem))
+                realDataItem->clearInstrumentId();
+            else
+                realDataItem->updateToInstrument(instrument);
+        }
 }
 
 void LinkInstrumentManager::onInstrumentAddedOrRemoved()
 {
     // remove links in realDataItems (in case of a linked instrument was removed)
-    for (auto realDataItem : m_realDataModel->realDataItems()) {
+    for (auto realDataItem : m_realDataModel->realDataItems())
         if (!m_instrumentModel->instrumentExists(realDataItem->instrumentId()))
             realDataItem->clearInstrumentId();
-    }
-}
-
-//! Returns list of RealDataItem's linked to given instrument.
-
-QList<RealDataItem*>
-LinkInstrumentManager::linkedRealDataItems(const InstrumentItem* instrumentItem)
-{
-    ASSERT(instrumentItem != nullptr);
-
-    QList<RealDataItem*> result;
-    for (auto realDataItem : m_realDataModel->realDataItems()) {
-        const QString linkedIdentifier = realDataItem->instrumentId();
-        const QString instrumentIdentifier = instrumentItem->id();
-
-        if (linkedIdentifier == instrumentIdentifier)
-            result.append(realDataItem);
-    }
-    return result;
-}
-
-namespace {
-bool QuestionOnInstrumentReshaping(const QString& message)
-{
-    QMessageBox msgBox;
-    msgBox.setText("Instrument description conflicts with the experimental data.");
-
-    QString informative;
-    informative.append(message);
-    informative.append("\n\nDo you want to adjust the instrument to the experimental data?\n\n");
-    msgBox.setInformativeText(informative);
-
-    QPushButton* modifyInstrumentButton =
-        msgBox.addButton("Yes, please modify instrument", QMessageBox::YesRole);
-    msgBox.addButton("No, leave as it is", QMessageBox::NoRole);
-
-    msgBox.exec();
-
-    return msgBox.clickedButton() == modifyInstrumentButton;
 }
-} // namespace

GUI/Views/ImportDataWidgets/LinkInstrumentManager.h

@@ -24,7 +24,6 @@
 
 class InstrumentModel;
 class RealDataModel;
-class SessionItem;
 class InstrumentItem;
 class RealDataItem;
 
@@ -36,17 +35,17 @@ class LinkInstrumentManager : public QObject {
     Q_OBJECT
 
 public:
-    explicit LinkInstrumentManager(InstrumentModel* instrumentModel, RealDataModel* realDataModel);
+    LinkInstrumentManager(InstrumentModel* instrumentModel, RealDataModel* realDataModel);
 
+    //! Returns true if RealDataItem can be linked to the instrument (same number of bins).
+    //! Also offers dialog to adjust instrument to match shape of real data.
     //! quiet defines whether a "not possible" message box is shown if link is not possible. Use
     //! this e.g. for unit tests. The question for adjusting the instrument is not suppressed by
     //! this flag.
     bool canLinkDataToInstrument(const RealDataItem* realDataItem, const QString& identifier,
                                  bool quiet = false);
 
-    QList<RealDataItem*> linkedRealDataItems(const InstrumentItem* instrumentItem);
-
-private slots:
+private:
     void onInstrumentChanged(const InstrumentItem* instrument);
     void onInstrumentAddedOrRemoved();