Skip to content
Snippets Groups Projects
Commit f276e8b5 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

ResolutionFunction -> PolyPtr

parent 69cf4966
No related branches found
No related tags found
1 merge request!2696PolyItem -> PolyPtr, with BaseItem as separate template parameter
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEM_H #define BORNAGAIN_GUI_MODEL_DETECTOR_DETECTORITEM_H
#include "GUI/Model/Descriptor/AxisProperty.h" #include "GUI/Model/Descriptor/AxisProperty.h"
#include "GUI/Model/Descriptor/PolyItem.h" #include "GUI/Model/Descriptor/PolyPtr.h"
#include "GUI/Model/Detector/ResolutionFunctionCatalog.h" #include "GUI/Model/Detector/ResolutionFunctionCatalog.h"
class IDetector; class IDetector;
...@@ -33,7 +33,7 @@ public: ...@@ -33,7 +33,7 @@ public:
void setMasks(MasksSet* item); void setMasks(MasksSet* item);
PolyItem<ResolutionFunctionCatalog>& resolutionFunctionSelection() PolyPtr<ResolutionFunctionItem, ResolutionFunctionCatalog>& resolutionFunctionSelection()
{ {
return m_resolution_function; return m_resolution_function;
} }
...@@ -55,7 +55,7 @@ private: ...@@ -55,7 +55,7 @@ private:
AxisProperty m_phi_axis; AxisProperty m_phi_axis;
AxisProperty m_alpha_axis; AxisProperty m_alpha_axis;
PolyItem<ResolutionFunctionCatalog> m_resolution_function; PolyPtr<ResolutionFunctionItem, ResolutionFunctionCatalog> m_resolution_function;
std::unique_ptr<MasksSet> m_masks; std::unique_ptr<MasksSet> m_masks;
std::unique_ptr<MasksSet> m_prjns; //!< projections std::unique_ptr<MasksSet> m_prjns; //!< projections
......
...@@ -73,7 +73,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, Scatter2DInstrumentItem* instrIt ...@@ -73,7 +73,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, Scatter2DInstrumentItem* instrIt
} }
}; };
auto* typeCombo = GUI::Util::createComboBoxFromPolyitem( auto* typeCombo = GUI::Util::createComboBoxFromPolyPtr(
detectorItem->resolutionFunctionSelection(), detectorItem->resolutionFunctionSelection(),
[this, updateResolutionForm](int) { [this, updateResolutionForm](int) {
updateResolutionForm(); updateResolutionForm();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment