OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code Packages Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dox/dev_guides/debug/debug.md
View File

@ -3,6 +3,26 @@ Debugging tools and hints {#occt_dev_guides__debug}
@tableofcontents @tableofcontents
@section occt_debug_macro Compiler macro to enable extended debug messages
Many OCCT algorithms can produce extended debug messages, usually printed to cout.
These include messages on internal errors and special cases encountered, timing etc.
In OCCT versions prior to 6.8.0 most of these messages were activated by compiler macro *DEB*, enabled by default in debug builds.
Since version 6.8.0 this is disabled by default but can be enabled by defining compiler macro *OCCT_DEBUG*.
To enable this macro on Windows when building with Visual Studio projects, edit file custom.bat and add the line:
set CSF_DEFINES=OCCT_DEBUG
Some algorithms use specific macros for yet more verbose messages, usually started with OCCT_DEBUG_.
These messages can be enabled in the same way, by defining corresponding macro.
Note that some header files are modified when *OCCT_DEBUG* is enabled, hence binaries built with it enabled are not compatible with client code built without this option; this is not intended for production use.
@section occt_debug_exceptions Calling JIT debugger on exception
On Windows platform when using Visual Studio compiler there is a possibility to start the debugger automatically if an exception is caught in a program running OCCT. For this, set environment variable *CSF_DEBUG* to any value. Note that this feature works only if you enable OCCT exception handler in your application by calling *OSD::SetSignal()*.
@section occt_debug_intro Introduction @section occt_debug_intro Introduction
This manual describes facilities included in OCCT to support debugging, and provides some hints for more efficient debug. This manual describes facilities included in OCCT to support debugging, and provides some hints for more efficient debug.
@ -15,10 +35,6 @@ This feature can be activated by defining environment variable *CSF_DEBUG_BOP*,
The diagnostic code checks validity of the input arguments and the result of each Boolean operation. When an invalid situation is detected, the report consisting of argument shapes and a DRAW script to reproduce the problematic operation is saved to the directory pointed by *CSF_DEBUG_BOP*. The diagnostic code checks validity of the input arguments and the result of each Boolean operation. When an invalid situation is detected, the report consisting of argument shapes and a DRAW script to reproduce the problematic operation is saved to the directory pointed by *CSF_DEBUG_BOP*.
@section occt_debug_exceptions Calling JIT debugger on exception
On Windows platform when using Visual Studio compiler there is a possibility to start the debugger automatically if an exception is caught in a program running OCCT. For this, set environment variable *CSF_DEBUG* to any value. Note that this feature works only if you enable OCCT exception handler in your application by calling *OSD::SetSignal()*.
@section occt_debug_call Functions for calling from debugger @section occt_debug_call Functions for calling from debugger
Modern interactive debuggers provide the possibility to execute application code at a program break point. This feature can be used to analyse the temporary objects available only in the context of the debugged code. OCCT provides several global functions that can be used in this way. Modern interactive debuggers provide the possibility to execute application code at a program break point. This feature can be used to analyse the temporary objects available only in the context of the debugged code. OCCT provides several global functions that can be used in this way.

4
src/AIS/AIS_AttributeFilter.cxx
View File

@ -41,7 +41,7 @@ Standard_Boolean AIS_AttributeFilter::IsOk(const Handle(SelectMgr_EntityOwner)&
if (Handle(AIS_InteractiveObject)::DownCast(anObj->Selectable()).IsNull()) return Standard_False; if (Handle(AIS_InteractiveObject)::DownCast(anObj->Selectable()).IsNull()) return Standard_False;
Standard_Boolean okstat = Standard_True; Standard_Boolean okstat = Standard_True;
//#ifndef DEB //#ifndef OCCT_DEBUG
Handle(SelectMgr_SelectableObject) aSelectable = anObj->Selectable() ; Handle(SelectMgr_SelectableObject) aSelectable = anObj->Selectable() ;
if( hasC && ((Handle(AIS_InteractiveObject)&) aSelectable)->HasColor() ) if( hasC && ((Handle(AIS_InteractiveObject)&) aSelectable)->HasColor() )
//#else //#else
@ -49,7 +49,7 @@ Standard_Boolean AIS_AttributeFilter::IsOk(const Handle(SelectMgr_EntityOwner)&
//#endif //#endif
okstat = (myCol == ((Handle(AIS_InteractiveObject)&) anObj)->Color()); okstat = (myCol == ((Handle(AIS_InteractiveObject)&) anObj)->Color());
//#ifndef DEB //#ifndef OCCT_DEBUG
aSelectable = anObj->Selectable() ; aSelectable = anObj->Selectable() ;
if( hasW && ((Handle(AIS_InteractiveObject)&) aSelectable)->HasWidth() ) if( hasW && ((Handle(AIS_InteractiveObject)&) aSelectable)->HasWidth() )
//#else //#else

24
src/AIS/AIS_InteractiveContext.cxx
View File

@ -215,7 +215,7 @@ Standard_CString AIS_InteractiveContext::DomainOfMainViewer() const
void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO, void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO,
const Standard_Boolean OnlyFromNeutral) const const Standard_Boolean OnlyFromNeutral) const
{ {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"AIS_IC::DisplayedObjects"<<endl; cout<<"AIS_IC::DisplayedObjects"<<endl;
#endif #endif
@ -235,7 +235,7 @@ void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO,
} }
//parse all local contexts... //parse all local contexts...
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl; cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl;
Standard_Integer NbDisp; Standard_Integer NbDisp;
for(AIS_DataMapIteratorOfDataMapOfILC it1(myLocalContexts);it1.More();it1.Next()){ for(AIS_DataMapIteratorOfDataMapOfILC it1(myLocalContexts);it1.More();it1.Next()){
@ -1195,7 +1195,7 @@ void AIS_InteractiveContext::Redisplay(const AIS_KindOfInteractive KOI,
Handle(AIS_InteractiveObject) IO = It.Key(); Handle(AIS_InteractiveObject) IO = It.Key();
// ENDCLE // ENDCLE
if(IO->Type()== KOI){ if(IO->Type()== KOI){
#ifdef DEB #ifdef OCCT_DEBUG
// Standard_Boolean good = (Sign==-1)? Standard_True : // Standard_Boolean good = (Sign==-1)? Standard_True :
// ((IO->Signature()==Sign)? Standard_True:Standard_False); // ((IO->Signature()==Sign)? Standard_True:Standard_False);
#endif #endif
@ -1683,13 +1683,13 @@ void AIS_InteractiveContext::SetColor(const Handle(AIS_InteractiveObject)& anIOb
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
#ifdef DEB #ifdef OCCT_DEBUG
// // pour isg // // pour isg
// if(anIObj->Type()==AIS_KOI_Datum && anIObj->Signature()==3){ // if(anIObj->Type()==AIS_KOI_Datum && anIObj->Signature()==3){
// Handle(AIS_Trihedron) Tr = *((Handle(AIS_Trihedron)*)&anIObj); // Handle(AIS_Trihedron) Tr = *((Handle(AIS_Trihedron)*)&anIObj);
@ -1758,7 +1758,7 @@ void AIS_InteractiveContext::SetDeviationCoefficient(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1802,7 +1802,7 @@ void AIS_InteractiveContext::SetHLRDeviationCoefficient(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1845,7 +1845,7 @@ void AIS_InteractiveContext::SetDeviationAngle(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1916,7 +1916,7 @@ void AIS_InteractiveContext::SetHLRAngleAndDeviation(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1958,7 +1958,7 @@ void AIS_InteractiveContext::SetHLRDeviationAngle(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1986,7 +1986,7 @@ void AIS_InteractiveContext::UnsetColor(const Handle(AIS_InteractiveObject)& anI
anIObj->Update(ITI.Value(),Standard_False); anIObj->Update(ITI.Value(),Standard_False);
NbDisp++; NbDisp++;
} }
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
@ -2057,7 +2057,7 @@ void AIS_InteractiveContext::SetWidth(const Handle(AIS_InteractiveObject)& anIOb
anIObj->Update(ITI.Value(),Standard_False); anIObj->Update(ITI.Value(),Standard_False);
NbDisp++; NbDisp++;
} }
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();

10
src/AIS/AIS_InteractiveContext_1.cxx
View File

@ -586,7 +586,7 @@ void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject
UpdateCurrentViewer(); UpdateCurrentViewer();
} }
else{ else{
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"Nothing Done : Opened Local Context"<<endl; cout<<"Nothing Done : Opened Local Context"<<endl;
#endif #endif
} }
@ -626,7 +626,7 @@ AddOrRemoveCurrentObject(const Handle(AIS_InteractiveObject)& anIObj,
UpdateCurrentViewer(); UpdateCurrentViewer();
} }
else{ else{
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"Nothing Done : Opened Local Context"<<endl; cout<<"Nothing Done : Opened Local Context"<<endl;
#endif #endif
} }
@ -887,7 +887,7 @@ void AIS_InteractiveContext::SetSelectedCurrent()
{ {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"Not Yet Implemented"<<endl; cout<<"Not Yet Implemented"<<endl;
#endif #endif
} }
@ -944,7 +944,7 @@ void AIS_InteractiveContext::AddOrRemoveSelected(const TopoDS_Shape& aShap,
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {
if(!HasOpenedContext()) { if(!HasOpenedContext()) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<" Attempt to remove a selected shape with no opened local context"<<endl; cout<<" Attempt to remove a selected shape with no opened local context"<<endl;
#endif #endif
return; return;
@ -963,7 +963,7 @@ void AIS_InteractiveContext::AddOrRemoveSelected(const Handle(SelectMgr_EntityOw
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {
if(!HasOpenedContext()) { if(!HasOpenedContext()) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<" Attempt to remove a selected ownr with no opened local context"<<endl; cout<<" Attempt to remove a selected ownr with no opened local context"<<endl;
#endif #endif
return; return;

4
src/AIS/AIS_InteractiveContext_2.cxx
View File

@ -81,7 +81,7 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
NewLocal->MainSelector()->UpdateConversion(); NewLocal->MainSelector()->UpdateConversion();
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"\tOpen Local Context No "<<myCurLocalIndex<<endl; cout<<"\tOpen Local Context No "<<myCurLocalIndex<<endl;
if(UseDisplayedObjects){ if(UseDisplayedObjects){
cout<<"\t\tObjects from Neutral Point loaded"<<endl; cout<<"\t\tObjects from Neutral Point loaded"<<endl;
@ -106,7 +106,7 @@ void AIS_InteractiveContext::CloseLocalContext(const Standard_Integer Index,
{ {
Standard_Boolean debugmode(Standard_False); Standard_Boolean debugmode(Standard_False);
#ifdef AIS_DEB #ifdef OCCT_DEBUG
debugmode = Standard_True; debugmode = Standard_True;
#endif #endif

2
src/AIS/AIS_InteractiveObject.cxx
View File

@ -146,7 +146,7 @@ void AIS_InteractiveObject::SetContext(const Handle(AIS_InteractiveContext)& aCt
return; return;
if (myDrawer.IsNull()) { if (myDrawer.IsNull()) {
myDrawer = new AIS_Drawer; myDrawer = new AIS_Drawer;
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout << "AIS_InteractiveObject::SetContext DRAWER NUL!" << endl; cout << "AIS_InteractiveObject::SetContext DRAWER NUL!" << endl;
#endif #endif
} }

2
src/AIS/AIS_Line.cxx
View File

@ -41,7 +41,7 @@
// purpose: // purpose:
//================================================================== //==================================================================
//unused //unused
/*#ifdef DEB /*#ifdef OCCT_DEBUG
static void FindLimits(const Adaptor3d_Curve& aCurve, static void FindLimits(const Adaptor3d_Curve& aCurve,
const Standard_Real aLimit, const Standard_Real aLimit,
gp_Pnt& P1, gp_Pnt& P1,

4
src/AIS/AIS_LocalContext_1.cxx
View File

@ -1504,7 +1504,7 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromIO
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString()); Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
if(Sel.IsNull()) { if(Sel.IsNull()) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection " cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection "
<<mySelName<<" Nulle "<<endl; <<mySelName<<" Nulle "<<endl;
#endif #endif
@ -1553,7 +1553,7 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString()); Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
if(Sel.IsNull()) { if(Sel.IsNull()) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection "<<mySelName<<" Nulle "<<endl; cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection "<<mySelName<<" Nulle "<<endl;
#endif #endif
return EO; return EO;

8
src/AIS/AIS_Shape.cxx
View File

@ -156,7 +156,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
case 0:{ case 0:{
try { OCC_CATCH_SIGNALS StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); } try { OCC_CATCH_SIGNALS StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); }
catch (Standard_Failure) { catch (Standard_Failure) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout << "AIS_Shape::Compute() failed"<< endl; cout << "AIS_Shape::Compute() failed"<< endl;
cout << "a Shape should be incorrect : No Compute can be maked on it "<< endl; cout << "a Shape should be incorrect : No Compute can be maked on it "<< endl;
#endif #endif
@ -189,7 +189,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
StdPrs_ShadedShape::Add(aPrs,myshape,myDrawer); StdPrs_ShadedShape::Add(aPrs,myshape,myDrawer);
} }
catch (Standard_Failure) { catch (Standard_Failure) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout << "AIS_Shape::Compute() in ShadingMode failed"<< endl; cout << "AIS_Shape::Compute() in ShadingMode failed"<< endl;
#endif #endif
StdPrs_WFShape::Add(aPrs,myshape,myDrawer); StdPrs_WFShape::Add(aPrs,myshape,myDrawer);
@ -268,7 +268,7 @@ void AIS_Shape::Compute(const Handle(Prs3d_Projector)& aProjector,
Standard_Boolean isOwnHLRDeviationCoefficient = OwnHLRDeviationCoefficient(newcoeff,prevcoeff); Standard_Boolean isOwnHLRDeviationCoefficient = OwnHLRDeviationCoefficient(newcoeff,prevcoeff);
if (((Abs (newangle - prevangle) > Precision::Angular()) && isOwnHLRDeviationAngle) || if (((Abs (newangle - prevangle) > Precision::Angular()) && isOwnHLRDeviationAngle) ||
((Abs (newcoeff - prevcoeff) > Precision::Confusion()) && isOwnHLRDeviationCoefficient)) { ((Abs (newcoeff - prevcoeff) > Precision::Confusion()) && isOwnHLRDeviationCoefficient)) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout << "AIS_Shape : compute"<<endl; cout << "AIS_Shape : compute"<<endl;
cout << "newangle : " << newangle << " # de " << "prevangl : " << prevangle << " OU "<<endl; cout << "newangle : " << newangle << " # de " << "prevangl : " << prevangle << " OU "<<endl;
cout << "newcoeff : " << newcoeff << " # de " << "prevcoeff : " << prevcoeff << endl; cout << "newcoeff : " << newcoeff << " # de " << "prevcoeff : " << prevcoeff << endl;
@ -290,7 +290,7 @@ void AIS_Shape::Compute(const Handle(Prs3d_Projector)& aProjector,
} }
} }
catch (Standard_Failure) { catch (Standard_Failure) {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
cout <<"AIS_Shape::Compute(Proj) HLR Algorithm failed" << endl; cout <<"AIS_Shape::Compute(Proj) HLR Algorithm failed" << endl;
#endif #endif
StdPrs_WFShape::Add(aPresentation,SH,myDrawer); StdPrs_WFShape::Add(aPresentation,SH,myDrawer);

6
src/AIS/AIS_TexturedShape.cxx
View File

@ -78,7 +78,7 @@ void AIS_TexturedShape::SetTextureFileName (const TCollection_AsciiString& theTe
} }
else else
{ {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
std::cout << "Texture " << theTextureFileName << " doesn't exist\n"; std::cout << "Texture " << theTextureFileName << " doesn't exist\n";
std::cout << "Using Texture 0 instead ...\n"; std::cout << "Using Texture 0 instead ...\n";
#endif #endif
@ -344,7 +344,7 @@ void AIS_TexturedShape::updateAttributes (const Handle(Prs3d_Presentation)& theP
myAspect->SetTextureMap (myTexture); myAspect->SetTextureMap (myTexture);
if (!myTexture->IsDone()) if (!myTexture->IsDone())
{ {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
std::cout << "An error occurred while building texture\n"; std::cout << "An error occurred while building texture\n";
#endif #endif
myAspect->SetTextureMapOff(); myAspect->SetTextureMapOff();
@ -472,7 +472,7 @@ void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*t
} }
catch (Standard_Failure) catch (Standard_Failure)
{ {
#ifdef AIS_DEB #ifdef OCCT_DEBUG
std::cout << "AIS_TexturedShape::Compute() in ShadingMode failed \n"; std::cout << "AIS_TexturedShape::Compute() in ShadingMode failed \n";
#endif #endif
StdPrs_WFShape::Add (thePrs, myshape, myDrawer); StdPrs_WFShape::Add (thePrs, myshape, myDrawer);

2
src/AIS/AIS_TypeFilter.cxx
View File

@ -25,7 +25,7 @@ Standard_Boolean AIS_TypeFilter::IsOk(const Handle(SelectMgr_EntityOwner)& anObj
if(Handle(AIS_InteractiveObject)::DownCast(anObj->Selectable()).IsNull()) if(Handle(AIS_InteractiveObject)::DownCast(anObj->Selectable()).IsNull())
return Standard_False; return Standard_False;
//#ifndef DEB //#ifndef OCCT_DEBUG
Handle(SelectMgr_SelectableObject) aSelectableObject = anObj->Selectable() ; Handle(SelectMgr_SelectableObject) aSelectableObject = anObj->Selectable() ;
return ((Handle(AIS_InteractiveObject)&) aSelectableObject)->Type()== myKind; return ((Handle(AIS_InteractiveObject)&) aSelectableObject)->Type()== myKind;
//#else //#else

2
src/AdvApp2Var/AdvApp2Var_Context.cxx
View File

@ -44,7 +44,7 @@ static Standard_Boolean lesparam(const Standard_Integer iordre,
// else if (*ndgjac < 61) { nbpnt = 61;} Bug Uneven number // else if (*ndgjac < 61) { nbpnt = 61;} Bug Uneven number
else { else {
nbpnts = 50; nbpnts = 50;
#if ADVAPP2VAR_DEB #ifdef OCCT_DEBUG
cout << "F(U, V) : Not enough points of discretization" << endl; cout << "F(U, V) : Not enough points of discretization" << endl;
#endif #endif
} }

4
src/AdvApp2Var/AdvApp2Var_Iso.cxx
View File

@ -163,7 +163,7 @@ void AdvApp2Var_Iso::MakeApprox(const AdvApp2Var_Context& Conditions,
NDGJAC = Conditions.VJacDeg(); NDGJAC = Conditions.VJacDeg();
NCFLIM = Conditions.VLimit(); NCFLIM = Conditions.VLimit();
break; break;
//#ifndef DEB //#ifndef OCCT_DEBUG
//pkv f //pkv f
case GeomAbs_NoneIso: case GeomAbs_NoneIso:
//pkv t //pkv t
@ -236,7 +236,7 @@ void AdvApp2Var_Iso::MakeApprox(const AdvApp2Var_Context& Conditions,
Standard_Real *EMXAPP = new Standard_Real[NBSESP]; Standard_Real *EMXAPP = new Standard_Real[NBSESP];
Handle (TColStd_HArray2OfReal) HERRMOY = Handle (TColStd_HArray2OfReal) HERRMOY =
new TColStd_HArray2OfReal(1,NBSESP,1,IDERIV+1); new TColStd_HArray2OfReal(1,NBSESP,1,IDERIV+1);
//#ifdef DEB //#ifdef OCCT_DEBUG
//Standard_Real *ERRMOY = //Standard_Real *ERRMOY =
//#endif //#endif
// (Standard_Real *) &HERRMOY->ChangeArray2()(HERRMOY ->LowerRow(),HERRMOY ->LowerCol()); // (Standard_Real *) &HERRMOY->ChangeArray2()(HERRMOY ->LowerRow(),HERRMOY ->LowerCol());

6
src/AdvApprox/AdvApprox_ApproxAFunction.cxx
View File

@ -56,7 +56,7 @@
#include <PLib_JacobiPolynomial.hxx> #include <PLib_JacobiPolynomial.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
static Standard_Boolean AdvApprox_Debug = 0; static Standard_Boolean AdvApprox_Debug = 0;
@ -431,7 +431,7 @@ void AdvApprox_ApproxAFunction::Approximation(
{ {
// Standard_Real EpsPar = Precision::Confusion(); // Standard_Real EpsPar = Precision::Confusion();
Standard_Integer IDIM, NUPIL,TheDeg; Standard_Integer IDIM, NUPIL,TheDeg;
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Integer NDIMEN = TotalDimension; Standard_Integer NDIMEN = TotalDimension;
#endif #endif
Standard_Boolean isCut = Standard_False; Standard_Boolean isCut = Standard_False;
@ -598,7 +598,7 @@ void AdvApprox_ApproxAFunction::Approximation(
CoefficientArray.SetValue(j, Coefficients.Value(i)); CoefficientArray.SetValue(j, Coefficients.Value(i));
} }
#ifdef DEB #ifdef OCCT_DEBUG
// Test des derives par difference finis // Test des derives par difference finis
Standard_Integer IORDRE = ContinuityOrder; Standard_Integer IORDRE = ContinuityOrder;

24
src/AppBlend/AppBlend_AppSurf.gxx
View File

@ -36,10 +36,8 @@
#include <AppDef_Variational.hxx> #include <AppDef_Variational.hxx>
static Standard_Boolean scal = 1; static Standard_Boolean scal = 1;
#ifdef DEB
extern Standard_Boolean AppBlend_GetContextSplineApprox(); extern Standard_Boolean AppBlend_GetContextSplineApprox();
extern Standard_Boolean AppBlend_GetContextApproxWithNoTgt(); extern Standard_Boolean AppBlend_GetContextApproxWithNoTgt();
#endif
// modified by EAP (Edward AGAPOV) Fri Jan 4 2002, bug OCC9 // modified by EAP (Edward AGAPOV) Fri Jan 4 2002, bug OCC9
// --- keep pipe parametrized like path // --- keep pipe parametrized like path
@ -244,11 +242,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
withderiv = F.Section(Lin->Point(1),tabAppP,tabAppV,tabP2d,tabV2d, withderiv = F.Section(Lin->Point(1),tabAppP,tabAppV,tabP2d,tabV2d,
tabW,tabDW); tabW,tabDW);
#if DEB
// SpApprox = AppBlend_GetContextSplineApprox();
if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False; if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False;
#endif
for (j=1; j<=NbPoles2d; j++) { for (j=1; j<=NbPoles2d; j++) {
tabAppP2d(j) = tabP2d(j); tabAppP2d(j) = tabP2d(j);
@ -297,9 +291,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
else { else {
withderiv = F.Section(Lin->Point(i),tabAppP,tabAppV,tabP2d,tabV2d, withderiv = F.Section(Lin->Point(i),tabAppP,tabAppV,tabP2d,tabV2d,
tabW,tabDW); tabW,tabDW);
#if DEB
if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False; if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False;
#endif
for (j=1; j<=NbPoles2d; j++) { for (j=1; j<=NbPoles2d; j++) {
tabAppP2d(j) = tabP2d(j); tabAppP2d(j) = tabP2d(j);
@ -331,9 +323,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
withderiv = F.Section(Lin->Point(NbPoint),tabAppP,tabAppV,tabP2d,tabV2d, withderiv = F.Section(Lin->Point(NbPoint),tabAppP,tabAppV,tabP2d,tabV2d,
tabW,tabDW); tabW,tabDW);
#if DEB if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False;
if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False;
#endif
for (j=1; j<=NbPoles2d; j++) { for (j=1; j<=NbPoles2d; j++) {
tabAppP2d(j) = tabP2d(j); tabAppP2d(j) = tabP2d(j);
@ -399,7 +389,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
mytol3d = Max(TheTol3d, mytol3d); mytol3d = Max(TheTol3d, mytol3d);
mytol2d = Max(TheTol2d, mytol2d); mytol2d = Max(TheTol2d, mytol2d);
} }
#ifdef APPBLEND_DEB #ifdef OCCT_DEBUG
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -444,7 +434,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
} }
theapprox.Perform(multL); theapprox.Perform(multL);
theapprox.Error(mytol3d,mytol2d); theapprox.Error(mytol3d,mytol2d);
#ifdef APPBLEND_DEB #ifdef OCCT_DEBUG
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -506,7 +496,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
mytol3d = Variation.MaxError(); mytol3d = Variation.MaxError();
mytol2d = 0.; mytol2d = 0.;
#ifdef APPBLEND_DEB #ifdef OCCT_DEBUG
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -710,9 +700,7 @@ void AppBlend_AppSurf::Perform(const Handle(TheLine)& Lin,
Standard_Real x,y,z; Standard_Real x,y,z;
withderiv = F.Section(Lin->Point(iLin),tabAppP,tabAppV,tabP2d,tabV2d, withderiv = F.Section(Lin->Point(iLin),tabAppP,tabAppV,tabP2d,tabV2d,
tabW,tabDW); tabW,tabDW);
#if DEB
if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False; if(AppBlend_GetContextApproxWithNoTgt()) withderiv = Standard_False;
#endif
for (j=1; j<=NbPoles2d; j++) { for (j=1; j<=NbPoles2d; j++) {
tabP2d(j).Coord(x,y); tabP2d(j).Coord(x,y);
@ -826,7 +814,7 @@ void AppBlend_AppSurf::Perform(const Handle(TheLine)& Lin,
} }
// modified by EAP Thu Jan 3 15:45:27 2002 ___END___ // modified by EAP Thu Jan 3 15:45:27 2002 ___END___
} }
#ifdef APPBLEND_DEB #ifdef OCCT_DEBUG
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -851,7 +839,7 @@ void AppBlend_AppSurf::Perform(const Handle(TheLine)& Lin,
F.Parameter(Lin->Point(Lin->NbPoints())), F.Parameter(Lin->Point(Lin->NbPoints())),
tabVKnots->ChangeArray1() tabVKnots->ChangeArray1()
); );
#ifdef APPBLEND_DEB #ifdef OCCT_DEBUG
cout << "Warning: AppBlend_AppSurf::Perform(), bad length of aParamSeq: " << cout << "Warning: AppBlend_AppSurf::Perform(), bad length of aParamSeq: " <<
aParamSeq.Length() << " instead of " << tabVKnots->Length() << endl; aParamSeq.Length() << " instead of " << tabVKnots->Length() << endl;
#endif #endif

2
src/AppCont/AppCont_ContMatrices.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifndef DEB #ifndef OCCT_DEBUG
#define No_Standard_OutOfRange #define No_Standard_OutOfRange
#define No_Standard_RangeError #define No_Standard_RangeError
#endif #endif

2
src/AppCont/AppCont_ContMatrices_1.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifndef DEB #ifndef OCCT_DEBUG
#define No_Standard_OutOfRange #define No_Standard_OutOfRange
#define No_Standard_RangeError #define No_Standard_RangeError
#endif #endif

2
src/AppCont/AppCont_ContMatrices_2.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifndef DEB #ifndef OCCT_DEBUG
#define No_Standard_OutOfRange #define No_Standard_OutOfRange
#define No_Standard_RangeError #define No_Standard_RangeError
#endif #endif

2
src/AppCont/AppCont_ContMatrices_3.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifndef DEB #ifndef OCCT_DEBUG
#define No_Standard_OutOfRange #define No_Standard_OutOfRange
#define No_Standard_RangeError #define No_Standard_RangeError
#endif #endif

2
src/AppCont/AppCont_ContMatrices_4.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifndef DEB #ifndef OCCT_DEBUG
#define No_Standard_OutOfRange #define No_Standard_OutOfRange
#define No_Standard_RangeError #define No_Standard_RangeError
#endif #endif

2
src/AppCont/AppCont_LeastSquare.gxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifndef DEB #ifndef OCCT_DEBUG
#define No_Standard_OutOfRange #define No_Standard_OutOfRange
#define No_Standard_RangeError #define No_Standard_RangeError
#endif #endif

4
src/AppDef/AppDef_Variational.cxx
View File

@ -1886,13 +1886,13 @@ void AppDef_Variational::SplitCurve(const Handle(FEmTool_Curve)& InCurve,
Standard_Integer NbElmOld = InCurve->NbElements(); Standard_Integer NbElmOld = InCurve->NbElements();
if(NbElmOld >= myMaxSegment) {iscut = Standard_False; return;} if(NbElmOld >= myMaxSegment) {iscut = Standard_False; return;}
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Integer MaxDegree = Standard_Integer MaxDegree =
#endif #endif
InCurve->Base()->WorkDegree(); InCurve->Base()->WorkDegree();
Standard_Integer NbElm = NbElmOld; Standard_Integer NbElm = NbElmOld;
TColStd_Array1OfReal NewKnots(NbElm + 1, myMaxSegment); TColStd_Array1OfReal NewKnots(NbElm + 1, myMaxSegment);
#ifndef DEB #ifndef OCCT_DEBUG
GettingKnots(Ti, InCurve, InCurve->Base()->WorkDegree(), NbElm, NewKnots); GettingKnots(Ti, InCurve, InCurve->Base()->WorkDegree(), NbElm, NewKnots);
GettingKnots(Ti, InCurve, InCurve->Base()->WorkDegree() - 1, NbElm, NewKnots); GettingKnots(Ti, InCurve, InCurve->Base()->WorkDegree() - 1, NbElm, NewKnots);
#else #else

6
src/Approx/Approx_BSplComputeLine.gxx
View File

@ -34,7 +34,7 @@
#include <AppParCurves_ConstraintCouple.hxx> #include <AppParCurves_ConstraintCouple.hxx>
#include Approx_BSpParLeastSquareOfMyBSplGradient_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; static Standard_Boolean mydebug = Standard_False;
@ -625,7 +625,7 @@ Approx_BSplComputeLine::Approx_BSplComputeLine
void Approx_BSplComputeLine::Perform(const MultiLine& Line) 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); if (mydebug) DUMP(Line);
#endif #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); if (mydebug) DUMP(TheMultiBSpCurve);
#endif #endif

30
src/Approx/Approx_ComputeLine.gxx
View File

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

40
src/Approx/Approx_CurvilinearParameter.cxx
View File

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

6
src/Approx/Approx_CurvlinFunc.cxx
View File

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

6
src/Approx/Approx_MCurvesToBSpCurve.cxx
View File

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

30
src/Approx/Approx_SameParameter.cxx
View File

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

10
src/BRepAlgo/BRepAlgo_BooleanOperation.cxx
View File

@ -47,7 +47,7 @@
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepTool_GetcontextNOSEW(); extern Standard_Boolean TopOpeBRepTool_GetcontextNOSEW();
#endif #endif
@ -64,7 +64,7 @@ static void Sub_Classify(TopExp_Explorer& Ex,
TopoDS_Shape& myShape); TopoDS_Shape& myShape);
#ifdef DEB #ifdef OCCT_DEBUG
Standard_IMPORT Standard_Integer TopOpeBRepTool_BOOOPE_CHECK_DEB; Standard_IMPORT Standard_Integer TopOpeBRepTool_BOOOPE_CHECK_DEB;
#endif #endif
@ -117,7 +117,7 @@ extern void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx
HDS->ChangeDS().Init(); HDS->ChangeDS().Init();
} }
#ifdef DEB #ifdef OCCT_DEBUG
TopOpeBRepDS_SettraceSPSX_HDS(HDS); TopOpeBRepDS_SettraceSPSX_HDS(HDS);
#endif #endif
@ -154,7 +154,7 @@ extern void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx
} }
} }
myBuilderCanWork = (esp || tede) ; myBuilderCanWork = (esp || tede) ;
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
if (!esp) cout<<"BRepAlgo_BooleanOperation(DEB) some edges not SameParameter"<<endl; if (!esp) cout<<"BRepAlgo_BooleanOperation(DEB) some edges not SameParameter"<<endl;
#endif #endif
if (!myBuilderCanWork) return; if (!myBuilderCanWork) return;
@ -651,7 +651,7 @@ extern void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx
TopTools_ListOfShape theOldShell, theNewShell; TopTools_ListOfShape theOldShell, theNewShell;
Standard_Boolean modif =Standard_False; Standard_Boolean modif =Standard_False;
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean nosew = TopOpeBRepTool_GetcontextNOSEW(); Standard_Boolean nosew = TopOpeBRepTool_GetcontextNOSEW();
if (nosew) sewing = Standard_False; if (nosew) sewing = Standard_False;
#endif #endif

10
src/BRepAlgo/BRepAlgo_DSAccess.cxx
View File

@ -546,7 +546,7 @@ void BRepAlgo_DSAccess::ChangeEdgeSet
// It is necessary to change Interferences => take the complement // It is necessary to change Interferences => take the complement
iC = myHB->GetDSCurveFromSectEdge(Edge); iC = myHB->GetDSCurveFromSectEdge(Edge);
if (!iC) { if (!iC) {
#if BREPALGO_DEB #ifdef OCCT_DEBUG
cout << "Warning DSAccess: Modifications of Edge are not implemented" << endl; cout << "Warning DSAccess: Modifications of Edge are not implemented" << endl;
#endif #endif
} }
@ -1367,7 +1367,7 @@ void BRepAlgo_DSAccess::RemoveEdgeFromFace
TopExp_Explorer exp(DSFace, TopAbs_EDGE), exp2; TopExp_Explorer exp(DSFace, TopAbs_EDGE), exp2;
for(; exp.More(); exp.Next()) { for(; exp.More(); exp.Next()) {
const TopoDS_Shape& Edge = exp.Current(); const TopoDS_Shape& Edge = exp.Current();
#ifdef DEB #ifdef OCCT_DEBUG
// Standard_Integer iEdge2 = DS.Shape(Edge, FindKeep); // Standard_Integer iEdge2 = DS.Shape(Edge, FindKeep);
// Standard_Integer iEdge3 = DS.Shape(Edge); // Standard_Integer iEdge3 = DS.Shape(Edge);
#endif #endif
@ -1376,7 +1376,7 @@ void BRepAlgo_DSAccess::RemoveEdgeFromFace
continue; continue;
exp2.Init(Edge, TopAbs_VERTEX); exp2.Init(Edge, TopAbs_VERTEX);
for(; exp2.More(); exp2.Next()) { for(; exp2.More(); exp2.Next()) {
#ifdef DEB #ifdef OCCT_DEBUG
// Standard_Integer iEdge5 = DS.Shape(Vertex, FindKeep); // Standard_Integer iEdge5 = DS.Shape(Vertex, FindKeep);
// Standard_Integer iEdge4 = DS.Shape(Vertex); // Standard_Integer iEdge4 = DS.Shape(Vertex);
// Standard_Integer iEdge6 = DS.Shape(exp2.Current(), FindKeep); // Standard_Integer iEdge6 = DS.Shape(exp2.Current(), FindKeep);
@ -1387,7 +1387,7 @@ void BRepAlgo_DSAccess::RemoveEdgeFromFace
if(!DS.HasGeometry(Edge)) { if(!DS.HasGeometry(Edge)) {
const TopTools_ListOfShape& los = DS.ShapeSameDomain(Edge); const TopTools_ListOfShape& los = DS.ShapeSameDomain(Edge);
if(los.IsEmpty()) { if(los.IsEmpty()) {
#ifdef DEB #ifdef OCCT_DEBUG
// Standard_Integer iEdge = DS.Shape(Edge); // Standard_Integer iEdge = DS.Shape(Edge);
#endif #endif
DS.ChangeKeepShape(Edge, FindKeep); DS.ChangeKeepShape(Edge, FindKeep);
@ -1416,7 +1416,7 @@ void BRepAlgo_DSAccess::PntVtxOnCurve
TopOpeBRepDS_Kind pvk; TopOpeBRepDS_Kind pvk;
Standard_Integer ipv, iMother = C.Mother(), igoodC = iCurve, comp = 0; Standard_Integer ipv, iMother = C.Mother(), igoodC = iCurve, comp = 0;
if(iMother) igoodC = iMother; if(iMother) igoodC = iMother;
//#ifndef DEB //#ifndef OCCT_DEBUG
TopOpeBRepDS_PointIterator PII = myHDS->CurvePoints(igoodC); TopOpeBRepDS_PointIterator PII = myHDS->CurvePoints(igoodC);
TopOpeBRepDS_PointIterator& PIt = PII; // skl : I change "M_PI" to "PIt" TopOpeBRepDS_PointIterator& PIt = PII; // skl : I change "M_PI" to "PIt"
//#else //#else

2
src/BRepAlgo/BRepAlgo_EdgeConnector.cxx
View File

@ -116,7 +116,7 @@ TopTools_ListOfShape& BRepAlgo_EdgeConnector::MakeBlock()
myBlockB.MakeBlock(SS); myBlockB.MakeBlock(SS);
BRep_Builder WireB; BRep_Builder WireB;
for(myBlockB.InitBlock();myBlockB.MoreBlock();myBlockB.NextBlock()) { for(myBlockB.InitBlock();myBlockB.MoreBlock();myBlockB.NextBlock()) {
//#ifndef DEB //#ifndef OCCT_DEBUG
TopOpeBRepBuild_BlockIterator BI = myBlockB.BlockIterator(); TopOpeBRepBuild_BlockIterator BI = myBlockB.BlockIterator();
//#else //#else
// TopOpeBRepBuild_BlockIterator& BI = myBlockB.BlockIterator(); // TopOpeBRepBuild_BlockIterator& BI = myBlockB.BlockIterator();

10
src/BRepAlgo/BRepAlgo_Loop.cxx
View File

@ -45,7 +45,7 @@
#ifdef DRAW #ifdef DRAW
#include <DBRep.hxx> #include <DBRep.hxx>
#endif #endif
#ifdef DEBUG_ALGO #ifdef OCCT_DEBUG_ALGO
Standard_Boolean AffichLoop = Standard_False; Standard_Boolean AffichLoop = Standard_False;
Standard_Integer NbLoops = 0; Standard_Integer NbLoops = 0;
Standard_Integer NbWires = 1; Standard_Integer NbWires = 1;
@ -184,7 +184,7 @@ static TopoDS_Vertex UpdateClosedEdge(const TopoDS_Edge& E,
} }
if (OnStart && OnEnd) { if (OnStart && OnEnd) {
if (!VB[0].IsSame(VB[1])) { if (!VB[0].IsSame(VB[1])) {
#ifdef DEBUG_ALGO #ifdef OCCT_DEBUG_ALGO
if (AffichLoop) if (AffichLoop)
cout <<"Two different vertices on the closing vertex"<<endl; cout <<"Two different vertices on the closing vertex"<<endl;
#endif #endif
@ -301,7 +301,7 @@ static Standard_Boolean SelectEdge(const TopoDS_Face& F,
{ {
TopTools_ListIteratorOfListOfShape itl; TopTools_ListIteratorOfListOfShape itl;
NE.Nullify(); NE.Nullify();
#ifdef DEBUG_ALGO #ifdef OCCT_DEBUG_ALGO
if (AffichLoop) { if (AffichLoop) {
if ( LE.Extent() > 2) { if ( LE.Extent() > 2) {
cout <<"vertex on more than 2 edges in a face."<<endl; cout <<"vertex on more than 2 edges in a face."<<endl;
@ -502,7 +502,7 @@ void BRepAlgo_Loop::Perform()
TopoDS_Vertex V1,V2; TopoDS_Vertex V1,V2;
Standard_Boolean YaCouture = Standard_False; Standard_Boolean YaCouture = Standard_False;
#ifdef DEBUG_ALGO #ifdef OCCT_DEBUG_ALGO
if (AffichLoop) { if (AffichLoop) {
cout <<"NewLoop"<<endl; cout <<"NewLoop"<<endl;
NbLoops++; NbLoops++;
@ -662,7 +662,7 @@ void BRepAlgo_Loop::Perform()
NW.Closed (Standard_True); NW.Closed (Standard_True);
myNewWires.Append (NW); myNewWires.Append (NW);
} }
#ifdef DEBUG_ALGO #ifdef OCCT_DEBUG_ALGO
else { else {
cout <<"BRepAlgo_Loop: Open Wire"<<endl; cout <<"BRepAlgo_Loop: Open Wire"<<endl;
if (AffichLoop) if (AffichLoop)

30
src/BRepAlgo/BRepAlgo_NormalProjection.cxx
View File

@ -50,7 +50,7 @@
#include <Geom2d_BSplineCurve.hxx> #include <Geom2d_BSplineCurve.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
#include <OSD_Timer.hxx> #include <OSD_Timer.hxx>
OSD_Chronometer chr_total, chr_init, chr_approx, chr_booltool; OSD_Chronometer chr_total, chr_init, chr_approx, chr_booltool;
@ -195,7 +195,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
void BRepAlgo_NormalProjection::Build() void BRepAlgo_NormalProjection::Build()
{ {
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
Standard_Integer init_count = 0, approx_count = 0, booltool_count = 0; Standard_Integer init_count = 0, approx_count = 0, booltool_count = 0;
t_total = 0; t_total = 0;
t_init = 0; t_init = 0;
@ -266,12 +266,12 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
TolU = hsur->UResolution(myTol3d)/20; TolU = hsur->UResolution(myTol3d)/20;
TolV = hsur->VResolution(myTol3d)/20; TolV = hsur->VResolution(myTol3d)/20;
// Projection // Projection
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
InitChron(chr_init); InitChron(chr_init);
#endif #endif
Projector = Projector =
ProjLib_CompProjectedCurve(hsur, hcur, TolU, TolV, myMaxDist); ProjLib_CompProjectedCurve(hsur, hcur, TolU, TolV, myMaxDist);
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_init,t_init); ResultChron(chr_init,t_init);
init_count++; init_count++;
#endif #endif
@ -290,7 +290,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
for(k = 1; k <= Projector.NbCurves(); k++){ for(k = 1; k <= Projector.NbCurves(); k++){
if(Projector.IsSinglePnt(k, P2d)){ if(Projector.IsSinglePnt(k, P2d)){
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
cout << "Projection of edge "<<i<<" on face "<<j; cout << "Projection of edge "<<i<<" on face "<<j;
cout << " is punctual"<<endl<<endl; cout << " is punctual"<<endl<<endl;
#endif #endif
@ -308,7 +308,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
/**************************************************************/ /**************************************************************/
if (Projector.IsUIso(k, UIso)) { if (Projector.IsUIso(k, UIso)) {
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
cout << "Projection of edge "<<i<<" on face "<<j; cout << "Projection of edge "<<i<<" on face "<<j;
cout << " is U-isoparametric"<<endl<<endl; cout << " is U-isoparametric"<<endl<<endl;
#endif #endif
@ -325,7 +325,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
Only3d = Standard_True; Only3d = Standard_True;
} }
else if (Projector.IsVIso(k, VIso)) { else if (Projector.IsVIso(k, VIso)) {
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
cout << "Projection of edge "<<i<<" on face "<<j; cout << "Projection of edge "<<i<<" on face "<<j;
cout << " is V-isoparametric"<<endl<<endl; cout << " is V-isoparametric"<<endl<<endl;
#endif #endif
@ -359,13 +359,13 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
BB.UpdateVertex(TopExp::LastVertex(TopoDS::Edge(prj)),myTol3d); BB.UpdateVertex(TopExp::LastVertex(TopoDS::Edge(prj)),myTol3d);
} }
else { else {
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
InitChron(chr_approx); InitChron(chr_approx);
#endif #endif
Approx_CurveOnSurface appr(HPCur, hsur, Udeb, Ufin, myTol3d, Approx_CurveOnSurface appr(HPCur, hsur, Udeb, Ufin, myTol3d,
myContinuity, myMaxDegree, myMaxSeg, myContinuity, myMaxDegree, myMaxSeg,
Only3d, Only2d); Only3d, Only2d);
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_approx,t_approx); ResultChron(chr_approx,t_approx);
approx_count++; approx_count++;
@ -438,7 +438,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
} }
} }
if (Degenerated) { if (Degenerated) {
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
cout << "Projection of edge "<<i<<" on face "<<j; cout << "Projection of edge "<<i<<" on face "<<j;
cout << " is degenerated "<<endl<<endl; cout << " is degenerated "<<endl<<endl;
#endif #endif
@ -471,7 +471,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
if(myFaceBounds) { if(myFaceBounds) {
// Trimming edges by face bounds // Trimming edges by face bounds
// if the solution is degenerated, use of BoolTool is avoided // if the solution is degenerated, use of BoolTool is avoided
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
InitChron(chr_booltool); InitChron(chr_booltool);
#endif #endif
if(!Degenerated){ if(!Degenerated){
@ -487,7 +487,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
LS = HB->Splits(prj, TopAbs_IN); LS = HB->Splits(prj, TopAbs_IN);
Iter.Initialize(LS); Iter.Initialize(LS);
if(Iter.More()) { if(Iter.More()) {
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
cout << " BooleanOperations :" << Iter.More()<<" solutions " << endl; cout << " BooleanOperations :" << Iter.More()<<" solutions " << endl;
#endif #endif
for(; Iter.More(); Iter.Next()) { for(; Iter.More(); Iter.Next()) {
@ -517,7 +517,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
} }
} }
else { else {
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
cout << " BooleanOperations : no solution " << endl; cout << " BooleanOperations : no solution " << endl;
#endif #endif
@ -536,7 +536,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
myAncestorMap.Bind(prj, Edges->Value(i)); myAncestorMap.Bind(prj, Edges->Value(i));
myCorresp.Bind(prj, Faces->Value(j)); myCorresp.Bind(prj, Faces->Value(j));
} }
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_booltool,t_booltool); ResultChron(chr_booltool,t_booltool);
booltool_count++; booltool_count++;
#endif #endif
@ -561,7 +561,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
myIsDone = Standard_True; myIsDone = Standard_True;
#ifdef __OCC_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_total,t_total); ResultChron(chr_total,t_total);
cout<<"Build - Total time : "<<t_total<<" includes:" <<endl; cout<<"Build - Total time : "<<t_total<<" includes:" <<endl;

2
src/BRepAlgo/BRepAlgo_Tool.cxx
View File

@ -86,7 +86,7 @@ TopoDS_Shape BRepAlgo_Tool::Deboucle3D(const TopoDS_Shape& S,
} }
if (NbSub == 0) if (NbSub == 0)
{ {
#ifdef BREPALGO_DEB #ifdef OCCT_DEBUG
cout << "No subhape in shape!" << endl; cout << "No subhape in shape!" << endl;
#endif #endif
SS = TopoDS_Shape(); SS = TopoDS_Shape();

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. // (4) Insertion of the point if the calculation seems long.
if ((!Trouve)&&(rsnld.NbIterations()>3)) { if ((!Trouve)&&(rsnld.NbIterations()>3)) {
#ifdef BREPBLEND_DEB #ifdef OCCT_DEBUG
cout << "Evaluation in t = " << Param << "given" << endl; cout << "Evaluation in t = " << Param << "given" << endl;
rsnld.Dump(cout); rsnld.Dump(cout);
#endif #endif

32
src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
View File

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

2
src/BRepBlend/BRepBlend_SurfRstConstRad.cxx
View File

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

2
src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
View File

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

32
src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
View File

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

8
src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
View File

@ -25,7 +25,7 @@
#include <TopTools_DataMapOfShapeShape.hxx> #include <TopTools_DataMapOfShapeShape.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
#include <stdio.h> #include <stdio.h>
Standard_Boolean Affich; Standard_Boolean Affich;
#endif #endif
@ -159,7 +159,7 @@ static void Update ( TopTools_DataMapOfShapeListOfShape& Mod,
} }
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
//======================================================================= //=======================================================================
//function : DEBControl //function : DEBControl
//purpose : //purpose :
@ -214,7 +214,7 @@ void BRepBuilderAPI_Collect::Add (const TopoDS_Shape& SI,
Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE); Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE);
Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX); Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX);
#ifdef DEB #ifdef OCCT_DEBUG
if (Affich) { if (Affich) {
DEBControl (myGen); DEBControl (myGen);
DEBControl (myMod); DEBControl (myMod);
@ -323,7 +323,7 @@ static void FilterByShape(TopTools_DataMapOfShapeListOfShape& MG,
else if (itl.More()) itl.Next(); else if (itl.More()) itl.Next();
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (Affich) { if (Affich) {
DEBControl (MG); DEBControl (MG);
} }

52
src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
View File

@ -143,7 +143,7 @@ Handle(Geom2d_Curve) BRepBuilderAPI_Sewing::SameRange(const Handle(Geom2d_Curve)
RequestedFirst,RequestedLast,NewCurvePtr); RequestedFirst,RequestedLast,NewCurvePtr);
} }
catch (Standard_Failure) { catch (Standard_Failure) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Exception in BRepBuilderAPI_Sewing::SameRange: "; cout << "Exception in BRepBuilderAPI_Sewing::SameRange: ";
Standard_Failure::Caught()->Print(cout); cout << endl; Standard_Failure::Caught()->Print(cout); cout << endl;
#endif #endif
@ -315,7 +315,7 @@ void BRepBuilderAPI_Sewing::SameParameter(const TopoDS_Edge& edge) const
BRepLib::SameParameter(edge); BRepLib::SameParameter(edge);
} }
catch (Standard_Failure) { catch (Standard_Failure) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Exception in BRepBuilderAPI_Sewing::SameParameter: "; cout << "Exception in BRepBuilderAPI_Sewing::SameParameter: ";
Standard_Failure::Caught()->Print(cout); cout << endl; Standard_Failure::Caught()->Print(cout); cout << endl;
#endif #endif
@ -1775,7 +1775,7 @@ void BRepBuilderAPI_Sewing::Add(const TopoDS_Shape& aShape)
//purpose : //purpose :
//======================================================================= //=======================================================================
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
#include <OSD_Timer.hxx> #include <OSD_Timer.hxx>
#endif #endif
@ -1783,7 +1783,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
{ {
const Standard_Integer aNumberOfStages = myAnalysis + myCutting + mySewing + 2; const Standard_Integer aNumberOfStages = myAnalysis + myCutting + mySewing + 2;
Message_ProgressSentry aPS (thePI, "Sewing", 0, aNumberOfStages, 1); Message_ProgressSentry aPS (thePI, "Sewing", 0, aNumberOfStages, 1);
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
Standard_Real t_total = 0., t_analysis = 0., t_assembling = 0., t_cutting = 0., t_merging = 0.; Standard_Real t_total = 0., t_analysis = 0., t_assembling = 0., t_cutting = 0., t_merging = 0.;
OSD_Chronometer chr_total, chr_local; OSD_Chronometer chr_total, chr_local;
chr_total.Reset(); chr_total.Reset();
@ -1793,7 +1793,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
// face analysis // face analysis
if (myAnalysis) if (myAnalysis)
{ {
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Begin face analysis..." << endl; cout << "Begin face analysis..." << endl;
chr_local.Reset(); chr_local.Reset();
chr_local.Start(); chr_local.Start();
@ -1802,7 +1802,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
if (!aPS.More()) if (!aPS.More())
return; return;
aPS.Next(); aPS.Next();
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
chr_local.Stop(); chr_local.Stop();
chr_local.Show(t_analysis); chr_local.Show(t_analysis);
cout << "Face analysis finished after " << t_analysis << " s" << endl; cout << "Face analysis finished after " << t_analysis << " s" << endl;
@ -1817,7 +1817,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
if (myBoundFaces.Extent()) if (myBoundFaces.Extent())
{ {
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Begin vertices assembling..." << endl; cout << "Begin vertices assembling..." << endl;
chr_local.Reset(); chr_local.Reset();
chr_local.Start(); chr_local.Start();
@ -1826,14 +1826,14 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
if (!aPS.More()) if (!aPS.More())
return; return;
aPS.Next(); aPS.Next();
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
chr_local.Stop(); chr_local.Stop();
chr_local.Show(t_assembling); chr_local.Show(t_assembling);
cout << "Vertices assembling finished after " << t_assembling << " s" << endl; cout << "Vertices assembling finished after " << t_assembling << " s" << endl;
#endif #endif
if (myCutting) if (myCutting)
{ {
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Begin cutting..." << endl; cout << "Begin cutting..." << endl;
chr_local.Reset(); chr_local.Reset();
chr_local.Start(); chr_local.Start();
@ -1842,13 +1842,13 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
if (!aPS.More()) if (!aPS.More())
return; return;
aPS.Next(); aPS.Next();
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
chr_local.Stop(); chr_local.Stop();
chr_local.Show(t_cutting); chr_local.Show(t_cutting);
cout << "Cutting finished after " << t_cutting << " s" << endl; cout << "Cutting finished after " << t_cutting << " s" << endl;
#endif #endif
} }
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Begin merging..." << endl; cout << "Begin merging..." << endl;
chr_local.Reset(); chr_local.Reset();
chr_local.Start(); chr_local.Start();
@ -1857,7 +1857,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
if (!aPS.More()) if (!aPS.More())
return; return;
aPS.Next(); aPS.Next();
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
chr_local.Stop(); chr_local.Stop();
chr_local.Show(t_merging); chr_local.Show(t_merging);
cout << "Merging finished after " << t_merging << " s" << endl; cout << "Merging finished after " << t_merging << " s" << endl;
@ -1876,7 +1876,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
if (mySewing) if (mySewing)
{ {
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Creating sewed shape..." << endl; cout << "Creating sewed shape..." << endl;
#endif #endif
// examine the multiple edges if any and process sameparameter for edges if necessary // examine the multiple edges if any and process sameparameter for edges if necessary
@ -1896,7 +1896,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
mySewedShape.Nullify(); mySewedShape.Nullify();
return; return;
} }
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Sewed shape created" << endl; cout << "Sewed shape created" << endl;
#endif #endif
} }
@ -1909,7 +1909,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
return; return;
} }
} }
#if BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
chr_total.Stop(); chr_total.Stop();
chr_total.Show(t_total); chr_total.Show(t_total);
cout << "Sewing finished!" << endl; cout << "Sewing finished!" << endl;
@ -2260,7 +2260,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
Standard_Real first, last; Standard_Real first, last;
Handle(Geom_Curve) c3d = BRep_Tool::Curve(edge,first,last); Handle(Geom_Curve) c3d = BRep_Tool::Curve(edge,first,last);
if (c3d.IsNull()) { if (c3d.IsNull()) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Warning: Possibly small edge can be sewed: No 3D curve" << endl; cout << "Warning: Possibly small edge can be sewed: No 3D curve" << endl;
#endif #endif
} }
@ -2281,7 +2281,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
isSmall = (length <= MinTolerance()); isSmall = (length <= MinTolerance());
} }
catch (Standard_Failure) { catch (Standard_Failure) {
#ifdef DEB #ifdef OCCT_DEBUG
cout << "Warning: Possibly small edge can be sewed: "; cout << "Warning: Possibly small edge can be sewed: ";
Standard_Failure::Caught()->Print(cout); cout << endl; Standard_Failure::Caught()->Print(cout); cout << endl;
#endif #endif
@ -2340,7 +2340,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
// Replace small edge // Replace small edge
if (isSmall) { if (isSmall) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Warning: Small edge made degenerated by FaceAnalysis" << endl; cout << "Warning: Small edge made degenerated by FaceAnalysis" << endl;
#endif #endif
nbSmall++; nbSmall++;
@ -2377,7 +2377,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
// Remove small face // Remove small face
if (nbSmall == nbEdges) { if (nbSmall == nbEdges) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Warning: Small face removed by FaceAnalysis" << endl; cout << "Warning: Small face removed by FaceAnalysis" << endl;
#endif #endif
myLittleFace.Add(face); myLittleFace.Add(face);
@ -2765,7 +2765,7 @@ static Standard_Boolean GlueVertices(TopTools_IndexedDataMapOfShapeShape& aVerte
} }
} }
Standard_Integer nbNodes = NodeVertices.Extent(); Standard_Integer nbNodes = NodeVertices.Extent();
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Glueing " << nbNodes << " nodes..." << endl; cout << "Glueing " << nbNodes << " nodes..." << endl;
#endif #endif
// Merge nearest nodes // Merge nearest nodes
@ -2926,7 +2926,7 @@ void BRepBuilderAPI_Sewing::VerticesAssembling(const Handle(Message_ProgressIndi
} }
// Glue vertices // Glue vertices
if (nbVert) { if (nbVert) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Assemble " << nbVert << " vertices on faces..." << endl; cout << "Assemble " << nbVert << " vertices on faces..." << endl;
#endif #endif
while (GlueVertices(myVertexNode,myNodeSections,myBoundFaces,myTolerance, thePI)); while (GlueVertices(myVertexNode,myNodeSections,myBoundFaces,myTolerance, thePI));
@ -2935,7 +2935,7 @@ void BRepBuilderAPI_Sewing::VerticesAssembling(const Handle(Message_ProgressIndi
return; return;
aPS.Next(); aPS.Next();
if (nbVertFree) { if (nbVertFree) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Assemble " << nbVertFree << " vertices on floating edges..." << endl; cout << "Assemble " << nbVertFree << " vertices on floating edges..." << endl;
#endif #endif
while (GlueVertices(myVertexNodeFree,myNodeSections,myBoundFaces,myTolerance, thePI)); while (GlueVertices(myVertexNodeFree,myNodeSections,myBoundFaces,myTolerance, thePI));
@ -3689,7 +3689,7 @@ void BRepBuilderAPI_Sewing::Cutting(const Handle(Message_ProgressIndicator)& the
myBoundSections.Bind(bound,listSections); myBoundSections.Bind(bound,listSections);
} }
} }
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "From " << nbBounds << " bounds " << myBoundSections.Extent() cout << "From " << nbBounds << " bounds " << myBoundSections.Extent()
<< " were cut into " << mySectionBound.Extent() << " sections" << endl; << " were cut into " << mySectionBound.Extent() << " sections" << endl;
#endif #endif
@ -4294,7 +4294,7 @@ void BRepBuilderAPI_Sewing::ProjectPointsOnCurve(const TColgp_Array1OfPnt& arrPn
} }
catch (Standard_Failure) { catch (Standard_Failure) {
worktol = MinTolerance(); worktol = MinTolerance();
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Exception in BRepBuilderAPI_Sewing::ProjectPointsOnCurve: "; cout << "Exception in BRepBuilderAPI_Sewing::ProjectPointsOnCurve: ";
Standard_Failure::Caught()->Print(cout); cout << endl; Standard_Failure::Caught()->Print(cout); cout << endl;
#endif #endif
@ -4632,7 +4632,7 @@ void BRepBuilderAPI_Sewing::CreateSections(const TopoDS_Shape& section,
} }
//} //}
/*catch (Standard_Failure) { /*catch (Standard_Failure) {
#ifdef DEB #ifdef OCCT_DEBUG
cout << "Exception in CreateSections: segment [" << par1 << "," << par2 << "]: "; cout << "Exception in CreateSections: segment [" << par1 << "," << par2 << "]: ";
Standard_Failure::Caught()->Print(cout); cout << endl; Standard_Failure::Caught()->Print(cout); cout << endl;
#endif #endif
@ -4674,7 +4674,7 @@ void BRepBuilderAPI_Sewing::SameParameterShape()
BRepLib::SameParameter(sec, BRep_Tool::Tolerance(sec)); BRepLib::SameParameter(sec, BRep_Tool::Tolerance(sec));
} }
catch (Standard_Failure) { catch (Standard_Failure) {
#ifdef BREPBUILDERAPI_DEB #ifdef OCCT_DEBUG
cout << "Fail: BRepBuilderAPI_Sewing::SameParameterShape exception in BRepLib::SameParameter" << endl; cout << "Fail: BRepBuilderAPI_Sewing::SameParameterShape exception in BRepLib::SameParameter" << endl;
#endif #endif
continue; continue;

14
src/BRepCheck/BRepCheck_Analyzer.cxx
View File

@ -139,7 +139,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;
@ -169,7 +169,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;
@ -207,7 +207,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;
@ -267,7 +267,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;
@ -320,7 +320,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;
@ -367,7 +367,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;
@ -410,7 +410,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;

2
src/BRepCheck/BRepCheck_Edge.cxx
View File

@ -878,7 +878,7 @@ Standard_Real PrecSurface(const Adaptor3d_CurveOnSurface& aACS)
//function : PrintProblematicPoint //function : PrintProblematicPoint
//purpose : //purpose :
//======================================================================= //=======================================================================
#ifdef DEB #ifdef OCCT_DEBUG
void PrintProblematicPoint(const gp_Pnt& problematic_point, void PrintProblematicPoint(const gp_Pnt& problematic_point,
const Standard_Real Error, const Standard_Real Error,
const Standard_Real Tol) const Standard_Real Tol)

10
src/BRepCheck/BRepCheck_Shell.cxx
View File

@ -529,7 +529,7 @@ BRepCheck_Status BRepCheck_Shell::Orientation(const Standard_Boolean Update)
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (BRepCheck_Trace(0) > 1) { if (BRepCheck_Trace(0) > 1) {
TopTools_DataMapIteratorOfDataMapOfShapeInteger itt(MapOfShapeOrientation); TopTools_DataMapIteratorOfDataMapOfShapeInteger itt(MapOfShapeOrientation);
Standard_Integer upper = MapOfShapeOrientation.NbBuckets(); Standard_Integer upper = MapOfShapeOrientation.NbBuckets();
@ -720,7 +720,7 @@ BRepCheck_Status BRepCheck_Shell::Orientation(const Standard_Boolean Update)
// orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fref); // orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fref);
Fref.Orientation(orf); Fref.Orientation(orf);
#ifdef DEB #ifdef OCCT_DEBUG
if (BRepCheck_Trace(0) > 3) { if (BRepCheck_Trace(0) > 3) {
cout << "Fref : " ; cout << "Fref : " ;
PrintShape(Fref, MapOfShapeOrientation.NbBuckets()); PrintShape(Fref, MapOfShapeOrientation.NbBuckets());
@ -763,7 +763,7 @@ BRepCheck_Status BRepCheck_Shell::Orientation(const Standard_Boolean Update)
// orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fcur); // orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fcur);
Fcur.Orientation(orf); Fcur.Orientation(orf);
#ifdef DEB #ifdef OCCT_DEBUG
if (BRepCheck_Trace(0) > 3) { if (BRepCheck_Trace(0) > 3) {
cout << " Fcur : " ; cout << " Fcur : " ;
PrintShape(Fcur, MapOfShapeOrientation.NbBuckets()); PrintShape(Fcur, MapOfShapeOrientation.NbBuckets());
@ -783,7 +783,7 @@ BRepCheck_Status BRepCheck_Shell::Orientation(const Standard_Boolean Update)
BRepCheck::Add(myMap(myShape), myOstat); BRepCheck::Add(myMap(myShape), myOstat);
} }
// quit, otherwise there is a risk of taking too much time. // quit, otherwise there is a risk of taking too much time.
#ifdef DEB #ifdef OCCT_DEBUG
if (BRepCheck_Trace(0) > 3) { if (BRepCheck_Trace(0) > 3) {
orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fcur); orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fcur);
Fcur.Orientation(orf); Fcur.Orientation(orf);
@ -798,7 +798,7 @@ BRepCheck_Status BRepCheck_Shell::Orientation(const Standard_Boolean Update)
MapOfShapeOrientation(Fcur)=orf; MapOfShapeOrientation(Fcur)=orf;
#ifdef DEB #ifdef OCCT_DEBUG
if (BRepCheck_Trace(0) > 3) { if (BRepCheck_Trace(0) > 3) {
orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fcur); orf = (TopAbs_Orientation)MapOfShapeOrientation.Find(Fcur);
Fcur.Orientation(orf); Fcur.Orientation(orf);

22
src/BRepCheck/BRepCheck_Wire.cxx
View File

@ -380,7 +380,7 @@ Standard_Boolean IsDistanceIn3DTolerance (const gp_Pnt& thePnt_f,
if (Dist < aTol3d) if (Dist < aTol3d)
return Standard_True; return Standard_True;
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout << endl; cout << endl;
cout << "--------Function IsDistanceIn3DTolerance(...)----------" << endl; cout << "--------Function IsDistanceIn3DTolerance(...)----------" << endl;
cout << "--- BRepCheck Wire: Closed3d -> Error" << endl; cout << "--- BRepCheck Wire: Closed3d -> Error" << endl;
@ -402,7 +402,7 @@ Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurfac
const gp_Pnt2d& thePnt, const gp_Pnt2d& thePnt,
const gp_Pnt2d& thePntRef, const gp_Pnt2d& thePntRef,
const Standard_Real aTol3d, const Standard_Real aTol3d,
#ifdef DEB #ifdef OCCT_DEBUG
const Standard_Boolean PrintWarnings = Standard_True) const Standard_Boolean PrintWarnings = Standard_True)
#else #else
const Standard_Boolean = Standard_True) const Standard_Boolean = Standard_True)
@ -416,7 +416,7 @@ Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurfac
if((dumin < dumax) && (dvmin < dvmax)) if((dumin < dumax) && (dvmin < dvmax))
return Standard_True; return Standard_True;
#ifdef DEB #ifdef OCCT_DEBUG
if(PrintWarnings) if(PrintWarnings)
{ {
cout << endl; cout << endl;
@ -451,7 +451,7 @@ Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurfac
Standard_Real aTol2d = 2*Max( dumax, dvmax); Standard_Real aTol2d = 2*Max( dumax, dvmax);
#ifdef DEB #ifdef OCCT_DEBUG
if((aTol2d <= 0.0) && (PrintWarnings)) if((aTol2d <= 0.0) && (PrintWarnings))
{ {
cout<<"BRepCheck_Wire : UResolution and VResolution = 0.0 (Face too small ?)"<<endl; cout<<"BRepCheck_Wire : UResolution and VResolution = 0.0 (Face too small ?)"<<endl;
@ -465,7 +465,7 @@ Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurfac
if (Dist < aTol2d) if (Dist < aTol2d)
return Standard_True; return Standard_True;
#ifdef DEB #ifdef OCCT_DEBUG
if(PrintWarnings) if(PrintWarnings)
{ {
cout << endl; cout << endl;
@ -1059,7 +1059,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire); BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire);
} }
delete [] tabDom; delete [] tabDom;
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
static Standard_Integer numpoint=0; static Standard_Integer numpoint=0;
cout<<"point p"<<++numpoint<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl;cout.flush(); cout<<"point p"<<++numpoint<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl;cout.flush();
#endif #endif
@ -1092,7 +1092,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
} }
else { else {
delete [] tabDom; delete [] tabDom;
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout<<"BRepCheck_NoCurveOnSurface or BRepCheck_InvalidRange"<<endl;cout.flush(); cout<<"BRepCheck_NoCurveOnSurface or BRepCheck_InvalidRange"<<endl;cout.flush();
#endif #endif
if(tabCur(j).IsNull()) { if(tabCur(j).IsNull()) {
@ -1214,7 +1214,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
//-- Check distance from edges to the curve joining //-- Check distance from edges to the curve joining
//-- the point of intersection with vertex (if exists) //-- the point of intersection with vertex (if exists)
if (localok == Standard_False && !CommonVertices.IsEmpty()) { if (localok == Standard_False && !CommonVertices.IsEmpty()) {
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
cout << "\n------------------------------------------------------\n" <<endl; cout << "\n------------------------------------------------------\n" <<endl;
cout << "\n--- BRepCheck Wire: AutoIntersection Phase1 -> Erreur \n" <<endl; cout << "\n--- BRepCheck Wire: AutoIntersection Phase1 -> Erreur \n" <<endl;
@ -1319,7 +1319,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
localok = Standard_False; localok = Standard_False;
} }
} }
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
if(localok) { if(localok) {
printf("--- BRepCheck Wire: AutoIntersection Phase2 -> Bon \n"); printf("--- BRepCheck Wire: AutoIntersection Phase2 -> Bon \n");
printf("--- distance Point Vertex : %10.7g (tol %10.7g)\n",distauvtxleplusproche,tolvtt); printf("--- distance Point Vertex : %10.7g (tol %10.7g)\n",distauvtxleplusproche,tolvtt);
@ -1344,7 +1344,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
if (Update) { if (Update) {
BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire); BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire);
} }
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
static Standard_Integer numpoint1=0; static Standard_Integer numpoint1=0;
cout<<"point p"<<++numpoint1<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl; cout<<"point p"<<++numpoint1<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl;
cout.flush(); cout.flush();
@ -1478,7 +1478,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
if (Update) { if (Update) {
BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire); BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire);
} }
#ifdef BREPCHECK_DEB #ifdef OCCT_DEBUG
static Standard_Integer numpoint1=0; static Standard_Integer numpoint1=0;
cout<<"point p"<<++numpoint1<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl; cout<<"point p"<<++numpoint1<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl;
cout.flush(); cout.flush();

4
src/BRepClass3d/BRepClass3d_SClassifier.cxx
View File

@ -330,7 +330,7 @@ void BRepClass3d_SClassifier::Perform(BRepClass3d_SolidExplorer& SolidExplorer,
IntCurveSurface_TransitionOnCurve tran = Intersector3d.Transition(i); IntCurveSurface_TransitionOnCurve tran = Intersector3d.Transition(i);
if (tran == IntCurveSurface_Tangent) { if (tran == IntCurveSurface_Tangent) {
#ifdef BREPCLASS3D_DEB #ifdef OCCT_DEBUG
cout<<"*Problem ds BRepClass3d_SClassifier.cxx"<<endl; cout<<"*Problem ds BRepClass3d_SClassifier.cxx"<<endl;
#endif #endif
continue; // ignore this point continue; // ignore this point
@ -381,7 +381,7 @@ void BRepClass3d_SClassifier::Perform(BRepClass3d_SolidExplorer& SolidExplorer,
} }
// Modified by skv - Thu Sep 4 11:42:03 2003 OCC578 End // Modified by skv - Thu Sep 4 11:42:03 2003 OCC578 End
#ifdef DEB #ifdef OCCT_DEBUG
//################################################# //#################################################
SolidExplorer.DumpSegment(P,L,parmin,State()); SolidExplorer.DumpSegment(P,L,parmin,State());
//################################################# //#################################################

2
src/BRepClass3d/BRepClass3d_SolidClassifier.cxx
View File

@ -17,7 +17,7 @@
#define MARCHEPASSIUNESEULEFACE 0 #define MARCHEPASSIUNESEULEFACE 0
#ifdef DEB #ifdef OCCT_DEBUG
#define LBRCOMPT 0 #define LBRCOMPT 0
#else #else
#define LBRCOMPT 0 #define LBRCOMPT 0

8
src/BRepClass3d/BRepClass3d_SolidExplorer.cxx
View File

@ -575,7 +575,7 @@ Standard_Integer BRepClass3d_SolidExplorer::OtherSegment(const gp_Pnt& P,
if(NbFacesInSolid==0) { if(NbFacesInSolid==0) {
_Par=0.0; _Par=0.0;
myReject=Standard_True; myReject=Standard_True;
#if BREPCLASS3D_DEB #ifdef OCCT_DEBUG
cout<<"\nWARNING : BRepClass3d_SolidExplorer.cxx (Solid without face)"<<endl; cout<<"\nWARNING : BRepClass3d_SolidExplorer.cxx (Solid without face)"<<endl;
#endif #endif
return 0; return 0;
@ -780,7 +780,7 @@ void BRepClass3d_SolidExplorer::InitShape(const TopoDS_Shape& S)
myReject=Standard_False; //-- at least one face in the solid myReject=Standard_False; //-- at least one face in the solid
} }
#if BREPCLASS3D_DEB #ifdef OCCT_DEBUG
if(myReject) { if(myReject) {
cout<<"\nWARNING : BRepClass3d_SolidExplorer.cxx (Solid without face)"<<endl; cout<<"\nWARNING : BRepClass3d_SolidExplorer.cxx (Solid without face)"<<endl;
} }
@ -902,7 +902,7 @@ Standard_Boolean BRepClass3d_SolidExplorer::RejectFace(const gp_Lin& ) const
return(Standard_False); return(Standard_False);
} }
#ifdef DEB #ifdef OCCT_DEBUG
#include <TopAbs_State.hxx> #include <TopAbs_State.hxx>
#endif #endif
@ -952,7 +952,7 @@ void BRepClass3d_SolidExplorer::DumpSegment(const gp_Pnt&,
const Standard_Real, const Standard_Real,
const TopAbs_State) const const TopAbs_State) const
{ {
#ifdef DEB #ifdef OCCT_DEBUG
#endif #endif
} }

32
src/BRepFeat/BRepFeat_Form.cxx
View File

@ -65,7 +65,7 @@
#include <BRepFeat_Builder.hxx> #include <BRepFeat_Builder.hxx>
//modified by NIZNHY-PKV Thu Mar 21 17:30:29 2002 t //modified by NIZNHY-PKV Thu Mar 21 17:30:29 2002 t
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
#endif #endif
@ -80,14 +80,14 @@ static void Descendants(const TopoDS_Shape&,
void BRepFeat_Form::GlobalPerform () void BRepFeat_Form::GlobalPerform ()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_Form::GlobalPerform ()" << endl; if (trc) cout << "BRepFeat_Form::GlobalPerform ()" << endl;
#endif #endif
if (!mySbOK || !myGSOK || !mySFOK || !mySUOK || !myGFOK || if (!mySbOK || !myGSOK || !mySFOK || !mySUOK || !myGFOK ||
!mySkOK || !myPSOK) { !mySkOK || !myPSOK) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Fields not initialized in BRepFeat_Form" << endl; if (trc) cout << " Fields not initialized in BRepFeat_Form" << endl;
#endif #endif
myStatusError = BRepFeat_NotInitialized; myStatusError = BRepFeat_NotInitialized;
@ -101,7 +101,7 @@ static void Descendants(const TopoDS_Shape&,
TopTools_DataMapIteratorOfDataMapOfShapeShape itm; TopTools_DataMapIteratorOfDataMapOfShapeShape itm;
if(myJustFeat && !myFuse) { if(myJustFeat && !myFuse) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Invalid option : myJustFeat + Cut" << endl; if (trc) cout << " Invalid option : myJustFeat + Cut" << endl;
#endif #endif
myStatusError = BRepFeat_InvOption; myStatusError = BRepFeat_InvOption;
@ -131,7 +131,7 @@ static void Descendants(const TopoDS_Shape&,
} }
if (!exp.More()) { if (!exp.More()) {
FromInShape = Standard_False; FromInShape = Standard_False;
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " From not in Shape" << endl; if (trc) cout << " From not in Shape" << endl;
#endif #endif
break; break;
@ -150,7 +150,7 @@ static void Descendants(const TopoDS_Shape&,
} }
if (!exp.More()) { if (!exp.More()) {
UntilInShape = Standard_False; UntilInShape = Standard_False;
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Until not in Shape" << endl; if (trc) cout << " Until not in Shape" << endl;
#endif #endif
break; break;
@ -320,7 +320,7 @@ static void Descendants(const TopoDS_Shape&,
//--- case of gluing //--- case of gluing
if (theOpe == 1) { if (theOpe == 1) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Gluer" << endl; if (trc) cout << " Gluer" << endl;
#endif #endif
Standard_Boolean Collage = Standard_True; Standard_Boolean Collage = Standard_True;
@ -534,7 +534,7 @@ static void Descendants(const TopoDS_Shape&,
//--- if the gluing is always applicable //--- if the gluing is always applicable
if (theOpe == 1) { if (theOpe == 1) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " still Gluer" << endl; if (trc) cout << " still Gluer" << endl;
#endif #endif
theGlue.Perform(); theGlue.Perform();
@ -545,7 +545,7 @@ static void Descendants(const TopoDS_Shape&,
UpdateDescendants(theGlue); UpdateDescendants(theGlue);
myNewEdges = theGlue.Edges(); myNewEdges = theGlue.Edges();
myTgtEdges = theGlue.TgtEdges(); myTgtEdges = theGlue.TgtEdges();
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Gluer result" << endl; if (trc) cout << " Gluer result" << endl;
#endif #endif
Done(); Done();
@ -566,7 +566,7 @@ static void Descendants(const TopoDS_Shape&,
//--- case without gluing + Tool with proper dimensions //--- case without gluing + Tool with proper dimensions
if (theOpe == 2 && ChangeOpe && myJustGluer) { if (theOpe == 2 && ChangeOpe && myJustGluer) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Gluer failure" << endl; if (trc) cout << " Gluer failure" << endl;
#endif #endif
myJustGluer = Standard_False; myJustGluer = Standard_False;
@ -578,12 +578,12 @@ static void Descendants(const TopoDS_Shape&,
//--- case without gluing //--- case without gluing
if (theOpe == 2) { if (theOpe == 2) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No Gluer" << endl; if (trc) cout << " No Gluer" << endl;
#endif #endif
TopoDS_Shape theGShape = myGShape; TopoDS_Shape theGShape = myGShape;
if (ChangeOpe) { if (ChangeOpe) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Passage to topological operations" << endl; if (trc) cout << " Passage to topological operations" << endl;
#endif #endif
} }
@ -988,7 +988,7 @@ static void Descendants(const TopoDS_Shape&,
// Case when no part of the tool is preserved // Case when no part of the tool is preserved
if (!KeepParts) { if (!KeepParts) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No parts of tool kept" << endl; if (trc) cout << " No parts of tool kept" << endl;
#endif #endif
myStatusError = BRepFeat_NoParts; myStatusError = BRepFeat_NoParts;
@ -1200,7 +1200,7 @@ const TopTools_ListOfShape& BRepFeat_Form::TgtEdges() const
Standard_Boolean BRepFeat_Form::TransformShapeFU(const Standard_Integer flag) Standard_Boolean BRepFeat_Form::TransformShapeFU(const Standard_Integer flag)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
#endif #endif
Standard_Boolean Trf = Standard_False; Standard_Boolean Trf = Standard_False;
@ -1215,7 +1215,7 @@ Standard_Boolean BRepFeat_Form::TransformShapeFU(const Standard_Integer flag)
TopExp_Explorer exp(shapefu, TopAbs_FACE); TopExp_Explorer exp(shapefu, TopAbs_FACE);
if (!exp.More()) { // no faces... It is necessary to return an error if (!exp.More()) { // no faces... It is necessary to return an error
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " BRepFeat_Form::TransformShapeFU : invalid Shape" << endl; if (trc) cout << " BRepFeat_Form::TransformShapeFU : invalid Shape" << endl;
#endif #endif
return Trf; return Trf;
@ -1272,7 +1272,7 @@ Standard_Boolean BRepFeat_Form::TransformShapeFU(const Standard_Integer flag)
myMap(fac).Append(fac); myMap(fac).Append(fac);
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (Trf && (flag == 0)) cout << " TransformShapeFU From" << endl; if (Trf && (flag == 0)) cout << " TransformShapeFU From" << endl;
if (Trf && (flag == 1)) cout << " TransformShapeFU Until" << endl; if (Trf && (flag == 1)) cout << " TransformShapeFU Until" << endl;

28
src/BRepFeat/BRepFeat_MakeDPrism.cxx
View File

@ -78,7 +78,7 @@
#include <BRepFeat.hxx> #include <BRepFeat.hxx>
#include <TopAbs.hxx> #include <TopAbs.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
#endif #endif
@ -116,7 +116,7 @@ void BRepFeat_MakeDPrism::Init(const TopoDS_Shape& Sbase,
const Standard_Boolean Modify) const Standard_Boolean Modify)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::Init" << endl; if (trc) cout << "BRepFeat_MakeDPrism::Init" << endl;
#endif #endif
@ -161,7 +161,7 @@ void BRepFeat_MakeDPrism::Init(const TopoDS_Shape& Sbase,
myMap(exp.Current()).Append(exp.Current()); myMap(exp.Current()).Append(exp.Current());
} }
myAngle = Angle; myAngle = Angle;
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (myJustFeat) cout << " Just Feature" << endl; if (myJustFeat) cout << " Just Feature" << endl;
if (myFuse) cout << " Fuse" << endl; if (myFuse) cout << " Fuse" << endl;
@ -181,7 +181,7 @@ void BRepFeat_MakeDPrism::Init(const TopoDS_Shape& Sbase,
void BRepFeat_MakeDPrism::Add(const TopoDS_Edge& E, void BRepFeat_MakeDPrism::Add(const TopoDS_Edge& E,
const TopoDS_Face& F) const TopoDS_Face& F)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::Add(Edge,face)" << endl; if (trc) cout << "BRepFeat_MakeDPrism::Add(Edge,face)" << endl;
#endif #endif
@ -227,7 +227,7 @@ void BRepFeat_MakeDPrism::Add(const TopoDS_Edge& E,
void BRepFeat_MakeDPrism::Perform(const Standard_Real Height) void BRepFeat_MakeDPrism::Perform(const Standard_Real Height)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::Perform(Height)" << endl; if (trc) cout << "BRepFeat_MakeDPrism::Perform(Height)" << endl;
#endif #endif
@ -338,7 +338,7 @@ void BRepFeat_MakeDPrism::Perform(const Standard_Real Height)
void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until) void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::Perform(Until)" << endl; if (trc) cout << "BRepFeat_MakeDPrism::Perform(Until)" << endl;
#endif #endif
@ -474,7 +474,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& From, void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& From,
const TopoDS_Shape& Until) const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::Perform(From,Until)" << endl; if (trc) cout << "BRepFeat_MakeDPrism::Perform(From,Until)" << endl;
#endif #endif
@ -658,7 +658,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& From,
void BRepFeat_MakeDPrism::PerformUntilEnd() void BRepFeat_MakeDPrism::PerformUntilEnd()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::PerformUntilEnd()" << endl; if (trc) cout << "BRepFeat_MakeDPrism::PerformUntilEnd()" << endl;
#endif #endif
@ -692,7 +692,7 @@ void BRepFeat_MakeDPrism::PerformUntilEnd()
void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until) void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::PerformFromEnd(From,Until)" << endl; if (trc) cout << "BRepFeat_MakeDPrism::PerformFromEnd(From,Until)" << endl;
#endif #endif
@ -851,7 +851,7 @@ void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until)
void BRepFeat_MakeDPrism::PerformThruAll() void BRepFeat_MakeDPrism::PerformThruAll()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::PerformThruAll()" << endl; if (trc) cout << "BRepFeat_MakeDPrism::PerformThruAll()" << endl;
#endif #endif
@ -909,7 +909,7 @@ void BRepFeat_MakeDPrism::PerformThruAll()
void BRepFeat_MakeDPrism::PerformUntilHeight(const TopoDS_Shape& Until, void BRepFeat_MakeDPrism::PerformUntilHeight(const TopoDS_Shape& Until,
const Standard_Real Height) const Standard_Real Height)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::PerformUntilHeight(Until,Height)" << endl; if (trc) cout << "BRepFeat_MakeDPrism::PerformUntilHeight(Until,Height)" << endl;
#endif #endif
@ -1040,7 +1040,7 @@ void BRepFeat_MakeDPrism::Curves(TColGeom_SequenceOfCurve& scur)
//============================================================================ //============================================================================
void BRepFeat_MakeDPrism::BossEdges (const Standard_Integer signature) void BRepFeat_MakeDPrism::BossEdges (const Standard_Integer signature)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeDPrism::BossEdges (integer)" << endl; if (trc) cout << "BRepFeat_MakeDPrism::BossEdges (integer)" << endl;
#endif #endif
@ -1186,12 +1186,12 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase, // shape initial
// } // }
// Standard_Real Height = abs(2.*(parmax - parmin)); // Standard_Real Height = abs(2.*(parmax - parmin));
// return(2.*Height); // return(2.*Height);
//#ifndef DEB //#ifndef OCCT_DEBUG
Standard_Real par = Max( Max( fabs(c[1] - c[0]), fabs(c[3] - c[2]) ), fabs(c[5] - c[4]) ); Standard_Real par = Max( Max( fabs(c[1] - c[0]), fabs(c[3] - c[2]) ), fabs(c[5] - c[4]) );
//#else //#else
// Standard_Real par = Max( Max( abs(c[1] - c[0]), abs(c[3] - c[2]) ), abs(c[5] - c[4]) ); // Standard_Real par = Max( Max( abs(c[1] - c[0]), abs(c[3] - c[2]) ), abs(c[5] - c[4]) );
//#endif //#endif
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Height = > " << par << endl; cout << "Height = > " << par << endl;
#endif #endif
return par; return par;

40
src/BRepFeat/BRepFeat_MakeLinearForm.cxx
View File

@ -112,7 +112,7 @@
#include <BRepLib_MakeWire.hxx> #include <BRepLib_MakeWire.hxx>
//#include <DbgTools.hxx> //#include <DbgTools.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
extern Standard_Boolean BRepFeat_GettraceFEATRIB(); extern Standard_Boolean BRepFeat_GettraceFEATRIB();
#endif #endif
@ -140,7 +140,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
const Standard_Integer Mode, const Standard_Integer Mode,
const Standard_Boolean Modify) const Standard_Boolean Modify)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeLinearForm::Init" << endl; if (trc) cout << "BRepFeat_MakeLinearForm::Init" << endl;
#endif #endif
@ -177,7 +177,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
myFuse = Standard_False; myFuse = Standard_False;
else // if(Mode == 1) else // if(Mode == 1)
myFuse = Standard_True; myFuse = Standard_True;
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (myFuse) cout << " Fuse" << endl; if (myFuse) cout << " Fuse" << endl;
if (!myFuse) cout << " Cut" << endl; if (!myFuse) cout << " Cut" << endl;
@ -209,7 +209,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
if(!myDir1.IsEqual(nulldir, myTol, myTol)) { if(!myDir1.IsEqual(nulldir, myTol, myTol)) {
Standard_Real ang = myDir1.Angle(myDir); Standard_Real ang = myDir1.Angle(myDir);
if(ang != M_PI) { if(ang != M_PI) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Directions must be opposite" << endl; if (trc) cout << " Directions must be opposite" << endl;
#endif #endif
myStatusError = BRepFeat_BadDirect; myStatusError = BRepFeat_BadDirect;
@ -220,7 +220,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
else { else {
// Rib is centre in the middle of translation // Rib is centre in the middle of translation
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Rib is centre" << endl; if (trc) cout << " Rib is centre" << endl;
#endif #endif
const gp_Vec& DirTranslation = (Direc + Direc1) * 0.5; const gp_Vec& DirTranslation = (Direc + Direc1) * 0.5;
@ -286,7 +286,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
OnFirstEdge, OnLastEdge); OnFirstEdge, OnLastEdge);
if(!Data) { if(!Data) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No Extreme faces" << endl; if (trc) cout << " No Extreme faces" << endl;
#endif #endif
myStatusError = BRepFeat_NoExtFace; myStatusError = BRepFeat_NoExtFace;
@ -312,7 +312,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
SliList.Append(FirstFace); SliList.Append(FirstFace);
if(Sliding) { // sliding if(Sliding) { // sliding
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Sliding" << endl; if (trc) cout << " Sliding" << endl;
#endif #endif
Standard_Boolean Sliding = Standard_False; Standard_Boolean Sliding = Standard_False;
@ -388,7 +388,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
// ---case of sliding : construction of the profile face // ---case of sliding : construction of the profile face
if(Sliding) { if(Sliding) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " still Sliding" << endl; if (trc) cout << " still Sliding" << endl;
#endif #endif
TopoDS_Face Prof; TopoDS_Face Prof;
@ -398,7 +398,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
FirstEdge,LastEdge); FirstEdge,LastEdge);
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) if (trc)
{ {
cout << "Not computable" << endl; cout << "Not computable" << endl;
@ -417,7 +417,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
// Control if there is everything required to have the material at the proper side // Control if there is everything required to have the material at the proper side
if(falseside == Standard_False) { if(falseside == Standard_False) {
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Verify plane and wire orientation" << endl; cout << "Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -721,7 +721,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
// ---Case without sliding : construction of the profile face // ---Case without sliding : construction of the profile face
if(!Sliding) { if(!Sliding) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (Modify) cout << " Sliding failure" << endl; if (Modify) cout << " Sliding failure" << endl;
cout << " no Sliding" << endl; cout << " no Sliding" << endl;
@ -735,7 +735,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
FirstEdge,LastEdge,OnFirstFace,OnLastFace); FirstEdge,LastEdge,OnFirstFace,OnLastFace);
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) if (trc)
{ {
cout << "Not computable" << endl; cout << "Not computable" << endl;
@ -754,7 +754,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
// Control if there is everything required to have the material at the proper side // Control if there is everything required to have the material at the proper side
if(falseside == Standard_False) { if(falseside == Standard_False) {
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Verify plane and wire orientation" << endl; cout << "Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -802,7 +802,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
void BRepFeat_MakeLinearForm::Add(const TopoDS_Edge& E, void BRepFeat_MakeLinearForm::Add(const TopoDS_Edge& E,
const TopoDS_Face& F) const TopoDS_Face& F)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeLinearForm::Add" << endl; if (trc) cout << "BRepFeat_MakeLinearForm::Add" << endl;
#endif #endif
@ -842,12 +842,12 @@ void BRepFeat_MakeLinearForm::Add(const TopoDS_Edge& E,
void BRepFeat_MakeLinearForm::Perform() void BRepFeat_MakeLinearForm::Perform()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeLinearForm::Perform()" << endl; if (trc) cout << "BRepFeat_MakeLinearForm::Perform()" << endl;
#endif #endif
if(mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) { if(mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Fields not initialized" << endl; if (trc) cout << " Fields not initialized" << endl;
#endif #endif
myStatusError = BRepFeat_NotInitialized; myStatusError = BRepFeat_NotInitialized;
@ -886,7 +886,7 @@ void BRepFeat_MakeLinearForm::Perform()
for(; exx.More(); exx.Next()) { for(; exx.More(); exx.Next()) {
const TopoDS_Edge& e = TopoDS::Edge(exx.Current()); const TopoDS_Edge& e = TopoDS::Edge(exx.Current());
if(!myMap.IsBound(e)) { if(!myMap.IsBound(e)) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Sliding face not in Base shape" << endl; if (trc) cout << " Sliding face not in Base shape" << endl;
#endif #endif
myStatusError = BRepFeat_IncSlidFace; myStatusError = BRepFeat_IncSlidFace;
@ -899,7 +899,7 @@ void BRepFeat_MakeLinearForm::Perform()
SetGluedFaces(mySlface, theForm, myGluedF); // management of sliding faces SetGluedFaces(mySlface, theForm, myGluedF); // management of sliding faces
if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) { if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) if (trc)
{ {
cout << "The case is not computable" << endl; cout << "The case is not computable" << endl;
@ -961,7 +961,7 @@ void BRepFeat_MakeLinearForm::Perform()
const gp_Pnt& Lastpnt, const gp_Pnt& Lastpnt,
Standard_Boolean& falseside) Standard_Boolean& falseside)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEATRIB(); Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
if (trc) cout << "BRepFeat_MakeLinearForm::Propagate" << endl; if (trc) cout << "BRepFeat_MakeLinearForm::Propagate" << endl;
#endif #endif
@ -1227,7 +1227,7 @@ static void SetGluedFaces(const TopTools_DataMapOfShapeListOfShape& theSlmap,
for (it.Initialize(ledg); it.More(); it.Next()) { for (it.Initialize(ledg); it.More(); it.Next()) {
const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value()); const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value());
if (gfac.Extent() != 1) { if (gfac.Extent() != 1) {
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Pb SetGluedFace" << endl; cout << "Pb SetGluedFace" << endl;
#endif #endif
} }

14
src/BRepFeat/BRepFeat_MakePipe.cxx
View File

@ -53,7 +53,7 @@
#include <TopExp.hxx> #include <TopExp.hxx>
#include <BRepBndLib.hxx> #include <BRepBndLib.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
#endif #endif
@ -75,7 +75,7 @@ void BRepFeat_MakePipe::Init(const TopoDS_Shape& Sbase,
const Standard_Integer Mode, const Standard_Integer Mode,
const Standard_Boolean Modify) const Standard_Boolean Modify)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePipe::Init" << endl; if (trc) cout << "BRepFeat_MakePipe::Init" << endl;
#endif #endif
@ -118,7 +118,7 @@ void BRepFeat_MakePipe::Init(const TopoDS_Shape& Sbase,
myMap.Bind(exp.Current(), thelist); myMap.Bind(exp.Current(), thelist);
myMap(exp.Current()).Append(exp.Current()); myMap(exp.Current()).Append(exp.Current());
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (myJustFeat) cout << " Just Feature" << endl; if (myJustFeat) cout << " Just Feature" << endl;
if (myFuse) cout << " Fuse" << endl; if (myFuse) cout << " Fuse" << endl;
@ -137,7 +137,7 @@ void BRepFeat_MakePipe::Init(const TopoDS_Shape& Sbase,
void BRepFeat_MakePipe::Add(const TopoDS_Edge& E, void BRepFeat_MakePipe::Add(const TopoDS_Edge& E,
const TopoDS_Face& F) const TopoDS_Face& F)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePipe::Add(Edge,face)" << endl; if (trc) cout << "BRepFeat_MakePipe::Add(Edge,face)" << endl;
#endif #endif
@ -183,7 +183,7 @@ void BRepFeat_MakePipe::Add(const TopoDS_Edge& E,
void BRepFeat_MakePipe::Perform() void BRepFeat_MakePipe::Perform()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePipe::Perform()" << endl; if (trc) cout << "BRepFeat_MakePipe::Perform()" << endl;
#endif #endif
@ -249,7 +249,7 @@ void BRepFeat_MakePipe::Perform()
void BRepFeat_MakePipe::Perform(const TopoDS_Shape& Until) void BRepFeat_MakePipe::Perform(const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePipe::Perform(Until)" << endl; if (trc) cout << "BRepFeat_MakePipe::Perform(Until)" << endl;
#endif #endif
@ -293,7 +293,7 @@ void BRepFeat_MakePipe::Perform(const TopoDS_Shape& Until)
void BRepFeat_MakePipe::Perform(const TopoDS_Shape& From, void BRepFeat_MakePipe::Perform(const TopoDS_Shape& From,
const TopoDS_Shape& Until) const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePipe::Perform(From,Until)" << endl; if (trc) cout << "BRepFeat_MakePipe::Perform(From,Until)" << endl;
#endif #endif

24
src/BRepFeat/BRepFeat_MakePrism.cxx
View File

@ -75,7 +75,7 @@
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
#include <Geom_Plane.hxx> #include <Geom_Plane.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
#endif #endif
@ -112,7 +112,7 @@ void BRepFeat_MakePrism::Init(const TopoDS_Shape& Sbase,
const Standard_Integer Mode, const Standard_Integer Mode,
const Standard_Boolean Modify) const Standard_Boolean Modify)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::Init" << endl; if (trc) cout << "BRepFeat_MakePrism::Init" << endl;
#endif #endif
@ -158,7 +158,7 @@ void BRepFeat_MakePrism::Init(const TopoDS_Shape& Sbase,
myMap.Bind(exp.Current(), thelist); myMap.Bind(exp.Current(), thelist);
myMap(exp.Current()).Append(exp.Current()); myMap(exp.Current()).Append(exp.Current());
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (myJustFeat) cout << " Just Feature" << endl; if (myJustFeat) cout << " Just Feature" << endl;
if (myFuse) cout << " Fuse" << endl; if (myFuse) cout << " Fuse" << endl;
@ -177,7 +177,7 @@ void BRepFeat_MakePrism::Init(const TopoDS_Shape& Sbase,
void BRepFeat_MakePrism::Add(const TopoDS_Edge& E, void BRepFeat_MakePrism::Add(const TopoDS_Edge& E,
const TopoDS_Face& F) const TopoDS_Face& F)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::Add(Edge,face)" << endl; if (trc) cout << "BRepFeat_MakePrism::Add(Edge,face)" << endl;
#endif #endif
@ -224,7 +224,7 @@ void BRepFeat_MakePrism::Add(const TopoDS_Edge& E,
void BRepFeat_MakePrism::Perform(const Standard_Real Length) void BRepFeat_MakePrism::Perform(const Standard_Real Length)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::Perform(Length)" << endl; if (trc) cout << "BRepFeat_MakePrism::Perform(Length)" << endl;
#endif #endif
@ -334,7 +334,7 @@ void BRepFeat_MakePrism::Perform(const Standard_Real Length)
void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until) void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::Perform(Until)" << endl; if (trc) cout << "BRepFeat_MakePrism::Perform(Until)" << endl;
#endif #endif
@ -480,7 +480,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
void BRepFeat_MakePrism::Perform(const TopoDS_Shape& From, void BRepFeat_MakePrism::Perform(const TopoDS_Shape& From,
const TopoDS_Shape& Until) const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::Perform(From,Until)" << endl; if (trc) cout << "BRepFeat_MakePrism::Perform(From,Until)" << endl;
#endif #endif
@ -695,7 +695,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& From,
void BRepFeat_MakePrism::PerformUntilEnd() void BRepFeat_MakePrism::PerformUntilEnd()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::PerformUntilEnd()" << endl; if (trc) cout << "BRepFeat_MakePrism::PerformUntilEnd()" << endl;
#endif #endif
@ -746,7 +746,7 @@ void BRepFeat_MakePrism::PerformUntilEnd()
void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until) void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::PerformFromEnd(From,Until)" << endl; if (trc) cout << "BRepFeat_MakePrism::PerformFromEnd(From,Until)" << endl;
#endif #endif
@ -891,7 +891,7 @@ void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until)
void BRepFeat_MakePrism::PerformThruAll() void BRepFeat_MakePrism::PerformThruAll()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::PerformThruAll()" << endl; if (trc) cout << "BRepFeat_MakePrism::PerformThruAll()" << endl;
#endif #endif
@ -949,7 +949,7 @@ void BRepFeat_MakePrism::PerformThruAll()
void BRepFeat_MakePrism::PerformUntilHeight(const TopoDS_Shape& Until, void BRepFeat_MakePrism::PerformUntilHeight(const TopoDS_Shape& Until,
const Standard_Real Length) const Standard_Real Length)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakePrism::PerformUntilHeight(Until,Length)" << endl; if (trc) cout << "BRepFeat_MakePrism::PerformUntilHeight(Until,Length)" << endl;
#endif #endif
@ -1124,7 +1124,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
if(c[i] > parmax) parmax = c[i]; if(c[i] > parmax) parmax = c[i];
if(c[i] < parmin ) parmin = c[i]; if(c[i] < parmin ) parmin = c[i];
} }
//#ifndef DEB //#ifndef OCCT_DEBUG
Standard_Real Height = fabs(2.*(parmax - parmin)); Standard_Real Height = fabs(2.*(parmax - parmin));
//#else //#else
// Standard_Real Height = abs(2.*(parmax - parmin)); // Standard_Real Height = abs(2.*(parmax - parmin));

22
src/BRepFeat/BRepFeat_MakeRevol.cxx
View File

@ -73,7 +73,7 @@
#include <ElCLib.hxx> #include <ElCLib.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
#endif #endif
@ -110,7 +110,7 @@ void BRepFeat_MakeRevol::Init(const TopoDS_Shape& Sbase,
const Standard_Integer Mode, const Standard_Integer Mode,
const Standard_Boolean Modify) const Standard_Boolean Modify)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevol::Init" << endl; if (trc) cout << "BRepFeat_MakeRevol::Init" << endl;
#endif #endif
@ -154,7 +154,7 @@ void BRepFeat_MakeRevol::Init(const TopoDS_Shape& Sbase,
myMap.Bind(exp.Current(), thelist); myMap.Bind(exp.Current(), thelist);
myMap(exp.Current()).Append(exp.Current()); myMap(exp.Current()).Append(exp.Current());
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (myJustFeat) cout << " Just Feature" << endl; if (myJustFeat) cout << " Just Feature" << endl;
if (myFuse) cout << " Fuse" << endl; if (myFuse) cout << " Fuse" << endl;
@ -173,7 +173,7 @@ void BRepFeat_MakeRevol::Init(const TopoDS_Shape& Sbase,
void BRepFeat_MakeRevol::Add(const TopoDS_Edge& E, void BRepFeat_MakeRevol::Add(const TopoDS_Edge& E,
const TopoDS_Face& F) const TopoDS_Face& F)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevol::Add(Edge,face)" << endl; if (trc) cout << "BRepFeat_MakeRevol::Add(Edge,face)" << endl;
#endif #endif
@ -219,7 +219,7 @@ void BRepFeat_MakeRevol::Add(const TopoDS_Edge& E,
void BRepFeat_MakeRevol::Perform(const Standard_Real Angle) void BRepFeat_MakeRevol::Perform(const Standard_Real Angle)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevol::Perform(Angle)" << endl; if (trc) cout << "BRepFeat_MakeRevol::Perform(Angle)" << endl;
#endif #endif
@ -345,7 +345,7 @@ void BRepFeat_MakeRevol::Perform(const Standard_Real Angle)
void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until) void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevol::Perform(Until)" << endl; if (trc) cout << "BRepFeat_MakeRevol::Perform(Until)" << endl;
#endif #endif
@ -377,7 +377,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
LocOpe_Revol theRevol; LocOpe_Revol theRevol;
if(!TourComplet) { if(!TourComplet) {
Angle = 2.*M_PI- 3*M_PI/180.; Angle = 2.*M_PI- 3*M_PI/180.;
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No complete Revolution" << endl; if (trc) cout << " No complete Revolution" << endl;
#endif #endif
} }
@ -513,7 +513,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& From, void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& From,
const TopoDS_Shape& Until) const TopoDS_Shape& Until)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevol::Perform(From,Until)" << endl; if (trc) cout << "BRepFeat_MakeRevol::Perform(From,Until)" << endl;
#endif #endif
@ -679,7 +679,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& From,
void BRepFeat_MakeRevol::PerformThruAll() void BRepFeat_MakeRevol::PerformThruAll()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevol::PerformThruAll()" << endl; if (trc) cout << "BRepFeat_MakeRevol::PerformThruAll()" << endl;
#endif #endif
@ -694,7 +694,7 @@ void BRepFeat_MakeRevol::PerformThruAll()
void BRepFeat_MakeRevol::PerformUntilAngle(const TopoDS_Shape& Until, void BRepFeat_MakeRevol::PerformUntilAngle(const TopoDS_Shape& Until,
const Standard_Real Angle) const Standard_Real Angle)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevol::PerformUntilAngle(Until,Angle)" << endl; if (trc) cout << "BRepFeat_MakeRevol::PerformUntilAngle(Until,Angle)" << endl;
#endif #endif
@ -884,7 +884,7 @@ static void VerifGluedFaces(const TopoDS_Face& theSkface,
break; break;
} }
if (!GluedFaces) { if (!GluedFaces) {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << " Intersection Revol/skface : no gluing" << endl; if (trc) cout << " Intersection Revol/skface : no gluing" << endl;
#endif #endif

50
src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
View File

@ -132,7 +132,7 @@
#include <GeomLProp_CLProps.hxx> #include <GeomLProp_CLProps.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
extern Standard_Boolean BRepFeat_GettraceFEATRIB(); extern Standard_Boolean BRepFeat_GettraceFEATRIB();
#endif #endif
@ -162,7 +162,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
const Standard_Integer Mode, const Standard_Integer Mode,
Standard_Boolean& Modify) Standard_Boolean& Modify)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevolutionForm::Init" << endl; if (trc) cout << "BRepFeat_MakeRevolutionForm::Init" << endl;
#endif #endif
@ -212,7 +212,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
GeomAPI_ProjectPointOnCurve proj1(p1, Line); GeomAPI_ProjectPointOnCurve proj1(p1, Line);
GeomAPI_ProjectPointOnCurve proj2(p2, Line); GeomAPI_ProjectPointOnCurve proj2(p2, Line);
if(proj1.NbPoints() < 1 || proj2.NbPoints() < 1) { if(proj1.NbPoints() < 1 || proj2.NbPoints() < 1) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No projection points" << endl; if (trc) cout << " No projection points" << endl;
#endif #endif
myStatusError = BRepFeat_NoProjPt; myStatusError = BRepFeat_NoProjPt;
@ -245,7 +245,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
myFuse = Standard_False; myFuse = Standard_False;
else // if(Mode == 1) else // if(Mode == 1)
myFuse = Standard_True; myFuse = Standard_True;
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (myFuse) cout << " Fuse" << endl; if (myFuse) cout << " Fuse" << endl;
if (!myFuse) cout << " Cut" << endl; if (!myFuse) cout << " Cut" << endl;
@ -335,7 +335,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
OnFirstEdge, OnLastEdge); OnFirstEdge, OnLastEdge);
if(!Data) { if(!Data) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No Extreme faces" << endl; if (trc) cout << " No Extreme faces" << endl;
#endif #endif
myStatusError = BRepFeat_NoExtFace; myStatusError = BRepFeat_NoExtFace;
@ -361,7 +361,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
SliList.Append(FirstFace); SliList.Append(FirstFace);
if(Sliding) { // sliding if(Sliding) { // sliding
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Sliding" << endl; if (trc) cout << " Sliding" << endl;
#endif #endif
Handle(Geom_Surface) s = BRep_Tool::Surface(FirstFace); Handle(Geom_Surface) s = BRep_Tool::Surface(FirstFace);
@ -401,7 +401,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
if(Sliding) { // sliding if(Sliding) { // sliding
GeomAPI_ProjectPointOnCurve proj(myFirstPnt, Line); GeomAPI_ProjectPointOnCurve proj(myFirstPnt, Line);
if(proj.NbPoints() < 1) { if(proj.NbPoints() < 1) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No First Point projection" << endl; if (trc) cout << " No First Point projection" << endl;
#endif #endif
myStatusError = BRepFeat_NoProjPt; myStatusError = BRepFeat_NoProjPt;
@ -413,7 +413,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
GeomAPI_ProjectPointOnCurve proj1(myLastPnt, Line); GeomAPI_ProjectPointOnCurve proj1(myLastPnt, Line);
if(proj.NbPoints() < 1) { if(proj.NbPoints() < 1) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " No Last Point projection" << endl; if (trc) cout << " No Last Point projection" << endl;
#endif #endif
myStatusError = BRepFeat_NoProjPt; myStatusError = BRepFeat_NoProjPt;
@ -468,7 +468,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
Precision::Confusion())) Precision::Confusion()))
Sliding = Standard_False; Sliding = Standard_False;
else { else {
//#ifndef DEB //#ifndef OCCT_DEBUG
if(fabs(FirstCircle.Radius()-FirstRayon) >= if(fabs(FirstCircle.Radius()-FirstRayon) >=
//#else //#else
// if(abs(FirstCircle.Radius()-FirstRayon) >= // if(abs(FirstCircle.Radius()-FirstRayon) >=
@ -494,7 +494,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
Sliding = Standard_False; Sliding = Standard_False;
else { else {
Standard_Real rad = LastCircle.Radius(); Standard_Real rad = LastCircle.Radius();
//#ifndef DEB //#ifndef OCCT_DEBUG
if(fabs(rad - LastRayon) >= Precision::Confusion()) { if(fabs(rad - LastRayon) >= Precision::Confusion()) {
//#else //#else
// if(abs(rad - LastRayon) >= Precision::Confusion()) { // if(abs(rad - LastRayon) >= Precision::Confusion()) {
@ -515,7 +515,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
// ---case of sliding : construction of the face profile // ---case of sliding : construction of the face profile
if(Sliding) { if(Sliding) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " still Sliding" << endl; if (trc) cout << " still Sliding" << endl;
#endif #endif
TopoDS_Face Prof; TopoDS_Face Prof;
@ -525,7 +525,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
FirstEdge,LastEdge); FirstEdge,LastEdge);
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) if (trc)
{ {
cout << "Not computable" << endl; cout << "Not computable" << endl;
@ -544,7 +544,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
// Control if there is everything required to have the material at the proper side // Control if there is everything required to have the material at the proper side
if(falseside == Standard_False) { if(falseside == Standard_False) {
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << " Verify plane and wire orientation" << endl; cout << " Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -844,7 +844,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
// ---Case without sliding : construction of the face profile // ---Case without sliding : construction of the face profile
if(!Sliding) { if(!Sliding) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) { if (trc) {
if (Modify) cout << " Sliding failure" << endl; if (Modify) cout << " Sliding failure" << endl;
cout << " no Sliding" << endl; cout << " no Sliding" << endl;
@ -942,7 +942,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
if(!BRepAlgo::IsValid(NewBndFace)) { if(!BRepAlgo::IsValid(NewBndFace)) {
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Invalid new bounding face" << endl; cout << "Invalid new bounding face" << endl;
#endif #endif
myStatusError = BRepFeat_InvShape; myStatusError = BRepFeat_InvShape;
@ -961,7 +961,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
FirstEdge,LastEdge,OnFirstFace,OnLastFace); FirstEdge,LastEdge,OnFirstFace,OnLastFace);
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) if (trc)
{ {
cout << "Not computable" << endl; cout << "Not computable" << endl;
@ -980,7 +980,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside);
// Control if there is everything required to have the material at the proper side // Control if there is everything required to have the material at the proper side
if(falseside == Standard_False) { if(falseside == Standard_False) {
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << " Verify plane and wire orientation" << endl; cout << " Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -1029,7 +1029,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
void BRepFeat_MakeRevolutionForm::Add(const TopoDS_Edge& E, void BRepFeat_MakeRevolutionForm::Add(const TopoDS_Edge& E,
const TopoDS_Face& F) const TopoDS_Face& F)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevolutionForm::Add" << endl; if (trc) cout << "BRepFeat_MakeRevolutionForm::Add" << endl;
#endif #endif
@ -1069,12 +1069,12 @@ void BRepFeat_MakeRevolutionForm::Add(const TopoDS_Edge& E,
void BRepFeat_MakeRevolutionForm::Perform() void BRepFeat_MakeRevolutionForm::Perform()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_MakeRevolutionForm::Perform()" << endl; if (trc) cout << "BRepFeat_MakeRevolutionForm::Perform()" << endl;
#endif #endif
if(mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) { if(mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Fields not initialized" << endl; if (trc) cout << " Fields not initialized" << endl;
#endif #endif
myStatusError = BRepFeat_NotInitialized; myStatusError = BRepFeat_NotInitialized;
@ -1176,7 +1176,7 @@ void BRepFeat_MakeRevolutionForm::Perform()
if(!ASI1.IsDone() || !ASI2.IsDone() || if(!ASI1.IsDone() || !ASI2.IsDone() ||
ASI1.NbPoints(1) != 1 || ASI2.NbPoints(1) != 1) { ASI1.NbPoints(1) != 1 || ASI2.NbPoints(1) != 1) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Intersection failure" << endl; if (trc) cout << " Intersection failure" << endl;
#endif #endif
myStatusError = BRepFeat_BadIntersect; myStatusError = BRepFeat_BadIntersect;
@ -1272,7 +1272,7 @@ void BRepFeat_MakeRevolutionForm::Perform()
for(; exx.More(); exx.Next()) { for(; exx.More(); exx.Next()) {
const TopoDS_Edge& e = TopoDS::Edge(exx.Current()); const TopoDS_Edge& e = TopoDS::Edge(exx.Current());
if(!myMap.IsBound(e)) { if(!myMap.IsBound(e)) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Sliding face not in Base shape" << endl; if (trc) cout << " Sliding face not in Base shape" << endl;
#endif #endif
myStatusError = BRepFeat_IncSlidFace; myStatusError = BRepFeat_IncSlidFace;
@ -1284,7 +1284,7 @@ void BRepFeat_MakeRevolutionForm::Perform()
myGShape = VraiForm; myGShape = VraiForm;
if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) { if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) if (trc)
{ {
cout << "The case is not computable" << endl; cout << "The case is not computable" << endl;
@ -1312,7 +1312,7 @@ Standard_Boolean BRepFeat_MakeRevolutionForm::Propagate(TopTools_ListOfShape& Sl
const gp_Pnt& Lastpnt, const gp_Pnt& Lastpnt,
Standard_Boolean& falseside) Standard_Boolean& falseside)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEATRIB(); Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
if (trc) cout << "BRepFeat_MakeRevolutionForm::Propagate" << endl; if (trc) cout << "BRepFeat_MakeRevolutionForm::Propagate" << endl;
#endif #endif
@ -1769,7 +1769,7 @@ static void SetGluedFaces(const TopTools_DataMapOfShapeListOfShape& theSlmap,
for (it.Initialize(ledg); it.More(); it.Next()) { for (it.Initialize(ledg); it.More(); it.Next()) {
const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value()); const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value());
if (gfac.Extent() != 1) { if (gfac.Extent() != 1) {
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Pb SetGluedFace" << endl; cout << "Pb SetGluedFace" << endl;
#endif #endif
} }

60
src/BRepFeat/BRepFeat_RibSlot.cxx
View File

@ -102,7 +102,7 @@
#include <BRepFeat_Builder.hxx> #include <BRepFeat_Builder.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
extern Standard_Boolean BRepFeat_GettraceFEAT(); extern Standard_Boolean BRepFeat_GettraceFEAT();
extern Standard_Boolean BRepFeat_GettraceFEATRIB(); extern Standard_Boolean BRepFeat_GettraceFEATRIB();
#endif #endif
@ -114,13 +114,13 @@ extern Standard_Boolean BRepFeat_GettraceFEATRIB();
void BRepFeat_RibSlot::LFPerform() void BRepFeat_RibSlot::LFPerform()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_RibSlot::LFPerform()" << endl; if (trc) cout << "BRepFeat_RibSlot::LFPerform()" << endl;
#endif #endif
if (mySbase.IsNull() || myPbase.IsNull() || mySkface.IsNull() if (mySbase.IsNull() || myPbase.IsNull() || mySkface.IsNull()
|| myGShape.IsNull() || myLFMap.IsEmpty()) { || myGShape.IsNull() || myLFMap.IsEmpty()) {
#ifdef DEB #ifdef OCCT_DEBUG
cout << "Topological reconstruction is impossible" << endl; cout << "Topological reconstruction is impossible" << endl;
if (trc) cout << " Fields not initialized" << endl; if (trc) cout << " Fields not initialized" << endl;
#endif #endif
@ -195,7 +195,7 @@ void BRepFeat_RibSlot::LFPerform()
(!myFuse && ope != LocOpe_CUT) || (!myFuse && ope != LocOpe_CUT) ||
(!Collage)) { (!Collage)) {
theOpe = 2; theOpe = 2;
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Passage to topological operations" << endl; cout << "Passage to topological operations" << endl;
#endif #endif
} }
@ -216,7 +216,7 @@ void BRepFeat_RibSlot::LFPerform()
} }
else { else {
theOpe = 2; theOpe = 2;
#ifdef BREPFEAT_DEB #ifdef OCCT_DEBUG
cout << "Passage to topologic operation" << endl; cout << "Passage to topologic operation" << endl;
#endif #endif
} }
@ -283,7 +283,7 @@ Standard_Boolean BRepFeat_RibSlot::IsDeleted(const TopoDS_Shape& F)
const TopTools_ListOfShape& BRepFeat_RibSlot::Modified const TopTools_ListOfShape& BRepFeat_RibSlot::Modified
(const TopoDS_Shape& F) (const TopoDS_Shape& F)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_RibSlot::Modified" << endl; if (trc) cout << "BRepFeat_RibSlot::Modified" << endl;
#endif #endif
@ -309,7 +309,7 @@ const TopTools_ListOfShape& BRepFeat_RibSlot::Modified
const TopTools_ListOfShape& BRepFeat_RibSlot::Generated const TopTools_ListOfShape& BRepFeat_RibSlot::Generated
(const TopoDS_Shape& S) (const TopoDS_Shape& S)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_RibSlot::Generated" << endl; if (trc) cout << "BRepFeat_RibSlot::Generated" << endl;
#endif #endif
@ -542,7 +542,7 @@ gp_Pnt BRepFeat_RibSlot::CheckPoint(const TopoDS_Edge& e,
const Handle(Geom_Plane)& Pln) const Handle(Geom_Plane)& Pln)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEATRIB(); Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
if (trc) cout << "BRepFeat_RibSlot::CheckPoint" << endl; if (trc) cout << "BRepFeat_RibSlot::CheckPoint" << endl;
#endif #endif
@ -575,7 +575,7 @@ gp_Pnt BRepFeat_RibSlot::CheckPoint(const TopoDS_Edge& e,
gp_Dir BRepFeat_RibSlot::Normal(const TopoDS_Face& F,const gp_Pnt& P) gp_Dir BRepFeat_RibSlot::Normal(const TopoDS_Face& F,const gp_Pnt& P)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEATRIB(); Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
if (trc) cout << "BRepFeat_RibSlot::Normal" << endl; if (trc) cout << "BRepFeat_RibSlot::Normal" << endl;
#endif #endif
@ -662,7 +662,7 @@ void BRepFeat_RibSlot::EdgeExtention(TopoDS_Edge& e,
const Standard_Real bnd, const Standard_Real bnd,
const Standard_Boolean FirstLast) const Standard_Boolean FirstLast)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_RibSlot::EdgeExtention" << endl; if (trc) cout << "BRepFeat_RibSlot::EdgeExtention" << endl;
#endif #endif
@ -725,7 +725,7 @@ TopoDS_Face BRepFeat_RibSlot::ChoiceOfFaces(TopTools_ListOfShape& faces,
const Handle(Geom_Plane)& Pln) const Handle(Geom_Plane)& Pln)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEATRIB(); Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
if (trc) cout << "BRepFeat_RibSlot::ChoiceOfFaces" << endl; if (trc) cout << "BRepFeat_RibSlot::ChoiceOfFaces" << endl;
#endif #endif
@ -783,7 +783,7 @@ Standard_Real BRepFeat_RibSlot::HeightMax(const TopoDS_Shape& theSbase,
gp_Pnt& p1, gp_Pnt& p1,
gp_Pnt& p2) gp_Pnt& p2)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEATRIB(); Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
if (trc) cout << "BRepFeat_RibSlot::HeightMax" << endl; if (trc) cout << "BRepFeat_RibSlot::HeightMax" << endl;
#endif #endif
@ -825,7 +825,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
TopoDS_Edge& OnLastEdge) TopoDS_Edge& OnLastEdge)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_RibSlot::ExtremeFaces" << endl; if (trc) cout << "BRepFeat_RibSlot::ExtremeFaces" << endl;
#endif #endif
@ -854,7 +854,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
// ---the wire includes only one edge // ---the wire includes only one edge
if(NumberOfEdges == 1) { if(NumberOfEdges == 1) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " One Edge" << endl; if (trc) cout << " One Edge" << endl;
#endif #endif
exp.ReInit(); exp.ReInit();
@ -1000,7 +1000,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
} }
//--- FirstFace or LastFace was not found //--- FirstFace or LastFace was not found
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " FirstFace or LastFace null" << endl; if (trc) cout << " FirstFace or LastFace null" << endl;
#endif #endif
LocOpe_CSIntersector ASI(mySbase); LocOpe_CSIntersector ASI(mySbase);
@ -1042,7 +1042,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
} }
} }
else { else {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Less than 2 intersection points" << endl; if (trc) cout << " Less than 2 intersection points" << endl;
#endif #endif
Data = Standard_False; Data = Standard_False;
@ -1062,13 +1062,13 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
} }
if(FirstFace.IsNull() || LastFace.IsNull()) { if(FirstFace.IsNull() || LastFace.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " First or Last Faces still null" << endl; if (trc) cout << " First or Last Faces still null" << endl;
#endif #endif
Data = Standard_False; Data = Standard_False;
} }
else { else {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " FirstFace and LastFace OK" << endl; if (trc) cout << " FirstFace and LastFace OK" << endl;
#endif #endif
Data = Standard_True; Data = Standard_True;
@ -1078,7 +1078,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
} }
// ---The wire consists of several edges // ---The wire consists of several edges
else { else {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Multiple Edges" << endl; if (trc) cout << " Multiple Edges" << endl;
#endif #endif
BRepTools_WireExplorer ex(myWire); BRepTools_WireExplorer ex(myWire);
@ -1089,7 +1089,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
f = f - bnd/10000; l = l +bnd/10000; f = f - bnd/10000; l = l +bnd/10000;
Handle(Geom_TrimmedCurve) curve; Handle(Geom_TrimmedCurve) curve;
curve = new Geom_TrimmedCurve(Cur, f, l, Standard_True); curve = new Geom_TrimmedCurve(Cur, f, l, Standard_True);
#ifdef DEB #ifdef OCCT_DEBUG
gp_Pnt P1 = gp_Pnt P1 =
#endif #endif
BRep_Tool::Pnt(TopExp::FirstVertex(E,Standard_True)); BRep_Tool::Pnt(TopExp::FirstVertex(E,Standard_True));
@ -1258,7 +1258,7 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
return Standard_True; return Standard_True;
} }
else { else {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " First or Last not OK" << endl; if (trc) cout << " First or Last not OK" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1284,7 +1284,7 @@ void BRepFeat_RibSlot::PtOnEdgeVertex(const Standard_Boolean RevolRib,
TopoDS_Vertex& OnVertex) TopoDS_Vertex& OnVertex)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEATRIB(); Standard_Boolean trc = BRepFeat_GettraceFEATRIB();
if (trc) cout << "BRepFeat_RibSlot::PtOnEdgeVertex" << endl; if (trc) cout << "BRepFeat_RibSlot::PtOnEdgeVertex" << endl;
#endif #endif
@ -1359,7 +1359,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
const TopoDS_Edge& LastEdge) const TopoDS_Edge& LastEdge)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_RibSlot::SlidingProfile" << endl; if (trc) cout << "BRepFeat_RibSlot::SlidingProfile" << endl;
#endif #endif
@ -1477,7 +1477,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
} }
if(BndEdge1.IsNull() || BndEdge2.IsNull()) { if(BndEdge1.IsNull() || BndEdge2.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Null bounding edge" << endl; if (trc) cout << " Null bounding edge" << endl;
#endif #endif
ProfileOK = Standard_False; ProfileOK = Standard_False;
@ -1606,7 +1606,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
TopoDS_Face fac = TopoDS::Face(f.Shape()); TopoDS_Face fac = TopoDS::Face(f.Shape());
if (!BRepAlgo::IsValid(fac)) { if (!BRepAlgo::IsValid(fac)) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Invalid Face" << endl; if (trc) cout << " Invalid Face" << endl;
#endif #endif
ProfileOK = Standard_False; ProfileOK = Standard_False;
@ -1643,7 +1643,7 @@ Standard_Boolean BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof,
} }
if (!BRepAlgo::IsValid(Prof)) { if (!BRepAlgo::IsValid(Prof)) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Invalid Face Profile" << endl; if (trc) cout << " Invalid Face Profile" << endl;
#endif #endif
ProfileOK = Standard_False; ProfileOK = Standard_False;
@ -1674,7 +1674,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
const Standard_Boolean OnLastFace) const Standard_Boolean OnLastFace)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean trc = BRepFeat_GettraceFEAT(); Standard_Boolean trc = BRepFeat_GettraceFEAT();
if (trc) cout << "BRepFeat_RibSlot::NoSlidingProfile" << endl; if (trc) cout << "BRepFeat_RibSlot::NoSlidingProfile" << endl;
#endif #endif
@ -1812,7 +1812,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
} }
if(BndEdge1.IsNull() || BndEdge2.IsNull()) { if(BndEdge1.IsNull() || BndEdge2.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Null bounding edge" << endl; if (trc) cout << " Null bounding edge" << endl;
#endif #endif
ProfileOK = Standard_False; ProfileOK = Standard_False;
@ -2302,7 +2302,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
TopoDS_Face fac = TopoDS::Face(fa.Shape()); TopoDS_Face fac = TopoDS::Face(fa.Shape());
if (!BRepAlgo::IsValid(fac)) { if (!BRepAlgo::IsValid(fac)) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Invalid Face" << endl; if (trc) cout << " Invalid Face" << endl;
#endif #endif
ProfileOK = Standard_False; ProfileOK = Standard_False;
@ -2338,7 +2338,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
} }
if (!BRepAlgo::IsValid(Prof)) { if (!BRepAlgo::IsValid(Prof)) {
#ifdef DEB #ifdef OCCT_DEBUG
if (trc) cout << " Invalid Face Profile" << endl; if (trc) cout << " Invalid Face Profile" << endl;
#endif #endif
ProfileOK = Standard_False; ProfileOK = Standard_False;

2
src/BRepFeat/BRepFeat_trace.cxx
View File

@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifdef DEB #ifdef OCCT_DEBUG
#include <Standard_Type.hxx> #include <Standard_Type.hxx>

2
src/BRepFill/BRepFill.cxx
View File

@ -862,7 +862,7 @@ void BRepFill::SearchOrigin(TopoDS_Wire & W,
} }
} }
} }
#if BREPFILL_DEB #ifdef OCCT_DEBUG
else { else {
cout << "BRepFill::SearchOrigine : Echec Distance" << endl; cout << "BRepFill::SearchOrigine : Echec Distance" << endl;
} }

2
src/BRepFill/BRepFill_ApproxSeewing.cxx
View File

@ -125,7 +125,7 @@ void BRepFill_ApproxSeewing::Perform(const BRepFill_MultiLine& ML)
// Standard_Integer MaxDeg = 0; // Standard_Integer MaxDeg = 0;
if ( NbCurves == 0) { if ( NbCurves == 0) {
#ifdef DEBUG_EVOLVED #ifdef OCCT_DEBUG
cout << " TrimSurfaceTool : Approx echoue, on met les polygones" << endl; cout << " TrimSurfaceTool : Approx echoue, on met les polygones" << endl;
#endif #endif

8
src/BRepFill/BRepFill_CompatibleWires.cxx
View File

@ -63,7 +63,7 @@
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <TColStd_SequenceOfReal.hxx> #include <TColStd_SequenceOfReal.hxx>
#ifdef DEB_EFV #ifdef OCCT_DEBUG_EFV
static void EdgesFromVertex (const TopoDS_Wire& W, static void EdgesFromVertex (const TopoDS_Wire& W,
const TopoDS_Vertex& V, const TopoDS_Vertex& V,
TopoDS_Edge& E1, TopoDS_Edge& E1,
@ -468,7 +468,7 @@ static Standard_Boolean EdgeIntersectOnWire (const gp_Pnt& P1,
isol = iss; isol = iss;
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
gp_Pnt Psol = gp_Pnt Psol =
#endif #endif
DSS.PointOnShape2(isol); DSS.PointOnShape2(isol);
@ -1700,7 +1700,7 @@ void BRepFill_CompatibleWires::ComputeOrigin(const Standard_Boolean /*polar*/ )
newwire.Orientation( TopAbs_FORWARD ); newwire.Orientation( TopAbs_FORWARD );
myWork(i) = newwire; myWork(i) = newwire;
} }
#ifdef DEB_EFV #ifdef OCCT_DEBUG_EFV
for ( i=ideb; i<=myWork.Length(); i++) { for ( i=ideb; i<=myWork.Length(); i++) {
@ -1852,7 +1852,7 @@ void BRepFill_CompatibleWires::ComputeOrigin(const Standard_Boolean /*polar*/ )
EdgesFromVertex(wire,Vmini,E1,E2); EdgesFromVertex(wire,Vmini,E1,E2);
TopExp::Vertices(E1,V1,V2,Standard_True); TopExp::Vertices(E1,V1,V2,Standard_True);
#ifndef DEB #ifndef OCCT_DEBUG
Standard_Real U1=0, U2=0; Standard_Real U1=0, U2=0;
#else #else
Standard_Real U1, U2; Standard_Real U1, U2;

8
src/BRepFill/BRepFill_Draft.cxx
View File

@ -186,7 +186,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
r = V.Magnitude()/l; r = V.Magnitude()/l;
Standard_Integer ii, Ind; Standard_Integer ii, Ind;
//#ifndef DEB //#ifndef OCCT_DEBUG
Standard_Integer Nb = (Standard_Integer) (4+(10*r)); Standard_Integer Nb = (Standard_Integer) (4+(10*r));
//#else //#else
// Standard_Integer Nb = 4+(10*r); // Standard_Integer Nb = 4+(10*r);
@ -269,14 +269,14 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
myWire = MW.Wire(); myWire = MW.Wire();
} }
else { else {
#if BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "Error in MakeWire" << endl; cout << "Error in MakeWire" << endl;
#endif #endif
Standard_ConstructionError::Raise("BRepFill_Draft"); Standard_ConstructionError::Raise("BRepFill_Draft");
} }
} }
else { else {
#if BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "No Free Borders !" << endl; cout << "No Free Borders !" << endl;
#endif #endif
Standard_ConstructionError::Raise("BRepFill_Draft"); Standard_ConstructionError::Raise("BRepFill_Draft");
@ -828,7 +828,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
myShape = solid; myShape = solid;
} }
} }
#if BREPFILL_DEB #ifdef OCCT_DEBUG
else cout << "Draft : No assembly !" << endl; else cout << "Draft : No assembly !" << endl;
#endif #endif
return Ok; return Ok;

4
src/BRepFill/BRepFill_LocationLaw.cxx
View File

@ -178,7 +178,7 @@ void BRepFill_LocationLaw::BiNormalIsMain()
gp_Ax1 axe(gp::Origin(), cross.XYZ()); gp_Ax1 axe(gp::Origin(), cross.XYZ());
N2.Rotate(axe, alpha); N2.Rotate(axe, alpha);
#if BREPFILL_DEB #ifdef OCCT_DEBUG
if (N2.Dot(T1) > 1.e-9) { if (N2.Dot(T1) > 1.e-9) {
cout << "Inprecision in TransformInCompatibleLaw" << endl; cout << "Inprecision in TransformInCompatibleLaw" << endl;
cout << "--- T1.R(N2) = " << N2.Dot(T1) << endl; cout << "--- T1.R(N2) = " << N2.Dot(T1) << endl;
@ -616,7 +616,7 @@ void BRepFill_LocationLaw::CurvilinearBounds(const Standard_Integer Index,
} }
else { else {
W.Nullify(); W.Nullify();
#if BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "BRepFill_LocationLaw::D0 : Attention position out of limits" cout << "BRepFill_LocationLaw::D0 : Attention position out of limits"
<< endl; << endl;
#endif #endif

6
src/BRepFill/BRepFill_MultiLine.cxx
View File

@ -622,7 +622,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
Dist = TheU.Circle().Radius(); Dist = TheU.Circle().Radius();
} }
else { else {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "MultiLine : D1 = D2 and the Curve is not a circle" << endl; cout << "MultiLine : D1 = D2 and the Curve is not a circle" << endl;
cout << " ---> ValueOnFace failed at parameter U = " << U << endl; cout << " ---> ValueOnFace failed at parameter U = " << U << endl;
#endif #endif
@ -675,7 +675,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
Geom2dInt_GInter Intersector(Cu1,Cu2,TolConf,Tol); Geom2dInt_GInter Intersector(Cu1,Cu2,TolConf,Tol);
if ( !Intersector.IsDone()) { if ( !Intersector.IsDone()) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "Intersector not done" << endl; cout << "Intersector not done" << endl;
cout << " ---> ValueonFace failed at parameter U = " << U << endl; cout << " ---> ValueonFace failed at parameter U = " << U << endl;
#endif #endif
@ -695,7 +695,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
VV = Alp*(VS2 - VS1) + VS1; VV = Alp*(VS2 - VS1) + VS1;
} }
else { else {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "Intersector done, but no points found" << endl; cout << "Intersector done, but no points found" << endl;
cout << " ---> ValueonFace failed at parameter U = " << U << endl; cout << " ---> ValueonFace failed at parameter U = " << U << endl;
#endif #endif

4
src/BRepFill/BRepFill_NSections.cxx
View File

@ -59,7 +59,7 @@
#include <Precision.hxx> #include <Precision.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
static Standard_Boolean Affich = 0; static Standard_Boolean Affich = 0;
#endif #endif
@ -374,7 +374,7 @@ BRepFill_NSections::BRepFill_NSections(const TopTools_SequenceOfShape& S,
const Standard_Boolean Build) const Standard_Boolean Build)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if ( Affich) { if ( Affich) {
#ifdef DRAW #ifdef DRAW
Standard_Integer NBSECT = 0; Standard_Integer NBSECT = 0;

2
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@ -648,7 +648,7 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset,
{ {
myShape.Nullify(); myShape.Nullify();
myIsDone = Standard_False; myIsDone = Standard_False;
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout<<"An exception was caught in BRepFill_OffsetWire::Perform : "; cout<<"An exception was caught in BRepFill_OffsetWire::Perform : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;

4
src/BRepFill/BRepFill_SectionPlacement.cxx
View File

@ -44,7 +44,7 @@
#include <TColStd_Array1OfInteger.hxx> #include <TColStd_Array1OfInteger.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#if DEB #ifdef OCCT_DEBUG
static Standard_Boolean myDebug = Standard_False; static Standard_Boolean myDebug = Standard_False;
#endif #endif
@ -296,7 +296,7 @@ BRepFill_SectionPlacement(const Handle(BRepFill_LocationLaw)& Law,
Standard_Real theParam = Place.ParameterOnPath(), Standard_Real theParam = Place.ParameterOnPath(),
eps = Precision::PConfusion(); eps = Precision::PConfusion();
#if DEB #ifdef OCCT_DEBUG
if (myDebug) { if (myDebug) {
gp_Pnt P_Path; gp_Pnt P_Path;
P_Path = adpPath->Value(theParam); P_Path = adpPath->Value(theParam);

2
src/BRepFill/BRepFill_ShapeLaw.cxx
View File

@ -373,7 +373,7 @@ void BRepFill_ShapeLaw::Init(const Standard_Boolean Build)
Standard_False, 20); Standard_False, 20);
if (!Bof) Bof = Concat.Add(TC, 200*epsV, if (!Bof) Bof = Concat.Add(TC, 200*epsV,
Standard_True, Standard_False, 20); Standard_True, Standard_False, 20);
#if BREPFILL_DEB #ifdef OCCT_DEBUG
if (!Bof) if (!Bof)
cout << "BRepFill_ShapeLaw::ConcatenedLaw INCOMPLET !!!" cout << "BRepFill_ShapeLaw::ConcatenedLaw INCOMPLET !!!"
<< endl; << endl;

28
src/BRepFill/BRepFill_Sweep.cxx
View File

@ -352,7 +352,7 @@ static Standard_Boolean SameParameter(TopoDS_Edge& E,
Approx_SameParameter sp( HC3d, Pcurv, S, tol3d ); Approx_SameParameter sp( HC3d, Pcurv, S, tol3d );
if(sp.IsDone() && !sp.IsSameParameter()) Pcurv = sp.Curve2d(); if(sp.IsDone() && !sp.IsSameParameter()) Pcurv = sp.Curve2d();
else if(!sp.IsDone() && !sp.IsSameParameter()){ else if(!sp.IsDone() && !sp.IsSameParameter()){
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout<<"echec SameParameter"<<endl; cout<<"echec SameParameter"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -360,7 +360,7 @@ static Standard_Boolean SameParameter(TopoDS_Edge& E,
ResTol = sp.TolReached(); ResTol = sp.TolReached();
if(ResTol > tolreached ){ if(ResTol > tolreached ){
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout<<"SameParameter : Tolerance not reached!"<<endl; cout<<"SameParameter : Tolerance not reached!"<<endl;
cout<<"tol visee : "<<tol3d<<" tol obtained : "<<ResTol<<endl; cout<<"tol visee : "<<tol3d<<" tol obtained : "<<ResTol<<endl;
#endif #endif
@ -601,7 +601,7 @@ static void BuildFace(const Handle(Geom_Surface)& S,
thePlane->UReverse(); thePlane->UReverse();
BRepLib_MakeFace MkF( thePlane, WW ); BRepLib_MakeFace MkF( thePlane, WW );
if (MkF.Error() != BRepLib_FaceDone) { if (MkF.Error() != BRepLib_FaceDone) {
#if BREPFILL_DEB #ifdef OCCT_DEBUG
BRepLib_FaceError Err = MkF.Error(); BRepLib_FaceError Err = MkF.Error();
cout << "Planar Face Error :" << Err << endl; cout << "Planar Face Error :" << Err << endl;
#endif #endif
@ -1034,12 +1034,12 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
GeomAbs_C1, GeomAbs_C1, GeomAbs_C1, GeomAbs_C1,
8, 8, 2*NbInt, 0); 8, 8, 2*NbInt, 0);
if (!App.HasResult()) { if (!App.HasResult()) {
#if DEB #ifdef OCCT_DEBUG
cout << "Filling_Approx : Pas de resultat" << endl; cout << "Filling_Approx : Pas de resultat" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
#if DEB #ifdef OCCT_DEBUG
cout << "Filling_Approx Error 3d = " << cout << "Filling_Approx Error 3d = " <<
App.MaxError() << endl; App.MaxError() << endl;
#endif #endif
@ -1234,7 +1234,7 @@ static void SetCommonEdgeInFace(BRepTools_Substitution& aSubstitute,
Substitute( aSubstitute, OldEdge, NewEdge ); Substitute( aSubstitute, OldEdge, NewEdge );
} }
} }
#if DEB #ifdef OCCT_DEBUG
if (!done) cout << "Substitution of Edge failed" << endl; if (!done) cout << "Substitution of Edge failed" << endl;
#endif #endif
} }
@ -1705,7 +1705,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
LastShape = Last; LastShape = Last;
// It is necessary to check the SameRange on its (PRO13551) // It is necessary to check the SameRange on its (PRO13551)
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Boolean issame = Standard_True; Standard_Boolean issame = Standard_True;
#endif #endif
BRep_Builder B; BRep_Builder B;
@ -1715,7 +1715,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
if (!BRepLib::CheckSameRange(wexp.Current())) { if (!BRepLib::CheckSameRange(wexp.Current())) {
B.SameRange(wexp.Current(), Standard_False); B.SameRange(wexp.Current(), Standard_False);
B.SameParameter(wexp.Current(), Standard_False); B.SameParameter(wexp.Current(), Standard_False);
#ifdef DEB #ifdef OCCT_DEBUG
issame = Standard_False; issame = Standard_False;
#endif #endif
} }
@ -1727,14 +1727,14 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
if (!BRepLib::CheckSameRange(wexp.Current())) { if (!BRepLib::CheckSameRange(wexp.Current())) {
B.SameRange(wexp.Current(), Standard_False); B.SameRange(wexp.Current(), Standard_False);
B.SameParameter(wexp.Current(), Standard_False); B.SameParameter(wexp.Current(), Standard_False);
#ifdef DEB #ifdef OCCT_DEBUG
issame = Standard_False; issame = Standard_False;
#endif #endif
} }
} }
} }
#if BREPFILL_DEB #ifdef OCCT_DEBUG
if (!issame) if (!issame)
cout<<"Sweep Warning : Edge not SameRange in the limits"<<endl; cout<<"Sweep Warning : Edge not SameRange in the limits"<<endl;
#endif #endif
@ -2412,7 +2412,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
Max(myTol3d, TabErr(isec,ipath))); Max(myTol3d, TabErr(isec,ipath)));
} }
if (Degenerated(isec, ipath)) { if (Degenerated(isec, ipath)) {
#if BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "Sweep : Degenerated case" << endl; cout << "Sweep : Degenerated case" << endl;
#endif #endif
hasdegen = Standard_True; hasdegen = Standard_True;
@ -2984,7 +2984,7 @@ void BRepFill_Sweep::Build(TopTools_MapOfShape& ReversedEdges,
t2 = M.Column(3); t2 = M.Column(3);
if (t1.Angle(t2) < myAngMin) { if (t1.Angle(t2) < myAngMin) {
#if BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "BRepFill_Sweep::PerformCorner : This is not a corner !" << endl; cout << "BRepFill_Sweep::PerformCorner : This is not a corner !" << endl;
#endif #endif
return; return;
@ -3077,7 +3077,7 @@ void BRepFill_Sweep::Build(TopTools_MapOfShape& ReversedEdges,
} }
else if ((TheTransition == BRepFill_Right) || else if ((TheTransition == BRepFill_Right) ||
aTrim.HasSection() ) { aTrim.HasSection() ) {
#if BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "Fail of TrimCorner" << endl; cout << "Fail of TrimCorner" << endl;
#endif #endif
return; // Nothing is touched return; // Nothing is touched
@ -3145,7 +3145,7 @@ void BRepFill_Sweep::Build(TopTools_MapOfShape& ReversedEdges,
if (ii==1) BordFirst = Bord1; if (ii==1) BordFirst = Bord1;
} }
} }
#if BREPFILL_DEB #ifdef OCCT_DEBUG
else cout << "PerformCorner : Unsymmetry of free border" << endl; else cout << "PerformCorner : Unsymmetry of free border" << endl;
#endif #endif
} }

18
src/BRepFill/BRepFill_TrimEdgeTool.cxx
View File

@ -362,7 +362,7 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
&& ( Points2.Length() != Params.Length() || && ( Points2.Length() != Params.Length() ||
(Points2.Length() == 0 && Params.Length() == 0) ) ) { (Points2.Length() == 0 && Params.Length() == 0) ) ) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "BRepFill_TrimEdgeTool: incoherent intersection. Try with a greater tolerance" << endl; cout << "BRepFill_TrimEdgeTool: incoherent intersection. Try with a greater tolerance" << endl;
#endif #endif
@ -376,7 +376,7 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
SeanceDeRattrapage++; SeanceDeRattrapage++;
} }
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
if(SeanceDeRattrapage != 0) cout << "SeanceDeRattrapage = " << SeanceDeRattrapage << endl; if(SeanceDeRattrapage != 0) cout << "SeanceDeRattrapage = " << SeanceDeRattrapage << endl;
if(SeanceDeRattrapage == nn) { if(SeanceDeRattrapage == nn) {
cout << "BRepFill_TrimEdgeTool: incoherent intersection" << endl; cout << "BRepFill_TrimEdgeTool: incoherent intersection" << endl;
@ -452,11 +452,11 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
Standard_Real P1xP2x=Abs( P1.X() - P2.X()); Standard_Real P1xP2x=Abs( P1.X() - P2.X());
if ( P1xP2x > Tol ) { if ( P1xP2x > Tol ) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "BRepFill_TrimEdgeTool: no same parameter on the bissectrice" << endl; cout << "BRepFill_TrimEdgeTool: no same parameter on the bissectrice" << endl;
#endif #endif
if(P1xP2x>TolInit) { if(P1xP2x>TolInit) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "BRepFill_TrimEdgeTool: Continue somehow" << endl; cout << "BRepFill_TrimEdgeTool: Continue somehow" << endl;
#endif #endif
i++; i++;
@ -523,7 +523,7 @@ const
} }
if (ToProj) { if (ToProj) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << " project extremity bissectrice on parallel."<<endl; cout << " project extremity bissectrice on parallel."<<endl;
#endif #endif
@ -537,25 +537,25 @@ const
Geom2dAPI_ProjectPointOnCurve Projector2(PBis,C2,f2,l2); Geom2dAPI_ProjectPointOnCurve Projector2(PBis,C2,f2,l2);
if (Projector1.NbPoints() == 0) { if (Projector1.NbPoints() == 0) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "Failed projection in BRepFill_TrimEdgeTool::AddOrConfuse"<<endl; cout << "Failed projection in BRepFill_TrimEdgeTool::AddOrConfuse"<<endl;
#endif #endif
return; return;
} }
if (!Projector1.NearestPoint().IsEqual(PBis,Tol)) { if (!Projector1.NearestPoint().IsEqual(PBis,Tol)) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout <<"Incorrect solution in BRepFill_TrimEdgeTool::AddOrConfuse"<<endl; cout <<"Incorrect solution in BRepFill_TrimEdgeTool::AddOrConfuse"<<endl;
#endif #endif
return; return;
} }
if (Projector2.NbPoints() == 0) { if (Projector2.NbPoints() == 0) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << "Failed projection in BRepFill_TrimEdgeTool::AddOrConfuse"<<endl; cout << "Failed projection in BRepFill_TrimEdgeTool::AddOrConfuse"<<endl;
#endif #endif
return; return;
} }
if (!Projector2.NearestPoint().IsEqual(PBis,Tol)) { if (!Projector2.NearestPoint().IsEqual(PBis,Tol)) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout <<" Mauvaisesolution dans BRepFill_TrimEdgeTool::AddOrConfuse"<<endl; cout <<" Mauvaisesolution dans BRepFill_TrimEdgeTool::AddOrConfuse"<<endl;
#endif #endif
return; return;

8
src/BRepFill/BRepFill_TrimSurfaceTool.cxx
View File

@ -65,7 +65,7 @@
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#include <DBRep.hxx> #include <DBRep.hxx>
#endif #endif
#ifdef DEB #ifdef OCCT_DEBUG
static Standard_Boolean Affich = Standard_False; static Standard_Boolean Affich = Standard_False;
static Standard_Integer NBCALL = 1; static Standard_Integer NBCALL = 1;
#endif #endif
@ -96,7 +96,7 @@ myInv1(Inv1),
myInv2(Inv2), myInv2(Inv2),
myBis (Bis) myBis (Bis)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if ( Affich) { if ( Affich) {
cout << " ---------->TrimSurfaceTool : NBCALL = " << NBCALL << endl; cout << " ---------->TrimSurfaceTool : NBCALL = " << NBCALL << endl;
@ -273,7 +273,7 @@ static void EvalParameters(const TopoDS_Edge& Edge,
NbSegments = Intersector.NbSegments(); NbSegments = Intersector.NbSegments();
if (NbSegments > 0) { if (NbSegments > 0) {
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
cout << " IntersectWith : " << NbSegments cout << " IntersectWith : " << NbSegments
<< " Segments of intersection" << endl; << " Segments of intersection" << endl;
#endif #endif
@ -468,7 +468,7 @@ Standard_Real BRepFill_TrimSurfaceTool::ProjOn(const gp_Pnt2d& Point,
// evaluate the projection of the point on the curve. // evaluate the projection of the point on the curve.
Geom2dAPI_ProjectPointOnCurve Projector(Point, C2d); Geom2dAPI_ProjectPointOnCurve Projector(Point, C2d);
#ifdef BREPFILL_DEB #ifdef OCCT_DEBUG
Standard_Real Dist = Projector.LowerDistance(); Standard_Real Dist = Projector.LowerDistance();
if ( Dist > Precision::Confusion() ) { if ( Dist > Precision::Confusion() ) {
cout << " *** WARNING TrimSurfaceTool: *** " << endl; cout << " *** WARNING TrimSurfaceTool: *** " << endl;

24
src/BRepGProp/BRepGProp.cxx
View File

@ -27,7 +27,7 @@
#include <TopTools_ListOfShape.hxx> #include <TopTools_ListOfShape.hxx>
#include <BRepCheck_Shell.hxx> #include <BRepCheck_Shell.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
static Standard_Integer AffichEps = 0; static Standard_Integer AffichEps = 0;
#endif #endif
@ -58,7 +58,7 @@ void BRepGProp::LinearProperties(const TopoDS_Shape& S, GProp_GProps& SProps){
static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Props, const Standard_Real Eps){ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Props, const Standard_Real Eps){
Standard_Integer i; Standard_Integer i;
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Integer iErrorMax = 0; Standard_Integer iErrorMax = 0;
#endif #endif
Standard_Real ErrorMax = 0.0, Error; Standard_Real ErrorMax = 0.0, Error;
@ -78,7 +78,7 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
Error = G.GetEpsilon(); Error = G.GetEpsilon();
if(ErrorMax < Error) { if(ErrorMax < Error) {
ErrorMax = Error; ErrorMax = Error;
#ifdef DEB #ifdef OCCT_DEBUG
iErrorMax = i; iErrorMax = i;
#endif #endif
} }
@ -87,11 +87,11 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
else G.Perform(BF, BD); else G.Perform(BF, BD);
} }
Props.Add(G); Props.Add(G);
#ifdef DEB #ifdef OCCT_DEBUG
if(AffichEps) cout<<"\n"<<i<<":\tEpsArea = "<< G.GetEpsilon(); if(AffichEps) cout<<"\n"<<i<<":\tEpsArea = "<< G.GetEpsilon();
#endif #endif
} }
#ifdef DEB #ifdef OCCT_DEBUG
if(AffichEps) cout<<"\n-----------------\n"<<iErrorMax<<":\tMaxError = "<<ErrorMax<<"\n"; if(AffichEps) cout<<"\n-----------------\n"<<iErrorMax<<":\tMaxError = "<<ErrorMax<<"\n";
#endif #endif
return ErrorMax; return ErrorMax;
@ -118,7 +118,7 @@ Standard_Real BRepGProp::SurfaceProperties(const TopoDS_Shape& S, GProp_GProps&
static Standard_Real volumeProperties(const TopoDS_Shape& S, GProp_GProps& Props, const Standard_Real Eps){ static Standard_Real volumeProperties(const TopoDS_Shape& S, GProp_GProps& Props, const Standard_Real Eps){
Standard_Integer i; Standard_Integer i;
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Integer iErrorMax = 0; Standard_Integer iErrorMax = 0;
#endif #endif
Standard_Real ErrorMax = 0.0, Error = 0.0; Standard_Real ErrorMax = 0.0, Error = 0.0;
@ -139,7 +139,7 @@ static Standard_Real volumeProperties(const TopoDS_Shape& S, GProp_GProps& Props
Error = G.GetEpsilon(); Error = G.GetEpsilon();
if(ErrorMax < Error) { if(ErrorMax < Error) {
ErrorMax = Error; ErrorMax = Error;
#ifdef DEB #ifdef OCCT_DEBUG
iErrorMax = i; iErrorMax = i;
#endif #endif
} }
@ -149,12 +149,12 @@ static Standard_Real volumeProperties(const TopoDS_Shape& S, GProp_GProps& Props
else G.Perform(BF, BD); else G.Perform(BF, BD);
} }
Props.Add(G); Props.Add(G);
#ifdef DEB #ifdef OCCT_DEBUG
if(AffichEps) cout<<"\n"<<i<<":\tEpsVolume = "<< G.GetEpsilon(); if(AffichEps) cout<<"\n"<<i<<":\tEpsVolume = "<< G.GetEpsilon();
#endif #endif
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
if(AffichEps) cout<<"\n-----------------\n"<<iErrorMax<<":\tMaxError = "<<ErrorMax<<"\n"; if(AffichEps) cout<<"\n-----------------\n"<<iErrorMax<<":\tMaxError = "<<ErrorMax<<"\n";
#endif #endif
return ErrorMax; return ErrorMax;
@ -184,7 +184,7 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
gp_Pnt P(0,0,0); P.Transform(S.Location()); gp_Pnt P(0,0,0); P.Transform(S.Location());
Props = GProp_GProps(P); Props = GProp_GProps(P);
Standard_Integer i; Standard_Integer i;
#ifdef DEB #ifdef OCCT_DEBUG
Standard_Integer iErrorMax = 0; Standard_Integer iErrorMax = 0;
#endif #endif
Standard_Real ErrorMax = 0.0, Error = 0.0; Standard_Real ErrorMax = 0.0, Error = 0.0;
@ -196,14 +196,14 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
Error = volumeProperties(Sh,Props,Eps); Error = volumeProperties(Sh,Props,Eps);
if(ErrorMax < Error) { if(ErrorMax < Error) {
ErrorMax = Error; ErrorMax = Error;
#ifdef DEB #ifdef OCCT_DEBUG
iErrorMax = i; iErrorMax = i;
#endif #endif
} }
} }
} }
} else ErrorMax = volumeProperties(S,Props,Eps); } else ErrorMax = volumeProperties(S,Props,Eps);
#ifdef DEB #ifdef OCCT_DEBUG
if(AffichEps) cout<<"\n\n==================="<<iErrorMax<<":\tMaxEpsVolume = "<<ErrorMax<<"\n"; if(AffichEps) cout<<"\n\n==================="<<iErrorMax<<":\tMaxEpsVolume = "<<ErrorMax<<"\n";
#endif #endif
return ErrorMax; return ErrorMax;

10
src/BRepLib/BRepLib_FuseEdges.cxx
View File

@ -76,7 +76,7 @@
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <GeomConvert.hxx> #include <GeomConvert.hxx>
//#ifdef DEB //#ifdef OCCT_DEBUG
//Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceFE(); //Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceFE();
//#endif //#endif
@ -373,7 +373,7 @@ TopoDS_Shape& BRepLib_FuseEdges::Shape()
void BRepLib_FuseEdges::BuildListEdges() void BRepLib_FuseEdges::BuildListEdges()
{ {
//#ifdef DEB //#ifdef OCCT_DEBUG
//Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE(); //Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
//#endif //#endif
@ -423,7 +423,7 @@ void BRepLib_FuseEdges::BuildListEdges()
void BRepLib_FuseEdges::BuildListResultEdges() void BRepLib_FuseEdges::BuildListResultEdges()
{ {
//#ifdef DEB //#ifdef OCCT_DEBUG
//Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE(); //Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
//#endif //#endif
@ -552,7 +552,7 @@ void BRepLib_FuseEdges::BuildListResultEdges()
void BRepLib_FuseEdges::Perform() void BRepLib_FuseEdges::Perform()
{ {
//#ifdef DEB //#ifdef OCCT_DEBUG
//Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE(); //Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
//#endif //#endif
@ -810,7 +810,7 @@ Standard_Boolean BRepLib_FuseEdges::SameSupport(const TopoDS_Edge& E1,
typC1 != STANDARD_TYPE(Geom_Ellipse) && typC1 != STANDARD_TYPE(Geom_Ellipse) &&
typC1 != STANDARD_TYPE(Geom_BSplineCurve) && typC1 != STANDARD_TYPE(Geom_BSplineCurve) &&
typC1 != STANDARD_TYPE(Geom_BezierCurve)) { typC1 != STANDARD_TYPE(Geom_BezierCurve)) {
#ifdef BREPLIB_DEB #ifdef OCCT_DEBUG
cout << " TopOpeBRepTool_FuseEdge : Type de Support non traite" << endl; cout << " TopOpeBRepTool_FuseEdge : Type de Support non traite" << endl;
#endif #endif
return Standard_False; return Standard_False;

6
src/BRepLib/BRepLib_MakeWire.cxx
View File

@ -351,7 +351,7 @@ void BRepLib_MakeWire::Add(const TopoDS_Edge& E)
if (V1.IsSame(myVertex)) VRef = V2; if (V1.IsSame(myVertex)) VRef = V2;
else if (V2.IsSame(myVertex)) VRef = V1; else if (V2.IsSame(myVertex)) VRef = V1;
else { else {
#if BREPLIB_DEB #ifdef OCCT_DEBUG
cout << "MakeWire : There is a PROBLEM !!" << endl; cout << "MakeWire : There is a PROBLEM !!" << endl;
#endif #endif
myError = BRepLib_NonManifoldWire; myError = BRepLib_NonManifoldWire;
@ -359,7 +359,7 @@ void BRepLib_MakeWire::Add(const TopoDS_Edge& E)
if (VF.IsSame(VL)) { if (VF.IsSame(VL)) {
// Particular case: it is required to control the orientation // Particular case: it is required to control the orientation
#if BREPLIB_DEB #ifdef OCCT_DEBUG
if (!VF.IsSame(myVertex)) if (!VF.IsSame(myVertex))
cout << "MakeWire : There is a PROBLEM !!" << endl; cout << "MakeWire : There is a PROBLEM !!" << endl;
#endif #endif
@ -369,7 +369,7 @@ void BRepLib_MakeWire::Add(const TopoDS_Edge& E)
if (VF.IsSame(myVertex)) VF = VRef; if (VF.IsSame(myVertex)) VF = VRef;
else if (VL.IsSame(myVertex)) VL = VRef; else if (VL.IsSame(myVertex)) VL = VRef;
else { else {
#if BREPLIB_DEB #ifdef OCCT_DEBUG
cout << "MakeWire : Y A UN PROBLEME !!" << endl; cout << "MakeWire : Y A UN PROBLEME !!" << endl;
#endif #endif
myError = BRepLib_NonManifoldWire; myError = BRepLib_NonManifoldWire;

4
src/BRepOffset/BRepOffset_Analyse.cxx
View File

@ -159,7 +159,7 @@ static void EdgeAnalyse(const TopoDS_Edge& E,
} }
else { else {
//Mixed not finished! //Mixed not finished!
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
cout <<" faces locally mixed"<<endl; cout <<" faces locally mixed"<<endl;
#endif #endif
I.Type(BRepOffset_Convex); I.Type(BRepOffset_Convex);
@ -266,7 +266,7 @@ void BRepOffset_Analyse::Perform (const TopoDS_Shape& S,
mapEdgeType(E).Append(Inter); mapEdgeType(E).Append(Inter);
} }
else { else {
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
cout <<"edge shared by more than two faces"<<endl; cout <<"edge shared by more than two faces"<<endl;
#endif #endif
} }

16
src/BRepOffset/BRepOffset_Inter2d.cxx
View File

@ -355,7 +355,7 @@ static void EdgeInter(const TopoDS_Face& F,
Standard_Real aT2 = ResParamsOnE2(i); //ponc2.Parameter(); Standard_Real aT2 = ResParamsOnE2(i); //ponc2.Parameter();
if (Precision::IsInfinite(aT1) || Precision::IsInfinite(aT2)) if (Precision::IsInfinite(aT1) || Precision::IsInfinite(aT2))
{ {
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
cout << "Inter2d : Solution rejected due to infinite parameter"<<endl; cout << "Inter2d : Solution rejected due to infinite parameter"<<endl;
#endif #endif
continue; continue;
@ -376,7 +376,7 @@ static void EdgeInter(const TopoDS_Face& F,
dist1 = Max( dist1, dist3 ); dist1 = Max( dist1, dist3 );
B.UpdateVertex( aNewVertex, dist1 ); B.UpdateVertex( aNewVertex, dist1 );
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
if (aT1 < f[1]-Tol || aT1 > l[1]+Tol) if (aT1 < f[1]-Tol || aT1 > l[1]+Tol)
{ {
cout << "out of limit"<<endl; cout << "out of limit"<<endl;
@ -412,7 +412,7 @@ static void EdgeInter(const TopoDS_Face& F,
if (E1.Orientation() == TopAbs_REVERSED) V1or.Reverse(); if (E1.Orientation() == TopAbs_REVERSED) V1or.Reverse();
if (E2.Orientation() == TopAbs_REVERSED) V2or.Reverse(); if (E2.Orientation() == TopAbs_REVERSED) V2or.Reverse();
Standard_Real CrossProd = V2or ^ V1; Standard_Real CrossProd = V2or ^ V1;
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
if (Abs(CrossProd) <= gp::Resolution()) if (Abs(CrossProd) <= gp::Resolution())
cout<<endl<<"CrossProd = "<<CrossProd<<endl; cout<<endl<<"CrossProd = "<<CrossProd<<endl;
#endif #endif
@ -623,7 +623,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
Standard_Real aT2 = ResParamsOnE2(i); //ponc2.Parameter(); Standard_Real aT2 = ResParamsOnE2(i); //ponc2.Parameter();
if (Precision::IsInfinite(aT1) || Precision::IsInfinite(aT2)) if (Precision::IsInfinite(aT1) || Precision::IsInfinite(aT2))
{ {
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
cout << "Inter2d : Solution rejected due to infinite parameter"<<endl; cout << "Inter2d : Solution rejected due to infinite parameter"<<endl;
#endif #endif
continue; continue;
@ -644,7 +644,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
dist1 = Max( dist1, dist3 ); dist1 = Max( dist1, dist3 );
B.UpdateVertex( aNewVertex, dist1 ); B.UpdateVertex( aNewVertex, dist1 );
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
if (aT1 < f[1]-Tol || aT1 > l[1]+Tol) if (aT1 < f[1]-Tol || aT1 > l[1]+Tol)
{ {
cout << "out of limit"<<endl; cout << "out of limit"<<endl;
@ -680,7 +680,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
if (E1.Orientation() == TopAbs_REVERSED) V1or.Reverse(); if (E1.Orientation() == TopAbs_REVERSED) V1or.Reverse();
if (E2.Orientation() == TopAbs_REVERSED) V2or.Reverse(); if (E2.Orientation() == TopAbs_REVERSED) V2or.Reverse();
Standard_Real CrossProd = V2or ^ V1; Standard_Real CrossProd = V2or ^ V1;
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
if (Abs(CrossProd) <= gp::Resolution()) if (Abs(CrossProd) <= gp::Resolution())
cout<<endl<<"CrossProd = "<<CrossProd<<endl; cout<<endl<<"CrossProd = "<<CrossProd<<endl;
#endif #endif
@ -1146,7 +1146,7 @@ static void ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE, const Standard_Real
Projector.Init( P1, C3d ); Projector.Init( P1, C3d );
if (Projector.NbPoints() > 0) if (Projector.NbPoints() > 0)
f = Projector.LowerDistanceParameter(); f = Projector.LowerDistanceParameter();
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
else else
cout<<"ProjectPointOnCurve not done"<<endl; cout<<"ProjectPointOnCurve not done"<<endl;
#endif #endif
@ -1159,7 +1159,7 @@ static void ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE, const Standard_Real
Projector.Init( P2, C3d ); Projector.Init( P2, C3d );
if (Projector.NbPoints() > 0) if (Projector.NbPoints() > 0)
l = Projector.LowerDistanceParameter(); l = Projector.LowerDistanceParameter();
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
else else
cout<<"ProjectPointOnCurve not done"<<endl; cout<<"ProjectPointOnCurve not done"<<endl;
#endif #endif

44
src/BRepOffset/BRepOffset_MakeOffset.cxx
View File

@ -121,7 +121,7 @@
#include <DBRep.hxx> #include <DBRep.hxx>
#endif #endif
#ifdef DEB #ifdef OCCT_DEBUG
#include <OSD_Chronometer.hxx> #include <OSD_Chronometer.hxx>
//#define DEB_VERB //#define DEB_VERB
Standard_Boolean AffichInt2d = Standard_False; Standard_Boolean AffichInt2d = Standard_False;
@ -796,14 +796,14 @@ void BRepOffset_MakeOffset::MakeThickSolid()
YaResult = 1; YaResult = 1;
Glue.Add (exp.Current().Reversed()); Glue.Add (exp.Current().Reversed());
} }
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
if(YaResult == 0) if(YaResult == 0)
{ {
cout << "OffsetShape does not contain a FACES." << endl; cout << "OffsetShape does not contain a FACES." << endl;
} }
#endif #endif
} }
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
else else
{ {
cout << "OffsetShape is null!" << endl; cout << "OffsetShape is null!" << endl;
@ -943,7 +943,7 @@ static void TrimEdge (TopoDS_Edge& NE,
//======================================================================= //=======================================================================
void BRepOffset_MakeOffset::BuildOffsetByInter() void BRepOffset_MakeOffset::BuildOffsetByInter()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) { if ( ChronBuild) {
cout << " CONSTRUCTION OF OFFSETS :" << endl; cout << " CONSTRUCTION OF OFFSETS :" << endl;
Clock.Reset(); Clock.Reset();
@ -1128,7 +1128,7 @@ void BRepOffset_MakeOffset::BuildOffsetByInter()
//------------------------------- //-------------------------------
myMakeLoops.Build(LFE ,AsDes,IMOE); myMakeLoops.Build(LFE ,AsDes,IMOE);
#ifdef DEB #ifdef OCCT_DEBUG
TopTools_IndexedMapOfShape COES; TopTools_IndexedMapOfShape COES;
#endif #endif
//--------------------------- //---------------------------
@ -1364,7 +1364,7 @@ void BRepOffset_MakeOffset::BuildOffsetByInter()
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
DEBVerticesControl (COES,myAsDes); DEBVerticesControl (COES,myAsDes);
if ( ChronBuild) Clock.Show(); if ( ChronBuild) Clock.Show();
#endif #endif
@ -1377,7 +1377,7 @@ void BRepOffset_MakeOffset::BuildOffsetByInter()
//======================================================================= //=======================================================================
void BRepOffset_MakeOffset::BuildOffsetByArc() void BRepOffset_MakeOffset::BuildOffsetByArc()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) { if ( ChronBuild) {
cout << " CONSTRUCTION OF OFFSETS :" << endl; cout << " CONSTRUCTION OF OFFSETS :" << endl;
Clock.Reset(); Clock.Reset();
@ -1613,7 +1613,7 @@ void BRepOffset_MakeOffset::BuildOffsetByArc()
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) Clock.Show(); if ( ChronBuild) Clock.Show();
#endif #endif
} }
@ -1627,7 +1627,7 @@ void BRepOffset_MakeOffset::BuildOffsetByArc()
void BRepOffset_MakeOffset::SelfInter(TopTools_MapOfShape& /*Modif*/) void BRepOffset_MakeOffset::SelfInter(TopTools_MapOfShape& /*Modif*/)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) { if ( ChronBuild) {
cout << " AUTODEBOUCLAGE:" << endl; cout << " AUTODEBOUCLAGE:" << endl;
Clock.Reset(); Clock.Reset();
@ -1637,7 +1637,7 @@ void BRepOffset_MakeOffset::SelfInter(TopTools_MapOfShape& /*Modif*/)
Standard_NotImplemented::Raise(); Standard_NotImplemented::Raise();
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) Clock.Show(); if ( ChronBuild) Clock.Show();
#endif #endif
} }
@ -2197,7 +2197,7 @@ void BRepOffset_MakeOffset::CorrectConicalFaces()
void BRepOffset_MakeOffset::Intersection3D(BRepOffset_Inter3d& Inter) void BRepOffset_MakeOffset::Intersection3D(BRepOffset_Inter3d& Inter)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if (ChronBuild) { if (ChronBuild) {
cout << " INTERSECTION 3D:" << endl; cout << " INTERSECTION 3D:" << endl;
Clock.Reset(); Clock.Reset();
@ -2231,7 +2231,7 @@ void BRepOffset_MakeOffset::Intersection3D(BRepOffset_Inter3d& Inter)
//-------------------------------- //--------------------------------
Inter.ConnexIntByArc(OffsetFaces,myShape,myAnalyse,myInitOffsetFace); Inter.ConnexIntByArc(OffsetFaces,myShape,myAnalyse,myInitOffsetFace);
} }
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) Clock.Show(); if ( ChronBuild) Clock.Show();
#endif #endif
} }
@ -2244,7 +2244,7 @@ void BRepOffset_MakeOffset::Intersection3D(BRepOffset_Inter3d& Inter)
void BRepOffset_MakeOffset::Intersection2D(const TopTools_IndexedMapOfShape& Modif, void BRepOffset_MakeOffset::Intersection2D(const TopTools_IndexedMapOfShape& Modif,
const TopTools_IndexedMapOfShape& NewEdges) const TopTools_IndexedMapOfShape& NewEdges)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if (ChronBuild) { if (ChronBuild) {
cout << " INTERSECTION 2D:" << endl; cout << " INTERSECTION 2D:" << endl;
Clock.Reset(); Clock.Reset();
@ -2265,7 +2265,7 @@ void BRepOffset_MakeOffset::Intersection2D(const TopTools_IndexedMapOfShape& Mod
BRepOffset_Inter2d::Compute(myAsDes,F,NewEdges,myTol); BRepOffset_Inter2d::Compute(myAsDes,F,NewEdges,myTol);
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (AffichInt2d) { if (AffichInt2d) {
DEBVerticesControl (NewEdges,myAsDes); DEBVerticesControl (NewEdges,myAsDes);
} }
@ -2281,7 +2281,7 @@ void BRepOffset_MakeOffset::Intersection2D(const TopTools_IndexedMapOfShape& Mod
void BRepOffset_MakeOffset::MakeLoops(TopTools_IndexedMapOfShape& Modif) void BRepOffset_MakeOffset::MakeLoops(TopTools_IndexedMapOfShape& Modif)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if (ChronBuild) { if (ChronBuild) {
cout << " DEBOUCLAGE 2D:" << endl; cout << " DEBOUCLAGE 2D:" << endl;
Clock.Reset(); Clock.Reset();
@ -2310,7 +2310,7 @@ void BRepOffset_MakeOffset::MakeLoops(TopTools_IndexedMapOfShape& Modif)
if (myOffset > 0 ) InSide = 0; if (myOffset > 0 ) InSide = 0;
myMakeLoops.BuildOnContext(LC,myAnalyse,myAsDes,myImageOffset,InSide); myMakeLoops.BuildOnContext(LC,myAnalyse,myAsDes,myImageOffset,InSide);
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) Clock.Show(); if ( ChronBuild) Clock.Show();
#endif #endif
} }
@ -2323,7 +2323,7 @@ void BRepOffset_MakeOffset::MakeLoops(TopTools_IndexedMapOfShape& Modif)
void BRepOffset_MakeOffset::MakeFaces(TopTools_IndexedMapOfShape& /*Modif*/) void BRepOffset_MakeOffset::MakeFaces(TopTools_IndexedMapOfShape& /*Modif*/)
{ {
#ifdef DEb #ifdef OCCT_DEBUG
if (ChronBuild) { if (ChronBuild) {
cout << " RECONSTRUCTION OF FACES:" << endl; cout << " RECONSTRUCTION OF FACES:" << endl;
Clock.Reset(); Clock.Reset();
@ -2342,7 +2342,7 @@ void BRepOffset_MakeOffset::MakeFaces(TopTools_IndexedMapOfShape& /*Modif*/)
} }
myMakeLoops.BuildFaces(LOF,myAsDes,myImageOffset); myMakeLoops.BuildFaces(LOF,myAsDes,myImageOffset);
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) Clock.Show(); if ( ChronBuild) Clock.Show();
#endif #endif
} }
@ -2764,7 +2764,7 @@ void BRepOffset_MakeOffset::MakeMissingWalls ()
void BRepOffset_MakeOffset::MakeShells () void BRepOffset_MakeOffset::MakeShells ()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if (ChronBuild) { if (ChronBuild) {
cout << " RECONSTRUCTION OF SHELLS:" << endl; cout << " RECONSTRUCTION OF SHELLS:" << endl;
Clock.Reset(); Clock.Reset();
@ -2923,7 +2923,7 @@ const TopTools_IndexedMapOfShape& BRepOffset_MakeOffset::ClosingFaces () const
void BRepOffset_MakeOffset::EncodeRegularity () void BRepOffset_MakeOffset::EncodeRegularity ()
{ {
#ifdef DEB #ifdef OCCT_DEBUG
if (ChronBuild) { if (ChronBuild) {
cout << " CODING OF REGULARITIES:" << endl; cout << " CODING OF REGULARITIES:" << endl;
Clock.Reset(); Clock.Reset();
@ -2951,7 +2951,7 @@ void BRepOffset_MakeOffset::EncodeRegularity ()
const TopTools_ListOfShape& LofOF = myAsDes->Ascendant(ROE); const TopTools_ListOfShape& LofOF = myAsDes->Ascendant(ROE);
if (LofOF.Extent() != 2) { if (LofOF.Extent() != 2) {
#ifdef DEB_VERB #ifdef OCCT_DEBUG_VERB
cout << " Edge shared by " << LofOF.Extent() << " Faces" << endl; cout << " Edge shared by " << LofOF.Extent() << " Faces" << endl;
#endif #endif
continue; continue;
@ -3094,7 +3094,7 @@ void BRepOffset_MakeOffset::EncodeRegularity ()
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
if ( ChronBuild) Clock.Show(); if ( ChronBuild) Clock.Show();
#endif #endif
} }

10
src/BRepOffset/BRepOffset_Offset.cxx
View File

@ -80,7 +80,7 @@
#include <GProp_GProps.hxx> #include <GProp_GProps.hxx>
#include <BRepGProp.hxx> #include <BRepGProp.hxx>
#ifdef DEB #ifdef OCCT_DEBUG
static Standard_Boolean Affich = Standard_False; static Standard_Boolean Affich = Standard_False;
static Standard_Integer NbOFFSET = 0; static Standard_Integer NbOFFSET = 0;
#endif #endif
@ -941,7 +941,7 @@ void BRepOffset_Offset::Init(const TopoDS_Face& Face,
if (BRep_Tool::Degenerated(E)) { if (BRep_Tool::Degenerated(E)) {
myBuilder.Degenerated(OE, Standard_True); myBuilder.Degenerated(OE, Standard_True);
/* /*
#ifdef DEB #ifdef OCCT_DEBUG
gp_Pnt P1,P2; gp_Pnt P1,P2;
gp_Pnt2d P2d; gp_Pnt2d P2d;
P2d = C2d->Value(f); TheSurf->D0(P2d.X(),P2d.Y(),P1); P2d = C2d->Value(f); TheSurf->D0(P2d.X(),P2d.Y(),P1);
@ -1243,7 +1243,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
Edge3 = TopoDS::Edge(aLocalEdge); Edge3 = TopoDS::Edge(aLocalEdge);
// Edge3 = TopoDS::Edge(FirstEdge.Oriented(TopAbs_FORWARD)); // Edge3 = TopoDS::Edge(FirstEdge.Oriented(TopAbs_FORWARD));
TopExp::Vertices(Edge3,VVf,VVl); TopExp::Vertices(Edge3,VVf,VVl);
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
// si firstedge n est pas nul, il faut que les vertex soient partages // si firstedge n est pas nul, il faut que les vertex soient partages
if ( !VVf.IsSame(V1f) && !VVf.IsSame(V2f) ) { if ( !VVf.IsSame(V1f) && !VVf.IsSame(V2f) ) {
cout << "Attention Vertex non partages !!!!!!" << endl; cout << "Attention Vertex non partages !!!!!!" << endl;
@ -1307,7 +1307,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
Edge4 = TopoDS::Edge(aLocalEdge); Edge4 = TopoDS::Edge(aLocalEdge);
// Edge4 = TopoDS::Edge(LastEdge.Oriented(TopAbs_FORWARD)); // Edge4 = TopoDS::Edge(LastEdge.Oriented(TopAbs_FORWARD));
TopExp::Vertices(Edge4,VVf,VVl); TopExp::Vertices(Edge4,VVf,VVl);
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
// si lastedge n est pas nul, il faut que les vertex soient partages // si lastedge n est pas nul, il faut que les vertex soient partages
if ( !VVf.IsSame(V1l) && !VVf.IsSame(V2l) ) { if ( !VVf.IsSame(V1l) && !VVf.IsSame(V2l) ) {
cout << "Attention Vertex non partages !!!!!!" << endl; cout << "Attention Vertex non partages !!!!!!" << endl;
@ -1432,7 +1432,7 @@ void BRepOffset_Offset::Init(const TopoDS_Vertex& Vertex,
TopoDS_Vertex V1, V2, V3, V4; TopoDS_Vertex V1, V2, V3, V4;
#ifdef DEB #ifdef OCCT_DEBUG
char* name = new char[100]; char* name = new char[100];
if (Affich) { if (Affich) {
NbOFFSET++; NbOFFSET++;

16
src/BRepOffset/BRepOffset_Tool.cxx
View File

@ -152,7 +152,7 @@ static Standard_Integer NbFTE = 1;
static Standard_Integer NbExtE = 1; static Standard_Integer NbExtE = 1;
#endif #endif
#ifdef DEB #ifdef OCCT_DEBUG
static Standard_Boolean AffichExtent = Standard_False; static Standard_Boolean AffichExtent = Standard_False;
#endif #endif
@ -1883,7 +1883,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
TopoDS_Edge anEdge = TopoDS::Edge(eseq(i)); TopoDS_Edge anEdge = TopoDS::Edge(eseq(i));
BRepLib::SameParameter(anEdge, aSameParTol, Standard_True); BRepLib::SameParameter(anEdge, aSameParTol, Standard_True);
Standard_Real EdgeTol = BRep_Tool::Tolerance(anEdge); Standard_Real EdgeTol = BRep_Tool::Tolerance(anEdge);
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
cout<<"Tolerance of glued E = "<<EdgeTol<<endl; cout<<"Tolerance of glued E = "<<EdgeTol<<endl;
#endif #endif
if (EdgeTol > 1.e-2) if (EdgeTol > 1.e-2)
@ -1893,7 +1893,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
{ {
ReconstructPCurves(anEdge); ReconstructPCurves(anEdge);
BRepLib::SameParameter(anEdge, aSameParTol, Standard_True); BRepLib::SameParameter(anEdge, aSameParTol, Standard_True);
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
cout<<"After projection tol of E = "<<BRep_Tool::Tolerance(anEdge)<<endl; cout<<"After projection tol of E = "<<BRep_Tool::Tolerance(anEdge)<<endl;
#endif #endif
} }
@ -2214,7 +2214,7 @@ static Standard_Boolean ProjectVertexOnEdge(TopoDS_Vertex& V,
} }
} }
#ifdef DEB #ifdef OCCT_DEBUG
if (AffichExtent) { if (AffichExtent) {
Standard_Real Dist = P.Distance(C.Value(U)); Standard_Real Dist = P.Distance(C.Value(U));
if (Dist > TolConf) { if (Dist > TolConf) {
@ -2316,7 +2316,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F,
// if (j == 1) C2 = BRep_Tool::CurveOnSurface(E2,F,fl2[0],fl2[1]); // if (j == 1) C2 = BRep_Tool::CurveOnSurface(E2,F,fl2[0],fl2[1]);
// else C2 = BRep_Tool::CurveOnSurface(TopoDS::Edge(E2.Reversed()), // else C2 = BRep_Tool::CurveOnSurface(TopoDS::Edge(E2.Reversed()),
// F,fl2[0],fl2[1]); // F,fl2[0],fl2[1]);
#ifdef DEB #ifdef OCCT_DEBUG
if (C1.IsNull() || C2.IsNull()) { if (C1.IsNull() || C2.IsNull()) {
cout <<"Inter2d : Pas de pcurve"<<endl; cout <<"Inter2d : Pas de pcurve"<<endl;
#ifdef DRAW #ifdef DRAW
@ -2428,7 +2428,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F,
Standard_Real U1on2 = IntP2.ParamOnFirst(); Standard_Real U1on2 = IntP2.ParamOnFirst();
Standard_Real U2on1 = IntP1.ParamOnSecond(); Standard_Real U2on1 = IntP1.ParamOnSecond();
Standard_Real U2on2 = IntP2.ParamOnSecond(); Standard_Real U2on2 = IntP2.ParamOnSecond();
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
cout << " BRepOffset_Tool::Inter2d SEGMENT d intersection" << endl; cout << " BRepOffset_Tool::Inter2d SEGMENT d intersection" << endl;
cout << " ===> Parametres sur Curve1 : "; cout << " ===> Parametres sur Curve1 : ";
cout << U1on1 << " " << U1on2 << endl; cout << U1on1 << " " << U1on2 << endl;
@ -2486,7 +2486,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F,
LV.Clear();LV.Append(VF); LV.Append(VL); LV.Clear();LV.Append(VF); LV.Append(VL);
} }
#ifdef BREPOFFSET_DEB #ifdef OCCT_DEBUG
if (!YaSol) { if (!YaSol) {
cout <<"Inter2d : Pas de solution"<<endl; cout <<"Inter2d : Pas de solution"<<endl;
#ifdef DRAW #ifdef DRAW
@ -3714,7 +3714,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F,
Standard_Real U1,U2; Standard_Real U1,U2;
Standard_Real eps = Precision::Confusion(); Standard_Real eps = Precision::Confusion();
#ifdef DEB #ifdef OCCT_DEBUG
TopLoc_Location L; TopLoc_Location L;
#endif #endif
B.MakeWire(NW); B.MakeWire(NW);

2
src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx
View File

@ -335,7 +335,7 @@ void BRepOffsetAPI_MakeOffset::Perform(const Standard_Real Offset,
} }
catch(...) //Every exception was caught. catch(...) //Every exception was caught.
{ {
#ifdef BREPOFFSETAPI_DEB #ifdef OCCT_DEBUG
cout<<"An exception was caught in BRepOffsetAPI_MakeOffset::Perform : "; cout<<"An exception was caught in BRepOffsetAPI_MakeOffset::Perform : ";
Standard_ConstructionError::Caught()->Print(cout); Standard_ConstructionError::Caught()->Print(cout);
cout<<endl; cout<<endl;

2
src/BRepPrim/BRepPrim_GWedge.cxx
View File

@ -567,7 +567,7 @@ Standard_Boolean BRepPrim_GWedge::HasWire (const BRepPrim_Direction d1) const
dd3 = BRepPrim_YMax; dd3 = BRepPrim_YMax;
dd4 = BRepPrim_XMin; dd4 = BRepPrim_XMin;
break; break;
#ifndef DEB #ifndef OCCT_DEBUG
default: default:
break; break;
#endif #endif

2
src/BRepTest/BRepTest_DraftAngleCommands.cxx
View File

@ -127,7 +127,7 @@ static Standard_Integer NDEP(Draw_Interpretor& theCommands,
return 1; return 1;
} }
//#ifdef DEB //#ifdef OCCT_DEBUG
// Flag = Draw::Atof(a[9*ii+7]); // BUG?? Real -> Boolean ??? // Flag = Draw::Atof(a[9*ii+7]); // BUG?? Real -> Boolean ???
//#else //#else
Flag = (Standard_Boolean ) Draw::Atof(a[9*ii+7]); Flag = (Standard_Boolean ) Draw::Atof(a[9*ii+7]);

2
src/BRepTest/BRepTest_ExtremaCommands.cxx
View File

@ -69,7 +69,7 @@ static Standard_Integer distmini(Draw_Interpretor& di, Standard_Integer n, const
if (dst.IsDone()) if (dst.IsDone())
{ {
#ifdef DEB #ifdef OCCT_DEBUG
//dst.Dump(cout); //dst.Dump(cout);
di << "*** Dump of \"BRepExtrema_DistShapeShape\" in DEBUG mode (begin) *****\n"; di << "*** Dump of \"BRepExtrema_DistShapeShape\" in DEBUG mode (begin) *****\n";
Standard_SStream aSStream; Standard_SStream aSStream;

6
src/BRepTest/BRepTest_FillingCommands.cxx
View File

@ -102,7 +102,7 @@
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
// pour mes tests // pour mes tests
#ifdef DEB #ifdef OCCT_DEBUG
#include <OSD_Chronometer.hxx> #include <OSD_Chronometer.hxx>
#include <Geom_Line.hxx> #include <Geom_Line.hxx>
#endif #endif
@ -450,7 +450,7 @@ static Standard_Integer approxplate (Draw_Interpretor & di,Standard_Integer n,co
static Standard_Integer filling( Draw_Interpretor & di, Standard_Integer n, const char** a ) static Standard_Integer filling( Draw_Interpretor & di, Standard_Integer n, const char** a )
{ {
#ifdef DEB #ifdef OCCT_DEBUG
// Chronmetrage // Chronmetrage
OSD_Chronometer Chrono; OSD_Chronometer Chrono;
Chrono.Reset(); Chrono.Reset();
@ -584,7 +584,7 @@ static Standard_Integer filling( Draw_Interpretor & di, Standard_Integer n, cons
TopoDS_Face ResFace= TopoDS::Face( MakeFilling.Shape() ); TopoDS_Face ResFace= TopoDS::Face( MakeFilling.Shape() );
DBRep::Set( a[1], ResFace ); DBRep::Set( a[1], ResFace );
#ifdef DEB #ifdef OCCT_DEBUG
Chrono.Stop(); Chrono.Stop();
Standard_Real Tps; Standard_Real Tps;
Chrono.Show(Tps); Chrono.Show(Tps);

2
src/BRepTools/BRepTools_ReShape.cxx
View File

@ -150,7 +150,7 @@ void BRepTools_ReShape::Replace (const TopoDS_Shape& ashape,
shape.Location ( nullLoc ); shape.Location ( nullLoc );
} }
#ifdef BREPTOOLS_DEB #ifdef OCCT_DEBUG
if ( IsRecorded ( shape ) && ((myConsiderLocation && ! Value ( shape ).IsPartner ( newshape )) || if ( IsRecorded ( shape ) && ((myConsiderLocation && ! Value ( shape ).IsPartner ( newshape )) ||
(!myConsiderLocation && ! Value ( shape ).IsSame ( newshape )))) (!myConsiderLocation && ! Value ( shape ).IsSame ( newshape ))))
cout << "Warning: BRepTools_ReShape::Replace: shape already recorded" << endl; cout << "Warning: BRepTools_ReShape::Replace: shape already recorded" << endl;

12
src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
View File

@ -47,7 +47,7 @@
#endif #endif
#ifdef DEB #ifdef OCCT_DEBUG
#define LBRCOMPT 0 #define LBRCOMPT 0
#else #else
#define LBRCOMPT 0 #define LBRCOMPT 0
@ -191,7 +191,7 @@ BRepTopAdaptor_FClass2d::BRepTopAdaptor_FClass2d(const TopoDS_Face& aFace,const
//-- and the last point registered in SeqPnt2d //-- and the last point registered in SeqPnt2d
//-- Try to remote the first point of the current edge //-- Try to remote the first point of the current edge
//-- from the last saved point //-- from the last saved point
#ifdef DEB #ifdef OCCT_DEBUG
gp_Pnt2d Pnt2dDebutEdgeCourant= gp_Pnt2d Pnt2dDebutEdgeCourant=
#endif #endif
C.Value(u); C.Value(u);
@ -260,7 +260,7 @@ BRepTopAdaptor_FClass2d::BRepTopAdaptor_FClass2d(const TopoDS_Face& aFace,const
if(NbEdges) if(NbEdges)
{ //-- on compte ++ with a normal explorer and with the Wire Explorer { //-- on compte ++ with a normal explorer and with the Wire Explorer
/* /*
#ifdef DEB #ifdef OCCT_DEBUG
cout << endl; cout << endl;
cout << "*** BRepTopAdaptor_Fclass2d ** Wire Probablement FAUX **" << endl; cout << "*** BRepTopAdaptor_Fclass2d ** Wire Probablement FAUX **" << endl;
@ -327,7 +327,7 @@ BRepTopAdaptor_FClass2d::BRepTopAdaptor_FClass2d(const TopoDS_Face& aFace,const
// { // {
// BadWire=1; // BadWire=1;
// TabOrien.Append(-1); // TabOrien.Append(-1);
//#ifdef DEB //#ifdef OCCT_DEBUG
// cout << endl; // cout << endl;
// cout << "*** BRepTopAdaptor_Fclass2d ** Wire Probably FALSE **" << endl; // cout << "*** BRepTopAdaptor_Fclass2d ** Wire Probably FALSE **" << endl;
// cout << "*** Total rotation angle of the wire : " << angle << endl; // cout << "*** Total rotation angle of the wire : " << angle << endl;
@ -339,7 +339,7 @@ BRepTopAdaptor_FClass2d::BRepTopAdaptor_FClass2d(const TopoDS_Face& aFace,const
}//if(nbpoints>3 }//if(nbpoints>3
else else
{ {
#ifdef BREPTOPADAPTOR_DEB #ifdef OCCT_DEBUG
cout << endl; cout << endl;
cout << "*** BRepTopAdaptor_Fclass2d ** Wire Probably FALSE **" << endl; cout << "*** BRepTopAdaptor_Fclass2d ** Wire Probably FALSE **" << endl;
cout << "*** The sample wire contains less than 3 points" << endl; cout << "*** The sample wire contains less than 3 points" << endl;
@ -684,7 +684,7 @@ void BRepTopAdaptor_FClass2d::Destroy() {
//const BRepTopAdaptor_FClass2d & BRepTopAdaptor_FClass2d::Copy(const BRepTopAdaptor_FClass2d& Other) const { //const BRepTopAdaptor_FClass2d & BRepTopAdaptor_FClass2d::Copy(const BRepTopAdaptor_FClass2d& Other) const {
const BRepTopAdaptor_FClass2d & BRepTopAdaptor_FClass2d::Copy(const BRepTopAdaptor_FClass2d& ) const { const BRepTopAdaptor_FClass2d & BRepTopAdaptor_FClass2d::Copy(const BRepTopAdaptor_FClass2d& ) const {
#ifdef BREPTOPADAPTOR_DEB #ifdef OCCT_DEBUG
cerr<<"Copy not allowed in BRepTopAdaptor_FClass2d"<<endl; cerr<<"Copy not allowed in BRepTopAdaptor_FClass2d"<<endl;
#endif #endif
Standard_ConstructionError::Raise(); Standard_ConstructionError::Raise();

4
src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx
View File

@ -70,7 +70,7 @@ Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool() {
return(myTopolTool); return(myTopolTool);
} }
else { else {
#ifdef BREPTOPADAPTOR_DEB #ifdef OCCT_DEBUG
cout<<"\n*** Error ds Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool()\n"<<endl; cout<<"\n*** Error ds Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool()\n"<<endl;
#endif #endif
return(myTopolTool); return(myTopolTool);
@ -82,7 +82,7 @@ Handle(Adaptor3d_HSurface) BRepTopAdaptor_Tool::GetSurface() {
return(myHSurface); return(myHSurface);
} }
else { else {
#ifdef BREPTOPADAPTOR_DEB #ifdef OCCT_DEBUG
cout<<"\n*** Error ds Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetSurface()\n"<<endl; cout<<"\n*** Error ds Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetSurface()\n"<<endl;
#endif #endif
return(myHSurface); return(myHSurface);

2
src/BSplCLib/BSplCLib.cxx
View File

@ -3481,7 +3481,7 @@ void BSplCLib::TangExtendToConstraint
Standard_Real& KnotsResult, Standard_Real& KnotsResult,
Standard_Real& PolesResult) Standard_Real& PolesResult)
{ {
#if BSPLCLIB_DEB #ifdef OCCT_DEBUG
if (CDegree<Continuity+1) { if (CDegree<Continuity+1) {
cout<<"The BSpline degree must be greater than the order of continuity"<<endl; cout<<"The BSpline degree must be greater than the order of continuity"<<endl;
} }

2
src/BSplSLib/BSplSLib.cxx
View File

@ -3156,7 +3156,7 @@ void BSplSLib::Resolution(const TColgp_Array2OfPnt& Poles,
} }
else { else {
UTolerance=VTolerance=0.0; UTolerance=VTolerance=0.0;
#ifdef DEB #ifdef OCCT_DEBUG
cout<<"ElSLib.cxx : maxderivative = 0.0 "<<endl; cout<<"ElSLib.cxx : maxderivative = 0.0 "<<endl;
#endif #endif
} }

30
src/BiTgte/BiTgte_Blend.cxx
View File

@ -402,7 +402,7 @@ Handle(Geom_Curve) MakeCurve (const BiTgte_CurveOnEdge& HC)
{ {
Handle(Geom_Curve) C; Handle(Geom_Curve) C;
#if BITGTE_DEB #ifdef OCCT_DEBUG
OSD_Chronometer ch; OSD_Chronometer ch;
ChFi3d_InitChron(ch); ChFi3d_InitChron(ch);
#endif #endif
@ -451,7 +451,7 @@ Handle(Geom_Curve) MakeCurve (const BiTgte_CurveOnEdge& HC)
Conv.Degree()); Conv.Degree());
} }
#if BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch, t_mkcurve); ChFi3d_ResultChron(ch, t_mkcurve);
#endif #endif
@ -975,7 +975,7 @@ void BiTgte_Blend::Perform(const Standard_Boolean BuildShape)
myShape = SewedShape; myShape = SewedShape;
// end Sewing for false free borders. // end Sewing for false free borders.
#if BITGTE_DEB #ifdef OCCT_DEBUG
OSD_Chronometer cl_total, ch; OSD_Chronometer cl_total, ch;
Standard_Real t_total, t_center, t_surface, t_shape; Standard_Real t_total, t_center, t_surface, t_shape;
@ -1007,39 +1007,39 @@ void BiTgte_Blend::Perform(const Standard_Boolean BuildShape)
// ---------------------------------------------- // ----------------------------------------------
// Calculate lines of centers and of surfaces // Calculate lines of centers and of surfaces
// ---------------------------------------------- // ----------------------------------------------
#if BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_InitChron(ch); ChFi3d_InitChron(ch);
#endif #endif
ComputeCenters(); ComputeCenters();
#if BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch, t_center); ChFi3d_ResultChron(ch, t_center);
#endif #endif
// ----------------------------- // -----------------------------
// Calculate connection Surfaces // Calculate connection Surfaces
// ----------------------------- // -----------------------------
#if BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_InitChron(ch); ChFi3d_InitChron(ch);
#endif #endif
ComputeSurfaces(); ComputeSurfaces();
#if BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch, t_surface); ChFi3d_ResultChron(ch, t_surface);
#endif #endif
// ---------------------------------- // ----------------------------------
// Calculate the generated shape if required // Calculate the generated shape if required
// ---------------------------------- // ----------------------------------
#if BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_InitChron(ch); ChFi3d_InitChron(ch);
#endif #endif
if ( myBuildShape) ComputeShape(); if ( myBuildShape) ComputeShape();
#if BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_ResultChron(ch, t_shape); ChFi3d_ResultChron(ch, t_shape);
#endif #endif
@ -1047,7 +1047,7 @@ void BiTgte_Blend::Perform(const Standard_Boolean BuildShape)
// since the partition is provided ( A Priori); // since the partition is provided ( A Priori);
BRepLib::BuildCurves3d(myResult, Precision::Confusion()); BRepLib::BuildCurves3d(myResult, Precision::Confusion());
#ifdef BITGTE_DEB #ifdef OCCT_DEBUG
ChFi3d_ResultChron(cl_total, t_total); ChFi3d_ResultChron(cl_total, t_total);
cout<<endl; cout<<endl;
cout<<"Blend_PERFORM: temps total "<<t_total<<" s dont :"<<endl; cout<<"Blend_PERFORM: temps total "<<t_total<<" s dont :"<<endl;
@ -1829,7 +1829,7 @@ void BiTgte_Blend::ComputeCenters()
} }
} }
#ifdef BITGTE_DEB #ifdef OCCT_DEBUG
if ( myResult.IsNull()) { if ( myResult.IsNull()) {
cout << " No Lines of Generated Centers" << endl; cout << " No Lines of Generated Centers" << endl;
} }
@ -1992,7 +1992,7 @@ void BiTgte_Blend::ComputeSurfaces()
Handle(Geom2d_Curve) PC2 = Handle(Geom2d_Curve) PC2 =
BRep_Tool::CurveOnSurface(CurCutE,F2,f2,l2); BRep_Tool::CurveOnSurface(CurCutE,F2,f2,l2);
if ( PC1.IsNull() || PC2.IsNull()) { if ( PC1.IsNull() || PC2.IsNull()) {
#ifdef BITGTE_DEB #ifdef OCCT_DEBUG
cout << "No PCurves on Intersections : No tubes constructed"; cout << "No PCurves on Intersections : No tubes constructed";
cout << endl; cout << endl;
#endif #endif
@ -2589,7 +2589,7 @@ Standard_Boolean BiTgte_Blend::Intersect
InitShape2.ShapeType() == TopAbs_EDGE && InitShape2.ShapeType() == TopAbs_EDGE &&
myStopFaces.Contains(InitShape2); myStopFaces.Contains(InitShape2);
#ifdef BITGTE_DEB #ifdef OCCT_DEBUG
if ( F1surBordLibre && F2surBordLibre) { if ( F1surBordLibre && F2surBordLibre) {
cout << "Rejection : 2 tubes on free border are not intersected"; cout << "Rejection : 2 tubes on free border are not intersected";
cout << endl; cout << endl;
@ -2628,7 +2628,7 @@ Standard_Boolean BiTgte_Blend::Intersect
if ( Done.Add(V1)) { if ( Done.Add(V1)) {
Standard_Boolean IsOnR1 = IsOnRestriction(V1,CurE,Face,E1); Standard_Boolean IsOnR1 = IsOnRestriction(V1,CurE,Face,E1);
Standard_Boolean IsOnR2 = IsOnRestriction(V1,CurE,F2,E2); Standard_Boolean IsOnR2 = IsOnRestriction(V1,CurE,F2,E2);
#ifdef BITGTE_DEB #ifdef OCCT_DEBUG
if (IsOnR1 && IsOnR2) { if (IsOnR1 && IsOnR2) {
cout << "Leave in the same tps on 2 faces, "; cout << "Leave in the same tps on 2 faces, ";
cout << "propagation only on free border"; cout << "propagation only on free border";
@ -2657,7 +2657,7 @@ Standard_Boolean BiTgte_Blend::Intersect
// Leave in the same tps on 2 faces, propagate only on // Leave in the same tps on 2 faces, propagate only on
// free borders. // free borders.
// A priori, only facet is closed. // A priori, only facet is closed.
#ifdef BITGTE_DEB #ifdef OCCT_DEBUG
if (IsOnR1 && IsOnR2) { if (IsOnR1 && IsOnR2) {
cout << "Leave with the same tps on 2 faces, "; cout << "Leave with the same tps on 2 faces, ";
cout << "propagate only if the border is free"; cout << "propagate only if the border is free";

4
src/BinDrivers/BinDrivers.cxx
View File

@ -38,7 +38,7 @@ Handle(Standard_Transient) BinDrivers::Factory(const Standard_GUID& theGUID)
{ {
if (theGUID == BinStorageDriver) if (theGUID == BinStorageDriver)
{ {
#ifdef BINDRIVERS_DEB #ifdef OCCT_DEBUG
cout << "BinDrivers : Storage Plugin" << endl; cout << "BinDrivers : Storage Plugin" << endl;
#endif #endif
static Handle(BinDrivers_DocumentStorageDriver) model_sd = static Handle(BinDrivers_DocumentStorageDriver) model_sd =
@ -48,7 +48,7 @@ Handle(Standard_Transient) BinDrivers::Factory(const Standard_GUID& theGUID)
if (theGUID == BinRetrievalDriver) if (theGUID == BinRetrievalDriver)
{ {
#ifdef BINDRIVERS_DEB #ifdef OCCT_DEBUG
cout << "BinDrivers : Retrieval Plugin" << endl; cout << "BinDrivers : Retrieval Plugin" << endl;
#endif #endif
static Handle(BinDrivers_DocumentRetrievalDriver) model_rd = static Handle(BinDrivers_DocumentRetrievalDriver) model_rd =

8
src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx
View File

@ -48,12 +48,6 @@ void BinDrivers_DocumentStorageDriver::WriteShapeSection
(BinLDrivers_DocumentSection& theSection, (BinLDrivers_DocumentSection& theSection,
Standard_OStream& theOS) Standard_OStream& theOS)
{ {
#if defined(_DEBUG) || defined(DEB)
TCollection_ExtendedString aMethStr ("BinDrivers_DocumentStorageDriver, ");
#else
TCollection_ExtendedString aMethStr;
#endif
const Standard_Size aShapesSectionOffset = (Standard_Size) theOS.tellp(); const Standard_Size aShapesSectionOffset = (Standard_Size) theOS.tellp();
Handle(BinMNaming_NamedShapeDriver) aNamedShapeDriver; Handle(BinMNaming_NamedShapeDriver) aNamedShapeDriver;
@ -65,7 +59,7 @@ void BinDrivers_DocumentStorageDriver::WriteShapeSection
TCollection_ExtendedString anErrorStr ("Error: "); TCollection_ExtendedString anErrorStr ("Error: ");
Handle(Standard_Failure) aFailure = Standard_Failure::Caught(); Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
TCollection_ExtendedString aStr = TCollection_ExtendedString aStr =
anErrorStr + aMethStr + "Shape Section :"; anErrorStr + "BinDrivers_DocumentStorageDriver, Shape Section :";
WriteMessage (aStr + aFailure->GetMessageString()); WriteMessage (aStr + aFailure->GetMessageString());
} }
} }

4
src/BinLDrivers/BinLDrivers.cxx
View File

@ -36,7 +36,7 @@ Handle(Standard_Transient) BinLDrivers::Factory(const Standard_GUID& theGUID)
{ {
if (theGUID == BinLStorageDriver) if (theGUID == BinLStorageDriver)
{ {
#ifdef BINLDRIVERS_DEB #ifdef OCCT_DEBUG
cout << "BinLDrivers : Storage Plugin" << endl; cout << "BinLDrivers : Storage Plugin" << endl;
#endif #endif
static Handle(BinLDrivers_DocumentStorageDriver) model_sd = static Handle(BinLDrivers_DocumentStorageDriver) model_sd =
@ -46,7 +46,7 @@ Handle(Standard_Transient) BinLDrivers::Factory(const Standard_GUID& theGUID)
if (theGUID == BinLRetrievalDriver) if (theGUID == BinLRetrievalDriver)
{ {
#ifdef BINLDRIVERS_DEB #ifdef OCCT_DEBUG
cout << "BinLDrivers : Retrieval Plugin" << endl; cout << "BinLDrivers : Retrieval Plugin" << endl;
#endif #endif
static Handle(BinLDrivers_DocumentRetrievalDriver) model_rd = static Handle(BinLDrivers_DocumentRetrievalDriver) model_rd =

8
src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
View File

@ -96,7 +96,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
Handle(TDocStd_Document) aDoc = Handle(TDocStd_Document) aDoc =
Handle(TDocStd_Document)::DownCast(theNewDocument); Handle(TDocStd_Document)::DownCast(theNewDocument);
if (aDoc.IsNull()) { if (aDoc.IsNull()) {
#ifdef DEB #ifdef OCCT_DEBUG
WriteMessage (aMethStr + "error: null document"); WriteMessage (aMethStr + "error: null document");
#endif #endif
myReaderStatus = PCDM_RS_NoDocument; myReaderStatus = PCDM_RS_NoDocument;
@ -150,7 +150,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
#ifdef DATATYPE_MIGRATION #ifdef DATATYPE_MIGRATION
TCollection_AsciiString newName; TCollection_AsciiString newName;
if(Storage_Schema::CheckTypeMigration(aStr, newName)) { if(Storage_Schema::CheckTypeMigration(aStr, newName)) {
#ifdef DATATYPE_MIGRATION_DEB #ifdef OCCT_DEBUG
cout << "CheckTypeMigration:OldType = " <<aStr << " Len = "<<aStr.Length()<<endl; cout << "CheckTypeMigration:OldType = " <<aStr << " Len = "<<aStr.Length()<<endl;
cout << "CheckTypeMigration:NewType = " <<newName << " Len = "<< newName.Length()<<endl; cout << "CheckTypeMigration:NewType = " <<newName << " Len = "<< newName.Length()<<endl;
#endif #endif
@ -253,7 +253,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
#if DO_INVERSE #if DO_INVERSE
aShapeSectionPos = InverseInt (aShapeSectionPos); aShapeSectionPos = InverseInt (aShapeSectionPos);
#endif #endif
#ifdef DATATYPE_MIGRATION_DEB #ifdef OCCT_DEBUG
cout <<"aShapeSectionPos = " <<aShapeSectionPos <<endl; cout <<"aShapeSectionPos = " <<aShapeSectionPos <<endl;
#endif #endif
if(aShapeSectionPos) { if(aShapeSectionPos) {
@ -493,7 +493,7 @@ void BinLDrivers_DocumentRetrievalDriver::CheckShapeSection(
if (!IS.eof()) if (!IS.eof())
{ {
const std::streamoff endPos = IS.rdbuf()->pubseekoff(0L, std::ios_base::end, std::ios_base::in); const std::streamoff endPos = IS.rdbuf()->pubseekoff(0L, std::ios_base::end, std::ios_base::in);
#ifdef DATATYPE_MIGRATION_DEB #ifdef OCCT_DEBUG
cout << "endPos = " << endPos <<endl; cout << "endPos = " << endPos <<endl;
#endif #endif
if(ShapeSectionPos != endPos) { if(ShapeSectionPos != endPos) {

46
src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
View File

@ -71,13 +71,6 @@ void BinLDrivers_DocumentStorageDriver::Write
myMsgDriver = theDocument -> Application() -> MessageDriver(); myMsgDriver = theDocument -> Application() -> MessageDriver();
myMapUnsupported.Clear(); myMapUnsupported.Clear();
#if defined(_DEBUG) || defined(DEB)
TCollection_ExtendedString aMethStr ("BinLDrivers_DocumentStorageDriver, ");
#else
TCollection_ExtendedString aMethStr;
#endif
TCollection_ExtendedString anErrorStr ("Error: ");
Handle(TDocStd_Document) aDoc = Handle(TDocStd_Document) aDoc =
Handle(TDocStd_Document)::DownCast(theDocument); Handle(TDocStd_Document)::DownCast(theDocument);
if (aDoc.IsNull()) { if (aDoc.IsNull()) {
@ -111,7 +104,7 @@ void BinLDrivers_DocumentStorageDriver::Write
ofstream anOS (aFileName.ToCString(), ios::ate); ofstream anOS (aFileName.ToCString(), ios::ate);
//ofstream anOS (aFileName.ToCString(), ios::out| ios::binary | ios::ate); //ofstream anOS (aFileName.ToCString(), ios::out| ios::binary | ios::ate);
#endif #endif
#ifdef BINLDRIVERS_DEB #ifdef OCCT_DEBUG
const Standard_Integer aP = (Standard_Integer) anOS.tellp(); const Standard_Integer aP = (Standard_Integer) anOS.tellp();
cout << "POS = " << aP <<endl; cout << "POS = " << aP <<endl;
#endif #endif
@ -155,26 +148,21 @@ void BinLDrivers_DocumentStorageDriver::Write
if (!myRelocTable.Extent()) { if (!myRelocTable.Extent()) {
// No objects written // No objects written
#ifdef DEB #ifdef OCCT_DEBUG
WriteMessage (aMethStr + "no objects written"); WriteMessage ("BinLDrivers_DocumentStorageDriver, no objects written");
#endif #endif
SetIsError(Standard_True); SetIsError(Standard_True);
SetStoreStatus(PCDM_SS_No_Obj); SetStoreStatus(PCDM_SS_No_Obj);
} }
myRelocTable.Clear(); myRelocTable.Clear();
} }
if (!anOS) { if (!anOS) {
// A problem with the stream // A problem with the stream
#if defined(_DEBUG) || defined(DEB) #ifdef OCCT_DEBUG
WriteMessage (anErrorStr + aMethStr + TCollection_ExtendedString anErrorStr ("Error: ");
"Problem with the file stream, rdstate=" WriteMessage (anErrorStr + "BinLDrivers_DocumentStorageDriver, Problem with the file stream, rdstate="
+ (Standard_Integer )anOS.rdstate()); + (Standard_Integer )anOS.rdstate());
#else
TCollection_ExtendedString aStr =
anErrorStr + aMethStr + "Problem writing the file ";
WriteMessage (aStr + theFileName);
#endif #endif
SetIsError(Standard_True); SetIsError(Standard_True);
SetStoreStatus(PCDM_SS_WriteFailure); SetStoreStatus(PCDM_SS_WriteFailure);
@ -191,13 +179,13 @@ void BinLDrivers_DocumentStorageDriver::Write
void BinLDrivers_DocumentStorageDriver::UnsupportedAttrMsg void BinLDrivers_DocumentStorageDriver::UnsupportedAttrMsg
(const Handle(Standard_Type)& theType) (const Handle(Standard_Type)& theType)
{ {
#ifdef DEB #ifdef OCCT_DEBUG
static TCollection_ExtendedString aMsg static TCollection_ExtendedString aMsg
("BinDrivers_DocumentStorageDriver: warning: attribute driver for type "); ("BinDrivers_DocumentStorageDriver: warning: attribute driver for type ");
#endif #endif
if (!myMapUnsupported.Contains(theType)) { if (!myMapUnsupported.Contains(theType)) {
myMapUnsupported.Add(theType); myMapUnsupported.Add(theType);
#ifdef DEB #ifdef OCCT_DEBUG
WriteMessage (aMsg + theType->Name() + " not found"); WriteMessage (aMsg + theType->Name() + " not found");
#endif #endif
} }
@ -245,7 +233,7 @@ void BinLDrivers_DocumentStorageDriver::WriteSubTree
// Write data to the stream -->!!! // Write data to the stream -->!!!
theOS << myPAtt; theOS << myPAtt;
} }
#ifdef DEB #ifdef OCCT_DEBUG
else else
UnsupportedAttrMsg (aType); UnsupportedAttrMsg (aType);
#endif #endif
@ -312,7 +300,7 @@ Standard_Boolean BinLDrivers_DocumentStorageDriver::FirstPassSubTree
hasAttr = Standard_True; hasAttr = Standard_True;
myTypesMap.Add (aType); myTypesMap.Add (aType);
} }
#ifdef DEB #ifdef OCCT_DEBUG
else else
UnsupportedAttrMsg (aType); UnsupportedAttrMsg (aType);
#endif #endif
@ -369,12 +357,8 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection
{ {
FSD_BinaryFile aFileDriver; FSD_BinaryFile aFileDriver;
if (aFileDriver.Open( theFileName, Storage_VSWrite ) != Storage_VSOk) { if (aFileDriver.Open( theFileName, Storage_VSWrite ) != Storage_VSOk) {
#if defined(DEB) || defined(_DEBUG)
WriteMessage ("BinDrivers_DocumentStorageDriver: error opening file");
#else
WriteMessage (TCollection_ExtendedString("Error: Cannot open file ") + WriteMessage (TCollection_ExtendedString("Error: Cannot open file ") +
theFileName); theFileName);
#endif
SetIsError(Standard_True); SetIsError(Standard_True);
return; return;
} }
@ -429,15 +413,11 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection
aFileDriver.EndWriteDataSection(); aFileDriver.EndWriteDataSection();
} }
else { else {
#if defined(DEB) || defined(_DEBUG)
WriteMessage("BinDrivers_DocumentStorageDriver: error writing header");
#else
WriteMessage(TCollection_ExtendedString("Error: Problem writing header " WriteMessage(TCollection_ExtendedString("Error: Problem writing header "
"into file ") + theFileName); "into file ") + theFileName);
#endif
SetIsError(Standard_True); SetIsError(Standard_True);
} }
#ifdef BINLDRIVERS_DEB #ifdef OCCT_DEBUG
const Standard_Integer aP = (Standard_Integer) aFileDriver.Tell(); const Standard_Integer aP = (Standard_Integer) aFileDriver.Tell();
cout << "POS = " << aP <<endl; cout << "POS = " << aP <<endl;
#endif #endif

2
src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
View File

@ -70,7 +70,7 @@ Standard_Boolean BinMDataStd_IntegerArrayDriver::Paste
else else
aDelta = (Standard_Boolean)aDeltaValue; aDelta = (Standard_Boolean)aDeltaValue;
} }
#ifdef BINMDATASTD_DEB #ifdef OCCT_DEBUG
else if(BinMDataStd::DocumentVersion() == -1) else if(BinMDataStd::DocumentVersion() == -1)
cout << "Current DocVersion field is not initialized. " <<endl; cout << "Current DocVersion field is not initialized. " <<endl;
#endif #endif

6
src/BinMNaming/BinMNaming_NamingDriver.cxx
View File

@ -239,7 +239,7 @@ Standard_Boolean BinMNaming_NamingDriver::Paste
TCollection_AsciiString entry; TCollection_AsciiString entry;
ok = theSource >> entry; ok = theSource >> entry;
if(ok) { if(ok) {
#ifdef BINMNAMING_DEB #ifdef OCCT_DEBUG
cout << "NamingDriver:: Retrieved Context Label = " << entry << " Ok = " << theSource.IsOK() <<endl; cout << "NamingDriver:: Retrieved Context Label = " << entry << " Ok = " << theSource.IsOK() <<endl;
#endif #endif
@ -277,7 +277,7 @@ Standard_Boolean BinMNaming_NamingDriver::Paste
if(ok) { if(ok) {
OrientationToApply = (TopAbs_Orientation)anIndx; OrientationToApply = (TopAbs_Orientation)anIndx;
aName.Orientation(OrientationToApply); aName.Orientation(OrientationToApply);
#ifdef BINMNAMING_DEB #ifdef OCCT_DEBUG
cout << "NamingDriver:: Retrieved Orientation = " << OrientationToApply << " Ok = " << theSource.IsOK() <<endl; cout << "NamingDriver:: Retrieved Orientation = " << OrientationToApply << " Ok = " << theSource.IsOK() <<endl;
#endif #endif
} else { } else {
@ -287,7 +287,7 @@ Standard_Boolean BinMNaming_NamingDriver::Paste
} }
} }
} }
#ifdef BINMNAMING_DEB #ifdef OCCT_DEBUG
else if(BinMNaming::DocumentVersion() == -1) else if(BinMNaming::DocumentVersion() == -1)
cout << "Current DocVersion field is not initialized. " <<endl; cout << "Current DocVersion field is not initialized. " <<endl;
else else

2
src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx
View File

@ -172,7 +172,7 @@ void BinMXCAFDoc_LocationDriver::Translate(const TopLoc_Location& theLoc,
// The location is not identity // The location is not identity
if( myLocations == 0 ) if( myLocations == 0 )
{ {
#ifdef BINMXCAFDOC_DEB #ifdef OCCT_DEBUG
cout<<"Pointer to LocationSet is NULL\n"; cout<<"Pointer to LocationSet is NULL\n";
#endif #endif
return; return;

4
src/BinTObjDrivers/BinTObjDrivers.cxx
View File

@ -34,7 +34,7 @@ Handle(Standard_Transient) BinTObjDrivers::Factory(const Standard_GUID& aGUID)
{ {
if(aGUID == BinStorageDriver) if(aGUID == BinStorageDriver)
{ {
#ifdef BINTOBJDRIVERS_DEB #ifdef OCCT_DEBUG
cout << "BinTObjDrivers : Storage Plugin" << endl; cout << "BinTObjDrivers : Storage Plugin" << endl;
#endif #endif
static Handle(BinTObjDrivers_DocumentStorageDriver) model_sd static Handle(BinTObjDrivers_DocumentStorageDriver) model_sd
@ -44,7 +44,7 @@ Handle(Standard_Transient) BinTObjDrivers::Factory(const Standard_GUID& aGUID)
if(aGUID == BinRetrievalDriver) if(aGUID == BinRetrievalDriver)
{ {
#ifdef BINTOBJDRIVERS_DEB #ifdef OCCT_DEBUG
cout << "BinTObjDrivers : Retrieval Plugin" << endl; cout << "BinTObjDrivers : Retrieval Plugin" << endl;
#endif #endif
static Handle (BinTObjDrivers_DocumentRetrievalDriver) model_rd static Handle (BinTObjDrivers_DocumentRetrievalDriver) model_rd

2
src/BinTools/BinTools_Curve2dSet.cxx
View File

@ -704,7 +704,7 @@ void BinTools_Curve2dSet::Read(Standard_IStream& IS)
if (IS.fail() || strcmp(buffer,"Curve2ds")) { if (IS.fail() || strcmp(buffer,"Curve2ds")) {
Standard_SStream aMsg; Standard_SStream aMsg;
aMsg << "BinTools_Curve2dSet::Read: Not a Curve2d table"<<endl; aMsg << "BinTools_Curve2dSet::Read: Not a Curve2d table"<<endl;
#ifdef BINTOOLS_DEB #ifdef OCCT_DEBUG
cout <<"Curve2dSet buffer: " << buffer << endl; cout <<"Curve2dSet buffer: " << buffer << endl;
#endif #endif
Standard_Failure::Raise(aMsg); Standard_Failure::Raise(aMsg);

2
src/BinTools/BinTools_CurveSet.cxx
View File

@ -720,7 +720,7 @@ void BinTools_CurveSet::Read(Standard_IStream& IS)
if (IS.fail() || strcmp(buffer,"Curves")) { if (IS.fail() || strcmp(buffer,"Curves")) {
Standard_SStream aMsg; Standard_SStream aMsg;
aMsg << "BinTools_CurveSet::Read: Not a Curve table"<<endl; aMsg << "BinTools_CurveSet::Read: Not a Curve table"<<endl;
#ifdef BINTOOLS_DEB #ifdef OCCT_DEBUG
cout <<"CurveSet buffer: " << buffer << endl; cout <<"CurveSet buffer: " << buffer << endl;
#endif #endif
Standard_Failure::Raise(aMsg); Standard_Failure::Raise(aMsg);

Some files were not shown because too many files have changed in this diff Show More