OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

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

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

Correction of test cases for issue CR25266
This commit is contained in:
abv
2014-10-16 16:45:55 +04:00
parent a520f6eb9a
commit aefdc31bf0
24 changed files with 127 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/HLRBRep/HLRBRep_CurveTool.lxx
View File

@@ -282,7 +282,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);
}
@@ -295,7 +297,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);
}

27
src/HLRBRep/HLRBRep_Data.cxx
View File

@@ -233,7 +233,7 @@ public:
}
//-- ============================================================
void Destroy() {
#ifdef DEB
#ifdef HLRBREP_DEB
if(N) {
Standard_Integer nnn=0;
StNbMoy=StNbMoyNonNul=0;
@@ -267,20 +267,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;
}
}
@@ -1771,11 +1775,15 @@ 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;
}
#else
(void)I; // avoid compiler warning
#endif
}
}
}
@@ -1970,9 +1978,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);
@@ -2012,9 +2018,6 @@ HLRBRep_Data::Classify (const Standard_Integer /*E*/,
}
#endif
if (((MaxFace1 - MinVert1) & 0x80008000) != 0 ||
((MaxVert1 - MinFace1) & 0x80008000) != 0 ||
((MaxFace2 - MinVert2) & 0x80008000) != 0 ||

24
src/HLRBRep/HLRBRep_Hider.cxx
View File

@@ -231,7 +231,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;
@@ -242,7 +245,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;
@@ -270,7 +276,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 :
@@ -288,7 +296,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 :
@@ -303,11 +314,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;
}
}
}

42
src/HLRBRep/HLRBRep_InternalAlgo.cxx
View File

@@ -137,10 +137,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;
@@ -760,17 +763,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;
@@ -786,7 +792,8 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
if(TRACE10) {
if(++QWE>QWEQWE) {
QWE=0;
cout<<"*";
if (myDebug)
cout<<"*";
}
}
else {
@@ -907,7 +914,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;
}
}

16
src/HLRBRep/HLRBRep_PolyAlgo.cxx
View File

@@ -876,7 +876,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;
@@ -906,7 +906,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;
@@ -1044,7 +1044,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;
@@ -1124,7 +1124,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;
@@ -1308,7 +1308,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 +
@@ -1350,7 +1350,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;
@@ -1491,7 +1491,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 +
@@ -1523,7 +1523,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;