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

rename fct -> parseAxis

parent 83b61b56
No related branches found
No related tags found
1 merge request!1628simplify and unify API and code for reading or writing data files
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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);
}
......
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