From fdba490440b41a14d133e46a2430838a3e629c48 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Thu, 6 Apr 2023 17:32:10 +0200
Subject: [PATCH] disambiguate fct name
---
GUI/Model/Axis/PointwiseAxisItem.cpp | 2 +-
GUI/Model/Axis/PointwiseAxisItem.h | 2 +-
GUI/Model/Device/GrazingScanItem.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/GUI/Model/Axis/PointwiseAxisItem.cpp b/GUI/Model/Axis/PointwiseAxisItem.cpp
index 7e3b4f550b5..b3333061cce 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.cpp
+++ b/GUI/Model/Axis/PointwiseAxisItem.cpp
@@ -37,7 +37,7 @@ PointwiseAxisItem::PointwiseAxisItem(QObject* parent)
PointwiseAxisItem::~PointwiseAxisItem() = default;
-void PointwiseAxisItem::init(const IAxis& axis, const QString& units_label)
+void PointwiseAxisItem::setAxisAndUnit(const IAxis& axis, const QString& units_label)
{
m_axis = std::unique_ptr<IAxis>(axis.clone());
m_nativeAxisUnits = units_label;
diff --git a/GUI/Model/Axis/PointwiseAxisItem.h b/GUI/Model/Axis/PointwiseAxisItem.h
index ac1f1427a83..5f9bb2252ef 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.h
+++ b/GUI/Model/Axis/PointwiseAxisItem.h
@@ -28,7 +28,7 @@ public:
~PointwiseAxisItem() override;
// setters, getters
- void init(const IAxis& axis, const QString& units_label);
+ void setAxisAndUnit(const IAxis& axis, const QString& units_label);
void setOwningInstrument(const InstrumentItem* instrument);
const IAxis* axis() const;
diff --git a/GUI/Model/Device/GrazingScanItem.cpp b/GUI/Model/Device/GrazingScanItem.cpp
index 074126028b6..a1fbf456ad1 100644
--- a/GUI/Model/Device/GrazingScanItem.cpp
+++ b/GUI/Model/Device/GrazingScanItem.cpp
@@ -192,6 +192,6 @@ void GrazingScanItem::initDiscreteAxis(const IAxis& axis, QString units)
setAxisPresentationDefaults(m_pointwiseAlphaAxis.get());
}
- m_pointwiseAlphaAxis->init(axis, units);
+ m_pointwiseAlphaAxis->setAxisAndUnit(axis, units);
m_pointwiseAlphaAxis->updateAxIndicators();
}
--
GitLab