From da60bab5519928d9d531f1d083a90a3fdb59b7e3 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 11 Mar 2024 15:47:24 +0100
Subject: [PATCH] Revert "ditto for projections"
This reverts commit 0c51e39189b1fd39b1c6fb5aefe11973f3f2d7ba.
---
GUI/Model/Data/Data2DItem.cpp | 9 +++++----
GUI/Model/Data/Data2DItem.h | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp
index b0d00cf5b26..f8033c8676d 100644
--- a/GUI/Model/Data/Data2DItem.cpp
+++ b/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();
}
diff --git a/GUI/Model/Data/Data2DItem.h b/GUI/Model/Data/Data2DItem.h
index 50523cc459f..1294b41f5d3 100644
--- a/GUI/Model/Data/Data2DItem.h
+++ b/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
--
GitLab