IPAL 18631 Remove Extra Messages from the Terminal in case of Release Mode

diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 335f53435bc43913b6c2677ac4ed601aaeb61b1c..2db3accd07f3ee9a98557e563d56f6a57d538019 100644 (file)
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -447,7 +447,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
       aNode = Itr.Value();
       aFunction = GEOM_Function::GetFunction(aNode->Label());
       if(aFunction.IsNull()) {
-       cout << "Null function !!!!" << endl;
+       MESSAGE ( "Null function !!!!" );
        continue;
       }
       ProcessFunction(aFunction, aScript, aMap);

diff --git a/src/GEOM/geom.cxx b/src/GEOM/geom.cxx
index 8ac0deb96856dab8a520f005ee8772838296fd50..c73e82e77d38683b54935b97ae1e07d51cf74592 100644 (file)
--- a/src/GEOM/geom.cxx
+++ b/src/GEOM/geom.cxx
@@ -32,6 +32,8 @@
 #include <GEOM_Gen_i.hh>
 #include <SALOME_NamingService.hxx>
 
+#include "utilities.h"
+
 //==================================================================================
 // function : main()                      MAIN 
 // purpose  :
@@ -70,19 +72,19 @@ int main(int argc, char** argv)
     orb->destroy();
   }
   catch(CORBA::SystemException&) {
-    cerr << "Caught CORBA::SystemException." << endl;
+    INFOS ( "Caught CORBA::SystemException." );
   }
   catch(CORBA::Exception&) {
-    cerr << "Caught CORBA::Exception." << endl;
+    INFOS ( "Caught CORBA::Exception." );
   }
   catch(omniORB::fatalException& fe) {
-    cerr << "Caught omniORB::fatalException:" << endl;
-    cerr << "  file: " << fe.file() << endl;
-    cerr << "  line: " << fe.line() << endl;
-    cerr << "  msg: " << fe.errmsg() << endl;
+    INFOS ( "Caught omniORB::fatalException:" );
+    INFOS ( "  file: " << fe.file() );
+    INFOS ( "  line: " << fe.line() );
+    INFOS ( "  msg: " << fe.errmsg() );
   }
   catch(...) {
-    cerr << "Caught unknown exception." << endl;
+    INFOS ( "Caught unknown exception." );
   }
   return 0;
 }

diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.cxx b/src/GEOMAlgo/BlockFix_UnionEdges.cxx
index 667375123b1ff775b2aa560fbe9445d926f622ea..1cdb061a2c1166b17345044e44ba46a4ae3fa724 100644 (file)
--- a/src/GEOMAlgo/BlockFix_UnionEdges.cxx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.cxx
@@ -56,6 +56,7 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Iterator.hxx>
 
+#include "utilities.h"
 
 //=======================================================================
 //function : BlockFix_UnionEdges()
@@ -109,7 +110,7 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
     }
   }
   if(aChain.Length()<SeqEdges.Length()) {
-    cout<<"can not create correct chain..."<<endl;
+    MESSAGE ("can not create correct chain...");
     return Standard_False;
   }
   // union edges in chain
@@ -197,12 +198,12 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
     }
   }
   if(j<aChain.Length()) {
-    cout<<"null curve3d in edge..."<<endl;
+    MESSAGE ("null curve3d in edge...");
     return Standard_False;
   }
   if(aChain.Length()>1) {
     // second step: union edges with various curves
-    cout<<"can not make analitical union => make approximation"<<endl;
+    MESSAGE ("can not make analitical union => make approximation");
     TopoDS_Wire W;
     B.MakeWire(W);
     for(j=1; j<=aChain.Length(); j++) {

diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
index 2ec4e5e397e89baef23af36cabb8831a5d4ea966..90467d2b9f60fcffebedbc1344f63e6285444ff0 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
@@ -737,16 +737,16 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
   //Add a new Chamfer function
   Handle(GEOM_Function) aFunction =
     aChamfer->AddFunction(GEOMImpl_ChamferDriver::GetID(), CHAMFER_SHAPE_EDGES);
-  if (aFunction.IsNull()) { return NULL; cout << "Edges Function is NULL!!!" << endl; }
+  if (aFunction.IsNull()) { MESSAGE ( "Edges Function is NULL!!!" ); return NULL;}
 
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ChamferDriver::GetID())
-       { return NULL; cout << "Chamfer Driver is NULL!!!" << endl; }
+       { MESSAGE ( "Chamfer Driver is NULL!!!" ); return NULL; }
 
   GEOMImpl_IChamfer aCI (aFunction);
 
   Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) { return NULL; cout << "Shape is NULL!!!" << endl; }
