0025266: Debug statements in the source are getting flushed on to the console

Suppress remaining couts in packages explicitly mentioned in the original bug description

diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index d218a6d2f280dd8613850a5c9d8aa02edaafa5c0..6370ec3f444ef04c2a3d627493ded79cc4c4d18b 100755 (executable)
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -272,20 +272,17 @@ void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO,
       if(It.Value()->GraphicStatus()==AIS_DS_Displayed)
         theMap.Add(It.Key());
     }
-#ifdef AIS_DEB
-    cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl;
-#endif
 
     //parse all local contexts...
+#ifdef AIS_DEB
+    cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl;
     Standard_Integer NbDisp;
     for(AIS_DataMapIteratorOfDataMapOfILC it1(myLocalContexts);it1.More();it1.Next()){
       const Handle(AIS_LocalContext)& LC = it1.Value();
       NbDisp =  LC->DisplayedObjects(theMap);
-#ifdef AIS_DEB
       cout<<"\tIn Local Context "<<it1.Key()<<" : "<<NbDisp<<endl;
-#endif
-      
     }
+#endif
     Handle(AIS_InteractiveObject) curIO;
     Handle(Standard_Transient) Tr;
       for(TColStd_MapIteratorOfMapOfTransient it2(theMap);it2.More();it2.Next()){

diff --git a/src/AIS/AIS_InteractiveContext_1.cxx b/src/AIS/AIS_InteractiveContext_1.cxx
index 8064dc2d0d16b7c194d54e3776fbe6a9adc7489d..f4f1d82007b945f1e8128af1697fab4fe2c1374d 100755 (executable)
--- a/src/AIS/AIS_InteractiveContext_1.cxx
+++ b/src/AIS/AIS_InteractiveContext_1.cxx
@@ -71,72 +71,6 @@
 #include <AIS_MapIteratorOfMapOfInteractive.hxx>
 #endif
 
-//unused
-/*#ifdef DEB
-static void InfoOnLight(const Handle(V3d_View) aView)
-{
-  Standard_Real V1=0.,V2=0.,V3=0.;
-  Standard_Integer IndexOfLit(0);
-  
-  static Standard_Boolean FirstTime (Standard_True);
-  if(FirstTime)
-    {
-      FirstTime = Standard_False;
-      for (aView->InitActiveLights();aView->MoreActiveLights();aView->NextActiveLights()){
-       IndexOfLit++;
-       cout<<"lumiere no "<<IndexOfLit<<"\n************\n\t";
-       Handle(V3d_Light) Li = aView->ActiveLight();
-       Quantity_NameOfColor Col;
-       Li->Color(Col);
-       cout<<"Color :"<<Standard_Integer(Col)<<"\n\t"<<endl;
-       cout<<"type :";
-       switch(Li->Type()){
-       case V3d_AMBIENT:
-         {
-           cout<<" AMBIENT\n\t";
-//POP K4L
-//         Handle(V3d_AmbientLight)::DownCast(Li)->DisplayPosition(V1,V2,V3);
-           cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-           break;
-         }
-       case V3d_DIRECTIONAL:
-         {
-           cout<<" DIRECTIONAL\n\t";
-           Handle(V3d_DirectionalLight)::DownCast(Li)->DisplayPosition(V1,V2,V3);
-           cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-           Handle(V3d_DirectionalLight)::DownCast(Li)->Direction(V1,V2,V3);
-           cout<<"Direction : V1 = "<<V1<<"  V2 = "<<V2<<"  V3 = "<<V3<<endl; 
-
-           break;
-         }
-       case V3d_POSITIONAL:
-         {
-           cout<<" POSITIONAL\n\t";
-           Handle(V3d_PositionalLight)::DownCast(Li)->Position(V1,V2,V3);
-           cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-           Handle(V3d_PositionalLight)::DownCast(Li)->Target(V1,V2,V3);
-           cout<<"Target    : x1 = "<<V1<<"  x2 = "<<V2<<"  x3 = "<<V3<<endl; 
-           break;
-         }
-       case V3d_SPOT:
-         {
-           cout<<" SPOT\n\t";
-           cout<<" DIRECTIONAL\n\t";
-           Handle(V3d_SpotLight)::DownCast(Li)->Position(V1,V2,V3);
-           cout<<"Position : X1 = "<<V1<<"  X2 = "<<V2<<"  X3 = "<<V3<<endl; 
-           Handle(V3d_SpotLight)::DownCast(Li)->Direction(V1,V2,V3);
-           cout<<"Direction : V1 = "<<V1<<"  V2 = "<<V2<<"  V3 = "<<V3<<endl; 
-           Handle(V3d_PositionalLight)::DownCast(Li)->Target(V1,V2,V3);
-           cout<<"Target    : x1 = "<<V1<<"  x2 = "<<V2<<"  x3 = "<<V3<<endl; 
-           cout<<"\tAngle :"<<Handle(V3d_SpotLight)::DownCast(Li)->Angle()<<endl;
-           break;
-         }
-       }
-      }
-    }
-}
-#endif
-*/
 //=======================================================================
 //function : MoveTo
 //purpose  : 

diff --git a/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx b/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
index 2dabb2f27a6a7d2a092cb1957b62ad76ab13b573..bc8a020de31a18a84bd0f83148ce3582cf3119a1 100755 (executable)
--- a/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
+++ b/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
@@ -817,7 +817,9 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
       }
       else{
        // reframing failed. Leave with PointsConfondus
+#ifdef BREPBLEND_DEB
        cout<<"reframing failed"<<endl;
+#endif
        State = Blend_SamePoints;
       }
     }
