RealItem: store pointer to InstrumentModel

GUI/Model/Data/RealItem.cpp

@@ -19,6 +19,7 @@
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Device/InstrumentItems.h"
+#include "GUI/Model/Device/InstrumentModel.h"
 #include "GUI/Model/Device/MaskItems.h"
 #include "GUI/Support/IO/AbstractDataLoader1D.h"
 #include "GUI/Support/IO/DataLoaders1D.h"
@@ -234,6 +235,11 @@ void RealItem::unlinkFromInstrument()
     updateToInstrument(nullptr);
 }
 
+void RealItem::setInstrumentModel(InstrumentModel *instrumentModel)
+{
+    m_instrumentModel = instrumentModel;
+}
+
 bool RealItem::hasImportErrors() const
 {
     return (dataLoader() != nullptr) ? dataLoader()->numErrors() > 0 : false;
@@ -447,13 +453,21 @@ QString RealItem::readFrom(QXmlStreamReader* r, const QString& projectDir,
         } else if (tag == Tag::Data) {
             QString type;
             XML::readAttribute(r, XML::Attrib::type, &type);
-            initFromType(type)->readFrom(r);
+            initFromType(type);
+
+            // if we have linked instrument, try to create axes units list
+            if(!m_instrumentId.isEmpty() && m_instrumentModel) // read 'm_instrumentId' before
+                if (auto* instrument = m_instrumentModel->findInstrumentItemById(m_instrumentId))
+                    GUI::Model::JobItemUtils::setDataItemCoords(m_dataItem.get(), instrument);
+
+            m_dataItem->readFrom(r);
             dataError = m_dataItem->loadDatafield(messageService, projectDir);
             XML::gotoEndElementOfTag(r, tag);
 
             // native data
         } else if (tag == Tag::NativeData) {
-            initNativeData()->readFrom(r); // requires initialized m_dataItem
+            // TODO: do we need to create coordinates here?
+            initNativeData()->readFrom(r); // read 'm_dataItem' before
             nativeDataError = m_nativeDataItem->loadDatafield(messageService, projectDir);
             XML::gotoEndElementOfTag(r, tag);
 
@@ -479,6 +493,7 @@ QString RealItem::readFrom(QXmlStreamReader* r, const QString& projectDir,
 
 void RealItem::copyTo(RealItem* const realdata_dst) const
 {
+    realdata_dst->setInstrumentModel(m_instrumentModel);
     GUI::Util::copyContents(this, realdata_dst);
 
     if (m_dataItem)

GUI/Model/Data/RealItem.h

@@ -21,6 +21,7 @@
 class Datafield;
 class ImportDataInfo;
 class InstrumentItem;
+class InstrumentModel;
 class IntensityDataItem;
 class MaskContainerItem;
 class MessageService;
@@ -85,6 +86,8 @@ public:
     void linkToInstrument(const InstrumentItem* instrument);
     void unlinkFromInstrument();
 
+    void setInstrumentModel(InstrumentModel* instrumentModel);
+
     // loader
 
     bool hasImportErrors() const;
@@ -135,6 +138,7 @@ private:
     QString m_name;
     QString m_nativeDataUnits = "nbins";
     QString m_presentationType;
+    InstrumentModel* m_instrumentModel = nullptr;
 
     // DataItem can be `IntensityDataItem` and `SpecularDataItem` (default `IntensityDataItem`).
     std::unique_ptr<DataItem> m_dataItem;       // TODO: Can be replaced by std::variant

GUI/Model/Project/ProjectDocument.cpp

@@ -367,6 +367,7 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
 
                             // real model
                         } else if (tag == Tag::RealModel) {
+                            // 'm_instrumentModel' should be read before
                             m_realModel.readFrom(&r, projectDir, &messageService);
                             XML::gotoEndElementOfTag(&r, tag);