mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0025418: Debug output to be limited to OCC development environment
Macros ending on "DEB" are replaced by OCCT_DEBUG across OCCT code; new macros described in documentation. Macros starting with DEB are changed to start with "OCCT_DEBUG_". Some code cleaned.
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
Standard_OStream& TopOpeBRepTool::Print(const TopOpeBRepTool_OutCurveType t,
|
||||
Standard_OStream& OS)
|
||||
{
|
||||
//#ifdef DEB
|
||||
//#ifdef OCCT_DEBUG
|
||||
switch (t) {
|
||||
case TopOpeBRepTool_BSPLINE1 : OS << "BSPLINE1"; break;
|
||||
case TopOpeBRepTool_APPROX : OS << "APPROX"; break;
|
||||
|
@@ -42,7 +42,7 @@
|
||||
#include <TopOpeBRepTool_DRAW.hxx>
|
||||
#endif
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
void debc2dnull(void) {}
|
||||
Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceC2D();
|
||||
#endif
|
||||
@@ -211,7 +211,7 @@ static Handle(Geom2d_Curve) FC2D_make2d(const TopoDS_Edge& E,const TopoDS_Face&
|
||||
f2d = f; l2d = l;
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceC2D() && C2D.IsNull()) {
|
||||
cout<<"#FC2D_make2d1 --> PCurve IsNull"<<endl;
|
||||
}
|
||||
@@ -350,7 +350,7 @@ static Handle(Geom2d_Curve) FC2D_make2d(const TopoDS_Edge& E,const TopoDS_Face&
|
||||
FC2D_translate(C2D,E,F,EF);
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceC2D() && C2D.IsNull()) {
|
||||
cout<<"#FC2D_make2d2 --> PCurve IsNull"<<endl;
|
||||
}
|
||||
|
@@ -31,7 +31,7 @@
|
||||
#include <TopOpeBRepTool_define.hxx>
|
||||
#include <Standard_ProgramError.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#define TBOX TopOpeBRepTool_GettraceBOX()
|
||||
#endif
|
||||
|
||||
@@ -113,7 +113,7 @@ void TopOpeBRepTool_BoxSort::AddBoxes(const TopoDS_Shape& S,const TopAbs_ShapeEn
|
||||
//=======================================================================
|
||||
void TopOpeBRepTool_BoxSort::MakeHAB(const TopoDS_Shape& S,const TopAbs_ShapeEnum TS,const TopAbs_ShapeEnum TA)
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
TopAbs_ShapeEnum t =
|
||||
#endif
|
||||
S.ShapeType();
|
||||
@@ -137,7 +137,7 @@ void TopOpeBRepTool_BoxSort::MakeHAB(const TopoDS_Shape& S,const TopAbs_ShapeEnu
|
||||
AB.ChangeValue(i) = B;
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TBOX) {
|
||||
cout<<"# BS::MakeHAB : ";TopAbs::Print(t,cout);cout<<" : "<<n<<"\n";
|
||||
cout.flush();
|
||||
@@ -196,7 +196,7 @@ void TopOpeBRepTool_BoxSort::MakeCOB(const TopoDS_Shape& S,const TopAbs_ShapeEnu
|
||||
MakeHAB(S,TS,TA);
|
||||
MakeHABCOB(myHAB,myCOB);
|
||||
myBSB.Initialize(myCOB,myHAB);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TBOX) {myHBT->DumpB(myCOB);cout<<";# BS::MakeCOB"<<endl;}
|
||||
#endif
|
||||
}
|
||||
@@ -262,7 +262,7 @@ const MTClioloi& TopOpeBRepTool_BoxSort::Compare(const TopoDS_Shape &S)
|
||||
else L = &myBSB.Compare(myLastCompareShapeBox);
|
||||
myIterator.Initialize(*L);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TBOX) {
|
||||
Standard_Integer nl = (*L).Extent();
|
||||
cout<<"#------------------------"<<endl;
|
||||
|
@@ -137,7 +137,7 @@ Standard_Integer TopOpeBRepTool_CLASSI::ClassiBnd2d(const TopoDS_Shape& S1,const
|
||||
// (Umin(i), Vmin(i), Umax(i), Vmax(i))
|
||||
B(i).Get(UV(i,1), UV(i,3), UV(i,2), UV(i,4));
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = Standard_False;
|
||||
if (trc) {
|
||||
for (Standard_Integer i = 1; i <= 2; i++)
|
||||
|
@@ -36,7 +36,7 @@
|
||||
#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
|
||||
#include <BRep_GCurve.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern Standard_Boolean TopOpeBRepTool_GettraceCORRISO();
|
||||
Standard_EXPORT TopTools_IndexedMapOfShape STATIC_PURGE_mapv;
|
||||
Standard_EXPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds;
|
||||
@@ -44,7 +44,7 @@ Standard_EXPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds;
|
||||
|
||||
static void FUN_RaiseError()
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
// Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
|
||||
FUN_REINIT();
|
||||
// if (trc) cout <<"*********failure in CORRISO***********\n";
|
||||
@@ -52,7 +52,7 @@ static void FUN_RaiseError()
|
||||
}
|
||||
static void FUN_Raise()
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
// cout <<"*********failure in CORRISO***********\n";
|
||||
#endif
|
||||
}
|
||||
@@ -149,7 +149,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
|
||||
TopExp_Explorer ex(S, TopAbs_EDGE);
|
||||
for (; ex.More(); ex.Next()){
|
||||
const TopoDS_Edge& E = TopoDS::Edge(ex.Current());
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
|
||||
(void)iE; // avoid warning
|
||||
#ifdef DRAW
|
||||
@@ -174,7 +174,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
|
||||
TopExp_Explorer exv(E, TopAbs_VERTEX);
|
||||
for (; exv.More(); exv.Next()){
|
||||
const TopoDS_Vertex& v = TopoDS::Vertex(exv.Current());
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
|
||||
(void)iE; // avoid warning
|
||||
#ifdef DRAW
|
||||
@@ -272,7 +272,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::SetConnexity(const TopoDS_Vertex& V, co
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_CORRISO::UVClosed() const
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
|
||||
if (trc) cout<<"** UVClosed"<<endl;
|
||||
#endif
|
||||
@@ -311,7 +311,7 @@ static Standard_Real FUN_getx(const TopoDS_Edge& ,
|
||||
Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfShape& ClEds, TopTools_ListOfShape& fyClEds) const
|
||||
{
|
||||
fyClEds.Clear();
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
|
||||
if (trc) cout<<"* PurgeFyClosingE"<<endl;
|
||||
#endif
|
||||
@@ -446,7 +446,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
Standard_Real tttuvcE = Max(Tol(1,tttolcE),Tol(2,tttolcE));
|
||||
TopOpeBRepTool_C2DF cE2d; Standard_Boolean isb = UVRep(cE,cE2d);
|
||||
if (!isb) return Standard_False; // NYIRAISE
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer icE = STATIC_PURGE_mapeds.Add(cE);
|
||||
if (trc) cout<<"? e"<<icE<<" :"<<endl;
|
||||
#endif
|
||||
@@ -474,7 +474,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
isonOcE2d = (UVvce1.Distance(UVvOcE2) < tol);
|
||||
}
|
||||
if (!isonOcE2d) {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"-> valid edge"<<endl;
|
||||
#endif
|
||||
continue;
|
||||
@@ -489,7 +489,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
if (!isb) return Standard_False; // NYIRAISE
|
||||
|
||||
Standard_Real parvce = TopOpeBRepTool_TOOL::ParE(ivce,cE); gp_Pnt2d UVvce = TopOpeBRepTool_TOOL::UVF(parvce,cE2d);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
// recall in one wire, there are 2 vertices for one non-degenerated closing edge
|
||||
Standard_Integer ivmapv = STATIC_PURGE_mapv.Add(vce);
|
||||
if (trc) {cout<<" connexity for v("<<ivce<<")=v"<<ivmapv;FUN_tool_trace(UVvce);}
|
||||
@@ -504,7 +504,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
for (TopTools_ListIteratorOfListOfShape ite(loe); ite.More(); ite.Next()) {
|
||||
const TopoDS_Edge& E = TopoDS::Edge(ite.Value());
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
|
||||
if (trc) {cout<<" : on e"<<iE<<endl;}
|
||||
#endif
|
||||
@@ -525,7 +525,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
Standard_Boolean samev = ve.IsSame(vce);
|
||||
if (!samev) continue;
|
||||
Standard_Real parve = TopOpeBRepTool_TOOL::ParE(ive,E); gp_Pnt2d UVve = TopOpeBRepTool_TOOL::UVF(parve,E2d);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<" ve("<<ive<<")";FUN_tool_trace(UVve);}
|
||||
#endif
|
||||
if (ive == ivce) continue; // vertex FORWARD connexed to REVERSED one
|
||||
@@ -550,7 +550,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
}
|
||||
if (sameuv) {
|
||||
vceok = Standard_True;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc){cout<<" connexity->ok"<<endl;}
|
||||
#endif
|
||||
}
|
||||
@@ -559,7 +559,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
if (vceok) break;
|
||||
} //ite(loe)
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc && !vceok) {cout<<" connexity->KO"<<endl;}
|
||||
#endif
|
||||
if (vceok) nvcEok++;
|
||||
@@ -567,7 +567,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
|
||||
|
||||
Standard_Boolean isfycE = (nvcEok == 0); // each bound is not connexed to any non-closed edge
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc)
|
||||
{if (isfycE) cout<<"-> faulty edge"<<endl;
|
||||
else cout<<"-> valid edge"<<endl;}
|
||||
@@ -715,7 +715,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgesOUTofBoundsUV(const TopTools_ListO
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E, Standard_Integer& Ivfaulty) const
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
|
||||
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
|
||||
if (trc) cout<<"? e"<<iE<<" :"<<endl;
|
||||
@@ -733,7 +733,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
|
||||
TopTools_Array1OfShape vEs(1,2); TopOpeBRepTool_TOOL::Vertices(E, vEs);
|
||||
Standard_Boolean closed = vEs(1).IsSame(vEs(2));
|
||||
if (closed) {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"closed -> valid edge"<<endl;}
|
||||
#endif
|
||||
return Standard_False; // closed edge is assumed valid
|
||||
@@ -748,7 +748,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
|
||||
TopOpeBRepTool_C2DF C2DF; Standard_Boolean isb = UVRep(E,C2DF);
|
||||
if (!isb) return Standard_False; //NYIRAISE
|
||||
gp_Pnt2d UVvE = TopOpeBRepTool_TOOL::UVF(parvE,C2DF);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
// recall in one wire, there are 2 vertices for one non-degenerated closing edge
|
||||
Standard_Integer ivmapv = STATIC_PURGE_mapv.Add(vE);
|
||||
if (trc) {cout<<" connexity for v("<<ivE<<")=v"<<ivmapv;FUN_tool_trace(UVvE);}
|
||||
@@ -771,7 +771,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
|
||||
const TopoDS_Edge& e = TopoDS::Edge(ite.Value());
|
||||
TopAbs_Orientation oe = e.Orientation();
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer ie = STATIC_PURGE_mapeds.Add(e);
|
||||
if (trc) {cout<<" : on e"<<ie<<endl;}
|
||||
#endif
|
||||
@@ -790,7 +790,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
|
||||
if (!samev) continue;
|
||||
|
||||
Standard_Real pare = TopOpeBRepTool_TOOL::ParE(ive,e); gp_Pnt2d UVve = TopOpeBRepTool_TOOL::UVF(pare,C2DF);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<" ve("<<ive<<")";FUN_tool_trace(UVve);}
|
||||
#endif
|
||||
if (ive == ivE) continue;
|
||||
@@ -802,7 +802,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
|
||||
Standard_Boolean isequal = UVvE.IsEqual(UVve,tttol);
|
||||
if (isequal) {
|
||||
vEok = Standard_True;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc){cout<<" connexity->ok"<<endl;}
|
||||
#endif
|
||||
break;
|
||||
@@ -812,13 +812,13 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
|
||||
} // ite(loe)
|
||||
|
||||
if (!vEok) {nfyv++; Ivfaulty = ivE;}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc && !vEok) {cout<<" connexity->KO"<<endl;}
|
||||
#endif
|
||||
|
||||
} // ivE = 1..2
|
||||
if (nfyv == 2) Ivfaulty = 3;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {if (Ivfaulty == 0) cout<<"-> valid edge"<<endl; else cout<<"-> faulty edge"<<endl;}
|
||||
#endif
|
||||
return (Ivfaulty != 0);
|
||||
@@ -833,7 +833,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgesWithFaultyUV(const TopTools_ListOf
|
||||
TopTools_DataMapOfOrientedShapeInteger& FyEds, const Standard_Boolean stopatfirst) const
|
||||
{
|
||||
FyEds.Clear();
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer ifault = 0;
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
|
||||
if (trc) cout<<endl<<"* EdgesWithFaultyUV"<<endl;
|
||||
@@ -853,7 +853,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgesWithFaultyUV(const TopTools_ListOf
|
||||
if (!faulty) continue;
|
||||
Standard_Integer nfyv = (Ivfaulty == 3)? 2 : 1;
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
ifault++;
|
||||
if (trc) cout<<"e"<<STATIC_PURGE_mapeds.FindIndex(Echk)<<" has ifyv="<<Ivfaulty<<endl;
|
||||
#ifdef DRAW
|
||||
|
@@ -60,7 +60,7 @@
|
||||
#include <Geom_RectangularTrimmedSurface.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#include <TopOpeBRepTool_KRO.hxx>
|
||||
TOPKRO KRO_CURVETOOL_APPRO("approximation");
|
||||
extern Standard_Boolean TopOpeBRepTool_GettraceKRO();
|
||||
@@ -318,7 +318,7 @@ Standard_Boolean TopOpeBRepTool_CurveTool::MakeCurves
|
||||
myGeomTool.GetTolerances(tol3d,tol2d,RelativeTol);
|
||||
Standard_Integer NbPntMax = myGeomTool.NbPntMax();
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceKRO()) KRO_CURVETOOL_APPRO.Start();
|
||||
#endif
|
||||
|
||||
@@ -682,7 +682,7 @@ Standard_Boolean TopOpeBRepTool_CurveTool::MakeCurves
|
||||
GeomLib_CheckBSplineCurve cbsc(Curve, 1.e-7, 0.1);
|
||||
cbsc.NeedTangentFix(bf, bl);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceCHKBSPL()) {
|
||||
if(bf || bl) {
|
||||
cout<<"Problem orientation GeomLib_CheckBSplineCurve : First = "<<bf;
|
||||
@@ -697,7 +697,7 @@ Standard_Boolean TopOpeBRepTool_CurveTool::MakeCurves
|
||||
if(!Curve2df.IsNull()) {
|
||||
GeomLib_Check2dBSplineCurve cbsc2df(Curve2df, 1.e-7, 0.1);
|
||||
cbsc2df.NeedTangentFix(bf, bl);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceCHKBSPL()) {
|
||||
if(bf || bl) {
|
||||
cout<<"Problem orientation GeomLib_CheckBSplineCurve : First = "<<bf;
|
||||
@@ -712,7 +712,7 @@ Standard_Boolean TopOpeBRepTool_CurveTool::MakeCurves
|
||||
if(!Curve2ds.IsNull()) {
|
||||
GeomLib_Check2dBSplineCurve cbsc2ds(Curve2ds, 1.e-7, 0.1);
|
||||
cbsc2ds.NeedTangentFix(bf, bl);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceCHKBSPL()) {
|
||||
if(bf || bl) {
|
||||
cout<<"Problem orientation GeomLib_CheckBSplineCurve : First = "<<bf;
|
||||
@@ -723,7 +723,7 @@ Standard_Boolean TopOpeBRepTool_CurveTool::MakeCurves
|
||||
cbsc2ds.FixTangent(bf, bl);
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceKRO()) KRO_CURVETOOL_APPRO.Stop();
|
||||
#endif
|
||||
// cout << "MakeCurves end" << endl;
|
||||
@@ -858,7 +858,7 @@ Standard_Boolean TopOpeBRepTool_CurveTool::IsProjectable
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettracePCURV()) {
|
||||
cout<<"--- IsProjectable : ";
|
||||
if (projectable) cout<<"projectable"<<endl;
|
||||
|
@@ -71,7 +71,7 @@
|
||||
#include <Geom2d_BSplineCurve.hxx>
|
||||
#include <BSplCLib.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern Standard_Boolean TopOpeBRepBuild_GettraceFE();
|
||||
#endif
|
||||
|
||||
@@ -227,11 +227,11 @@ TopoDS_Shape& TopOpeBRepTool_FuseEdges::Shape()
|
||||
void TopOpeBRepTool_FuseEdges::BuildListEdges()
|
||||
{
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
|
||||
#endif
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : BuildListEdges "<<endl;
|
||||
#endif
|
||||
|
||||
@@ -281,11 +281,11 @@ void TopOpeBRepTool_FuseEdges::BuildListEdges()
|
||||
void TopOpeBRepTool_FuseEdges::BuildListResultEdges()
|
||||
{
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
|
||||
#endif
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : BuildListResultEdges "<<endl;
|
||||
#endif
|
||||
|
||||
@@ -303,7 +303,7 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges()
|
||||
for (itLstEdg.Initialize(myMapLstEdg); itLstEdg.More(); itLstEdg.Next()) {
|
||||
const Standard_Integer& iLst = itLstEdg.Key();
|
||||
const TopTools_ListOfShape& LmapEdg = myMapLstEdg.Find(iLst);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
TopTools_ListIteratorOfListOfShape itEdg;
|
||||
#endif
|
||||
|
||||
@@ -329,7 +329,7 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges()
|
||||
C = (*((Handle(Geom_TrimmedCurve)*)&C))->BasisCurve();
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : Creating New Edge "<<endl;
|
||||
#endif
|
||||
|
||||
@@ -340,7 +340,7 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges()
|
||||
// the curve which is not infinite and limited to old vertices
|
||||
// we try to use ExtendCurveToPoint, then rebuild the NewEdge
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : MakeEdge failed. Trying to Extend Curve "<<endl;
|
||||
#endif
|
||||
Handle(Geom_BoundedCurve) ExtC = Handle(Geom_BoundedCurve)::DownCast(C->Copy());
|
||||
@@ -360,7 +360,7 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges()
|
||||
|
||||
NewEdge = ME.Edge();
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : Updating pcurve "<<endl;
|
||||
#endif
|
||||
if (UpdatePCurve(OldEdge,NewEdge,LmapEdg))
|
||||
@@ -380,7 +380,7 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges()
|
||||
void TopOpeBRepTool_FuseEdges::Perform()
|
||||
{
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean tFE = TopOpeBRepBuild_GettraceFE();
|
||||
#endif
|
||||
|
||||
@@ -388,7 +388,7 @@ void TopOpeBRepTool_FuseEdges::Perform()
|
||||
BuildListResultEdges();
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : Perform "<<endl;
|
||||
#endif
|
||||
|
||||
@@ -423,7 +423,7 @@ void TopOpeBRepTool_FuseEdges::Perform()
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : Building New Shape "<<endl;
|
||||
#endif
|
||||
|
||||
@@ -444,7 +444,7 @@ void TopOpeBRepTool_FuseEdges::Perform()
|
||||
myShape=(Bsub.Copy(myShape)).First();
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (tFE) cout<<endl<<"FuseEdges : "<< NbVertices() <<" vertices removed"<<endl;
|
||||
#endif
|
||||
|
||||
@@ -651,7 +651,7 @@ Standard_Boolean TopOpeBRepTool_FuseEdges::SameSupport(const TopoDS_Edge& E1,
|
||||
typC1 != STANDARD_TYPE(Geom_Ellipse) &&
|
||||
typC1 != STANDARD_TYPE(Geom_BSplineCurve) &&
|
||||
typC1 != STANDARD_TYPE(Geom_BezierCurve)) {
|
||||
#ifdef TOPOPEBREPTOOL_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << " TopOpeBRepTool_FuseEdge : Type de Support non traite" << endl;
|
||||
#endif
|
||||
return Standard_False;
|
||||
|
@@ -154,7 +154,7 @@ Standard_EXPORT gp_Dir FUN_tool_ngS(const gp_Pnt2d& p2d,const Handle(Geom_Surfac
|
||||
return ng;
|
||||
}
|
||||
}
|
||||
#ifdef TOPOPEBREPTOOL_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"FUN_tool_nggeomF NYI"<<endl;
|
||||
#endif
|
||||
return gp_Dir(0,0,1);
|
||||
|
@@ -27,7 +27,7 @@
|
||||
#include <TopOpeBRepTool_define.hxx>
|
||||
#include <Precision.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#define TBOX TopOpeBRepTool_GettraceBOX()
|
||||
#endif
|
||||
|
||||
@@ -69,7 +69,7 @@ void TopOpeBRepTool_HBoxTool::AddBoxes(const TopoDS_Shape& S,const TopAbs_ShapeE
|
||||
//=======================================================================
|
||||
void TopOpeBRepTool_HBoxTool::AddBox(const TopoDS_Shape& S)
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
TopAbs_ShapeEnum t =
|
||||
#endif
|
||||
S.ShapeType();
|
||||
@@ -79,7 +79,7 @@ void TopOpeBRepTool_HBoxTool::AddBox(const TopoDS_Shape& S)
|
||||
Bnd_Box B;
|
||||
ComputeBox(S,B);
|
||||
myIMS.Add(S,B);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TBOX) {
|
||||
DumpB(Box(S));cout<<"; # HBT::AddBox "<<Index(S)<<" : ";TopAbs::Print(t,cout);cout<<"\n";cout<<endl;
|
||||
}
|
||||
@@ -224,7 +224,7 @@ const TopOpeBRepTool_IndexedDataMapOfShapeBox& TopOpeBRepTool_HBoxTool::IMS() co
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
void TopOpeBRepTool_HBoxTool::DumpB
|
||||
#ifdef TOPOPEBREPTOOL_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
(const Bnd_Box& B)
|
||||
{
|
||||
if (B.IsVoid()) cout<<"# IsVoid";
|
||||
|
@@ -16,7 +16,7 @@
|
||||
|
||||
#ifndef _TopOpeBRepTool_KRO_HeaderFile
|
||||
#define _TopOpeBRepTool_KRO_HeaderFile
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#include <OSD_Chronometer.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <Standard_OStream.hxx>
|
||||
|
@@ -41,7 +41,7 @@
|
||||
#include <Standard_Failure.hxx>
|
||||
#include <TopOpeBRepTool_PURGE.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
//Standard_EXPORT Standard_Integer STATIC_PURGE_iwi = 0;
|
||||
//Standard_EXPORT TopTools_IndexedMapOfShape STATIC_PURGE_mapw, STATIC_PURGE_mapv;
|
||||
//Standard_EXPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds, STATIC_CORR_mapeds;
|
||||
@@ -214,7 +214,7 @@ Standard_Boolean TopOpeBRepTool::PurgeClosingEdges(const TopoDS_Face& Fin, const
|
||||
// elsewhere : we have to get this information using geometric
|
||||
// criteriums (TopOpeBRepTool_TOOL::IsonCLO)
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettracePURGE();
|
||||
if (trc) cout<<"\n* PurgeClosingEdges:\n\n";
|
||||
#endif
|
||||
@@ -263,7 +263,7 @@ Standard_Boolean TopOpeBRepTool::PurgeClosingEdges(const TopoDS_Face& Fin, const
|
||||
MshNOK.Add(FF);
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc && topurge) cout<<"found FAULTY edge = ed"<<endl;
|
||||
#endif
|
||||
} // exw
|
||||
@@ -364,7 +364,7 @@ static Standard_Boolean FUN_correctDegeneratedE
|
||||
Standard_Boolean ok = (fEin && fe1 && fe2);
|
||||
if (!ok) return Standard_False;
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
debcorrUV(); // call Draw_Call("av2d;dy fyf;fit;ppcu fyf")
|
||||
#endif
|
||||
|
||||
@@ -409,7 +409,7 @@ static Standard_Boolean FUN_correctDegeneratedE
|
||||
}
|
||||
else {
|
||||
// redefinition des parametres de v1,v2 de Ein tels que des parametres de
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceCORRISO()) {
|
||||
cout<<"FUN_correctDegeneratedE : !mmd NYI"<<endl;
|
||||
}
|
||||
@@ -599,7 +599,7 @@ static Standard_Boolean FUN_connexX(const Standard_Boolean onU, TopOpeBRepTool_C
|
||||
Standard_Boolean TopOpeBRepTool::CorrectONUVISO(const TopoDS_Face& Fin, TopoDS_Face& Fsp)
|
||||
// <Fref> is x-periodic
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceCORRISO();
|
||||
if (trc) cout<<"\n#### CorrectONUVISO ####\n\n";
|
||||
debcorrUV();
|
||||
@@ -702,7 +702,7 @@ Standard_Boolean TopOpeBRepTool::CorrectONUVISO(const TopoDS_Face& Fin, TopoDS_F
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {
|
||||
cout<<"CorrectONUVISO ";
|
||||
cout<<"iso faulty "<<tocorrectisoe<<" deg faulty "<<tocorrectdege<<endl;;
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#include <TopTools_Array1OfShape.hxx>
|
||||
#include <gp_Pnt2d.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern void FUN_REINIT();
|
||||
extern Standard_Integer FUN_addepc(const TopoDS_Shape& ed,const TopoDS_Shape& f);
|
||||
extern Standard_Integer FUN_addcheckepc(const TopoDS_Shape& ed,const TopoDS_Shape& f);
|
||||
|
@@ -43,7 +43,7 @@
|
||||
#define EXTERNAL (4)
|
||||
#define CLOSING (5)
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern Standard_Boolean TopOpeBRepTool_GettraceREGUSO();
|
||||
static TopTools_IndexedMapOfShape STATIC_mape, STATIC_mapf, STATIC_mapw, STATIC_mapsh;
|
||||
static Standard_Integer FUN_adds(const TopoDS_Shape& s) {
|
||||
@@ -63,7 +63,7 @@ static Standard_Integer FUN_adds(const TopoDS_Shape& s) {
|
||||
|
||||
static void FUN_Raise()
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
if (trc) cout<<"***** Failure in REGUS **********"<<endl;
|
||||
// Standard_Failure::Raise("REGUS");
|
||||
@@ -165,7 +165,7 @@ void TopOpeBRepTool_REGUS::GetOshNsh(TopTools_DataMapOfShapeListOfShape& OshNsh)
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_REGUS::MapS()
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
Standard_Integer ish = FUN_adds(S());
|
||||
if (trc) cout<<"** MAPPING ** shape"<<ish<<endl;
|
||||
@@ -194,7 +194,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::MapS()
|
||||
const TopTools_ListOfShape& lof = itm.Value();
|
||||
Standard_Integer nf = lof.Extent();
|
||||
if (nf > 2) mymapemult.Add(e);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {
|
||||
cout <<"co(e"<<FUN_adds(e)<<")= ";
|
||||
TopTools_ListIteratorOfListOfShape it(lof);
|
||||
@@ -212,7 +212,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::MapS()
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_REGUS::WireToFace(const TopoDS_Face& Fanc, const TopTools_ListOfShape& nWs, TopTools_ListOfShape& nFs)
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
#endif
|
||||
nFs.Clear();
|
||||
@@ -224,7 +224,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::WireToFace(const TopoDS_Face& Fanc, const
|
||||
|
||||
Standard_Boolean classifok = classi.Classilist(nWs,mapWlow);
|
||||
if (!classifok) {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"** classif fails"<<endl;
|
||||
#endif
|
||||
return Standard_False;
|
||||
@@ -232,7 +232,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::WireToFace(const TopoDS_Face& Fanc, const
|
||||
|
||||
Standard_Boolean facesbuilt = TopOpeBRepTool_TOOL::WireToFace(Fanc, mapWlow, nFs);
|
||||
if (!facesbuilt) {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"** facesbuilt fails"<<endl;
|
||||
#endif
|
||||
return Standard_False;
|
||||
@@ -340,7 +340,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::SplitF(const TopoDS_Face& Fanc, TopTools_
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_REGUS::SplitFaces()
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
Standard_Integer ish = FUN_adds(S());
|
||||
if (trc) cout<<"** SPLITTING FACES ** shape"<<ish<<endl;
|
||||
@@ -381,7 +381,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::SplitFaces()
|
||||
}//exe(fsp)
|
||||
}//itf(lfsp)
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {
|
||||
cout <<"split(f"<<FUN_adds(f)<<")= ";
|
||||
TopTools_ListIteratorOfListOfShape it(lfsp);
|
||||
@@ -427,7 +427,7 @@ static void FUN_update(const TopoDS_Shape& fcur, TopTools_MapOfShape& edstoconne
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_REGUS::REGU()
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
Standard_Integer ishe = FUN_adds(myS);
|
||||
if (trc) cout<<"** REGU **"<<ishe<<endl;
|
||||
@@ -458,7 +458,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::REGU()
|
||||
Standard_Boolean startBlock = mylFinBlock.IsEmpty();
|
||||
Standard_Boolean endBlock = myedstoconnect.IsEmpty() && (!startBlock);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean tr=Standard_False;
|
||||
if (tr) {
|
||||
TopTools_MapIteratorOfMapOfShape it(myedstoconnect);
|
||||
@@ -475,7 +475,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::REGU()
|
||||
Standard_Integer nFcur = mylFinBlock.Extent();
|
||||
Standard_Boolean unchanged = (nFcur==myoldnF) && (mynF==myoldnF);
|
||||
if (unchanged) {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"#** shell"<<ishe<<" valid\n";
|
||||
#endif
|
||||
return Standard_False; // nyi analysis if we should raise or not
|
||||
@@ -483,7 +483,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::REGU()
|
||||
else {
|
||||
TopoDS_Shell newShe; TopOpeBRepTool_TOOL::MkShell(mylFinBlock,newShe);
|
||||
Splits.Append(newShe);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"#** shell "<<ishe<<" gives new shell "<<FUN_adds(newShe)<<endl;
|
||||
for (TopTools_ListIteratorOfListOfShape it(mylFinBlock); it.More(); it.Next()) cout <<";dins f"<<FUN_adds(it.Value());
|
||||
cout<<endl<<endl;}
|
||||
@@ -556,7 +556,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::InitBlock()
|
||||
const TopTools_ListOfShape& lof = mymapeFs.Find(e);
|
||||
if (lof.IsEmpty()) {mymapeFs.UnBind(e); continue;}
|
||||
myf = lof.First();
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
if (trc) cout<<"* Block : first face = f"<<FUN_adds(myf)<<endl;
|
||||
#endif
|
||||
@@ -572,7 +572,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::InitBlock()
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_REGUS::NextinBlock()
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
#endif
|
||||
// we try to connect first edge of <myf> bound in <myedstoconnect>
|
||||
@@ -641,7 +641,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NextinBlock()
|
||||
const TopTools_ListOfShape& lof = mymapeFs.Find(e); Standard_Integer nf = lof.Extent();
|
||||
if (nf == 0) {myedstoconnect.Remove(e); mymapeFs.UnBind(e);
|
||||
continue;}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"e"<<FUN_adds(e)<<" on "<<nf<<" untouched f:"<<endl;}
|
||||
#endif
|
||||
if (nf == 1) myf = lof.First();
|
||||
@@ -650,7 +650,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NextinBlock()
|
||||
if (!ok) return Standard_False;
|
||||
myf = ffound;
|
||||
}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"->myf = f"<<FUN_adds(myf)<<endl;
|
||||
#endif
|
||||
return Standard_True;
|
||||
@@ -689,7 +689,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NearestF(const TopoDS_Edge& e, const TopT
|
||||
// NYIXPU!!!!!!!! if (xx1 tg xx2) -> use curvatures
|
||||
//
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUSO();
|
||||
#endif
|
||||
ffound.Nullify();
|
||||
@@ -722,7 +722,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NearestF(const TopoDS_Edge& e, const TopT
|
||||
if (!ok) {FUN_Raise(); return Standard_False;}
|
||||
|
||||
Standard_Boolean oppo = TopOpeBRepTool_TOOL::Matter(x,y,xxfound,ntfound,tola, angfound);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc&&!oppo) cout<<" f"<<FUN_adds(fref)<<",f"<<FUN_adds(ffound)<<" not oppo"<<endl;
|
||||
#endif
|
||||
if (!oppo) {ffound.Nullify(); continue;}
|
||||
@@ -734,7 +734,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NearestF(const TopoDS_Edge& e, const TopT
|
||||
ok = TopOpeBRepTool_TOOL::MatterKPtg(fref,ffound,e,angfound);
|
||||
if (!ok) {FUN_Raise(); return Standard_False;}
|
||||
}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<" ang("<<"f"<<FUN_adds(fref)<<",f"<<FUN_adds(ffound)<<")="<<angfound<<endl;
|
||||
#endif
|
||||
break;
|
||||
@@ -753,7 +753,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NearestF(const TopoDS_Edge& e, const TopT
|
||||
|
||||
Standard_Real angi = 0;
|
||||
Standard_Boolean oppo = TopOpeBRepTool_TOOL::Matter(x,y,xxi,nti,tola, angi);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc&&!oppo) cout<<" f"<<FUN_adds(fref)<<",f"<<FUN_adds(fi)<<" not oppo"<<endl;
|
||||
#endif
|
||||
if (!oppo) continue;
|
||||
@@ -765,7 +765,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NearestF(const TopoDS_Edge& e, const TopT
|
||||
ok = TopOpeBRepTool_TOOL::MatterKPtg(fref,fi,e,angi);
|
||||
if (!ok) {FUN_Raise(); return Standard_False;}
|
||||
}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<" ang("<<"f"<<FUN_adds(fref)<<",f"<<FUN_adds(fi)<<")="<<angi<<endl;
|
||||
#endif
|
||||
if (angi > angfound) continue;
|
||||
|
@@ -40,7 +40,7 @@
|
||||
#define M_INTERNAL(ori) (ori == TopAbs_INTERNAL)
|
||||
#define M_EXTERNAL(ori) (ori == TopAbs_EXTERNAL)
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern Standard_Boolean TopOpeBRepTool_GettraceREGUFA();
|
||||
static TopTools_IndexedMapOfShape STATIC_mapf, STATIC_mapw, STATIC_mapv;
|
||||
static TopTools_IndexedMapOfOrientedShape STATIC_mapeds;
|
||||
@@ -75,7 +75,7 @@ void FUN_tool_Add(TopTools_DataMapOfShapeListOfShape& map,const TopoDS_Shape& ke
|
||||
else {TopTools_ListOfShape los; los.Append(subitem); map.Bind(key,los);}
|
||||
}
|
||||
static void FUN_Raise() {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<"*** Raise REGUW"<<endl;
|
||||
// Standard_Failure::Raise("REGUW");
|
||||
@@ -161,7 +161,7 @@ void TopOpeBRepTool_REGUW::GetOwNw(TopTools_DataMapOfShapeListOfShape& OwNw) con
|
||||
Standard_Boolean TopOpeBRepTool_REGUW::SplitEds()
|
||||
{
|
||||
if (!HasInit()) Standard_Failure::Raise("TopOpeBRepTool_REGUW : NO INIT");
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<"** SPLITTING EDGES **"<<endl;
|
||||
#endif
|
||||
@@ -183,7 +183,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::SplitEds()
|
||||
if (isdone) splits.Assign(myEsplits.Find(e));
|
||||
else issp = TopOpeBRepTool_TOOL::SplitE(e,splits);
|
||||
if (issp) hasnewsplits = Standard_True;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"e"<<FUN_adds(e)<<" gives splits ="<<endl;
|
||||
#endif
|
||||
if (!(issp || isdone)) continue; //nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnyi
|
||||
@@ -192,7 +192,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::SplitEds()
|
||||
TopTools_ListIteratorOfListOfShape ite(splits);
|
||||
for (; ite.More(); ite.Next()){
|
||||
const TopoDS_Shape& esp = ite.Value();
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<" e"<<FUN_adds(esp);}
|
||||
#endif
|
||||
TopExp_Explorer exvv(esp, TopAbs_VERTEX);
|
||||
@@ -205,7 +205,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::SplitEds()
|
||||
co.AddItem(ivv,esp);
|
||||
}//exvv(exvv,VERTEX)
|
||||
}//ite(splits)
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<endl;
|
||||
#endif
|
||||
}
|
||||
@@ -272,7 +272,7 @@ void TopOpeBRepTool_REGUW::InitStep(const TopoDS_Shape& S)
|
||||
Standard_Boolean TopOpeBRepTool_REGUW::MapS()
|
||||
{
|
||||
if (!HasInit()) Standard_Failure::Raise("TopOpeBRepTool_REGUW : NO INIT");
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<"** MAPPING **"<<endl;
|
||||
#endif
|
||||
@@ -345,7 +345,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::MapS()
|
||||
}//exv
|
||||
}//exe
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {
|
||||
for (Standard_Integer iv = 1; iv <= mymapvEds.Extent(); iv++) {
|
||||
const TopoDS_Vertex& v = TopoDS::Vertex(mymapvEds.FindKey(iv));
|
||||
@@ -426,7 +426,7 @@ static void FUN_nextdata(const Standard_Integer iStep,const TopoDS_Edge& e,const
|
||||
Standard_Boolean TopOpeBRepTool_REGUW::InitBlock()
|
||||
{
|
||||
if (!HasInit()) Standard_Failure::Raise("TopOpeBRepTool_REGUW : NO INIT");
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
#endif
|
||||
|
||||
@@ -488,7 +488,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::InitBlock()
|
||||
for (; exv.More(); exv.Next()){
|
||||
const TopoDS_Shape& vcur = exv.Current();
|
||||
TopOpeBRepTool_connexity& cco = mymapvEds.ChangeFromKey(vcur);
|
||||
//#ifdef DEB
|
||||
//#ifdef OCCT_DEBUG
|
||||
// Standard_Boolean ok =
|
||||
//#endif
|
||||
cco.RemoveItem(myed);
|
||||
@@ -505,7 +505,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::InitBlock()
|
||||
// myv, myp2d, mytg2d :
|
||||
::FUN_nextdata(iStep,myed,pc, myv,myp2d,mytg2d);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {
|
||||
cout<<endl<<" v0 = v"<<FUN_adds(myv0)<<" p2d0 = ("<<myp2d0.X()<<" "<<myp2d0.Y()<<")"<<endl;
|
||||
cout<<" vcur = v"<<FUN_adds(myv)<<" p2d = ("<<myp2d.X()<<" "<<myp2d.Y()<<")"<<endl;
|
||||
@@ -522,7 +522,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::InitBlock()
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe, TopoDS_Edge& efound) const
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
#endif
|
||||
|
||||
@@ -546,7 +546,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe,
|
||||
Standard_Real angfound = 1.e7;
|
||||
if (iStep == 1) angfound = TopOpeBRepTool_TOOL::Matter(mytg2d,tg2dfound);
|
||||
else angfound = 2.*M_PI - TopOpeBRepTool_TOOL::Matter(tg2dfound,mytg2d);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"ang(e"<<FUN_adds(myed)<<",e"<<FUN_adds(efound)<<")="<<angfound<<endl;
|
||||
#endif
|
||||
|
||||
@@ -569,7 +569,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe,
|
||||
if (iStep == 1) angi = TopOpeBRepTool_TOOL::Matter(mytg2d,tg2di);
|
||||
else angi = 2.*M_PI - TopOpeBRepTool_TOOL::Matter(tg2di,mytg2d);
|
||||
Standard_Boolean eq = Abs(angi-angfound) < tola;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"ang(e"<<FUN_adds(myed)<<",e"<<FUN_adds(ei)<<")="<<angi<<endl;
|
||||
#endif
|
||||
if (eq) {
|
||||
@@ -590,7 +590,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe,
|
||||
Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
|
||||
{
|
||||
if (!HasInit()) Standard_Failure::Raise("TopOpeBRepTool_REGUW : NO INIT");
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<endl<<" vcur = v"<<FUN_adds(myv)<<" p2d = ("<<myp2d.X()<<" "<<myp2d.Y()<<")"<<endl;
|
||||
#endif
|
||||
@@ -606,13 +606,13 @@ Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
|
||||
TopTools_ListIteratorOfListOfShape ite(le);
|
||||
while (ite.More()) {
|
||||
const TopoDS_Edge& e = TopoDS::Edge(ite.Value());
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<" e"<<FUN_adds(e);
|
||||
#endif
|
||||
|
||||
Standard_Boolean issame = e.IsSame(myed);
|
||||
if (issame) {//xpu240299 FRA60275, fsp4
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<" is same : not valid"<<endl;
|
||||
#endif
|
||||
le.Remove(ite); continue;
|
||||
@@ -628,7 +628,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
|
||||
Standard_Boolean samep2d = p2de.IsEqual(myp2d,mytol2d);
|
||||
if (!samep2d) le.Remove(ite);
|
||||
else ite.Next();
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {if (samep2d) cout<<" valid"<<endl;
|
||||
else cout<<" not valid"<<endl;}
|
||||
#endif
|
||||
@@ -648,7 +648,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
|
||||
TopExp_Explorer exv(myed, TopAbs_VERTEX);
|
||||
for (; exv.More(); exv.Next()){
|
||||
TopOpeBRepTool_connexity& cco = mymapvEds.ChangeFromKey(exv.Current());
|
||||
//#ifdef DEB
|
||||
//#ifdef OCCT_DEBUG
|
||||
// Standard_Boolean ok =
|
||||
//#endif
|
||||
cco.RemoveItem(myed);
|
||||
@@ -659,7 +659,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
|
||||
Standard_Real f,l,tol; const Handle(Geom2d_Curve)& pc = c2df.PC(f,l,tol);
|
||||
::FUN_nextdata(iStep,myed,pc, myv,myp2d,mytg2d);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {
|
||||
cout<<" vcur = v"<<FUN_adds(myv)<<" p2d = ("<<myp2d.X()<<" "<<myp2d.Y()<<")"<<endl;
|
||||
cout<<" ecur = e"<<FUN_adds(myed)<<endl;
|
||||
@@ -674,7 +674,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
|
||||
//=======================================================================
|
||||
|
||||
Standard_Boolean TopOpeBRepTool_REGUW::REGU(const Standard_Integer istep,
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
const TopoDS_Shape& Scur,
|
||||
#else
|
||||
const TopoDS_Shape& ,
|
||||
@@ -683,7 +683,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::REGU(const Standard_Integer istep,
|
||||
{
|
||||
if (!HasInit()) Standard_Failure::Raise("TopOpeBRepTool_REGUW : NO INIT");
|
||||
iStep = istep;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<endl<<"** REGU istep=**"<<iStep<<endl;
|
||||
#endif
|
||||
@@ -745,7 +745,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::REGU(const Standard_Integer istep,
|
||||
if (isinit0 && !FINI) {
|
||||
Standard_Boolean ok = InitBlock();
|
||||
if (!ok) {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"** InitBlock fails"<<endl;
|
||||
#endif
|
||||
{FUN_Raise(); return Standard_False;}
|
||||
@@ -787,7 +787,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::REGU(const Standard_Integer istep,
|
||||
// is valid and unchanged.
|
||||
Standard_Boolean onewok = FINI && loW.IsEmpty() && !hasnewsplits;
|
||||
if (onewok){
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"wire "<<FUN_adds(Scur)<<" is found valid\n";
|
||||
#endif
|
||||
return Standard_True;
|
||||
@@ -796,12 +796,12 @@ Standard_Boolean TopOpeBRepTool_REGUW::REGU(const Standard_Integer istep,
|
||||
TopoDS_Wire newW; Standard_Boolean wiok = FUN_tool_MakeWire(loEcur, newW);
|
||||
if (wiok) loW.Append(newW);
|
||||
else {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"** FUN_tool_MakeWire fails"<<endl;
|
||||
#endif
|
||||
{FUN_Raise(); return Standard_False;}
|
||||
}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"#->new wire = wi"<<FUN_adds(newW)<<" = ";
|
||||
for (TopTools_ListIteratorOfListOfShape it(loEcur); it.More(); it.Next())
|
||||
cout<<" e"<<FUN_adds(it.Value());
|
||||
@@ -822,7 +822,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::REGU(const Standard_Integer istep,
|
||||
// <v> is in <ed>, <p2d> = <v> current UV representation
|
||||
Standard_Boolean gotonext = NextinBlock();
|
||||
if (!gotonext) {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"** NextinBlock fails"<<endl;
|
||||
#endif
|
||||
{FUN_Raise(); return Standard_False;}
|
||||
@@ -921,7 +921,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::AddNewConnexity(const TopoDS_Vertex& v, c
|
||||
TopOpeBRepTool_connexity& co = mymapvEds.ChangeFromKey(v);
|
||||
co.AddItem(OriKey,e);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc)
|
||||
{cout<<"** setting new connexity : v"<<FUN_adds(v)<<" is ";FUN_tro(OriKey);
|
||||
@@ -950,7 +950,7 @@ Standard_Boolean TopOpeBRepTool_REGUW::RemoveOldConnexity(const TopoDS_Vertex& v
|
||||
ok = co.RemoveItem(OriKey,e);
|
||||
if (!ok) return Standard_False;
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc)
|
||||
{cout<<"** removing old connexity : v"<<FUN_adds(v)<<" for e"<<FUN_adds(e);FUN_tool_tori(e.Orientation());
|
||||
|
@@ -40,7 +40,7 @@
|
||||
#define M_INTERNAL(sta) (sta == TopAbs_INTERNAL)
|
||||
#define M_EXTERNAL(sta) (sta == TopAbs_EXTERNAL)
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern Standard_Boolean TopOpeBRepTool_GettraceREGUFA();
|
||||
static TopTools_IndexedMapOfShape STATIC_mapw,STATIC_mapf;
|
||||
static Standard_Integer FUN_adds(const TopoDS_Shape& s) {
|
||||
@@ -192,7 +192,7 @@ Standard_Boolean TopOpeBRepTool::Regularize(const TopoDS_Face& theFace,
|
||||
// (Umin(i), Vmin(i), Umax(i), Vmax(i))
|
||||
B(i).Get(UV(i,1), UV(i,3), UV(i,2), UV(i,4));
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = Standard_False;
|
||||
if (trc) {
|
||||
for (Standard_Integer i = 1; i <= 2; i++)
|
||||
@@ -337,7 +337,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
|
||||
{
|
||||
// NYI : create maps to store Bnd_Box2d, and faces.
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<"** ClassifW :"<<endl;
|
||||
STATIC_mapw.Clear();
|
||||
@@ -405,7 +405,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
|
||||
Standard_Integer sta = FUN_tool_classiBnd2d(Bnd2d);
|
||||
nite++;
|
||||
if ((sta == SAME)||(sta == UNKNOWN)) sta = FUN_tool_classiwithp2d(wi);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"#wi :";FUN_tool_coutsta(sta,FUN_adds(wi(1)),FUN_adds(wi(2)));}
|
||||
#endif
|
||||
if ((sta == SAME)||(sta == UNKNOWN)) return Standard_False;
|
||||
@@ -490,7 +490,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
|
||||
// Classifying Ow<i> with Ow<j> :
|
||||
osta = FUN_tool_classiBnd2d(OBnd2d);
|
||||
if ((osta == SAME)||(osta == UNKNOWN)) osta = FUN_tool_classiwithp2d(Owi);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"wi : "; FUN_tool_coutsta(osta,FUN_adds(Owi(1)),FUN_adds(Owi(2)));}
|
||||
#endif
|
||||
if ((osta == SAME)||(osta == UNKNOWN)) return Standard_False;
|
||||
@@ -540,7 +540,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
|
||||
|
||||
// Classifying wi(1) with wi(2) :
|
||||
sta = FUN_tool_classiBnd2d(Bnd2d);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"wi : "; FUN_tool_coutsta(sta,STATIC_mapw.FindIndex(wi(1)),
|
||||
STATIC_mapw.FindIndex(wi(2)));}
|
||||
#endif
|
||||
@@ -577,7 +577,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_MakeFaces(const TopoDS_Face& theFace,
|
||||
TopTools_DataMapOfShapeListOfShape& mapWlow,
|
||||
TopTools_ListOfShape& aListOfFaces)
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<"** MakeFaces :"<<endl;
|
||||
#endif
|
||||
@@ -601,7 +601,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_MakeFaces(const TopoDS_Face& theFace,
|
||||
aListOfFaces.Append(FF);
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {
|
||||
cout<<"sp(fa"<<FUN_adds(theFace)<<")=";
|
||||
TopTools_ListIteratorOfListOfShape it(aListOfFaces);
|
||||
@@ -617,7 +617,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
|
||||
const TopTools_DataMapOfShapeListOfShape& mapOwNw,
|
||||
TopTools_DataMapOfShapeListOfShape& mapWlow)
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Boolean trc = TopOpeBRepTool_GettraceREGUFA();
|
||||
if (trc) cout<<"** ClassifW :"<<endl;
|
||||
#endif
|
||||
@@ -697,13 +697,13 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
|
||||
TopTools_ListOfShape ldone; FUN_addOwlw(Ow1,lw1,ldone);
|
||||
TopTools_ListIteratorOfListOfShape itw(ldone);
|
||||
for (; itw.More(); itw.Next()) mapdone.Add(itw.Value());
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) cout<<"old wires :wi"<<FUN_adds(Ow1)<<" is OUT all old wires"<<endl;
|
||||
#endif
|
||||
lOws.RemoveFirst();
|
||||
}//OUTall
|
||||
else {
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<"old wires :wi -> ";
|
||||
FUN_tool_coutsta(sta12,FUN_adds(Ow1),FUN_adds(Ow2));
|
||||
cout<<endl;}
|
||||
@@ -732,7 +732,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
|
||||
|
||||
Standard_Integer stabnd2d = CLASSI.ClassiBnd2d(wsma,wgre,toluv,Standard_True);
|
||||
Standard_Integer sta = CLASSI.Classip2d(wsma,wgre, stabnd2d);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (trc) {cout<<" wires :wi -> ";
|
||||
FUN_tool_coutsta(sta,FUN_adds(wsma),FUN_adds(wgre));
|
||||
cout<<endl;}
|
||||
|
@@ -14,7 +14,7 @@
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
|
||||
#include <TopOpeBRepTool_STATE.hxx>
|
||||
|
||||
@@ -85,5 +85,4 @@ void TopOpeBRepTool_STATE::Print()
|
||||
cout<<endl;
|
||||
}
|
||||
|
||||
// #define DEB
|
||||
#endif
|
||||
|
@@ -17,7 +17,7 @@
|
||||
#ifndef _TopOpeBRepTool_STATE_HeaderFile
|
||||
#define _TopOpeBRepTool_STATE_HeaderFile
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
|
||||
#include <Standard_Type.hxx>
|
||||
#include <TopAbs_State.hxx>
|
||||
@@ -45,8 +45,6 @@ class TopOpeBRepTool_STATE {
|
||||
|
||||
};
|
||||
|
||||
// #define DEB
|
||||
#endif
|
||||
#endif /* OCCT_DEBUG */
|
||||
|
||||
// #define _TopOpeBRepTool_STATE_HeaderFile
|
||||
#endif
|
||||
#endif /* _TopOpeBRepTool_STATE_HeaderFile */
|
||||
|
@@ -481,7 +481,7 @@ void TopOpeBRepTool_ShapeClassifier::StateEdgeReference()
|
||||
Standard_Real p = (1-t)*f2d + t*l2d;
|
||||
P2D = C2D->Value(p);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
C3D = BRep_Tool::Curve(myEdge,f3d,l3d);
|
||||
if(!C3D.IsNull())
|
||||
P3D = C3D->Value(p);
|
||||
@@ -555,7 +555,7 @@ void TopOpeBRepTool_ShapeClassifier::StateP2DReference
|
||||
// else if (o == TopAbs_INTERNAL) myState == TopAbs_IN;
|
||||
else if (o == TopAbs_INTERNAL) myState = TopAbs_IN;
|
||||
else {
|
||||
#ifdef TOPOPEBREPTOOL_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"StateP2DReference o<>E,I"<<endl;
|
||||
#endif
|
||||
break;
|
||||
|
@@ -57,7 +57,7 @@ void TopOpeBRepTool_ShapeExplorer::Init(const TopoDS_Shape& S,
|
||||
{
|
||||
myExplorer.Init(S,ToFind,ToAvoid);
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
myIndex = myNbShapes = 0;
|
||||
for (;More();Next()) myNbShapes++;
|
||||
myExplorer.ReInit();
|
||||
@@ -85,7 +85,7 @@ Standard_Boolean TopOpeBRepTool_ShapeExplorer::More()const
|
||||
void TopOpeBRepTool_ShapeExplorer::Next()
|
||||
{
|
||||
myExplorer.Next();
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
myIndex++;
|
||||
#endif
|
||||
}
|
||||
@@ -110,7 +110,7 @@ const TopoDS_Shape& TopOpeBRepTool_ShapeExplorer::Current()const
|
||||
Standard_Integer TopOpeBRepTool_ShapeExplorer::NbShapes()const
|
||||
{
|
||||
Standard_Integer n = 0;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
n = myNbShapes;
|
||||
#endif
|
||||
return n;
|
||||
@@ -125,7 +125,7 @@ Standard_Integer TopOpeBRepTool_ShapeExplorer::NbShapes()const
|
||||
Standard_Integer TopOpeBRepTool_ShapeExplorer::Index()const
|
||||
{
|
||||
Standard_Integer n = 0;
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
n = myIndex;
|
||||
#endif
|
||||
return n;
|
||||
@@ -139,7 +139,7 @@ Standard_Integer TopOpeBRepTool_ShapeExplorer::Index()const
|
||||
Standard_OStream& TopOpeBRepTool_ShapeExplorer::DumpCurrent
|
||||
(Standard_OStream& OS)const
|
||||
{
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if ( More() ) {
|
||||
const TopoDS_Shape& S = Current();
|
||||
TopAbs_ShapeEnum T = S.ShapeType();
|
||||
|
@@ -244,7 +244,7 @@ Standard_Boolean TopOpeBRepTool_ShapeTool::Closed(const TopoDS_Shape& S1,
|
||||
}
|
||||
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern Standard_Boolean TopOpeBRepTool_GettraceVC();
|
||||
extern Standard_Boolean TopOpeBRepTool_GettraceNYI();
|
||||
#endif
|
||||
@@ -334,7 +334,7 @@ Standard_Real TopOpeBRepTool_ShapeTool::PeriodizeParameter
|
||||
periopar = ADJUST(par,Vfirst,Vlast,tol);
|
||||
}
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceVC()) {
|
||||
cout<<"TopOpeBRepTool_ShapeTool PC on edge is ";
|
||||
if (isoU) cout<<"isoU f,l "<<Ufirst<<" "<<Ulast<<endl;
|
||||
@@ -449,7 +449,7 @@ Standard_Boolean TopOpeBRepTool_ShapeTool::SurfacesSameOriented
|
||||
else {
|
||||
// prendre u1,v1 et projeter sur 2 pour calcul des normales
|
||||
// au meme point 3d.
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceNYI()) {
|
||||
cout<<"TopOpeBRepTool_ShapeTool::SurfacesSameOriented surfaces non traitees : NYI";
|
||||
cout<<endl;
|
||||
@@ -513,7 +513,7 @@ Standard_Boolean TopOpeBRepTool_ShapeTool::CurvesSameOriented
|
||||
else {
|
||||
// prendre p1 et projeter sur 2 pour calcul des normales
|
||||
// au meme point 3d.
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceNYI()) {
|
||||
cout<<"TopOpeBRepTool_ShapeTool::CurvesSameOriented non lineaires : NYI";
|
||||
cout<<endl;
|
||||
|
@@ -179,7 +179,7 @@ void TopOpeBRepTool_SolidClassifier::LoadSolid(const TopoDS_Solid& SOL)
|
||||
else {
|
||||
myPClassifier = &myClassifierMap.ChangeFromKey(SOL);
|
||||
}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer i =
|
||||
#endif
|
||||
myClassifierMap.FindIndex(SOL); // DEB
|
||||
@@ -202,7 +202,7 @@ void TopOpeBRepTool_SolidClassifier::LoadShell(const TopoDS_Shell& SHE)
|
||||
else {
|
||||
myPClassifier = &myClassifierMap.ChangeFromKey(SHE);
|
||||
}
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_Integer i =
|
||||
#endif
|
||||
myClassifierMap.FindIndex(SHE); // DEB
|
||||
|
@@ -262,7 +262,7 @@ void TopOpeBRepTool_TOOL::Vertices(const TopoDS_Edge& E, TopTools_Array1OfShape&
|
||||
|
||||
Standard_Real par1 = BRep_Tool::Parameter(v1,E);
|
||||
Standard_Real par2 = BRep_Tool::Parameter(v2,E);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
// if (par1>par2) cout<<"TopOpeBRepTool_TOOL::Vertices ERROR"<<endl;
|
||||
#endif
|
||||
Standard_Integer ivparSMA = (par1<par2) ? FORWARD : REVERSED;
|
||||
@@ -496,11 +496,11 @@ Standard_Boolean TopOpeBRepTool_TOOL::TgINSIDE(const TopoDS_Vertex& v, const Top
|
||||
Standard_Boolean TopOpeBRepTool_TOOL::TggeomE(const Standard_Real par, const BRepAdaptor_Curve& BC,
|
||||
gp_Vec& Tg)
|
||||
{
|
||||
//#ifdef DEB
|
||||
//#ifdef OCCT_DEBUG
|
||||
// GeomAbs_CurveType ct =
|
||||
//#endif
|
||||
// BC.GetType();
|
||||
//#ifdef DEB
|
||||
//#ifdef OCCT_DEBUG
|
||||
// Standard_Boolean apoles = (ct == GeomAbs_BezierCurve)||(ct == GeomAbs_BSplineCurve);
|
||||
//#endif
|
||||
|
||||
@@ -707,7 +707,7 @@ Standard_Boolean TopOpeBRepTool_TOOL::tryNgApp(const Standard_Real par,const Top
|
||||
gp_Pnt2d uv; Standard_Boolean ok = FUN_tool_paronEF(e,par,f,uv);
|
||||
if (!ok) return Standard_False;
|
||||
gp_Dir ng( FUN_tool_nggeomF(uv,f) );
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
gp_Dir ngApp;
|
||||
#endif
|
||||
ok = TopOpeBRepTool_TOOL::NgApp(par,e,f,tola,Ng);
|
||||
@@ -960,7 +960,7 @@ Standard_Boolean TopOpeBRepTool_TOOL::UVISO(const TopOpeBRepTool_C2DF& C2DF,
|
||||
Standard_Boolean & isoU, Standard_Boolean& isoV, gp_Dir2d& d2d, gp_Pnt2d& o2d)
|
||||
{
|
||||
Standard_Real f,l,tol; const Handle(Geom2d_Curve)& PC = C2DF.PC(f,l,tol);
|
||||
//#ifdef DEB
|
||||
//#ifdef OCCT_DEBUG
|
||||
// const iso = UVISO(PC,isoU,isoV,d2d,o2d);
|
||||
//#else
|
||||
const Standard_Boolean iso = UVISO(PC,isoU,isoV,d2d,o2d);
|
||||
@@ -1266,7 +1266,7 @@ static Standard_Boolean FUN_ngF(const gp_Pnt2d& uv, const TopoDS_Face& F, gp_Vec
|
||||
ngF = ng; return Standard_True;
|
||||
}
|
||||
}
|
||||
#ifdef TOPOPEBREPTOOL_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"FUN_tool_nggeomF NYI"<<endl;
|
||||
#endif
|
||||
return Standard_False;
|
||||
|
@@ -23,7 +23,7 @@ Standard_EXPORT void FBOX_Prepare()
|
||||
{
|
||||
Handle(TopOpeBRepTool_HBoxTool) hbt = FBOX_GetHBoxTool();
|
||||
hbt->Clear();
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceBOX()) {
|
||||
cout<<endl<<"TOOLBOX : Prepare"<<endl;
|
||||
}
|
||||
@@ -43,7 +43,7 @@ Standard_EXPORT const Bnd_Box& FBOX_Box(const TopoDS_Shape& S)
|
||||
{
|
||||
Handle(TopOpeBRepTool_HBoxTool) hbt = FBOX_GetHBoxTool();
|
||||
const Bnd_Box& b = hbt->Box(S);
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if (TopOpeBRepTool_GettraceBOX()) {
|
||||
Standard_Integer i = hbt->Index(S);
|
||||
Standard_Integer n = hbt->Extent();
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopOpeBRepTool_HBoxTool.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceBOX();
|
||||
#endif
|
||||
|
||||
|
@@ -33,7 +33,7 @@
|
||||
#include <TopOpeBRepTool_DRAW.hxx>
|
||||
#endif
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
extern TopTools_IndexedMapOfShape STATIC_PURGE_mapv;
|
||||
extern TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds;
|
||||
extern Standard_Boolean TopOpeBRepTool_GettracePURGE();
|
||||
|
@@ -137,7 +137,7 @@ Standard_EXPORT void FTOL_FaceTolerances
|
||||
// non ! laisser MMAXUV a 0.01
|
||||
// MMAXUV=DP;
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
// printf("\n FaceTolerances3d : TOL1 = %5.5eg TOL2=%5.5eg DEFL=%5.5eg MAXUV=%5.5eg\n",MTOL1,MTOL2,MDEFLECTION,0.01);
|
||||
#endif
|
||||
|
||||
@@ -147,7 +147,7 @@ Standard_EXPORT void FTOL_FaceTolerances
|
||||
if(MMAXUV>0.01) MMAXUV=0.01;
|
||||
if(MDEFLECTION>0.1) MDEFLECTION = 0.1;
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
// printf("TOL1 = %5.5eg TOL2=%5.5eg DEFL=%5.5eg MAXUV=%5.5eg\n",MTOL1,MTOL2,MDEFLECTION,MMAXUV);
|
||||
#endif
|
||||
|
||||
|
@@ -14,7 +14,7 @@
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
|
||||
#include <Standard_Type.hxx>
|
||||
|
||||
@@ -108,5 +108,5 @@ Standard_Boolean b) { TopOpeBRepTool_contextNOSEW = b; }
|
||||
Standard_EXPORT Standard_Boolean TopOpeBRepTool_GetcontextNOSEW() {
|
||||
return TopOpeBRepTool_contextNOSEW; }
|
||||
|
||||
// #ifdef DEB
|
||||
// #ifdef OCCT_DEBUG
|
||||
#endif
|
||||
|
@@ -14,7 +14,7 @@
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
|
||||
#include <Standard_Type.hxx>
|
||||
#include <TopOpeBRepTool_STATE.hxx>
|
||||
@@ -56,5 +56,5 @@ Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceCL2DPR(const TopAbs_Stat
|
||||
Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceCL2DPR()
|
||||
{ return TopOpeBRepTool_CL2DPR.Get(); }
|
||||
|
||||
// #ifdef DEB
|
||||
// #ifdef OCCT_DEBUG
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user