Skip to content
Snippets Groups Projects
Commit 4bb167c1 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Remove LogogSetup

parent 76ab6be3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 146 deletions
Applications/ApplicationsLib/LogogSetup.h deleted 100644 → 0
+ 0
− 83
View file @ 76ab6be3
/**
* \copyright
* Copyright (c) 2012-2020, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
*
*/
#pragma once
#include <map>
#include <memory>
#include <string>
#include <logog/include/logog.hpp>
#include "BaseLib/LogogSimpleFormatter.h"
namespace ApplicationsLib
{
/// Initialization and shutting down of the logog library.
class LogogSetup final
{
public:
LogogSetup()
{
LOGOG_INITIALIZE();
logog_cout = std::make_unique<logog::Cout>();
setFormatter(std::make_unique<BaseLib::LogogSimpleFormatter>());
}
~LogogSetup()
{
// Objects have to be deleted before shutdown
fmt.reset(nullptr);
logog_cout.reset(nullptr);
LOGOG_SHUTDOWN();
}
void setFormatter(std::unique_ptr<logog::Formatter>&& formatter)
{
fmt = std::move(formatter);
logog_cout->SetFormatter(*fmt);
}
void setLevel(LOGOG_LEVEL_TYPE level)
{
logog::SetDefaultLevel(level);
}
void setLevel(std::string const & level)
{
std::map<std::string, LOGOG_LEVEL_TYPE> foo =
{
{ "none", LOGOG_LEVEL_NONE },
{ "emergency", LOGOG_LEVEL_EMERGENCY },
{ "alert", LOGOG_LEVEL_ALERT},
{ "critical", LOGOG_LEVEL_CRITICAL },
{ "error", LOGOG_LEVEL_ERROR },
{ "warn", LOGOG_LEVEL_WARN },
{ "info", LOGOG_LEVEL_INFO },
{ "debug", LOGOG_LEVEL_DEBUG },
{ "all", LOGOG_LEVEL_ALL }
};
LOGOG_LEVEL_TYPE level_type = LOGOG_LEVEL_ALL;
if(foo.find(level) != foo.end())
level_type = foo[level];
else
WARN("'%s' is not a valid log level! 'all' is used instead.", level.c_str());
setLevel(level_type);
}
private:
std::unique_ptr<logog::Formatter> fmt;
std::unique_ptr<logog::Cout> logog_cout;
};
} // namespace ApplicationsLib
Applications/CLI/ogs.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -31,10 +31,8 @@
#include "BaseLib/DateTools.h"
#include "BaseLib/FileTools.h"
#include "BaseLib/RunTime.h"
#include "BaseLib/TemplateLogogFormatterSuppressedGCC.h"
#include "Applications/ApplicationsLib/LinearSolverLibrarySetup.h"
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "Applications/ApplicationsLib/ProjectData.h"
#include "Applications/ApplicationsLib/TestDefinition.h"
#include "Applications/InSituLib/Adaptor.h"
......@@ -123,7 +121,6 @@ int main(int argc, char* argv[])
std::cout.setf(std::ios::unitbuf);
}
ApplicationsLib::LogogSetup logog_setup;
logog_setup.setLevel(log_level_arg.getValue());
INFO("This is OpenGeoSys-6 version {:s}.",
......
Applications/DataExplorer/main.cpp
+ 1
− 1
View file @ 4bb167c1
......@@ -16,7 +16,7 @@ FbxScene* lScene = nullptr;
#include <vtkSmartPointer.h>
#include "InfoLib/GitInfo.h"
#include "BaseLib/LogogSimpleFormatter.h"
#include "BaseLib/Logging.h"
#include "VtkVis/VtkConsoleOutputWindow.h"
int main(int argc, char* argv[])
......
Applications/Utils/FileConverter/ConvertSHPToGLI.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -21,7 +21,6 @@
// ShapeLib
#include <shapefil.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "GeoLib/GEOObjects.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
......@@ -152,8 +151,6 @@ void printFieldInformationTable(DBFHandle const& dbf_handle, std::size_t n_field
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converts points contained in shape file\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/FileConverter/FEFLOW2OGS.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -13,8 +13,6 @@
// ThirdParty
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
// BaseLib
#include "InfoLib/GitInfo.h"
#include "BaseLib/FileTools.h"
......@@ -33,8 +31,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converting a mesh in FEFLOW file format (ASCII, version 5.4) to a vtk "
"unstructured grid file (new OGS file format) or to the old OGS file "
......
Applications/Utils/FileConverter/GMSH2OGS.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -19,8 +19,6 @@
// ThirdParty
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
// BaseLib
#include "InfoLib/GitInfo.h"
#include "BaseLib/FileTools.h"
......@@ -40,8 +38,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converting meshes in gmsh file format (ASCII, version 2.2) to a vtk "
"unstructured grid file (new OGS file format) or to the old OGS file "
......
Applications/Utils/FileConverter/NetCdfConverter.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -20,9 +20,7 @@
#include <string>
#include <utility>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "BaseLib/FileTools.h"
#include "BaseLib/LogogSimpleFormatter.h"
#include "BaseLib/Logging.h"
#include "GeoLib/Raster.h"
#include "InfoLib/GitInfo.h"
......@@ -577,8 +575,6 @@ static bool convert(NcFile const& dataset, NcVar const& var,
int main(int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converts NetCDF data into mesh file(s).\n\n "
"OpenGeoSys-6 software, version " +
......
Applications/Utils/FileConverter/OGS2VTK.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -16,7 +16,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "MeshLib/IO/VtkIO/VtuInterface.h"
#include "MeshLib/IO/readMeshFromFile.h"
......@@ -24,8 +23,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converts OGS mesh into VTK mesh.\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/FileConverter/TIN2VTK.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -13,8 +13,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
// BaseLib
#include "InfoLib/GitInfo.h"
#include "BaseLib/FileTools.h"
......@@ -34,8 +32,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converts TIN file into VTU file.\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/FileConverter/TecPlotTools.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -14,8 +14,6 @@
#include <tclap/CmdLine.h>
#include <Applications/ApplicationsLib/LogogSetup.h>
#include "InfoLib/GitInfo.h"
#include "BaseLib/StringTools.h"
......@@ -409,8 +407,6 @@ int convertFile(std::ifstream& in, std::string file_name)
*/
int main(int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"TecPlot Parser\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/FileConverter/VTK2OGS.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -16,7 +16,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "MeshLib/IO/Legacy/MeshIO.h"
#include "MeshLib/IO/VtkIO/VtuInterface.h"
......@@ -24,8 +23,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converts VTK mesh into OGS mesh.\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/FileConverter/VTK2TIN.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -13,8 +13,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
// BaseLib
#include "InfoLib/GitInfo.h"
#include "BaseLib/Logging.h"
......@@ -35,8 +33,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converts VTK mesh into TIN file.\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/FileConverter/convertGEO.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -14,7 +14,6 @@
#include "InfoLib/GitInfo.h"
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "Applications/FileIO/readGeometryFromFile.h"
#include "Applications/FileIO/writeGeometryToFile.h"
#include "GeoLib/GEOObjects.h"
......@@ -22,8 +21,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Converts OGS geometry file into another file format. "
"Currently *.gml (OGS6 XML-based format) and *.gli (OGS5 format) "
......
Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -16,8 +16,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "BaseLib/FileTools.h"
......@@ -29,8 +27,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Creates a new file for material properties and sets the material ids "
"in the msh-file to 0\n\n"
......
Applications/Utils/GeoTools/MoveGeometry.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -14,7 +14,6 @@
// ThirdParty
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "GeoLib/GEOObjects.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
......@@ -26,8 +25,6 @@ int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Moves the points of a geometry by a given displacement vector\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/GeoTools/TriangulatePolyline.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -15,7 +15,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "Applications/FileIO/Legacy/createSurface.h"
#include "InfoLib/GitInfo.h"
......@@ -40,8 +39,6 @@ int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv, false);
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Triangulates the specified polyline in the given geometry file.\n\n"
"OpenGeoSys-6 software, version " +
......
Applications/Utils/MeshEdit/AddTopLayer.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -13,7 +13,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "BaseLib/FileTools.h"
#include "MeshLib/IO/readMeshFromFile.h"
......@@ -23,8 +22,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Adds a top layer to an existing mesh"
"The documentation is available at "
......
Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -16,7 +16,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "Applications/FileIO/readGeometryFromFile.h"
#include "Applications/FileIO/writeGeometryToFile.h"
......@@ -123,8 +122,6 @@ void writeBCsAndGeometry(GeoLib::GEOObjects& geometry_sets,
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Creates boundary conditions for mesh nodes along polylines."
"The documentation is available at "
......
Applications/Utils/MeshEdit/ExtractSurface.cpp
+ 0
− 4
View file @ 4bb167c1
......@@ -15,8 +15,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "BaseLib/FileTools.h"
#include "BaseLib/StringTools.h"
......@@ -32,8 +30,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Tool extracts the surface of the given mesh. The documentation is "
"available at "
......
Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp
+ 0
− 3
View file @ 4bb167c1
......@@ -14,7 +14,6 @@
#include <tclap/CmdLine.h>
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "InfoLib/GitInfo.h"
#include "GeoLib/GEOObjects.h"
#include "GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h"
......@@ -24,8 +23,6 @@
int main (int argc, char* argv[])
{
ApplicationsLib::LogogSetup logog_setup;
TCLAP::CmdLine cmd(
"Maps geometric objects to the surface of a given mesh."
"The documentation is available at "
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment