[bos #32517][EDF] Dynamic logging: Removed MYDEBUG.

diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 46426c6fdeeca00566a6644d33fc924fffe3de2b..14a0c516d8411af592dbe4fd673cd8a4873aad67 100644 (file)
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -83,13 +83,6 @@
 #define C_SQR_BRACKET ']'
 #define PY_NULL "None"
 
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-using namespace std;
-#else
-static int MYDEBUG = 0;
-#endif
-
 // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump
 // Next macro, when defined, causes appearing of SubShapeAllIDs(), SubShapeAllSortedIDs(), GetSameIDs()
 // and other such commands in Python dump.
@@ -1302,10 +1295,10 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin
 void ReplaceVariables(TCollection_AsciiString& theCommand,
                       const TVariablesList&    theVariables)
 {
-  if (MYDEBUG)
+  if (SALOME::VerbosityActivated())
     std::cout<<"Command : "<<theCommand<<std::endl;
 
-  if (MYDEBUG) {
+  if (SALOME::VerbosityActivated()) {
     std::cout<<"All Entries:"<<std::endl;
     TVariablesList::const_iterator it = theVariables.begin();
     for(;it != theVariables.end();it++)
@@ -1319,7 +1312,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
     if( aCommand.Length() == 0 )
       break;
 
-    if (MYDEBUG)
+    if (SALOME::VerbosityActivated())
       std::cout<<"Sub-command : "<<aCommand<<std::endl;
 
     Standard_Integer aStartCommandPos = theCommand.Location(aCommand,1,theCommand.Length());
@@ -1337,7 +1330,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
     //Remove white spaces
     anEntry.RightAdjust();
     anEntry.LeftAdjust();
-    if(MYDEBUG)
+    if(SALOME::VerbosityActivated())
       std::cout<<"Result entry : '" <<anEntry<<"'"<<std::endl;
 
     if ( anEntry.IsEmpty() ) {
@@ -1355,8 +1348,8 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
       anEntry.Remove( 1, 1 );
       anEntry.RightAdjust();
       anEntry.LeftAdjust();
-      if(MYDEBUG)
-               std::cout<<"Sub-entry : '" <<anEntry<<"'"<<std::endl;
+      if(SALOME::VerbosityActivated())
+                   std::cout<<"Sub-entry : '" <<anEntry<<"'"<<std::endl;
     }
 
     //Find variables used for object construction
@@ -1366,15 +1359,15 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
       aStates = (*it).second;
 
     if(!aStates) {
-      if(MYDEBUG)
-               std::cout<<"Valiables list empty!!!"<<std::endl;
+      if(SALOME::VerbosityActivated())
+                   std::cout<<"Valiables list empty!!!"<<std::endl;
       aCommandIndex++;
       continue;
     }
 
     TState aVariables = aStates->GetCurrectState();
 
-    if(MYDEBUG) {
+    if(SALOME::VerbosityActivated()) {
           std::cout<<"Variables from SObject:"<<std::endl;
       for (size_t i = 0; i < aVariables.size();i++)
         std::cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<std::endl;
@@ -1385,8 +1378,8 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
     while(aCommand.Location(aTotalNbParams,COMMA,1,aCommand.Length()))
       aTotalNbParams++;
 
-    if(MYDEBUG)
-         std::cout<<"aTotalNbParams = "<<aTotalNbParams<<std::endl;
+    if(SALOME::VerbosityActivated())
+           std::cout<<"aTotalNbParams = "<<aTotalNbParams<<std::endl;
 
     Standard_Integer aFirstParam = aNbEntries;
 
@@ -1427,14 +1420,14 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
       if ( aStartPos == aEndPos )
         continue; // PAL20889: for "[]"
 
-      if(MYDEBUG)
+      if(SALOME::VerbosityActivated())
         std::cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<std::endl;
 
       aVar = aCommand.SubString(aStartPos, aEndPos-1);
       aVar.RightAdjust();
       aVar.LeftAdjust();
 
-      if(MYDEBUG)
+      if(SALOME::VerbosityActivated())
         std::cout<<"Variable: '"<< aVar <<"'"<<std::endl;
 
       // specific case for sketcher
@@ -1454,8 +1447,8 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
             aEndSectionPos = aVar.Length();
 
           aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
-          if(MYDEBUG)
-                       std::cout<<"aSection: "<<aSection<<std::endl;
+          if(SALOME::VerbosityActivated())
+                             std::cout<<"aSection: "<<aSection<<std::endl;
 
           Standard_Integer aNbParams = 1;
           while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) )
@@ -1471,15 +1464,15 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
             else
               aEndParamPos = aSection.Length() + 1;
 
-            if(MYDEBUG)
+            if(SALOME::VerbosityActivated())
               std::cout<<"aParamIndex: "<<aParamIndex<<" aStartParamPos: " <<aStartParamPos<<" aEndParamPos: "<<aEndParamPos<<std::endl;
 
             if ( aStartParamPos == aEndParamPos)
               continue;
 
             aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
-            if(MYDEBUG)
-                         std::cout<<"aParameter: "<<aParameter<<std::endl;
+            if(SALOME::VerbosityActivated())
+                               std::cout<<"aParameter: "<<aParameter<<std::endl;
 
             if(iVar >= aVariables.size())
               continue;
@@ -1495,27 +1488,30 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
               aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'");
             }
 
-            if(MYDEBUG)
-                         std::cout<<"aSection before : "<<aSection<< std::endl;
+            if(SALOME::VerbosityActivated())
+                               std::cout<<"aSection before : "<<aSection<< std::endl;
             aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
             aSection.Insert(aStartParamPos, aReplacedParameter);
-            if(MYDEBUG)
+            if(SALOME::VerbosityActivated())
               std::cout<<"aSection after  : "<<aSection<<std::endl<<std::endl;
             iVar++;
           }
-          if(MYDEBUG)
+
+          if(SALOME::VerbosityActivated())
             std::cout<<"aVar before : "<<aVar<<std::endl;
+
           aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
           aVar.Insert(aStartSectionPos, aSection);
-          if(MYDEBUG)
+
+          if(SALOME::VerbosityActivated())
             std::cout<<"aVar after  : "<<aVar<<std::endl<<std::endl;
         }
 
-        if(MYDEBUG)
+        if(SALOME::VerbosityActivated())
           std::cout<<"aCommand before : "<<aCommand<<std::endl;
         aCommand.Remove(aStartPos, aEndPos - aStartPos);
         aCommand.Insert(aStartPos, aVar);
-        if(MYDEBUG)
+        if(SALOME::VerbosityActivated())
           std::cout<<"aCommand after  : "<<aCommand<<std::endl;
 
         break;
@@ -1552,7 +1548,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
     aStates->IncrementState();
   }
 