@@ -868,10 +870,12 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
                           previousP.ParameterOnC2(),
                           previousP.Parameter(), tolesp);
          Arrive = Standard_True;
+#ifdef BREPBLEND_DEB
          if (line->NbPoints()>=2) {
            // Show that there is a stop during processing 
            cout<<"No more advancement in the processing"<<endl;
          }
+#endif
        }
        else {
          param = parprec + sens * stepw;  // there is no risk to exceed Bound.
@@ -976,7 +980,9 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
     case Blend_SamePoints :
       {
        // Stop
+#ifdef BREPBLEND_DEB
        cout << " Mixed points in the processing" << endl;
+#endif
        Extrst1.SetValue(previousP.PointOnC1(),
                         previousP.ParameterOnC1(),
                         previousP.Parameter(), tolesp);
@@ -1025,7 +1031,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
   math_FunctionSetRoot rsnld(Finv, toler, 30);
   rsnld.Perform(Finv, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
 
@@ -1105,7 +1113,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
   math_FunctionSetRoot rsnld(Finv, toler, 30);
   rsnld.Perform(Finv, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
 
@@ -1189,7 +1199,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&
   math_FunctionSetRoot rsnld(FinvP, toler, 30);
   rsnld.Perform(FinvP, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
   rsnld.Root(Solinv);
@@ -1255,7 +1267,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv&
   math_FunctionSetRoot rsnld(FinvP, toler, 30);
   rsnld.Perform(FinvP, Solinv, infb, supb);
   if (!rsnld.IsDone()) {
+#ifdef BREPBLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
   rsnld.Root(Solinv);

diff --git a/src/Blend/Blend_CSWalking_3.gxx b/src/Blend/Blend_CSWalking_3.gxx
index 33568317592a1125b7f02f641540afc35f62527a..f3a1e8d50c89b3043b56e4ad08f45149b686a51a 100755 (executable)
--- a/src/Blend/Blend_CSWalking_3.gxx
+++ b/src/Blend/Blend_CSWalking_3.gxx
@@ -109,7 +109,9 @@ Standard_Boolean Blend_CSWalking::Recadre(Blend_FuncInv& FuncInv,
 
 
   if (!rsnld.IsDone()) {
+#ifdef BLEND_DEB
     cout << "RSNLD not done "<< endl << endl;
+#endif
     return Standard_False;
   }
       

diff --git a/src/Blend/Blend_Walking_3.gxx b/src/Blend/Blend_Walking_3.gxx
index 9c04898c7e6f426f97ac57783e80437fac3a2ed2..456e86410b7dc8cff2ca664ba2e7a1a9cb42ff21 100755 (executable)
--- a/src/Blend/Blend_Walking_3.gxx
+++ b/src/Blend/Blend_Walking_3.gxx
@@ -276,7 +276,9 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
     // Resolution...
     rsnld.Perform(FuncInv,solrst,infb,supb);  
     if (!rsnld.IsDone()) {
+#ifdef BLEND_DEB
       cout << "Walking::Recadre : RSNLD not done " << endl;
+#endif
       recadre = Standard_False;
     }
     else {
@@ -322,7 +324,9 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
     rsnld.Perform(FuncInv,solrst,infb,supb);
   
     if (!rsnld.IsDone()) {
+#ifdef BLEND_DEB
       cout << "Walking::Recadre : RSNLD not done " << endl;
+#endif
       recadre = Standard_False;
     }
     else {

diff --git a/src/HLRAlgo/HLRAlgo_PolyData.cxx b/src/HLRAlgo/HLRAlgo_PolyData.cxx
index e826afa0b7ea6d0f3c8b8fb746371220fdb2801e..f967b3002c77c904ce893bece903011e3de95244 100755 (executable)
--- a/src/HLRAlgo/HLRAlgo_PolyData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyData.cxx
@@ -478,7 +478,7 @@ HideByOneTriangle (const Standard_Address Coordinates,
        o[npi] = n1 == -1;
        m[npi] = Multiple;
       }
-#ifdef DEB
+#ifdef HLRALGO_DEB
       else if (ERROR) {
        cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
        cout << " ( more than 2 points )." << endl;
@@ -623,7 +623,7 @@ HideByOneTriangle (const Standard_Address Coordinates,
        o[npi] = n1 == -1;
        m[npi] = Multiple;
       }
-#ifdef DEB
+#ifdef HLRALGO_DEB
       else if (ERROR) {
        cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
        cout << " ( more than 2 points )." << endl;
@@ -768,7 +768,7 @@ HideByOneTriangle (const Standard_Address Coordinates,
        o[npi] = n1 == -1;
        m[npi] = Multiple;
       }
-#ifdef DEB
+#ifdef HLRALGO_DEB
       else if (ERROR) {
        cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
        cout << " ( more than 2 points )." << endl;

diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
index 953555c5c38499fe9995adaa245b80b174dc79f7..d73a19b0f28dd06ae652b37f438c694613890e7a 100755 (executable)
--- a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
@@ -430,7 +430,7 @@ HLRAlgo_PolyInternalData::AddNode (const Standard_Address Nod1RValues,
     Nod3NrmX = 1;
     Nod3NrmY = 0;
     Nod3NrmZ = 0;
-#ifdef DEB
+#ifdef HLRALGO_DEB
     if (ERROR)
       cout << "HLRAlgo_PolyInternalData::AddNode" << endl;
 #endif
@@ -520,7 +520,7 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
   }
   if (find == 0) {
     myNbPISeg--;
-#ifdef DEB
+#ifdef HLRALGO_DEB
     if (ERROR) {
       cout << "HLRAlgo_PolyInternalData::UpdateLinks : segment error";
       cout << endl;
@@ -629,7 +629,7 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
          Nod3NdSg   = myNbPISeg;
          Nod4NdSg   = myNbPISeg;
        }
-#ifdef DEB
+#ifdef HLRALGO_DEB
        else if (ERROR) {
          cout << "HLRAlgo_PolyInternalData::UpdateLinks : triangle error ";
          cout << endl;

diff --git a/src/HLRBRep/HLRBRep_CurveTool.lxx b/src/HLRBRep/HLRBRep_CurveTool.lxx
index b5ed07f2fefb454a5dc1630dc3fbaf3a40464926..a38068d11b0639943419ba7b23d6cdf01b4e1cf9 100755 (executable)
--- a/src/HLRBRep/HLRBRep_CurveTool.lxx
+++ b/src/HLRBRep/HLRBRep_CurveTool.lxx
@@ -287,7 +287,9 @@ HLRBRep_CurveTool::Hyperbola (const Standard_Address C)
 inline Handle(Geom2d_BezierCurve)
      HLRBRep_CurveTool::Bezier (const Standard_Address C)
 {
+#ifdef HLRBREP_DEB
   cout<<"  HLRBRep_CurveTool::Bezier : Not Implemented "<<endl;
+#endif
   //-- return(((HLRBRep_Curve *)C)->Bezier());
   return(0);
 }
@@ -300,7 +302,9 @@ inline Handle(Geom2d_BezierCurve)
 inline Handle(Geom2d_BSplineCurve)
      HLRBRep_CurveTool::BSpline (const Standard_Address C)
 {
+#ifdef HLRBREP_DEB
   cout<<"  HLRBRep_CurveTool::BSpline : Not Implemented "<<endl;
+#endif
   //-- return(((HLRBRep_Curve *)C)->BSpline());
   return(0);
 }

diff --git a/src/HLRBRep/HLRBRep_Data.cxx b/src/HLRBRep/HLRBRep_Data.cxx
index 071d6c34b5e37b80ed0e58acf6fcdcd140a489c8..bc257c8c2f0f3e187087d168746295200764fb8f 100755 (executable)
--- a/src/HLRBRep/HLRBRep_Data.cxx
+++ b/src/HLRBRep/HLRBRep_Data.cxx
@@ -238,7 +238,7 @@ public:
   } 
   //-- ============================================================
   void Destroy() {
-#ifdef DEB
+#ifdef HLRBREP_DEB
     if(N) { 
       Standard_Integer nnn=0;
       StNbMoy=StNbMoyNonNul=0;
@@ -272,20 +272,24 @@ public:
          free(IndUV[i]);
          IndUV[i]=NULL;
        }
-       else { cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
-              
+#ifdef HLRBREP_DEB
+       else
+          cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl;
+#endif
       }
       for(i=0;i<N;i++) { 
        if(UV[i]) { 
          free(UV[i]);
          UV[i]=NULL;
        }
+#ifdef HLRBREP_DEB
        else { cout<<" UV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
+#endif
       }
       
-      if(nbUV)  { free(nbUV);  nbUV=NULL; } else { cout<<" nbUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
-      if(IndUV) { free(IndUV); IndUV=NULL;} else { cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
-      if(UV)    { free(UV);    UV=NULL; }  else { cout<<" UV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; } 
+      if(nbUV)  { free(nbUV);  nbUV=NULL; } 
+      if(IndUV) { free(IndUV); IndUV=NULL;}
+      if(UV) { free(UV);    UV=NULL; }
       N=0;
     }
   }
@@ -1796,11 +1800,13 @@ void HLRBRep_Data::OrientOthEdge (const Standard_Integer I,
            eb1->Orientation(ie1,myFEOri);
          }
        }
+#ifdef HLRBREP_DEB
        else {
          cout << "HLRBRep_Data::OrientOthEdge " << I;
          cout << " Edge " << myFE << " : ";
          cout << "UVPoint not found, Edge not Oriented" << endl;
        }
+#endif
       }
     }
   }
@@ -1995,9 +2001,7 @@ HLRBRep_Data::Classify (const Standard_Integer E,
                          (Standard_Address)VertMax,
                          (Standard_Address)MinMaxVert);
 
-
-
-#if 0 
+#ifdef HLRBREP_DEB
        {
          Standard_Integer qwe,qwep8,q,q1,q2;
          printf("\n E:%d -------\n",E);
@@ -2037,9 +2041,6 @@ HLRBRep_Data::Classify (const Standard_Integer E,
        }
  #endif
 
-
-
-
     if (((MaxFace1 - MinVert1) & 0x80008000) != 0 ||
        ((MaxVert1 - MinFace1) & 0x80008000) != 0 ||
        ((MaxFace2 - MinVert2) & 0x80008000) != 0 ||

diff --git a/src/HLRBRep/HLRBRep_Hider.cxx b/src/HLRBRep/HLRBRep_Hider.cxx
index f19205a2e5bf534775b36e5094e6aa9fc3395d4e..9f940324040fc3d86c5e9c84711fdfb0ea186b40 100755 (executable)
--- a/src/HLRBRep/HLRBRep_Hider.cxx
+++ b/src/HLRBRep/HLRBRep_Hider.cxx
@@ -235,7 +235,10 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
            case TopAbs_IN      :
              HLRBRep_EdgeIList::AddInterference(ILHidden,Int,EIT);
              ILOn.Remove(It);                            break;
-           case TopAbs_UNKNOWN : cout << "UNKNOWN state staft" << endl;
+           case TopAbs_UNKNOWN : 
+#ifdef HLRBREP_DEB
+              cout << "UNKNOWN state staft" << endl;
+#endif
            case TopAbs_ON      :
              It.Next();                                  break;
            }                                             break;
@@ -246,7 +249,10 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
            case TopAbs_IN      :
              HLRBRep_EdgeIList::AddInterference(ILHidden,Int,EIT);
              ILOn.Remove(It);                            break;
-           case TopAbs_UNKNOWN : cout << "UNKNOWN state stbef" << endl;
+           case TopAbs_UNKNOWN :
+#ifdef HLRBREP_DEB
+              cout << "UNKNOWN state stbef" << endl;
+#endif
            case TopAbs_ON      :
              It.Next();                                  break;
            }                                             break;
@@ -274,7 +280,9 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
                HLRBRep_EdgeIList::AddInterference(ILHidden,Int,EIT);
                ILOn.Remove(It);                          break;
              case TopAbs_UNKNOWN :
+#ifdef HLRBREP_DEB
                cout << "UNKNOWN state after" << endl;
+#endif
                It.Next();                                break;
              }                                           break;
            case TopAbs_ON :
@@ -292,7 +300,10 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
              case TopAbs_OUT     :
                Int.Transition(TopAbs_REVERSED);          break;
              case TopAbs_UNKNOWN :
-               cout << "UNKNOWN state after" << endl;    break;
+#ifdef HLRBREP_DEB
+               cout << "UNKNOWN state after" << endl;
+#endif
+                break;
              }     
              It.Next();                                  break;
            case TopAbs_OUT :
@@ -307,11 +318,16 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
              case TopAbs_OUT     :
                ILOn.Remove(It);                          break;
              case TopAbs_UNKNOWN :
+#ifdef HLRBREP_DEB
                cout << "UNKNOWN state after" << endl;
+#endif
                It.Next();                                break;
              }                                           break;
            case TopAbs_UNKNOWN :
-             cout << "UNKNOWN state stbef" << endl;      break;
+#ifdef HLRBREP_DEB
+             cout << "UNKNOWN state stbef" << endl;
+#endif
+              break;
            }
          }
        }

diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.cxx b/src/HLRBRep/HLRBRep_InternalAlgo.cxx
index 322fbbdd2785090856ef2cca6fb2f549351b7a92..804da1506f6deee070884bff49443245fb9bfe9c 100755 (executable)
--- a/src/HLRBRep/HLRBRep_InternalAlgo.cxx
+++ b/src/HLRBRep/HLRBRep_InternalAlgo.cxx
@@ -142,10 +142,13 @@ void HLRBRep_InternalAlgo::Update ()
        df = DS[i-1]->NbFaces   ();
       }
       catch(Standard_Failure) {
-       cout << "An exception was catched when preparing the Shape " << i;
-       cout << " and computing its OutLines " << endl;
-       Handle(Standard_Failure) fail = Standard_Failure::Caught();
-       cout << fail << endl;
+        if (myDebug)
+        {
+          cout << "An exception was catched when preparing the Shape " << i;
+          cout << " and computing its OutLines " << endl;
+          Handle(Standard_Failure) fail = Standard_Failure::Caught();
+          cout << fail << endl;
+        }
        DS[i-1] = new HLRBRep_Data(0,0,0);
        dv = 0;
        de = 0;
@@ -765,17 +768,20 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
        fd++;
       }
       
-      cout << endl;
-      cout << "Vertices  : " << setw(5) << myDS->NbVertices() << endl;
-      cout << "Edges     : " << setw(5) << myDS->NbEdges()    << " , ";
-      cout << "Selected  : " << setw(5) << nbSelEdges         << " , ";
-      cout << "Visibles  : " << setw(5) << nbVisEdges         << endl;
-      cout << "Faces     : " << setw(5) << myDS->NbFaces()    << " , ";
-      cout << "Selected  : " << setw(5) << nbSelFaces         << " , ";
-      cout << "Simple    : " << setw(5) << nbFSimp            << endl;
-      if (SideFace)
-       cout << "Side      : " << setw(5) << nbFSide            << " , ";
-      cout << "Cachantes : " << setw(5) << nbCache            << endl << endl;
+      if (myDebug)
+      {
+        cout << endl;
+        cout << "Vertices  : " << setw(5) << myDS->NbVertices() << endl;
+        cout << "Edges     : " << setw(5) << myDS->NbEdges()    << " , ";
+        cout << "Selected  : " << setw(5) << nbSelEdges         << " , ";
+        cout << "Visibles  : " << setw(5) << nbVisEdges         << endl;
+        cout << "Faces     : " << setw(5) << myDS->NbFaces()    << " , ";
+        cout << "Selected  : " << setw(5) << nbSelFaces         << " , ";
+        cout << "Simple    : " << setw(5) << nbFSimp            << endl;
+        if (SideFace)
+          cout << "Side      : " << setw(5) << nbFSide            << " , ";
+        cout << "Cachantes : " << setw(5) << nbCache            << endl << endl;
+      }
     }
 
     Standard_Integer QWE=0,QWEQWE;
@@ -791,7 +797,8 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
            if(TRACE10) { 
              if(++QWE>QWEQWE) { 
                QWE=0; 
-               cout<<"*";
+                if (myDebug)
+                  cout<<"*";
              } 
            }
            else {  
@@ -912,7 +919,8 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
        if (fd->Hiding()) {
          if(TRACE10 && TRACE==Standard_False) { 
            if(++QWE>QWEQWE) { 
-             cout<<".";
+             if (myDebug)
+                cout<<".";
              QWE=0;
            }
          }

diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cxx b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
index 62e41e2c642ff19ac3382c5799fcbf93c62aacfa..f225f00fb1865bdf16bf79166fd058c6f2a21eff 100755 (executable)
--- a/src/HLRBRep/HLRBRep_PolyAlgo.cxx
+++ b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
@@ -882,7 +882,7 @@ void HLRBRep_PolyAlgo::StoreShell (const TopoDS_Shape& Shape,
              NN++;
            }
          }
-#ifdef DEB
+#ifdef HLRBREP_DEB
          else if (DoError) {
            cout << " HLRBRep_PolyAlgo::StoreShell : Face ";
            cout << f << " non triangulated" << endl;
@@ -912,7 +912,7 @@ void HLRBRep_PolyAlgo::StoreShell (const TopoDS_Shape& Shape,
          }
        }
       }
-#ifdef DEB
+#ifdef HLRBREP_DEB
       else if (DoError) {
        cout << "HLRBRep_PolyAlgo::StoreShell : Face ";
        cout << f << " deja stockee" << endl;
@@ -1050,7 +1050,7 @@ Normal (const Standard_Integer iNode,
     Nod1NrmX = 1;
     Nod1NrmY = 0;
     Nod1NrmZ = 0;
-#ifdef DEB
+#ifdef HLRBREP_DEB
     if (DoError) {
       cout << "HLRBRep_PolyAlgo::Normal : AverageNormal error";
       cout << endl;
@@ -1130,7 +1130,7 @@ HLRBRep_PolyAlgo::AverageNormal(const Standard_Integer iNode,
   Standard_Real d = sqrt (X * X + Y * Y + Z * Z);
   if (OK && d < 1.e-10) {
     OK = Standard_False;
-#ifdef DEB
+#ifdef HLRBREP_DEB
     if (DoError) {
       cout << "HLRAlgo_PolyInternalData:: inverted normals on ";
       cout << "node " << iNode << endl;
@@ -1314,7 +1314,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
              &(((HLRAlgo_Array1OfPINod*)PINod1)->ChangeValue(Pol1(iPol)));
            Nod12Indices = (*pi1p2)->Indices();
            Nod12RValues = (*pi1p2)->RValues();
-#ifdef DEB
+#ifdef HLRBREP_DEB
            if (DoError) {
              if (Nod11NrmX*Nod12NrmX +
                  Nod11NrmY*Nod12NrmY +
@@ -1356,7 +1356,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
          }
        }
       }
-#ifdef DEB
+#ifdef HLRBREP_DEB
       else if (DoError) {
        cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
        cout << e << " connex 1 sans PolygonOnTriangulation" << endl;
@@ -1497,7 +1497,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
              &(((HLRAlgo_Array1OfPINod*)PINod2)->ChangeValue(Pol2(iPol)));
            Nod22Indices = (*pi2p2)->Indices();
            Nod22RValues = (*pi2p2)->RValues();
-#ifdef DEB
+#ifdef HLRBREP_DEB
            if (DoError) {
              if (Nod11NrmX*Nod12NrmX +
                  Nod11NrmY*Nod12NrmY +
@@ -1529,7 +1529,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
            ZTI2 = Z2 = Nod12PntZ;
            if      (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1;
            else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2;
-#ifdef DEB
+#ifdef HLRBREP_DEB
            else {
              cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
              cout << "Parameter error on Node " << i1p2 << endl;

diff --git a/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx b/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx
index 9556ed515a55ae2ffee53ba391085dd83ac6ee0f..ccaa9ae994a639525ef35b0a0589c7375cd18b75 100755 (executable)
--- a/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx
+++ b/src/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx
@@ -192,7 +192,8 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
       if (Hatcher.TrimDone (IndH) && !Hatcher.TrimFailed (IndH))
        Hatcher.ComputeDomains (IndH);
       if (!Hatcher.IsDone (IndH)) {
-       cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
+#ifdef HLRTOBREP_DEB
+        cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
        cout << "U iso of parameter: " << UPrm;
        switch (Hatcher.Status (IndH)) {
        case HatchGen_NoProblem          :
@@ -211,6 +212,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
          cout << " Incompatible States" << endl;
          break;
        }
+#endif
        Hatcher.RemHatching (IndH);
        continue;
       }
@@ -283,6 +285,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
       if (Hatcher.TrimDone (IndH) && !Hatcher.TrimFailed (IndH))
        Hatcher.ComputeDomains (IndH);
       if (!Hatcher.IsDone (IndH)) {
+#ifdef HLRTOBREP_DEB
        cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
        cout << "V iso of parameter: " << VPrm;
        switch (Hatcher.Status (IndH)) {
@@ -302,6 +305,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
          cout << " Incompatible States" << endl;
          break;
        }
+#endif
        Hatcher.RemHatching (IndH);
        continue;
       }

diff --git a/src/HatchGen/HatchGen_ElementsGen.gxx b/src/HatchGen/HatchGen_ElementsGen.gxx
index a7f511e353d69d6e3bb837d5e393d21371a6a54a..3939056087b2e9e189f3de1b86cbc351b37428f1 100755 (executable)
--- a/src/HatchGen/HatchGen_ElementsGen.gxx
+++ b/src/HatchGen/HatchGen_ElementsGen.gxx
@@ -27,7 +27,9 @@
 
 //HatchGen_ElementsGen::HatchGen_ElementsGen(const HatchGen_ElementsGen& Other) {
 HatchGen_ElementsGen::HatchGen_ElementsGen(const HatchGen_ElementsGen& ) {
+#ifdef HATCHGEN_DEB
   cout<<" Magic Constructor in HatchGen_ElementsGen:: "<<endl;
+#endif
 } 
 
 HatchGen_ElementsGen::HatchGen_ElementsGen() { 

diff --git a/src/HatchGen/HatchGen_Hatcher.gxx b/src/HatchGen/HatchGen_Hatcher.gxx
index d715c495e55e9be160ab2c6fa3b9afdf7731ead7..f288205f395643f9a58da8b1b69fe1f3614c685b 100755 (executable)
--- a/src/HatchGen/HatchGen_Hatcher.gxx
+++ b/src/HatchGen/HatchGen_Hatcher.gxx
@@ -461,7 +461,9 @@ Standard_Boolean HatchGen_Hatcher::Trim (const Standard_Integer IndH,
 #endif    
   
   if (!myIntersector.IsDone())  { 
+#if TRACE_HATCHER
     cout<<" Intersector -> Done = False ";
+#endif
     return Standard_False ;
   }
   

diff --git a/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx b/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
index 6db19eab794b6e53d74f00548314284e4b65a499..0e6778b23db0e0a0b30066c59449a047a14b4da7 100755 (executable)
--- a/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
@@ -932,7 +932,9 @@ Standard_Boolean  ShapeAnalysis_CheckSmallFace::CheckTwisted (const TopoDS_Face&
       }
       catch (Standard_Failure)
        {
-         cout << "Couldn't compute angle between derivative vectors"  <<endl;
+#ifdef SHAPEANALYSIS_DEB
+          cout << "Couldn't compute angle between derivative vectors"  <<endl;
+#endif
          return Standard_False;
        }
 //       cout << "angle1 "   << angle1<< endl;

diff --git a/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx b/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx
index 352319b86e5a57c6fa5a5db4631cee4597961da4..ff91e75fe663074fdc8d0335b26a4e8e7277ad07 100755 (executable)
--- a/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx
@@ -538,7 +538,9 @@ void ShapeAnalysis_WireOrder::SetChains(const Standard_Real gap)
 
  void ShapeAnalysis_WireOrder::SetCouples(const Standard_Real /*gap*/) 
 {
+#ifdef SHAPEANALYSIS_DEB
   cout<<"ShapeAnalysis_WireOrder:SetCouple not yet implemented"<<endl;
+#endif
 }
 
 //=======================================================================

diff --git a/src/ShapeFix/ShapeFix_Face.cxx b/src/ShapeFix/ShapeFix_Face.cxx
index 2c3dc2e80fabf34a61fad92b95c475eed6783812..08acb6874c8f094a3352736daa16f3dc783f660d 100755 (executable)
--- a/src/ShapeFix/ShapeFix_Face.cxx
+++ b/src/ShapeFix/ShapeFix_Face.cxx
@@ -2231,7 +2231,9 @@ Standard_Boolean ShapeFix_Face::FixSplitFace(const TopTools_DataMapOfShapeListOf
       V1=sae.FirstVertex(E1);
       V2=sae.LastVertex(E2);
       if(!V1.IsSame(V2)) {
+#ifdef SHAPEFIX_DEB
         cout<<"wire not closed --> stop split"<<endl;
+#endif
         return Standard_False;
       }
       // create face