From f3ae1f9717b1090694f1c821213375100e6b4adf Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 6 Oct 2023 16:42:30 +0200
Subject: [PATCH] disambiguate fct name
---
GUI/View/Mask/MaskGraphicsProxy.cpp | 4 ++--
GUI/View/Mask/MaskGraphicsProxy.h | 2 +-
GUI/View/Plot2D/ColorMapCanvas.cpp | 4 ++--
GUI/View/Plot2D/ColorMapCanvas.h | 2 +-
GUI/View/PlotScale/ColorMap.cpp | 2 +-
GUI/View/PlotScale/ColorMap.h | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/GUI/View/Mask/MaskGraphicsProxy.cpp b/GUI/View/Mask/MaskGraphicsProxy.cpp
index 2c1845a239d..f0d6de7e99d 100644
--- a/GUI/View/Mask/MaskGraphicsProxy.cpp
+++ b/GUI/View/Mask/MaskGraphicsProxy.cpp
@@ -34,9 +34,9 @@ MaskGraphicsProxy::~MaskGraphicsProxy()
m_sceneAdaptor->setColorMapPlot(nullptr);
}
-void MaskGraphicsProxy::setData2DItem(Data2DItem* data2DItem)
+void MaskGraphicsProxy::setData2DItem(Data2DItem* item)
{
- m_colorMap->setData2DItem(data2DItem);
+ m_colorMap->itemToMap(item);
if (widget() != m_colorMap)
setWidget(m_colorMap);
}
diff --git a/GUI/View/Mask/MaskGraphicsProxy.h b/GUI/View/Mask/MaskGraphicsProxy.h
index 085404813a9..a9412189080 100644
--- a/GUI/View/Mask/MaskGraphicsProxy.h
+++ b/GUI/View/Mask/MaskGraphicsProxy.h
@@ -33,7 +33,7 @@ public:
int type() const override { return MaskEditorHelper::MASKGRAPHICSPROXY; }
- void setData2DItem(Data2DItem* data2DItem);
+ void setData2DItem(Data2DItem* item);
void setSceneAdaptor(SceneAdaptor* sceneAdaptor);
void setInZoomMode(bool value);
diff --git a/GUI/View/Plot2D/ColorMapCanvas.cpp b/GUI/View/Plot2D/ColorMapCanvas.cpp
index 9f80e5652f3..39b3e3aae25 100644
--- a/GUI/View/Plot2D/ColorMapCanvas.cpp
+++ b/GUI/View/Plot2D/ColorMapCanvas.cpp
@@ -38,9 +38,9 @@ ColorMapCanvas::ColorMapCanvas(QWidget* parent)
setStatusLabelEnabled(false);
}
-void ColorMapCanvas::setData2DItem(Data2DItem* data2DItem)
+void ColorMapCanvas::setData2DItem(Data2DItem* item)
{
- m_colorMap->setData2DItem(data2DItem);
+ m_colorMap->itemToMap(item);
}
ColorMap* ColorMapCanvas::colorMap()
diff --git a/GUI/View/Plot2D/ColorMapCanvas.h b/GUI/View/Plot2D/ColorMapCanvas.h
index 0fc5c4d4839..c65aa9c4468 100644
--- a/GUI/View/Plot2D/ColorMapCanvas.h
+++ b/GUI/View/Plot2D/ColorMapCanvas.h
@@ -31,7 +31,7 @@ class ColorMapCanvas : public QWidget {
public:
explicit ColorMapCanvas(QWidget* parent = nullptr);
- void setData2DItem(Data2DItem* data2DItem);
+ void setData2DItem(Data2DItem* item);
ColorMap* colorMap();
QCustomPlot* customPlot();
diff --git a/GUI/View/PlotScale/ColorMap.cpp b/GUI/View/PlotScale/ColorMap.cpp
index 4e298700f16..417cb760af3 100644
--- a/GUI/View/PlotScale/ColorMap.cpp
+++ b/GUI/View/PlotScale/ColorMap.cpp
@@ -80,7 +80,7 @@ ColorMap::ColorMap(QWidget* parent)
// setFixedColorMapMargins();
}
-void ColorMap::setData2DItem(Data2DItem* item)
+void ColorMap::itemToMap(Data2DItem* item)
{
m_data2DItem = item;
diff --git a/GUI/View/PlotScale/ColorMap.h b/GUI/View/PlotScale/ColorMap.h
index 3c7da67b0b9..ecd55ccf069 100644
--- a/GUI/View/PlotScale/ColorMap.h
+++ b/GUI/View/PlotScale/ColorMap.h
@@ -35,7 +35,7 @@ class ColorMap : public ScientificPlot {
public:
explicit ColorMap(QWidget* parent = nullptr);
- void setData2DItem(Data2DItem* item);
+ void itemToMap(Data2DItem* item);
QSize sizeHint() const override { return QSize(500, 400); }
QSize minimumSizeHint() const override { return QSize(128, 128); }
--
GitLab