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

2
src/BRepBlend/BRepBlend_AppFuncRoot.cxx
View File

@@ -340,7 +340,7 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func,
// (4) Insertion of the point if the calculation seems long.
if ((!Trouve)&&(rsnld.NbIterations()>3)) {
#ifdef BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << "Evaluation in t = " << Param << "given" << endl;
rsnld.Dump(cout);
#endif

32
src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
View File

@@ -26,7 +26,7 @@
#include <gp_Vec2d.hxx>
#include <gp_Vec.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
#include <TColStd_Array1OfInteger.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
@@ -40,7 +40,7 @@
static Standard_Integer IndexOfSection = 0;
extern Standard_Boolean Blend_GettraceDRAWSECT();
#ifdef DEB_BBPP_N_TRDERIV
#ifdef OCCT_DEBUG_BBPP_N_TRDERIV
//-----------------------------------------------------
// For debug : visualisation of the section
static Standard_Boolean BBPP(const Standard_Real param,
@@ -235,7 +235,7 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction& Func,
if (State != Blend_OK) {
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param, Func);
}
@@ -576,7 +576,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
while (!Arrive) {
Standard_Boolean bonpoint = 1;
#ifdef DEB_BBPP_N_TRDERIV
#ifdef OCCT_DEBUG_BBPP_N_TRDERIV
//debdebdebdebdebdeb
Func.Set(param);
rsnld.Perform(Func, parinit, infbound, supbound);
@@ -813,7 +813,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
}
else{
// reframing failed. Leave with PointsConfondus
#ifdef BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout<<"reframing failed"<<endl;
#endif
State = Blend_SamePoints;
@@ -823,7 +823,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
switch (State) {
case Blend_OK :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param, Func);
}
@@ -866,7 +866,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
previousP.ParameterOnC2(),
previousP.Parameter(), tolesp);
Arrive = Standard_True;
#ifdef BREPBLEND_DEB
#ifdef OCCT_DEBUG
if (line->NbPoints()>=2) {
// Show that there is a stop during processing
cout<<"No more advancement in the processing"<<endl;
@@ -881,7 +881,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
case Blend_StepTooSmall :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param,Func);
}
@@ -916,7 +916,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
case Blend_OnRst1 :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param, Func);
}
@@ -935,7 +935,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
case Blend_OnRst2 :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param, Func);
}
@@ -955,7 +955,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
case Blend_OnRst12 :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param, Func);
}
@@ -976,7 +976,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
case Blend_SamePoints :
{
// Stop
#ifdef BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << " Mixed points in the processing" << endl;
#endif
Extrst1.SetValue(previousP.PointOnC1(),
@@ -1027,7 +1027,7 @@ 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
#ifdef OCCT_DEBUG
cout << "RSNLD not done "<< endl << endl;
#endif
return Standard_False;
@@ -1109,7 +1109,7 @@ 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
#ifdef OCCT_DEBUG
cout << "RSNLD not done "<< endl << endl;
#endif
return Standard_False;
@@ -1195,7 +1195,7 @@ 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
#ifdef OCCT_DEBUG
cout << "RSNLD not done "<< endl << endl;
#endif
return Standard_False;
@@ -1263,7 +1263,7 @@ 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
#ifdef OCCT_DEBUG
cout << "RSNLD not done "<< endl << endl;
#endif
return Standard_False;

2
src/BRepBlend/BRepBlend_SurfRstConstRad.cxx
View File

@@ -910,7 +910,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
norm = ncrossns.Magnitude();
if (norm < Eps) {
norm = 1; // Not enough, but it is not necessary to stop
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << " SurfRstConstRad : Singular Surface " << endl;
#endif
}

2
src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
View File

@@ -922,7 +922,7 @@ TColStd_Array1OfReal& DWeigths)
norm = ncrossns.Magnitude();
if (norm < Eps) {
norm = 1; // Not enough, but it is not necessary to stop
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << " SurfRstEvolRad : Surface single " << endl;
#endif
}

32
src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
View File

@@ -26,7 +26,7 @@
#include <gp_Vec2d.hxx>
#include <gp_Vec.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
#include <TColStd_Array1OfInteger.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
@@ -39,7 +39,7 @@
#endif
static Standard_Integer IndexOfSection = 0;
extern Standard_Boolean Blend_GettraceDRAWSECT();
#ifdef DEB_BBPP_N_TRDERIV
#ifdef OCCT_DEBUG_BBPP_N_TRDERIV
// for debug : visualisation of the section
static Standard_Boolean BBPP(const Standard_Real param,
Blend_SurfRstFunction& Func,
@@ -271,7 +271,7 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction& Func,
if (State!=Blend_OK) {
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param,Func);
}
@@ -538,7 +538,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
while (!Arrive) {
Standard_Boolean bonpoint = 1;
#ifdef DEB_BBPP_N_TRDERIV
#ifdef OCCT_DEBUG_BBPP_N_TRDERIV
//debdebdebdebdebdeb
Func.Set(param);
rsnld.Perform(Func,parinit,infbound,supbound);
@@ -704,7 +704,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
}
else{
// Failed reframing. Leave with PointsConfondus
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout<<"SurfRstLineBuilder : failed reframing"<<endl;
#endif
State = Blend_SamePoints;
@@ -714,7 +714,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
switch (State) {
case Blend_OK :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param,Func);
}
@@ -759,7 +759,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
Arrive = Standard_True;
if (line->NbPoints()>=2) {
// Indicate that one stops during the processing
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout<<"SurfRstLineBuilder : No advancement in the processing"<<endl;
#endif
}
@@ -772,7 +772,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
case Blend_StepTooSmall :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param,Func);
}
@@ -806,7 +806,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
case Blend_OnRst1 :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param,Func);
}
@@ -825,7 +825,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
case Blend_OnRst2 :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param,Func);
}
@@ -845,7 +845,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
case Blend_OnRst12 :
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (Blend_GettraceDRAWSECT()){
Drawsect(param,Func);
}
@@ -865,7 +865,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
case Blend_SamePoints :
{
// Stop
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << "SurfRstLineBuilder Points mixed in the processing" << endl;
#endif
previousP.ParametersOnS(U,V);
@@ -938,7 +938,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
rsnld.Perform(FinvC,Solinv,infb,supb);
if (!rsnld.IsDone()) {
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << "SurfRstLineBuilder : RSNLD not done "<< endl << endl;
#endif
}
@@ -977,7 +977,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
rsnld.Perform(FinvC,Solinv,infb,supb);
if (!rsnld.IsDone()) {
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << "SurfRstLineBuilder : RSNLD not done "<< endl << endl;
#endif
}
@@ -1038,7 +1038,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&
math_FunctionSetRoot rsnld(Finv,toler,30);
rsnld.Perform(Finv,Solinv,infb,supb);
if (!rsnld.IsDone()) {
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << "SurfRstLineBuilder :RSNLD not done "<< endl;
#endif
return Standard_False;
@@ -1122,7 +1122,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfPointFuncInv&
math_FunctionSetRoot rsnld(FinvP,toler,30);
rsnld.Perform(FinvP,Solinv,infb,supb);
if (!rsnld.IsDone()) {
#if BREPBLEND_DEB
#ifdef OCCT_DEBUG
cout << "SurfRstLineBuilder :RSNLD not done "<< endl;
#endif
return Standard_False;