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

0025418: Debug output to be limited to OCC development environment

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Approx/Approx_BSplComputeLine.gxx
View File

@@ -34,7 +34,7 @@
#include <AppParCurves_ConstraintCouple.hxx>
#include Approx_BSpParLeastSquareOfMyBSplGradient_hxx
#if defined( DEB ) && defined( DRAW ) && !defined( WNT )
#if defined(OCCT_DEBUG) && defined( DRAW ) && !defined( WNT )
static Standard_Boolean mydebug = Standard_False;
@@ -625,7 +625,7 @@ Approx_BSplComputeLine::Approx_BSplComputeLine
void Approx_BSplComputeLine::Perform(const MultiLine& Line)
{
#if defined( DEB ) && defined( DRAW ) && !defined( WNT )
#if defined(OCCT_DEBUG) && defined( DRAW ) && !defined( WNT )
if (mydebug) DUMP(Line);
#endif
@@ -751,7 +751,7 @@ void Approx_BSplComputeLine::Perform(const MultiLine& Line)
}
}
#if defined( DEB ) && defined( DRAW ) && !defined( WNT )
#if defined(OCCT_DEBUG) && defined( DRAW ) && !defined( WNT )
if (mydebug) DUMP(TheMultiBSpCurve);
#endif

30
src/Approx/Approx_ComputeLine.gxx
View File

