OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-16 10:08:36 +03:00
Code

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

Browse Source 
Output to cout activated previously in Debug mode by #ifdef DEB is suppressed by using macro <PACKAGE>_DEB instead of DEB
This commit is contained in:
dbv 2014-10-08 19:00:20 +04:00 committed by abv
parent 7aa1b65c2a
commit 63c629aa3a
370 changed files with 1634 additions and 1639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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 DEBUG #ifdef AIS_DEB
cout<<"AIS_IC::DisplayedObjects"<<endl; cout<<"AIS_IC::DisplayedObjects"<<endl;
#endif #endif
@ -233,12 +233,12 @@ void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO,
if(It.Value()->GraphicStatus()==AIS_DS_Displayed) if(It.Value()->GraphicStatus()==AIS_DS_Displayed)
theMap.Add(It.Key()); theMap.Add(It.Key());
} }
#ifdef DEBUG #ifdef AIS_DEB
cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl; cout<<"\tFrom Neutral Point : "<<theMap.Extent()<<endl;
#endif #endif
//parse all local contexts... //parse all local contexts...
#ifdef DEBUG #ifdef AIS_DEB
Standard_Integer NbDisp; Standard_Integer NbDisp;
for(AIS_DataMapIteratorOfDataMapOfILC it1(myLocalContexts);it1.More();it1.Next()){ for(AIS_DataMapIteratorOfDataMapOfILC it1(myLocalContexts);it1.More();it1.Next()){
const Handle(AIS_LocalContext)& LC = it1.Value(); const Handle(AIS_LocalContext)& LC = it1.Value();
@ -1670,7 +1670,7 @@ void AIS_InteractiveContext::SetColor(const Handle(AIS_InteractiveObject)& anIOb
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef DEB #ifdef AIS_DEB
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1745,7 +1745,7 @@ void AIS_InteractiveContext::SetDeviationCoefficient(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef DEB #ifdef AIS_DEB
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1789,7 +1789,7 @@ void AIS_InteractiveContext::SetHLRDeviationCoefficient(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef DEB #ifdef AIS_DEB
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1832,7 +1832,7 @@ void AIS_InteractiveContext::SetDeviationAngle(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef DEB #ifdef AIS_DEB
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1903,7 +1903,7 @@ void AIS_InteractiveContext::SetHLRAngleAndDeviation(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef DEB #ifdef AIS_DEB
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1945,7 +1945,7 @@ void AIS_InteractiveContext::SetHLRDeviationAngle(
NbDisp++; NbDisp++;
} }
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
#ifdef DEB #ifdef AIS_DEB
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
} }
@ -1973,7 +1973,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 DEB #ifdef AIS_DEB
cout<<"nb of modes to recalculate : "<<NbDisp<<endl; cout<<"nb of modes to recalculate : "<<NbDisp<<endl;
#endif #endif
anIObj->SetRecomputeOk(); anIObj->SetRecomputeOk();
@ -2044,7 +2044,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 DEB #ifdef AIS_DEB
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

@ -653,7 +653,7 @@ void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject
UpdateCurrentViewer(); UpdateCurrentViewer();
} }
else{ else{
#ifdef DEB #ifdef AIS_DEB
cout<<"Nothing Done : Opened Local Context"<<endl; cout<<"Nothing Done : Opened Local Context"<<endl;
#endif #endif
} }
@ -693,7 +693,7 @@ AddOrRemoveCurrentObject(const Handle(AIS_InteractiveObject)& anIObj,
UpdateCurrentViewer(); UpdateCurrentViewer();
} }
else{ else{
#ifdef DEB #ifdef AIS_DEB
cout<<"Nothing Done : Opened Local Context"<<endl; cout<<"Nothing Done : Opened Local Context"<<endl;
#endif #endif
} }
@ -954,7 +954,7 @@ void AIS_InteractiveContext::SetSelectedCurrent()
{ {
#ifdef DEB #ifdef AIS_DEB
cout<<"Not Yet Implemented"<<endl; cout<<"Not Yet Implemented"<<endl;
#endif #endif
} }
@ -1011,7 +1011,7 @@ void AIS_InteractiveContext::AddOrRemoveSelected(const TopoDS_Shape& aShap,
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {
if(!HasOpenedContext()) { if(!HasOpenedContext()) {
#ifdef DEB #ifdef AIS_DEB
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;
@ -1030,7 +1030,7 @@ void AIS_InteractiveContext::AddOrRemoveSelected(const Handle(SelectMgr_EntityOw
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {
if(!HasOpenedContext()) { if(!HasOpenedContext()) {
#ifdef DEB #ifdef AIS_DEB
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 DEB #ifdef AIS_DEB
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 DEB #ifdef AIS_DEB
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 DEB #ifdef AIS_DEB
cout << "AIS_InteractiveObject::SetContext DRAWER NUL!" << endl; cout << "AIS_InteractiveObject::SetContext DRAWER NUL!" << endl;
#endif #endif
} }

4
src/AIS/AIS_LocalContext_1.cxx
View File

@ -1431,7 +1431,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 DEB #ifdef AIS_DEB
cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection " cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection "
<<mySelName<<" Nulle "<<endl; <<mySelName<<" Nulle "<<endl;
#endif #endif
@ -1480,7 +1480,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 DEB #ifdef AIS_DEB
cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection "<<mySelName<<" Nulle "<<endl; cout<<"\t\tAIS_LocalCOntext::FindSelectedOwnerFromShape : Selection "<<mySelName<<" Nulle "<<endl;
#endif #endif
return EO; return EO;

10
src/AIS/AIS_Shape.cxx
View File

@ -156,10 +156,10 @@ 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 DEB #ifdef AIS_DEB
cout << "AIS_Shape::Compute() failed"<< endl; cout << "AIS_Shape::Compute() failed"<< endl;
#endif
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
// presentation of the bounding box is calculated // presentation of the bounding box is calculated
// Compute(aPresentationManager,aPrs,2); // Compute(aPresentationManager,aPrs,2);
} }
@ -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 DEB #ifdef AIS_DEB
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 DEB #ifdef AIS_DEB
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 DEB #ifdef AIS_DEB
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,8 +78,10 @@ void AIS_TexturedShape::SetTextureFileName (const TCollection_AsciiString& theTe
} }
else else
{ {
#ifdef AIS_DEB
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
myPredefTexture = Graphic3d_NameOfTexture2D (0); myPredefTexture = Graphic3d_NameOfTexture2D (0);
} }
myTextureFile = ""; myTextureFile = "";
@ -342,7 +344,9 @@ void AIS_TexturedShape::updateAttributes (const Handle(Prs3d_Presentation)& theP
myAspect->SetTextureMap (myTexture); myAspect->SetTextureMap (myTexture);
if (!myTexture->IsDone()) if (!myTexture->IsDone())
{ {
#ifdef AIS_DEB
std::cout << "An error occurred while building texture\n"; std::cout << "An error occurred while building texture\n";
#endif
myAspect->SetTextureMapOff(); myAspect->SetTextureMapOff();
return; return;
} }
@ -468,7 +472,9 @@ void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*t
} }
catch (Standard_Failure) catch (Standard_Failure)
{ {
#ifdef AIS_DEB
std::cout << "AIS_TexturedShape::Compute() in ShadingMode failed \n"; std::cout << "AIS_TexturedShape::Compute() in ShadingMode failed \n";
#endif
StdPrs_WFShape::Add (thePrs, myshape, myDrawer); StdPrs_WFShape::Add (thePrs, myshape, myDrawer);
} }
break; break;

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 DEB #if ADVAPP2VAR_DEB
cout << "F(U, V) : Not enough points of discretization" << endl; cout << "F(U, V) : Not enough points of discretization" << endl;
#endif #endif
} }

10
src/AppBlend/AppBlend_AppSurf.gxx
View File

@ -399,7 +399,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 DEB #ifdef APPBLEND_DEB
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -444,7 +444,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
} }
theapprox.Perform(multL); theapprox.Perform(multL);
theapprox.Error(mytol3d,mytol2d); theapprox.Error(mytol3d,mytol2d);
#ifdef DEB #ifdef APPBLEND_DEB
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -506,7 +506,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
mytol3d = Variation.MaxError(); mytol3d = Variation.MaxError();
mytol2d = 0.; mytol2d = 0.;
#ifdef DEB #ifdef APPBLEND_DEB
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -826,7 +826,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 DEB #ifdef APPBLEND_DEB
cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl;
cout << " --> 2d : "<< mytol2d << endl; cout << " --> 2d : "<< mytol2d << endl;
#endif #endif
@ -851,7 +851,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 DEB #ifdef APPBLEND_DEB
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/Approx/Approx_CurvilinearParameter.cxx
View File

@ -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 DEB #ifdef APPROX_DEB
cout << "TolV = " << TolV << endl; cout << "TolV = " << TolV << endl;
cout << "TolW = " << TolW << endl; cout << "TolW = " << TolW << endl;
#endif #endif

10
src/Approx/Approx_SameParameter.cxx
View File

@ -563,7 +563,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
if(!projok) if(!projok)
{ {
//Projector //Projector
#ifdef DEB #ifdef APPROX_DEB
// 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 DEB #ifdef APPROX_DEB
cout<<"SameParameter problem : zero tangent to extremities"<<endl; cout<<"SameParameter problem : zero tangent to extremities"<<endl;
#endif #endif
return; return;
@ -739,7 +739,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
} }
} }
else { else {
#ifdef DEB #ifdef APPROX_DEB
// 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 DEB #ifdef APPROX_DEB
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;
@ -869,7 +869,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
} }
} }
else { else {
#ifdef DEB #ifdef APPROX_DEB
// JAG // JAG
cout << "Projection not done" << endl; cout << "Projection not done" << endl;
#endif #endif

2
src/BRepAlgo/BRepAlgo_BooleanOperation.cxx
View File

@ -154,7 +154,7 @@ extern void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx
} }
} }
myBuilderCanWork = (esp || tede) ; myBuilderCanWork = (esp || tede) ;
#ifdef DEB #ifdef BREPALGO_DEB
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;

2
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 DEB #if BREPALGO_DEB
cout << "Warning DSAccess: Modifications of Edge are not implemented" << endl; cout << "Warning DSAccess: Modifications of Edge are not implemented" << endl;
#endif #endif
} }

12
src/BRepAlgo/BRepAlgo_NormalProjection.cxx
View File

@ -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 DEBUG #ifdef BREPALGO_DEB
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 DEBUG #ifdef BREPALGO_DEB
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 DEBUG #ifdef BREPALGO_DEB
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
@ -438,7 +438,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
} }
} }
if (Degenerated) { if (Degenerated) {
#ifdef DEBUG #ifdef BREPALGO_DEB
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
@ -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 DEBUG #ifdef BREPALGO_DEB
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 DEB #ifdef BREPALGO_DEB
cout << " BooleanOperations : no solution " << endl; cout << " BooleanOperations : no solution " << endl;
#endif #endif

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 DEB #ifdef BREPALGO_DEB
cout << "No subhape in shape!" << endl; cout << "No subhape in shape!" << endl;
#endif #endif
SS = TopoDS_Shape(); SS = TopoDS_Shape();

4
src/BRepBlend/BRepBlend_AppFuncRoot.cxx
View File

@ -328,7 +328,7 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func,
rsnld.Perform(Func, XInit, X1, X2); rsnld.Perform(Func, XInit, X1, X2);
if (!rsnld.IsDone()) { if (!rsnld.IsDone()) {
# ifdef DEB # ifdef BREPBLEND_DEB
cout << "AppFunc : RNLD Not done en t = " << Param << endl; cout << "AppFunc : RNLD Not done en t = " << Param << endl;
# endif # endif
return Standard_False; return Standard_False;
@ -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 DEB #ifdef BREPBLEND_DEB
cout << "Evaluation in t = " << Param << "given" << endl; cout << "Evaluation in t = " << Param << "given" << endl;
rsnld.Dump(cout); rsnld.Dump(cout);
#endif #endif

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 DEB #if BREPBLEND_DEB
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 DEB #if BREPBLEND_DEB
cout << " SurfRstEvolRad : Surface single " << endl; cout << " SurfRstEvolRad : Surface single " << endl;
#endif #endif
} }

14
src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
View File

@ -704,7 +704,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
} }
else{ else{
// Failed reframing. Leave with PointsConfondus // Failed reframing. Leave with PointsConfondus
#if DEB #if BREPBLEND_DEB
cout<<"SurfRstLineBuilder : failed reframing"<<endl; cout<<"SurfRstLineBuilder : failed reframing"<<endl;
#endif #endif
State = Blend_SamePoints; State = Blend_SamePoints;
@ -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 DEB #if BREPBLEND_DEB
cout<<"SurfRstLineBuilder : No advancement in the processing"<<endl; cout<<"SurfRstLineBuilder : No advancement in the processing"<<endl;
#endif #endif
} }
@ -865,7 +865,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
case Blend_SamePoints : case Blend_SamePoints :
{ {
// Stop // Stop
#if DEB #if BREPBLEND_DEB
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 DEB #if BREPBLEND_DEB
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 DEB #if BREPBLEND_DEB
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 DEB #if BREPBLEND_DEB
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 DEB #if BREPBLEND_DEB
cout << "SurfRstLineBuilder :RSNLD not done "<< endl; cout << "SurfRstLineBuilder :RSNLD not done "<< endl;
#endif #endif
return Standard_False; return Standard_False;

26
src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
View File

@ -1775,7 +1775,7 @@ void BRepBuilderAPI_Sewing::Add(const TopoDS_Shape& aShape)
//purpose : //purpose :
//======================================================================= //=======================================================================
#ifdef DEB #ifdef BREPBUILDERAPI_DEB
#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 DEB #ifdef BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
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 DEB #if BREPBUILDERAPI_DEB
chr_total.Stop(); chr_total.Stop();
chr_total.Show(t_total); chr_total.Show(t_total);
cout << "Sewing finished!" << endl; cout << "Sewing finished!" << endl;

12
src/BRepCheck/BRepCheck_Analyzer.cxx
View File

@ -169,7 +169,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
} }
catch(Standard_Failure) catch(Standard_Failure)
{ {
#ifdef DEB #ifdef BREPCHECK_DEB
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 DEB #ifdef BREPCHECK_DEB
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 DEB #ifdef BREPCHECK_DEB
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 DEB #ifdef BREPCHECK_DEB
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 DEB #ifdef BREPCHECK_DEB
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 DEB #ifdef BREPCHECK_DEB
cout<<"BRepCheck_Analyzer : "; cout<<"BRepCheck_Analyzer : ";
Standard_Failure::Caught()->Print(cout); Standard_Failure::Caught()->Print(cout);
cout<<endl; cout<<endl;

2
src/BRepCheck/BRepCheck_Wire.cxx
View File

@ -1320,7 +1320,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
localok = Standard_False; localok = Standard_False;
} }
} }
#ifdef DEB #ifdef BREPCHECK_DEB
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);

2
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 DEB #ifdef BREPCLASS3D_DEB
cout<<"*Problem ds BRepClass3d_SClassifier.cxx"<<endl; cout<<"*Problem ds BRepClass3d_SClassifier.cxx"<<endl;
#endif #endif
continue; // ignore this point continue; // ignore this point

