From 3cc7a308ae974e64ed5b095d76252d0cbe2aafb4 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Nov 2023 10:47:40 +0100
Subject: [PATCH] merge fcts
---
GUI/View/Import/RealDataMaskWidget.cpp | 3 +--
GUI/View/Mask/MaskEditorActions.cpp | 7 ++-----
GUI/View/Mask/MaskEditorActions.h | 3 +--
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index 9a023a13171..20f01688dd4 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -137,8 +137,7 @@ void RealDataMaskWidget::setContextMW()
m_editorCanvas->setContextMEC(currentData2DItem(), m_editorPropertyPanel->selectionModel());
- m_editorActions->setModel(containerModel);
- m_editorActions->setSelectionModel(m_editorPropertyPanel->selectionModel());
+ m_editorActions->setModels(containerModel, m_editorPropertyPanel->selectionModel());
update();
}
diff --git a/GUI/View/Mask/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp
index a68bfa95c55..9c1b02a5bd6 100644
--- a/GUI/View/Mask/MaskEditorActions.cpp
+++ b/GUI/View/Mask/MaskEditorActions.cpp
@@ -68,14 +68,11 @@ MaskEditorActions::MaskEditorActions(QWidget* parent)
&MaskEditorActions::propertyPanelRequest);
}
-void MaskEditorActions::setModel(MaskContainerModel* maskContainerModel)
+void MaskEditorActions::setModels(MaskContainerModel* maskContainerModel,
+ QItemSelectionModel* selectionModel)
{
ASSERT(maskContainerModel);
m_maskContainerModel = maskContainerModel;
-}
-
-void MaskEditorActions::setSelectionModel(QItemSelectionModel* selectionModel)
-{
m_selectionModel = selectionModel;
}
diff --git a/GUI/View/Mask/MaskEditorActions.h b/GUI/View/Mask/MaskEditorActions.h
index 98f87f3fcd7..a77e3121b3a 100644
--- a/GUI/View/Mask/MaskEditorActions.h
+++ b/GUI/View/Mask/MaskEditorActions.h
@@ -35,8 +35,7 @@ class MaskEditorActions : public QObject {
public:
MaskEditorActions(QWidget* parent);
- void setModel(MaskContainerModel* maskContainerModel);
- void setSelectionModel(QItemSelectionModel* selectionModel);
+ void setModels(MaskContainerModel* maskContainerModel, QItemSelectionModel* selectionModel);
QAction* sendToBackAction();
QAction* bringToFrontAction();
--
GitLab