@@ -35,7 +35,7 @@
#include <stdio.h>
#ifdef DEB
#ifdef OCCT_DEBUG
static Standard_Boolean mydebug = Standard_False;
#include <Geom_BezierCurve.hxx>
@@ -514,7 +514,7 @@ Approx_ComputeLine::Approx_ComputeLine
void Approx_ComputeLine::Perform(const MultiLine& Line)
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (mydebug) DUMP(Line);
#endif
if (!myIsClear)
@@ -560,7 +560,7 @@ void Approx_ComputeLine::Perform(const MultiLine& Line)
TheMultiCurve = AppParCurves_MultiCurve();
alldone = Compute(Line, myfirstpt, mylastpt, TheParam, thetol3d, thetol2d);
if(!alldone && TheMultiCurve.NbCurves() > 0) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (mydebug) DUMP(TheMultiCurve);
#endif
myMultiCurves.Append(TheMultiCurve);
@@ -674,7 +674,7 @@ void Approx_ComputeLine::Perform(const MultiLine& Line)
myMultiCurves.Clear();
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (mydebug) DUMP(TheMultiCurve);
#endif
myMultiCurves.Append(TheMultiCurve);
@@ -710,7 +710,7 @@ void Approx_ComputeLine::Perform(const MultiLine& Line)
myMultiCurves.Clear();
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (mydebug) DUMP(TheMultiCurve);
#endif
myMultiCurves.Append(TheMultiCurve);
@@ -946,7 +946,7 @@ Standard_Boolean Approx_ComputeLine::Compute(const MultiLine& Line,
if (TheTol3d <= mytol3d && TheTol2d <= mytol2d) {
// Stockage de la multicurve approximee.
tolreached = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (mydebug) DUMP(mySCU);
#endif
myMultiCurves.Append(mySCU);
@@ -992,7 +992,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
gp_Pnt P1, P2;
gp_Pnt2d P12d, P22d;
Standard_Boolean Tangent1, Tangent2, mydone= Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean Parallel;
#endif
Standard_Integer myfirstpt = firstpt, mylastpt = lastpt;
@@ -1039,7 +1039,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
if (nbp == 2) {
// S il n y a que 2 points, on verifie quand meme que les tangentes sont
// alignees.
#ifdef DEB
#ifdef OCCT_DEBUG
Parallel = Standard_True;
#endif
if (Tangent1) {
@@ -1047,7 +1047,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
gp_Vec PVec(tabP1(i), tabP2(i));
V13d = tabV1(i);
if (!PVec.IsParallel(V13d, Precision::Angular())) {
#ifdef DEB
#ifdef OCCT_DEBUG
Parallel = Standard_False;
#endif
break;
@@ -1057,7 +1057,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
gp_Vec2d PVec2d(tabP12d(i), tabP22d(i));
V12d = tabV12d(i);
if (!PVec2d.IsParallel(V12d, Precision::Angular())) {
#ifdef DEB
#ifdef OCCT_DEBUG
Parallel = Standard_False;
#endif
break;
@@ -1070,7 +1070,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
gp_Vec PVec(tabP1(i), tabP2(i));
V23d = tabV2(i);
if (!PVec.IsParallel(V23d, Precision::Angular())) {
#ifdef DEB
#ifdef OCCT_DEBUG
Parallel = Standard_False;
#endif
break;
@@ -1080,7 +1080,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
gp_Vec2d PVec2d(tabP12d(i), tabP22d(i));
V22d = tabV22d(i);
if (!PVec2d.IsParallel(V22d, Precision::Angular())) {
#ifdef DEB
#ifdef OCCT_DEBUG
Parallel = Standard_False;
#endif
break;
@@ -1088,7 +1088,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (!Parallel) {
if (mydebug) cout <<"droite mais tangentes pas vraiment paralleles!!"<< endl;
}
@@ -1148,7 +1148,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
mydone = Standard_True;
// Stockage de la multicurve approximee.
tolreached = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (mydebug) DUMP(mySCU);
#endif
myMultiCurves.Append(mySCU);
@@ -1191,7 +1191,7 @@ Standard_Boolean Approx_ComputeLine::ComputeCurve(const MultiLine& Line,
// Stockage de la multicurve approximee.
tolreached = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (mydebug) DUMP(mySCU);
#endif
myMultiCurves.Append(mySCU);

40
src/Approx/Approx_CurvilinearParameter.cxx
View File

@@ -40,7 +40,7 @@
#include <CPnts_AbscissaPoint.hxx>
#include <Approx_CurvlinFunc.hxx>
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
#include <OSD_Timer.hxx>
static OSD_Chronometer chr_total, chr_init, chr_approx;
@@ -129,7 +129,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments)
{
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
t_total = t_init = t_approx = t_uparam = 0;
uparam_count = 0;
InitChron(chr_total);
@@ -142,11 +142,11 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
Handle(TColStd_HArray1OfReal) ThreeDTol = new TColStd_HArray1OfReal(1,Num3DSS);
ThreeDTol->Init(Tol);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
InitChron(chr_init);
#endif
Handle(Approx_CurvlinFunc) fonct = new Approx_CurvlinFunc(C3D, Tol/10);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_init, t_init);
#endif
@@ -161,7 +161,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
fonct->Intervals(CutPnts_C3,GeomAbs_C3);
AdvApprox_PrefAndRec CutTool(CutPnts_C2,CutPnts_C3);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
InitChron(chr_approx);
#endif
@@ -172,7 +172,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
MaxDegree, MaxSegments,
evC, CutTool);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_approx, t_approx);
#endif
@@ -189,7 +189,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
}
myMaxError3d = aApprox.MaxError(3,1);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_total, t_total);
cout<<" total reparametrization time = "<<t_total<<endl;
@@ -267,7 +267,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments)
{
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
t_total = t_init = t_approx = t_uparam = 0;
uparam_count = 0;
InitChron(chr_total);
@@ -292,11 +292,11 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
Handle(TColStd_HArray1OfReal) ThreeDTol = new TColStd_HArray1OfReal(1,Num3DSS);
ThreeDTol->Init(Tol/2.);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
InitChron(chr_init);
#endif
Handle(Approx_CurvlinFunc) fonct = new Approx_CurvlinFunc(C2D, Surf, Tol/20);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_init, t_init);
#endif
@@ -311,7 +311,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
fonct->Intervals(CutPnts_C3,GeomAbs_C3);
AdvApprox_PrefAndRec CutTool(CutPnts_C2,CutPnts_C3);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
InitChron(chr_approx);
#endif
@@ -322,7 +322,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
MaxDegree, MaxSegments,
evCOnS, CutTool);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_approx, t_approx);
#endif
@@ -350,7 +350,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
myMaxError2d1 = Max (aApprox.MaxError(1,1),aApprox.MaxError(1,2));
myMaxError3d = aApprox.MaxError(3,1);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_total, t_total);
cout<<" total reparametrization time = "<<t_total<<endl;
@@ -432,7 +432,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
{
Standard_Integer i;
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
t_total = t_init = t_approx = t_uparam = 0;
uparam_count = 0;
InitChron(chr_total);
@@ -457,11 +457,11 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
Handle(TColStd_HArray1OfReal) ThreeDTol = new TColStd_HArray1OfReal(1,Num3DSS);
ThreeDTol->Init(Tol/2);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
InitChron(chr_init);
#endif
Handle(Approx_CurvlinFunc) fonct = new Approx_CurvlinFunc(C2D1, C2D2, Surf1, Surf2, Tol/20);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_init, t_init);
#endif
@@ -476,7 +476,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
fonct->Intervals(CutPnts_C3,GeomAbs_C3);
AdvApprox_PrefAndRec CutTool(CutPnts_C2,CutPnts_C3);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
InitChron(chr_approx);
#endif
@@ -487,7 +487,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
MaxDegree, MaxSegments,
evCOn2S, CutTool);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_approx, t_approx);
#endif
@@ -523,7 +523,7 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
myMaxError2d2 = Max (aApprox.MaxError(1,3),aApprox.MaxError(1,4));
myMaxError3d = aApprox.MaxError(3,1);
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_total, t_total);
cout<<" total reparametrization time = "<<t_total<<endl;
@@ -659,7 +659,7 @@ void Approx_CurvilinearParameter::ToleranceComputation(const Handle(Adaptor2d_HC
TolV = Tol / (4.*Max_dS_dv);
TolW = Tol / (4.*Max_dS_dw);
#ifdef APPROX_DEB
#ifdef OCCT_DEBUG
cout << "TolV = " << TolV << endl;
cout << "TolW = " << TolW << endl;
#endif

6
src/Approx/Approx_CurvlinFunc.cxx
View File

@@ -22,7 +22,7 @@
#include <GCPnts_AbscissaPoint.hxx>
#include <Precision.hxx>
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
#include <OSD_Timer.hxx>
static OSD_Chronometer chr_uparam;
Standard_EXPORT Standard_Integer uparam_count;
@@ -447,7 +447,7 @@ Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C,
Standard_Real deltaS, base, U, Length;
Standard_Integer NbInt, NInterval, i;
Handle(TColStd_HArray1OfReal) InitUArray, InitSArray;
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
InitChron(chr_uparam);
#endif
if(S < 0 || S > 1) Standard_ConstructionError::Raise("Approx_CurvlinFunc::GetUParameter");
@@ -497,7 +497,7 @@ Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C,
const_cast<Approx_CurvlinFunc*>(this)->myPrevS = S;
const_cast<Approx_CurvlinFunc*>(this)->myPrevU = U;
#ifdef __OCC_DEBUG_CHRONO
#ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_uparam, t_uparam);
uparam_count++;
#endif

6
src/Approx/Approx_MCurvesToBSpCurve.cxx
View File

@@ -25,7 +25,7 @@
#include <BSplCLib.hxx>
#include <PLib.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
static void DEBUG(const AppParCurves_MultiCurve& MC) {
Standard_Integer i, j;
Standard_Integer nbcu = MC.NbCurves();
@@ -84,7 +84,7 @@ void Approx_MCurvesToBSpCurve::Perform
Standard_Integer nbcu = TheSeq.Length();
AppParCurves_MultiCurve CU;
Standard_Integer nbpolesspl=0, nbknots=0;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean debug = Standard_False;
#endif
@@ -228,7 +228,7 @@ void Approx_MCurvesToBSpCurve::Perform
mySpline = AppParCurves_MultiBSpCurve(tabMU, TheKnots, TheMults);
}
#ifdef DEB
#ifdef OCCT_DEBUG
if(debug) DEBUG(mySpline);
#endif

30
src/Approx/Approx_SameParameter.cxx
View File

@@ -33,7 +33,7 @@
#include <Precision.hxx>
#include <Extrema_ExtPC.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
#ifdef DRAW
#include <DrawTrSurf.hxx>
#endif
@@ -207,7 +207,7 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
Standard_Integer extrap_mode[2] ;
extrap_mode[0] = extrap_mode[1] = 3;
Standard_Integer i;
#ifdef DEB
#ifdef OCCT_DEBUG
if (Voir) {
cout<<endl;
cout<<"Control the change of variable : "<<endl;
@@ -230,7 +230,7 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
if(temp >= glis) glis = temp;
}
dglis = sqrt(dglis);
#ifdef DEB
#ifdef OCCT_DEBUG
if ( Voir) {
cout<<"shift of parameter to the imposed points : "<<glis<<endl;
cout<<"shift distance at the imposed points : "<<dglis<<endl;
@@ -248,7 +248,7 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
if(temp >= dglis) dglis = temp;
}
dglis = sqrt(dglis);
#ifdef DEB
#ifdef OCCT_DEBUG
if (Voir)
cout<<"distance de glissement en milieu d intervals : "<<dglis<<endl;
#endif
@@ -285,7 +285,7 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
if(temp > d2) d2 = temp;
}
tol = sqrt(d2);
#ifdef DEB
#ifdef OCCT_DEBUG
if (Voir)
cout<<"distance max on "<<nn<<" points : "<<tol<<endl<<endl;
#endif
@@ -411,7 +411,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
//Take a multiple of the sample pof CheckShape,
//at least the control points will be correct. No comment!!!
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer nbcoups = 0;
#endif
@@ -563,7 +563,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
if(!projok)
{
//Projector
#ifdef APPROX_DEB
#ifdef OCCT_DEBUG
// JAG
cout << "Projection not done" << endl;
#endif
@@ -578,7 +578,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
if(!extrok) { // If not already SameP and tangent to mill, abandon.
mySameParameter = Standard_False;
#ifdef APPROX_DEB
#ifdef OCCT_DEBUG
cout<<"SameParameter problem : zero tangent to extremities"<<endl;
#endif
return;
@@ -587,7 +587,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
pcons[count] = lcons;
pc3d[count] = lc3d;
#ifdef DEB
#ifdef OCCT_DEBUG
if (AffichFw) {
char Name[17];
Name[0]='\0';
@@ -648,7 +648,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
}
//-------------------------------------------
#ifdef DEB
#ifdef OCCT_DEBUG
if (AffichFw) {
nbcoups ++;
char Name[17];
@@ -739,7 +739,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
}
}
else {
#ifdef APPROX_DEB
#ifdef OCCT_DEBUG
// JAG
cout << "Projection not done" << endl;
#endif
@@ -769,7 +769,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
if (Precision::IsInfinite(algtol)) {
mySameParameter = Standard_False;
#ifdef APPROX_DEB
#ifdef OCCT_DEBUG
cout<<"SameParameter problem : function of interpolation of parametration at mills !!"<<endl;
#endif
return;
@@ -781,7 +781,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
if(interpolok) {
Standard_Real besttol = sqrt(besttol2);
#ifdef DEB
#ifdef OCCT_DEBUG
if (Voir) {
if(algtol > besttol){
cout<<"SameParameter : Tol can't be reached before approx"<<endl;
@@ -834,7 +834,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
if(!interpolok)
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Voir)
cout<<"SameParameter : Not enough points, enrich"<<endl;
#endif
@@ -869,7 +869,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
}
}
else {
#ifdef APPROX_DEB
#ifdef OCCT_DEBUG
// JAG
cout << "Projection not done" << endl;
#endif