[bos #32517][EDF] Dynamic log messages switched on and off by SALOME_VERBOSE environm...

diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.cxx b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
index a3911ae855d22ef815a8a1862bd80a587b9d683e..c4a9479a3806b965aab8b01a52667d387e098588 100644 (file)
--- a/src/ARCHIMEDE/Archimede_VolumeSection.cxx
+++ b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
@@ -88,7 +88,7 @@ void VolumeSection::CenterOfGravity()
       TopoDS_Face F = TopoDS::Face(ex.Current());
       Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
       if(Tr.IsNull())
-        MESSAGE("Error, null layer" )
+        MESSAGE("Error, null layer" );
       nbNodes = Tr->NbNodes();
       const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
       
@@ -113,8 +113,8 @@ void VolumeSection::CenterOfGravity()
         }
     }
   
-  // Creation du point d'initialisation, c'est \80 dire le centre de gravit\89 
-  //g\89om\89trique de la boite englobante
+  // Creation du point d'initialisation, c'est e dire le centre de gravite 
+  // geometrique de la boite englobante
   
   InitPoint.SetX(0.5 * (Xmin + Xmax));
   InitPoint.SetY(0.5 * (Ymin + Ymax));
@@ -141,14 +141,14 @@ Standard_Real VolumeSection::CalculateVolume(Standard_Real Elevation)
       TopoDS_Face F = TopoDS::Face(ex.Current());
       Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
       if(Tr.IsNull())
-        MESSAGE("Error, null layer" )
+        MESSAGE("Error, null layer" );
       const Poly_Array1OfTriangle& triangles = Tr->Triangles();
       Standard_Integer nbTriangles = Tr->NbTriangles();
       //nbNodes = Tr->NbNodes();
       const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
       
       // Calcul des volumes de chaque triangle, de chaque face 
-      //en tenant compte des triangles coup\89s par le plan de section
+      // en tenant compte des triangles coupes par le plan de section
       
       for (i=1;i<=nbTriangles;i++) 
         {
@@ -234,7 +234,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
   Bsup = Zmax;
   if(Binf>Bsup)
     {
-      MESSAGE("error, Bound + < Bound - in dichotomy")
+      MESSAGE("error, Bound + < Bound - in dichotomy");
       return -1;
     }
   tempBsupVolume = CalculateVolume(Bsup);
@@ -242,7 +242,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
   
   if (Constante>tempBsupVolume || Constante<tempBinfVolume)
     {
-      MESSAGE("error, algorithm start Impossible. Wrong constant value" )
+      MESSAGE("error, algorithm start Impossible. Wrong constant value" );
       return -1;
     }
   
@@ -286,7 +286,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
       
     }
  endMethod:
-  MESSAGE("La ligne de flottaison correspondant a la constante :"<<Constante<<" est a la cote Z = "<<c)
+  MESSAGE("La ligne de flottaison correspondant a la constante :"<<Constante<<" est a la cote Z = "<<c);
   
   return c;
 }
@@ -372,7 +372,7 @@ gp_Pnt VolumeSection::Intersection(gp_Pnt P1,gp_Pnt P2,Standard_Real Hauteur)
   return Point;
 }
 