-  if (MYDEBUG)
+  if (SALOME::VerbosityActivated())
     std::cout<<"Command : "<<theCommand<<std::endl;
 }
 

diff --git a/src/GEOMUtils/GEOMUtils_XmlHandler.cxx b/src/GEOMUtils/GEOMUtils_XmlHandler.cxx
index 8adaf196e920fa11d3df9b9047a718c42dfb6d96..e56cb5599f26cb0f33e6dff8c00e5a0df7fe0907 100644 (file)
--- a/src/GEOMUtils/GEOMUtils_XmlHandler.cxx
+++ b/src/GEOMUtils/GEOMUtils_XmlHandler.cxx
@@ -19,6 +19,7 @@
 
 #include "GEOMUtils_XmlHandler.hxx"
 #include <Basics_Utils.hxx>
+#include "utilities.h"
 
 #include <libxml/parser.h>
 #include <algorithm>
@@ -30,8 +31,6 @@
 #include <unistd.h>
 #endif
 
-//#define MYDEBUG
-
 namespace
 {
   const char*    env_var     = "GEOM_PluginsList";
@@ -186,7 +185,6 @@ namespace
          return xmlPaths;
   }
 
-#ifdef MYDEBUG
   void dumpinfo(const GEOMUtils::PluginInfo& info)
   {
     printf("DUMPING PLUGIN INFO\n");
@@ -210,7 +208,6 @@ namespace
       printf("-----\n");
     }
   }
-#endif
 }
 
 namespace GEOMUtils
@@ -284,9 +281,10 @@ namespace GEOMUtils
        //xmlCleanupParser();//vsr: xmlCleanupParser should not be called from the application
       } // end xml doc
     }
-#ifdef MYDEBUG
-    dumpinfo(info);
-#endif
+
+       if (SALOME::VerbosityActivated())
+       dumpinfo(info);
+
     return info;
   }
 }

diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx
index f7ddfe78c2425f78b5ddbe91625b1c0c3304e3bf..ed30100633e591e0e72fdf88a87b45777cf276ce 100644 (file)
--- a/src/OBJECT/GEOM_Actor.cxx
+++ b/src/OBJECT/GEOM_Actor.cxx
@@ -73,10 +73,6 @@
 
 //vtkStandardNewMacro(GEOM_Actor)
 
-#ifndef MYDEBUG
-//#define MYDEBUG
-#endif
-
 GEOM_Actor::GEOM_Actor(): 
   isOnlyVertex(false),
 
@@ -127,9 +123,8 @@ GEOM_Actor::GEOM_Actor():
   // defined in this class !!!
   myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true)
 { 
-#ifdef MYDEBUG
-  MESSAGE (this<< " GEOM_Actor::GEOM_Actor");
-#endif
+
+  MESSAGE(this<< " GEOM_Actor::GEOM_Actor");
 
   myPolyDataMapper->SetInputConnection(myAppendFilter->GetOutputPort()); 
   vtkProperty* aProperty;