+  if (aRefShape.IsNull()) { MESSAGE ("Shape is NULL!!!"); return NULL;}
 
   aCI.SetShape(aRefShape);
   aCI.SetD1(theD1);
@@ -809,16 +809,16 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
   //Add a new Chamfer function
   Handle(GEOM_Function) aFunction =
     aChamfer->AddFunction(GEOMImpl_ChamferDriver::GetID(), CHAMFER_SHAPE_EDGES_AD);
-  if (aFunction.IsNull()) { return NULL; cout << "Edges Function is NULL!!!" << endl; }
+  if (aFunction.IsNull()) { MESSAGE ( "Edges Function is NULL!!!" ); return NULL; }
 
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ChamferDriver::GetID())
-       { return NULL; cout << "Chamfer Driver is NULL!!!" << endl; }
+       { MESSAGE("Chamfer Driver is NULL!!!"); return NULL;}
 
   GEOMImpl_IChamfer aCI (aFunction);
 
   Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) { return NULL; cout << "Shape is NULL!!!" << endl; }
+  if (aRefShape.IsNull()) { MESSAGE ("Shape is NULL!!!"); return NULL;}
 
   aCI.SetShape(aRefShape);
   aCI.SetD(theD);

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
index cad1b06953e4691a9d6e1f4e6b07bdc55458e68b..ad976665b5e957564fcd80242995ec8b674eeb96 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@@ -2893,9 +2893,6 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace (Handle(GEOM_Object)
     else if ( compType == TopAbs_SOLID || compType == TopAbs_COMPSOLID) iType = TopAbs_SOLID;
   }
   else {
-    //MESSAGE("");
-    //MESSAGE("WARNING : the 'GetInPlace' function parameter used to extract a shape is probably of Vertex type !");
-    //MESSAGE("");
     SetErrorCode("Error: An attempt to extract a shape of not supported type.");
     return NULL;
   }

diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
index df73fdb802de16c2b3c2e7b25336e2b404948d18..41aec47585d22ed6c750270cb1b0b5250b616a44 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
@@ -146,7 +146,7 @@ static bool FillForOtherEdges(const TopoDS_Shape& F1,
   ShapeAnalysis_Edge sae;
   while(1) {
     if(!aMapVertEdge1.Contains(VS1))
-      cout<<"    FillForOtherEdges: map aMapVertEdge1 not contains key VS1"<<endl;
+      MESSAGE ("    FillForOtherEdges: map aMapVertEdge1 not contains key VS1");
     const TopTools_ListOfShape& aList1 = aMapVertEdge1.FindFromKey(VS1);
     //TopoDS_Shape E1next;
     TopTools_ListIteratorOfListOfShape anIter1(aList1);
@@ -155,7 +155,7 @@ static bool FillForOtherEdges(const TopoDS_Shape& F1,
     }
     //E1next = anIter1.Value();
     if(!aMapVertEdge2.Contains(VS2))
-      cout<<"    FillForOtherEdges: map aMapVertEdge2 not contains key VS2"<<endl;
+      MESSAGE ("    FillForOtherEdges: map aMapVertEdge2 not contains key VS2");
     const TopTools_ListOfShape& aList2 = aMapVertEdge2.FindFromKey(VS2);
     //TopoDS_Shape E2next;
     TopTools_ListIteratorOfListOfShape anIter2(aList2);
@@ -444,7 +444,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
       Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not find edge in map");
     }
     if(!FF.Contains(E1))
-      cout<<"    FindNextPairOfFaces: map FF not contains key E1"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map FF not contains key E1");
     const TopoDS_Shape& E2 = FF.FindFromKey(E1);
     TopExp_Explorer anExpV;
     anExpV.Init( E1, TopAbs_VERTEX );
@@ -455,7 +455,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
     }
 
     if(!aMapEdgeFaces1.Contains(E1))
-      cout<<"    FindNextPairOfFaces: map aMapEdgeFaces1 not contains key E1"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map aMapEdgeFaces1 not contains key E1");
     const TopTools_ListOfShape& aList1 = aMapEdgeFaces1.FindFromKey(E1);
     if(aList1.Extent()<2)
       continue;
@@ -468,10 +468,10 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
       continue;
 
     if(!FF.Contains(aCurFace))
-      cout<<"    FindNextPairOfFaces: map FF not contains key aCurFace"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map FF not contains key aCurFace");
     const TopoDS_Shape& F2 = FF.FindFromKey(aCurFace);
     if(!aMapEdgeFaces2.Contains(E2))