4
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 DEB #if BREPCLASS3D_DEB
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 DEB #if BREPCLASS3D_DEB
if(myReject) { if(myReject) {
cout<<"\nWARNING : BRepClass3d_SolidExplorer.cxx (Solid without face)"<<endl; cout<<"\nWARNING : BRepClass3d_SolidExplorer.cxx (Solid without face)"<<endl;
} }

2
src/BRepFeat/BRepFeat_MakeDPrism.cxx
View File

@ -1191,7 +1191,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase, // shape initial
//#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 DEB #ifdef BREPFEAT_DEB
cout << "Height = > " << par << endl; cout << "Height = > " << par << endl;
#endif #endif
return par; return par;

21
src/BRepFeat/BRepFeat_MakeLinearForm.cxx
View File

@ -399,8 +399,11 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef DEB
if (trc)
{
cout << "Not computable" << endl; cout << "Not computable" << endl;
if (trc) cout << "Face profile not computable" << endl; cout << "Face profile not computable" << endl;
}
#endif #endif
myStatusError = BRepFeat_NoFaceProf; myStatusError = BRepFeat_NoFaceProf;
NotDone(); NotDone();
@ -414,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 DEB #ifdef BREPFEAT_DEB
cout << "Verify plane and wire orientation" << endl; cout << "Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -733,8 +736,11 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef DEB
if (trc)
{
cout << "Not computable" << endl; cout << "Not computable" << endl;
if (trc) cout << " Face profile not computable" << endl; cout << " Face profile not computable" << endl;
}
#endif #endif
myStatusError = BRepFeat_NoFaceProf; myStatusError = BRepFeat_NoFaceProf;
NotDone(); NotDone();
@ -748,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 DEB #ifdef BREPFEAT_DEB
cout << "Verify plane and wire orientation" << endl; cout << "Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -894,8 +900,11 @@ void BRepFeat_MakeLinearForm::Perform()
if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) { if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) {
#ifdef DEB #ifdef DEB
if (trc)
{
cout << "The case is not computable" << endl; cout << "The case is not computable" << endl;
if (trc) cout << " Glued faces not empty and Until shape not null" << endl; cout << " Glued faces not empty and Until shape not null" << endl;
}
#endif #endif
myStatusError = BRepFeat_InvShape; myStatusError = BRepFeat_InvShape;
NotDone(); NotDone();
@ -1218,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 DEB #ifdef BREPFEAT_DEB
cout << "Pb SetGluedFace" << endl; cout << "Pb SetGluedFace" << endl;
#endif #endif
} }

23
src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
View File

@ -526,8 +526,11 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef DEB
if (trc)
{
cout << "Not computable" << endl; cout << "Not computable" << endl;
if (trc) cout << "Face profile not computable" << endl; cout << "Face profile not computable" << endl;
}
#endif #endif
myStatusError = BRepFeat_NoFaceProf; myStatusError = BRepFeat_NoFaceProf;
NotDone(); NotDone();
@ -541,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 DEB #ifdef BREPFEAT_DEB
cout << " Verify plane and wire orientation" << endl; cout << " Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -939,7 +942,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
if(!BRepAlgo::IsValid(NewBndFace)) { if(!BRepAlgo::IsValid(NewBndFace)) {
#ifdef DEB #ifdef BREPFEAT_DEB
cout << "Invalid new bounding face" << endl; cout << "Invalid new bounding face" << endl;
#endif #endif
myStatusError = BRepFeat_InvShape; myStatusError = BRepFeat_InvShape;
@ -959,8 +962,11 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
if (!ProfileOK) { if (!ProfileOK) {
#ifdef DEB #ifdef DEB
if (trc)
{
cout << "Not computable" << endl; cout << "Not computable" << endl;
if (trc) cout << " Face profile not computable" << endl; cout << " Face profile not computable" << endl;
}
#endif #endif
myStatusError = BRepFeat_NoFaceProf; myStatusError = BRepFeat_NoFaceProf;
NotDone(); NotDone();
@ -974,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 DEB #ifdef BREPFEAT_DEB
cout << " Verify plane and wire orientation" << endl; cout << " Verify plane and wire orientation" << endl;
#endif #endif
myStatusError = BRepFeat_FalseSide; myStatusError = BRepFeat_FalseSide;
@ -1279,8 +1285,11 @@ void BRepFeat_MakeRevolutionForm::Perform()
if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) { if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) {
#ifdef DEB #ifdef DEB
if (trc)
{
cout << "The case is not computable" << endl; cout << "The case is not computable" << endl;
if (trc) cout << " Glued faces not empty and Until shape not null" << endl; cout << " Glued faces not empty and Until shape not null" << endl;
}
#endif #endif
myStatusError = BRepFeat_InvShape; myStatusError = BRepFeat_InvShape;
NotDone(); NotDone();
@ -1760,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 DEB #ifdef BREPFEAT_DEB
cout << "Pb SetGluedFace" << endl; cout << "Pb SetGluedFace" << endl;
#endif #endif
} }

4
src/BRepFeat/BRepFeat_RibSlot.cxx
View File

@ -195,7 +195,7 @@ void BRepFeat_RibSlot::LFPerform()
(!myFuse && ope != LocOpe_CUT) || (!myFuse && ope != LocOpe_CUT) ||
(!Collage)) { (!Collage)) {
theOpe = 2; theOpe = 2;
#ifdef DEB #ifdef BREPFEAT_DEB
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 DEB #ifdef BREPFEAT_DEB
cout << "Passage to topologic operation" << endl; cout << "Passage to topologic operation" << endl;
#endif #endif
} }

2
src/BRepFill/BRepFill.cxx
View File

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

6
src/BRepFill/BRepFill_Draft.cxx
View File

@ -269,14 +269,14 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
myWire = MW.Wire(); myWire = MW.Wire();
} }
else { else {
#if DEB #if BREPFILL_DEB
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 DEB #if BREPFILL_DEB
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 DEB #if BREPFILL_DEB
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 DEB #if BREPFILL_DEB
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 DEB #if BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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

2
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@ -662,9 +662,11 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset,
{ {
myShape.Nullify(); myShape.Nullify();
myIsDone = Standard_False; myIsDone = Standard_False;
#ifdef BREPFILL_DEB
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;
#endif
return; return;
} }

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 DEB #if BREPFILL_DEB
if (!Bof) if (!Bof)
cout << "BRepFill_ShapeLaw::ConcatenedLaw INCOMPLET !!!" cout << "BRepFill_ShapeLaw::ConcatenedLaw INCOMPLET !!!"
<< endl; << endl;

12
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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
@ -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 DEB #if BREPFILL_DEB
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 DEB #if BREPFILL_DEB
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 DEB #if BREPFILL_DEB
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 DEB #if BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
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 DEB #ifdef BREPFILL_DEB
cout <<" Mauvaisesolution dans BRepFill_TrimEdgeTool::AddOrConfuse"<<endl; cout <<" Mauvaisesolution dans BRepFill_TrimEdgeTool::AddOrConfuse"<<endl;
#endif #endif
return; return;

9
src/BRepFill/BRepFill_TrimSurfaceTool.cxx
View File

@ -273,7 +273,7 @@ static void EvalParameters(const TopoDS_Edge& Edge,
NbSegments = Intersector.NbSegments(); NbSegments = Intersector.NbSegments();
if (NbSegments > 0) { if (NbSegments > 0) {
#ifdef DEB #ifdef BREPFILL_DEB
cout << " IntersectWith : " << NbSegments cout << " IntersectWith : " << NbSegments
<< " Segments of intersection" << endl; << " Segments of intersection" << endl;
#endif #endif
@ -468,11 +468,8 @@ 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 DEB #ifdef BREPFILL_DEB
Standard_Real Dist = Standard_Real Dist = Projector.LowerDistance();
#endif
Projector.LowerDistance();
#ifdef DEB
if ( Dist > Precision::Confusion() ) { if ( Dist > Precision::Confusion() ) {
cout << " *** WARNING TrimSurfaceTool: *** " << endl; cout << " *** WARNING TrimSurfaceTool: *** " << endl;
cout << " --> the point is not on the edge" <<endl; cout << " --> the point is not on the edge" <<endl;

33
src/BRepLib/BRepLib_FuseEdges.cxx
View File

@ -377,10 +377,6 @@ void BRepLib_FuseEdges::BuildListEdges()
//Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE(); //Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
//#endif //#endif
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : BuildListEdges "<<endl;
//#endif
//-------------------------------------------------------- //--------------------------------------------------------
// Step One : Build the map ancestors // Step One : Build the map ancestors
//-------------------------------------------------------- //--------------------------------------------------------
@ -431,10 +427,6 @@ void BRepLib_FuseEdges::BuildListResultEdges()
//Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE(); //Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
//#endif //#endif
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : BuildListResultEdges "<<endl;
//#endif
// if we have edges to fuse // if we have edges to fuse
if (myMapLstEdg.Extent() > 0) { if (myMapLstEdg.Extent() > 0) {
TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape itLstEdg; TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape itLstEdg;
@ -493,10 +485,6 @@ void BRepLib_FuseEdges::BuildListResultEdges()
} }
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : Creating New Edge "<<endl;
//#endif
BRepLib_MakeEdge ME; BRepLib_MakeEdge ME;
Standard_Boolean isBSpline = C->DynamicType() == STANDARD_TYPE(Geom_BSplineCurve); Standard_Boolean isBSpline = C->DynamicType() == STANDARD_TYPE(Geom_BSplineCurve);
@ -530,9 +518,6 @@ void BRepLib_FuseEdges::BuildListResultEdges()
// the curve which is not infinite and limited to old vertices // the curve which is not infinite and limited to old vertices
// we try to use ExtendCurveToPoint, then rebuild the NewEdge // we try to use ExtendCurveToPoint, then rebuild the NewEdge
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : MakeEdge failed. Trying to Extend Curve "<<endl;
//#endif
Handle(Geom_BoundedCurve) ExtC = Handle(Geom_BoundedCurve)::DownCast(C->Copy()); Handle(Geom_BoundedCurve) ExtC = Handle(Geom_BoundedCurve)::DownCast(C->Copy());
if (!ExtC.IsNull()) { if (!ExtC.IsNull()) {
gp_Pnt PF = BRep_Tool::Pnt(VF); gp_Pnt PF = BRep_Tool::Pnt(VF);
@ -550,9 +535,6 @@ void BRepLib_FuseEdges::BuildListResultEdges()
NewEdge = ME.Edge(); NewEdge = ME.Edge();
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : Updating pcurve "<<endl;
//#endif
if (UpdatePCurve(OldEdge,NewEdge,LmapEdg)) if (UpdatePCurve(OldEdge,NewEdge,LmapEdg))
myMapEdg.Bind(iLst,NewEdge); myMapEdg.Bind(iLst,NewEdge);
} }
@ -578,10 +560,6 @@ void BRepLib_FuseEdges::Perform()
BuildListResultEdges(); BuildListResultEdges();
} }
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : Perform "<<endl;
//#endif
// if we have fused edges // if we have fused edges
if (myMapEdg.Extent() > 0) { if (myMapEdg.Extent() > 0) {
TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape itLstEdg; TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape itLstEdg;
@ -613,10 +591,6 @@ void BRepLib_FuseEdges::Perform()
} }
} }
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : Building New Shape "<<endl;
//#endif
// perform the effective substitution // perform the effective substitution
Bsub.Build(myShape); Bsub.Build(myShape);
@ -634,11 +608,6 @@ void BRepLib_FuseEdges::Perform()
myShape=(Bsub.Copy(myShape)).First(); myShape=(Bsub.Copy(myShape)).First();
} }
//#ifdef DEB
//if (tFE) cout<<endl<<"FuseEdges : "<< NbVertices() <<" vertices removed"<<endl;
//#endif
} }
@ -841,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 DEB #ifdef BREPLIB_DEB
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 DEB #if BREPLIB_DEB
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 DEB #if BREPLIB_DEB
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 DEB #if BREPLIB_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
else else
cout<<"ProjectPointOnCurve not done"<<endl; cout<<"ProjectPointOnCurve not done"<<endl;
#endif #endif

4
src/BRepOffset/BRepOffset_MakeOffset.cxx
View File

