From e871e65db35dd618f5db23cb915f565c11c1febf Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 4 Jul 2023 19:13:10 +0200
Subject: [PATCH] rm calculateMin|Max
---
Device/Coord/CoordSystem1D.cpp | 12 ------------
Device/Coord/CoordSystem1D.h | 6 ------
Device/Coord/CoordSystem2D.cpp | 16 +---------------
Device/Coord/CoordSystem2D.h | 3 ---
Device/Coord/ICoordSystem.h | 3 ---
Device/Histo/SimulationResult.cpp | 2 +-
GUI/Model/Axis/PointwiseAxisItem.cpp | 4 ++--
7 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/Device/Coord/CoordSystem1D.cpp b/Device/Coord/CoordSystem1D.cpp
index de1f110289f..f49617ee1e5 100644
--- a/Device/Coord/CoordSystem1D.cpp
+++ b/Device/Coord/CoordSystem1D.cpp
@@ -50,18 +50,6 @@ CoordSystem1D::CoordSystem1D(const Scale* axis)
{
}
-double CoordSystem1D::calculateMin(size_t i_axis) const
-{
- ASSERT(i_axis == 0);
- return m_axes[0]->min();
-}
-
-double CoordSystem1D::calculateMax(size_t i_axis) const
-{
- ASSERT(i_axis == 0);
- return m_axes[0]->max();
-}
-
Scale* CoordSystem1D::convertedAxis(size_t i_axis) const
{
ASSERT(i_axis == 0);
diff --git a/Device/Coord/CoordSystem1D.h b/Device/Coord/CoordSystem1D.h
index 3a3987bfefc..8e56fb13ff4 100644
--- a/Device/Coord/CoordSystem1D.h
+++ b/Device/Coord/CoordSystem1D.h
@@ -33,12 +33,6 @@ public:
//! Creates axis in converted units.
Scale* convertedAxis(size_t i_axis) const override;
-
- //! Calculates minimum on-axis value in given units.
- double calculateMin(size_t i_axis) const override;
-
- //! Calculates maximum on-axis value in given units.
- double calculateMax(size_t i_axis) const override;
};
diff --git a/Device/Coord/CoordSystem2D.cpp b/Device/Coord/CoordSystem2D.cpp
index 91fbc7a4f3c..f3a3b559885 100644
--- a/Device/Coord/CoordSystem2D.cpp
+++ b/Device/Coord/CoordSystem2D.cpp
@@ -38,25 +38,11 @@ CoordSystem2D::CoordSystem2D(const CoordSystem2D& other)
{
}
-double CoordSystem2D::calculateMin(size_t i_axis) const
-{
- ASSERT(i_axis < rank());
- return calculateValue(i_axis, m_axes[i_axis]->min());
-}
-
-double CoordSystem2D::calculateMax(size_t i_axis) const
-{
- ASSERT(i_axis < rank());
- return calculateValue(i_axis, m_axes[i_axis]->max());
-}
-
Scale* CoordSystem2D::convertedAxis(size_t i_axis) const
{
- const double min = calculateMin(i_axis);
- const double max = calculateMax(i_axis);
const auto& axis_name = nameOfAxis(i_axis);
const auto axis_size = m_axes[i_axis]->size();
- return newEquiDivision(axis_name, axis_size, min, max);
+ return newEquiDivision(axis_name, axis_size, m_axes[i_axis]->min(), m_axes[i_axis]->max());
}
// ************************************************************************************************
diff --git a/Device/Coord/CoordSystem2D.h b/Device/Coord/CoordSystem2D.h
index df9ac69af07..8a192ecc348 100644
--- a/Device/Coord/CoordSystem2D.h
+++ b/Device/Coord/CoordSystem2D.h
@@ -32,9 +32,6 @@ public:
CoordSystem2D(std::vector<const Scale*>&& axes);
~CoordSystem2D() override = default;
- double calculateMin(size_t i_axis) const override;
- double calculateMax(size_t i_axis) const override;
-
Scale* convertedAxis(size_t i_axis) const override;
protected:
diff --git a/Device/Coord/ICoordSystem.h b/Device/Coord/ICoordSystem.h
index 6936b64b7fc..6abd7704f4d 100644
--- a/Device/Coord/ICoordSystem.h
+++ b/Device/Coord/ICoordSystem.h
@@ -30,9 +30,6 @@ public:
ICoordSystem* clone() const override = 0;
- virtual double calculateMin(size_t i_axis) const = 0;
- virtual double calculateMax(size_t i_axis) const = 0;
-
virtual std::string nameOfAxis(size_t i_axis) const = 0;
virtual Scale* convertedAxis(size_t i_axis) const = 0;
diff --git a/Device/Histo/SimulationResult.cpp b/Device/Histo/SimulationResult.cpp
index 908ef66d0a8..692c19f4135 100644
--- a/Device/Histo/SimulationResult.cpp
+++ b/Device/Histo/SimulationResult.cpp
@@ -45,7 +45,7 @@ Datafield SimulationResult::extracted_field() const
std::pair<double, double> SimulationResult::axisMinMax(size_t i) const
{
- return {converter().calculateMin(i), converter().calculateMax(i)};
+ return {converter().axis(i).min(), converter().axis(i).max()};
}
std::string SimulationResult::name_of_axis(size_t i) const
diff --git a/GUI/Model/Axis/PointwiseAxisItem.cpp b/GUI/Model/Axis/PointwiseAxisItem.cpp
index 1c879841cd1..706590a4ca6 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.cpp
+++ b/GUI/Model/Axis/PointwiseAxisItem.cpp
@@ -148,7 +148,7 @@ void PointwiseAxisItem::updateAxIndicators(const ICoordSystem& cs)
if (!m_axis || nativeAxisUnits() == "nbins")
return;
- setMin(cs.calculateMin(0));
- setMax(cs.calculateMax(0));
+ setMin(cs.axis(0).min());
+ setMax(cs.axis(0).max());
setBinCount(static_cast<int>(m_axis->size()));
}
--
GitLab