diff --git a/GUI/View/Mask/MaskGraphicsProxy.cpp b/GUI/View/Mask/MaskGraphicsProxy.cpp index 2c1845a239dbdd2ced9d7c2ce9c6be9039434426..f0d6de7e99dc2ab490420b2424ff4bb9726102c0 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 085404813a9d40ff7a3af6efa8969f8e12ead320..a9412189080b7234341f5575df212db94ebbcb35 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 9f80e5652f36de343a360b111323b3ebdabf93ce..39b3e3aae25413908ea50ad8216815684d052703 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 0fc5c4d48394838d1c16a11ee2438fedf7cf267f..c65aa9c4468287d91b2906dd776ab23a215decfe 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 4e298700f161b38043d3c5529bfd8ce84bac607a..417cb760af35a6d40a95f31f0f86a7d5e4b6f648 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 3c7da67b0b9bc6eda7b9d5b91d2849f3f028c2af..ecd55ccf069be67bfc1d3dc149f11e14d761806a 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); }