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

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

2
src/ChFi3d/ChFi3d.cxx
View File

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

24
src/ChFi3d/ChFi3d_Builder.cxx
View File

@@ -250,7 +250,7 @@ void ChFi3d_Builder::Compute()
}
catch(Standard_Failure) {
Handle(Standard_Failure) exc = Standard_Failure::Caught();
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"EXCEPTION Stripe compute " << exc << endl;
#endif
badstripes.Append(itel.Value());
@@ -281,7 +281,7 @@ void ChFi3d_Builder::Compute()
catch(Standard_Failure)
{
Handle(Standard_Failure) exc = Standard_Failure::Caught();
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"EXCEPTION Corner compute " << exc << endl;
#endif
badvertices.Append(myVDataMap.FindKey(j));
@@ -336,7 +336,7 @@ void ChFi3d_Builder::Compute()
}
catch(Standard_Failure) {
Handle(Standard_Failure) exc = Standard_Failure::Caught();
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"EXCEPTION Fillets compute " << exc << endl;
#endif
badstripes.Append(itel.Value());
@@ -488,16 +488,16 @@ void ChFi3d_Builder::Compute()
// display of time for perfs
#ifdef DEB
cout<<endl;
cout<<"COMPUTE: temps total "<<t_total<<"s dont :"<<endl;
cout<<"- Init + ExtentAnalyse "<<t_extent<<"s"<<endl;
cout<<"- PerformSetOfSurf "<<t_perfsetofsurf<<"s"<<endl;
cout<<"- PerformFilletOnVertex "<<t_perffilletonvertex<<"s"<<endl;
cout<<"- FilDS "<<t_filds<<"s"<<endl;
cout<<"- Reconstruction "<<t_reconstruction<<"s"<<endl;
cout<<"- SetRegul "<<t_setregul<<"s"<<endl<<endl;
if(ChFi3d_GettraceCHRON()){
cout<<endl;
cout<<"COMPUTE: temps total "<<t_total<<"s dont :"<<endl;
cout<<"- Init + ExtentAnalyse "<<t_extent<<"s"<<endl;
cout<<"- PerformSetOfSurf "<<t_perfsetofsurf<<"s"<<endl;
cout<<"- PerformFilletOnVertex "<<t_perffilletonvertex<<"s"<<endl;
cout<<"- FilDS "<<t_filds<<"s"<<endl;
cout<<"- Reconstruction "<<t_reconstruction<<"s"<<endl;
cout<<"- SetRegul "<<t_setregul<<"s"<<endl<<endl;
cout<<endl;
cout <<"temps PERFORMSETOFSURF "<<t_perfsetofsurf <<"s dont : "<<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;
}
else{
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"top has more than 3 edges"<<endl;
#endif
sommetpourri = Standard_True;
@@ -594,7 +594,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
}
if(nbf>3) {
Spine->SetFirstStatus(ChFiDS_BreakPoint);
#if DEB
#if CHFI3D_DEB
cout<<"top has : "<<nbf<<" faces."<<endl;
#endif
}
@@ -610,7 +610,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
}
if(nbf>3) {
Spine->SetLastStatus(ChFiDS_BreakPoint);
#if DEB
#if CHFI3D_DEB
cout<<"top has : "<<nbf<<" faces."<<endl;
#endif
}

22
src/ChFi3d/ChFi3d_Builder_2.cxx
View File

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

114
src/ChFi3d/ChFi3d_Builder_6.cxx
View File

@@ -274,7 +274,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
}
else {
//(2) Intersection
#ifdef DEB
#ifdef CHFI3D_DEB
cout<< "CompParam : bad intersection parameters"<<endl;
#endif
IntRes2d_IntersectionPoint int2d;
@@ -289,7 +289,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
if (!Intersection.IsEmpty()){
nbseg = Intersection.NbSegments();
if ( nbseg > 0 ){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<< "segments of intersection on the restrictions"<<endl;
#endif
}
@@ -311,7 +311,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
if(!found){
// (3) Projection...
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"CompParam : failed intersection PC, projection is created."<<endl;
#endif
parc = prefarc;
@@ -321,7 +321,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
// This happens in some cases when there is a vertex
// at the end of spine...
ptg = preftg;
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"CompParam : failed proj p2d/c2d, the extremity is taken!" <<endl;
#endif
}
@@ -542,12 +542,12 @@ Standard_Boolean ChFi3d_Builder::CompleteData
tolappangle, // Contact G1
myConti, Degmax, Segmax);
if (!approx.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Approximation non faite !!!" << endl;
#endif
return Standard_False;
}
#ifdef DEB
#ifdef CHFI3D_DEB
approx.Dump(cout);
#endif
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
myConti);
if (!approx.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Approximation is not done!" << endl;
#endif
return Standard_False;
}
#ifdef DEB
#ifdef CHFI3D_DEB
approx.Dump(cout);
#endif
@@ -615,12 +615,12 @@ Standard_Boolean ChFi3d_Builder::CompleteData
tolappangle, // Contact G1
myConti);
if (!approx.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Approximation non faite !!!" << endl;
#endif
return Standard_False;
}
#ifdef DEB
#ifdef CHFI3D_DEB
approx.Dump(cout);
#endif
@@ -726,7 +726,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
chc.Load(Crv3d1,par1,par2);
if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S1,tolC1,tolcheck)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"aaproximate tolerance under-valued : "<<tolC1<<" for "<<tolcheck<<endl;
#endif
tolC1 = tolcheck;
@@ -779,7 +779,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
approx.Curves2dDegree());
chc.Load(Crv3d2,par1,par2);
if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S2,tolC2,tolcheck)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"approximate tolerance under-evaluated : "<<tolC2<<" for "<<tolcheck<<endl;
#endif
tolC2 = tolcheck;
@@ -959,7 +959,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(!TheWalk.PerformFirstSection(Func,FInv,FInvP,FInvC,PFirst,Target,Soldep,
tolesp,TolGuide,RecRst,RecP,RecS,
NewFirst,ParSol)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl;
#endif
return Standard_False;
@@ -974,7 +974,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
MS,TolGuide,ParSol,tolesp,Fleche,Appro);
if (!TheWalk.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Path not created" << endl;
#endif
return Standard_False;
@@ -982,7 +982,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (reverse) {
if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Not completed" << endl;
#endif
}
@@ -993,14 +993,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"one point of the path MS/50 is attempted."<<endl;
#endif
MS = MS/50.; Target = Targetsov;
}
else if (Nbpnt<=nbptmin && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl;
#endif
Standard_Real u1 = Lin->Point(1).Parameter();
@@ -1010,7 +1010,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Target = Targetsov;
}
else if(Nbpnt<=nbptmin){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl;
#endif
return Standard_False;
@@ -1091,7 +1091,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (!TheWalk.PerformFirstSection(Func, FInv1, FInvP1, FInv2, FInvP2, PFirst, Target, Soldep,
tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2,
NewFirst, ParSol)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::ComputeData : fail calculation first section"<<endl;
#endif
return Standard_False;
@@ -1106,7 +1106,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
MS, TolGuide, ParSol, tolesp, Fleche, Appro);
if (!TheWalk.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Path not done" << endl;
#endif
return Standard_False;
@@ -1114,7 +1114,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (reverse) {
if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Not completed" << endl;
#endif
}
@@ -1125,14 +1125,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"one point of path MS/50 is attempted."<<endl;
#endif
MS = MS/50.; Target = Targetsov;
}
else if (Nbpnt<=nbptmin && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl;
#endif
Standard_Real u1 = Lin->Point(1).Parameter();
@@ -1141,7 +1141,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Target = Targetsov;
}
else if(Nbpnt<=nbptmin){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl;
#endif
return Standard_False;
@@ -1221,7 +1221,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if(!TheWalk.PerformFirstSection(Func,FInv,FInvP,FInvC,PFirst,Target,Soldep,
tolesp,TolGuide,RecRst,RecP,RecS,
NewFirst,ParSol)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::SimulData : fail calculate first section"<<endl;
#endif
@@ -1236,14 +1236,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
TheWalk.Perform (Func,FInv,FInvP,FInvC,NewFirst,Last,
MS,TolGuide,ParSol,tolesp,Fleche,Appro);
if (!TheWalk.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Path not done" << endl;
#endif
return Standard_False;
}
if (reverse) {
if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Not completed" << endl;
#endif
}
@@ -1252,14 +1252,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"one point of path MS/50 is attempted."<<endl;
#endif
MS = MS/50.; Target = Targetsov;
}
else if (Nbpnt <= NbSecMin && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl;
#endif
Standard_Real u1 = Lin->Point(1).Parameter();
@@ -1268,7 +1268,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Target = Targetsov;
}
else if(Nbpnt<=NbSecMin){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl;
#endif
return Standard_False;
@@ -1347,7 +1347,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if(!TheWalk.PerformFirstSection(Func, FInv1, FInvP1, FInv2, FInvP2, PFirst, Target, Soldep,
tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2,
NewFirst,ParSol)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl;
#endif
@@ -1362,14 +1362,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
TheWalk.Perform (Func, FInv1, FInvP1, FInv2, FInvP2, NewFirst, Last,
MS, TolGuide, ParSol, tolesp, Fleche, Appro);
if (!TheWalk.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Path not created" << endl;
#endif
return Standard_False;
}
if (reverse) {
if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Not completed" << endl;
#endif
}
@@ -1378,14 +1378,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
Nbpnt = Lin->NbPoints();
if (Nbpnt <= 1 && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"only one point of path MS/50 is attempted."<<endl;
#endif
MS = MS/50.; Target = Targetsov;
}
else if (Nbpnt <= NbSecMin && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl;
#endif
Standard_Real u1 = Lin->Point(1).Parameter();
@@ -1394,7 +1394,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Target = Targetsov;
}
else if(Nbpnt<=NbSecMin){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl;
#endif
return Standard_False;
@@ -1543,7 +1543,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(!TheWalk.PerformFirstSection(Func,FInv,PFirst,Target,Soldep,
tolesp,TolGuide,RecOnS1,RecOnS2,
NewFirst,ParSol)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl;
#endif
return Standard_False;
@@ -1576,7 +1576,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
TheWalk.Perform(Func,FInv,NewFirst,Target,MS,TolGuide,
ParSol,TolEsp,Fleche,Appro);
if (!TheWalk.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Path is not created" << endl;
#endif
return Standard_False;
@@ -1592,7 +1592,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_Boolean complmnt = Standard_True;
if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast);
if(!complmnt){
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Not completed" << endl;
#endif
return Standard_False;
@@ -1603,7 +1603,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
//- if one has gone far enough.
Nbpnt = Lin->NbPoints();
if (Nbpnt == 0){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"0 point of path, quit."<<endl;
#endif
return Standard_False;
@@ -1628,7 +1628,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
//It drags, the controls are extended, it is expected to evaluate a
//satisfactory maximum step. If it already done, quit.
if(tchernobyl){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"If it drags without control, quit."<<endl;
#endif
return Standard_False;
@@ -1636,14 +1636,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
tchernobyl = Standard_True;
TheWalk.Check(0);
if (Nbpnt == 1){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"only one point of path MS/100 is attempted"<<endl;
cout <<"and the controls are extended."<<endl;
#endif
MS *= 0.01;
}
else{
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"It drags, the controls are extended."<<endl;
#endif
MS = (lpointpar-fpointpar)/Nbpnt; //EvalStep(Lin);
@@ -1651,7 +1651,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
}
else if (Nbpnt < nbptmin){
if(again == 0){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl;
#endif
u1sov = fpointpar;
@@ -1661,13 +1661,13 @@ Standard_Boolean ChFi3d_Builder::ComputeData
else if(again == 1){
if(Abs(fpointpar-u1sov)>=TolGuide ||
Abs(lpointpar-u2sov)>=TolGuide){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, the step is reduced"<<endl;
#endif
MS = (lpointpar - fpointpar) * factor;
}
else{
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl;
#endif
return Standard_False;
@@ -1682,13 +1682,13 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(TheWalk.TwistOnS1()){
Data->TwistOnS1(Standard_True);
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"Path completed, but TWIST on S1"<<endl;
#endif
}
if(TheWalk.TwistOnS2()){
Data->TwistOnS2(Standard_True);
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"Parh completed, but TWIST on S2"<<endl;
#endif
}
@@ -2094,7 +2094,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if(!TheWalk.PerformFirstSection(Func,FInv,PFirst,Target,Soldep,
tolesp,TolGuide,RecOnS1,RecOnS2,
NewFirst,ParSol)){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl;
#endif
return Standard_False;
@@ -2117,7 +2117,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
ParSol,TolEsp,Fleche,Appro);
if (!TheWalk.IsDone()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Path not created" << endl;
#endif
return Standard_False;
@@ -2133,7 +2133,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Standard_Boolean complmnt = Standard_True;
if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast);
if(!complmnt){
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "Not completed" << endl;
#endif
return Standard_False;
@@ -2142,14 +2142,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
Nbpnt = Lin->NbPoints();
Standard_Real factor = 1./(NbSecMin + 1);
if (Nbpnt == 0){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"0 point of path, quit."<<endl;
#endif
return Standard_False;
}
else if (Nbpnt == 1 && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"only one point of path, MS/100 is attempted."<<endl;
#endif
MS *= 0.01; Target = Targetsov;
@@ -2157,7 +2157,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
}
else if (Nbpnt< NbSecMin && again == 0) {
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is too small, the step is reduced"<<endl;
#endif
Standard_Real u1 = u1sov = Lin->Point(1).Parameter();
@@ -2170,21 +2170,21 @@ Standard_Boolean ChFi3d_Builder::SimulData
Standard_Real u2 = Lin->Point(Nbpnt).Parameter();
if(Abs(u1-u1sov)>=TolGuide || Abs(u2-u2sov)>=TolGuide){
again++;
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, the step is reduced"<<endl;
#endif
MS /= 100;
Target = Targetsov;
}
else{
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl;
#endif
return Standard_False;
}
}
else if(Nbpnt < NbSecMin){
#ifdef DEB
#ifdef CHFI3D_DEB
cout <<"Number of points is still too small, quit"<<endl;
#endif
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) {
trafil1 = DStr.Shape(Ishape1).Orientation();
}
#ifdef DEB
#ifdef CHFI3D_DEB
else {
cout<<"erreur"<<endl;
}
@@ -1746,7 +1746,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
trafil1 = TopAbs::Compose(TopAbs::Reverse(Fi1.Transition()),trafil1);
}
#ifdef DEB
#ifdef CHFI3D_DEB
else cout<<"erreur"<<endl;
#endif
// eap, Apr 22 2002, occ 293
@@ -3623,7 +3623,7 @@ Standard_Boolean ChFi3d_Builder::FindFace(const TopoDS_Vertex& V,
const TopoDS_Face& Favoid) const
{
if (P1.IsVertex() || P2.IsVertex()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"change of face on vertex"<<endl;
#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,
IFaCo1,IFaCo2,Okvisavis,Vtx,Standard_True);
if (!Okvisavis) {
#if DEB
#if CHFI3D_DEB
cout<<"TwoCorner : pas de face commune"<<endl;
#endif
done=Standard_False;
@@ -205,14 +205,14 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
}
if (!Okvisavis) {
#if DEB
#if CHFI3D_DEB
cout<<"TwoCorner : no common face"<<endl;
#endif
done=Standard_False;
return done;
}
if (!OkinterCC) {
#if DEB
#if CHFI3D_DEB
cout<<"biseau : failed intersection of tangency lines on common face"<<endl;
#endif
done=Standard_False;
@@ -227,7 +227,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
ChFiDS_CommonPoint& CP2 = Fd2->ChangeVertex(isfirst2,IFaArc2);
if (!CP1.IsOnArc() || !CP2.IsOnArc()) {
#if DEB
#if CHFI3D_DEB
cout<<"fail 1 of 2 fillets are not on arc"<<endl;
#endif
done=Standard_False;
@@ -235,7 +235,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
}
if ( ! CP1.Arc().IsSame( CP2.Arc()) ) {
// 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;
#endif
done = Standard_True;
@@ -279,7 +279,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
}
}
if(!ok1 || !ok2){
#if DEB
#if CHFI3D_DEB
cout<<"fail one of surfaces has no common base face with the pivot edge"<<endl;
#endif
done=Standard_False;
@@ -326,7 +326,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
if (IFaCo1 == 1 &&
!ChFi3d_ComputeCurves(HS1,HS2,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB
#if CHFI3D_DEB
cout<<"failed to calculate bevel error interSS"<<endl;
#endif
done=Standard_False;
@@ -335,7 +335,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
else if (IFaCo1 == 2 &&
!ChFi3d_ComputeCurves(HS1,HS2,Parfin,Pardeb,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB
#if CHFI3D_DEB
cout<<"failed to calculate bevel error interSS"<<endl;
#endif
done=Standard_False;
@@ -471,7 +471,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Reduce(UIntPCSma,UIntPCBig,Hctg);
}
if(!ChFi3d_IntCS(BigHS,Hctg,UVi,wi)){
#if DEB
#if CHFI3D_DEB
cout<<"bevel : failed inter C S"<<endl;
#endif
done=Standard_False;
@@ -485,7 +485,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Standard_Real tolreached;
if (!ChFi3d_ComputeCurves(SmaHS,BigHS,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB
#if CHFI3D_DEB
cout<<"failed to calculate bevel failed interSS"<<endl;
#endif
done=Standard_False;
@@ -574,7 +574,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Adaptor3d_CurveOnSurface consf(c2df,HF);
Handle(Adaptor3d_HCurveOnSurface) Hconsf = new Adaptor3d_HCurveOnSurface(consf);
if(!ChFi3d_IntCS(BigHS,Hconsf,UVi,wi)) {
#if DEB
#if CHFI3D_DEB
cout<<"bevel : failed inter C S"<<endl;
#endif
done=Standard_False;
@@ -607,7 +607,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
if (!ChFi3d_ComputeCurves(HF,BigHS,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB
#if CHFI3D_DEB
cout<<"fail calculation bevel fail interSS"<<endl;
#endif
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;
Standard_Boolean Ok;
Ok = Bat.Compute(Iana,25,1.e-2);
#if DEB
#if CHFI3D_DEB
if (!Ok) {
cout<<"no batten :";
Bat.Dump(cout);
@@ -1330,7 +1330,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
isOnSameDiff = isOnSame && isOnDiff;
}
if ( isOnSameDiff ) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout << "OnSame + OnDiff, PerformMoreThreeCorner() calls PerformOneCorner()" << endl;
#endif
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);
found = ChFi3d_InterPlaneEdge(plan,HE,Nl,First,tolc);
gp_Pnt point = CE.Value(Nl);
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"******* ParamOnSpine() for edge "<<iedge<<endl;
cout<<Nl<<endl;
cout<<"point ped "<<point.X()<<" "<<point.Y()<<" "<<point.Z()<<endl;
#endif
if(found) Nl = Spine->Absc(Nl,ii);
point = Spine->Value(Nl);
#ifdef DEB
#ifdef CHFI3D_DEB
if (found) cout << "found by edge " << ii << " : ";
cout<<Nl<<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 (iSansLast == 0) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"Parsing : Pb of Hatcher"<<endl;
#endif
return 0;
@@ -679,7 +679,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
if(!H1.IsDone(iH1)) return 0;
Nb1 = H1.NbDomains(iH1);
if(Nb1 == 0) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"SplitKPart : tangency line out of the face"<<endl;
#endif
return Standard_False;
@@ -705,7 +705,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
if(!H2.IsDone(iH2)) return 0;
Nb2 = H2.NbDomains(iH2);
if(Nb2 == 0) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"SplitKPart : tangency line out of the face"<<endl;
#endif
return Standard_False;
@@ -747,7 +747,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
// situation, eap occ354
if (C1.IsNull() && C2.IsNull()) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"SplitData : 2 zero lines hatching impossible"<<endl;
#endif
return Standard_False;
@@ -969,7 +969,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
onS = 1;
else
onS = 2;
#ifdef DEB
#ifdef CHFI3D_DEB
if (threeE[0].IsSame(threeE[1]))
cout << "SplitKPart(), wrong corner vertex at switcher search" << endl;
#endif
@@ -1064,7 +1064,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
onS = 1;
else
onS = 2;
#ifdef DEB
#ifdef CHFI3D_DEB
if (threeE[0].IsSame(threeE[1]))
cout << "SplitKPart(), wrong corner vertex at switcher search" << endl;
#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()) {
Standard_Integer nbl = inter.NbLines();
if (nbl > 1) {
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"trop d'intersection entre les surfaces"<<endl;
#endif
}

2
src/ChFi3d/ChFi3d_FilBuilder.cxx
View File

@@ -1766,7 +1766,7 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
}
}
else {
# if DEB
# if CHFI3D_DEB
cout << "Failed calculation of the minimum length" << endl;
# 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.
pivot = SearchPivot(sens,p,tol2d);
if(pivot < 0){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"pivot not found, plate is called"<<endl;
#endif
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]);
ifacfin = CD[fin]->ChangeSetOfSurfData()->Value(i[fin][pivot])->Index(3-jf[fin][pivot]);
if(ifacfin != ifacdeb){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"several base faces, plate is called"<<endl;
#endif
PerformMoreThreeCorner(Jndex, 3);
return;
}
if(i[pivot][deb] != i[pivot][fin]){
#ifdef DEB
#ifdef CHFI3D_DEB
cout<<"load surfdata on the pivot, plate is called"<<endl;
#endif
PerformMoreThreeCorner(Jndex, 3);