@ -796,14 +796,14 @@ void BRepOffset_MakeOffset::MakeThickSolid()
YaResult = 1; YaResult = 1;
Glue.Add (exp.Current().Reversed()); Glue.Add (exp.Current().Reversed());
} }
#ifdef DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
else else
{ {
cout << "OffsetShape is null!" << endl; cout << "OffsetShape is null!" << endl;

4
src/BRepOffset/BRepOffset_Offset.cxx
View File

@ -1140,7 +1140,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 DEB #ifdef BREPOFFSET_DEB
// 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;
@ -1204,7 +1204,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 DEB #ifdef BREPOFFSET_DEB
// 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;

8
src/BRepOffset/BRepOffset_Tool.cxx
View File

@ -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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
cout<<"After projection tol of E = "<<BRep_Tool::Tolerance(anEdge)<<endl; cout<<"After projection tol of E = "<<BRep_Tool::Tolerance(anEdge)<<endl;
#endif #endif
} }
@ -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 DEB #ifdef BREPOFFSET_DEB
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 DEB #ifdef BREPOFFSET_DEB
if (!YaSol) { if (!YaSol) {
cout <<"Inter2d : Pas de solution"<<endl; cout <<"Inter2d : Pas de solution"<<endl;
#ifdef DRAW #ifdef DRAW

2
src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx
View File

@ -335,9 +335,11 @@ void BRepOffsetAPI_MakeOffset::Perform(const Standard_Real Offset,
} }
catch(...) //Every exception was caught. catch(...) //Every exception was caught.
{ {
#ifdef BREPOFFSETAPI_DEB
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;
#endif
NotDone(); NotDone();
myShape.Nullify(); myShape.Nullify();
} }

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 DEB #ifdef BREPTOOLS_DEB
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;

4
src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
View File

@ -339,7 +339,7 @@ BRepTopAdaptor_FClass2d::BRepTopAdaptor_FClass2d(const TopoDS_Face& aFace,const
}//if(nbpoints>3 }//if(nbpoints>3
else else
{ {
#ifdef DEB #ifdef BREPTOPADAPTOR_DEB
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,9 @@ 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
cerr<<"Copy not allowed in BRepTopAdaptor_FClass2d"<<endl; cerr<<"Copy not allowed in BRepTopAdaptor_FClass2d"<<endl;
#endif
Standard_ConstructionError::Raise(); Standard_ConstructionError::Raise();
return(*this); return(*this);
} }

4
src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx
View File

@ -70,7 +70,9 @@ Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool() {
return(myTopolTool); return(myTopolTool);
} }
else { else {
#ifdef BREPTOPADAPTOR_DEB
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
return(myTopolTool); return(myTopolTool);
} }
} }
@ -80,7 +82,9 @@ Handle(Adaptor3d_HSurface) BRepTopAdaptor_Tool::GetSurface() {
return(myHSurface); return(myHSurface);
} }
else { else {
#ifdef BREPTOPADAPTOR_DEB
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
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 DEB #if BSPLCLIB_DEB
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;
} }

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 DEB #if BITGTE_DEB
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 DEB #if BITGTE_DEB
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 DEB #if BITGTE_DEB
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 DEB #if BITGTE_DEB
ChFi3d_InitChron(ch); ChFi3d_InitChron(ch);
#endif #endif
ComputeCenters(); ComputeCenters();
#if DEB #if BITGTE_DEB
ChFi3d_ResultChron(ch, t_center); ChFi3d_ResultChron(ch, t_center);
#endif #endif
// ----------------------------- // -----------------------------
// Calculate connection Surfaces // Calculate connection Surfaces
// ----------------------------- // -----------------------------
#if DEB #if BITGTE_DEB
ChFi3d_InitChron(ch); ChFi3d_InitChron(ch);
#endif #endif
ComputeSurfaces(); ComputeSurfaces();
#if DEB #if BITGTE_DEB
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 DEB #if BITGTE_DEB
ChFi3d_InitChron(ch); ChFi3d_InitChron(ch);
#endif #endif
if ( myBuildShape) ComputeShape(); if ( myBuildShape) ComputeShape();
#if DEB #if BITGTE_DEB
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 DEB #ifdef BITGTE_DEB
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 DEB #ifdef BITGTE_DEB
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 DEB #ifdef BITGTE_DEB
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 DEB #ifdef BITGTE_DEB
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 DEB #ifdef BITGTE_DEB
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 DEB #ifdef BITGTE_DEB
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,9 @@ Handle(Standard_Transient) BinDrivers::Factory(const Standard_GUID& theGUID)
{ {
if (theGUID == BinStorageDriver) if (theGUID == BinStorageDriver)
{ {
#ifdef BINDRIVERS_DEB
cout << "BinDrivers : Storage Plugin" << endl; cout << "BinDrivers : Storage Plugin" << endl;
#endif
static Handle(BinDrivers_DocumentStorageDriver) model_sd = static Handle(BinDrivers_DocumentStorageDriver) model_sd =
new BinDrivers_DocumentStorageDriver; new BinDrivers_DocumentStorageDriver;
return model_sd; return model_sd;
@ -46,7 +48,9 @@ Handle(Standard_Transient) BinDrivers::Factory(const Standard_GUID& theGUID)
if (theGUID == BinRetrievalDriver) if (theGUID == BinRetrievalDriver)
{ {
#ifdef BINDRIVERS_DEB
cout << "BinDrivers : Retrieval Plugin" << endl; cout << "BinDrivers : Retrieval Plugin" << endl;
#endif
static Handle(BinDrivers_DocumentRetrievalDriver) model_rd = static Handle(BinDrivers_DocumentRetrievalDriver) model_rd =
new BinDrivers_DocumentRetrievalDriver; new BinDrivers_DocumentRetrievalDriver;
return model_rd; return model_rd;

4
src/BinLDrivers/BinLDrivers.cxx
View File

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

4
src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
View File

@ -111,7 +111,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 DEB #ifdef BINLDRIVERS_DEB
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
@ -437,7 +437,7 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection
#endif #endif
SetIsError(Standard_True); SetIsError(Standard_True);
} }
#ifdef DEB #ifdef BINLDRIVERS_DEB
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

10
src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx
View File

@ -45,9 +45,6 @@ Standard_Boolean BinMDataStd_ByteArrayDriver::Paste(const BinObjMgt_Persistent&
const Handle(TDF_Attribute)& theTarget, const Handle(TDF_Attribute)& theTarget,
BinObjMgt_RRelocationTable& ) const BinObjMgt_RRelocationTable& ) const
{ {
#ifdef DEB
// cout << "ByteArrayDriver::Retrieve: " << TypeName() << endl;
#endif
Standard_Integer aFirstInd, aLastInd; Standard_Integer aFirstInd, aLastInd;
if (! (theSource >> aFirstInd >> aLastInd)) if (! (theSource >> aFirstInd >> aLastInd))
return Standard_False; return Standard_False;
@ -64,9 +61,7 @@ Standard_Boolean BinMDataStd_ByteArrayDriver::Paste(const BinObjMgt_Persistent&
bytes->SetValue(i, aTargetArray.Value(i)); bytes->SetValue(i, aTargetArray.Value(i));
} }
anAtt->ChangeArray(bytes); anAtt->ChangeArray(bytes);
#ifdef DEB
//cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() <<endl;
#endif
Standard_Boolean aDelta(Standard_False); Standard_Boolean aDelta(Standard_False);
if(BinMDataStd::DocumentVersion() > 2) { if(BinMDataStd::DocumentVersion() > 2) {
Standard_Byte aDeltaValue; Standard_Byte aDeltaValue;
@ -87,9 +82,6 @@ void BinMDataStd_ByteArrayDriver::Paste(const Handle(TDF_Attribute)& theSource,
BinObjMgt_Persistent& theTarget, BinObjMgt_Persistent& theTarget,
BinObjMgt_SRelocationTable& ) const BinObjMgt_SRelocationTable& ) const
{ {
#ifdef DEB
// cout << "ByteArrayDriver::Store: " << TypeName() << endl;
#endif
Handle(TDataStd_ByteArray) anAtt = Handle(TDataStd_ByteArray)::DownCast(theSource); Handle(TDataStd_ByteArray) anAtt = Handle(TDataStd_ByteArray)::DownCast(theSource);
const Standard_Integer aFirstInd = anAtt->Lower(); const Standard_Integer aFirstInd = anAtt->Lower();
const Standard_Integer aLastInd = anAtt->Upper(); const Standard_Integer aLastInd = anAtt->Upper();

6
src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx
View File

@ -74,16 +74,10 @@ Standard_Boolean BinMDataStd_ExtStringArrayDriver::Paste
} }
if(ok) { if(ok) {
//#ifdef DEB
// cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() <<endl;
//#endif
Standard_Boolean aDelta(Standard_False); Standard_Boolean aDelta(Standard_False);
if(BinMDataStd::DocumentVersion() > 2) { if(BinMDataStd::DocumentVersion() > 2) {
Standard_Byte aDeltaValue; Standard_Byte aDeltaValue;
if (! (theSource >> aDeltaValue)) { if (! (theSource >> aDeltaValue)) {
//#ifdef DEB
// cout <<"DeltaValue = " << (Standard_Integer)aDeltaValue <<endl;
//#endif
return Standard_False; return Standard_False;
} }
else else

4
src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx
View File

@ -81,9 +81,7 @@ Standard_Boolean BinMDataStd_IntPackedMapDriver::Paste
} }
aTagAtt->ChangeMap(aHMap); aTagAtt->ChangeMap(aHMap);
} }
#ifdef DEB
//cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() <<endl;
#endif
Standard_Boolean aDelta(Standard_False); Standard_Boolean aDelta(Standard_False);
if(BinMDataStd::DocumentVersion() > 2) { if(BinMDataStd::DocumentVersion() > 2) {
Standard_Byte aDeltaValue; Standard_Byte aDeltaValue;

5
src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
View File

@ -63,9 +63,6 @@ Standard_Boolean BinMDataStd_IntegerArrayDriver::Paste
if(!theSource.GetIntArray (&aTargetArray(aFirstInd), aLength)) if(!theSource.GetIntArray (&aTargetArray(aFirstInd), aLength))
return Standard_False; return Standard_False;
Standard_Boolean aDelta(Standard_False); Standard_Boolean aDelta(Standard_False);
#ifdef DEB
//cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() <<endl;
#endif
if(BinMDataStd::DocumentVersion() > 2) { if(BinMDataStd::DocumentVersion() > 2) {
Standard_Byte aDeltaValue; Standard_Byte aDeltaValue;
if (! (theSource >> aDeltaValue)) if (! (theSource >> aDeltaValue))
@ -73,7 +70,7 @@ Standard_Boolean BinMDataStd_IntegerArrayDriver::Paste
else else
aDelta = (Standard_Boolean)aDeltaValue; aDelta = (Standard_Boolean)aDeltaValue;
} }
#ifdef DEB #ifdef BINMDATASTD_DEB
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

4
src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx
View File

@ -62,9 +62,7 @@ Standard_Boolean BinMDataStd_RealArrayDriver::Paste
TColStd_Array1OfReal& aTargetArray = anAtt->Array()->ChangeArray1(); TColStd_Array1OfReal& aTargetArray = anAtt->Array()->ChangeArray1();
if(!theSource.GetRealArray (&aTargetArray(aFirstInd), aLength)) if(!theSource.GetRealArray (&aTargetArray(aFirstInd), aLength))
return Standard_False; return Standard_False;
#ifdef DEB
//cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() <<endl;
#endif
Standard_Boolean aDelta(Standard_False); Standard_Boolean aDelta(Standard_False);
if(BinMDataStd::DocumentVersion() > 2) { if(BinMDataStd::DocumentVersion() > 2) {
Standard_Byte aDeltaValue; Standard_Byte aDeltaValue;

9
src/BinMNaming/BinMNaming_NamingDriver.cxx
View File

@ -235,14 +235,11 @@ Standard_Boolean BinMNaming_NamingDriver::Paste
WriteMessage (aMsg); WriteMessage (aMsg);
} }
#ifdef DEB
//cout << "CurDocVersion = " << BinMNaming::DocumentVersion() <<endl;
#endif
if(BinMNaming::DocumentVersion() > 3) { if(BinMNaming::DocumentVersion() > 3) {
TCollection_AsciiString entry; TCollection_AsciiString entry;
ok = theSource >> entry; ok = theSource >> entry;
if(ok) { if(ok) {
#ifdef DEB #ifdef BINMNAMING_DEB
cout << "NamingDriver:: Retrieved Context Label = " << entry << " Ok = " << theSource.IsOK() <<endl; cout << "NamingDriver:: Retrieved Context Label = " << entry << " Ok = " << theSource.IsOK() <<endl;
#endif #endif
@ -280,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 DEB #ifdef BINMNAMING_DEB
cout << "NamingDriver:: Retrieved Orientation = " << OrientationToApply << " Ok = " << theSource.IsOK() <<endl; cout << "NamingDriver:: Retrieved Orientation = " << OrientationToApply << " Ok = " << theSource.IsOK() <<endl;
#endif #endif
} else { } else {
@ -290,7 +287,7 @@ Standard_Boolean BinMNaming_NamingDriver::Paste
} }
} }
} }
#ifdef DEB #ifdef BINMNAMING_DEB
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 DEB #ifdef BINMXCAFDOC_DEB
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,9 @@ Handle(Standard_Transient) BinTObjDrivers::Factory(const Standard_GUID& aGUID)
{ {
if(aGUID == BinStorageDriver) if(aGUID == BinStorageDriver)
{ {
#ifdef BINTOBJDRIVERS_DEB
cout << "BinTObjDrivers : Storage Plugin" << endl; cout << "BinTObjDrivers : Storage Plugin" << endl;
#endif
static Handle(BinTObjDrivers_DocumentStorageDriver) model_sd static Handle(BinTObjDrivers_DocumentStorageDriver) model_sd
= new BinTObjDrivers_DocumentStorageDriver; = new BinTObjDrivers_DocumentStorageDriver;
return model_sd; return model_sd;
@ -42,7 +44,9 @@ Handle(Standard_Transient) BinTObjDrivers::Factory(const Standard_GUID& aGUID)
if(aGUID == BinRetrievalDriver) if(aGUID == BinRetrievalDriver)
{ {
#ifdef BINTOBJDRIVERS_DEB
cout << "BinTObjDrivers : Retrieval Plugin" << endl; cout << "BinTObjDrivers : Retrieval Plugin" << endl;
#endif
static Handle (BinTObjDrivers_DocumentRetrievalDriver) model_rd static Handle (BinTObjDrivers_DocumentRetrievalDriver) model_rd
= new BinTObjDrivers_DocumentRetrievalDriver; = new BinTObjDrivers_DocumentRetrievalDriver;
return model_rd; return model_rd;

7
src/BinTools/BinTools_Curve2dSet.cxx
View File

@ -699,15 +699,12 @@ Standard_IStream& BinTools_Curve2dSet::ReadCurve2d(Standard_IStream& IS,
void BinTools_Curve2dSet::Read(Standard_IStream& IS) void BinTools_Curve2dSet::Read(Standard_IStream& IS)
{ {
char buffer[255]; char buffer[255];
#ifdef DEB
// const Standard_Integer aPos = IS.tellg();
// cout << "\tPosition of Curves2d section = " << aPos << endl;
#endif
IS >> buffer; IS >> buffer;
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 DEB #ifdef BINTOOLS_DEB
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 DEB #ifdef BINTOOLS_DEB
cout <<"CurveSet buffer: " << buffer << endl; cout <<"CurveSet buffer: " << buffer << endl;
#endif #endif
Standard_Failure::Raise(aMsg); Standard_Failure::Raise(aMsg);

13
src/BinTools/BinTools_ShapeSet.cxx
View File

@ -1241,22 +1241,11 @@ void BinTools_ShapeSet::ReadPolygonOnTriangulation(Standard_IStream& IS)
Handle(Poly_PolygonOnTriangulation) Poly; Handle(Poly_PolygonOnTriangulation) Poly;
IS >> nbpol; IS >> nbpol;
IS.get();//remove LF IS.get();//remove LF
#ifdef DEB
// cout << "ReadPolygonOnTriangulation: NbPoles = "<< nbpol<< endl;
#endif
try { try {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
for (i=1; i<=nbpol; i++) { for (i=1; i<=nbpol; i++) {
#ifdef DEB
// streampos pos = IS.tellg();
// cout << "ReadPolygonOnTriangulation: Pos = "<< pos << endl;
#endif
BinTools::GetInteger(IS, nbnodes); BinTools::GetInteger(IS, nbnodes);
#ifdef DEB
// cout << "ReadPolygonOnTriangulation: PoleIndx = "<< i << " NbOfNodes = "<< nbnodes <<endl;
#endif
TColStd_Array1OfInteger Nodes(1, nbnodes); TColStd_Array1OfInteger Nodes(1, nbnodes);
for (j = 1; j <= nbnodes; j++) { for (j = 1; j <= nbnodes; j++) {
BinTools::GetInteger(IS, val); BinTools::GetInteger(IS, val);
@ -1348,7 +1337,7 @@ void BinTools_ShapeSet::ReadPolygon3D(Standard_IStream& IS)
if (IS.fail() || strstr(buffer,"Polygon3D") == NULL) { if (IS.fail() || strstr(buffer,"Polygon3D") == NULL) {
aMsg << "BinTools_ShapeSet::ReadPolygon3D: Not a Polygon3D section" <<endl; aMsg << "BinTools_ShapeSet::ReadPolygon3D: Not a Polygon3D section" <<endl;
#ifdef DEB #ifdef BINTOOLS_DEB
cout <<"Buffer: " << buffer << endl; cout <<"Buffer: " << buffer << endl;
#endif #endif
Standard_Failure::Raise(aMsg); Standard_Failure::Raise(aMsg);

18
src/BinTools/BinTools_SurfaceSet.cxx
View File

@ -276,29 +276,16 @@ static Standard_OStream& operator <<(Standard_OStream& OS, const Handle(Geom_Bez
Standard_Integer i,j,udegree,vdegree; Standard_Integer i,j,udegree,vdegree;
udegree = S->UDegree(); udegree = S->UDegree();
vdegree = S->VDegree(); vdegree = S->VDegree();
#ifdef DEB
// cout << "\tudegree = " << udegree << ", vdegree = "<< vdegree<<endl;
#endif
BinTools::PutExtChar(OS, (Standard_ExtCharacter)udegree); BinTools::PutExtChar(OS, (Standard_ExtCharacter)udegree);
BinTools::PutExtChar(OS, (Standard_ExtCharacter)vdegree); BinTools::PutExtChar(OS, (Standard_ExtCharacter)vdegree);
for (i = 1; i <= udegree+1; i++) { for (i = 1; i <= udegree+1; i++) {
for (j = 1; j <= vdegree+1; j++) { for (j = 1; j <= vdegree+1; j++) {
OS << S->Pole(i,j); //Pnt OS << S->Pole(i,j); //Pnt
#ifdef DEB
// cout << "Bezier Surface: Pole Pnt: X = " << S->Pole(i,j).X()<< " Y = " << S->Pole(i,j).Y()<<" Z = " << S->Pole(i,j).Z()<<endl;
#endif
if (urational || vrational) { if (urational || vrational) {
BinTools::PutReal(OS, S->Weight(i,j));//Real BinTools::PutReal(OS, S->Weight(i,j));//Real
#ifdef DEB
// cout << "Bezier Surface: Put Real" << endl;
#endif
} }
} }
} }
#ifdef DEB
// const Standard_Integer aPos = OS.tellp();
// cout << "\tEnd of Bezier surface pos = " << aPos << endl;
#endif
return OS; return OS;
} }
@ -776,9 +763,6 @@ Standard_IStream& BinTools_SurfaceSet::ReadSurface(Standard_IStream& IS,
try { try {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
const Standard_Byte stype = (Standard_Byte) IS.get(); const Standard_Byte stype = (Standard_Byte) IS.get();
#ifdef DEB
// cout << "ReadSurface: Surface type = " << (Standard_Integer)stype <<endl;
#endif
switch (stype) { switch (stype) {
case PLANE : case PLANE :
@ -900,7 +884,7 @@ void BinTools_SurfaceSet::Read(Standard_IStream& IS)
if (IS.fail() || strcmp(buffer,"Surfaces")) { if (IS.fail() || strcmp(buffer,"Surfaces")) {
Standard_SStream aMsg; Standard_SStream aMsg;
aMsg << "BinTools_SurfaceSet::Read: Not a surface table"<<endl; aMsg << "BinTools_SurfaceSet::Read: Not a surface table"<<endl;
#ifdef DEB #ifdef BINTOOLS_DEB
cout <<"SurfaceSet buffer: " << buffer << endl; cout <<"SurfaceSet buffer: " << buffer << endl;
#endif #endif
Standard_Failure::Raise(aMsg); Standard_Failure::Raise(aMsg);

4
src/BinXCAFDrivers/BinXCAFDrivers.cxx
View File

@ -33,7 +33,9 @@ Handle(Standard_Transient) BinXCAFDrivers::Factory(const Standard_GUID& theGUID)
if (theGUID == BinXCAFStorageDriver) if (theGUID == BinXCAFStorageDriver)
{ {
#ifdef BINXCAFDRIVERS_DEB
cout << "BinXCAFDrivers : Storage Plugin" << endl; cout << "BinXCAFDrivers : Storage Plugin" << endl;
#endif
static Handle(BinXCAFDrivers_DocumentStorageDriver) model_sd = static Handle(BinXCAFDrivers_DocumentStorageDriver) model_sd =
new BinXCAFDrivers_DocumentStorageDriver; new BinXCAFDrivers_DocumentStorageDriver;
return model_sd; return model_sd;
@ -41,7 +43,9 @@ Handle(Standard_Transient) BinXCAFDrivers::Factory(const Standard_GUID& theGUID)
if (theGUID == BinXCAFRetrievalDriver) if (theGUID == BinXCAFRetrievalDriver)
{ {
#ifdef BINXCAFDRIVERS_DEB
cout << "BinXCAFDrivers : Retrieval Plugin" << endl; cout << "BinXCAFDrivers : Retrieval Plugin" << endl;
#endif
static Handle(BinXCAFDrivers_DocumentRetrievalDriver) model_rd = static Handle(BinXCAFDrivers_DocumentRetrievalDriver) model_rd =
new BinXCAFDrivers_DocumentRetrievalDriver; new BinXCAFDrivers_DocumentRetrievalDriver;
return model_rd; return model_rd;

10
src/Blend/Blend_Walking_1.gxx
View File

@ -156,11 +156,6 @@ void Blend_Walking::Perform(Blend_Function& Func,
InternalPerform(Func,FuncInv,Pmax); InternalPerform(Func,FuncInv,Pmax);
#ifdef DEB
// cout <<"Perform : "<<nbcomputedsection<<" sections calculees"<<endl;
// cout <<line->NbPoints()<<" sections gardees"<<endl;
#endif
done = Standard_True; done = Standard_True;
} }
@ -555,11 +550,6 @@ Standard_Boolean Blend_Walking::Complete(Blend_Function& Func,
InternalPerform(Func,FuncInv,Pmin); InternalPerform(Func,FuncInv,Pmin);
#ifdef DEB
// cout <<"Complete : "<<nbcomputedsection<<" sections calculees"<<endl;
// cout <<line->NbPoints()<<" sections gardees"<<endl;
#endif
iscomplete = Standard_True; iscomplete = Standard_True;
return Standard_True; return Standard_True;
} }

2
src/Blend/Blend_Walking_3.gxx
View File

@ -423,7 +423,7 @@ void Blend_Walking::Transition(const Standard_Boolean OnFirst,
TheSurfaceTool::LastVParameter(surf), TheSurfaceTool::LastVParameter(surf),
stat, thenormal, iu, iv); stat, thenormal, iu, iv);
normale.SetXYZ(thenormal.XYZ()); normale.SetXYZ(thenormal.XYZ());
#if DEB #if BLEND_DEB
if (stat == CSLib_InfinityOfSolutions) if (stat == CSLib_InfinityOfSolutions)
cout << "Blend_Walking::Transition : Infinite de Normal" << endl; cout << "Blend_Walking::Transition : Infinite de Normal" << endl;
#endif #endif

4
src/Blend/Blend_Walking_4.gxx
View File

@ -316,7 +316,7 @@ void Blend_Walking::InternalPerform(Blend_Function& Func,
if (stepw > 2*tolgui) State = Blend_StepTooLarge; if (stepw > 2*tolgui) State = Blend_StepTooLarge;
// Sinon echec recadrage. On sort avec PointsConfondus // Sinon echec recadrage. On sort avec PointsConfondus
else { else {
#if DEB #if BLEND_DEB
cout << "Echec recadrage" << endl; cout << "Echec recadrage" << endl;
#endif #endif
State = Blend_SamePoints; State = Blend_SamePoints;
@ -521,7 +521,7 @@ void Blend_Walking::InternalPerform(Blend_Function& Func,
case Blend_SamePoints : case Blend_SamePoints :
{ {
// On arrete // On arrete
#if DEB #if BLEND_DEB
cout << " Points confondus dans le cheminement" << endl; cout << " Points confondus dans le cheminement" << endl;
#endif #endif
Ext1.SetValue(previousP.PointOnS1(), Ext1.SetValue(previousP.PointOnS1(),

12
src/BlendFunc/BlendFunc_CSCircular.cxx
View File

@ -203,9 +203,6 @@ Standard_Boolean BlendFunc_CSCircular::IsSolution(const math_Vector& Sol, const
norm = ncrossns.Magnitude(); norm = ncrossns.Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1.; norm = 1.;
//#if DEB
// cout << "CSCircular : Surface singuliere !" << endl;
//#endif
} }
temp.SetXYZ(pts.XYZ() - ptc.XYZ()); temp.SetXYZ(pts.XYZ() - ptc.XYZ());
@ -279,9 +276,6 @@ Standard_Boolean BlendFunc_CSCircular::Value(const math_Vector& X, math_Vector&
Standard_Real norm = nplan.Crossed(ns).Magnitude(); Standard_Real norm = nplan.Crossed(ns).Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1.; norm = 1.;
//#if DEB
// cout << "CSCircular : Surface singuliere !" << endl;
//#endif
} }
ns.SetLinearForm(nplan.Dot(ns)/norm,nplan, -1./norm,ns); ns.SetLinearForm(nplan.Dot(ns)/norm,nplan, -1./norm,ns);
@ -318,9 +312,6 @@ Standard_Boolean BlendFunc_CSCircular::Derivatives(const math_Vector& X, math_Ma
norm = ncrossns.Magnitude(); norm = ncrossns.Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1.; norm = 1.;
//#if DEB
// cout << "CSCircular : Surface singuliere !" << endl;
//#endif
} }
ndotns = nplan.Dot(ns); ndotns = nplan.Dot(ns);
@ -374,9 +365,6 @@ Standard_Boolean BlendFunc_CSCircular::Values(const math_Vector& X, math_Vector&
norm = ncrossns.Magnitude(); norm = ncrossns.Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1.; norm = 1.;
//#if DEB
// cout << "CSCircular : Surface singuliere !" << endl;
//#endif
} }
ndotns = nplan.Dot(ns); ndotns = nplan.Dot(ns);

23
src/BlendFunc/BlendFunc_ConstRad.cxx
View File

@ -283,14 +283,14 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1; if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1;
else { else {
invnorm1 = 1; // Unsatisfactory, but it is not necessary to crash invnorm1 = 1; // Unsatisfactory, but it is not necessary to crash
#if DEB #if BLENDFUNC_DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2; if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2;
else { else {
invnorm2 = 1; // Unsatisfactory, but it is not necessary to crash invnorm2 = 1; // Unsatisfactory, but it is not necessary to crash
#if DEB #if BLENDFUNC_DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
@ -878,7 +878,7 @@ Standard_Boolean BlendFunc_ConstRad::IsSolution(const math_Vector& Sol, const St
Abs(controle(2)) > tolerances(2) || Abs(controle(2)) > tolerances(2) ||
Abs(controle(3)) > tolerances(3) || Abs(controle(3)) > tolerances(3) ||
Abs(controle(4)) > tolerances(4)){ Abs(controle(4)) > tolerances(4)){
#ifdef DEB #ifdef BLENDFUNC_DEB
cout<<"Cheminement : echec calcul des derivees"<<endl; cout<<"Cheminement : echec calcul des derivees"<<endl;
#endif #endif
istangent = Standard_True; istangent = Standard_True;
@ -1087,9 +1087,6 @@ void BlendFunc_ConstRad::Tangent(const Standard_Real U1,
(U2!=xval(3)) || (V2!=xval(4))) { (U2!=xval(3)) || (V2!=xval(4))) {
gp_Vec d1u,d1v; gp_Vec d1u,d1v;
gp_Pnt bid; gp_Pnt bid;
//#if DEB
// cout << " ConstRad::erreur de tengent !!!!!!!!!!!!!!!!!!!!" << endl;
//#endif
surf1->D1(U1,V1,bid,d1u,d1v); surf1->D1(U1,V1,bid,d1u,d1v);
NmF = ns1 = d1u.Crossed(d1v); NmF = ns1 = d1u.Crossed(d1v);
surf2->D1(U2,V2,bid,d1u,d1v); surf2->D1(U2,V2,bid,d1u,d1v);
@ -1349,15 +1346,9 @@ void BlendFunc_ConstRad::Section(const Blend_Point& P,
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
//#if DEB
// cout << " ConstRad : Surface singuliere " << endl;
//#endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
//#if DEB
// cout << " ConstRad : Surface singuliere " << endl;
//#endif
} }
ns1.SetLinearForm(nplan.Dot(ns1)/norm1,nplan, -1./norm1,ns1); ns1.SetLinearForm(nplan.Dot(ns1)/norm1,nplan, -1./norm1,ns1);
@ -1480,13 +1471,13 @@ Standard_Boolean BlendFunc_ConstRad::Section
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
@ -1822,13 +1813,13 @@ Standard_Boolean BlendFunc_ConstRad::Section
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }

14
src/BlendFunc/BlendFunc_ConstRadInv.cxx
View File

@ -208,15 +208,9 @@ Standard_Boolean BlendFunc_ConstRadInv::Value(const math_Vector& X,
Standard_Real norm2 = nplan.Crossed(ns2).Magnitude(); Standard_Real norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; norm1 = 1;
//#if DEB
// cout << " ConstRadInv : Surface singuliere " << endl;
//#endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
//#if DEB
// cout << " ConstRadInv : Surface singuliere " << endl;
//#endif
} }
gp_Vec resul; gp_Vec resul;
@ -300,13 +294,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
norm2 = ncrossns2.Magnitude(); norm2 = ncrossns2.Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
} }
@ -481,13 +475,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
norm2 = ncrossns2.Magnitude(); norm2 = ncrossns2.Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
} }

20
src/BlendFunc/BlendFunc_EvolRad.cxx
View File

@ -348,14 +348,14 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1; if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1;
else { else {
invnorm1 = 1; // Unsatisfactory, but it is not necessary to stop invnorm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2; if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2;
else { else {
invnorm2 = 1; // Unsatisfactory, but it is not necessary to stop invnorm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
@ -947,7 +947,7 @@ Standard_Boolean BlendFunc_EvolRad::IsSolution(const math_Vector& Sol,
Abs(controle(2)) > tolerances(2) || Abs(controle(2)) > tolerances(2) ||
Abs(controle(3)) > tolerances(3) || Abs(controle(3)) > tolerances(3) ||
Abs(controle(4)) > tolerances(4)){ Abs(controle(4)) > tolerances(4)){
#ifdef DEB #ifdef BLENDFUNC_DEB
cout<<"Cheminement : echec calcul des derivees"<<endl; cout<<"Cheminement : echec calcul des derivees"<<endl;
#endif #endif
istangent = Standard_True; istangent = Standard_True;
@ -1072,7 +1072,7 @@ void BlendFunc_EvolRad::Tangent(const Standard_Real U1,
(U2!=xval(3)) || (V2!=xval(4))) { (U2!=xval(3)) || (V2!=xval(4))) {
gp_Vec d1u,d1v; gp_Vec d1u,d1v;
gp_Pnt bid; gp_Pnt bid;
#if DEB #if BLENDFUNC_DEB
cout << " erreur de tengent !!!!!!!!!!!!!!!!!!!!" << endl; cout << " erreur de tengent !!!!!!!!!!!!!!!!!!!!" << endl;
#endif #endif
surf1->D1(U1,V1,bid,d1u,d1v); surf1->D1(U1,V1,bid,d1u,d1v);
@ -1447,13 +1447,13 @@ void BlendFunc_EvolRad::Section(const Blend_Point& P,
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
@ -1580,13 +1580,13 @@ Standard_Boolean BlendFunc_EvolRad::Section
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
@ -1926,13 +1926,13 @@ Standard_Boolean BlendFunc_EvolRad::Section
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Unsatisfactory, but it is not necessary to stop norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Unsatisfactory, but it is not necessary to stop norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if BLENDFUNC_DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }

12
src/BlendFunc/BlendFunc_EvolRadInv.cxx
View File

@ -212,15 +212,9 @@ Standard_Boolean BlendFunc_EvolRadInv::Value(const math_Vector& X,
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1.; norm1 = 1.;
//#if DEB
// cout << "EvolRadInv : Surface singuliere " << endl;
//#endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1.; norm2 = 1.;
//#if DEB
// cout << "EvolRadInv : Surface singuliere " << endl;
//#endif
} }
gp_Vec resul; gp_Vec resul;
@ -323,15 +317,9 @@ Standard_Boolean BlendFunc_EvolRadInv::Values(const math_Vector& X,
Standard_Real norm2 = ncrossns2.Magnitude(); Standard_Real norm2 = ncrossns2.Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1.; norm1 = 1.;
//#if DEB
// cout << "EvolRadInv : Surface singuliere " << endl;
//#endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1.; norm2 = 1.;
//#if DEB
// cout << "EvolRadInv : Surface singuliere " << endl;
//#endif
} }
gp_Vec resul1,resul2; gp_Vec resul1,resul2;

2
src/CSLib/CSLib_Class2d.cxx
View File

@ -300,7 +300,9 @@ Standard_Integer CSLib_Class2d::InternalSiDansOuOn(const Standard_Real Px,
//======================================================================= //=======================================================================
const CSLib_Class2d& CSLib_Class2d::Copy(const CSLib_Class2d& ) const const CSLib_Class2d& CSLib_Class2d::Copy(const CSLib_Class2d& ) const
{ {
#ifdef CSLIB_DEB
cerr<<"Copy not allowed in CSLib_Class2d"<<endl; cerr<<"Copy not allowed in CSLib_Class2d"<<endl;
#endif
Standard_ConstructionError::Raise(); Standard_ConstructionError::Raise();
return *this; return *this;
} }

2
src/ChFi3d/ChFi3d.cxx
View File

@ -152,7 +152,7 @@ Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1,
} }
} }
else { else {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ConcaveSide : no concave face"<<endl; cout<<"ConcaveSide : no concave face"<<endl;
#endif #endif
//This 10 shows that the face at end is in the extension of one of two base faces //This 10 shows that the face at end is in the extension of one of two base faces

8
src/ChFi3d/ChFi3d_Builder.cxx
View File

@ -250,7 +250,7 @@ void ChFi3d_Builder::Compute()
} }
catch(Standard_Failure) { catch(Standard_Failure) {
Handle(Standard_Failure) exc = Standard_Failure::Caught(); Handle(Standard_Failure) exc = Standard_Failure::Caught();
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"EXCEPTION Stripe compute " << exc << endl; cout <<"EXCEPTION Stripe compute " << exc << endl;
#endif #endif
badstripes.Append(itel.Value()); badstripes.Append(itel.Value());
@ -281,7 +281,7 @@ void ChFi3d_Builder::Compute()
catch(Standard_Failure) catch(Standard_Failure)
{ {
Handle(Standard_Failure) exc = Standard_Failure::Caught(); Handle(Standard_Failure) exc = Standard_Failure::Caught();
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"EXCEPTION Corner compute " << exc << endl; cout <<"EXCEPTION Corner compute " << exc << endl;
#endif #endif
badvertices.Append(myVDataMap.FindKey(j)); badvertices.Append(myVDataMap.FindKey(j));
@ -336,7 +336,7 @@ void ChFi3d_Builder::Compute()
} }
catch(Standard_Failure) { catch(Standard_Failure) {
Handle(Standard_Failure) exc = Standard_Failure::Caught(); Handle(Standard_Failure) exc = Standard_Failure::Caught();
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"EXCEPTION Fillets compute " << exc << endl; cout <<"EXCEPTION Fillets compute " << exc << endl;
#endif #endif
badstripes.Append(itel.Value()); badstripes.Append(itel.Value());
@ -488,6 +488,7 @@ void ChFi3d_Builder::Compute()
// display of time for perfs // display of time for perfs
#ifdef DEB #ifdef DEB
if(ChFi3d_GettraceCHRON()){
cout<<endl; cout<<endl;
cout<<"COMPUTE: temps total "<<t_total<<"s dont :"<<endl; cout<<"COMPUTE: temps total "<<t_total<<"s dont :"<<endl;
cout<<"- Init + ExtentAnalyse "<<t_extent<<"s"<<endl; cout<<"- Init + ExtentAnalyse "<<t_extent<<"s"<<endl;
@ -497,7 +498,6 @@ void ChFi3d_Builder::Compute()
cout<<"- Reconstruction "<<t_reconstruction<<"s"<<endl; cout<<"- Reconstruction "<<t_reconstruction<<"s"<<endl;
cout<<"- SetRegul "<<t_setregul<<"s"<<endl<<endl; cout<<"- SetRegul "<<t_setregul<<"s"<<endl<<endl;
if(ChFi3d_GettraceCHRON()){
cout<<endl; cout<<endl;
cout <<"temps PERFORMSETOFSURF "<<t_perfsetofsurf <<"s dont : "<<endl; cout <<"temps PERFORMSETOFSURF "<<t_perfsetofsurf <<"s dont : "<<endl;
cout <<"- SetofKPart "<<t_perfsetofkpart<<"s"<<endl; cout <<"- SetofKPart "<<t_perfsetofkpart<<"s"<<endl;

6
src/ChFi3d/ChFi3d_Builder_1.cxx
View File

@ -563,7 +563,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
E[i] = Ec; E[i] = Ec;
} }
else{ else{
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"top has more than 3 edges"<<endl; cout<<"top has more than 3 edges"<<endl;
#endif #endif
sommetpourri = Standard_True; sommetpourri = Standard_True;
@ -594,7 +594,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
} }
if(nbf>3) { if(nbf>3) {
Spine->SetFirstStatus(ChFiDS_BreakPoint); Spine->SetFirstStatus(ChFiDS_BreakPoint);
#if DEB #if CHFI3D_DEB
cout<<"top has : "<<nbf<<" faces."<<endl; cout<<"top has : "<<nbf<<" faces."<<endl;
#endif #endif
} }
@ -610,7 +610,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
} }
if(nbf>3) { if(nbf>3) {
Spine->SetLastStatus(ChFiDS_BreakPoint); Spine->SetLastStatus(ChFiDS_BreakPoint);
#if DEB #if CHFI3D_DEB
cout<<"top has : "<<nbf<<" faces."<<endl; cout<<"top has : "<<nbf<<" faces."<<endl;
#endif #endif
} }

22
src/ChFi3d/ChFi3d_Builder_2.cxx
View File

@ -1327,7 +1327,7 @@ Standard_Boolean ChFi3d_Builder::SearchFace
TopoDS_Edge E; TopoDS_Edge E;
if (Pc.IsVertex()){ if (Pc.IsVertex()){
// attention it is necessary to analyze all faces that turn around of the vertex // attention it is necessary to analyze all faces that turn around of the vertex
#if DEB #if CHFI3D_DEB
cout<<"Commonpoint on vertex, the process hangs up"<<endl; cout<<"Commonpoint on vertex, the process hangs up"<<endl;
#endif #endif
if (Pc.HasVector()) { //General processing if (Pc.HasVector()) { //General processing
@ -1372,7 +1372,7 @@ Standard_Boolean ChFi3d_Builder::SearchFace
FindFace = Standard_False; FindFace = Standard_False;
if (Spine.IsNull()) { if (Spine.IsNull()) {
//La Spine peut etre nulle (ThreeCorner) //La Spine peut etre nulle (ThreeCorner)
#if DEB #if CHFI3D_DEB
cout << "FindFace sur vertex avec spine nulle! QUEZAKO ?" << endl; cout << "FindFace sur vertex avec spine nulle! QUEZAKO ?" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1592,7 +1592,7 @@ static void ChFi3d_MakeExtremities(Handle(ChFiDS_Stripe)& Stripe,
if (CV1.IsVertex()) { if (CV1.IsVertex()) {
ChFi3d_SingularExtremity(Stripe, DStr, CV1.Vertex(), tol3d, tol2d); ChFi3d_SingularExtremity(Stripe, DStr, CV1.Vertex(), tol3d, tol2d);
} }
# if DEB # if CHFI3D_DEB
else { cout << "MakeExtremities : Singularity out of Vertex !!" << endl; } else { cout << "MakeExtremities : Singularity out of Vertex !!" << endl; }
# endif # endif
} }
@ -1657,7 +1657,7 @@ static void ChFi3d_MakeExtremities(Handle(ChFiDS_Stripe)& Stripe,
if (cpdeb1.IsVertex()) { if (cpdeb1.IsVertex()) {
ChFi3d_SingularExtremity(Stripe, DStr, cpdeb1.Vertex(), tol3d, tol2d); ChFi3d_SingularExtremity(Stripe, DStr, cpdeb1.Vertex(), tol3d, tol2d);
} }
# if DEB # if CHFI3D_DEB
else { cout << "MakeExtremities : Singularity out of Vertex !!" << endl; } else { cout << "MakeExtremities : Singularity out of Vertex !!" << endl; }
# endif # endif
} }
@ -1719,7 +1719,7 @@ static void ChFi3d_MakeExtremities(Handle(ChFiDS_Stripe)& Stripe,
if (cpfin1.IsVertex()) { if (cpfin1.IsVertex()) {
ChFi3d_SingularExtremity(Stripe, DStr, cpfin1.Vertex(), tol3d, tol2d); ChFi3d_SingularExtremity(Stripe, DStr, cpfin1.Vertex(), tol3d, tol2d);
} }
# if DEB # if CHFI3D_DEB
else { cout << "MakeExtremities : Singularity out of Vertex !!" << endl; } else { cout << "MakeExtremities : Singularity out of Vertex !!" << endl; }
# endif # endif
} }
@ -1743,7 +1743,7 @@ static void ChFi3d_Purge (Handle(ChFiDS_Stripe)& Stripe,
Standard_Integer opp = 3-ons; Standard_Integer opp = 3-ons;
if (!SD->Vertex(isfirst,opp).IsOnArc() || if (!SD->Vertex(isfirst,opp).IsOnArc() ||
SD->TwistOnS1() || SD->TwistOnS2() ) { SD->TwistOnS1() || SD->TwistOnS2() ) {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ChFi3d_Purge : No output on extension."<<endl; cout<<"ChFi3d_Purge : No output on extension."<<endl;
#endif #endif
ChFiDS_SequenceOfSurfData& Seq = ChFiDS_SequenceOfSurfData& Seq =
@ -2335,12 +2335,12 @@ void ChFi3d_Builder::PerformSetOfKPart(Handle(ChFiDS_Stripe)& Stripe,
ChFiDS_SequenceOfSurfData LSD; ChFiDS_SequenceOfSurfData LSD;
if(!ChFiKPart_ComputeData::Compute(DStr,SD,HS1,HS2,Or1,Or2,Spine,iedge)){ if(!ChFiKPart_ComputeData::Compute(DStr,SD,HS1,HS2,Or1,Or2,Spine,iedge)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"failed calculation KPart"<<endl; cout<<"failed calculation KPart"<<endl;
#endif #endif
} }
else if(!SplitKPart(SD,LSD,Spine,iedge,HS1,It1,HS2,It2,intf,intl)){ else if(!SplitKPart(SD,LSD,Spine,iedge,HS1,It1,HS2,It2,intf,intl)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"failed calculation KPart"<<endl; cout<<"failed calculation KPart"<<endl;
#endif #endif
LSD.Clear(); LSD.Clear();
@ -2874,7 +2874,7 @@ void ChFi3d_Builder::PerformSetOfKGen(Handle(ChFiDS_Stripe)& Stripe,
} }
else if(IF < IL){ else if(IF < IL){
TColStd_Array1OfReal wv(IF,IL - 1); TColStd_Array1OfReal wv(IF,IL - 1);
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"length of the trajectory : "<<(WL-WF)<<endl; cout<<"length of the trajectory : "<<(WL-WF)<<endl;
#endif #endif
for(i = IF; i < IL; i++){ for(i = IF; i < IL; i++){
@ -2883,7 +2883,7 @@ void ChFi3d_Builder::PerformSetOfKGen(Handle(ChFiDS_Stripe)& Stripe,
Standard_Real wi = Spine->LastParameter(iloc); Standard_Real wi = Spine->LastParameter(iloc);
if(periodic) wi = ElCLib::InPeriod(wi,WF,WF+period); if(periodic) wi = ElCLib::InPeriod(wi,WF,WF+period);
gp_Pnt pv = Spine->Value(wi); gp_Pnt pv = Spine->Value(wi);
#ifdef DEB #ifdef CHFI3D_DEB
gp_Pnt pelsapp = curels.Value(wi); gp_Pnt pelsapp = curels.Value(wi);
Standard_Real distinit = pv.Distance(pelsapp); Standard_Real distinit = pv.Distance(pelsapp);
cout<<"distance psp/papp : "<<distinit<<endl; cout<<"distance psp/papp : "<<distinit<<endl;
@ -2894,7 +2894,7 @@ void ChFi3d_Builder::PerformSetOfKGen(Handle(ChFiDS_Stripe)& Stripe,
wv(i) = ext.Point().Parameter(); wv(i) = ext.Point().Parameter();
} }
else { else {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"fail of projection vertex ElSpine!!!"<<endl; cout<<"fail of projection vertex ElSpine!!!"<<endl;
#endif #endif
} }

114
src/ChFi3d/ChFi3d_Builder_6.cxx
View File

@ -274,7 +274,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
} }
else { else {
//(2) Intersection //(2) Intersection
#ifdef DEB #ifdef CHFI3D_DEB
cout<< "CompParam : bad intersection parameters"<<endl; cout<< "CompParam : bad intersection parameters"<<endl;
#endif #endif
IntRes2d_IntersectionPoint int2d; IntRes2d_IntersectionPoint int2d;
@ -289,7 +289,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
if (!Intersection.IsEmpty()){ if (!Intersection.IsEmpty()){
nbseg = Intersection.NbSegments(); nbseg = Intersection.NbSegments();
if ( nbseg > 0 ){ if ( nbseg > 0 ){
#ifdef DEB #ifdef CHFI3D_DEB
cout<< "segments of intersection on the restrictions"<<endl; cout<< "segments of intersection on the restrictions"<<endl;
#endif #endif
} }
@ -311,7 +311,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
if(!found){ if(!found){
// (3) Projection... // (3) Projection...
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"CompParam : failed intersection PC, projection is created."<<endl; cout<<"CompParam : failed intersection PC, projection is created."<<endl;
#endif #endif
parc = prefarc; parc = prefarc;
@ -321,7 +321,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
// This happens in some cases when there is a vertex // This happens in some cases when there is a vertex
// at the end of spine... // at the end of spine...
ptg = preftg; ptg = preftg;
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"CompParam : failed proj p2d/c2d, the extremity is taken!" <<endl; cout<<"CompParam : failed proj p2d/c2d, the extremity is taken!" <<endl;
#endif #endif
} }
@ -542,12 +542,12 @@ Standard_Boolean ChFi3d_Builder::CompleteData
tolappangle, // Contact G1 tolappangle, // Contact G1
myConti, Degmax, Segmax); myConti, Degmax, Segmax);
if (!approx.IsDone()) { if (!approx.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Approximation non faite !!!" << endl; cout << "Approximation non faite !!!" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
#ifdef DEB #ifdef CHFI3D_DEB
approx.Dump(cout); approx.Dump(cout);
#endif #endif
return StoreData( Data, approx, lin, S1, S2, Or1, Gd1, Gd2, Gf1, Gf2, Reversed); return StoreData( Data, approx, lin, S1, S2, Or1, Gd1, Gd2, Gf1, Gf2, Reversed);
@ -578,12 +578,12 @@ Standard_Boolean ChFi3d_Builder::CompleteData
tolappangle, // Contact G1 tolappangle, // Contact G1
myConti); myConti);
if (!approx.IsDone()) { if (!approx.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Approximation is not done!" << endl; cout << "Approximation is not done!" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
#ifdef DEB #ifdef CHFI3D_DEB
approx.Dump(cout); approx.Dump(cout);
#endif #endif
@ -615,12 +615,12 @@ Standard_Boolean ChFi3d_Builder::CompleteData
tolappangle, // Contact G1 tolappangle, // Contact G1
myConti); myConti);
if (!approx.IsDone()) { if (!approx.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Approximation non faite !!!" << endl; cout << "Approximation non faite !!!" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
#ifdef DEB #ifdef CHFI3D_DEB
approx.Dump(cout); approx.Dump(cout);
#endif #endif
@ -726,7 +726,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
chc.Load(Crv3d1,par1,par2); chc.Load(Crv3d1,par1,par2);
if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S1,tolC1,tolcheck)){ if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S1,tolC1,tolcheck)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"aaproximate tolerance under-valued : "<<tolC1<<" for "<<tolcheck<<endl; cout<<"aaproximate tolerance under-valued : "<<tolC1<<" for "<<tolcheck<<endl;
#endif #endif
tolC1 = tolcheck; tolC1 = tolcheck;
@ -779,7 +779,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
approx.Curves2dDegree()); approx.Curves2dDegree());
chc.Load(Crv3d2,par1,par2); chc.Load(Crv3d2,par1,par2);
if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S2,tolC2,tolcheck)){ if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S2,tolC2,tolcheck)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"approximate tolerance under-evaluated : "<<tolC2<<" for "<<tolcheck<<endl; cout<<"approximate tolerance under-evaluated : "<<tolC2<<" for "<<tolcheck<<endl;
#endif #endif
tolC2 = tolcheck; tolC2 = tolcheck;
@ -959,7 +959,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(!TheWalk.PerformFirstSection(Func,FInv,FInvP,FInvC,PFirst,Target,Soldep, if(!TheWalk.PerformFirstSection(Func,FInv,FInvP,FInvC,PFirst,Target,Soldep,
tolesp,TolGuide,RecRst,RecP,RecS, tolesp,TolGuide,RecRst,RecP,RecS,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl; cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -974,7 +974,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
MS,TolGuide,ParSol,tolesp,Fleche,Appro); MS,TolGuide,ParSol,tolesp,Fleche,Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Path not created" << endl; cout << "Path not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -982,7 +982,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) { if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Not completed" << endl; cout << "Not completed" << endl;
#endif #endif
} }
@ -993,14 +993,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Nbpnt = Lin->NbPoints(); Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"one point of the path MS/50 is attempted."<<endl; cout <<"one point of the path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt<=nbptmin && again == 0) { else if (Nbpnt<=nbptmin && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
@ -1010,7 +1010,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Target = Targetsov; Target = Targetsov;
} }
else if(Nbpnt<=nbptmin){ else if(Nbpnt<=nbptmin){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1091,7 +1091,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (!TheWalk.PerformFirstSection(Func, FInv1, FInvP1, FInv2, FInvP2, PFirst, Target, Soldep, if (!TheWalk.PerformFirstSection(Func, FInv1, FInvP1, FInv2, FInvP2, PFirst, Target, Soldep,
tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2, tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2,
NewFirst, ParSol)){ NewFirst, ParSol)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::ComputeData : fail calculation first section"<<endl; cout<<"ChFi3d_Builder::ComputeData : fail calculation first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1106,7 +1106,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
MS, TolGuide, ParSol, tolesp, Fleche, Appro); MS, TolGuide, ParSol, tolesp, Fleche, Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Path not done" << endl; cout << "Path not done" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1114,7 +1114,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) { if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Not completed" << endl; cout << "Not completed" << endl;
#endif #endif
} }
@ -1125,14 +1125,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Nbpnt = Lin->NbPoints(); Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"one point of path MS/50 is attempted."<<endl; cout <<"one point of path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt<=nbptmin && again == 0) { else if (Nbpnt<=nbptmin && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
@ -1141,7 +1141,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Target = Targetsov; Target = Targetsov;
} }
else if(Nbpnt<=nbptmin){ else if(Nbpnt<=nbptmin){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1221,7 +1221,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if(!TheWalk.PerformFirstSection(Func,FInv,FInvP,FInvC,PFirst,Target,Soldep, if(!TheWalk.PerformFirstSection(Func,FInv,FInvP,FInvC,PFirst,Target,Soldep,
tolesp,TolGuide,RecRst,RecP,RecS, tolesp,TolGuide,RecRst,RecP,RecS,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::SimulData : fail calculate first section"<<endl; cout<<"ChFi3d_Builder::SimulData : fail calculate first section"<<endl;
#endif #endif
@ -1236,14 +1236,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
TheWalk.Perform (Func,FInv,FInvP,FInvC,NewFirst,Last, TheWalk.Perform (Func,FInv,FInvP,FInvC,NewFirst,Last,
MS,TolGuide,ParSol,tolesp,Fleche,Appro); MS,TolGuide,ParSol,tolesp,Fleche,Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Path not done" << endl; cout << "Path not done" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) { if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Not completed" << endl; cout << "Not completed" << endl;
#endif #endif
} }
@ -1252,14 +1252,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
Nbpnt = Lin->NbPoints(); Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"one point of path MS/50 is attempted."<<endl; cout <<"one point of path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt <= NbSecMin && again == 0) { else if (Nbpnt <= NbSecMin && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
@ -1268,7 +1268,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Target = Targetsov; Target = Targetsov;
} }
else if(Nbpnt<=NbSecMin){ else if(Nbpnt<=NbSecMin){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1347,7 +1347,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if(!TheWalk.PerformFirstSection(Func, FInv1, FInvP1, FInv2, FInvP2, PFirst, Target, Soldep, if(!TheWalk.PerformFirstSection(Func, FInv1, FInvP1, FInv2, FInvP2, PFirst, Target, Soldep,
tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2, tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl; cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl;
#endif #endif
@ -1362,14 +1362,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
TheWalk.Perform (Func, FInv1, FInvP1, FInv2, FInvP2, NewFirst, Last, TheWalk.Perform (Func, FInv1, FInvP1, FInv2, FInvP2, NewFirst, Last,
MS, TolGuide, ParSol, tolesp, Fleche, Appro); MS, TolGuide, ParSol, tolesp, Fleche, Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Path not created" << endl; cout << "Path not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) { if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Not completed" << endl; cout << "Not completed" << endl;
#endif #endif
} }
@ -1378,14 +1378,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
Nbpnt = Lin->NbPoints(); Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"only one point of path MS/50 is attempted."<<endl; cout <<"only one point of path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt <= NbSecMin && again == 0) { else if (Nbpnt <= NbSecMin && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
@ -1394,7 +1394,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Target = Targetsov; Target = Targetsov;
} }
else if(Nbpnt<=NbSecMin){ else if(Nbpnt<=NbSecMin){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1543,7 +1543,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(!TheWalk.PerformFirstSection(Func,FInv,PFirst,Target,Soldep, if(!TheWalk.PerformFirstSection(Func,FInv,PFirst,Target,Soldep,
tolesp,TolGuide,RecOnS1,RecOnS2, tolesp,TolGuide,RecOnS1,RecOnS2,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl; cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1576,7 +1576,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
TheWalk.Perform(Func,FInv,NewFirst,Target,MS,TolGuide, TheWalk.Perform(Func,FInv,NewFirst,Target,MS,TolGuide,
ParSol,TolEsp,Fleche,Appro); ParSol,TolEsp,Fleche,Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Path is not created" << endl; cout << "Path is not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1592,7 +1592,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_Boolean complmnt = Standard_True; Standard_Boolean complmnt = Standard_True;
if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast); if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast);
if(!complmnt){ if(!complmnt){
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Not completed" << endl; cout << "Not completed" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1603,7 +1603,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
//- if one has gone far enough. //- if one has gone far enough.
Nbpnt = Lin->NbPoints(); Nbpnt = Lin->NbPoints();
if (Nbpnt == 0){ if (Nbpnt == 0){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"0 point of path, quit."<<endl; cout <<"0 point of path, quit."<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1628,7 +1628,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
//It drags, the controls are extended, it is expected to evaluate a //It drags, the controls are extended, it is expected to evaluate a
//satisfactory maximum step. If it already done, quit. //satisfactory maximum step. If it already done, quit.
if(tchernobyl){ if(tchernobyl){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"If it drags without control, quit."<<endl; cout <<"If it drags without control, quit."<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1636,14 +1636,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
tchernobyl = Standard_True; tchernobyl = Standard_True;
TheWalk.Check(0); TheWalk.Check(0);
if (Nbpnt == 1){ if (Nbpnt == 1){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"only one point of path MS/100 is attempted"<<endl; cout <<"only one point of path MS/100 is attempted"<<endl;
cout <<"and the controls are extended."<<endl; cout <<"and the controls are extended."<<endl;
#endif #endif
MS *= 0.01; MS *= 0.01;
} }
else{ else{
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"It drags, the controls are extended."<<endl; cout <<"It drags, the controls are extended."<<endl;
#endif #endif
MS = (lpointpar-fpointpar)/Nbpnt; //EvalStep(Lin); MS = (lpointpar-fpointpar)/Nbpnt; //EvalStep(Lin);
@ -1651,7 +1651,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
} }
else if (Nbpnt < nbptmin){ else if (Nbpnt < nbptmin){
if(again == 0){ if(again == 0){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
u1sov = fpointpar; u1sov = fpointpar;
@ -1661,13 +1661,13 @@ Standard_Boolean ChFi3d_Builder::ComputeData
else if(again == 1){ else if(again == 1){
if(Abs(fpointpar-u1sov)>=TolGuide || if(Abs(fpointpar-u1sov)>=TolGuide ||
Abs(lpointpar-u2sov)>=TolGuide){ Abs(lpointpar-u2sov)>=TolGuide){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, the step is reduced"<<endl; cout <<"Number of points is still too small, the step is reduced"<<endl;
#endif #endif
MS = (lpointpar - fpointpar) * factor; MS = (lpointpar - fpointpar) * factor;
} }
else{ else{
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -1682,13 +1682,13 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(TheWalk.TwistOnS1()){ if(TheWalk.TwistOnS1()){
Data->TwistOnS1(Standard_True); Data->TwistOnS1(Standard_True);
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"Path completed, but TWIST on S1"<<endl; cout<<"Path completed, but TWIST on S1"<<endl;
#endif #endif
} }
if(TheWalk.TwistOnS2()){ if(TheWalk.TwistOnS2()){
Data->TwistOnS2(Standard_True); Data->TwistOnS2(Standard_True);
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"Parh completed, but TWIST on S2"<<endl; cout<<"Parh completed, but TWIST on S2"<<endl;
#endif #endif
} }
@ -2094,7 +2094,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if(!TheWalk.PerformFirstSection(Func,FInv,PFirst,Target,Soldep, if(!TheWalk.PerformFirstSection(Func,FInv,PFirst,Target,Soldep,
tolesp,TolGuide,RecOnS1,RecOnS2, tolesp,TolGuide,RecOnS1,RecOnS2,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl; cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -2117,7 +2117,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
ParSol,TolEsp,Fleche,Appro); ParSol,TolEsp,Fleche,Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Path not created" << endl; cout << "Path not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -2133,7 +2133,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Standard_Boolean complmnt = Standard_True; Standard_Boolean complmnt = Standard_True;
if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast); if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast);
if(!complmnt){ if(!complmnt){
#ifdef DEB #ifdef CHFI3D_DEB
cout << "Not completed" << endl; cout << "Not completed" << endl;
#endif #endif
return Standard_False; return Standard_False;
@ -2142,14 +2142,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
Nbpnt = Lin->NbPoints(); Nbpnt = Lin->NbPoints();
Standard_Real factor = 1./(NbSecMin + 1); Standard_Real factor = 1./(NbSecMin + 1);
if (Nbpnt == 0){ if (Nbpnt == 0){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"0 point of path, quit."<<endl; cout <<"0 point of path, quit."<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
else if (Nbpnt == 1 && again == 0) { else if (Nbpnt == 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"only one point of path, MS/100 is attempted."<<endl; cout <<"only one point of path, MS/100 is attempted."<<endl;
#endif #endif
MS *= 0.01; Target = Targetsov; MS *= 0.01; Target = Targetsov;
@ -2157,7 +2157,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
} }
else if (Nbpnt< NbSecMin && again == 0) { else if (Nbpnt< NbSecMin && again == 0) {
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = u1sov = Lin->Point(1).Parameter(); Standard_Real u1 = u1sov = Lin->Point(1).Parameter();
@ -2170,21 +2170,21 @@ Standard_Boolean ChFi3d_Builder::SimulData
Standard_Real u2 = Lin->Point(Nbpnt).Parameter(); Standard_Real u2 = Lin->Point(Nbpnt).Parameter();
if(Abs(u1-u1sov)>=TolGuide || Abs(u2-u2sov)>=TolGuide){ if(Abs(u1-u1sov)>=TolGuide || Abs(u2-u2sov)>=TolGuide){
again++; again++;
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, the step is reduced"<<endl; cout <<"Number of points is still too small, the step is reduced"<<endl;
#endif #endif
MS /= 100; MS /= 100;
Target = Targetsov; Target = Targetsov;
} }
else{ else{
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
} }
else if(Nbpnt < NbSecMin){ else if(Nbpnt < NbSecMin){
#ifdef DEB #ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;

6
src/ChFi3d/ChFi3d_Builder_C1.cxx
View File

@ -1737,7 +1737,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
if (Ishape1 > 0) { if (Ishape1 > 0) {
trafil1 = DStr.Shape(Ishape1).Orientation(); trafil1 = DStr.Shape(Ishape1).Orientation();
} }
#ifdef DEB #ifdef CHFI3D_DEB
else { else {
cout<<"erreur"<<endl; cout<<"erreur"<<endl;
} }
@ -1746,7 +1746,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
trafil1 = TopAbs::Compose(TopAbs::Reverse(Fi1.Transition()),trafil1); trafil1 = TopAbs::Compose(TopAbs::Reverse(Fi1.Transition()),trafil1);
} }
#ifdef DEB #ifdef CHFI3D_DEB
else cout<<"erreur"<<endl; else cout<<"erreur"<<endl;
#endif #endif
// eap, Apr 22 2002, occ 293 // eap, Apr 22 2002, occ 293
@ -3623,7 +3623,7 @@ Standard_Boolean ChFi3d_Builder::FindFace(const TopoDS_Vertex& V,
const TopoDS_Face& Favoid) const const TopoDS_Face& Favoid) const
{ {
if (P1.IsVertex() || P2.IsVertex()) { if (P1.IsVertex() || P2.IsVertex()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"change of face on vertex"<<endl; cout<<"change of face on vertex"<<endl;
#endif #endif
} }

24
src/ChFi3d/ChFi3d_Builder_C2.cxx
View File

@ -190,7 +190,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
UIntPC1,UIntPC2,FaCo,SameSide, UIntPC1,UIntPC2,FaCo,SameSide,
IFaCo1,IFaCo2,Okvisavis,Vtx,Standard_True); IFaCo1,IFaCo2,Okvisavis,Vtx,Standard_True);
if (!Okvisavis) { if (!Okvisavis) {
#if DEB #if CHFI3D_DEB
cout<<"TwoCorner : pas de face commune"<<endl; cout<<"TwoCorner : pas de face commune"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -205,14 +205,14 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
} }
if (!Okvisavis) { if (!Okvisavis) {
#if DEB #if CHFI3D_DEB
cout<<"TwoCorner : no common face"<<endl; cout<<"TwoCorner : no common face"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
} }
if (!OkinterCC) { if (!OkinterCC) {
#if DEB #if CHFI3D_DEB
cout<<"biseau : failed intersection of tangency lines on common face"<<endl; cout<<"biseau : failed intersection of tangency lines on common face"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -227,7 +227,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
ChFiDS_CommonPoint& CP2 = Fd2->ChangeVertex(isfirst2,IFaArc2); ChFiDS_CommonPoint& CP2 = Fd2->ChangeVertex(isfirst2,IFaArc2);
if (!CP1.IsOnArc() || !CP2.IsOnArc()) { if (!CP1.IsOnArc() || !CP2.IsOnArc()) {
#if DEB #if CHFI3D_DEB
cout<<"fail 1 of 2 fillets are not on arc"<<endl; cout<<"fail 1 of 2 fillets are not on arc"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -235,7 +235,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
} }
if ( ! CP1.Arc().IsSame( CP2.Arc()) ) { if ( ! CP1.Arc().IsSame( CP2.Arc()) ) {
// look like OnSame + OnDiff case (eap, Arp 9 2002, occ266) // look like OnSame + OnDiff case (eap, Arp 9 2002, occ266)
#if DEB #if CHFI3D_DEB
cout<<"PerformTwoCornerbyInter(): fillets are not on the same arc"<<endl; cout<<"PerformTwoCornerbyInter(): fillets are not on the same arc"<<endl;
#endif #endif
done = Standard_True; done = Standard_True;
@ -279,7 +279,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
} }
} }
if(!ok1 || !ok2){ if(!ok1 || !ok2){
#if DEB #if CHFI3D_DEB
cout<<"fail one of surfaces has no common base face with the pivot edge"<<endl; cout<<"fail one of surfaces has no common base face with the pivot edge"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -326,7 +326,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
if (IFaCo1 == 1 && if (IFaCo1 == 1 &&
!ChFi3d_ComputeCurves(HS1,HS2,Pardeb,Parfin,Gc, !ChFi3d_ComputeCurves(HS1,HS2,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if CHFI3D_DEB
cout<<"failed to calculate bevel error interSS"<<endl; cout<<"failed to calculate bevel error interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -335,7 +335,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
else if (IFaCo1 == 2 && else if (IFaCo1 == 2 &&
!ChFi3d_ComputeCurves(HS1,HS2,Parfin,Pardeb,Gc, !ChFi3d_ComputeCurves(HS1,HS2,Parfin,Pardeb,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if CHFI3D_DEB
cout<<"failed to calculate bevel error interSS"<<endl; cout<<"failed to calculate bevel error interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -471,7 +471,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Reduce(UIntPCSma,UIntPCBig,Hctg); Reduce(UIntPCSma,UIntPCBig,Hctg);
} }
if(!ChFi3d_IntCS(BigHS,Hctg,UVi,wi)){ if(!ChFi3d_IntCS(BigHS,Hctg,UVi,wi)){
#if DEB #if CHFI3D_DEB
cout<<"bevel : failed inter C S"<<endl; cout<<"bevel : failed inter C S"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -485,7 +485,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Standard_Real tolreached; Standard_Real tolreached;
if (!ChFi3d_ComputeCurves(SmaHS,BigHS,Pardeb,Parfin,Gc, if (!ChFi3d_ComputeCurves(SmaHS,BigHS,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if CHFI3D_DEB
cout<<"failed to calculate bevel failed interSS"<<endl; cout<<"failed to calculate bevel failed interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -574,7 +574,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Adaptor3d_CurveOnSurface consf(c2df,HF); Adaptor3d_CurveOnSurface consf(c2df,HF);
Handle(Adaptor3d_HCurveOnSurface) Hconsf = new Adaptor3d_HCurveOnSurface(consf); Handle(Adaptor3d_HCurveOnSurface) Hconsf = new Adaptor3d_HCurveOnSurface(consf);
if(!ChFi3d_IntCS(BigHS,Hconsf,UVi,wi)) { if(!ChFi3d_IntCS(BigHS,Hconsf,UVi,wi)) {
#if DEB #if CHFI3D_DEB
cout<<"bevel : failed inter C S"<<endl; cout<<"bevel : failed inter C S"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
@ -607,7 +607,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
if (!ChFi3d_ComputeCurves(HF,BigHS,Pardeb,Parfin,Gc, if (!ChFi3d_ComputeCurves(HF,BigHS,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if CHFI3D_DEB
cout<<"fail calculation bevel fail interSS"<<endl; cout<<"fail calculation bevel fail interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;

4
src/ChFi3d/ChFi3d_Builder_CnCrn.cxx
View File

@ -525,7 +525,7 @@ static void CalculBatten (const Handle (GeomAdaptor_HSurface) ASurf,
FairCurve_AnalysisCode Iana; FairCurve_AnalysisCode Iana;
Standard_Boolean Ok; Standard_Boolean Ok;
Ok = Bat.Compute(Iana,25,1.e-2); Ok = Bat.Compute(Iana,25,1.e-2);
#if DEB #if CHFI3D_DEB
if (!Ok) { if (!Ok) {
cout<<"no batten :"; cout<<"no batten :";
Bat.Dump(cout); Bat.Dump(cout);
@ -1330,7 +1330,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
isOnSameDiff = isOnSame && isOnDiff; isOnSameDiff = isOnSame && isOnDiff;
} }
if ( isOnSameDiff ) { if ( isOnSameDiff ) {
#ifdef DEB #ifdef CHFI3D_DEB
cout << "OnSame + OnDiff, PerformMoreThreeCorner() calls PerformOneCorner()" << endl; cout << "OnSame + OnDiff, PerformMoreThreeCorner() calls PerformOneCorner()" << endl;
#endif #endif
PerformOneCorner (Jndex, Standard_True); PerformOneCorner (Jndex, Standard_True);

16
src/ChFi3d/ChFi3d_Builder_SpKP.cxx
View File

@ -264,14 +264,14 @@ static Standard_Real ParamOnSpine(const TopOpeBRepDS_DataStructure& DStr,
Standard_Real tolc = CE.Resolution(tol); Standard_Real tolc = CE.Resolution(tol);
found = ChFi3d_InterPlaneEdge(plan,HE,Nl,First,tolc); found = ChFi3d_InterPlaneEdge(plan,HE,Nl,First,tolc);
gp_Pnt point = CE.Value(Nl); gp_Pnt point = CE.Value(Nl);
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"******* ParamOnSpine() for edge "<<iedge<<endl; cout<<"******* ParamOnSpine() for edge "<<iedge<<endl;
cout<<Nl<<endl; cout<<Nl<<endl;
cout<<"point ped "<<point.X()<<" "<<point.Y()<<" "<<point.Z()<<endl; cout<<"point ped "<<point.X()<<" "<<point.Y()<<" "<<point.Z()<<endl;
#endif #endif
if(found) Nl = Spine->Absc(Nl,ii); if(found) Nl = Spine->Absc(Nl,ii);
point = Spine->Value(Nl); point = Spine->Value(Nl);
#ifdef DEB #ifdef CHFI3D_DEB
if (found) cout << "found by edge " << ii << " : "; if (found) cout << "found by edge " << ii << " : ";
cout<<Nl<<endl; cout<<Nl<<endl;
cout<<"point psp "<<point.X()<<" "<<point.Y()<<" "<<point.Z()<<endl; cout<<"point psp "<<point.X()<<" "<<point.Y()<<" "<<point.Z()<<endl;
@ -509,7 +509,7 @@ static Standard_Boolean Tri(const Geom2dHatch_Hatcher& H,
} }
if (iSansFirst != 0) { if (iSansFirst != 0) {
if (iSansLast == 0) { if (iSansLast == 0) {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"Parsing : Pb of Hatcher"<<endl; cout<<"Parsing : Pb of Hatcher"<<endl;
#endif #endif
return 0; return 0;
@ -679,7 +679,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
if(!H1.IsDone(iH1)) return 0; if(!H1.IsDone(iH1)) return 0;
Nb1 = H1.NbDomains(iH1); Nb1 = H1.NbDomains(iH1);
if(Nb1 == 0) { if(Nb1 == 0) {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"SplitKPart : tangency line out of the face"<<endl; cout<<"SplitKPart : tangency line out of the face"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -705,7 +705,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
if(!H2.IsDone(iH2)) return 0; if(!H2.IsDone(iH2)) return 0;
Nb2 = H2.NbDomains(iH2); Nb2 = H2.NbDomains(iH2);
if(Nb2 == 0) { if(Nb2 == 0) {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"SplitKPart : tangency line out of the face"<<endl; cout<<"SplitKPart : tangency line out of the face"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -747,7 +747,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
// situation, eap occ354 // situation, eap occ354
if (C1.IsNull() && C2.IsNull()) { if (C1.IsNull() && C2.IsNull()) {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"SplitData : 2 zero lines hatching impossible"<<endl; cout<<"SplitData : 2 zero lines hatching impossible"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -969,7 +969,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
onS = 1; onS = 1;
else else
onS = 2; onS = 2;
#ifdef DEB #ifdef CHFI3D_DEB
if (threeE[0].IsSame(threeE[1])) if (threeE[0].IsSame(threeE[1]))
cout << "SplitKPart(), wrong corner vertex at switcher search" << endl; cout << "SplitKPart(), wrong corner vertex at switcher search" << endl;
#endif #endif
@ -1064,7 +1064,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
onS = 1; onS = 1;
else else
onS = 2; onS = 2;
#ifdef DEB #ifdef CHFI3D_DEB
if (threeE[0].IsSame(threeE[1])) if (threeE[0].IsSame(threeE[1]))
cout << "SplitKPart(), wrong corner vertex at switcher search" << endl; cout << "SplitKPart(), wrong corner vertex at switcher search" << endl;
#endif #endif

2
src/ChFi3d/ChFi3d_ChBuilder_C3.cxx
View File

@ -563,7 +563,7 @@ void ChFi3d_ChBuilder::PerformThreeCorner(const Standard_Integer Jndex)
if (inter.IsDone()) { if (inter.IsDone()) {
Standard_Integer nbl = inter.NbLines(); Standard_Integer nbl = inter.NbLines();
if (nbl > 1) { if (nbl > 1) {
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"trop d'intersection entre les surfaces"<<endl; cout<<"trop d'intersection entre les surfaces"<<endl;
#endif #endif
} }

2
src/ChFi3d/ChFi3d_FilBuilder.cxx
View File

@ -1766,7 +1766,7 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
} }
} }
else { else {
# if DEB # if CHFI3D_DEB
cout << "Failed calculation of the minimum length" << endl; cout << "Failed calculation of the minimum length" << endl;
# endif # endif
} }

6
src/ChFi3d/ChFi3d_FilBuilder_C3.cxx
View File

@ -290,7 +290,7 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
// 3 concavities identic. // 3 concavities identic.
pivot = SearchPivot(sens,p,tol2d); pivot = SearchPivot(sens,p,tol2d);
if(pivot < 0){ if(pivot < 0){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"pivot not found, plate is called"<<endl; cout<<"pivot not found, plate is called"<<endl;
#endif #endif
PerformMoreThreeCorner(Jndex, 3); PerformMoreThreeCorner(Jndex, 3);
@ -312,14 +312,14 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
ifacdeb = CD[deb]->ChangeSetOfSurfData()->Value(i[deb][pivot])->Index(3-jf[deb][pivot]); ifacdeb = CD[deb]->ChangeSetOfSurfData()->Value(i[deb][pivot])->Index(3-jf[deb][pivot]);
ifacfin = CD[fin]->ChangeSetOfSurfData()->Value(i[fin][pivot])->Index(3-jf[fin][pivot]); ifacfin = CD[fin]->ChangeSetOfSurfData()->Value(i[fin][pivot])->Index(3-jf[fin][pivot]);
if(ifacfin != ifacdeb){ if(ifacfin != ifacdeb){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"several base faces, plate is called"<<endl; cout<<"several base faces, plate is called"<<endl;
#endif #endif
PerformMoreThreeCorner(Jndex, 3); PerformMoreThreeCorner(Jndex, 3);
return; return;
} }
if(i[pivot][deb] != i[pivot][fin]){ if(i[pivot][deb] != i[pivot][fin]){
#ifdef DEB #ifdef CHFI3D_DEB
cout<<"load surfdata on the pivot, plate is called"<<endl; cout<<"load surfdata on the pivot, plate is called"<<endl;
#endif #endif
PerformMoreThreeCorner(Jndex, 3); PerformMoreThreeCorner(Jndex, 3);

10
src/ChFiDS/ChFiDS_Spine.cxx
View File

@ -174,7 +174,7 @@ Standard_Real ChFiDS_Spine::LastParameter() const
void ChFiDS_Spine::SetFirstParameter(const Standard_Real Par) void ChFiDS_Spine::SetFirstParameter(const Standard_Real Par)
{ {
#ifdef DEB #ifdef CHFIDS_DEB
if(Par >= Precision::Confusion()) if(Par >= Precision::Confusion())
cout<<"Interior extension at the start of guideline"<<endl; cout<<"Interior extension at the start of guideline"<<endl;
if(IsPeriodic()) if(IsPeriodic())
@ -192,7 +192,7 @@ void ChFiDS_Spine::SetFirstParameter(const Standard_Real Par)
void ChFiDS_Spine::SetLastParameter(const Standard_Real Par) void ChFiDS_Spine::SetLastParameter(const Standard_Real Par)
{ {
#ifdef DEB #ifdef CHFIDS_DEB
Standard_Real lll = abscissa->Value(abscissa->Upper()); Standard_Real lll = abscissa->Value(abscissa->Upper());
if((Par - lll) <= -Precision::Confusion()) if((Par - lll) <= -Precision::Confusion())
cout<<"Interior extension at the end of guideline"<<endl; cout<<"Interior extension at the end of guideline"<<endl;
@ -347,7 +347,7 @@ void ChFiDS_Spine::SetFirstTgt(const Standard_Real W)
{ {
if(IsPeriodic()) Standard_Failure::Raise if(IsPeriodic()) Standard_Failure::Raise
("No extension by tangent on periodic contours"); ("No extension by tangent on periodic contours");
#ifdef DEB #ifdef CHFIDS_DEB
if(W >= Precision::Confusion()) if(W >= Precision::Confusion())
cout<<"Interior extension at start of the guideline"<<endl; cout<<"Interior extension at start of the guideline"<<endl;
#endif #endif
@ -371,7 +371,7 @@ void ChFiDS_Spine::SetLastTgt(const Standard_Real W)
if(IsPeriodic()) Standard_Failure::Raise if(IsPeriodic()) Standard_Failure::Raise
("No extension by tangent periodic contours"); ("No extension by tangent periodic contours");
#ifdef DEB #ifdef CHFIDS_DEB
Standard_Real L = W - abscissa->Value(abscissa->Upper()); Standard_Real L = W - abscissa->Value(abscissa->Upper());
if(L <= -Precision::Confusion()) if(L <= -Precision::Confusion())
cout<<"Interior extension at the end of guideline"<<endl; cout<<"Interior extension at the end of guideline"<<endl;
@ -491,7 +491,7 @@ void ChFiDS_Spine::UnsetReference()
void ChFiDS_Spine::Load() void ChFiDS_Spine::Load()
{ {
if(!abscissa.IsNull()){ if(!abscissa.IsNull()){
#ifdef DEB #ifdef CHFIDS_DEB
cout<<"new load of CE"<<endl; cout<<"new load of CE"<<endl;
#endif #endif
} }

8
src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCon.cxx
View File

@ -133,7 +133,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
ChamfRad = Spine.Radius() - Dis; ChamfRad = Spine.Radius() - Dis;
if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True; if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True;
if( ChamfRad < 0 ) { if( ChamfRad < 0 ) {
#ifdef DEB #ifdef CHFIKPART_DEB
cout<<"the chamfer can't pass"<<endl; cout<<"the chamfer can't pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -147,7 +147,9 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
if (ouvert) { if (ouvert) {
if (Abs(angCon) - Abs(SemiAngl) > -Precision::Confusion() ) { if (Abs(angCon) - Abs(SemiAngl) > -Precision::Confusion() ) {
#ifdef CHFIKPART_DEB
cout<<"wrong choice of angle for the chamfer"<<endl; cout<<"wrong choice of angle for the chamfer"<<endl;
#endif
return Standard_False; return Standard_False;
} }
} }
@ -159,7 +161,9 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
SemiAngl = Abs(angCon) + Angle; SemiAngl = Abs(angCon) + Angle;
if ( (M_PI / 2. - SemiAngl) < Precision::Confusion() ) { if ( (M_PI / 2. - SemiAngl) < Precision::Confusion() ) {
#ifdef CHFIKPART_DEB
cout <<"wrong choice of angle for the chamfer"<<endl; cout <<"wrong choice of angle for the chamfer"<<endl;
#endif
return Standard_False; return Standard_False;
} }
Dis1 = move * Tan(SemiAngl) - Dis * Abs(Sin(angCon)); Dis1 = move * Tan(SemiAngl) - Dis * Abs(Sin(angCon));
@ -191,7 +195,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True; if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True;
if( ChamfRad < 0 ) { if( ChamfRad < 0 ) {
#ifdef DEB #ifdef CHFIKPART_DEB
cout<<"the chamfer can't pass"<<endl; cout<<"the chamfer can't pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;

4
src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCyl.cxx
View File

@ -149,7 +149,9 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
Rad = Cyl.Radius() - dis1; Rad = Cyl.Radius() - dis1;
if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True; if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True;
if(Rad < 0 ) { if(Rad < 0 ) {
#ifdef CHFIKPART_DEB
cout<<"the chamfer can't pass"<<endl; cout<<"the chamfer can't pass"<<endl;
#endif
return Standard_False; return Standard_False;
} }
} }
@ -403,7 +405,9 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
dis2 = temp2 + temp1 * (cosAhOC - temp1); dis2 = temp2 + temp1 * (cosAhOC - temp1);
if (dis2 < -1.E-09) { if (dis2 < -1.E-09) {
#ifdef CHFIKPART_DEB
cout<<"too great angle of chamfer"<<endl; cout<<"too great angle of chamfer"<<endl;
#endif
return Standard_False; return Standard_False;
} }
else if (dis2 < 1.E-09) { else if (dis2 < 1.E-09) {

2
src/ChFiKPart/ChFiKPart_ComputeData_ChPlnCyl.cxx
View File

@ -131,7 +131,9 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
Rad = Cyl.Radius()- Dis1; Rad = Cyl.Radius()- Dis1;
if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True; if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True;
if(Rad < 0 ) { if(Rad < 0 ) {
#ifdef CHFIKPART_DEB
cout<<"the chamfer can't pass"<<endl; cout<<"the chamfer can't pass"<<endl;
#endif
return Standard_False; return Standard_False;
} }
} }

2
src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCon.cxx
View File

@ -124,7 +124,9 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Rad = Maxrad - Rabio; Rad = Maxrad - Rabio;
if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; } if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; }
else if(Rad < 0){ else if(Rad < 0){
#ifdef CHFIKPART_DEB
cout<<"the fillet does not pass"<<endl; cout<<"the fillet does not pass"<<endl;
#endif
return Standard_False; return Standard_False;
} }
} }

4
src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCyl.cxx
View File

@ -85,7 +85,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
ROff-=Radius; ROff-=Radius;
} }
else { else {
#ifdef DEB #ifdef CHFIKPART_DEB
cout<<"the fillet does not pass"<<endl; cout<<"the fillet does not pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;
@ -293,7 +293,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Rad = cylrad - Radius; Rad = cylrad - Radius;
if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; } if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; }
else if(Rad < 0){ else if(Rad < 0){
#ifdef DEB #ifdef CHFIKPART_DEB
cout<<"the fillet can't pass"<<endl; cout<<"the fillet can't pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;

2
src/ChFiKPart/ChFiKPart_ComputeData_Sphere.cxx
View File

@ -84,7 +84,7 @@ Standard_Boolean ChFiKPart_Sphere(TopOpeBRepDS_DataStructure& DStr,
pp.Z()-delta*di.Z()); pp.Z()-delta*di.Z());
dz = gp_Dir(gp_Vec(p1,cen)); dz = gp_Dir(gp_Vec(p1,cen));
if(Abs(ds1.Dot(dz)-1.)>ptol){ if(Abs(ds1.Dot(dz)-1.)>ptol){
#ifdef DEB #ifdef CHFIKPART_DEB
cout<<"center of the spherical corner not found"<<endl; cout<<"center of the spherical corner not found"<<endl;
#endif #endif
return Standard_False; return Standard_False;

4
src/DBRep/DBRep.cxx
View File

@ -337,7 +337,7 @@ static Standard_Integer triangles(Draw_Interpretor& ,
if (n == 1) { if (n == 1) {
disptriangles = !disptriangles; disptriangles = !disptriangles;
#ifdef DEB #ifdef DBREP_DEB
if (disptriangles) cout <<"Triangulations are always displayed"<<endl; if (disptriangles) cout <<"Triangulations are always displayed"<<endl;
else cout <<"Triangulations are displayed only if there is no geometric representation"<<endl; else cout <<"Triangulations are displayed only if there is no geometric representation"<<endl;
#endif #endif
@ -387,7 +387,7 @@ static Standard_Integer polygons(Draw_Interpretor& ,
if (n == 1) { if (n == 1) {
disppolygons = !disppolygons; disppolygons = !disppolygons;
#ifdef DEB #ifdef DBREP_DEB
if (disppolygons) cout <<"Polygons are always displayed"<<endl; if (disppolygons) cout <<"Polygons are always displayed"<<endl;
else cout <<"Polygons are displayed only if there is no geometric representation"<<endl; else cout <<"Polygons are displayed only if there is no geometric representation"<<endl;
#endif #endif

14
src/DBRep/DBRep_IsoBuilder.cxx
View File

@ -108,14 +108,14 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion,
if (PCurve.IsNull()) if (PCurve.IsNull())
{ {
#ifdef DEB #ifdef DBREP_DEB
cout << "DBRep_IsoBuilder : PCurve is null\n"; cout << "DBRep_IsoBuilder : PCurve is null\n";
#endif #endif
return; return;
} }
else if (U1 == U2) else if (U1 == U2)
{ {
#ifdef DEB #ifdef DBREP_DEB
cout << "DBRep_IsoBuilder PCurve : U1==U2\n"; cout << "DBRep_IsoBuilder PCurve : U1==U2\n";
#endif #endif
return; return;
@ -140,7 +140,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion,
U2 - TrimPCurve->BasisCurve()->LastParameter() > Precision::PConfusion()) U2 - TrimPCurve->BasisCurve()->LastParameter() > Precision::PConfusion())
{ {
AddElement (PCurve, TopologicalEdge.Orientation()); AddElement (PCurve, TopologicalEdge.Orientation());
#ifdef DEB #ifdef DBREP_DEB
cout << "DBRep_IsoBuilder TrimPCurve : parameters out of range\n"; cout << "DBRep_IsoBuilder TrimPCurve : parameters out of range\n";
cout << " U1(" << U1 << "), Umin(" << PCurve->FirstParameter() cout << " U1(" << U1 << "), Umin(" << PCurve->FirstParameter()
<< "), U2(" << U2 << "), Umax(" << PCurve->LastParameter() << ")\n"; << "), U2(" << U2 << "), Umax(" << PCurve->LastParameter() << ")\n";
@ -152,7 +152,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion,
{ {
if (PCurve->FirstParameter() - U1 > Precision::PConfusion()) if (PCurve->FirstParameter() - U1 > Precision::PConfusion())
{ {
#ifdef DEB #ifdef DBREP_DEB
cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << "DBRep_IsoBuilder PCurve : parameters out of range\n";
cout << " U1(" << U1 << "), Umin(" << PCurve->FirstParameter() << ")\n"; cout << " U1(" << U1 << "), Umin(" << PCurve->FirstParameter() << ")\n";
#endif #endif
@ -160,7 +160,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion,
} }
if (PCurve->FirstParameter() - U2 > Precision::PConfusion()) if (PCurve->FirstParameter() - U2 > Precision::PConfusion())
{ {
#ifdef DEB #ifdef DBREP_DEB
cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << "DBRep_IsoBuilder PCurve : parameters out of range\n";
cout << " U2(" << U2 << "), Umin(" << PCurve->FirstParameter() << ")\n"; cout << " U2(" << U2 << "), Umin(" << PCurve->FirstParameter() << ")\n";
#endif #endif
@ -168,7 +168,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion,
} }
if (U1 - PCurve->LastParameter() > Precision::PConfusion()) if (U1 - PCurve->LastParameter() > Precision::PConfusion())
{ {
#ifdef DEB #ifdef DBREP_DEB
cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << "DBRep_IsoBuilder PCurve : parameters out of range\n";
cout << " U1(" << U1 << "), Umax(" << PCurve->LastParameter() << ")\n"; cout << " U1(" << U1 << "), Umax(" << PCurve->LastParameter() << ")\n";
#endif #endif
@ -176,7 +176,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion,
} }
if (U2 - PCurve->LastParameter() > Precision::PConfusion()) if (U2 - PCurve->LastParameter() > Precision::PConfusion())
{ {
#ifdef DEB #ifdef DBREP_DEB
cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << "DBRep_IsoBuilder PCurve : parameters out of range\n";
cout << " U2(" << U2 << "), Umax(" << PCurve->LastParameter() << ")\n"; cout << " U2(" << U2 << "), Umax(" << PCurve->LastParameter() << ")\n";
#endif #endif

2
src/DDF/DDF_BrowserCommands.cxx
View File

@ -71,7 +71,7 @@ static Standard_Integer DFBrowse (Draw_Interpretor& di,
aTclScript.AssignCat ( "/dftree.tcl" ); aTclScript.AssignCat ( "/dftree.tcl" );
OSD_File aTclScriptFile (aTclScript); OSD_File aTclScriptFile (aTclScript);
if (aTclScriptFile.Exists()) { if (aTclScriptFile.Exists()) {
#ifdef DEB #ifdef DDF_DEB
cout << "Load " << aTclScript << endl; cout << "Load " << aTclScript << endl;
#endif #endif
di.EvalFile( aTclScript.ToCString() ); di.EvalFile( aTclScript.ToCString() );

4
src/DDF/DDF_IOStream.cxx
View File

@ -644,7 +644,7 @@ Storage_Error DDF_IOStream::BeginReadInfoSection()
ReadChar(l,len); ReadChar(l,len);
if (strncmp(DDF_IOStream::MagicNumber(),l.ToCString(),len) != 0) { if (strncmp(DDF_IOStream::MagicNumber(),l.ToCString(),len) != 0) {
#ifdef DEB #ifdef DDF_DEB
cout<<"BeginReadInfoSection: format error"<<endl; cout<<"BeginReadInfoSection: format error"<<endl;
#endif #endif
s = Storage_VSFormatError; s = Storage_VSFormatError;
@ -1344,7 +1344,7 @@ Storage_Error DDF_IOStream::IsGoodFileType(istream* anIStream)
f.Close(); f.Close();
if (strncmp(DDF_IOStream::MagicNumber(),l.ToCString(),len) != 0) { if (strncmp(DDF_IOStream::MagicNumber(),l.ToCString(),len) != 0) {
#ifdef DEB #ifdef DDF_DEB
cout<<"IsGoodFileType: format error"<<endl; cout<<"IsGoodFileType: format error"<<endl;
#endif #endif
s = Storage_VSFormatError; s = Storage_VSFormatError;

2
src/DDataStd/DDataStd_BasicCommands.cxx
View File

@ -1307,7 +1307,7 @@ static Standard_Integer DDataStd_GetUTFtoFile (Draw_Interpretor& di,
#endif #endif
if (!anOS) { if (!anOS) {
// A problem with the stream // A problem with the stream
#ifdef DEB #ifdef DDATASTD_DEB
cout << "Error: problem with the file stream, rdstate = " <<anOS.rdstate() <<endl; cout << "Error: problem with the file stream, rdstate = " <<anOS.rdstate() <<endl;
#endif #endif
} }

12
src/DNaming/DNaming.cxx
View File

@ -126,7 +126,9 @@ TopoDS_Shape DNaming::CurrentShape (const Standard_CString LabelName,
TDF_Label Label; TDF_Label Label;
Standard_Boolean Found = DDF::AddLabel (DF, LabelName, Label); Standard_Boolean Found = DDF::AddLabel (DF, LabelName, Label);
if (!Found) { if (!Found) {
#ifdef DNAMING_DEB
cout <<"no labels"<<endl; cout <<"no labels"<<endl;
#endif
return S; return S;
} }
if (Found) { if (Found) {
@ -134,7 +136,9 @@ TopoDS_Shape DNaming::CurrentShape (const Standard_CString LabelName,
Label.FindAttribute(TNaming_NamedShape::GetID(),NS); Label.FindAttribute(TNaming_NamedShape::GetID(),NS);
S = TNaming_Tool::CurrentShape(NS); S = TNaming_Tool::CurrentShape(NS);
if (S.IsNull()) if (S.IsNull())
#ifdef DNAMING_DEB
cout <<"current shape from "<< LabelName <<" is deleted"<<endl; cout <<"current shape from "<< LabelName <<" is deleted"<<endl;
#endif
return S; return S;
} }
return S; return S;
@ -561,13 +565,7 @@ void DNaming::SetObjectArg (const Handle(TFunction_Function)& theFunction,
Handle(TNaming_NamedShape) DNaming::GetObjectValue(const Handle(TDataStd_UAttribute)& theObject) Handle(TNaming_NamedShape) DNaming::GetObjectValue(const Handle(TDataStd_UAttribute)& theObject)
{ {
Handle(TNaming_NamedShape) aNS; Handle(TNaming_NamedShape) aNS;
#ifdef DEB
// cout <<"DNaming::GetObjectValue : Obj is NULL = " << theObject.IsNull() <<endl;
// cout << "Object = " << theObject->DynamicType()->Name() <<endl;
// Standard_CString aStrGUID = "00000000-0000-0000-0000-000000000000";
// Standard_GUID aGd = theObject->ID();
// aGd.ShallowDump(cout);
#endif
if(!theObject.IsNull() && theObject->ID() == GEOMOBJECT_GUID) { if(!theObject.IsNull() && theObject->ID() == GEOMOBJECT_GUID) {
Handle(TDF_Reference) aReference; Handle(TDF_Reference) aReference;

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