-//Fonction calculant le volume \89l\89mentaire de chaque t\89traedre \80 partir de 3 points
+// Fonction calculant le volume elementaire de chaque tetraedre e partir de 3 points
 Standard_Real VolumeSection::ElementaryVolume(gp_Pnt P1,gp_Pnt P2,gp_Pnt P3)
 {
   Standard_Real Determinant;

diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx
index 30765e9a1bd4ec3b04eb6a0ba6ec45b813a81c4a..b47285b72a5f96d04fdc9ec6322fed5ae79cbe88 100644 (file)
--- a/src/EntityGUI/EntityGUI.cxx
+++ b/src/EntityGUI/EntityGUI.cxx
@@ -352,7 +352,7 @@ bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_Vie
 //=====================================================================================
 void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Shape& S2 ) 
 {
-  MESSAGE("EntityGUI::DisplaySimulationShape")
+  MESSAGE("EntityGUI::DisplaySimulationShape");
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return;
 
@@ -401,7 +401,7 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
 //==================================================================================
 void EntityGUI::EraseSimulationShape()
 {
-  MESSAGE("EntityGUI::EraseSimulationShape")
+  MESSAGE("EntityGUI::EraseSimulationShape");
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return;
 

diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
index 5c2495d6514357abc1133b208b5f8da4251d33aa..af84e6b578c8d4913ce12ad87d7023fa3f98b06a 100644 (file)
--- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
+++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
@@ -505,7 +505,7 @@ bool EntityGUI_FeatureDetectorDlg::ClickOnApply()
 //=================================================================================
 void EntityGUI_FeatureDetectorDlg::ConstructorsClicked(int id)
 {
-  MESSAGE("Constructor id ="<<id)
+  MESSAGE("Constructor id ="<<id);
   myConstructorId = id;
   switch (id)
   {
@@ -671,7 +671,7 @@ ShapeRec_Parameters* EntityGUI_FeatureDetectorDlg::parametersChanged()
 void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
 {
   myStartPnt = theStartPnt;
-  MESSAGE("myStartPnt = ("<<theStartPnt.X()<<", "<<theStartPnt.Y()<<")")
+  MESSAGE("myStartPnt = ("<<theStartPnt.X()<<", "<<theStartPnt.Y()<<")");
 }
 
 //=================================================================================
@@ -681,7 +681,7 @@ void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
 void EntityGUI_FeatureDetectorDlg::setEndPnt(const gp_Pnt& theEndPnt)
 {
   myEndPnt = theEndPnt;
-  MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")")
+  MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")");
   if (setSelectionRect() && myDetector->GetImgHeight() > 0)
     showImageSample();
 }
@@ -814,10 +814,10 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
     
       bool insert;
     
-      MESSAGE("hierarchy.size() =" << hierarchy.size()) 
+      MESSAGE("hierarchy.size() =" << hierarchy.size());
       if ( hierarchy.size() < 1 ) {
-       getOperation()->SetErrorCode( "Impossible detected contours" );
-       return false;
+        getOperation()->SetErrorCode( "Impossible detected contours" );
+        return false;
       }
 
       for( ; idx >= 0; idx = hierarchy[idx][0])

diff --git a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
index 68774a9c6de2eee97e3861f76fff0add50d715fb..dc82efdd3f83b7de5ee11ae372d3ce365bb5e009 100644 (file)
--- a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
+++ b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
@@ -135,7 +135,7 @@ void EntityGUI_PictureImportDlg::FileSelectionClicked()
 //=================================================================================
 void EntityGUI_PictureImportDlg::ClickOnOk()
 {
-  MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()")
+  MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()");
   setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
@@ -147,7 +147,7 @@ void EntityGUI_PictureImportDlg::ClickOnOk()
 //=================================================================================
 bool EntityGUI_PictureImportDlg::ClickOnApply()
 {
-  MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()")
+  MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()");
   if ( !onAccept() )
     return false;
   

diff --git a/src/EntityGUI/EntityGUI_PolylineDlg.cxx b/src/EntityGUI/EntityGUI_PolylineDlg.cxx
index f3e06896fd645e083935f715fc7267cb7603ec17..6fcec142f3bca1fb6aae6e9b9c93c72afe0794fa 100644 (file)
--- a/src/EntityGUI/EntityGUI_PolylineDlg.cxx
+++ b/src/EntityGUI/EntityGUI_PolylineDlg.cxx
@@ -671,7 +671,7 @@ gp_Ax3 EntityGUI_PolylineDlg::WPlaneToLCS(GEOM::GeomObjPtr theGeomObj)
   gp_Ax3 aLCS;
 
   if (theGeomObj || aShape.IsNull()) {
-    MESSAGE("CORBA::is_nil(theGeomObj) || aShape.IsNull()")
+    MESSAGE("CORBA::is_nil(theGeomObj) || aShape.IsNull()");
   }
 
   aLCS.Transform(aShape.Location().Transformation());

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 82865e9cf46045e1617ac446c1df0a316e9af70b..7d20265f27fca5f51f4fe048438ccc91d6197b64 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -529,7 +529,7 @@ void EntityGUI_SketcherDlg::Init()
 //=================================================================================
 void EntityGUI_SketcherDlg::InitClick()
 {
-  MESSAGE("EntityGUI_SketcherDlg::InitClick()")
+  MESSAGE("EntityGUI_SketcherDlg::InitClick()");
   disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
   myCheckFlag = 0;
 
@@ -694,7 +694,7 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
 //=================================================================================
 void EntityGUI_SketcherDlg::PointClicked( int constructorId )
 {
-  MESSAGE("PointClicked")
+  MESSAGE("PointClicked");
   myConstructorPntId = constructorId;
   GroupPt->RB_Point3->setEnabled( true );
   int buttonId = GroupPt2->ButtonGroup->checkedId();
@@ -713,7 +713,7 @@ void EntityGUI_SketcherDlg::PointClicked( int constructorId )
 //=================================================================================
 void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
 {
-  MESSAGE("Point2Clicked")
+  MESSAGE("Point2Clicked");
   InitClick();
 
   // Get setting of step value from file configuration
@@ -1134,7 +1134,7 @@ void EntityGUI_SketcherDlg::ClickOnCancel()
 //=================================================================================
 void EntityGUI_SketcherDlg::ClickOnEnd()
 {
-  MESSAGE("EntityGUI_SketcherDlg::ClickOnEnd()")
+  MESSAGE("EntityGUI_SketcherDlg::ClickOnEnd()");
   if ( sender() == MainWidget->buttonClose ) {
     // Verify validity of commands
     if ( myCommand.count() <= 2 ) {
@@ -1190,7 +1190,7 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
 //=================================================================================
 bool EntityGUI_SketcherDlg::ClickOnApply()
 {
-  MESSAGE("EntityGUI_SketcherDlg::ClickOnApply()")
+  MESSAGE("EntityGUI_SketcherDlg::ClickOnApply()");
   if ( sender() && sender()->inherits( "QPushButton" ) )
     ( (QPushButton*)sender() )->setFocus(); // to update value of currently edited spin-box (PAL11948)
 
@@ -1357,7 +1357,7 @@ void EntityGUI_SketcherDlg::setEnabledRedo( bool value )
 //=================================================================================
 void EntityGUI_SketcherDlg::SelectionIntoArgument()
 {
-  MESSAGE("EntityGUI_SketcherDlg::SelectionIntoArgument")
+  MESSAGE("EntityGUI_SketcherDlg::SelectionIntoArgument");
   myEditCurrentArgument->setText( "" );
 
   LightApp_SelectionMgr* aSelMgr = myGeometryGUI->getApp()->selectionMgr();
@@ -1627,7 +1627,7 @@ void EntityGUI_SketcherDlg::DeactivateActiveDialog()
 //=================================================================================
 void EntityGUI_SketcherDlg::ActivateThisDialog()
 {
-  MESSAGE("EntityGUI_SketcherDlg::ActivateThisDialog()")
+  MESSAGE("EntityGUI_SketcherDlg::ActivateThisDialog()");
   myGeometryGUI->EmitSignalDeactivateDialog();
   setEnabled( true );
   myGeometryGUI->SetActiveDialogBox( this );
@@ -1679,7 +1679,7 @@ void EntityGUI_SketcherDlg::enterEvent( QEvent* )
 //=================================================================================
 void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e )
 {
-  MESSAGE("EntityGUI_SketcherDlg::closeEvent")
+  MESSAGE("EntityGUI_SketcherDlg::closeEvent");
   //myGeometryGUI->SetState( -1 );
   disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
   myGeometryGUI->getApp()->updateActions();
@@ -2317,7 +2317,7 @@ bool EntityGUI_SketcherDlg::isValid( QString& msg )
 //=================================================================================
 bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
 {
-  MESSAGE("EntityGUI_SketcherDlg::execute")
+  MESSAGE("EntityGUI_SketcherDlg::execute");
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
   int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
   int DigNum = qAbs(aPrecision);                   // options for the format of numbers in myNewCommand
@@ -2789,7 +2789,7 @@ gp_Ax3 EntityGUI_SketcherDlg::WPlaneToLCS( GEOM::GEOM_Object_var geomObj )
   gp_Ax3 aLCS;
   if (CORBA::is_nil( geomObj ) || aShape.IsNull())
   {
-    MESSAGE("CORBA::is_nil( geomObj ) || aShape.IsNull()")
+    MESSAGE("CORBA::is_nil( geomObj ) || aShape.IsNull()");
   }
   aLCS.Transform(aShape.Location().Transformation());
   if (aShape.ShapeType() == TopAbs_FACE)

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/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 332b1652b651d3741f7220d51d767b4d6570a435..71e8bcb3eb0d9abc168e7399fbfe0098536dafff 100644 (file)
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -754,7 +754,7 @@ bool GEOMBase_Helper::openCommand()
   bool res = false;
   if ( !getStudy() || hasCommand() )
   {
-    MESSAGE("Getting out from openCommand()")
+    MESSAGE("Getting out from openCommand()");
       return res;
   }
 
@@ -766,8 +766,8 @@ bool GEOMBase_Helper::openCommand()
   }
   else
   {
-    MESSAGE("anOp->_is_nil() = true")
-      }
+    MESSAGE("anOp->_is_nil() = true");
+  }
 
   return res;
 }
@@ -857,7 +857,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
   if ( !appStudy )
   {
-    MESSAGE("appStudy is empty")
+    MESSAGE("appStudy is empty");
       return false;
   }
   _PTR(Study) aStudy = appStudy->studyDS();
@@ -968,13 +968,13 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
   catch( const SALOME::SALOME_Exception& e ) {
     SalomeApp_Tools::QtCatchCorbaException( e );
     abortCommand();
-    MESSAGE("Exception caught")
-      }
+    MESSAGE("Exception caught");
+  }
 
   updateViewer();
 
-  MESSAGE("result ="<<result)
-    return result;
+  MESSAGE("result ="<<result);
+  return result;
 }
 
 

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
index 878b5bad8bcfcc7803d7d010487336bdc7e62b85..e95f3880b49741ec1a0f0ddff0a0f6fbfe0077a6 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@@ -1846,7 +1846,7 @@ Standard_Integer GEOMImpl_IShapesOperations::GetSubShapeIndex (Handle(GEOM_Objec
 Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndices (Handle(GEOM_Object) theMainShape,
                                                                                     std::list<Handle(GEOM_Object)> theSubShapes)
 {
-  MESSAGE("GEOMImpl_IShapesOperations::GetSubShapesIndices")
+  MESSAGE("GEOMImpl_IShapesOperations::GetSubShapesIndices");
   SetErrorCode(KO);
   
   Handle(TColStd_HSequenceOfInteger) aSeq = new TColStd_HSequenceOfInteger;
@@ -1854,7 +1854,7 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndic
   TopoDS_Shape aMainShape = theMainShape->GetValue();
   if (aMainShape.IsNull())
   {
-    MESSAGE("NULL main shape")
+    MESSAGE("NULL main shape");
     return NULL;
   }
   
@@ -1867,7 +1867,7 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndic
     TopoDS_Shape aSubShape = (*it)->GetValue(); 
     if (aSubShape.IsNull())
     {
-      MESSAGE("NULL subshape")
+      MESSAGE("NULL subshape");
       return NULL;
     }
     int id = anIndices.FindIndex(aSubShape);

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/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc
index 751c8839cde7b2f703ca07df7752d33902810a66..1c2a0aa0e3f5db652bf016ae6ecde04957fc12a9 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.cc
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc
@@ -977,7 +977,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetSubShapesIndices
     Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
     if (aSh.IsNull())
     {
-      MESSAGE("NULL shape")
+      MESSAGE("NULL shape");
       return aSeq._retn();
     }
     aShapes.push_back(aSh);

diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx
index f7ddfe78c2425f78b5ddbe91625b1c0c3304e3bf..6ca9b475f9ff91235f3e1536544d17a35c369773 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; 
@@ -215,9 +210,8 @@ GEOM_Actor::GEOM_Actor():
  
 GEOM_Actor::~GEOM_Actor() 
 { 
-#ifdef MYDEBUG
-  MESSAGE (this<< " ~GEOM_Actor::GEOM_Actor");
-#endif
+  MESSAGE(this << " ~GEOM_Actor::GEOM_Actor");
+
   myTextActor->Delete();
   myHighlightProp->Delete();
   myPreHighlightProp->Delete();
@@ -319,9 +313,7 @@ void
 GEOM_Actor:: 
 setDisplayMode(int theMode) 
 { 
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::setDisplayMode = "<<theMode );
-#endif
+  MESSAGE("GEOM_Actor::setDisplayMode = " << theMode);
 
   if ( theMode == (int)eShadingWithEdges ) {
     // Coloring edges
@@ -356,9 +348,7 @@ void
 GEOM_Actor:: 
 SetSelected(bool theIsSelected) 
 { 
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::SetSelected = "<<theIsSelected  );
-#endif
+  MESSAGE("GEOM_Actor::SetSelected = " << theIsSelected);
 
   myIsSelected = theIsSelected; 
   SetVisibility(GetVisibility()); 
@@ -368,10 +358,8 @@ void
 GEOM_Actor:: 
 SetVisibility(int theVisibility) 
 { 
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::SetVisibility = "<<theVisibility <<"  myIsSelected="<< myIsSelected
-            << " theVisibility="<<theVisibility<<" myIsPreselected="<<myIsPreselected );
-#endif
+  MESSAGE("GEOM_Actor::SetVisibility = " << theVisibility << "  myIsSelected=" << myIsSelected
+            << " theVisibility=" << theVisibility << " myIsPreselected=" << myIsPreselected);
 
   SALOME_Actor::SetVisibility(theVisibility);
 
@@ -553,18 +541,16 @@ void GEOM_Actor::SetShape (const TopoDS_Shape& theShape,
 
 void GEOM_Actor::SetHighlightProperty(vtkProperty* Prop)
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::SetHighlightProperty" );
-#endif
+  MESSAGE("GEOM_Actor::SetHighlightProperty");
+
   this->myHighlightActor->GetProperty()->DeepCopy(Prop);
   
 }
 
 void GEOM_Actor::SetWireframeProperty(vtkProperty* Prop)
 {
-#ifdef MYDEBUG
-  MESSAGE ( this << " GEOM_Actor::SetWireframeProperty" );
-#endif
+  MESSAGE(this << " GEOM_Actor::SetWireframeProperty");
+
   // must be filled
   myWireframeFaceActor->SetProperty(Prop);
 }
@@ -602,9 +588,8 @@ vtkProperty* GEOM_Actor::GetFaceEdgeProperty()
 
 void GEOM_Actor::SetShadingProperty(vtkProperty* Prop)
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::SetShadingProperty" );
-#endif
+  MESSAGE("GEOM_Actor::SetShadingProperty");
+
   myShadingFaceProp->DeepCopy(Prop);
 }
 
@@ -617,9 +602,7 @@ vtkProperty* GEOM_Actor::GetShadingProperty()
 
 void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::Render" );
-#endif
+  MESSAGE("GEOM_Actor::Render");
 
   if(!GetVisibility())
     return;
@@ -695,18 +678,13 @@ void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
 
 void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *)
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::ReleaseGraphicsResources" );
-#endif  
+  MESSAGE("GEOM_Actor::ReleaseGraphicsResources");
 }
 
-
-
 void GEOM_Actor::ShallowCopy(vtkProp *prop)
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::ShallowCopy" );
-#endif
+  MESSAGE("GEOM_Actor::ShallowCopy");
+
   GEOM_Actor *f = GEOM_Actor::SafeDownCast(prop);
   if ( f != NULL )
     {
@@ -717,48 +695,40 @@ void GEOM_Actor::ShallowCopy(vtkProp *prop)
   this->SALOME_Actor::ShallowCopy(prop);
 }
 
-const TopoDS_Shape& GEOM_Actor::getTopo() {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::getTopo" );
-#endif
+const TopoDS_Shape& GEOM_Actor::getTopo()
+{
+  MESSAGE("GEOM_Actor::getTopo");
+
   return myShape;
 }
 
 void GEOM_Actor::setInputShape(const TopoDS_Shape& /*ashape*/, double /*adef1*/,
                                int /*imode*/, bool /*isVector*/)
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::setInputShape" );
-#endif
+  MESSAGE("GEOM_Actor::setInputShape");
 }
 
 double GEOM_Actor::isVector()
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::isVector" );
-#endif  
+  MESSAGE("GEOM_Actor::isVector");
+
   return 0;
 }
 
 void GEOM_Actor::SubShapeOn()
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::SubShapeOn" );
-#endif  
+  MESSAGE("GEOM_Actor::SubShapeOn");
 }
 
 void GEOM_Actor::SubShapeOff()
 {
-#ifdef MYDEBUG
-  MESSAGE ( "GEOM_Actor::SubShapeOff" );
-#endif
+  MESSAGE("GEOM_Actor::SubShapeOff");
 }
 
 void GEOM_Actor::highlight(bool highlight)
 {
-#ifdef MYDEBUG
-  MESSAGE ( this << " GEOM_Actor::highlight highlight="<<highlight );
-#endif
+  MESSAGE(this << " GEOM_Actor::highlight highlight=" << highlight);
+
   SALOME_Actor::highlight(highlight);  
 }
 
@@ -973,9 +943,8 @@ GEOM_Actor
 ::Highlight(bool theIsHighlight)
 {
   myIsSelected = theIsHighlight;
-#ifdef MYDEBUG
-  MESSAGE ( this << " GEOM_Actor::Highlight myIsSelected="<<myIsSelected );
-#endif
+
+  MESSAGE(this << " GEOM_Actor::Highlight myIsSelected=" << myIsSelected);
 
   SALOME_Actor::Highlight(theIsHighlight); // this method call ::highlight(theIsHighlight) in the end
   SetVisibility(GetVisibility());
@@ -990,9 +959,7 @@ GEOM_Actor
                SVTK_SelectionEvent* theSelectionEvent,
                bool theIsHighlight)
 {
-#ifdef MYDEBUG
-  MESSAGE ( this<<" GEOM_Actor::PreHighlight (3) theIsHighlight="<<theIsHighlight );
-#endif
+  MESSAGE(this << " GEOM_Actor::PreHighlight (3) theIsHighlight=" << theIsHighlight);
 
   if ( !GetPickable() )
     return false;  
@@ -1040,14 +1007,12 @@ GEOM_Actor
             bool theIsHighlight)
 {
   // define the selection of object
-#ifdef MYDEBUG
-  MESSAGE ( std::endl << this << " GEOM_Actor::Highlight (3) myIsSelected="<<myIsSelected );
-#endif
+  MESSAGE(std::endl << this << " GEOM_Actor::Highlight (3) myIsSelected=" << myIsSelected);
+
   bool aRet = SALOME_Actor::Highlight(theInteractorStyle,theSelectionEvent,theIsHighlight);
   SetSelected(theIsHighlight);
   if(theIsHighlight)
     SetPreSelected(false);
-  
  
   return aRet;
 }

diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx
index 4579325380ca4d76389b2d4481c7ba5a7838ff9a..0dad2a6d85ddf5e7a66ed85443f3c07a5fdf7bc2 100644 (file)
--- a/src/OBJECT/GEOM_OCCReader.cxx
+++ b/src/OBJECT/GEOM_OCCReader.cxx
@@ -253,9 +253,9 @@ void GEOM_OCCReader::createIsos(const GEOMUtils::Hatcher &theHatcher,
 
   if (anIndices.IsNull() || aParams.IsNull()) {
     if (IsUIso) {
-      MESSAGE("GEOMUtils_Hatcher: null U-isoline indices")
+      MESSAGE("GEOMUtils_Hatcher: null U-isoline indices");
     } else {
-      MESSAGE("GEOMUtils_Hatcher: null V-isoline indices")
+      MESSAGE("GEOMUtils_Hatcher: null V-isoline indices");
     }
   } else {
     const GeomAbs_IsoType aType    = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV);
@@ -271,9 +271,9 @@ void GEOM_OCCReader::createIsos(const GEOMUtils::Hatcher &theHatcher,
 
         if (aNbDomains < 0) {
           if (IsUIso) {
-            MESSAGE("GEOMUtils_Hatcher: U iso of parameter: "<<aParam)
+            MESSAGE("GEOMUtils_Hatcher: U iso of parameter: "<<aParam);
           } else {
-            MESSAGE("GEOMUtils_Hatcher: V iso of parameter: "<<aParam)
+            MESSAGE("GEOMUtils_Hatcher: V iso of parameter: "<<aParam);
           }
 
           switch (theHatcher.GetHatcher().Status (aHatchingIndex)) {

diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
index af6df93cf41209c3944dada7ee4d2c7d7d5ef87e..5f1547c9b2ae22d9d02f9ed1dce33bde88a96eb2 100644 (file)
--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
@@ -257,7 +257,7 @@ bool ShapeRec_FeatureDetector::ComputeContours( bool useROI, ShapeRec_Parameters
   Computes the lines in the image located at imagePath
 */
 bool ShapeRec_FeatureDetector::ComputeLines(){
-  MESSAGE("ShapeRec_FeatureDetector::ComputeLines()")
+  MESSAGE("ShapeRec_FeatureDetector::ComputeLines()");
   // Initialising images
   cv::Mat src, src_gray, detected_edges, dst;