From 0fa7f64dbd47256c96133ab3fd02dea8144daa3e Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sun, 29 May 2016 18:39:35 +0000
Subject: [PATCH] Use INFO/WARN/ERR instead of std::cout/cerr.
---
.../Utils/FileConverter/ConvertVtkToOsg.cpp | 7 ++--
Applications/Utils/MeshEdit/moveMeshNodes.cpp | 39 ++++++++++++-------
BaseLib/IO/Writer.cpp | 6 +--
GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp | 29 +++++++++-----
.../Mesh2MeshPropertyInterpolation.cpp | 2 +-
5 files changed, 51 insertions(+), 32 deletions(-)
diff --git a/Applications/Utils/FileConverter/ConvertVtkToOsg.cpp b/Applications/Utils/FileConverter/ConvertVtkToOsg.cpp
index fc2b4b6e245..aa0856da995 100644
--- a/Applications/Utils/FileConverter/ConvertVtkToOsg.cpp
+++ b/Applications/Utils/FileConverter/ConvertVtkToOsg.cpp
@@ -98,7 +98,7 @@ int main (int argc, char const* argv[])
for (vector<string>::const_iterator it = filenames.begin(); it != filenames.end(); ++it)
{
string filename(*it);
- cout << "Opening file " << filename << " ... " << endl << flush;
+ INFO("Opening file %s", filename.c_str());
string fileExt = getFileExt(filename);
vtkXMLDataReader* reader = NULL;
@@ -157,8 +157,7 @@ int main (int argc, char const* argv[])
}
else
{
- cout << "Not a valid vtk file ending (vti, vtr, vts, vtp, vtu, vtk)" <<
- endl;
+ ERR("Not a valid vtk file ending (vti, vtr, vts, vtp, vtu, vtk)");
return 1;
}
@@ -201,7 +200,7 @@ int main (int argc, char const* argv[])
OSG::osgExit();
- cout << "File conversion finished" << endl;
+ INFO("File conversion finished");
return 0;
}
diff --git a/Applications/Utils/MeshEdit/moveMeshNodes.cpp b/Applications/Utils/MeshEdit/moveMeshNodes.cpp
index b5fb282b928..c35ec249ee4 100644
--- a/Applications/Utils/MeshEdit/moveMeshNodes.cpp
+++ b/Applications/Utils/MeshEdit/moveMeshNodes.cpp
@@ -66,14 +66,22 @@ int main (int argc, char* argv[])
if (argc < 3)
{
- std::cout << "Moves mesh nodes and connected elements either by a given value or based on a list." << std::endl;
- std::cout << std::endl;
- std::cout << "Usage: " << argv[0] << " <msh-file.msh> <keyword> [<value1>] [<value2>]" << std::endl;
- std::cout << "Available keywords:" << std::endl;
+ INFO(
+ "Moves mesh nodes and connected elements either by a given value "
+ "or based on a list.\n");
+ INFO("Usage: %s <msh-file.msh> <keyword> [<value1>] [<value2>]",
+ argv[0]);
+ INFO("Available keywords:");
//for (std::size_t i=0; i<keywords.size(); i++)
- std::cout << "\t" << "-ALL <value1> <value2> : changes the elevation of all mesh nodes by <value2> in direction <value1> [x,y,z]." << std::endl;
- std::cout << "\t" << "-MESH <value1> <value2> : changes the elevation of mesh nodes based on a second mesh <value1> with a search range of <value2>." << std::endl;
- std::cout << "\t" << "-LOWPASS : applies a lowpass filter over node elevation using directly connected nodes." << std::endl;
+ INFO(
+ "\t-ALL <value1> <value2> : changes the elevation of all mesh "
+ "nodes by <value2> in direction <value1> [x,y,z].");
+ INFO(
+ "\t-MESH <value1> <value2> : changes the elevation of mesh nodes "
+ "based on a second mesh <value1> with a search range of <value2>.");
+ INFO(
+ "\t-LOWPASS : applies a lowpass filter over node elevation using "
+ "directly connected nodes.");
return -1;
}
@@ -84,8 +92,8 @@ int main (int argc, char* argv[])
if (msh_name.substr(msh_name.length()-4, 4).compare(".msh") != 0)
{
- std::cout << "Error: Parameter 1 should be a msh-file" << std::endl;
- std::cout << "Usage: " << argv[0] << " <msh-file.gml> <keyword> <value>" << std::endl;
+ ERR("Error: Parameter 1 should be a msh-file.");
+ INFO("Usage: %s <msh-file.gml> <keyword> <value>", argv[0]);
return -1;
}
@@ -99,9 +107,9 @@ int main (int argc, char* argv[])
if (!is_keyword)
{
- std::cout << "Keyword not recognised. Available keywords:" << std::endl;
- for (std::size_t i=0; i<keywords.size(); i++)
- std::cout << keywords[i] << std::endl;
+ ERR("Keyword not recognised. Available keywords:");
+ for (auto const& keyword : keywords)
+ INFO("\t%s", keyword.c_str());
return -1;
}
@@ -116,13 +124,14 @@ int main (int argc, char* argv[])
{
if (argc < 5)
{
- std::cout << "Missing parameter..." << std::endl;
+ ERR("Missing parameter...");
return -1;
}
const std::string dir(argv[3]);
unsigned idx = (dir.compare("x") == 0) ? 0 : (dir.compare("y") == 0) ? 1 : 2;
const double value(strtod(argv[4],0));
- std::cout << "Moving all mesh nodes by " << value << " in direction " << idx << " (" << dir << ")..." << std::endl;
+ INFO("Moving all mesh nodes by %g in direction %d (%s)...", value, idx,
+ dir.c_str());
//double value(-10);
const std::size_t nNodes(mesh->getNNodes());
std::vector<MeshLib::Node*> nodes (mesh->getNodes());
@@ -137,7 +146,7 @@ int main (int argc, char* argv[])
{
if (argc < 5)
{
- std::cout << "Missing parameter..." << std::endl;
+ ERR("Missing parameter...");
return -1;
}
const std::string value (argv[3]);
diff --git a/BaseLib/IO/Writer.cpp b/BaseLib/IO/Writer.cpp
index a4abbaa2d75..8f8988b5057 100644
--- a/BaseLib/IO/Writer.cpp
+++ b/BaseLib/IO/Writer.cpp
@@ -12,13 +12,13 @@
*
*/
-// ** INCLUDES **
#include "Writer.h"
-#include <iostream>
#include <fstream>
#include <limits>
+#include <logog/include/logog.hpp>
+
namespace BaseLib
{
namespace IO
@@ -52,7 +52,7 @@ int Writer::writeToFile(std::string const& filename)
// check file stream
if (!fileStream)
{
- std::cerr << "Could not open file " << filename << " !\n";
+ ERR("Could not open file \"%s\"!", filename.c_str());
return 0;
}
diff --git a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp
index 4da64c84626..f1363d4dcc5 100644
--- a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp
+++ b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp
@@ -33,7 +33,7 @@ std::vector<GeoLib::Point*> *RapidStnInterface::readStationFile(const std::strin
std::ifstream in(fileName.c_str());
if (in.fail())
{
- std::cout << "XmlStnInterface::rapidReadFile() - Can't open xml-file." << std::endl;
+ ERR("XmlStnInterface::rapidReadFile() - Can't open xml-file.");
return NULL;
}
@@ -53,7 +53,7 @@ std::vector<GeoLib::Point*> *RapidStnInterface::readStationFile(const std::strin
// parse content
if (std::string(doc.first_node()->name()).compare("OpenGeoSysSTN") != 0)
{
- std::cout << "XmlStnInterface::readFile() - Unexpected XML root." << std::endl;
+ ERR("XmlStnInterface::readFile() - Unexpected XML root.");
return NULL;
}
@@ -86,7 +86,7 @@ int RapidStnInterface::rapidReadFile(const std::string &fileName)
std::ifstream in(fileName.c_str());
if (in.fail())
{
- std::cout << "XmlStnInterface::rapidReadFile() - Can't open xml-file." << std::endl;
+ ERR("XmlStnInterface::rapidReadFile() - Can't open xml-file.");
return 0;
}
@@ -106,7 +106,7 @@ int RapidStnInterface::rapidReadFile(const std::string &fileName)
// parse content
if (std::string(doc.first_node()->name()).compare("OpenGeoSysSTN"))
{
- std::cout << "XmlStnInterface::readFile() - Unexpected XML root." << std::endl;
+ ERR("XmlStnInterface::readFile() - Unexpected XML root.");
return 0;
}
@@ -195,7 +195,11 @@ void RapidStnInterface::readStations(const rapidxml::xml_node<>* station_root, s
}
}
else
- std::cout << "XmlStnInterface::rapidReadStations() - Attribute missing in <station> tag ..." << std::endl;
+ {
+ ERR(
+ "XmlStnInterface::rapidReadStations() - Attribute missing in "
+ "<station> tag ...");
+ }
}
}
@@ -223,12 +227,19 @@ void RapidStnInterface::readStratigraphy( const rapidxml::xml_node<>* strat_root
depth_check = depth;
}
else
- std::cout << "Warning: Skipped layer \"" << horizon_name << "\" in borehole \""
- << borehole->getName() << "\" because of thickness 0.0." << std::endl;
+ {
+ WARN(
+ "Warning: Skipped layer \"%s\" in borehole \"%s\" because "
+ "of thickness 0.0.",
+ horizon_name.c_str(), borehole->getName().c_str());
+ }
}
else
- std::cout <<
- "XmlStnInterface::rapidReadStratigraphy() - Attribute missing in <horizon> tag ..." << std::endl;
+ {
+ WARN(
+ "XmlStnInterface::rapidReadStratigraphy() - Attribute missing "
+ "in <horizon> tag ...");
+ }
}
}
diff --git a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
index 7306eeeee44..7e546ab3e04 100644
--- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
+++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
@@ -143,7 +143,7 @@ void Mesh2MeshPropertyInterpolation::interpolatePropertiesForMesh(Mesh *dest_mes
}
out_src << "#STOP" << "\n";
out_src.close();
- std::cerr << "no source nodes in dest element " << k << "\n";
+ ERR("no source nodes in dest element %d", k);
}
}
}
--
GitLab