From 32d9b6901c356cb56c9ab64a60ccd12ec5ef0d27 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <svechnikovmv@gmail.com>
Date: Fri, 4 Aug 2023 16:49:40 +0200
Subject: [PATCH] Scale --> GenericScale
---
Base/Axis/Scale.cpp | 2 +-
Device/IO/ParseUtil.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Base/Axis/Scale.cpp b/Base/Axis/Scale.cpp
index faf84df19ad..9615e3a2f17 100644
--- a/Base/Axis/Scale.cpp
+++ b/Base/Axis/Scale.cpp
@@ -152,7 +152,7 @@ std::ostream& operator<<(std::ostream& ostr, const Scale& ax)
return ostr;
}
- ostr << "Scale(\"" << ax.axisName() << "\", [";
+ ostr << "GenericScale(\"" << ax.axisName() << "\", [";
for (const Bin1D& b : ax.bins())
ostr << b.lowerBound() << "," << b.upperBound() << ",";
ostr << "])";
diff --git a/Device/IO/ParseUtil.cpp b/Device/IO/ParseUtil.cpp
index 308df0d6a79..34bd6dbe687 100644
--- a/Device/IO/ParseUtil.cpp
+++ b/Device/IO/ParseUtil.cpp
@@ -69,10 +69,10 @@ Scale* Util::Parse::parseScale(std::istream& input_stream)
::readLineOfDoubles(coordinates, iss);
return newListScan(name, coordinates);
- } else if (type == "Scale") {
+ } else if (type == "GenericScale") {
std::string name;
if (!(iss >> name))
- throw std::runtime_error("Reading Scale: cannot read name");
+ throw std::runtime_error("Reading GenericScale: cannot read name");
std::vector<double> coordinates;
::readLineOfDoubles(coordinates, iss);
return newGenericScale(name, coordinates);
--
GitLab