From 1bc5b29ad4d52f61a1c05f74f4aa59eef3b66f1e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 10 May 2023 15:41:50 +0200
Subject: [PATCH] rename fct -> parseAxis
---
Device/IO/DataFormatUtil.cpp | 2 +-
Device/IO/DataFormatUtil.h | 2 +-
Device/IO/ReadWriteINT.cpp | 2 +-
Tests/Unit/Device/FixedBinAxisTest.cpp | 2 +-
Tests/Unit/Device/PointwiseAxisTest.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Device/IO/DataFormatUtil.cpp b/Device/IO/DataFormatUtil.cpp
index b72565fbbe5..ca05967f37d 100644
--- a/Device/IO/DataFormatUtil.cpp
+++ b/Device/IO/DataFormatUtil.cpp
@@ -94,7 +94,7 @@ bool DataUtil::Format::isTiffFile(const std::string& file_name)
}
//! Creates axis of certain type from input stream
-Scale* DataUtil::Format::createAxis(std::istream& input_stream)
+Scale* DataUtil::Format::parseScale(std::istream& input_stream)
{
auto iss = ::getAxisStringRepresentation(input_stream);
std::string type;
diff --git a/Device/IO/DataFormatUtil.h b/Device/IO/DataFormatUtil.h
index a92e444027d..43b2073cf6e 100644
--- a/Device/IO/DataFormatUtil.h
+++ b/Device/IO/DataFormatUtil.h
@@ -46,7 +46,7 @@ bool isNicosFile(const std::string& file_name);
//! Returns true if file name corresponds to tiff file (can be also compressed)
bool isTiffFile(const std::string& file_name);
-Scale* createAxis(std::istream& input_stream);
+Scale* parseScale(std::istream& input_stream);
void fillDatafield(Datafield* data, std::istream& input_stream);
diff --git a/Device/IO/ReadWriteINT.cpp b/Device/IO/ReadWriteINT.cpp
index 897071e8abf..0e4bf6605a3 100644
--- a/Device/IO/ReadWriteINT.cpp
+++ b/Device/IO/ReadWriteINT.cpp
@@ -30,7 +30,7 @@ Datafield* ReadWriteINT::readDatafield(std::istream& input_stream)
line = BaseUtil::String::trim(line);
if (line.find("axis") != std::string::npos)
- axes.emplace_back(DataUtil::Format::createAxis(input_stream));
+ axes.emplace_back(DataUtil::Format::parseScale(input_stream));
if (line.find("data") != std::string::npos)
break;
diff --git a/Tests/Unit/Device/FixedBinAxisTest.cpp b/Tests/Unit/Device/FixedBinAxisTest.cpp
index 7d54ba9e0ab..0ff55b86c2a 100644
--- a/Tests/Unit/Device/FixedBinAxisTest.cpp
+++ b/Tests/Unit/Device/FixedBinAxisTest.cpp
@@ -118,7 +118,7 @@ TEST(EquiDivisionTest, IOStream)
oss << axis;
std::istringstream iss(oss.str());
- std::unique_ptr<Scale> result(DataUtil::Format::createAxis(iss));
+ std::unique_ptr<Scale> result(DataUtil::Format::parseScale(iss));
EXPECT_TRUE(axis == *result);
}
diff --git a/Tests/Unit/Device/PointwiseAxisTest.cpp b/Tests/Unit/Device/PointwiseAxisTest.cpp
index c5f129ca674..601dc8b2fae 100644
--- a/Tests/Unit/Device/PointwiseAxisTest.cpp
+++ b/Tests/Unit/Device/PointwiseAxisTest.cpp
@@ -87,7 +87,7 @@ TEST(PointwiseAxisTest, IOStream)
oss << axis;
std::istringstream iss(oss.str());
- std::unique_ptr<Scale> result(DataUtil::Format::createAxis(iss));
+ std::unique_ptr<Scale> result(DataUtil::Format::parseScale(iss));
EXPECT_TRUE(axis == *result);
}
--
GitLab