From: Konstantin LEONTEV Date: Fri, 14 Oct 2022 11:58:00 +0000 (+0300) Subject: [bos #32517][EDF] Dynamic logging: Removed _MYDEBUG_. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=18a8413e3b8006ff34c84259b823761b198c91ba;p=modules%2Fsmesh.git [bos #32517][EDF] Dynamic logging: Removed _MYDEBUG_. --- diff --git a/src/SMESHUtils/SMESH_MAT2d.cxx b/src/SMESHUtils/SMESH_MAT2d.cxx index 944c9a9eb..43a44394c 100644 --- a/src/SMESHUtils/SMESH_MAT2d.cxx +++ b/src/SMESHUtils/SMESH_MAT2d.cxx @@ -46,11 +46,9 @@ #include #include -#ifdef _DEBUG_ -//#define _MYDEBUG_ #include "SMESH_File.hxx" #include "SMESH_Comment.hxx" -#endif +#include "utilities.h" using namespace std; using boost::polygon::x; @@ -155,12 +153,13 @@ namespace // } // ------------------------------------------------------------------------------------- -#ifdef _MYDEBUG_ + // writes segments into a txt file readable by voronoi_visualizer void inSegmentsToFile( vector< InSegment>& inSegments) { - if ( inSegments.size() > 1000 ) + if (inSegments.size() > 1000 || !SALOME::VerbosityActivated()) return; + const char* fileName = "/misc/dn25/salome/eap/salome/misc/Code/C++/MAdebug.txt"; const char* user = getenv("USER"); if ( !user || strcmp( user, "eap" )) return; @@ -219,11 +218,6 @@ namespace } while (edge != cell->incident_edge()); } } -#else - #define inSegmentsToFile(arg) {} - //void dumpEdge( const TVDEdge* edge ) {} - //void dumpCell( const TVDCell* cell ) {} -#endif } // ------------------------------------------------------------------------------------- @@ -420,9 +414,9 @@ namespace void bndSegsToMesh( const vector< vector< BndSeg > >& bndSegsPerEdge ) { - if ( bndSegsPerEdge.empty() ) + if (bndSegsPerEdge.empty() || !SALOME::VerbosityActivated()) return; -#ifdef _MYDEBUG_ + if ( !getenv("bndSegsToMesh")) return; map< const TVDVertex *, int > v2Node; map< const TVDVertex *, int >::iterator v2n; @@ -472,7 +466,6 @@ namespace text << "\n"; file.write( text.c_str(), text.size() ); cout << fileName << endl; -#endif } //================================================================================ diff --git a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx index e91c8806c..7e7920ba7 100644 --- a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx +++ b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx @@ -38,25 +38,13 @@ using namespace std; -// Define error message and _MYDEBUG_ if needed -#ifdef _DEBUG_ +// Define error message #define BAD_MESH_ERR \ error(SMESH_Comment("Can't detect block-wise structure of the input 2D mesh.\n" \ __FILE__ ":" )<<__LINE__) -//#define _MYDEBUG_ -#else -#define BAD_MESH_ERR \ - error(SMESH_Comment("Can't detect block-wise structure of the input 2D mesh")) -#endif - // Debug output -#ifdef _MYDEBUG_ #define _DUMP_(msg) cout << msg << endl -#else -#define _DUMP_(msg) -#endif - namespace { @@ -68,12 +56,12 @@ namespace { B_BOTTOM=0, B_RIGHT, B_TOP, B_LEFT, B_FRONT, B_BACK, NB_BLOCK_SIDES }; -#ifdef _MYDEBUG_ + const char* SBoxSides[] = //!< names of block sides -- needed for DEBUG only { "BOTTOM", "RIGHT", "TOP", "LEFT", "FRONT", "BACK", "UNDEFINED" }; -#endif + enum EQuadEdge //!< edges of quadrangle side { Q_BOTTOM = 0, Q_RIGHT, Q_TOP, Q_LEFT, NB_QUAD_SIDES