Revert "ditto for projections"

This reverts commit 0c51e391.

GUI/Model/Data/Data2DItem.cpp

@@ -21,6 +21,7 @@
 #include "Device/Mask/MaskStack.h"
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
+#include "GUI/Model/Mask/MasksQModel.h"
 #include "GUI/Model/Mask/MasksSet.h"
 #include "GUI/Support/Data/ComboProperty.h"
 #include "GUI/Support/Style/QCP_Util.h"
@@ -365,18 +366,18 @@ Datafield* Data2DItem::createMaskedField() const
 
 MasksSet* Data2DItem::projectionsSet()
 {
-    return m_proj_model.get();
+    return m_proj_model ? m_proj_model->set() : nullptr;
 }
 
 const MasksSet* Data2DItem::projectionsSet() const
 {
-    return m_proj_model.get();
+    return m_proj_model ? m_proj_model->set() : nullptr;
 }
 
-MasksSet* Data2DItem::getOrCreateProjectionModel()
+MasksQModel* Data2DItem::getOrCreateProjectionModel()
 {
     if (!m_proj_model)
-        m_proj_model = std::make_unique<MasksSet>();
+        m_proj_model = std::make_unique<MasksQModel>(new MasksSet);
 
     return m_proj_model.get();
 }

GUI/Model/Data/Data2DItem.h

@@ -83,7 +83,7 @@ public:
 
     MasksSet* projectionsSet();
     const MasksSet* projectionsSet() const;
-    MasksSet* getOrCreateProjectionModel();
+    MasksQModel* getOrCreateProjectionModel();
 
     size_t rank() const override { return 2; }
     //! Returns dimensions and axesbins of data
@@ -115,7 +115,7 @@ private:
     std::unique_ptr<ComboProperty> m_gradient;
     std::unique_ptr<AmplitudeAxisItem> m_z_axis;
     std::unique_ptr<MasksSet> m_model;
-    std::unique_ptr<MasksSet> m_proj_model;
+    std::unique_ptr<MasksQModel> m_proj_model;
 };
 
 #endif // BORNAGAIN_GUI_MODEL_DATA_DATA2DITEM_H