[j.1] revert premature edits: leave mask ownership with data ()

Merging branch 'j.1'  into 'main'.

See merge request !2440

GUI/Model/Detector/DetectorItem.h

@@ -50,11 +50,6 @@ public:
     SpanProperty& alphaAxis() { return m_alpha_axis; }
     const SpanProperty& alphaAxis() const { return m_alpha_axis; }
 
-    const MasksSet* masks() const { return m_masks.get(); }
-    MasksSet* masksRW() { return m_masks.get(); }
-    const MasksSet* prjns() const { return m_prjns.get(); }
-    MasksSet* prjnsRW() { return m_prjns.get(); }
-
     bool expandResolutionFunc = true;
 
 private:

GUI/Model/Device/InstrumentItems.cpp

@@ -372,23 +372,6 @@ Scatter2DInstrumentItem::Scatter2DInstrumentItem()
     setName("GISAS");
 }
 
-const MasksSet* Scatter2DInstrumentItem::masks() const
-{
-    return m_detector_item->masks();
-}
-MasksSet* Scatter2DInstrumentItem::masksRW()
-{
-    return m_detector_item->masksRW();
-}
-const MasksSet* Scatter2DInstrumentItem::prjns() const
-{
-    return m_detector_item->prjns();
-}
-MasksSet* Scatter2DInstrumentItem::prjnsRW()
-{
-    return m_detector_item->prjnsRW();
-}
-
 std::vector<int> Scatter2DInstrumentItem::axdims() const
 {
     ASSERT(detectorItem());

GUI/Model/Device/InstrumentItems.h

@@ -29,7 +29,6 @@ class DetectorItem;
 class Frame;
 class IDetector;
 class ISimulation;
-class MasksSet;
 class MultiLayer;
 class OffspecDetectorItem;
 class PhysicalScan;
@@ -46,10 +45,6 @@ public:
     //! The type as how to show it on the UI. Do not use for type checking or similar!
     virtual QString instrumentType() const = 0;
     virtual int detectorRank() const = 0;
-    virtual const MasksSet* masks() const { return nullptr; }
-    virtual MasksSet* masksRW() { return nullptr; }
-    virtual const MasksSet* prjns() const { return nullptr; }
-    virtual MasksSet* prjnsRW() { return nullptr; }
 
     virtual std::vector<int> axdims() const = 0;
 
@@ -130,10 +125,6 @@ public:
 
     QString instrumentType() const override { return "Scatter2D"; }
     int detectorRank() const override { return 2; }
-    const MasksSet* masks() const override;
-    virtual MasksSet* masksRW() override;
-    const MasksSet* prjns() const override;
-    virtual MasksSet* prjnsRW() override;
     std::vector<int> axdims() const override;
     void updateToRealData(const DatafileItem* dfileItem) override;
     std::unique_ptr<Frame> createFrame() const override;

GUI/Model/Project/ProjectDocument.cpp

@@ -52,10 +52,10 @@ const QString ActiveView("ActiveView");
 ProjectDocument::ProjectDocument()
     : m_project_name("Untitled")
     , m_modified(false)
-    , m_options(std::make_unique<SimulationOptionsItem>())
     , m_instruments(std::make_unique<InstrumentsSet>())
     , m_samples(std::make_unique<SamplesSet>())
     , m_datafiles(std::make_unique<DatafilesSet>())
+    , m_options(std::make_unique<SimulationOptionsItem>())
     , m_jobs(std::make_unique<JobsSet>())
 {
     connect(m_instruments.get(), &InstrumentsSet::setChanged, this, &ProjectDocument::setModified);
@@ -68,10 +68,10 @@ ProjectDocument::~ProjectDocument() = default;
 void ProjectDocument::clear()
 {
     m_project_name = "Untitled";
-    m_options = std::make_unique<SimulationOptionsItem>();
     m_instruments->clear();
     m_samples->clear();
     m_datafiles->clear();
+    m_options = std::make_unique<SimulationOptionsItem>();
     m_jobs = std::make_unique<JobsSet>();
     m_modified = false;
 }

GUI/Model/Project/ProjectDocument.h

@@ -62,14 +62,14 @@ public:
     const InstrumentsSet* instruments() const { return m_instruments.get(); };
     const SamplesSet* samples() const { return m_samples.get(); };
     const DatafilesSet* datafiles() const { return m_datafiles.get(); };
-    const JobsSet* jobs() const { return m_jobs.get(); };
     const SimulationOptionsItem* simulationOptionsItem() const { return m_options.get(); };
+    const JobsSet* jobs() const { return m_jobs.get(); };
 
     InstrumentsSet* instrumentsRW() { return m_instruments.get(); };
     SamplesSet* samplesRW() { return m_samples.get(); };
     DatafilesSet* datafilesRW() { return m_datafiles.get(); };
-    JobsSet* jobsRW() { return m_jobs.get(); };
     SimulationOptionsItem* simulationOptionsRW() { return m_options.get(); };
+    JobsSet* jobsRW() { return m_jobs.get(); };
 
 signals:
     void modifiedStateChanged();
@@ -83,10 +83,10 @@ private:
     QString m_project_dir;
     QString m_project_name;
     bool m_modified;
-    std::unique_ptr<SimulationOptionsItem> m_options;
     std::unique_ptr<InstrumentsSet> m_instruments;
     std::unique_ptr<SamplesSet> m_samples;
     std::unique_ptr<DatafilesSet> m_datafiles;
+    std::unique_ptr<SimulationOptionsItem> m_options;
     std::unique_ptr<JobsSet> m_jobs;
 };