diff --git a/SimpleTests/MeshTests/CollapseMeshNodes.cpp b/SimpleTests/MeshTests/CollapseMeshNodes.cpp index ee44736e2088a4aa288366480f328231f6cb9542..8145e97dde8f0be64c1e49f5a188bf4d134eace1 100644 --- a/SimpleTests/MeshTests/CollapseMeshNodes.cpp +++ b/SimpleTests/MeshTests/CollapseMeshNodes.cpp @@ -13,6 +13,7 @@ #include "MemWatch.h" #include "RunTime.h" #include "tclap/CmdLine.h" +#include "LogogSimpleFormatter.h" // BaseLib/logog #include "logog.hpp" @@ -24,23 +25,10 @@ #include "Legacy/MeshIO.h" #include "MeshCoarsener.h" - -/** - * new formatter for logog - */ -class FormatterCustom : public logog::FormatterGCC -{ - virtual TOPIC_FLAGS GetTopicFlags( const logog::Topic &topic ) - { - return ( Formatter::GetTopicFlags( topic ) & - ~( TOPIC_FILE_NAME_FLAG | TOPIC_LINE_NUMBER_FLAG )); - } -}; - int main(int argc, char *argv[]) { LOGOG_INITIALIZE(); - FormatterCustom *custom_format (new FormatterCustom); + BaseLib::LogogSimpleFormatter *custom_format (new BaseLib::LogogSimpleFormatter); logog::Cout *logogCout(new logog::Cout); logogCout->SetFormatter(*custom_format); diff --git a/SimpleTests/MeshTests/MeshSearchTest.cpp b/SimpleTests/MeshTests/MeshSearchTest.cpp index e8b7f7066e112290f5e889df77028f068a39f076..c70c22f042c95fdab8d874569540445c9edc1c02 100644 --- a/SimpleTests/MeshTests/MeshSearchTest.cpp +++ b/SimpleTests/MeshTests/MeshSearchTest.cpp @@ -13,6 +13,7 @@ #include "MemWatch.h" #include "RunTime.h" #include "tclap/CmdLine.h" +#include "LogogSimpleFormatter.h" // BaseLib/logog #include "logog.hpp" @@ -26,18 +27,6 @@ #include "Mesh.h" #include "Legacy/MeshIO.h" -/** - * new formatter for logog - */ -class FormatterCustom : public logog::FormatterGCC -{ - virtual TOPIC_FLAGS GetTopicFlags( const logog::Topic &topic ) - { - return ( Formatter::GetTopicFlags( topic ) & - ~( TOPIC_FILE_NAME_FLAG | TOPIC_LINE_NUMBER_FLAG )); - } -}; - void testMeshGridAlgorithm(MeshLib::Mesh const*const mesh, std::vector<GeoLib::Point*>& pnts_for_search, std::vector<size_t> &idx_found_nodes, bool contiguous) @@ -106,7 +95,7 @@ int main(int argc, char *argv[]) { LOGOG_INITIALIZE(); logog::Cout* logog_cout (new logog::Cout); - FormatterCustom *custom_format (new FormatterCustom); + BaseLib::LogogSimpleFormatter *custom_format (new BaseLib::LogogSimpleFormatter); logog_cout->SetFormatter(*custom_format); TCLAP::CmdLine cmd("Simple mesh search test", ' ', "0.1");