Restore linking in Simulation tab if data & instrument fit each other

Redmine: #2235

GUI/coregui/Models/InstrumentItems.cpp

@@ -76,7 +76,7 @@ void InstrumentItem::updateToRealData(const RealDataItem *item)
     setShape(item->shape());
 }
 
-bool InstrumentItem::alignedWith(const RealDataItem* item)
+bool InstrumentItem::alignedWith(const RealDataItem* item) const
 {
     return shape() == item->shape();
 }
@@ -161,7 +161,7 @@ void SpecularInstrumentItem::updateToRealData(const RealDataItem* item)
     }
 }
 
-bool SpecularInstrumentItem::alignedWith(const RealDataItem* item)
+bool SpecularInstrumentItem::alignedWith(const RealDataItem* item) const
 {
     const QString native_units = item->getItemValue(RealDataItem::P_NATIVE_UNITS).toString();
     if (native_units == Constants::UnitsNbins) {

GUI/coregui/Models/InstrumentItems.h

@@ -45,7 +45,7 @@ public:
     virtual void clearMasks() {}
     virtual void importMasks(const MaskContainerItem*) {}
     virtual void updateToRealData(const RealDataItem* item);
-    virtual bool alignedWith(const RealDataItem* item);
+    virtual bool alignedWith(const RealDataItem* item) const;
 
 protected:
     explicit InstrumentItem(const QString& modelType);
@@ -66,7 +66,7 @@ public:
     std::vector<int> shape() const override;
     void setShape(const std::vector<int>& shape) override;
     void updateToRealData(const RealDataItem* item) override;
-    bool alignedWith(const RealDataItem* item) override;
+    bool alignedWith(const RealDataItem* item) const override;
 
     std::unique_ptr<IUnitConverter> createUnitConverter() const;
 };

GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp

@@ -38,7 +38,7 @@ bool SimulationSetupAssistant::isValidSimulationSetup(const MultiLayerItem *mult
     checkFittingSetup(instrumentItem, realData);
 
     if(!m_isValid)
-        QMessageBox::warning(0, QStringLiteral("Can't run the job"), composeMessage());
+        QMessageBox::warning(nullptr, QStringLiteral("Can't run the job"), composeMessage());
 
     return m_isValid;
 }
@@ -77,13 +77,12 @@ void SimulationSetupAssistant::checkInstrumentItem(const InstrumentItem* instrum
 void SimulationSetupAssistant::checkFittingSetup(const InstrumentItem* instrumentItem,
                                                  const RealDataItem* realData)
 {
-    if (!realData
-        || instrumentItem->getItemValue(InstrumentItem::P_IDENTIFIER).toString()
-               == realData->getItemValue(RealDataItem::P_INSTRUMENT_ID).toString())
+    if (!realData || instrumentItem->alignedWith(realData))
         return;
 
     m_isValid = false;
-    m_messages.append("The RealData was not linked to the instrument");
+    m_messages.append("The experimental data does not fit in the selected instrument. Try linking "
+                      "them in Import Tab.");
 }
 
 //! Composes the error message for message box.