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

0025418: Debug output to be limited to OCC development environment

Macros ending on "DEB" are replaced by OCCT_DEBUG across OCCT code; new macros described in documentation.
Macros starting with DEB are changed to start with "OCCT_DEBUG_".
Some code cleaned.
This commit is contained in:
abv
2014-10-28 12:41:04 +03:00
committed by bugmaster
parent a507ffd9d7
commit 0797d9d30a
700 changed files with 3932 additions and 4250 deletions

View File

@@ -283,14 +283,14 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1;
else {
invnorm1 = 1; // Unsatisfactory, but it is not necessary to crash
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRad : Surface singuliere " << endl;
#endif
}
if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2;
else {
invnorm2 = 1; // Unsatisfactory, but it is not necessary to crash
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRad : Surface singuliere " << endl;
#endif
}
@@ -878,7 +878,7 @@ Standard_Boolean BlendFunc_ConstRad::IsSolution(const math_Vector& Sol, const St
Abs(controle(2)) > tolerances(2) ||
Abs(controle(3)) > tolerances(3) ||
Abs(controle(4)) > tolerances(4)){
#ifdef BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout<<"Cheminement : echec calcul des derivees"<<endl;
#endif
istangent = Standard_True;
@@ -1471,13 +1471,13 @@ Standard_Boolean BlendFunc_ConstRad::Section
norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRad : Surface singuliere " << endl;
#endif
}
if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRad : Surface singuliere " << endl;
#endif
}
@@ -1568,7 +1568,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
P.ParametersOnS2(X(3), X(4));
/* Pour debuger par des D.F
#if DEB
#ifdef OCCT_DEBUG
Standard_Real deltat = 1.e-7;
if (prm==tcurv->LastParameter()){deltat *= -1;} //Pour les discont
Standard_Real deltaX = 1.e-7;
@@ -1614,7 +1614,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
distmin = Min (distmin, pts1.Distance(pts2));
/*
#if DEB
#ifdef OCCT_DEBUG
MDiff = (M - DEDX)*(1/deltat);
VDiff = (V - DEDT)*(1/deltat);
@@ -1813,13 +1813,13 @@ Standard_Boolean BlendFunc_ConstRad::Section
norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRad : Surface singuliere " << endl;
#endif
}
if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRad : Surface singuliere " << endl;
#endif
}

View File

@@ -294,13 +294,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
norm2 = ncrossns2.Magnitude();
if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRadInv : Surface singuliere " << endl;
#endif
}
if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRadInv : Surface singuliere " << endl;
#endif
}
@@ -475,13 +475,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
norm2 = ncrossns2.Magnitude();
if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRadInv : Surface singuliere " << endl;
#endif
}
if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " ConstRadInv : Surface singuliere " << endl;
#endif
}

View File

@@ -348,14 +348,14 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1;
else {
invnorm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}
if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2;
else {
invnorm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}
@@ -947,7 +947,7 @@ Standard_Boolean BlendFunc_EvolRad::IsSolution(const math_Vector& Sol,
Abs(controle(2)) > tolerances(2) ||
Abs(controle(3)) > tolerances(3) ||
Abs(controle(4)) > tolerances(4)){
#ifdef BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout<<"Cheminement : echec calcul des derivees"<<endl;
#endif
istangent = Standard_True;
@@ -1072,7 +1072,7 @@ void BlendFunc_EvolRad::Tangent(const Standard_Real U1,
(U2!=xval(3)) || (V2!=xval(4))) {
gp_Vec d1u,d1v;
gp_Pnt bid;
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " erreur de tengent !!!!!!!!!!!!!!!!!!!!" << endl;
#endif
surf1->D1(U1,V1,bid,d1u,d1v);
@@ -1447,13 +1447,13 @@ void BlendFunc_EvolRad::Section(const Blend_Point& P,
norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}
if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}
@@ -1580,13 +1580,13 @@ Standard_Boolean BlendFunc_EvolRad::Section
norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}
if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}
@@ -1683,7 +1683,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
P.ParametersOnS2(X(3), X(4));
/*
#if DEB
#ifdef OCCT_DEBUG
Standard_Real deltat = 1.e-9;
if (prm==tcurv->LastParameter()){deltat *= -1;} //Pour les discont
Standard_Real deltaX = 1.e-9;
@@ -1727,7 +1727,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
distmin = Min (distmin, pts1.Distance(pts2));
/*
#if DEB
#ifdef OCCT_DEBUG
MDiff = (M - DEDX)*(1/deltat);
VDiff = (V - DEDT)*(1/deltat);
@@ -1926,13 +1926,13 @@ Standard_Boolean BlendFunc_EvolRad::Section
norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}
if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if BLENDFUNC_DEB
#ifdef OCCT_DEBUG
cout << " EvolRad : Surface singuliere " << endl;
#endif
}