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

disambiguate fct names

parent f3ae1f97
No related branches found
No related tags found
1 merge request!2000minor
......@@ -34,7 +34,7 @@ MaskGraphicsProxy::~MaskGraphicsProxy()
m_sceneAdaptor->setColorMapPlot(nullptr);
}
void MaskGraphicsProxy::setData2DItem(Data2DItem* item)
void MaskGraphicsProxy::itemToMGProxy(Data2DItem* item)
{
m_colorMap->itemToMap(item);
if (widget() != m_colorMap)
......
......@@ -33,7 +33,7 @@ public:
int type() const override { return MaskEditorHelper::MASKGRAPHICSPROXY; }
void setData2DItem(Data2DItem* item);
void itemToMGProxy(Data2DItem* item);
void setSceneAdaptor(SceneAdaptor* sceneAdaptor);
void setInZoomMode(bool value);
......
......@@ -374,7 +374,7 @@ void MaskGraphicsScene::updateProxyWidget()
m_proxy = new MaskGraphicsProxy; // TODO: check if m_proxy is released at the end
m_proxy->setParent(this);
m_proxy->setData2DItem(m_data2DItem);
m_proxy->itemToMGProxy(m_data2DItem);
m_proxy->setSceneAdaptor(m_adaptor.data());
addItem(m_proxy);
}
......
......@@ -38,7 +38,7 @@ ColorMapCanvas::ColorMapCanvas(QWidget* parent)
setStatusLabelEnabled(false);
}
void ColorMapCanvas::setData2DItem(Data2DItem* item)
void ColorMapCanvas::itemToCanvas(Data2DItem* item)
{
m_colorMap->itemToMap(item);
}
......
......@@ -31,7 +31,7 @@ class ColorMapCanvas : public QWidget {
public:
explicit ColorMapCanvas(QWidget* parent = nullptr);
void setData2DItem(Data2DItem* item);
void itemToCanvas(Data2DItem* item);
ColorMap* colorMap();
QCustomPlot* customPlot();
......
......@@ -73,7 +73,7 @@ IntensityDataCanvas::IntensityDataCanvas(QWidget* parent)
void IntensityDataCanvas::setJobOrRealItem(QObject* job_or_real_Item)
{
DataAccessWidget::setJobOrRealItem(job_or_real_Item);
m_colorMapCanvas->setData2DItem(currentData2DItem());
m_colorMapCanvas->itemToCanvas(currentData2DItem());
if (!m_rotateDataAction)
initRotation();
......@@ -82,7 +82,7 @@ void IntensityDataCanvas::setJobOrRealItem(QObject* job_or_real_Item)
void IntensityDataCanvas::setFourierItem(Data2DItem* fftItem)
{
DataAccessWidget::setFourierItem(fftItem);
m_colorMapCanvas->setData2DItem(currentData2DItem());
m_colorMapCanvas->itemToCanvas(currentData2DItem());
}
QSize IntensityDataCanvas::sizeHint() const
......
......@@ -95,9 +95,9 @@ void Fitpair2DWidget::setJobOrRealItem(QObject* job_item)
updateDiffData();
connectItems();
m_simuCanvas->setData2DItem(simuData2DItem());
m_realCanvas->setData2DItem(realData2DItem());
m_diffCanvas->setData2DItem(diffData2DItem());
m_simuCanvas->itemToCanvas(simuData2DItem());
m_realCanvas->itemToCanvas(realData2DItem());
m_diffCanvas->itemToCanvas(diffData2DItem());
m_fitFlowWidget->setJobOrRealItem(job_item);
m_propertyWidget->setJobOrRealItem(job_item);
}
......
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