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

disambiguate fct name

parent e36c1853
No related branches found
No related tags found
1 merge request!2000minor
...@@ -34,9 +34,9 @@ MaskGraphicsProxy::~MaskGraphicsProxy() ...@@ -34,9 +34,9 @@ MaskGraphicsProxy::~MaskGraphicsProxy()
m_sceneAdaptor->setColorMapPlot(nullptr); 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) if (widget() != m_colorMap)
setWidget(m_colorMap); setWidget(m_colorMap);
} }
......
...@@ -33,7 +33,7 @@ public: ...@@ -33,7 +33,7 @@ public:
int type() const override { return MaskEditorHelper::MASKGRAPHICSPROXY; } int type() const override { return MaskEditorHelper::MASKGRAPHICSPROXY; }
void setData2DItem(Data2DItem* data2DItem); void setData2DItem(Data2DItem* item);
void setSceneAdaptor(SceneAdaptor* sceneAdaptor); void setSceneAdaptor(SceneAdaptor* sceneAdaptor);
void setInZoomMode(bool value); void setInZoomMode(bool value);
......
...@@ -38,9 +38,9 @@ ColorMapCanvas::ColorMapCanvas(QWidget* parent) ...@@ -38,9 +38,9 @@ ColorMapCanvas::ColorMapCanvas(QWidget* parent)
setStatusLabelEnabled(false); setStatusLabelEnabled(false);
} }
void ColorMapCanvas::setData2DItem(Data2DItem* data2DItem) void ColorMapCanvas::setData2DItem(Data2DItem* item)
{ {
m_colorMap->setData2DItem(data2DItem); m_colorMap->itemToMap(item);
} }
ColorMap* ColorMapCanvas::colorMap() ColorMap* ColorMapCanvas::colorMap()
......
...@@ -31,7 +31,7 @@ class ColorMapCanvas : public QWidget { ...@@ -31,7 +31,7 @@ class ColorMapCanvas : public QWidget {
public: public:
explicit ColorMapCanvas(QWidget* parent = nullptr); explicit ColorMapCanvas(QWidget* parent = nullptr);
void setData2DItem(Data2DItem* data2DItem); void setData2DItem(Data2DItem* item);
ColorMap* colorMap(); ColorMap* colorMap();
QCustomPlot* customPlot(); QCustomPlot* customPlot();
......
...@@ -80,7 +80,7 @@ ColorMap::ColorMap(QWidget* parent) ...@@ -80,7 +80,7 @@ ColorMap::ColorMap(QWidget* parent)
// setFixedColorMapMargins(); // setFixedColorMapMargins();
} }
void ColorMap::setData2DItem(Data2DItem* item) void ColorMap::itemToMap(Data2DItem* item)
{ {
m_data2DItem = item; m_data2DItem = item;
......
...@@ -35,7 +35,7 @@ class ColorMap : public ScientificPlot { ...@@ -35,7 +35,7 @@ class ColorMap : public ScientificPlot {
public: public:
explicit ColorMap(QWidget* parent = nullptr); explicit ColorMap(QWidget* parent = nullptr);
void setData2DItem(Data2DItem* item); void itemToMap(Data2DItem* item);
QSize sizeHint() const override { return QSize(500, 400); } QSize sizeHint() const override { return QSize(500, 400); }
QSize minimumSizeHint() const override { return QSize(128, 128); } QSize minimumSizeHint() const override { return QSize(128, 128); }
......
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