-      cout<<"    FindNextPairOfFaces: map aMapEdgeFaces2 not contains key E2"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map aMapEdgeFaces2 not contains key E2");
     const TopTools_ListOfShape& aList2 = aMapEdgeFaces2.FindFromKey(E2);
     if(aList2.Extent()<2) {
       if(aCI) delete aCI;
@@ -543,17 +543,17 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
   if(!V1.IsSame(V1new)) {
     V1 = V1new;
     P1 = BRep_Tool::Pnt(V1);
-    cout<<"  replace V1"<<endl;
+    MESSAGE ("  replace V1");
   }
   else
-    cout<<"  not replace V1"<<endl;
+    MESSAGE ("  not replace V1");
   if(!V2.IsSame(V2new)) {
     V2 = V2new;
     P2 = BRep_Tool::Pnt(V2);
-    cout<<"  replace V2"<<endl;
+    MESSAGE ("  replace V2");
   }
   else
-    cout<<"  not replace V2"<<endl;
+    MESSAGE ("  not replace V2");
 
   TopTools_IndexedDataMapOfShapeListOfShape aMapVertFaces1;
   TopExp::MapShapesAndAncestors(S1, TopAbs_VERTEX, TopAbs_FACE, aMapVertFaces1);
@@ -561,7 +561,7 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
   TopExp::MapShapesAndAncestors(S2, TopAbs_VERTEX, TopAbs_FACE, aMapVertFaces2);
 
   if(!aMapVertFaces1.Contains(V1))
-    cout<<"    FindFirstPairFaces: map aMapVertFaces1 not contains key V1"<<endl;
+    MESSAGE ("    FindFirstPairFaces: map aMapVertFaces1 not contains key V1");
   const TopTools_ListOfShape& aList1 = aMapVertFaces1.FindFromKey(V1);
   TopTools_ListIteratorOfListOfShape anIter1(aList1);
   FS1 = anIter1.Value();
@@ -581,7 +581,7 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
   TColgp_SequenceOfPnt Ps;
   TopTools_SequenceOfShape Fs;
   if(!aMapVertFaces2.Contains(V2))
-    cout<<"    FindFirstPairFaces: map aMapVertFaces2 not contains key V2"<<endl;
+    MESSAGE ("    FindFirstPairFaces: map aMapVertFaces2 not contains key V2");
   const TopTools_ListOfShape& aList2 = aMapVertFaces2.FindFromKey(V2);
   TopTools_ListIteratorOfListOfShape anIter2(aList2);
   for(; anIter2.More(); anIter2.Next()) {
@@ -1437,7 +1437,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
   B.MakeCompound(aComp);
 
   for(i=1 ; i<nbBases; i++) {
-    cout<<"Make pipe between sections "<<i<<" and "<<i+1<<endl;
+    MESSAGE ("Make pipe between sections "<<i<<" and "<<i+1);
     TopoDS_Shape aShBase1 = Bases.Value(i);
     TopoDS_Shape aShBase2 = Bases.Value(i+1);
     TopExp_Explorer anExp;
@@ -1478,7 +1478,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
     FindFirstPairFaces(aShBase1, aShBase2, V1, V2, FS1, FS2);
 
     FF.Add(FS1,FS2);
-    cout<<"  first pair of corresponding faces is found"<<endl;
+    MESSAGE ("  first pair of corresponding faces is found");
 
     // add pairs of edges and vertexes to FF
     bool stat =  FillCorrespondingEdges(FS1, FS2, V1, V2, FF);
@@ -1486,10 +1486,10 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
       if(aCI) delete aCI;
       Standard_ConstructionError::Raise("Can not create correct pipe");
     }
-    cout<<"  correspondences for subshapes of first pair of faces is found"<<endl;
+    MESSAGE ("  correspondences for subshapes of first pair of faces is found");
 
     FindNextPairOfFaces(FS1, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI);
-    cout<<"  other correspondences is found, make pipe for all pairs of faces"<<endl;
+    MESSAGE ("  other correspondences is found, make pipe for all pairs of faces");
 
     // make pipe for each pair of faces
     // auxilary map vertex->edge for created pipe edges
@@ -1506,7 +1506,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
 
       //if(nbff!=3) continue;
 
-      cout<<"    make pipe for "<<nbff<<" face"<<endl;
+      MESSAGE ("    make pipe for "<<nbff<<" face");
 
       Handle(Geom_Surface) S1 = BRep_Tool::Surface(TopoDS::Face(F1));
       if(S1->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) {
@@ -1550,12 +1550,12 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
        TopoDS_Edge E1 = TopoDS::Edge(anExpE.Current());
        //nbee++;
        if(!FF.Contains(E1))
-         cout<<"map FF not contains key E1"<<endl;
+         MESSAGE ("map FF not contains key E1");
 
        if(VPE.Contains(E1)) {
          aNewFs.Append(VPE.FindFromKey(E1));
 #ifdef _DEBUG_
-         cout<<"    using existed face"<<endl;
+         MESSAGE ("    using existed face");
 #endif
          continue;
        }
@@ -1564,9 +1564,9 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
        TopoDS_Vertex V1 = sae.FirstVertex(E1);
        TopoDS_Vertex V2 = sae.LastVertex(E1);
        if(!FF.Contains(V1))
-         cout<<"map FF not contains key V1"<<endl;
+         MESSAGE ("map FF not contains key V1");
        if(!FF.Contains(V2))
-         cout<<"map FF not contains key V2"<<endl;
+         MESSAGE ("map FF not contains key V2");
        TopoDS_Vertex V3 = TopoDS::Vertex(FF.FindFromKey(V2));
        TopoDS_Vertex V4 = TopoDS::Vertex(FF.FindFromKey(V1));
        TopoDS_Vertex Vtmp = sae.FirstVertex(E3);
@@ -1683,7 +1683,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
          BS = GF.Surface();
        }
        catch(...) {
-         cout<<"      can not create BSplineSurface - create Bezier"<<endl;
+         MESSAGE ("      can not create BSplineSurface - create Bezier");
          int NbP=26;
          TColgp_Array2OfPnt Points(1,NbP,1,NbP);
          double fp1,lp1,fp2,lp2;
@@ -1794,7 +1794,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
        aSewing->Add(anExp.Current());
       }
       aSewing->Perform();
-      cout<<"    shell for face "<<nbff<<" is created"<<endl;
+      MESSAGE ("    shell for face "<<nbff<<" is created");
       const TopoDS_Shape aSewShape = aSewing->SewedShape();
       //BRepTools::Write(aSewShape,"/dn02/users_Linux/skl/work/Bugs/14857/sew.brep");
       if( aSewShape.ShapeType() == TopAbs_SHELL ) {
@@ -1810,16 +1810,16 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
          B.MakeSolid(aSolid);
          B.Add(aSolid,aShell);
          B.Add(aComp,aSolid);
-         cout<<"    solid for face "<<nbff<<" is created"<<endl;
+         MESSAGE ("    solid for face "<<nbff<<" is created");
        }
        else {
          B.Add(aComp,aShell);
-         cout<<"    solid for face "<<nbff<<" is not created"<<endl;
+         MESSAGE ("    solid for face "<<nbff<<" is not created");
        }
       }
       else {
        B.Add(aComp,aShell);
-       cout<<"    solid for face "<<nbff<<" is not created"<<endl;
+       MESSAGE ("    solid for face "<<nbff<<" is not created");
       }
       //cout<<"    solid for face "<<nbff<<" is created"<<endl;
 
@@ -1880,7 +1880,7 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const
     TopoDS_Shape aShapePath = aRefPath->GetValue();
 
     if (aShapePath.IsNull()) {
-      cout<<"Driver : path is null"<<endl;
+      MESSAGE ("Driver : path is null");
       if(aCI) delete aCI;
       Standard_NullObject::Raise("MakePipe aborted : null path argument");
     }

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index 2137d9dfd7d3f347c2178ceebdcc8fa3b1e6b422..460617bf43ad25c26267204203d228b06bdeefc7 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -548,7 +548,7 @@ bool GEOMToolsGUI::Import()
 
   SalomeApp_Study* stud = dynamic_cast<SalomeApp_Study*> ( app->activeStudy() );
   if ( !stud ) {
-    cout << "FAILED to cast active study to SalomeApp_Study" << endl;
+    MESSAGE ( "FAILED to cast active study to SalomeApp_Study" );
     return false;
   }
   _PTR(Study) aStudy = stud->studyDS();
@@ -667,7 +667,7 @@ bool GEOMToolsGUI::Export()
 
   SalomeApp_Study* stud = dynamic_cast<SalomeApp_Study*> ( app->activeStudy() );
   if ( !stud ) {
-    cout << "FAILED to cast active study to SalomeApp_Study" << endl;
+    MESSAGE ( "FAILED to cast active study to SalomeApp_Study" );
     return false;
   }
   _PTR(Study) aStudy = stud->studyDS();