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

0025418: Debug output to be limited to OCC development environment

Browse Source 
Macros ending on "DEB" are replaced by OCCT_DEBUG across OCCT code; new macros described in documentation.
Macros starting with DEB are changed to start with "OCCT_DEBUG_".
Some code cleaned.
This commit is contained in:
abv
2014-10-28 12:41:04 +03:00
committed by bugmaster
parent a507ffd9d7
commit 0797d9d30a
700 changed files with 3932 additions and 4250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx
View File

@@ -23,7 +23,7 @@
#include <TopAbs_Orientation.hxx>
#include <TopAbs.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceAREA();
extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
#endif
@@ -33,7 +33,7 @@ extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Area1dBuilder::DumpList(const TopOpeBRepBuild_ListOfLoop& LOL)
{
Standard_Integer iLOL;
@@ -99,7 +99,7 @@ void TopOpeBRepBuild_Area1dBuilder::InitAreaBuilder
const Handle(TopOpeBRepBuild_Loop)& L = LS.Loop();
Standard_Boolean boundaryL = L->IsShape();
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceAREA()) {
cout<<"++++ new loop : "; L->Dump();
if (boundaryL) cout<<" is bound"; else cout<<" is not bound";
@@ -237,7 +237,7 @@ void TopOpeBRepBuild_Area1dBuilder::InitAreaBuilder
} // end of block loop
} // end of LoopSet LS scan
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceAREA()) {
if ( ! myArea.IsEmpty() ) {
cout<<"------- Areas -------"<<endl;
@@ -260,14 +260,14 @@ void TopOpeBRepBuild_Area1dBuilder::ADD_Loop_TO_LISTOFLoop
(const Handle(TopOpeBRepBuild_Loop)& L,
TopOpeBRepBuild_ListOfLoop& LOL,
const Standard_Address
#ifdef DEB
#ifdef OCCT_DEBUG
ss
#endif
) const
{
LOL.Append(L);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceAREA()) {
cout<<"--------------------- add area loop to area : ";
L->Dump(); cout<<endl;
@@ -286,7 +286,7 @@ void TopOpeBRepBuild_Area1dBuilder::ADD_Loop_TO_LISTOFLoop
void TopOpeBRepBuild_Area1dBuilder::REM_Loop_FROM_LISTOFLoop
(TopOpeBRepBuild_ListIteratorOfListOfLoop& ITA,
TopOpeBRepBuild_ListOfLoop& A,
#ifdef DEB
#ifdef OCCT_DEBUG
const Standard_Address ss) const
{
char* s = (char*)ss;
@@ -295,7 +295,7 @@ const Standard_Address) const
{
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceAREA()) {
if (ITA.More()) {
cout<<"--------------------- remove area loop from area : ";
@@ -307,7 +307,7 @@ const Standard_Address) const
A.Remove(ITA);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceAREA()) {
DumpList(A);
cout<<"---------------------"<<endl;
@@ -323,7 +323,7 @@ const Standard_Address) const
void TopOpeBRepBuild_Area1dBuilder::ADD_LISTOFLoop_TO_LISTOFLoop
(TopOpeBRepBuild_ListOfLoop& A1,
TopOpeBRepBuild_ListOfLoop& A2,
#ifdef DEB
#ifdef OCCT_DEBUG
const Standard_Address ss,
const Standard_Address ss1,
const Standard_Address ss2) const
@@ -333,7 +333,7 @@ void TopOpeBRepBuild_Area1dBuilder::ADD_LISTOFLoop_TO_LISTOFLoop
const Standard_Address) const
#endif
{
#ifdef DEB
#ifdef OCCT_DEBUG
char* s = (char*)ss;
char* s1 = (char*)ss1;
char* s2 = (char*)ss2;
@@ -348,7 +348,7 @@ void TopOpeBRepBuild_Area1dBuilder::ADD_LISTOFLoop_TO_LISTOFLoop
A2.Append(A1);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceAREA()) {
cout<<"2 : "; if (s2 != NULL) cout<<s2; cout<<endl;
DumpList(A2);

4
src/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx
View File

@@ -17,7 +17,7 @@
#include <TopOpeBRepBuild_Area2dBuilder.ixx>
#include <TopOpeBRepBuild_Loop.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceAREA();
#endif
@@ -203,7 +203,7 @@ void TopOpeBRepBuild_Area2dBuilder::InitAreaBuilder
if ( ! boundaryloops.IsEmpty() ) {
if ( myArea.IsEmpty() ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceAREA())
cout<<"---"<<endl<<"--- purge"<<endl<<"---"<<endl;
#endif

4
src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx
View File

@@ -25,7 +25,7 @@
#include <Standard_DomainError.hxx>
#include <TopAbs.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
#endif
@@ -113,7 +113,7 @@ void TopOpeBRepBuild_AreaBuilder::Atomize(TopAbs_State& state,
"AreaBuilder : Position Unknown");
}
else {
#ifdef DEB
#ifdef OCCT_DEBUG
if ( TopOpeBRepDS_GettraceSTRANGE() ) {
cout<<"AreaBuilder : state "; TopAbs::Print(state,cout);
cout<<" taken as "; TopAbs::Print(newstate,cout); cout<<endl;

6
src/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx
View File

@@ -21,7 +21,7 @@
#include <TopoDS.hxx>
#include <TopOpeBRepBuild_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceCU();
#endif
@@ -31,7 +31,7 @@ extern Standard_Boolean TopOpeBRepBuild_GettraceCU();
//=======================================================================
void TopOpeBRepBuild_Builder::BuildEdges(const Standard_Integer iC,const Handle(TopOpeBRepDS_HDataStructure)& HDS)
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceCU()) cout<<"\nBuildEdges on C "<<iC<<endl;
#endif
const TopOpeBRepDS_Curve& C = HDS->Curve(iC);
@@ -115,7 +115,7 @@ void TopOpeBRepBuild_Builder::BuildEdges(const Handle(TopOpeBRepDS_HDataStructur
Standard_Integer ip, np = HDS->NbPoints();
TColStd_HArray1OfInteger tp(0,np,0);
for (cex.Init(BDS); cex.More(); cex.Next()) {
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopOpeBRepDS_Curve& C = cex.Curve();
#endif
Standard_Integer ic = cex.Index();

6
src/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx
View File

@@ -22,7 +22,7 @@
#include <BRep_Tool.hxx>
#include <BRep_Builder.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceCU();
extern Standard_Boolean TopOpeBRepBuild_GettraceCUV();
extern Standard_Boolean TopOpeBRepBuild_GettraceSPF();
@@ -53,7 +53,7 @@ void TopOpeBRepBuild_Builder::BuildFaces(const Standard_Integer iS,
//
TopOpeBRepBuild_WireEdgeSet WES(aFace, this);
//
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSE = TopOpeBRepBuild_GettraceSPF();
Standard_Boolean tCU = TopOpeBRepBuild_GettraceCU();
Standard_Boolean NtCUV = !TopOpeBRepBuild_GettraceCUV();
@@ -63,7 +63,7 @@ void TopOpeBRepBuild_Builder::BuildFaces(const Standard_Integer iS,
for (; SCurves.More(); SCurves.Next()) {
Standard_Integer iC = SCurves.Current();
const TopOpeBRepDS_Curve& CDS = HDS->Curve(iC);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSE) cout<<endl<<"BuildFaces : C "<<iC<<" on S "<<iS<<endl;
if (tCU) { CDS.Dump(cout,iC,NtCUV); cout<<endl; }
#endif

26
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx
View File

@@ -42,7 +42,7 @@
#include <TopOpeBRepDS_Reducer.hxx>
#include <TopOpeBRepBuild_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceCU();
extern Standard_Boolean TopOpeBRepBuild_GettraceCUV();
extern Standard_Boolean TopOpeBRepBuild_GettraceSPF();
@@ -120,7 +120,7 @@ Handle(TopOpeBRepDS_HDataStructure) TopOpeBRepBuild_Builder::DataStructure() con
//=======================================================================
void TopOpeBRepBuild_Builder::Perform(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
{
#ifdef DEB
#ifdef OCCT_DEBUG
GdumpSHASETreset();
#endif
Clear();
@@ -160,7 +160,7 @@ void TopOpeBRepBuild_Builder::AddIntersectionEdges
TopOpeBRepDS_CurveIterator FCurves = myDataStructure->FaceCurves(aFace);
for (; FCurves.More(); FCurves.Next()) {
Standard_Integer iC = FCurves.Current();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tCU = TopOpeBRepBuild_GettraceCU();
Standard_Boolean NtCUV = !TopOpeBRepBuild_GettraceCUV();
if(tCU) {cout<<endl;myDataStructure->Curve(iC).Dump(cout,iC,NtCUV);}
@@ -294,7 +294,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::ToSplit(const TopoDS_Shape& S,const To
Standard_Boolean hassame = myDataStructure->HasSameDomain(S);
Standard_Boolean tosplit = (!issplit) && (hasgeom || hassame);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if (tSPS) {
cout<<"tosplit "<<tosplit<<" : "<<"!issplit "<<(!issplit);
@@ -322,7 +322,7 @@ void TopOpeBRepBuild_Builder::MarkSplit(const TopoDS_Shape& S,const TopAbs_State
TopOpeBRepDS_ListOfShapeOn1State& losos = (*p).ChangeFind(S);
losos.Split(Bval);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if(tSPS){
GdumpSHA(S, (char *) "MarkSplit ");
@@ -349,7 +349,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::IsSplit(const TopoDS_Shape& S,const To
if ((*p).IsBound(S)) {
const TopOpeBRepDS_ListOfShapeOn1State& losos = (*p).Find(S);
res = losos.IsSplit();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer n = losos.ListOnState().Extent();
#endif
}
@@ -382,7 +382,7 @@ const TopTools_ListOfShape& TopOpeBRepBuild_Builder::Splits(const TopoDS_Shape&
//=======================================================================
TopTools_ListOfShape& TopOpeBRepBuild_Builder::ChangeSplit(const TopoDS_Shape& S,const TopAbs_State ToBuild)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if(tSPS){
GdumpSHA(S, (char *) "ChangeSplit ");
@@ -422,7 +422,7 @@ TopAbs_State TopOpeBRepBuild_Builder::ShapePosition(const TopoDS_Shape& S, const
for (TopTools_ListIteratorOfListOfShape Iti(LS); Iti.More(); Iti.Next()) {
const TopoDS_Shape& SLS = Iti.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// TopAbs_ShapeEnum tSLS = SLS.ShapeType();
#endif
state = myShapeClassifier.StateShapeShape(S,(*PLOS),SLS);
@@ -514,13 +514,13 @@ void TopOpeBRepBuild_Builder::FindSameDomain(TopTools_ListOfShape& L1,TopTools_L
TopTools_ListIteratorOfListOfShape it1(L1);
for (i=1 ; i<=nl1; i++) {
const TopoDS_Shape& S1 = it1.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS1 = myDataStructure->Shape(S1); // DEB
#endif
TopTools_ListIteratorOfListOfShape itsd(myDataStructure->SameDomain(S1));
for (; itsd.More(); itsd.Next() ) {
const TopoDS_Shape& S2 = itsd.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS2 = myDataStructure->Shape(S2);// DEB
#endif
Standard_Boolean found = Contains(S2,L2);
@@ -536,13 +536,13 @@ void TopOpeBRepBuild_Builder::FindSameDomain(TopTools_ListOfShape& L1,TopTools_L
TopTools_ListIteratorOfListOfShape it2(L2);
for (i=1 ; i<=nl2; i++) {
const TopoDS_Shape& S2 = it2.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS2 = myDataStructure->Shape(S2);// DEB
#endif
TopTools_ListIteratorOfListOfShape itsd(myDataStructure->SameDomain(S2));
for (; itsd.More(); itsd.Next() ) {
const TopoDS_Shape& S1 = itsd.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS1 = myDataStructure->Shape(S1);// DEB
#endif
Standard_Boolean found = Contains(S1,L1);
@@ -571,7 +571,7 @@ void TopOpeBRepBuild_Builder::FindSameDomainSameOrientation(TopTools_ListOfShape
if ( !it.More() ) return;
const TopoDS_Shape& sref = it.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iref = myDataStructure->SameDomainReference(sref);
#endif
TopOpeBRepDS_Config oref = myDataStructure->SameDomainOrientation(sref);

132
src/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx
View File

@@ -31,7 +31,7 @@
#include <BRepLProp_SurfaceTool.hxx>
#include <BRepLProp_SLProps.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextEINTERNAL();
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextEEXTERNAL();
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOSG();
@@ -57,7 +57,7 @@ Standard_EXPORT Standard_Boolean DEBTEFOR(const TopOpeBRepBuild_Builder& B,const
{return B.GtraceSPS(iFOR,GI); }
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT void FUN_RaiseON()
{Standard_Failure::Raise("BuilderON");}
static void FUN_cout(const TopoDS_Shape& eON)
@@ -109,7 +109,7 @@ void TopOpeBRepBuild_BuilderON::Perform(const TopOpeBRepBuild_PBuilder& PB,const
myPLSclass = PLSclass;
myPWES = PWES;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iFOR;Standard_Boolean tFOR=myPB->GtraceSPS(FOR,iFOR);
if (tFOR) debfillonf(iFOR);
#endif
@@ -135,15 +135,15 @@ Standard_Boolean TopOpeBRepBuild_BuilderON::GFillONCheckI(const Handle(TopOpeBRe
TopOpeBRepDS_Kind GT,ST;Standard_Integer GI,SI;FDS_data(SSI,GT,GI,ST,SI);
if (GT != TopOpeBRepDS_EDGE || ST != TopOpeBRepDS_FACE) return Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFOR=BDS.Shape(myFace);
#endif
const TopoDS_Edge& EG=TopoDS::Edge(BDS.Shape(GI, Standard_False));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iEG=BDS.Shape(EG, Standard_False);
#endif
const TopoDS_Shape& FS=BDS.Shape(SI, Standard_False);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFS=BDS.Shape(FS, Standard_False);
#endif
TopAbs_ShapeEnum ShapeInterf=TopAbs_FACE;
@@ -159,7 +159,7 @@ Standard_Boolean TopOpeBRepBuild_BuilderON::GFillONCheckI(const Handle(TopOpeBRe
const TopTools_ListOfShape& lEspON=myPB->Splits(EG,TopAbs_ON);
if (lEspON.Extent() == 0) return Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopoDS_Shape& EspON=lEspON.First();
#endif
Standard_Integer rankFS=myPB->GShapeRank(FS);
@@ -176,7 +176,7 @@ Standard_Boolean TopOpeBRepBuild_BuilderON::GFillONCheckI(const Handle(TopOpeBRe
void TopOpeBRepBuild_BuilderON::GFillONPartsWES1(const Handle(TopOpeBRepDS_Interference)& I)
{
const TopOpeBRepDS_DataStructure& BDS=myPB->DataStructure()->DS();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iFOR=
#endif
BDS.Shape(myFace);
@@ -187,18 +187,18 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES1(const Handle(TopOpeBRepDS_Inter
const TopoDS_Edge& EG=TopoDS::Edge(BDS.Shape(GI));
// const TopoDS_Shape& FS=BDS.Shape(SI);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iEG=BDS.Shape(EG);
// Standard_Integer iFS=BDS.Shape(FS);
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tEFOR=DEBTEFOR(*myPB,iFOR,GI);
if (tEFOR) debfillonfemess(iFOR,GI,myPB,myPWES,"--- GFillONPartsWES1");
#endif
const TopTools_ListOfShape& lEspON=myPB->Splits(EG,TopAbs_ON);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nEspON=lEspON.Extent();
#endif
for(TopTools_ListIteratorOfListOfShape it(lEspON);it.More();it.Next()) {
@@ -207,7 +207,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES1(const Handle(TopOpeBRepDS_Inter
}
} // GFillONPartsWES1
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT void FUN_coutmess(const TCollection_AsciiString& m)
{
cout<<m;
@@ -219,7 +219,7 @@ Standard_EXPORT void FUN_coutmess(const TCollection_AsciiString&)
#endif
//------------------------------------------------------
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean FUN_keepEON(const TopOpeBRepBuild_Builder& B,
#else
Standard_Boolean FUN_keepEON(const TopOpeBRepBuild_Builder&,
@@ -227,7 +227,7 @@ Standard_Boolean FUN_keepEON(const TopOpeBRepBuild_Builder&,
const TopoDS_Shape& sEG,
const TopoDS_Shape& sFOR,
const TopoDS_Shape& sFS,
#ifdef DEB
#ifdef OCCT_DEBUG
const Standard_Boolean EGBoundFOR,
#else
const Standard_Boolean,
@@ -247,7 +247,7 @@ Standard_Boolean FUN_keepEON(const TopOpeBRepBuild_Builder&,
TopoDS_Face FF=TopoDS::Face(sFOR);FF.Orientation(TopAbs_FORWARD);
TopoDS_Face FS=TopoDS::Face(sFS);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iEG;/*Standard_Boolean tEG=*/B.GtraceSPS(EG,iEG);
Standard_Integer iFF;/*Standard_Boolean tFF=*/B.GtraceSPS(FF,iFF);
Standard_Integer iFS;/*Standard_Boolean tFS=*/B.GtraceSPS(FS,iFS);
@@ -255,14 +255,14 @@ Standard_Boolean FUN_keepEON(const TopOpeBRepBuild_Builder&,
Standard_Boolean tFSEG=DEBTEFOR(B,iFS,iEG);if (tFSEG) debfillonfemess(iFS,iEG);
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean keep1=Standard_True;
Standard_Boolean keep2=Standard_True;
#endif
Standard_Boolean keep3=Standard_True;
Standard_Boolean isclosedFF=BRep_Tool::IsClosed(EG,FF);
if (isclosedFF) {
#ifdef DEB
#ifdef OCCT_DEBUG
keep1=Standard_True;
keep2=Standard_True;
#endif
@@ -272,7 +272,7 @@ Standard_Boolean FUN_keepEON(const TopOpeBRepBuild_Builder&,
TopAbs_Orientation oEGFF=TopAbs_FORWARD;
FUN_tool_orientEinF(EG,FF,oEGFF);
#ifdef DEB
#ifdef OCCT_DEBUG
TopAbs_Orientation omatFS1=TFE.Orientation(TB1);
if (oEGFF == TopAbs_REVERSED) omatFS1=TopAbs::Complement(omatFS1);
keep1=(omatFS1 == TopAbs_FORWARD);
@@ -289,7 +289,7 @@ Standard_Boolean FUN_keepEON(const TopOpeBRepBuild_Builder&,
else if (oEGFF == TopAbs_INTERNAL) keep3=(tfea == TB1 || tfeb == TB1);
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (tFFEG || tFSEG) {
if ( keep1 != keep2 || keep1 != keep3 || keep2 != keep3 ) {
cout<<"\nkeepEON : EGB "<<EGBoundFOR<<" EG "<<iEG<<" FOR "<<iFF<<" FS "<<iFS;
@@ -406,7 +406,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
const TopoDS_Face& FOR=TopoDS::Face(myFace); Standard_Integer iFOR=BDS.Shape(FOR);
const TopoDS_Edge& eON=TopoDS::Edge(EspON);
const TopoDS_Edge& EG=TopoDS::Edge(BDS.Shape(GI));
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iEG=
#endif
BDS.Shape(EG);
@@ -421,7 +421,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
Standard_Boolean isclosedFS=FUN_tool_IsClosingE(EG,FS,FS); //xpu240898
Standard_Boolean isclosed=(isclosedFF || isclosedFS);
Standard_Boolean isrest=BDS.IsSectionEdge(EG);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean issplit=myPB->IsSplit(EG,TopAbs_ON);
#endif
Standard_Integer rankFS=myPB->GShapeRank(FS);
@@ -430,7 +430,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopAbs_Orientation OTFE = TFE.Orientation(TopAbs_IN);
TopAbs_State TFEbef = TFE.Before();
TopAbs_State TFEaft = TFE.After();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean EGboundFOR =
// Handle(TopOpeBRepDS_ShapeShapeInterference)::DownCast(I)->GBound();
#endif
@@ -455,7 +455,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
Standard_Boolean opeFus = myPB->Opefus();
Standard_Boolean opec12 = myPB->Opec12();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean opec21 = myPB->Opec21();
#endif
Standard_Boolean opeCut = myPB->Opec12() || myPB->Opec21();
@@ -464,7 +464,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopAbs_State TBFOR = FUN_build_TB(myPB,rankFOR);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tFOR=myPB->GtraceSPS(iFOR);Standard_Boolean tE=myPB->GtraceSPS(GI);
Standard_Boolean tEFOR=DEBTEFOR(*myPB,iFOR,GI);
if (tFOR) debON(iFOR);
@@ -576,7 +576,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap00 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap0 GFillON");
if (tE) {cout<<"yap00(FOR"<<iFOR<<" FS"<<iFS<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -606,7 +606,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap00 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -616,7 +616,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap0 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap0 GFillON");
if (tE) {cout<<"yap0(FOR"<<iFOR<<" FS"<<iFS<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -777,7 +777,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
} // hsdFOR
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap0 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -787,7 +787,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yapc1 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yapc1 GFillON");
if (tE) {cout<<"yapc1(FOR"<<iFOR<<" FS"<<iFS<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -804,11 +804,11 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
if (!ok) return; //nyiRAISE
Standard_Boolean samegeom; ok = FUN_tool_curvesSO(EG,parEG,e3d,samegeom);
if (!ok) return; //nyiRAISE
#ifdef DEB
#ifdef OCCT_DEBUG
if (!TopOpeBRepBuild_GetcontextNOSG()) {
#endif
if (!samegeom) oe3dk = TopAbs::Complement(oe3dk);
#ifdef DEB
#ifdef OCCT_DEBUG
}
#endif
@@ -818,7 +818,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
else if (oe3dk == TopAbs_INTERNAL) keep3d = Standard_True;
else if (oe3dk == TopAbs_EXTERNAL) keep3d = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
// if(tEFOR) {cout<<endl<<"yapc1 keep3d : "<<keep3d<<endl;debfillonfemess3d(iFOR,iEG);}
#endif
@@ -828,7 +828,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yapc1 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -840,7 +840,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yapc2 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yapc2 GFillON");
if (tE) {cout<<"yapc2(FOR"<<iFOR<<" FS"<<iFS<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -871,7 +871,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
else if (M_INTERNAL(neworiE)) addFORREV = Standard_True;
newE.Orientation(neworiEk);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) {
if (!isclosedFF)
debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yapc2 GFillON","WES+ EspON not closed");
@@ -909,7 +909,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yapc3 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yapc3 GFillON");
if (tE) {cout<<"yapc3(FOR"<<iFOR<<" FS"<<iFS<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -969,11 +969,11 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
Standard_Boolean samegeom; Standard_Boolean ok = FUN_tool_curvesSO(eON,EG,samegeom);
if (!ok) return; // nyiRAISE
Standard_Boolean reverse = (!samegeom);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GetcontextNOSG())
// MSV 21.03.2002: restore the genaral behaviour, since the function
// FUN_UNKFstasta was corrected.
reverse = Standard_False; //we exclude this line from #ifdef DEB because
reverse = Standard_False; //we exclude this line from #ifdef OCCT_DEBUG because
//in optimised mode this line will never be included , and that follows to regressions
//MZV-12-05-2000
#endif
@@ -982,7 +982,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
newE.Orientation(neworiEk);
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) {
if (!addFORREV)
debaddpwes(iFOR,TB1,iEG,neworiEk,myPB,myPWES,"yapc3 GFillON","WES+ EspON ");
@@ -1042,7 +1042,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopAbs_Orientation orefFCX = BDS.Shape(irefFCX).Orientation();
Standard_Boolean FCXisref = (irefFCX == iFCX);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Real tolFCX = factor*BRep_Tool::Tolerance(FCX); //NYITOLXPU
#endif
@@ -1101,7 +1101,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
yap6b = yap6b && eONFS; //xpu240898
yap6b = yap6b && !eghassd3d;// yap6b = yap6b && !eghassd3dON;
if (yap6b) {
#ifdef DEB
#ifdef OCCT_DEBUG
// FUN_RaiseON();
#endif
yap2 = Standard_True;
@@ -1147,7 +1147,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopAbs_State staFOR = TB1;
TopAbs_State staFS = (rankFS == rankFOR) ? TB1 : TB2;
#ifdef DEB
#ifdef OCCT_DEBUG
// if(tEFOR) cout<<endl<<"yap1 yap2 yap3 yap4 = ";
// if(tEFOR) cout<<yap1<<" "<<yap2<<" "<<yap3<<" "<<yap4<<endl<<endl;
// if(tEFOR) debfillonfemess(iFOR,iEG);
@@ -1155,7 +1155,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap1 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap1 GFillON");
if (tE) {cout<<"yap1(FOR"<<iFOR<<" FCX"<<iFCX<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -1292,7 +1292,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap1 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -1303,7 +1303,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap2 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap2 GFillON");
if (tE) {cout<<"yap2(FOR"<<iFOR<<" FCX"<<iFCX<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -1344,7 +1344,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
else if (oegFCXF == TopAbs_REVERSED) b2d = (Tbef == TopAbs_IN);
else FUN_coutmess("DEBUG GFillONPartsWES2_4 orientation != F,R\n");
}
//#ifdef DEB
//#ifdef OCCT_DEBUG
// if(tEFOR) {cout<<endl<<"yap2 : b3d,b2d "<<b3d<<","<<b2d<<endl;debfillonfemess(iFOR,iEG);}
//#endif
@@ -1427,7 +1427,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
}
}
}
//#ifdef DEB
//#ifdef OCCT_DEBUG
// if(tEFOR) {cout<<endl<<"yap2 : keep "<<keep<<endl;debfillonfemess(iFOR,iEG);}
//#endif
if (!keep) return;
@@ -1497,7 +1497,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap2 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -1508,7 +1508,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap6 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap6 GFillON");
if (tE) {cout<<"yap6(FOR"<<iFOR<<" FCX"<<iFCX<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -1526,7 +1526,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
Standard_Boolean SO = FFinSDSO;//(FFinSDSO && (oFOR == oFCX)) || (FFinSDDO && (oFOR != oFCX));
Standard_Boolean DO = FFinSDDO;//(FFinSDSO && (oFOR != oFCX)) || (FFinSDDO && (oFOR == oFCX));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer rkToFill = BDS.AncestorRank(myFace);
#endif
// Standard_Boolean samerk = (rankEG == rkToFill);
@@ -1636,7 +1636,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
gp_Vec ntOOFOR = FUN_tool_nggeomF(uv,OOFOR);
if (OOFOR.Orientation() == TopAbs_REVERSED) ntOOFOR.Reverse();
// xxFCX :
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Real t1 =factor*BRep_Tool::Tolerance(Esd);
#endif
Standard_Real parEG; ok = FUN_tool_parE(Esd,parEsd,EG,parEG);
@@ -1688,7 +1688,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap6 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -1716,7 +1716,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
if (addtwice) {
neworiE = TopAbs::Complement(neworiE);
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap6 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -1727,7 +1727,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap3 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap3 GFillON");
if (tE) {cout<<"yap3(FOR"<<iFOR<<" FCX"<<iFCX<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -1746,11 +1746,11 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
if (!ok) return; //nyiRAISE
Standard_Boolean samegeom; ok = FUN_tool_curvesSO(EG,parEG,e3d,samegeom);
if (!ok) return; //nyiRAISE
#ifdef DEB
#ifdef OCCT_DEBUG
if (!TopOpeBRepBuild_GetcontextNOSG()) {
#endif
if (!samegeom) oe3dk = TopAbs::Complement(oe3dk);
#ifdef DEB
#ifdef OCCT_DEBUG
}
#endif
@@ -1761,7 +1761,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
else if (oe3dk == TopAbs_INTERNAL) keep3d = Standard_True;
else if (oe3dk == TopAbs_EXTERNAL) keep3d = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
if(tEFOR) {cout<<endl<<"yap3 keep3d : "<<keep3d<<endl;debfillonfemess3d(iFOR,iEG);}
#endif
@@ -1771,7 +1771,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap3 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -1783,7 +1783,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap5 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap5 GFillON");
if (tE) {cout<<"yap5(FOR"<<iFOR<<" FCX"<<iFCX<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -1800,11 +1800,11 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
if (!ok) return; // nyiRAISE
Standard_Boolean samegeom; ok = FUN_tool_curvesSO(EG,parEG,e2d,samegeom);
if (!ok) return; // nyiRAISE
#ifdef DEB
#ifdef OCCT_DEBUG
if (!TopOpeBRepBuild_GetcontextNOSG()) {
#endif
if (!samegeom) oe2dk = TopAbs::Complement(oe2dk);
#ifdef DEB
#ifdef OCCT_DEBUG
}
#endif
@@ -1821,7 +1821,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap5 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -1833,7 +1833,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap4 ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap4 GFillON");
if (tE) {cout<<"yap4(FOR"<<iFOR<<" FCX"<<iFCX<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -1844,7 +1844,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopAbs_Orientation neworiE = oTFE;
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap4 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif
@@ -1856,7 +1856,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
//=========================================
if ( yap7 ) {
// xpu290598 : CTS20212
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debfillonfemess(iFOR,iEG,myPB,myPWES,"yap7 GFillON");
if (tE) {cout<<"yap7(FOR"<<iFOR<<" FCX"<<iFCX<<" EG"<<GI<<") ";
cout<<"TB1=";TopAbs::Print(TB1,cout);cout<<" TB2=";TopAbs::Print(TB2,cout);cout<<endl;}
@@ -1894,7 +1894,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tEFOR) debaddpwes(iFOR,TB1,iEG,neworiE,myPB,myPWES,"yap7 GFillON","WES+ EspON ");
if (tE) FUN_cout(newE);
#endif

32
src/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON2d.cxx
View File

@@ -34,7 +34,7 @@
#define M_FORWARD(st) (st == TopAbs_FORWARD)
#define M_REVERSED(st) (st == TopAbs_REVERSED)
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextEINTERNAL();
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextEEXTERNAL();
Standard_EXPORT void debfillonf(const Standard_Integer iF);
@@ -70,7 +70,7 @@ void TopOpeBRepBuild_BuilderON::Perform2d
if (GLOBAL_DS2d == NULL) GLOBAL_DS2d = (TopOpeBRepDS_PDataStructure)new TopOpeBRepDS_DataStructure();
const TopOpeBRepDS_ListOfInterference& lFEI = GLOBAL_DS2d->ShapeInterferences(FOR);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iFOR;Standard_Boolean tFOR=myPB->GtraceSPS(FOR,iFOR);
if (tFOR) debfillonf(iFOR);
if (tFOR) {cout<<endl<<"LI on F"<<iFOR<<":"<<endl;
@@ -83,11 +83,11 @@ void TopOpeBRepBuild_BuilderON::Perform2d
TopOpeBRepDS_Kind GT,ST;Standard_Integer GI,SI;FDS_data(I,GT,GI,ST,SI);
const TopoDS_Edge& EG=TopoDS::Edge(BDS.Shape(GI));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iEG=BDS.Shape(EG);
#endif
const TopTools_ListOfShape& lEspON=myPB->Splits(EG,TopAbs_ON);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nEspON=lEspON.Extent();
#endif
for(TopTools_ListIteratorOfListOfShape it(lEspON);it.More();it.Next()) {
@@ -112,11 +112,11 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
Standard_Boolean EGBoundFOR=SSI->GBound();
const TopoDS_Face& FOR=TopoDS::Face(myFace); Standard_Integer iFOR=BDS.Shape(FOR);
const TopoDS_Edge& EG=TopoDS::Edge(BDS.Shape(GI));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iEG=BDS.Shape(EG);
#endif
const TopoDS_Face& FS=TopoDS::Face(BDS.Shape(SI));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFS=BDS.Shape(FS);
// Standard_Boolean isclosedFF=BRep_Tool::IsClosed(EG,FOR);
// Standard_Boolean isclosedFS=BRep_Tool::IsClosed(EG,FS);
@@ -126,13 +126,13 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
// Standard_Integer rankFS=myPB->GShapeRank(FS);
#endif
Standard_Integer rankEG=myPB->GShapeRank(EG);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer rankFOR=myPB->GShapeRank(FOR);
#endif
// TopAbs_State TBEG = (rankEG == 1) ? TB1 : TB2;
TopAbs_State TBEG = FUN_build_TB(myPB,rankEG);
#ifdef DEB
#ifdef OCCT_DEBUG
// TopAbs_State TFEbef = TFE.Before();
// TopAbs_State TFEaft = TFE.After();
// Standard_Boolean EGboundFOR =
@@ -140,7 +140,7 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
#endif
Standard_Boolean eghassd = HDS->HasSameDomain(EG);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tFOR=myPB->GtraceSPS(iFOR);
// Standard_Boolean tE=myPB->GtraceSPS(GI);
// Standard_Boolean tEFOR = (tE && tFOR);
@@ -150,13 +150,13 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
Standard_Integer iFCX=SI;
Standard_Boolean FFinSDSO = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean FFinSDDO = Standard_False;
#endif
Standard_Boolean FFinSD= Standard_True;
TopoDS_Face FCX = FS;
#ifdef DEB
#ifdef OCCT_DEBUG
// TopAbs_Orientation oFOR = BDS.Shape(iFOR).Orientation();
// TopAbs_Orientation oFS = BDS.Shape(iFS).Orientation();
// TopAbs_Orientation oFCX = BDS.Shape(iFCX).Orientation();
@@ -168,7 +168,7 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
TopAbs_Orientation oegFCXF;Standard_Boolean EGBoundFCX = FUN_tool_orientEinFFORWARD(EG,FCX,oegFCXF);
TopAbs_Orientation oegFCX ;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean ok2 =
#endif
FUN_tool_orientEinF(EG,FCX,oegFCX);
@@ -187,7 +187,7 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
//=========================================
if ( yap6) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tFOR) cout<<"* yap6 = 1"<<endl;
#endif
TopAbs_Orientation neworiE = TopAbs_FORWARD;
@@ -199,7 +199,7 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
Standard_Boolean b = Standard_False;
Standard_Boolean SO = FFinSDSO;//(FFinSDSO && (oFOR == oFCX)) || (FFinSDDO && (oFOR != oFCX));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer rkToFill = BDS.AncestorRank(myFace); //DEB
#endif
Standard_Boolean rk1 = (rankEG == 1);
@@ -213,7 +213,7 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
else if (EGBoundFOR)
ok = FUN_ds_shareG(myPB->DataStructure(),iFCX,iFOR,GI,TopoDS::Edge(EspON),shareG);
if (!ok) return; // nyiFUNRAISE
#ifdef DEB
#ifdef OCCT_DEBUG
if (tFOR) cout<<" shareG="<<shareG<<endl;
#endif
@@ -247,7 +247,7 @@ void TopOpeBRepBuild_BuilderON::GFillONParts2dWES2(const Handle(TopOpeBRepDS_Int
TopoDS_Shape newE = EspON;
newE.Orientation(neworiE);
myPWES->AddStartElement(newE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tFOR) cout<<" add spON e"<<GI<<endl;
#endif
return;

2
src/TopOpeBRepBuild/TopOpeBRepBuild_CompositeClassifier.cxx
View File

@@ -24,7 +24,7 @@
// avec un shell qui a ete deja ete place dans le solide interne du
// TopOpeBRepTool_SolidClassifier par LoadShell.
#ifdef DEB
#ifdef OCCT_DEBUG
//static Standard_Integer dddjyl = 0;
//static Standard_Integer dddebi = 0;
//static Standard_Integer dddebi2 = 0;

14
src/TopOpeBRepBuild/TopOpeBRepBuild_End.cxx
View File

@@ -36,7 +36,7 @@
#include <Bnd_Box.hxx>
#include <TopOpeBRepTool_FuseEdges.hxx>
#include <Standard_ProgramError.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GetcontextNOFE();
#endif
@@ -147,7 +147,7 @@ void TopOpeBRepBuild_Builder::End()
const TopTools_ListOfShape& lmergesha1 = Merged(myShape1,myState1);
TopTools_ListIteratorOfListOfShape it(lmergesha1); for(;it.More();it.Next()) B.Add(R,it.Value());
const TopTools_ListOfShape& LOES = Section();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nLOES = LOES.Extent();
#endif
@@ -163,7 +163,7 @@ void TopOpeBRepBuild_Builder::End()
if ( !isbe ) continue;
const TopTools_ListOfShape& loe1 = idmovloe.FindFromIndex(iv);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nloe1 = loe1.Extent();
#endif
TopTools_MapOfShape mose; //une seule fois chaque arete
@@ -174,7 +174,7 @@ void TopOpeBRepBuild_Builder::End()
Standard_Boolean isb = mose.Contains(E); if (isb) continue;
mose.Add(E);loe.Append(E);
}
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nloe = loe.Extent();
#endif
@@ -197,7 +197,7 @@ void TopOpeBRepBuild_Builder::End()
TP(++nP2) = Pv;
}
const TopTools_ListOfShape& lof = idmoelof.FindFromKey(E);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nlof = lof.Extent();
#endif
for (TopTools_ListIteratorOfListOfShape ilof(lof);ilof.More();ilof.Next()) {
@@ -250,7 +250,7 @@ void TopOpeBRepBuild_Builder::End()
gp_Pnt P2(aXmax, aYmax, aZmax);
Standard_Real d = P1.Distance(P2);
if (d > newtol) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"\npoint P"<<iv<<" "<<Pv.X()<<" "<<Pv.Y()<<" "<<Pv.Z()<<endl;
cout<<"TopOpeBRepBuild_Builder::End BOX newtol "<<newtol<<" -> "<<d<<endl;
#endif
@@ -261,7 +261,7 @@ void TopOpeBRepBuild_Builder::End()
}
Standard_Boolean makeFE = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
makeFE = !TopOpeBRepBuild_GetcontextNOFE();
#endif

26
src/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx
View File

@@ -28,7 +28,7 @@
#include <Standard_ProgramError.hxx>
#include <TopOpeBRepDS_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GetcontextNOREGUFA();
extern Standard_Boolean TopOpeBRepBuild_GetcontextREGUXPU();
extern Standard_Boolean TopOpeBRepBuild_GettraceSAVFREGU();
@@ -57,12 +57,12 @@ void TopOpeBRepBuild_Builder::RegularizeFaces
const TopoDS_Shape& newFace = itl.Value();
TopTools_ListOfShape newFaceLOF;
RegularizeFace(FF,newFace,newFaceLOF);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nnewFaceLOF = newFaceLOF.Extent(); // DEB
#endif
LOF.Append(newFaceLOF);
}
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nLOF = LOF.Extent(); // DEB
#endif
@@ -83,7 +83,7 @@ void TopOpeBRepBuild_Builder::RegularizeFaces
for (x.Init(fsdFF,TopAbs_EDGE);x.More();x.Next()) {
// for (TopExp_Explorer x(fsdFF,TopAbs_EDGE);x.More();x.Next()) {
const TopoDS_Shape& e = x.Current();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer ie = myDataStructure->Shape(e); //DEB
// Standard_Boolean issect = myDataStructure->DS().IsSectionEdge(TopoDS::Edge(e));
#endif
@@ -100,7 +100,7 @@ void TopOpeBRepBuild_Builder::RegularizeFaces
if (!issplite) continue;
TopTools_ListOfShape& lspe = ChangeSplit(e,stae);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nlspe = lspe.Extent(); // DEB
#endif
TopTools_ListOfShape newlspe;
@@ -158,7 +158,7 @@ void TopOpeBRepBuild_Builder::RegularizeFace
Standard_Boolean toregu = Standard_True;
Standard_Boolean usewtof = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF;Standard_Boolean tSPSFF=GtraceSPS(FF,iF);
// Standard_Boolean savfregu = TopOpeBRepBuild_GettraceSAVFREGU();
if (TopOpeBRepBuild_GetcontextNOREGUFA()) toregu = Standard_False;
@@ -209,7 +209,7 @@ void TopOpeBRepBuild_Builder::RegularizeFace
}
}
wtof.MakeFaces(newFace,newfaces);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nnewfaces = newfaces.Extent(); // DEB
#endif
rf = (newfaces.Extent() != 0);
@@ -223,7 +223,7 @@ void TopOpeBRepBuild_Builder::RegularizeFace
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPSFF) { cout<<"RegularizeFace "<<iF<<endl; debregufa(iF); }
#endif
@@ -252,18 +252,18 @@ void TopOpeBRepBuild_Builder::RegularizeFace
for (; itlfsdFF.More(); itlfsdFF.Next()) {
const TopoDS_Shape& fsdFF = itlfsdFF.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer ifsdFF=0;Standard_Boolean tSPSfsdFF=GtraceSPS(fsdFF,ifsdFF);
if (tSPSfsdFF) debregufa(ifsdFF);
#endif
Standard_Integer rankfsdFF = GShapeRank(fsdFF);
TopAbs_State stafsdFF = (rankfsdFF == 1) ? myState1 : myState2;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean issplitfsdFF = IsSplit(fsdFF,stafsdFF);
#endif
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
const TopTools_ListOfShape& lspfsdFF = Splits(fsdFF,stafsdFF);
Standard_Integer nlspfsdFF = lspfsdFF.Extent();
#endif*/
@@ -274,7 +274,7 @@ void TopOpeBRepBuild_Builder::RegularizeFace
//fsdFFe : 1 edge de fsdFF = 1 face SameDomain de FF
const TopoDS_Shape& fsdFFe = x.Current();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer ifsdFFe = 0;Standard_Boolean tSPSfsdFFe=GtraceSPS(fsdFFe,ifsdFFe);
if (tSPSfsdFFe) debregufa(ifsdFFe);
#endif
@@ -286,7 +286,7 @@ void TopOpeBRepBuild_Builder::RegularizeFace
if (iiista == 2) stafsdFFe = TopAbs_ON;
TopTools_ListOfShape& lspfsdFFe = ChangeSplit(fsdFFe,stafsdFFe);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean issplitfsdFFe = IsSplit(fsdFFe,stafsdFFe);
// Standard_Integer nlspfsdFFe = lspfsdFFe.Extent();
#endif

10
src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx
View File

@@ -55,7 +55,7 @@
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettracePURGE();
extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
#include <TopOpeBRepDS_DSX.hxx>
@@ -90,7 +90,7 @@ TopOpeBRepBuild_FaceBuilder::TopOpeBRepBuild_FaceBuilder(TopOpeBRepBuild_WireEdg
void TopOpeBRepBuild_FaceBuilder::InitFaceBuilder(TopOpeBRepBuild_WireEdgeSet& WES,const TopoDS_Shape& F,const Standard_Boolean ForceClass)
{
myFace = TopoDS::Face(F);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean deb = TopOpeBRepDS_GettraceSPSX(myFace);
if (deb) debifb();
#endif
@@ -371,7 +371,7 @@ void TopOpeBRepBuild_FaceBuilder::CorrectGclosedWire(const TopTools_IndexedDataM
const TopTools_IndexedDataMapOfShapeShape& mapVon1Edge)
{
// prequesitory : edges described by <mapVon1Edge> are not closed,not degenerated
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepDS_GettraceSTRANGE();
if (TopOpeBRepBuild_GettracePURGE()) {
cout<<endl<<"* CorrectGclosedWire :"<<endl<<endl;
@@ -395,7 +395,7 @@ void TopOpeBRepBuild_FaceBuilder::CorrectGclosedWire(const TopTools_IndexedDataM
TopoDS_Vertex newVref = TopoDS::Vertex(aLocalShape);
// TopoDS_Vertex newVref = TopoDS::Vertex(Vref.Oriented(V.Orientation()));
BB.Add(E,newVref);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iV = i,iVref = mapVVref.FindIndex(Vref),iE = mapVon1Edge.FindIndex(V);
if (trc) cout << " replacing V "<<iV<<" with V "<<iVref<<" on edge "<<iE<<endl;
#endif
@@ -618,7 +618,7 @@ const TopoDS_Shape& TopOpeBRepBuild_FaceBuilder::Edge() const
//=======================================================================
Standard_Integer TopOpeBRepBuild_FaceBuilder::EdgeConnexity(const TopoDS_Shape& /*E*/) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_ProgramError::Raise("FaceBuilder::EdgeConnexity management disactivated");
#endif
return 0;

6
src/TopOpeBRepBuild/TopOpeBRepBuild_Fill.hxx
View File

@@ -48,7 +48,7 @@ void TopOpeBRepBuild_Builder::FillShape(const TopoDS_Shape& S1,
TopOpeBRepDS_Config ssc = myDataStructure->SameDomainOrientation(S1);
if ( ssc == TopOpeBRepDS_DIFFORIENTED ) {
RevOri = ! RevOri;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFace = myDataStructure->Shape(S1);
// cout<<endl<<"********** ";
// cout<<"retournement d'orientation de ";TopAbs::Print(t,cout);
@@ -98,7 +98,7 @@ void TopOpeBRepBuild_Builder::FillFace(const TopoDS_Shape& F1,
TopOpeBRepBuild_WireEdgeSet& WES,
const Standard_Boolean RevOri)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPF = TopOpeBRepBuild_GettraceSPF();
// Standard_Integer iFace = myDataStructure->Shape(F1);
if(tSPF){cout<<endl;}
@@ -170,7 +170,7 @@ void TopOpeBRepBuild_Builder::FillVertexSetOnValue
PVS.Append(PV);
}
#ifdef DEB
#ifdef OCCT_DEBUG
const TopoDS_Edge& EDEB = PVS.Edge();
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(EDEB,iE);
if (tSPS) {

64
src/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx
View File

@@ -55,7 +55,7 @@
#include <ElCLib.hxx>
#include <Precision.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceFUFA();
#endif
@@ -79,7 +79,7 @@ void TopOpeBRepBuild_FuseFace::Init(const TopTools_ListOfShape& LIF,
const TopTools_ListOfShape& LRF,
const Standard_Integer CXM)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepBuild_GettraceFUFA();
if (trc) cout << "TopOpeBRepBuild_FuseFace::Init" << endl;
#endif
@@ -91,7 +91,7 @@ void TopOpeBRepBuild_FuseFace::Init(const TopTools_ListOfShape& LIF,
else if(CXM == 2) {
myInternal = Standard_True;
} // CXM
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) {
if (myInternal) {
cout << " TopOpeBRepBuild_FuseFace::Init : Keep internal connections" << endl;
@@ -124,7 +124,7 @@ void TopOpeBRepBuild_FuseFace::Init(const TopTools_ListOfShape& LIF,
void TopOpeBRepBuild_FuseFace::PerformFace()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepBuild_GettraceFUFA();
if (trc) cout << "TopOpeBRepBuild_FuseFace::PerformFace()" << endl;
#endif
@@ -132,7 +132,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
myModified = Standard_False;
myLFF.Clear();
if (myLRF.IsEmpty()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Empty list of reconstructed faces"<<endl;
#endif
myModified = Standard_False;
@@ -143,7 +143,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
Standard_Integer number = myLRF.Extent();
if (number == 1) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : only 1 reconstructed face"<<endl;
#endif
myModified = Standard_False;
@@ -171,7 +171,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
BRepCheck_Analyzer ana(fac);
if (!ana.IsValid(fac)) {
// if (!BRepCheck_Analyzer::IsValid(fac)) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Invalid reconstructed face"<<endl;
#endif
myModified = Standard_False;
@@ -185,7 +185,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
// Orientation 3d de l'espace limite par la face
if (Ori3dForward && Ori3dReversed) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Bad faces 3d orientation"<<endl;
#endif
myModified = Standard_False;
@@ -200,7 +200,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
TopTools_DataMapOfShapeListOfShape mapFacLFac;
GroupShape(mylist,Keep_Edge,mapFacLFac);
if (mapFacLFac.IsEmpty()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Empty list of faces"<<endl;
#endif
myModified = Standard_False;
@@ -211,7 +211,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
Standard_Integer n1 = myLRF.Extent();
Standard_Integer n2 = mapFacLFac.Extent();
if (n1 == n2) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : No connection"<<endl;
#endif
myModified = Standard_False;
@@ -245,7 +245,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
TopTools_DataMapOfShapeListOfShape mapWirLWir;
GroupShape(LWir,Keep_Edge,mapWirLWir);
if (mapWirLWir.IsEmpty()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Empty list of wires"<<endl;
#endif
myModified = Standard_False;
@@ -278,7 +278,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
TopTools_DataMapOfShapeListOfShape mapEdgLEdg;
GroupShape(LEdg,Keep_Edge,mapEdgLEdg);
if (mapEdgLEdg.IsEmpty()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Empty list of edges"<<endl;
#endif
myModified = Standard_False;
@@ -302,7 +302,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
ori1 = edg1.Orientation();
if (ori1 == TopAbs_REVERSED) {
if (OriReversed) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Bad faces orientation"<<endl;
#endif
myModified = Standard_False;
@@ -314,7 +314,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
}
else if (ori1 == TopAbs_FORWARD) {
if (OriForward) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Bad faces orientation"<<endl;
#endif
myModified = Standard_False;
@@ -376,7 +376,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
BRepLib_MakeWire MW;
MW.Add(myWireLE);
if (!MW.IsDone()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Failure in making wire"<<endl;
#endif
myModified = Standard_False;
@@ -464,7 +464,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
}
if (!MF.IsDone()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Failure in making face"<<endl;
#endif
myModified = Standard_False;
@@ -484,7 +484,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
} // mapFacLFac
if (myLFF.IsEmpty()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::PerformFace : Empty list of fusionned faces"<<endl;
#endif
myModified = Standard_False;
@@ -496,7 +496,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
myModified = Standard_True;
myDone = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout << " TopOpeBRepBuild_FuseFace::PerformFace() : Done" << endl;
#endif
}
@@ -509,7 +509,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace()
void TopOpeBRepBuild_FuseFace::PerformEdge()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepBuild_GettraceFUFA();
if (trc) cout << "TopOpeBRepBuild_FuseFace::PerformEdge()" << endl;
#endif
@@ -581,7 +581,7 @@ void TopOpeBRepBuild_FuseFace::PerformEdge()
myModified = Standard_True;
myDone = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout << " TopOpeBRepBuild_FuseFace::PerformEdge() : Done" << endl;
#endif
}
@@ -593,7 +593,7 @@ void TopOpeBRepBuild_FuseFace::PerformEdge()
void TopOpeBRepBuild_FuseFace::ClearEdge()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepBuild_GettraceFUFA();
if (trc) cout << "TopOpeBRepBuild_FuseFace::ClearEdge()" << endl;
#endif
@@ -637,7 +637,7 @@ void TopOpeBRepBuild_FuseFace::ClearEdge()
BRepLib_MakeWire MW;
MW.Add(myWireLE);
if (!MW.IsDone()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::ClearEdge : Failure in making wire"<<endl;
#endif
myModified = Standard_False;
@@ -657,7 +657,7 @@ void TopOpeBRepBuild_FuseFace::ClearEdge()
// Fin Niveau 2
// Reconstrution de 1 face de LRF
if (myFaceLW.IsEmpty()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::ClearEdge : Empty list of wires"<<endl;
#endif
myModified = Standard_False;
@@ -676,7 +676,7 @@ void TopOpeBRepBuild_FuseFace::ClearEdge()
MF.Add(wir1);
}
if (!MF.IsDone()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::ClearEdge : Failure in making face"<<endl;
#endif
myModified = Standard_False;
@@ -689,7 +689,7 @@ void TopOpeBRepBuild_FuseFace::ClearEdge()
}
//Fin Niveau 1
if (myLFFnew.IsEmpty()) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::ClearEdge : Empty list of fusionned faces"<<endl;
#endif
myModified = Standard_False;
@@ -702,7 +702,7 @@ void TopOpeBRepBuild_FuseFace::ClearEdge()
myModified = Standard_True;
myDone = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout << " TopOpeBRepBuild_FuseFace::ClearEdge() : Done" << endl;
#endif
}
@@ -714,12 +714,12 @@ void TopOpeBRepBuild_FuseFace::ClearEdge()
void TopOpeBRepBuild_FuseFace::ClearVertex()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepBuild_GettraceFUFA();
if (trc) cout << "TopOpeBRepBuild_FuseFace::ClearVertex()" << endl;
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout << " TopOpeBRepBuild_FuseFace::ClearVertex() : Done" << endl;
#endif
}
@@ -928,7 +928,7 @@ static void GroupEdge(TopTools_DataMapOfShapeListOfShape& mymapVerLEdg, TopTools
static void MakeEdge(TopTools_DataMapOfShapeListOfShape& mymapEdgLEdg)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepBuild_GettraceFUFA();
#endif
@@ -978,7 +978,7 @@ static void MakeEdge(TopTools_DataMapOfShapeListOfShape& mymapEdgLEdg)
}
Standard_Integer number = myEdgeLV.Extent();
if (!(number == 2)){
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout<<" TopOpeBRepBuild_FuseFace::MakeEdge : Failure in reconstructing new edge"<<endl;
#endif
return;
@@ -1023,7 +1023,7 @@ static void MakeEdge(TopTools_DataMapOfShapeListOfShape& mymapEdgLEdg)
Standard_Boolean SameSupport(const TopoDS_Edge& E1,
const TopoDS_Edge& E2)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepBuild_GettraceFUFA();
#endif
@@ -1070,7 +1070,7 @@ Standard_Boolean SameSupport(const TopoDS_Edge& E1,
typC1 != STANDARD_TYPE(Geom_Ellipse) &&
typC1 != STANDARD_TYPE(Geom_BSplineCurve) &&
typC1 != STANDARD_TYPE(Geom_BezierCurve)) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trc) cout << " TopOpeBRepBuild_FuseFace : Type de Support non traite" << endl;
#endif
return Standard_False;

26
src/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx
View File

@@ -20,7 +20,7 @@
#include <TopoDS.hxx>
#include <TopOpeBRepBuild_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GetcontextSPEON();
#endif
@@ -36,7 +36,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GToSplit(const TopoDS_Shape& S,const T
Standard_Boolean hassame = myDataStructure->HasSameDomain(S);
Standard_Boolean tosplit = (!issplit) && (facshap || hasgeom || hassame);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if (tSPS) {
cout<<"GToSplit ";GdumpSHA(S);cout<<" ";TopAbs::Print(TB,cout);
@@ -47,7 +47,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GToSplit(const TopoDS_Shape& S,const T
}
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GetcontextSPEON()) { //CONTEXT
tSPS = Standard_True; //CONTEXT
Standard_Boolean hasON = Standard_False; //CONTEXT
@@ -86,7 +86,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GToMerge(const TopoDS_Shape& S) const
Standard_Boolean hassame = myDataStructure->HasSameDomain(S);
Standard_Boolean tomerge = (!ismerged && hassame);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if(tSPS){cout<<"GToMerge ";GdumpSHA(S);cout<<" ";TopAbs::Print(TB,cout);}
if(tSPS){cout<<" "<<tomerge<<" : !ismerged "<<(!ismerged)<<" && hassame "<<hassame<<endl;}
@@ -154,13 +154,13 @@ void TopOpeBRepBuild_Builder::GFindSamDom(TopTools_ListOfShape& L1,TopTools_List
TopTools_ListIteratorOfListOfShape it1(L1);
for (i=1 ; i<=nl1; i++) {
const TopoDS_Shape& S1 = it1.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS1 = myDataStructure->Shape(S1);
#endif
TopTools_ListIteratorOfListOfShape itsd(myDataStructure->SameDomain(S1));
for (; itsd.More(); itsd.Next() ) {
const TopoDS_Shape& S2 = itsd.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS2 = myDataStructure->Shape(S2);
#endif
Standard_Boolean found = GContains(S2,L2);
@@ -176,13 +176,13 @@ void TopOpeBRepBuild_Builder::GFindSamDom(TopTools_ListOfShape& L1,TopTools_List
TopTools_ListIteratorOfListOfShape it2(L2);
for (i=1 ; i<=nl2; i++) {
const TopoDS_Shape& S2 = it2.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS2 = myDataStructure->Shape(S2);
#endif
TopTools_ListIteratorOfListOfShape itsd(myDataStructure->SameDomain(S2));
for (; itsd.More(); itsd.Next() ) {
const TopoDS_Shape& S1 = itsd.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS1 = myDataStructure->Shape(S1);
#endif
Standard_Boolean found = GContains(S1,L1);
@@ -221,14 +221,14 @@ void TopOpeBRepBuild_Builder::GFindSamDomSODO(TopTools_ListOfShape& LSO,TopTools
it.Initialize(LSO);
if ( ! it.More() ) return;
const TopoDS_Shape& sref = it.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iref = myDataStructure->SameDomainReference(sref);
#endif
TopOpeBRepDS_Config oref = myDataStructure->SameDomainOrientation(sref);
GFindSamDom(LSO,LDO);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(sref,iS);
if(tSPS) {
TCollection_AsciiString ss("GFindSamDom result on ");
@@ -243,7 +243,7 @@ void TopOpeBRepBuild_Builder::GFindSamDomSODO(TopTools_ListOfShape& LSO,TopTools
for (it.Initialize(LSO); it.More(); it.Next() ) {
const TopoDS_Shape& s = it.Value();
TopOpeBRepDS_Config o = myDataStructure->SameDomainOrientation(s);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS = myDataStructure->Shape(s);
#endif
if ( o == oref && !GContains(s,LLSO) ) LLSO.Append(s);
@@ -253,7 +253,7 @@ void TopOpeBRepBuild_Builder::GFindSamDomSODO(TopTools_ListOfShape& LSO,TopTools
for (it.Initialize(LDO); it.More(); it.Next() ) {
const TopoDS_Shape& s = it.Value();
TopOpeBRepDS_Config o = myDataStructure->SameDomainOrientation(s);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS = myDataStructure->Shape(s);
#endif
if ( o == oref && !GContains(s,LLSO) ) LLSO.Append(s);
@@ -296,7 +296,7 @@ void TopOpeBRepBuild_Builder::GFindSameRank
{
for ( TopTools_ListIteratorOfListOfShape it1(L1); it1.More(); it1.Next() ) {
const TopoDS_Shape& s = it1.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS = myDataStructure->Shape(s);
#endif
Standard_Integer r = GShapeRank(s);

58
src/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx
View File

@@ -44,7 +44,7 @@
#include <TopOpeBRepDS_Dumper.hxx>
#include <Standard_ProgramError.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOSG();
#endif
@@ -66,7 +66,7 @@ void TopOpeBRepBuild_Builder::GMergeEdges(const TopTools_ListOfShape& LE1,const
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
const TopoDS_Shape& E1 = LE1.First();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPS1 = GtraceSPS(E1,iE);
if(tSPS1){
cout<<endl;cout<<"--- GMergeEdges "<<endl;
@@ -125,7 +125,7 @@ void TopOpeBRepBuild_Builder::GFillEdgesPVS(const TopTools_ListOfShape& LE1,cons
const TopoDS_Shape& E11 = it1.Value();
Standard_Boolean ismerged = IsMerged(E11,TB1);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer i1; Standard_Boolean tSPS1 = GtraceSPS(E11,i1);
if(tSPS1){
cout<<endl;cout<<"--- GFillEdgesPVS ";GdumpSHA(E11);
@@ -143,7 +143,7 @@ void TopOpeBRepBuild_Builder::GFillEdgesPVS(const TopTools_ListOfShape& LE1,cons
const TopoDS_Shape& E2 = it2.Value();
Standard_Boolean ismerged = IsMerged(E2,TB2);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer i2; Standard_Boolean tSPS2 = GtraceSPS(E2,i2);
if(tSPS2){
cout<<endl;
@@ -203,7 +203,7 @@ static Standard_Boolean FUN_MoreSHAINT(TopOpeBRepDS_PointIterator& EPit,
}
// Unused :
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
static Standard_Integer FUN_getTRASHA(const Standard_Integer geti,
const TopOpeBRepDS_ListOfInterference& lFOR, const Standard_Integer FOR,
const TopOpeBRepDS_ListOfInterference& lREV, const Standard_Integer REV,
@@ -222,7 +222,7 @@ static Standard_Integer FUN_getTRASHA(const Standard_Integer geti,
}
#endif*/
#ifdef DEB
#ifdef OCCT_DEBUG
void debfillp(const Standard_Integer i) {cout <<"+ + debfillp "<<i<<endl;}
void debfillpon(const Standard_Integer i) {cout <<"+ + debfillpon "<<i<<endl;}
void debfillpin(const Standard_Integer i) {cout <<"+ + debfillpin "<<i<<endl;}
@@ -272,7 +272,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
const TopOpeBRepBuild_GTopo& G,
TopOpeBRepBuild_PaveSet& PVS)
{
#ifdef DEB
#ifdef OCCT_DEBUG
// TopAbs_State TB1,TB2;
// G.StatesON(TB1,TB2);
// TopOpeBRepDS_Config GConf1 = G.Config1();
@@ -283,7 +283,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
ShapeInterf = t1;
const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS();
const Standard_Integer iEDS = BDS.Shape(E);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer rkE = BDS.AncestorRank(E);
#endif
Standard_Boolean isSE = BDS.IsSectionEdge(TopoDS::Edge(E));
@@ -291,12 +291,12 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
Standard_Boolean isEd;
isEd = BRep_Tool::Degenerated(TopoDS::Edge(E));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean hsd = myDataStructure->HasSameDomain(E); //xpu170498
#endif
Standard_Boolean isfafa = BDS.Isfafa(); //xpu120598
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPSE=GtraceSPS(iEDS);
TCollection_AsciiString striE=TopOpeBRepDS::SPrint(TopAbs_EDGE,iEDS);
const TopoDS_Shape& EPVS=PVS.Edge();Standard_Integer iEPVS;Standard_Boolean tSPSEPVS=GtraceSPS(EPVS,iEPVS);
@@ -314,7 +314,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
Standard_Boolean isspin=(GLOBAL_issp==TheIN), isspou=(GLOBAL_issp==TheOUT), isspon=(GLOBAL_issp==TheON);
if (isSE && (GLOBAL_issp == 0)) return; // splits done in process ProcessSectionEdges
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iefil = BDS.Shape(E);
// Standard_Integer iffil = BDS.Shape(myFaceToFill);
// Standard_Integer ieref = BDS.Shape(myEdgeReference);
@@ -405,7 +405,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
const TopOpeBRepDS_ListOfInterference& LICur = tki.Value(Kcur,Gcur);
Standard_Boolean point = (Kcur == TopOpeBRepDS_POINT); //xpu170498
Standard_Boolean vertex = (Kcur == TopOpeBRepDS_VERTEX);//xpu170498
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nLICur = LICur.Extent();
Standard_Boolean trcI = Standard_False;
if(trcI) {TopOpeBRepDS_Dumper DSD(myDataStructure); TCollection_AsciiString aa("lI");
@@ -497,7 +497,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
TopOpeBRepDS_ListOfInterference li; li.Append(newI); TopOpeBRepDS_PointIterator itCur(li);
GFillPointTopologyPVS(E,itCur,G,PVS);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {newI->Dump(cout,"\nnewinterf ","\n\n"); debfillp2(iEDS);}
#endif
{tki.Next(); continue;}
@@ -518,7 +518,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
TopAbs_ShapeEnum SB1,SA1;Standard_Integer IB1,IA1;TopOpeBRepDS_Kind GT1,ST1;Standard_Integer G1,S1;
FDS_Idata(I1,SB1,IB1,SA1,IA1,GT1,G1,ST1,S1);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {I1->Dump(cout,"\n? keepinterf ","\n\n"); debfillp2(iEDS);}
#endif
@@ -534,17 +534,15 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
// e27 possede des I de nature 2d et 3d en V8
// on privilegie l'info 3d
if (has2d3d && !isSE) {
#ifdef DEB
#ifdef OCCT_DEBUG
const Handle(TopOpeBRepDS_Interference)& i2d =
#endif
l2dFEcur.First();
const Handle(TopOpeBRepDS_Interference)& i3d = l3dFcur.First();
Standard_Boolean id3d = (I1 == i3d);
#ifdef DEB
Standard_Boolean id2d = (I1 == i2d);
#endif
keepinterf1 = id3d;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean id2d = (I1 == i2d);
if (tSPS) {
cout<<"DEB : GFillPointTopologyPVS E"<<iEDS<<" has2d3d"<<endl;
i2d->Dump(cout,"2d : ","\n");
@@ -598,7 +596,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
const Handle(TopOpeBRepDS_Interference)& I1=EPit.Value();
TopOpeBRepDS_Kind ST1 = I1->SupportType();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPSE = GtraceSPS(E,iE);
Standard_Integer iEPVS; Standard_Boolean tSPSEPVS = GtraceSPS(EPVS,iEPVS);
Standard_Boolean tSPS = tSPSE || tSPSEPVS;
@@ -637,17 +635,17 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
Standard_Real par = EPit.Parameter();
TopAbs_Orientation ori = EPit.Orientation(TB);
#ifdef DEB
#ifdef OCCT_DEBUG
if ( tSPS ) debfillp(iE);
#endif
Standard_Boolean samegeom = ::TopOpeBRepBuild_FUN_aresamegeom(E,EPVS);
if (Conf == TopOpeBRepDS_DIFFORIENTED) ori = TopAbs::Complement(ori);
#ifdef DEB
#ifdef OCCT_DEBUG
if (!TopOpeBRepBuild_GetcontextNOSG()) {
#endif
if (!samegeom) ori = TopAbs::Complement(ori);
#ifdef DEB
#ifdef OCCT_DEBUG
}
#endif
@@ -657,7 +655,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
Standard_Real parref = par;
const TopoDS_Edge& EE = TopoDS::Edge(E);
GParamOnReference(VPV,EE,parref);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
cout<<"par "<<par<<" / ";GdumpSHA(E);cout<<" --> parref "<<parref<<" / ";GdumpSHA(EPVS);
cout<<endl;
@@ -669,7 +667,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
Standard_Boolean kpbound = Standard_False;
{
TopoDS_Vertex vclo; Standard_Boolean Eclosed = TopOpeBRepTool_TOOL::ClosedE(myEdgeReference,vclo);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer ivclo = myDataStructure->Shape(vclo);
#endif
TopAbs_Orientation oriI = EPit.Orientation(TopAbs_IN);
@@ -704,7 +702,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
PVS.Append(PV);
#ifdef DEB
#ifdef OCCT_DEBUG
gp_Pnt P = BRep_Tool::Pnt(VPV);
if(tSPS){cout<<"+";if(ispoint)cout<<" PDS ";else cout<<" VDS ";}
if(tSPS){cout<<iG<<" : ";GdumpORIPARPNT(ori,par,P);cout<<endl;}
@@ -737,7 +735,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
PVF -> InterferenceType() = ST1;
PVS.Append(PVF);
#ifdef DEB
#ifdef OCCT_DEBUG
gp_Pnt PF = BRep_Tool::Pnt(VPV);
if(tSPS){cout<<"+";if(ispoint)cout<<" PDS ";else cout<<" VDS ";}
if(tSPS){cout<<iG<<" : ";GdumpORIPARPNT(ovpv,parf,PF);cout<<endl;}
@@ -757,7 +755,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
//modified by NIZHNY-MZV Mon Feb 21 14:48:37 2000
PVR -> InterferenceType() = ST1;
PVS.Append(PVR);
#ifdef DEB
#ifdef OCCT_DEBUG
gp_Pnt PR = BRep_Tool::Pnt(VPV);
if(tSPS){cout<<"+";if(ispoint)cout<<" PDS ";else cout<<" VDS ";}
if(tSPS){cout<<iG<<" : ";GdumpORIPARPNT(ovpv,parl,PR);cout<<endl;}
@@ -784,7 +782,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GParamOnReference(const TopoDS_Vertex&
Handle(Geom_Surface) su = BRep_Tool::Surface(myFaceReference);
Handle(Geom_Plane) suplan = Handle(Geom_Plane)::DownCast(su);
if ( suplan.IsNull() ) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"NYI : GParamOnReference : not planar"<<endl;
#endif
return Standard_False;
@@ -810,7 +808,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GParamOnReference(const TopoDS_Vertex&
case GeomAbs_Parabola:
P = ElCLib::Parameter(AC.Parabola(),p2); break;
default :
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"NYI : GParamOnReference : OtherCurve on planar surface"<<endl;
#endif
return Standard_False;

78
src/TopOpeBRepBuild/TopOpeBRepBuild_GridFF.cxx
View File

@@ -32,12 +32,12 @@
#include <TopOpeBRepBuild_define.hxx>
#ifdef DRAW
#include <TopOpeBRepDS_DSX.hxx>
Standard_IMPORT void FUN_draw(const TopoDS_Shape& s);
Standard_IMPORT void FUN_draw2de (const TopoDS_Shape& ed,const TopoDS_Shape& fa);
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
#include <TopOpeBRepDS_DSX.hxx>
extern void* GFABUMAKEFACEPWES_DEB;
#define DEBSHASET(sarg,meth,shaset,str) TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str);
Standard_Integer GLOBAL_iexE = 0;
@@ -85,7 +85,7 @@ static
//-------------------------------------------------------------
// Unused :
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
//=======================================================================
//function :FUN_BUI_FACESINTERFER
//purpose :
@@ -133,7 +133,7 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU,
// {I = (T(F),ES,FTRA)} / Fsdm F and ES interfers with E which has splits ON
// E is edge of F
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF;Standard_Boolean tF=BU.GtraceSPS(F,iF);
#endif
@@ -195,7 +195,7 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU,
if (ok) {
newT.Index(ITRA); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED;
Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,ITRA,IE,Standard_True,C);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tF) {cout<<"f"<<IF<<" + ";newI->Dump(cout);cout<<endl;}
#endif
pDS2d->AddShapeInterference(F,newI);
@@ -213,7 +213,7 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU,
if (ok) {
newT.Index(IF); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED;
Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,IF,IE,Standard_False,C);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tF) {cout<<"f"<<ITRA<<" + ";newI->Dump(cout);cout<<endl;}
#endif
pDS2d->AddShapeInterference(FTRA,newI);
@@ -223,7 +223,7 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU,
if (ok) {
newT.Index(IF); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED;
Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,IF,S,Standard_True,C);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tF) {cout<<endl<<"f"<<ITRA<<" + ";newI->Dump(cout);cout<<endl;}
#endif
pDS2d->AddShapeInterference(FTRA,newI);
@@ -244,7 +244,7 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU,
if (ok) {
newT.Index(ITRA); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED;
Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,ITRA,S,Standard_False,C);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tF) {cout<<"f"<<iF<<" + ";newI->Dump(cout);cout<<endl;}
#endif
pDS2d->AddShapeInterference(F,newI);
@@ -291,7 +291,7 @@ Standard_EXPORT TopOpeBRepDS_PDataStructure GLOBAL_DS2d = NULL;
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
const TopoDS_Shape& F1 = LF1.First();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(F1,iF);
if(tSPS){
cout<<endl<<"--- GMergeFaces "<<endl;
@@ -347,7 +347,7 @@ Standard_EXPORT TopOpeBRepDS_PDataStructure GLOBAL_DS2d = NULL;
// Build new faces LFM
TopTools_ListOfShape LFM;
#ifdef DEB
#ifdef OCCT_DEBUG
GFABUMAKEFACEPWES_DEB = (void*)&WES;
#endif
@@ -444,7 +444,7 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
TopOpeBRepBuild_WireEdgeSet WES(FF,this);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(FF,iF);
if(tSPS) GdumpSHASTA(iF,TB1,WES,"\n--- GFillFacesWESMakeFaces");
if(tSPS) debfillf(iF);
@@ -490,7 +490,7 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
TopTools_ListIteratorOfListOfShape it1;
for (it1.Initialize(LF1); it1.More(); it1.Next()) {
const TopoDS_Shape& S = it1.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; GtraceSPS(S,iS);
#endif
MarkSplit(S,TB1);
@@ -501,7 +501,7 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
TopTools_ListIteratorOfListOfShape it2;
for (it2.Initialize(LF2); it2.More(); it2.Next()) {
const TopoDS_Shape& S = it2.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; GtraceSPS(S,iS);
#endif
MarkSplit(S,TB2);
@@ -522,7 +522,7 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
Standard_Boolean RevOri1 = G1.IsToReverse1();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(FOR1,iF);
if(tSPS) GdumpSHASTA(iF,TB1,WES,"--- GFillFaceWES","START");
if(tSPS) debfillf(iF);
@@ -561,7 +561,7 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) GdumpSHASTA(iF,TB1,WES,"--- GFillFaceWES","END");
#endif
@@ -579,7 +579,7 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
{
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iW; Standard_Boolean tSPS = GtraceSPS(W,iW);
if(tSPS){
cout<<endl;DEBSHASET(s,"--- GFillWireWES ",WES," ");
@@ -596,7 +596,7 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
for (; exEdge.More(); exEdge.Next()) {
const TopoDS_Shape& EOR = exEdge.Current();
#ifdef DEB
#ifdef OCCT_DEBUG
GLOBAL_iexE++;
if (tSPS) {
// const TopoDS_Edge& ed = TopoDS::Edge(EOR);
@@ -628,21 +628,21 @@ static Standard_Boolean FUN_validF1edge(const TopoDS_Shape& F)
{
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(EOR,iE);
if(tSPS)cout<<endl;
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tosplit =
#endif
GToSplit(EOR,TB1);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tomerge =
#endif
GToMerge(EOR);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) GdumpSHASTA(iE,TB1,WES,"--- GFillEdgeWES ");
if(tSPS) cout<<" tosplit "<<tosplit<<" tomerge "<<tomerge<<endl;
if(tSPS) debfille(iE);
@@ -729,7 +729,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
// if (cut && TBToFill==OUT) : myFaceToFill is the reference face,
// we keep original edge's orientation
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iEOR; Standard_Boolean tSPS = GtraceSPS(EOR,iEOR);
Standard_Integer iWESF; /*Standard_Boolean tSPSW = */GtraceSPS(WES.Face(),iWESF);
if(tSPS) GdumpSHASTA(iEOR,TB1,WES,"\n--- GSplitEdgeWES","START");
@@ -780,7 +780,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
if ( issplit ) {
const TopTools_ListOfShape& LSE = Splits(EOR,TB1);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
GdumpSHASTA(iEOR,TB1,WES,"--- GSplitEdgeWES","WES+ Split");
cout<<" ";TopAbs::Print(TB1,cout)<<" : "<<LSE.Extent()<<" edge(s) ";
@@ -802,7 +802,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
Standard_Boolean so = Standard_True;
Standard_Boolean ok = FUN_tool_curvesSO(newE,par,TopoDS::Edge(EOR),so);
if (!ok) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"GSplitEdgeWES: cannot orient SDM split of an edge"<<endl;
#endif
//return; // nyiFUNRAISE
@@ -814,7 +814,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
}// xpu060598
else newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debaddpwes(iWESF,TB1,iEOR,neworiE,(TopOpeBRepBuild_Builder* const)this,&WES,"GSplitEdgeWES " ,"WES+ Eisspl ");
#endif
@@ -846,7 +846,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
addON = Standard_True;
}
#ifdef DEBDEB
#ifdef OCCT_DEBUG
cout<<"o-o GridFF ffil F"<<ifil<<" se E"<<iEOR<<" / "<<iWESF<<" ";
TopAbs::Print(TB1,cout);cout.flush();
Standard_Boolean tse = TopOpeBRepDS_GettraceSPSX(iEOR);
@@ -862,7 +862,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
Standard_Boolean testkeep = Standard_True;
testkeep = hs && (!hg);
if (testkeep) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){cout<<"--- GSplitEdgeWES ";}
#endif
TopAbs_State pos;
@@ -884,7 +884,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
else if (Oinref == FORREVOPPO) newE.Orientation(TopAbs_INTERNAL);// xpu120898 (PRO14785 : e36 shared by f34 & f39,
// faces sdm with f16)
else newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(ss,"--- GSplitEdgeWES ",WES," WES+ edge ");
GdumpSHA(newE,(Standard_Address)ss.ToCString());
@@ -894,7 +894,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
#endif
if (isstart) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debaddpwes(iWESF,TB1,iEOR,neworiE,(TopOpeBRepBuild_Builder* const)this,&WES,"GSplitEdgeWES " ,"WES+ Enospl ");
#endif
WES.AddStartElement(newE);
@@ -925,7 +925,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
Standard_Boolean so = Standard_True;
Standard_Boolean ok = FUN_tool_curvesSO(newE,par,TopoDS::Edge(EOR),so);
if (!ok) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"GSplitEdgeWES: cannot orient SDM split of an edge"<<endl;
#endif
}
@@ -937,7 +937,7 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) GdumpSHASTA(iEOR,TB1,WES,"--- GSplitEdgeWES","END");
#endif
@@ -948,7 +948,7 @@ Standard_IMPORT Standard_Boolean FUN_ismotheropedef();
Standard_IMPORT const TopOpeBRepBuild_GTopo& FUN_motherope();
Standard_EXPORT Standard_Boolean GLOBAL_IEtoMERGE = 0; // xpu240498
#ifdef DEB
#ifdef OCCT_DEBUG
void debmergee(const Standard_Integer /*i*/) {}
#endif
@@ -960,7 +960,7 @@ void debmergee(const Standard_Integer /*i*/) {}
const TopOpeBRepBuild_GTopo& G1,
TopOpeBRepBuild_WireEdgeSet& WES)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iWESF; /*Standard_Boolean tSPSW = */GtraceSPS(WES.Face(),iWESF);
Standard_Integer iEOR; Standard_Boolean tSPS = GtraceSPS(EOR,iEOR);
if(tSPS){ debmergee(iEOR);
@@ -1003,7 +1003,7 @@ void debmergee(const Standard_Integer /*i*/) {}
TopoDS_Shape newE = it.Value();
newE.Orientation(neworiE);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debaddpwes(iWESF,TB1,iEOR,neworiE,(TopOpeBRepBuild_Builder* const)this,&WES,"GMergeEdgeWES " ,"WES+ Emerge ");
#endif
@@ -1024,7 +1024,7 @@ void debmergee(const Standard_Integer /*i*/) {}
ChangeMerged(EOR,TBEOR) = Splits(EOR,stspEOR);
const TopTools_ListOfShape& ME = Merged(EOR,TBEOR);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(s,"GMergeEdgeWES(1) ",WES," WES+ Merged ");
GdumpSHA(EOR,(Standard_Address)s.ToCString());
@@ -1038,7 +1038,7 @@ void debmergee(const Standard_Integer /*i*/) {}
WES.AddStartElement(newE);
}
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(sss,"GMergeEdgeWES ",WES," END ");
GdumpSHA(EOR,(Standard_Address)sss.ToCString());cout<<endl;
@@ -1061,7 +1061,7 @@ void debmergee(const Standard_Integer /*i*/) {}
// work on a FORWARD edge <EF>
TopoDS_Shape EF = EOR; EF.Orientation(TopAbs_FORWARD);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(EOR,iE);
if (tSPS) GdumpSHASTA(EOR,TB1,"--- GSplitEdge ","\n");
if (tSPS) GdumpEDG(EF);
@@ -1073,13 +1073,13 @@ void debmergee(const Standard_Integer /*i*/) {}
Standard_Boolean issplitON = IsSplit(EEF,TopAbs_ON);
Standard_Boolean takeON = (TB1 == TopAbs_IN) && (isse) && (issplitON);
takeON = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) cout<<"---- takeON mis a 0"<<endl;
#endif
if ( takeON ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) GdumpSHASTA(EOR,TB1,"--- GSplitEdge takeON ","\n");
#endif

66
src/TopOpeBRepBuild/TopOpeBRepBuild_GridSS.cxx
View File

@@ -65,7 +65,7 @@
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
#define DEBSHASET(sarg,meth,shaset,str) TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str);
extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
Standard_EXPORT void debsplitf(const Standard_Integer i){cout<<"++ debsplitf "<<i<<endl;}
@@ -134,7 +134,7 @@ static Standard_Boolean FUN_EPIforEvisoONperiodicF
if (!ok) return Standard_False; // nyi FUN_Raise
Standard_Integer iEinterf=0; Standard_Integer iG = FUN_getG(p3d,EPIlist,HDS,iEinterf);
if (iG == 0) {
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean strange = TopOpeBRepDS_GettraceSTRANGE();
if (strange) cout<<"strange : FUN_EPIforEvisoONperiodicF"<<endl;
#endif
@@ -188,7 +188,7 @@ static Standard_Boolean FUN_EPIforEvisoONperiodicF
Handle(Geom2d_TrimmedCurve) PCsup2pi = new Geom2d_TrimmedCurve(L2d,paronE,pl);
TopOpeBRepDS_SetThePCurve(BB,Esup2pi,F,oriE,PCsup2pi);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = Standard_False;
#ifdef DRAW
if (trc) {TCollection_AsciiString aa("PCinf");FUN_tool_draw(aa,Einf2pi,F,0);}
@@ -238,7 +238,7 @@ void TopOpeBRepBuild_Builder::GMergeSolids(const TopTools_ListOfShape& LSO1,cons
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
const TopoDS_Shape& SO1 = LSO1.First();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iSO; Standard_Boolean tSPS = GtraceSPS(SO1,iSO);
if(tSPS){
cout<<endl;
@@ -309,7 +309,7 @@ void TopOpeBRepBuild_Builder::GFillSolidsSFS(const TopTools_ListOfShape& LS1,con
for(; it.More(); it.Next()) {
const TopoDS_Shape& S = it.Value();
Standard_Boolean tomerge = !IsMerged(S,TB);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if(tSPS){
cout<<endl;
@@ -325,7 +325,7 @@ void TopOpeBRepBuild_Builder::GFillSolidsSFS(const TopTools_ListOfShape& LS1,con
for (; it.More(); it.Next()) {
const TopoDS_Shape& S = it.Value();
Standard_Boolean tomerge = !IsMerged(S,TB);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if(tSPS){
cout<<endl;
@@ -351,7 +351,7 @@ void TopOpeBRepBuild_Builder::GFillSolidSFS(const TopoDS_Shape& SO1,const TopToo
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
Standard_Boolean RevOri1 = G1.IsToReverse1();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iSO; Standard_Boolean tSPS = GtraceSPS(SO1,iSO);
if(tSPS){
cout<<endl;
@@ -376,7 +376,7 @@ void TopOpeBRepBuild_Builder::GFillSolidSFS(const TopoDS_Shape& SO1,const TopToo
TopAbs_Orientation neworiSH = Orient(oriSH,RevOri1);
SH.Orientation(neworiSH);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(ss,"--- GFillSolidSFS ",SFS," AddShape SFS+ shell ");
GdumpSHA(SH,(Standard_Address)ss.ToCString());
@@ -399,7 +399,7 @@ void TopOpeBRepBuild_Builder::GFillSolidSFS(const TopoDS_Shape& SO1,const TopToo
//function : GFillSurfaceTopologySFS
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GFillSurfaceTopologySFS(const TopoDS_Shape& SO1,
#else
void TopOpeBRepBuild_Builder::GFillSurfaceTopologySFS(const TopoDS_Shape&,
@@ -410,11 +410,11 @@ void TopOpeBRepBuild_Builder::GFillSurfaceTopologySFS(const TopoDS_Shape&,
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
TopAbs_ShapeEnum t1,t2;
G1.Type(t1,t2);
#ifdef DEB
#ifdef OCCT_DEBUG
TopAbs_ShapeEnum ShapeInterf = t1;
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iSO; Standard_Boolean tSPS = GtraceSPS(SO1,iSO);
if(tSPS){
cout<<endl;
@@ -443,7 +443,7 @@ void TopOpeBRepBuild_Builder::GFillSurfaceTopologySFS
else if (TB1 == TopAbs_IN ) TB = TopAbs_OUT;
}
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iSO; Standard_Boolean tSPS = GtraceSPS(SFS.Solid(),iSO);
Standard_Integer iref = myDataStructure->Shape(mySolidReference);
Standard_Integer ifil = myDataStructure->Shape(mySolidToFill);
@@ -463,7 +463,7 @@ void TopOpeBRepBuild_Builder::GFillSurfaceTopologySFS
TopAbs_Orientation ori = SSit.Orientation(TB);
F.Orientation(ori);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS){
DEBSHASET(ss,"--- GFillSurfaceTopologySFS ",SFS," AddElement SFS+ face ");
GdumpSHA(F,(Standard_Address)ss.ToCString());
@@ -488,7 +488,7 @@ void TopOpeBRepBuild_Builder::GFillShellSFS(const TopoDS_Shape& SH,
{
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer ish; Standard_Boolean tSPS = GtraceSPS(SH,ish);
if(tSPS){
cout<<endl;
@@ -507,7 +507,7 @@ void TopOpeBRepBuild_Builder::GFillShellSFS(const TopoDS_Shape& SH,
} // hsd
} // exFace.More()
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) {
SFS.DumpSS();
}
@@ -672,12 +672,12 @@ void TopOpeBRepBuild_Builder::GSplitFaceSFS
TopAbs_Orientation oriF = FOR.Orientation();
TopAbs_Orientation neworiF = Orient(oriF,RevOri1);
const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iFOR =
#endif
BDS.Shape(FOR);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iiFOR; Standard_Boolean tSPS = GtraceSPS(FOR,iiFOR);
if(tSPS){
cout<<endl;
@@ -714,7 +714,7 @@ void TopOpeBRepBuild_Builder::GSplitFaceSFS
Standard_Integer rkAnc = BDS.AncestorRank(iAnc);
TopAbs_Orientation oAnc = BDS.Shape(iAnc).Orientation();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iFanc; Standard_Boolean tSPSa = GtraceSPS(BDS.Shape(iAnc),iFanc);
if (tSPSa) debspanc(iAnc);
#endif
@@ -760,7 +760,7 @@ void TopOpeBRepBuild_Builder::GSplitFaceSFS
GLOBAL_lfr1->Append(newF);
}
else {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(ss,"--- GSplitFaceSFS ",SFS," AddStartElement SFS+ face ");
GdumpSHA(newF,(Standard_Address)ss.ToCString());
@@ -791,7 +791,7 @@ void TopOpeBRepBuild_Builder::GSplitFaceSFS
TopoDS_Shape F = FOR;
F.Orientation(neworiF);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(ss,"--- GSplitFaceSFS ",SFS," AddElement SFS+ face ");
GdumpSHA(F,(Standard_Address)ss.ToCString());
@@ -814,7 +814,7 @@ void TopOpeBRepBuild_Builder::GMergeFaceSFS
(const TopoDS_Shape& FOR,const TopOpeBRepBuild_GTopo& G1,
TopOpeBRepBuild_ShellFaceSet& SFS)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iFOR; Standard_Boolean tSPS = GtraceSPS(FOR,iFOR);
if(tSPS){
cout<<endl;
@@ -847,7 +847,7 @@ void TopOpeBRepBuild_Builder::GMergeFaceSFS
GFindSameRank(LFSO,rankF,LFSO1); GFindSameRank(LFDO,rankF,LFDO1);
GFindSameRank(LFSO,rankX,LFSO2); GFindSameRank(LFDO,rankX,LFDO2);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
cout<<"--------- merge FACE "<<iFOR<<endl;
GdumpSAMDOM(LFSO1, (char *) "LFSO1 : ");
@@ -871,7 +871,7 @@ void TopOpeBRepBuild_Builder::GMergeFaceSFS
if (performcom) { PtrLF1 = &LFSO1; PtrLF2 = &LFDO2; }
}
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
cout<<"performcom : "<<performcom<<" ";
cout<<"makecomsam : "<<makecomsam<<" makcomdif : "<<makecomdif<<" ";
@@ -907,7 +907,7 @@ void TopOpeBRepBuild_Builder::GMergeFaceSFS
TopoDS_Shape newF = it.Value();
newF.Orientation(neworiF);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(ss,"--- GMergeFaceSFS ",SFS," AddStartElement SFS+ face ");
GdumpSHA(newF,(Standard_Address)ss.ToCString());
@@ -920,7 +920,7 @@ void TopOpeBRepBuild_Builder::GMergeFaceSFS
}
} // performcom
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){cout<<"--------- end merge FACE "<<iFOR<<endl;}
#endif
@@ -950,7 +950,7 @@ static Standard_Boolean FUN_SplitEvisoONperiodicF(const Handle(TopOpeBRepDS_HDat
TopOpeBRepDS_Kind GT,ST;Standard_Integer GI,SI;FDS_data(SSI,GT,GI,ST,SI);
const TopoDS_Face& FS = TopoDS::Face( HDS->Shape(SI));
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iFS =
#endif
HDS->Shape(FS);
@@ -959,7 +959,7 @@ static Standard_Boolean FUN_SplitEvisoONperiodicF(const Handle(TopOpeBRepDS_HDat
if (!FSper) continue;
const TopoDS_Edge& EG = TopoDS::Edge(HDS->Shape(GI));
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iEG =
#endif
HDS->Shape(EG);
@@ -994,7 +994,7 @@ static Standard_Boolean FUN_SplitEvisoONperiodicF(const Handle(TopOpeBRepDS_HDat
TopOpeBRepDS_DataStructure& BDS = HDS->ChangeDS();
TopOpeBRepDS_ListOfInterference EPIlist; FUN_getEPIonEds(FS,HDS,EPIlist);
TopOpeBRepDS_ListOfInterference loCPI;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean recadre =
#endif
FUN_EPIforEvisoONperiodicF(EG,FS,EPIlist, HDS,loCPI);
@@ -1002,7 +1002,7 @@ static Standard_Boolean FUN_SplitEvisoONperiodicF(const Handle(TopOpeBRepDS_HDat
TopOpeBRepDS_ListOfInterference& lIEG = BDS.ChangeShapeInterferences(EG);
lIEG.Append(loCPI);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = TopOpeBRepDS_GettraceSTRANGE();
if (trc) {cout<<"!! recadre is "; if (!recadre) cout<<"not ";
cout<<"done on face FS "<<iFS<<" for edge "<<iEG<<endl;}
@@ -1066,7 +1066,7 @@ void TopOpeBRepBuild_Builder::GSplitFace
// work on a FORWARD face <FForward>
TopoDS_Shape FF = FOR; FF.Orientation(TopAbs_FORWARD);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(FOR,iF);
if(tSPS){
cout<<endl;GdumpSHASTA(FOR,TB1,"--- GSplitFace ");
@@ -1079,7 +1079,7 @@ void TopOpeBRepBuild_Builder::GSplitFace
// Add ON parts (edges ON solid)
GFillONPartsWES(FOR,G1,LSclass,WES);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer n0 = WES.StartElements().Extent();
if(tSPS) cout <<"--> GSplitFace , after GFillONPartsWES nstartelWES = "<<n0<<endl;
#endif
@@ -1097,14 +1097,14 @@ void TopOpeBRepBuild_Builder::GSplitFace
// split the edges of FF : add split edges to WES
GFillFaceWES(FF,LSclass,G1,WES);
Standard_Integer n1 = WES.StartElements().Extent();
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) cout <<"--> GSplitFace , after GFillFaceWES nstartelWES = "<<n1<<endl;
#endif
// add edges built on curves supported by FF
GFillCurveTopologyWES(FF,G1,WES);
Standard_Integer n2 = WES.StartElements().Extent();
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) cout <<"--> GSplitFace , after GFillCurveTopologyWES nstartelWES = "<<n2<<endl;
#endif

72
src/TopOpeBRepBuild/TopOpeBRepBuild_Griddump.cxx
View File

@@ -59,7 +59,7 @@
#include <TCollection_AsciiString.hxx>
#include <TopOpeBRepBuild_WireEdgeSet.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer);
extern Standard_Boolean TopOpeBRepDS_GettraceSPSXX(const Standard_Integer,const Standard_Integer);
static TCollection_AsciiString PRODINS("dins ");
@@ -69,7 +69,7 @@ static TCollection_AsciiString PRODINS("dins ");
//function : GdumpLS
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpLS(const TopTools_ListOfShape& L) const
{
TopTools_ListIteratorOfListOfShape it(L);
@@ -88,7 +88,7 @@ void TopOpeBRepBuild_Builder::GdumpLS(const TopTools_ListOfShape&) const
//function : PrintGeo
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::PrintGeo(const TopoDS_Shape& S)
{
if (S.ShapeType() == TopAbs_VERTEX) PrintPnt(TopoDS::Vertex(S));
@@ -105,7 +105,7 @@ void TopOpeBRepBuild_Builder::PrintGeo(const TopoDS_Shape&)
//function : PrintSur
//purpose : print the name of a surface
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::PrintSur(const TopoDS_Face& F)
{
BRepAdaptor_Surface STA_Surface(F);
@@ -134,7 +134,7 @@ void TopOpeBRepBuild_Builder::PrintSur(const TopoDS_Face& )
//function : PrintCur
//purpose : print the name of a curve
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::PrintCur(const TopoDS_Edge& E)
{
TopLoc_Location L; Standard_Real f,l;
@@ -165,7 +165,7 @@ void TopOpeBRepBuild_Builder::PrintCur(const TopoDS_Edge&)
//function : PrintPnt
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::PrintPnt(const TopoDS_Vertex& V)
{
GdumpPNT(BRep_Tool::Pnt(V));
@@ -180,7 +180,7 @@ void TopOpeBRepBuild_Builder::PrintPnt(const TopoDS_Vertex&)
//function : PrintOri
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::PrintOri(const TopoDS_Shape& S)
{
TopAbs::Print(S.Orientation(),cout);
@@ -196,14 +196,14 @@ void TopOpeBRepBuild_Builder::PrintOri(const TopoDS_Shape& /*S*/)
//function : StringState
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
TCollection_AsciiString TopOpeBRepBuild_Builder::StringState(const TopAbs_State st)
#else
TCollection_AsciiString TopOpeBRepBuild_Builder::StringState(const TopAbs_State)
#endif
{
TCollection_AsciiString s;
#ifdef DEB
#ifdef OCCT_DEBUG
switch(st) {
case TopAbs_ON : s.AssignCat("ON"); break;
case TopAbs_IN : s.AssignCat("IN"); break;
@@ -218,7 +218,7 @@ TCollection_AsciiString TopOpeBRepBuild_Builder::StringState(const TopAbs_State)
//function : GdumpPNT
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpPNT(const gp_Pnt& P)
{
cout<<P.X()<<" "<<P.Y()<<" "<<P.Z(); cout.flush();
@@ -233,7 +233,7 @@ void TopOpeBRepBuild_Builder::GdumpPNT(const gp_Pnt&)
//function : GdumpORIPARPNT
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpORIPARPNT(const TopAbs_Orientation o,
const Standard_Real p,
const gp_Pnt& Pnt)
@@ -251,7 +251,7 @@ void TopOpeBRepBuild_Builder::GdumpORIPARPNT(const TopAbs_Orientation,
//function : GdumpEDGVER
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpEDGVER(const TopoDS_Shape& E,
const TopoDS_Shape& V,
const Standard_Address s) const
@@ -276,7 +276,7 @@ void TopOpeBRepBuild_Builder::GdumpEDGVER(const TopoDS_Shape&,
//function : GdumpEDG
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpEDG(const TopoDS_Shape& E,
const Standard_Address s) const
{
@@ -327,7 +327,7 @@ void TopOpeBRepBuild_Builder::GdumpSAMDOM(const TopTools_ListOfShape& L,
//function : GdumpSHA
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpSHA(const TopoDS_Shape& S,
const Standard_Address str) const
{
@@ -349,7 +349,7 @@ void TopOpeBRepBuild_Builder::GdumpSHA(const TopoDS_Shape&,
//function : GdumpSHAORI
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpSHAORI(const TopoDS_Shape& S,
const Standard_Address str) const
{
@@ -367,7 +367,7 @@ void TopOpeBRepBuild_Builder::GdumpSHAORI(const TopoDS_Shape& ,
//function : GdumpSHAORIGEO
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpSHAORIGEO(const TopoDS_Shape& S,
const Standard_Address str) const
{
@@ -385,7 +385,7 @@ void TopOpeBRepBuild_Builder::GdumpSHAORIGEO(const TopoDS_Shape& ,
//function : GdumpSHASTA
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpSHASTA(const TopoDS_Shape& S,
const TopAbs_State T,
const TCollection_AsciiString& a,
@@ -409,7 +409,7 @@ void TopOpeBRepBuild_Builder::GdumpSHASTA(const TopoDS_Shape& ,
//function : GdumpSHASTA
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpSHASTA(const Standard_Integer iS,
const TopAbs_State T,
const TCollection_AsciiString& a,
@@ -432,7 +432,7 @@ void TopOpeBRepBuild_Builder::GdumpSHASTA(const Standard_Integer ,
//function : GdumpSHASTA
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpSHASTA(const Standard_Integer iS,
const TopAbs_State T,
const TopOpeBRepBuild_ShapeSet& SS,
@@ -462,7 +462,7 @@ void TopOpeBRepBuild_Builder::GdumpSHASTA(const Standard_Integer ,
//=======================================================================
void TopOpeBRepBuild_Builder::GdumpSHASETreset()
{
#ifdef DEB
#ifdef OCCT_DEBUG
mySHASETindex = 0;
#endif
}
@@ -474,7 +474,7 @@ void TopOpeBRepBuild_Builder::GdumpSHASETreset()
Standard_Integer TopOpeBRepBuild_Builder::GdumpSHASETindex()
{
Standard_Integer n = 0;
#ifdef DEB
#ifdef OCCT_DEBUG
n = ++mySHASETindex;
#endif
return n;
@@ -484,7 +484,7 @@ Standard_Integer TopOpeBRepBuild_Builder::GdumpSHASETindex()
//function : GdumpEXP
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpEXP(const TopOpeBRepTool_ShapeExplorer& Ex) const
{
if ( ! Ex.More() ) return;
@@ -511,11 +511,11 @@ void TopOpeBRepBuild_Builder::GdumpEXP(const TopOpeBRepTool_ShapeExplorer& ) con
//=======================================================================
void TopOpeBRepBuild_Builder::GdumpSOBU(TopOpeBRepBuild_SolidBuilder& /*ME*/) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
#endif
} // GdumpSOBU
#ifdef DEB
#ifdef OCCT_DEBUG
void* GFABUMAKEFACEPWES_DEB = NULL;
#endif
@@ -523,7 +523,7 @@ void* GFABUMAKEFACEPWES_DEB = NULL;
//function : GdumpFABU
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_Builder::GdumpFABU(TopOpeBRepBuild_FaceBuilder& ME) const
{
const TopoDS_Shape& face = ME.Face();
@@ -593,7 +593,7 @@ void TopOpeBRepBuild_Builder::GdumpFABU(TopOpeBRepBuild_FaceBuilder& ) const
//=======================================================================
void TopOpeBRepBuild_Builder::GdumpEDBU(TopOpeBRepBuild_EdgeBuilder& /*ME*/) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
#endif
} // GdumpEDBU
@@ -601,14 +601,14 @@ void TopOpeBRepBuild_Builder::GdumpEDBU(TopOpeBRepBuild_EdgeBuilder& /*ME*/) con
//function : GtraceSPS
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer iS) const
#else
Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer ) const
#endif
{
Standard_Boolean b = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer ibid;
b = GtraceSPS(myDataStructure->Shape(iS),ibid);
#endif
@@ -619,7 +619,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer ) con
//function : GtraceSPS
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer i,
const Standard_Integer j) const
#else
@@ -628,7 +628,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer ,
#endif
{
Standard_Boolean b = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
b = TopOpeBRepDS_GettraceSPSXX(i,j);
#endif
return b;
@@ -638,14 +638,14 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer ,
//function : GtraceSPS
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape& S) const
#else
Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape& ) const
#endif
{
Standard_Boolean b = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS;
b = GtraceSPS(S,iS);
#endif
@@ -656,7 +656,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape& ) const
//function : GtraceSPS
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape& S,
Standard_Integer& IS) const
#else
@@ -665,7 +665,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape&,
#endif
{
IS = 0; Standard_Boolean b = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
if ( ! myDataStructure.IsNull() ) {
if ( ! S.IsNull() ) {
IS = myDataStructure->Shape(S);
@@ -681,14 +681,14 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape&,
//function : GcheckNBOUNDS
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TopOpeBRepBuild_Builder::GcheckNBOUNDS(const TopoDS_Shape& E)
#else
Standard_Boolean TopOpeBRepBuild_Builder::GcheckNBOUNDS(const TopoDS_Shape& )
#endif
{
Standard_Boolean res = Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer nf = 0, nr = 0;
TopOpeBRepTool_ShapeExplorer ex(E,TopAbs_VERTEX);
for(; ex.More(); ex.Next()) {

2
src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cxx
View File

@@ -473,7 +473,7 @@ void TopOpeBRepBuild_HBuilder::MakeCurveAncestorMap()
for(;itloe.More();itloe.Next()) {
TopoDS_Shape& E = *((TopoDS_Shape*)(&itloe.Value()));
if(mySectEdgeDSCurve.IsBound(E)) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"BRepAlgo_DSAccess::MakeEdgeAncestorFromCurve : program error"<<endl;
#endif
}

72
src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx
View File

@@ -42,12 +42,12 @@
#include <TopOpeBRepBuild_kpresu.hxx>
#include <Standard_ProgramError.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceKPB();
#endif
static void FUN_Raise() {
#ifdef DEB
#ifdef OCCT_DEBUG
cout<<"******************************ERROR"<<endl;
Standard_ProgramError::Raise("KPart.cxx");
#endif
@@ -98,7 +98,7 @@ Standard_Integer TopOpeBRepBuild_Builder::FindIsKPart()
{
KPClearMaps();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if(TKPB){cout<<endl<<"--- IsKPart ? ---"<<endl;}
#endif
@@ -240,7 +240,7 @@ static void FUN_sortplcy(const TopTools_ListOfShape& lof, TopTools_ListOfShape&
static void FUN_addf(const TopAbs_State sta, const TopoDS_Shape& ftoadd, TopTools_DataMapOfShapeShape& map)
{
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean isadded = map.IsBound(ftoadd);
#endif
TopoDS_Shape fori = ftoadd;
@@ -419,7 +419,7 @@ static Standard_Boolean FUN_rebuildfc(const TopOpeBRepBuild_Builder& BU, const H
// with {fcFk} = faces of shape k connexed to Owk
// fcFk has edges {edk}
{
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopOpeBRepDS_DataStructure& BDS = HDS->DS();
// Standard_Integer rFk = BDS.AncestorRank(Fk);
#endif
@@ -446,7 +446,7 @@ static Standard_Boolean FUN_rebuildfc(const TopOpeBRepBuild_Builder& BU, const H
return Standard_True;
} // FUN_rebuildfc
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT void debiskoletge() {}
#endif
@@ -457,7 +457,7 @@ Standard_EXPORT void debiskoletge() {}
void TopOpeBRepBuild_Builder::MergeKPartiskoletge()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) KPreturn(myIsKPart);
debiskoletge();
@@ -492,16 +492,16 @@ void TopOpeBRepBuild_Builder::MergeKPartiskoletge()
TopTools_ListOfShape lplhsd2, lcyhsd2; ::FUN_sortplcy(lfhsd2,lplhsd2,lcyhsd2);
const TopoDS_Face& fac1 = TopoDS::Face(lplhsd1.First());
const TopoDS_Face& fac2 = TopoDS::Face(lplhsd2.First());
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF1 =
#endif
myDataStructure->Shape(fac1); //DEB
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF2 =
#endif
myDataStructure->Shape(fac2); //DEB
#ifdef DEB
#ifdef OCCT_DEBUG
if (TKPB) {cout<<""<<endl;cout<<"face "<<iF1<<" : ";cout<<iF2<<endl;}
#endif
@@ -662,7 +662,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskoletge()
void TopOpeBRepBuild_Builder::MergeKPartisdisj()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) KPreturn(myIsKPart);
#endif
@@ -779,7 +779,7 @@ void TopOpeBRepBuild_Builder::MergeKPartisdisj()
return;
}
else {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"TopOpeBRepBuild_MergeKPart soldisj : ires = "<<ires<<endl;
#endif
return;
@@ -818,7 +818,7 @@ void TopOpeBRepBuild_Builder::MergeKPartisdisj()
void TopOpeBRepBuild_Builder::MergeKPartisfafa()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) KPreturn(myIsKPart);
#endif
@@ -866,7 +866,7 @@ void TopOpeBRepBuild_Builder::MergeKPartisfafa()
void TopOpeBRepBuild_Builder::MergeKPartissoso()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) KPreturn(myIsKPart);
#endif
@@ -965,7 +965,7 @@ static Standard_Boolean allIonsectionedges(const Handle(TopOpeBRepDS_HDataStruct
Standard_Integer TopOpeBRepBuild_Builder::KPiskoletge()
{
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
#endif*/
@@ -996,16 +996,16 @@ Standard_Integer TopOpeBRepBuild_Builder::KPiskoletge()
// ------------------------------------
const TopoDS_Face& f1 = TopoDS::Face(lplhsd1.First());
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean isb1 = myKPMAPf1f2.IsBound(f1); // DEB
#endif
const TopoDS_Face& f2 = TopoDS::Face(lplhsd2.First());
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean isb2 = myKPMAPf1f2.IsBound(f2); // DEB
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF1,iF2;
Standard_Boolean tSPS1 = GtraceSPS(f1,iF1);
Standard_Boolean tSPS2 = GtraceSPS(f2,iF2);
@@ -1058,7 +1058,7 @@ Standard_Integer TopOpeBRepBuild_Builder::KPiskoletge()
Standard_Integer TopOpeBRepBuild_Builder::KPisdisj()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
#endif
@@ -1073,7 +1073,7 @@ Standard_Integer TopOpeBRepBuild_Builder::KPisdisj()
Standard_Integer isdisj1 = KPisdisjsh(myShape1);
Standard_Integer isdisj2 = KPisdisjsh(myShape2);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TKPB) {
cout<<"isdisj : "<<isdisj1<<" "<<isdisj2<<endl;
}
@@ -1090,7 +1090,7 @@ Standard_Integer TopOpeBRepBuild_Builder::KPisdisj()
Standard_Integer TopOpeBRepBuild_Builder::KPisfafa()
{
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
#endif*/
@@ -1110,7 +1110,7 @@ Standard_Integer TopOpeBRepBuild_Builder::KPisfafa()
Standard_Integer TopOpeBRepBuild_Builder::KPissoso()
{
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
#endif*/
@@ -1221,7 +1221,7 @@ TopAbs_State TopOpeBRepBuild_Builder::KPclasSS(const TopoDS_Shape& S1,const TopT
TopAbs_State state = TopAbs_UNKNOWN;
state = myShapeClassifier.StateShapeShape(S1,exLS1,S2);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceKPB()) {
const gp_Pnt& P1 = myShapeClassifier.P3D();
cout<<"point P1 "<<P1.X()<<" "<<P1.Y()<<" "<<P1.Z();
@@ -1245,7 +1245,7 @@ TopAbs_State TopOpeBRepBuild_Builder::KPclasSS(const TopoDS_Shape& S1,const Topo
{
TopAbs_State state = myShapeClassifier.StateShapeShape(S1,exS1,S2);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceKPB()) {
const gp_Pnt& P1 = myShapeClassifier.P3D();
cout<<"point P1 "<<P1.X()<<" "<<P1.Y()<<" "<<P1.Z();
@@ -1279,14 +1279,14 @@ TopAbs_State TopOpeBRepBuild_Builder::KPclasSS(const TopoDS_Shape& S1,const Topo
Standard_Boolean TopOpeBRepBuild_Builder::KPiskoletgesh(const TopoDS_Shape& Sarg,TopTools_ListOfShape& lShsd,TopTools_ListOfShape& lfhsd) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
#endif
const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS();
Standard_Boolean iskolesh = FUNKP_KPiskolesh((*this),BDS,Sarg,lShsd,lfhsd);
if (!iskolesh) return Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer nfhsd =
#endif
KPlhsd(Sarg,TopAbs_FACE,lfhsd);
@@ -1313,7 +1313,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::KPiskoletgesh(const TopoDS_Shape& Sarg
}
// if (ne > 1) return Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer isol = myDataStructure->Shape(Sarg); Standard_Integer ifac = myDataStructure->Shape(fac);
if(TKPB){cout<<"isol "<<isol<<endl;}
if(TKPB){cout<<"nfhsd "<<nfhsd<<endl;}
@@ -1346,13 +1346,13 @@ void TopOpeBRepBuild_Builder::KPSameDomain(TopTools_ListOfShape& L1, TopTools_Li
TopTools_ListIteratorOfListOfShape it1(L1);
for (i=1 ; i<=nl1; i++) {
const TopoDS_Shape& S1 = it1.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS1 = myDataStructure->Shape(S1);
#endif
TopTools_ListIteratorOfListOfShape itsd(myDataStructure->SameDomain(S1));
for (; itsd.More(); itsd.Next() ) {
const TopoDS_Shape& S2 = itsd.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS2 = myDataStructure->Shape(S2);
#endif
Standard_Boolean found = KPContains(S2,L2);
@@ -1368,13 +1368,13 @@ void TopOpeBRepBuild_Builder::KPSameDomain(TopTools_ListOfShape& L1, TopTools_Li
TopTools_ListIteratorOfListOfShape it2(L2);
for (i=1 ; i<=nl2; i++) {
const TopoDS_Shape& S2 = it2.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS2 = myDataStructure->Shape(S2);
#endif
TopTools_ListIteratorOfListOfShape itsd(myDataStructure->SameDomain(S2));
for (; itsd.More(); itsd.Next() ) {
const TopoDS_Shape& S1 = itsd.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iS1 = myDataStructure->Shape(S1);
#endif
Standard_Boolean found = KPContains(S1,L1);
@@ -1599,7 +1599,7 @@ void TopOpeBRepBuild_Builder::KPiskoletgeanalyse(const TopOpeBRepDS_Config confi
ires = RESSHAPE2;
} // SameOriented
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) cout<<"ires = "<<ires<<endl;
#endif
@@ -1661,7 +1661,7 @@ void TopOpeBRepBuild_Builder::KPisdisjanalyse(const TopAbs_State Stsol1, const T
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) cout<<"ires = "<<ires<<" icla1 "<<icla1<<" icla2 "<<icla2<<endl;
#endif
@@ -1740,7 +1740,7 @@ void TopOpeBRepBuild_Builder::KPclassFF(const TopoDS_Shape& F1,const TopoDS_Shap
St1 = KPclassF(F1,F2);
St2 = KPclassF(F2,F1);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceKPB()) {
cout<<"Stf1 ";TopAbs::Print(St1,cout); cout<<" ";
cout<<"Stf2 ";TopAbs::Print(St2,cout); cout<<endl;
@@ -1757,7 +1757,7 @@ void TopOpeBRepBuild_Builder::KPclassFF(const TopoDS_Shape& F1,const TopoDS_Shap
Standard_Boolean TopOpeBRepBuild_Builder::KPiskoleFF(const TopoDS_Shape& F1,const TopoDS_Shape& F2,TopAbs_State& St1,TopAbs_State& St2)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF1;
Standard_Boolean tSPS1 = GtraceSPS(F1,iF1);
Standard_Integer iF2;
@@ -1799,7 +1799,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::KPContains(const TopoDS_Shape& S,const
Standard_Integer TopOpeBRepBuild_Builder::KPreturn(const Standard_Integer b)
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceKPB()) {
cout<<"--- IsKPart "<<b;
if ( b == 1 ) cout<<" iskole";

14
src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx
View File

@@ -34,7 +34,7 @@
#include <BRepCheck.hxx>
#include <BRepCheck_Result.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceSPS();
#endif
//------------
@@ -162,13 +162,13 @@ void TopOpeBRepBuild_Builder::MergeShapes(const TopoDS_Shape& S1,const TopAbs_St
{
Standard_Boolean lesmemes = S1.IsEqual(S2);
if (lesmemes) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"TopOpeBRepBuild : S1 == S2"<<endl;
#endif
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
GdumpSHASETreset();
#endif
@@ -197,7 +197,7 @@ void TopOpeBRepBuild_Builder::MergeShapes(const TopoDS_Shape& S1,const TopAbs_St
// -----------------------------------------
TopOpeBRepBuild_ShellFaceSet SFS;
#ifdef DEB
#ifdef OCCT_DEBUG
SFS.DEBNumber(GdumpSHASETindex());
#endif
@@ -387,7 +387,7 @@ void TopOpeBRepBuild_Builder::MakeShells(TopOpeBRepBuild_SolidBuilder& SOBU,TopT
void TopOpeBRepBuild_Builder::MakeFaces(const TopoDS_Shape& aFace,TopOpeBRepBuild_FaceBuilder& FABU,TopTools_ListOfShape& L)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF = 0; Standard_Boolean tSPS = GtraceSPS(aFace,iF);
if(tSPS){GdumpFABU(FABU);}
#endif
@@ -452,7 +452,7 @@ void TopOpeBRepBuild_Builder::MakeFaces(const TopoDS_Shape& aFace,TopOpeBRepBuil
void TopOpeBRepBuild_Builder::MakeEdges(const TopoDS_Shape& anEdge,TopOpeBRepBuild_EdgeBuilder& EDBU,TopTools_ListOfShape& L)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(anEdge,iE);
Standard_Integer ne = 0;
#endif
@@ -521,7 +521,7 @@ void TopOpeBRepBuild_Builder::MakeEdges(const TopoDS_Shape& anEdge,TopOpeBRepBui
}
} // loop on vertices of new edge newEdge
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){cout<<endl;}
if(tSPS){cout<<"V of new edge "<<++ne<<endl;}
if(tSPS){GdumpEDG(newEdge);}

2
src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cxx
View File

@@ -136,7 +136,7 @@ const TopoDS_Shape& TopOpeBRepBuild_Pave::Shape() const
void TopOpeBRepBuild_Pave::Dump() const
{
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<Parameter()<<" ";TopAbs::Print(Vertex().Orientation(),cout);
#endif
}

20
src/TopOpeBRepBuild/TopOpeBRepBuild_PaveClassifier.cxx
View File

@@ -25,7 +25,7 @@
#include <Precision.hxx>
#include <TopExp.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepTool_GettraceVC();
extern Standard_Boolean TopOpeBRepTool_GettraceCLOV();
#endif
@@ -72,7 +72,7 @@ TopOpeBRepBuild_PaveClassifier::TopOpeBRepBuild_PaveClassifier
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<endl;
if (myEdgePeriodic) {
@@ -122,7 +122,7 @@ TopAbs_State TopOpeBRepBuild_PaveClassifier::CompareOnNonPeriodic()
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<"VC_NP : ";
if (myP1 == myP2) cout<<" p1 = p2";
@@ -181,7 +181,7 @@ void TopOpeBRepBuild_PaveClassifier::AdjustOnPeriodic()
{
if ( ! ToAdjustOnPeriodic() ) return;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Real p1 = myP1, p2 = myP2;
#endif
@@ -196,7 +196,7 @@ void TopOpeBRepBuild_PaveClassifier::AdjustOnPeriodic()
if (myO2 == TopAbs_FORWARD) myP1 = AdjustCase(myP1,myO1,myP2,myPeriod,tol,myCas1);
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<"p1 "<<p1<<" ";TopAbs::Print(myO1,cout);cout<<" --> "<<myP1<<endl;
cout<<"p2 "<<p2<<" ";TopAbs::Print(myO2,cout);cout<<" --> "<<myP2<<endl;
@@ -241,7 +241,7 @@ TopAbs_State TopOpeBRepBuild_PaveClassifier::CompareOnPeriodic()
myCas1 = myCas2 = 7;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<"VC_P : cas "<<myCas1<<"__"<<myCas2;
cout<<" --> state "; TopAbs::Print(state,cout); cout<<endl;
@@ -272,7 +272,7 @@ TopAbs_State TopOpeBRepBuild_PaveClassifier::Compare
myP1 = PV1->Parameter();
myP2 = PV2->Parameter();
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<endl<<"VC : "<<myP1<<" "<<myP2<<" ";
TopAbs::Print(myO1,cout); cout<<" "; TopAbs::Print(myO2,cout);
@@ -291,7 +291,7 @@ TopAbs_State TopOpeBRepBuild_PaveClassifier::Compare
else
state = CompareOnNonPeriodic();
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<"VC : --> final state "; TopAbs::Print(state,cout); cout<<endl;
}
@@ -311,7 +311,7 @@ void TopOpeBRepBuild_PaveClassifier::SetFirstParameter
myFirst = P;
mySameParameters = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC())
cout<<endl<<"VC : set first parameter "<<myFirst<<endl;
#endif
@@ -327,7 +327,7 @@ void TopOpeBRepBuild_PaveClassifier::ClosedVertices
(const Standard_Boolean Closed)
{
myClosedVertices = Closed;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceCLOV()) {
myEdgePeriodic = Closed;
cout<<"::::::::::::::::::::::::"<<endl;

12
src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
View File

@@ -27,7 +27,7 @@
#include <TopExp.hxx>
#include <gp_Pnt.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepTool_GettraceVC();
#include <TopOpeBRepBuild_Builder.hxx>
#include <gp_Pnt.hxx>
@@ -161,7 +161,7 @@ void TopOpeBRepBuild_PaveSet::Prepare()
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trc = Standard_False;
trc = trc || TopOpeBRepTool_GettraceVC();
Standard_Integer iv=0;//,nv=myVertices.Extent();
@@ -272,7 +272,7 @@ void TopOpeBRepBuild_PaveSet::Prepare()
SortPave(List,myVertices);
}
#ifdef DEB
#ifdef OCCT_DEBUG
if ( TopOpeBRepTool_GettraceVC() ) {
myVerticesIt.Initialize(myVertices);
if ( MoreLoop() ) cout<<"--- PaveSet : Prepare"<<endl;
@@ -377,7 +377,7 @@ Standard_Boolean TopOpeBRepBuild_PaveSet::HasEqualParameters()
p2 = it2.Value()->Parameter();
Standard_Real d = Abs(p1-p2);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<"VertexSet : p1,p2 d "<<p1<<","<<p2<<" "<<d<<endl;
}
@@ -401,7 +401,7 @@ Standard_Boolean TopOpeBRepBuild_PaveSet::HasEqualParameters()
for (it1.Initialize(myVertices);
(! myHasEqualParameters ) && it1.More();
it1.Next()) {
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopoDS_Shape& v1 = it1.Value()->Vertex();
#endif
p1 = it1.Value()->Parameter();
@@ -409,7 +409,7 @@ Standard_Boolean TopOpeBRepBuild_PaveSet::HasEqualParameters()
if (d < Precision::PConfusion()) {
myHasEqualParameters = Standard_True;
myEqualParameters = f;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceVC()) {
cout<<"=*=*=*=*=*=*=*=*=*=*=*=*=*=*"<<endl;
cout<<"PaveSet : p1,f d "<<p1<<","<<f<<" "<<d<<endl;

20
src/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx
View File

@@ -26,7 +26,7 @@
#include <Standard_ProgramError.hxx>
#include <TopOpeBRepDS_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GetcontextNOREGUSO();
extern Standard_Boolean TopOpeBRepBuild_GetcontextREGUXPU();
extern Standard_Boolean TopOpeBRepBuild_GettraceSAVSREGU();
@@ -52,12 +52,12 @@ void TopOpeBRepBuild_Builder::RegularizeSolids
const TopoDS_Shape& newSolid = itl.Value();
TopTools_ListOfShape newSolidLOSO;
RegularizeSolid(SO,newSolid,newSolidLOSO);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nnewSolidLOSO = newSolidLOSO.Extent(); // DEB
#endif
LOSO.Append(newSolidLOSO);
}
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nLOSO = LOSO.Extent(); // DEB
#endif
Standard_Integer nr = myMemoSplit.Extent();
@@ -83,7 +83,7 @@ void TopOpeBRepBuild_Builder::RegularizeSolids
TopTools_ListOfShape newlspf;
TopTools_ListOfShape& lspf = ChangeSplit(f,staf);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nlspf = lspf.Extent(); // DEB
#endif
for (TopTools_ListIteratorOfListOfShape itl1(lspf);itl1.More();itl1.Next()) {
@@ -123,7 +123,7 @@ void TopOpeBRepBuild_Builder::RegularizeSolid
Standard_Boolean toregu = Standard_True;
Standard_Boolean usestos = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS;Standard_Boolean tSPS=GtraceSPS(SS,iS);
// Standard_Boolean savsregu = TopOpeBRepBuild_GettraceSAVSREGU();
if (TopOpeBRepBuild_GetcontextNOREGUSO()) toregu = Standard_False;
@@ -193,7 +193,7 @@ void TopOpeBRepBuild_Builder::RegularizeSolid
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) {
cout<<"RegularizeSolid "<<iS<<endl;
debreguso(iS);
@@ -227,13 +227,13 @@ void TopOpeBRepBuild_Builder::RegularizeSolid
TopTools_ListIteratorOfListOfShape itlssdSS(lssdSS);
for (; itlssdSS.More(); itlssdSS.Next()) {
const TopoDS_Shape& ssdSS = itlssdSS.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer issdSS = myDataStructure->Shape(ssdSS); // DEB
#endif
Standard_Integer rankssdSS = GShapeRank(ssdSS);
TopAbs_State stassdSS = (rankssdSS == 1) ? myState1 : myState2;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean issplitssdSS = IsSplit(ssdSS,stassdSS);
// const TopTools_ListOfShape& lspssdSS = Splits(ssdSS,stassdSS);
// Standard_Integer nlspssdSS = lspssdSS.Extent();
@@ -245,7 +245,7 @@ void TopOpeBRepBuild_Builder::RegularizeSolid
//ssdSSf : 1 face de ssdSS = 1 solid SameDomain de Ss
const TopoDS_Shape& ssdSSf = x.Current();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer issdSSf = 0;Standard_Boolean tSPSssdSSf=GtraceSPS(ssdSSf,issdSSf);
if (tSPSssdSSf) debreguso(issdSSf);
#endif
@@ -253,7 +253,7 @@ void TopOpeBRepBuild_Builder::RegularizeSolid
TopAbs_State stassdSSf = stassdSS;
TopTools_ListOfShape& lspssdSSf = ChangeSplit(ssdSSf,stassdSSf);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean issplitssdSSf = IsSplit(ssdSSf,stassdSSf);
// Standard_Integer nlspssdSSf = lspssdSSf.Extent();
#endif

62
src/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx
View File

@@ -43,7 +43,7 @@
#define MGhc3 Handle(Geom_Curve)
#define MGhc2 Handle(Geom2d_Curve)
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceSPS();
extern Standard_Boolean TopOpeBRepDS_GettraceDSNC();
Standard_EXPORT void debsplitse(const Standard_Integer) {}
@@ -238,7 +238,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS();
Standard_Integer i,n = BDS.NbSectionEdges();
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepDS_GettraceDSNC() && !mySplitSectionEdgesDone)
cout<<"TopOpeBRepBuild_Builder::SSE : compute "<<n<<" section edges"<<endl;
#endif
@@ -258,7 +258,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
Standard_Integer iE = myDataStructure->Shape(E);
Standard_Integer rE = BDS.AncestorRank(E);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPS = GtraceSPS(E,iE); if (tSPS) debsplitsemess(iE); Standard_Integer DEBiESD = 1;
#endif
@@ -281,7 +281,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
Standard_Integer iESD = myDataStructure->Shape(ESD);
const TopTools_ListOfShape& LESDspon = Splits(ESD,TopAbs_ON);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) {
TCollection_AsciiString str("# edge ");str=str+iE+" sd3d edge "+iESD;
TCollection_AsciiString stru(str.Length(),'-');
@@ -351,7 +351,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
TopOpeBRepBuild_ListOfShapeListOfShape thelist;
if (!E1b) MEIN.Bind(E1, thelist);
TopOpeBRepBuild_ListOfShapeListOfShape& LE1loslos = MEIN.ChangeFind(E1);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nLE1 = LE1loslos.Extent();
#endif
@@ -359,7 +359,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
TopOpeBRepBuild_ListOfShapeListOfShape thelist2;
if (!E2b) MEIN.Bind(E2,thelist2);
TopOpeBRepBuild_ListOfShapeListOfShape& LE2loslos = MEIN.ChangeFind(E2);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nLE2 = LE2loslos.Extent();
#endif
@@ -417,7 +417,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
for (i = 1; i <= n; i++) { // 3
const TopoDS_Edge& E = TopoDS::Edge(BDS.SectionEdge(i));
if(E.IsNull()) continue;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE = myDataStructure->Shape(E);
// Standard_Integer rE = GShapeRank(E);
Standard_Boolean tSPS = GtraceSPS(E,iE);
@@ -439,7 +439,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
if (isbMEOUT) {
const TopTools_ListOfShape& LEOUT = MEOUT.Find(E);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nOUT = LEOUT.Extent();
#endif
GCopyList(LEOUT,LEspon);
@@ -447,12 +447,12 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
if (isbMEIN) {
const TopOpeBRepBuild_ListOfShapeListOfShape& loslos = MEIN.Find(E);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nloslos = loslos.Extent();
#endif
for (TopOpeBRepBuild_ListIteratorOfListOfShapeListOfShape it(loslos); it.More(); it.Next()) {
const TopTools_ListOfShape& los = it.Value().List();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nlos = los.Extent();
#endif
GCopyList(los,LEspon);
@@ -463,14 +463,14 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
BRep_Builder BB;
for (i = 1; i <= n; i++) { // 4
const TopoDS_Edge& E = TopoDS::Edge(BDS.SectionEdge(i)); if(E.IsNull()) continue;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer idebE; Standard_Boolean tSPS = GtraceSPS(E,idebE); if (tSPS) debsplitsemess(idebE);
#endif
const TopTools_ListOfShape& lesd = BDS.ShapeSameDomain(E);
if (lesd.IsEmpty()) continue;
Standard_Integer iE = BDS.Shape(E);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer rE = BDS.AncestorRank(E);
#endif
Standard_Integer RE = BDS.SameDomainRef(E);
@@ -479,13 +479,13 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
TopTools_ListOfShape lF; TopTools_ListIteratorOfListOfShape itlesd;
for(itlesd.Initialize(lesd);itlesd.More();itlesd.Next()) {
const TopoDS_Edge& esd = TopoDS::Edge(itlesd.Value());
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iesd = BDS.Shape(esd);
#endif
const TopTools_ListOfShape& lf = FDSCNX_EdgeConnexitySameShape(esd,myDataStructure);
GCopyList(lf,lF);
}
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nlF = lF.Extent();
#endif
@@ -515,7 +515,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
TopoDS_Edge& eon = TopoDS::Edge(itlon.Value());
Standard_Real f,l; Standard_Boolean hasPC = FC2D_HasCurveOnSurface(eon,F);
if (hasPC) continue;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepTool_GettraceC2D()) {
cout<<"\n#TopOpeBRepBuild_Builder::SSE : hasPC = 0 ES"<<i<<" E"<<idebE<<" sur F"<<iF<<endl;
cout<<"tsee s "<<iF<<" "<<idebE<<";"<<endl;
@@ -537,7 +537,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
Standard_Boolean isface = (FOR.ShapeType() == TopAbs_FACE);
if (!isface) continue;
const TopoDS_Face& FF = TopoDS::Face(FOR);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFF = BDS.Shape(FF);
#endif
const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(FF); Standard_Integer nLI = LI.Extent();
@@ -551,18 +551,18 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
TopAbs_ShapeEnum shab = TFE.ShapeBefore(),shaa = TFE.ShapeAfter();
if (shaa != TopAbs_FACE || shab != TopAbs_FACE) continue;
const TopoDS_Face& FS = TopoDS::Face( myDataStructure->Shape(SI));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFS = myDataStructure->Shape(FS);
#endif
Standard_Boolean FSisper = FUN_periodicS(FS);
if (!FSisper) continue;
const TopoDS_Edge& EG = TopoDS::Edge(myDataStructure->Shape(GI));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iEG = myDataStructure->Shape(EG);
#endif
Standard_Boolean isrest = myDataStructure->DS().IsSectionEdge(EG); if (!isrest) continue;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Real tolE = BRep_Tool::Tolerance(EG);
#endif
Standard_Boolean haspc = FC2D_HasCurveOnSurface(EG,FS); if (haspc) continue;
@@ -580,7 +580,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
Standard_Boolean isface = (FOR.ShapeType() == TopAbs_FACE);
if (!isface) continue;
const TopoDS_Face& FF = TopoDS::Face(FOR);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFF = BDS.Shape(FF);
#endif
Standard_Boolean FFuper,FFvper; Standard_Boolean FFisper = FUN_periodic(FF,FFuper,FFvper);
@@ -597,7 +597,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
if (GB == 1) continue;
const TopoDS_Edge& EG = TopoDS::Edge(myDataStructure->Shape(GI));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iEG = myDataStructure->Shape(EG);
#endif
Standard_Boolean isrest = myDataStructure->DS().IsSectionEdge(EG); if (!isrest) continue;
@@ -661,7 +661,7 @@ Standard_EXPORT Standard_Integer GLOBAL_hassd = 0; //++
//=======================================================================
void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(EA,iE);
if (tSPS) debsplitsemess(iE);
#endif
@@ -676,7 +676,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
Standard_Boolean hg = myDataStructure->HasGeometry(EOR);
Standard_Boolean hsd3d = FDS_HasSameDomain3d(BDS,EOR);
Standard_Boolean hsd2d = FDS_HasSameDomain2d(BDS,EOR);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean issplit = IsSplit(EOR,TopAbs_ON);
#endif
@@ -687,7 +687,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
if(hsd2d) GLOBAL_hassd=2; //++
if (mySplitSectionEdgesDone) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
GdumpSHA(EF, (char *) "SplitSectionEdges done : ");
if (issplit) cout<<" "<<Splits(EOR,TopAbs_ON).Extent()<<" edges splitON"<<endl;
@@ -697,7 +697,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
return;
}
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS)GdumpSHASTA(EF,TopAbs_ON,"--- SplitSectionEdges ");
if(tSPS)cout<<" (hg="<<hg<<"||hsd3d="<<hsd3d<<")="<<cond<<endl;
#endif
@@ -731,7 +731,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
if (mke) {
MarkSplit(EOR,TopAbs_ON);
TopTools_ListOfShape& LON = ChangeSplit(EOR,TopAbs_ON);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer non = LON.Extent(); // DEB
#endif
@@ -768,7 +768,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
TopTools_ListOfShape LESD1,LESD2; GFindSamDom(EOR,LESD1,LESD2);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS)GdumpSHASTA(EF,TopAbs_ON,"--- SplitSectionEdges ");
if(tSPS){
cout<<" (hg="<<hg<<"||hsd3d="<<hsd3d<<")="<<cond<<endl;
@@ -780,7 +780,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
#endif
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debspseon(iE);
#endif
TopOpeBRepBuild_GTopo G = TopOpeBRepBuild_GTool::GComUnsh(TopAbs_FACE,TopAbs_FACE);
@@ -825,7 +825,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
//modified by NIZHNY-MZV Mon Apr 17 16:25:53 2000 else if (rankEF == 2) losOO.Append(GLOBALDS_shape1);
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debspsein(iE);
#endif
TopOpeBRepBuild_GTopo G = TopOpeBRepBuild_GTool::GCutUnsh(TopAbs_FACE,TopAbs_FACE);
@@ -858,7 +858,7 @@ void TopOpeBRepBuild_Builder::SplitSectionEdge(const TopoDS_Shape& EA)
}
{
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debspseou(iE);
#endif
TopOpeBRepBuild_GTopo G = TopOpeBRepBuild_GTool::GCutUnsh(TopAbs_FACE,TopAbs_FACE);
@@ -967,7 +967,7 @@ void TopOpeBRepBuild_Builder::SectionEdges(TopTools_ListOfShape& LSE)
Standard_Boolean issplitON = IsSplit(es,TopAbs_ON);
TopAbs_State staspl=(issplitON)?TopAbs_ON:(issplitIN)?TopAbs_IN:TopAbs_UNKNOWN;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iii; Standard_Boolean tSPS = GtraceSPS(es,iii);
if (tSPS) {
GdumpSHA(es, (char *) "--- Section ");

14
src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx
View File

@@ -30,7 +30,7 @@
static TCollection_AsciiString PRODINS("dins ");
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
extern Standard_Boolean TopOpeBRepBuild_GettraceCHKOK();
extern Standard_Boolean TopOpeBRepBuild_GettraceCHKNOK();
@@ -63,7 +63,7 @@ void TopOpeBRepBuild_ShapeSet::Delete()
void TopOpeBRepBuild_ShapeSet::AddShape(const TopoDS_Shape& S)
{
Standard_Boolean chk = CheckShape(S);
#ifdef DEB
#ifdef OCCT_DEBUG
DumpCheck(cout," AddShape",S,chk);
#endif
@@ -78,7 +78,7 @@ void TopOpeBRepBuild_ShapeSet::AddShape(const TopoDS_Shape& S)
void TopOpeBRepBuild_ShapeSet::AddStartElement(const TopoDS_Shape& S)
{
Standard_Boolean chk = CheckShape(S);
#ifdef DEB
#ifdef OCCT_DEBUG
DumpCheck(cout," AddStartElement",S,chk);
#endif
@@ -93,7 +93,7 @@ void TopOpeBRepBuild_ShapeSet::AddStartElement(const TopoDS_Shape& S)
void TopOpeBRepBuild_ShapeSet::AddElement(const TopoDS_Shape& S)
{
Standard_Boolean chk = CheckShape(S);
#ifdef DEB
#ifdef OCCT_DEBUG
DumpCheck(cout," AddElement",S,chk);
#endif
@@ -353,7 +353,7 @@ void TopOpeBRepBuild_ShapeSet::CheckShape(const Standard_Boolean checkshape)
{
myCheckShape = checkshape;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceCHK() && !myCheckShape) {
DumpName(cout,"no checkshape set on ");cout<<endl;
}
@@ -401,7 +401,7 @@ void TopOpeBRepBuild_ShapeSet::DumpName(Standard_OStream& OS,const TCollection_A
//purpose :
//=======================================================================
#ifdef DEB
#ifdef OCCT_DEBUG
void TopOpeBRepBuild_ShapeSet::DumpCheck(Standard_OStream& OS,
const TCollection_AsciiString& str,
const TopoDS_Shape& S,
@@ -416,7 +416,7 @@ void TopOpeBRepBuild_ShapeSet::DumpCheck(Standard_OStream&,
{
if (!myCheckShape) return;
#ifdef DEB
#ifdef OCCT_DEBUG
TopAbs_ShapeEnum t = S.ShapeType();
if (!chk) {
if (TopOpeBRepBuild_GettraceCHK() ||

14
src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx
View File

@@ -26,7 +26,7 @@
#include <Standard_ProgramError.hxx>
#include <BRepAdaptor_Surface.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
#endif
@@ -60,7 +60,7 @@ void TopOpeBRepBuild_ShellFaceClassifier::Clear()
TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareShapes
(const TopoDS_Shape& B1, const TopoDS_Shape& B2)
{
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopAbs_ShapeEnum t1 = B1.ShapeType();
// const TopAbs_ShapeEnum t2 = B2.ShapeType();
#endif
@@ -82,7 +82,7 @@ TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareShapes
TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareElementToShape
(const TopoDS_Shape& F, const TopoDS_Shape& SHE)
{
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopAbs_ShapeEnum t1 = F.ShapeType();
// const TopAbs_ShapeEnum t2 = SHE.ShapeType();
#endif
@@ -103,7 +103,7 @@ TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareElementToShape
void TopOpeBRepBuild_ShellFaceClassifier::ResetShape(const TopoDS_Shape& SHE)
{
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopAbs_ShapeEnum t1 = SHE.ShapeType();
#endif
@@ -151,7 +151,7 @@ void TopOpeBRepBuild_ShellFaceClassifier::ResetElement(const TopoDS_Shape& F)
Standard_Boolean TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoDS_Shape& F)
{
#ifdef DEB
#ifdef OCCT_DEBUG
// const TopAbs_ShapeEnum t = F.ShapeType();
#endif
Standard_Boolean bRet = Standard_True;
@@ -187,7 +187,7 @@ Standard_Boolean TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoD
return bRet;
}
#ifdef DEB
#ifdef OCCT_DEBUG
#include <BRepTools.hxx>
#include <BRep_Builder.hxx>
#include <TCollection_AsciiString.hxx>
@@ -204,7 +204,7 @@ TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::State()
TopAbs_State state;
Standard_Real tol3d = Precision::Confusion();
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceCHK()) {
STATIC_ishell++;
TCollection_AsciiString home("/home/wb/mdl/gti/prod/TTOPOPE/src/test/data/");

10
src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx
View File

@@ -25,7 +25,7 @@ static TCollection_AsciiString PRODINS("dins ");
#include <TopOpeBRepBuild_define.hxx>
#include <TopoDS.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
#endif
@@ -37,7 +37,7 @@ extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
TopOpeBRepBuild_ShellFaceSet::TopOpeBRepBuild_ShellFaceSet() :
TopOpeBRepBuild_ShapeSet(TopAbs_EDGE)
{
#ifdef DEB
#ifdef OCCT_DEBUG
myDEBName = "SFS";
#endif
}
@@ -48,7 +48,7 @@ TopOpeBRepBuild_ShapeSet(TopAbs_EDGE)
//=======================================================================
TopOpeBRepBuild_ShellFaceSet::TopOpeBRepBuild_ShellFaceSet
#ifdef DEB
#ifdef OCCT_DEBUG
(const TopoDS_Shape& S,const Standard_Address A) : // DEB
#else
(const TopoDS_Shape& S,const Standard_Address) : // DEB
@@ -57,7 +57,7 @@ TopOpeBRepBuild_ShapeSet(TopAbs_EDGE)
{
mySolid = TopoDS::Solid(S);
#ifdef DEB
#ifdef OCCT_DEBUG
myDEBName = "SFS";
if (A != NULL) {
TopOpeBRepBuild_Builder* pB = ((TopOpeBRepBuild_Builder*)((void*)A));
@@ -117,7 +117,7 @@ const TopoDS_Solid& TopOpeBRepBuild_ShellFaceSet::Solid() const
void TopOpeBRepBuild_ShellFaceSet::DumpSS()
{
#ifdef DEB
#ifdef OCCT_DEBUG
TopOpeBRepBuild_ShapeSet::DumpSS();
#endif
}

2
src/TopOpeBRepBuild/TopOpeBRepBuild_SolidBuilder.cxx
View File

@@ -190,7 +190,7 @@ void TopOpeBRepBuild_SolidBuilder::NextFace()
const TopoDS_Shape& TopOpeBRepBuild_SolidBuilder::Face() const
{
#ifdef DEB
#ifdef OCCT_DEBUG
// const Standard_Integer i = myBlockIterator.Value(); // DEB
#endif
const TopoDS_Shape& F = myBlockBuilder.Element(myBlockIterator);

12
src/TopOpeBRepBuild/TopOpeBRepBuild_SplitEdge.hxx
View File

@@ -26,7 +26,7 @@ void TopOpeBRepBuild_Builder::SplitEdge(const TopoDS_Shape& E,
const TopAbs_State ToBuild1,
const TopAbs_State ToBuild2)
{
#ifdef DEB
#ifdef OCCT_DEBUG
if ( TopOpeBRepBuild_GetcontextSF2() ) {
SplitEdge2(E,ToBuild1,ToBuild2);
return;
@@ -52,7 +52,7 @@ void TopOpeBRepBuild_Builder::SplitEdge1(const TopoDS_Shape& Eoriented,
Standard_Boolean tosplit = ToSplit(Eoriented,ToBuild1);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iEdge; Standard_Boolean tSPS = GtraceSPS(Eoriented,iEdge);
if(tSPS){
cout<<endl;
@@ -73,7 +73,7 @@ void TopOpeBRepBuild_Builder::SplitEdge1(const TopoDS_Shape& Eoriented,
LE1.Append(Eforward);
FindSameDomain(LE1,LE2);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){GdumpSAMDOM(LE1, (char *) "1 : ");}
if(tSPS){GdumpSAMDOM(LE2, (char *) "2 : ");}
if(tSPS){cout<<endl;}
@@ -104,7 +104,7 @@ void TopOpeBRepBuild_Builder::SplitEdge1(const TopoDS_Shape& Eoriented,
PVS.InitLoop();
if ( !PVS.MoreLoop() ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
cout<<"NO VERTEX split "; TopAbs::Print(ToBuild1,cout);cout<<endl;
}
@@ -158,7 +158,7 @@ void TopOpeBRepBuild_Builder::SplitEdge2(const TopoDS_Shape& Eoriented,
TopoDS_Shape Eforward = Eoriented;
myBuildTool.Orientation(Eforward,TopAbs_FORWARD);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iEdge; Standard_Boolean tSPS = GtraceSPS(Eoriented,iEdge);
if(tSPS){cout<<endl;}
if(tSPS){GdumpSHASTA(Eoriented,ToBuild1,"--- SplitEdge2 ");}
@@ -183,7 +183,7 @@ void TopOpeBRepBuild_Builder::SplitEdge2(const TopoDS_Shape& Eoriented,
PVS.InitLoop();
if ( !PVS.MoreLoop() ) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {cout<<"NO VERTEX split ";TopAbs::Print(ToBuild1,cout);cout<<endl;}
#endif
return;

14
src/TopOpeBRepBuild/TopOpeBRepBuild_SplitFace.hxx
View File

@@ -20,7 +20,7 @@
#include <TopOpeBRepBuild_WireEdgeSet.hxx>
#include <TopOpeBRepBuild_FaceBuilder.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT void debspf(const Standard_Integer i) {cout<<"++ debspf"<<i<<endl;}
#endif
@@ -33,7 +33,7 @@ void TopOpeBRepBuild_Builder::SplitFace(const TopoDS_Shape& Foriented,
const TopAbs_State ToBuild1,
const TopAbs_State ToBuild2)
{
#ifdef DEB
#ifdef OCCT_DEBUG
if(TopOpeBRepBuild_GetcontextSF2()){
SplitFace2(Foriented,ToBuild1,ToBuild2);
return;
@@ -88,7 +88,7 @@ void TopOpeBRepBuild_Builder::SplitFace1(const TopoDS_Shape& Foriented,
// ----------------------------------------------
TopOpeBRepBuild_WireEdgeSet WES(Fforward,this);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPF=TopOpeBRepBuild_GettraceSPF();
Standard_Integer iFace=myDataStructure->Shape(Foriented);
if(tSPF){cout<<endl;GdumpSHASTA(Foriented,ToBuild1,"=== SplitFace ");}
@@ -114,7 +114,7 @@ void TopOpeBRepBuild_Builder::SplitFace1(const TopoDS_Shape& Foriented,
// -----------------------------------------
AddIntersectionEdges(Fforward,ToBuild1,RevOri1,WES);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(Fforward,iF);
if(tSPS) WES.DumpSS();
#endif
@@ -185,7 +185,7 @@ void TopOpeBRepBuild_Builder::SplitFace2(const TopoDS_Shape& Foriented,
Standard_Integer n1 = LF1.Extent();
Standard_Integer n2 = LF2.Extent();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPF = TopOpeBRepBuild_GettraceSPF();
// Standard_Integer iFace = myDataStructure->Shape(Foriented);
if (tSPF) {
@@ -221,7 +221,7 @@ void TopOpeBRepBuild_Builder::SplitFace2(const TopoDS_Shape& Foriented,
FindSameRank(LFSO,rankX,LFSO2);
FindSameRank(LFOO,rankX,LFOO2);
#ifdef DEB
#ifdef OCCT_DEBUG
if ( tSPF ) {
GdumpSAMDOM(LFSO1, (char *) "LFSO1 : ");
GdumpSAMDOM(LFOO1, (char *) "LFOO1 : ");
@@ -403,7 +403,7 @@ void TopOpeBRepBuild_Builder::SplitFaceOK(const TopoDS_Shape& Foriented,
// ---------------------------------------------
TopOpeBRepBuild_WireEdgeSet WES(Fforward,this);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPF = TopOpeBRepBuild_GettraceSPF();
Standard_Integer iFace = myDataStructure->Shape(Foriented);
if(tSPF){cout<<endl;GdumpSHASTA(Foriented,ToBuild1,"=== SplitFaceOK ");}

4
src/TopOpeBRepBuild/TopOpeBRepBuild_SplitShapes.hxx
View File

@@ -49,7 +49,7 @@ void TopOpeBRepBuild_Builder::SplitShapes(TopOpeBRepTool_ShapeExplorer& Ex,
TopAbs_ShapeEnum t = aShape.ShapeType();
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GettraceSHEX()) GdumpEXP(Ex);
#endif
@@ -79,7 +79,7 @@ void TopOpeBRepBuild_Builder::SplitShapes(TopOpeBRepTool_ShapeExplorer& Ex,
for (; It.More(); It.Next()) {
newShape = It.Value();
myBuildTool.Orientation(newShape,newori);
#ifdef DEB
#ifdef OCCT_DEBUG
// TopAbs_ShapeEnum tns = TopType(newShape);
#endif
//----------------------- IFV

6
src/TopOpeBRepBuild/TopOpeBRepBuild_SplitSolid.hxx
View File

@@ -21,7 +21,7 @@
#include <TopOpeBRepBuild_SolidBuilder.hxx>
#include <TopOpeBRepBuild_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
#define DEBSHASET(sarg,meth,shaset,str) TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str);
Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
Standard_EXPORT void debsplitf(const Standard_Integer i);
@@ -79,7 +79,7 @@ void TopOpeBRepBuild_Builder::SplitSolid(const TopoDS_Shape& S1oriented,
// -----------------------------------------
TopOpeBRepBuild_ShellFaceSet SFS;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPS = TopOpeBRepBuild_GettraceSPS();
// Standard_Integer iSolid = myDataStructure->Shape(S1oriented);
if (tSPS) {
@@ -117,7 +117,7 @@ void TopOpeBRepBuild_Builder::SplitSolid(const TopoDS_Shape& S1oriented,
TopAbs_Orientation ori = SSurfaces.Orientation(ToBuild1);
myBuildTool.Orientation(aFace,ori);
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS){
DEBSHASET(ss,"--- SplitSolid ",SFS," AddElement SFS+ face ");
GdumpSHA(aFace,(Standard_Address)ss.ToCString());

4
src/TopOpeBRepBuild/TopOpeBRepBuild_Tools.cxx
View File

@@ -447,7 +447,7 @@ const Standard_Real PAR_T = 0.43213918;
if (!anAvoidSubshMap.Contains (aSubshMap(i)) )
aSubsh = aSubshMap(i);
if (aSubsh.IsNull()) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"FindStateThroughVertex: warning: all vertices are avoided"<<endl;
#endif
return TopAbs_UNKNOWN; // failure
@@ -666,7 +666,7 @@ Standard_Boolean TopOpeBRepBuild_Tools::GetTangentToEdgeEdge (const TopoDS_Face&
aCopyCurve -> Transform(aTrsf);
GeomAPI_ProjectPointOnCurve aPP(aP, aCopyCurve, aCopyCurve->FirstParameter(), aCopyCurve->LastParameter());
#ifdef DEB
#ifdef OCCT_DEBUG
// gp_Pnt aNP = aPP.NearestPoint();
#endif
parOri = aPP.LowerDistanceParameter();

12
src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx
View File

@@ -48,7 +48,7 @@
#include <TopOpeBRepBuild_Builder.hxx>
#include <TopOpeBRepBuild_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
#define TSTRA TopOpeBRepDS_GettraceSTRANGE()
static TCollection_AsciiString PRODINS("dins ");
extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
@@ -146,7 +146,7 @@ TopAbs_State TopOpeBRepBuild_WireEdgeClassifier::Compare
} //UNKNOWN
if (state == TopAbs_UNKNOWN) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (TSTRA) cout<<"TopOpeBRepBuild_Builder::WES::Compare UNKNOWN -> ShapeClassifier "<<endl;
#endif
}
@@ -233,7 +233,7 @@ TopAbs_State TopOpeBRepBuild_WireEdgeClassifier::CompareShapes
// et que si ils ne se touchent pas, on ne passe pas par le WEC.
// INCOMPLET!!!
#ifdef DEB
#ifdef OCCT_DEBUG
// TopAbs_ShapeEnum t1 = B1.ShapeType();
// TopAbs_ShapeEnum t2 = B2.ShapeType();
#endif
@@ -402,7 +402,7 @@ void TopOpeBRepBuild_WireEdgeClassifier::ResetElement(const TopoDS_Shape& EE)
Standard_Real t = 0.397891143689; Standard_Real par = ((1-t)*f2 + t*l2);
myPoint2d = C2D->Value(par);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Real f3,l3; Handle(Geom_Curve) C3D = BRep_Tool::Curve(E,f3,l3);
gp_Pnt P3D; if (!C3D.IsNull()) P3D = C3D->Value(par);
#endif
@@ -437,7 +437,7 @@ Standard_Boolean TopOpeBRepBuild_WireEdgeClassifier::CompareElement(const TopoDS
Standard_Real t = 0.33334567; Standard_Real par = ((1-t)*f2 + t*l2);
gp_Pnt2d p2d = C2D->Value(par);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Real f3,l3; Handle(Geom_Curve) C3D = BRep_Tool::Curve(E,f3,l3);
gp_Pnt P3D; if (!C3D.IsNull()) P3D = C3D->Value(par);
#endif
@@ -455,7 +455,7 @@ Standard_Boolean TopOpeBRepBuild_WireEdgeClassifier::CompareElement(const TopoDS
myBCEdge.Edge() = E;
TopAbs_Orientation Eori = E.Orientation();
myFPC.Compare(myBCEdge,Eori);
#ifdef DEB
#ifdef OCCT_DEBUG
// TopAbs_State state = myFPC.State();
#endif
return bRet;

6
src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx
View File

@@ -43,7 +43,7 @@ static TCollection_AsciiString PRODINS("dins ");
#include <TopOpeBRepBuild_define.hxx>
#include <TopOpeBRepTool_2d.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRep_GettraceSHA(const Standard_Integer i);
extern Standard_Boolean TopOpeBRepBuild_GettraceSS();
extern Standard_Boolean TopOpeBRepBuild_GetcontextSSCONNEX();
@@ -111,7 +111,7 @@ void TopOpeBRepBuild_WireEdgeSet::AddShape(const TopoDS_Shape& S)
//=======================================================================
void TopOpeBRepBuild_WireEdgeSet::AddStartElement(const TopoDS_Shape& S)
{
#ifdef DEB
#ifdef OCCT_DEBUG
#endif
Standard_Boolean tocheck = Standard_True;
@@ -495,7 +495,7 @@ void TopOpeBRepBuild_WireEdgeSet::LocalD1(const TopoDS_Shape& SF,const TopoDS_Sh
//=======================================================================
Standard_Boolean TopOpeBRepBuild_WireEdgeSet::IsClosed(const TopoDS_Shape& E) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer ista=myOMSS.FindIndex(E);Standard_Boolean tsh=(ista)?TopOpeBRep_GettraceSHA(ista):Standard_False;
if (tsh) debwesclo(ista);
#endif

16
src/TopOpeBRepBuild/TopOpeBRepBuild_fctwes.cxx
View File

@@ -26,7 +26,7 @@
#include <BRep_Tool.hxx>
#include <Standard_ProgramError.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT void debfctwes(const Standard_Integer /*i*/) {}
Standard_EXPORT void debfctwesmess(const Standard_Integer i,const TCollection_AsciiString& s = "")
{cout<<"+ + + debfctwes "<<s<<"F"<<i<<endl;debfctwes(i);}
@@ -52,7 +52,7 @@ void TopOpeBRepBuild_Builder::GFillCurveTopologyWES(const TopoDS_Shape& F1,const
TopAbs_State TB1,TB2; G1.StatesON(TB1,TB2);
TopAbs_ShapeEnum t1,t2,ShapeInterf; G1.Type(t1,t2); ShapeInterf = t1;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(F1,iF);
if(tSPS) GdumpSHASTA(iF,TB1,WES,"--- GFillCurveTopologyWES");
if(tSPS) {cout<<" ShapeInterf ";TopAbs::Print(ShapeInterf,cout);cout<<endl;}
@@ -119,11 +119,11 @@ void TopOpeBRepBuild_Builder::GFillCurveTopologyWES(const TopOpeBRepDS_CurveIter
TopoDS_Face& WESF = *((TopoDS_Face*)((void*)&WES.Face()));
TopoDS_Face& FTF = *((TopoDS_Face*)((void*)&myFaceToFill));
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean FTFeqWESF = myFaceReference.IsEqual(WESF);
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iWESF = myDataStructure->Shape(WESF);
Standard_Integer iref = myDataStructure->Shape(myFaceReference);
Standard_Integer ifil = myDataStructure->Shape(myFaceToFill);
@@ -139,7 +139,7 @@ void TopOpeBRepBuild_Builder::GFillCurveTopologyWES(const TopOpeBRepDS_CurveIter
neworiE = TopAbs::Complement(neworiE);
}
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPS = GtraceSPS(iWESF);
if(tSPS){
cout<<"ifil : "<<ifil<<" iref : "<<iref<<" iwes : "<<iWESF<<endl;
@@ -181,19 +181,19 @@ void TopOpeBRepBuild_Builder::GFillCurveTopologyWES(const TopOpeBRepDS_CurveIter
Standard_Real f2,l2,tolpc; Handle(Geom2d_Curve) C2D;
C2D = FC2D_CurveOnSurface(E,WESF,f2,l2,tolpc);
if (C2D.IsNull()) Standard_ProgramError::Raise("GFillCurveTopologyWES");
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Real tol = Max(tolE,tolpc);
#endif
myBuildTool.PCurve(WESF,E,C2D);
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
EhasPConWESF = FC2D_HasCurveOnSurface(E,WESF);
if (!EhasPConWESF) cout<<"TopOpeBRepBuild_Builder::GFillCurveTopologyWES : Null PCurve on F"<<iWESF<<endl;
#endif
}
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debaddpwes(iWESF,TB,iG,neworiE,(TopOpeBRepBuild_Builder* const)this,&WES,"GFillCurveTopology " ,"WES+ EofC ");
#endif

32
src/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx
View File

@@ -27,7 +27,7 @@
#include <BRep_Tool.hxx>
#include <TopoDS.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
#define DEBSHASET(sarg,meth,shaset,str) TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str);
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOFUFA();
Standard_EXPORT void debffsfs(const Standard_Integer i){cout<<"+++ debffsfs "<<i<<endl;}
@@ -50,7 +50,7 @@ Standard_EXPORT void FUNBUILD_ANCESTORRANKGET(TopOpeBRepBuild_Builder& B,const T
static Standard_Integer FUN_getAncestorFsp(TopOpeBRepBuild_Builder& B,TopOpeBRepTool_ShapeClassifier& SC,const TopTools_ListOfShape& LF,const TopoDS_Shape& fsp,Standard_Boolean& p3ddef,gp_Pnt& p3d);
static Standard_Integer FUN_getAncestorFsp(TopOpeBRepBuild_Builder& B,TopOpeBRepTool_ShapeClassifier& SC,const TopTools_ListOfShape& LF1,const TopTools_ListOfShape& LF2,const TopoDS_Shape& fsp);
#ifdef DEB
#ifdef OCCT_DEBUG
//static void FUN_getAncestorFsp(const Handle(TopOpeBRepDS_HDataStructure)& HDS,TopOpeBRepTool_ShapeClassifier& SC,const TopTools_ListOfShape& LF1,const TopTools_ListOfShape& LF2,const TopTools_ListOfShape& spFOR,
// TopTools_DataMapOfShapeInteger* SplitAnc);
#endif
@@ -165,19 +165,19 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
{
TopAbs_State TB1,TB2; Gin.StatesON(TB1,TB2);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(FOR,iF);
if(tSPS)cout<<endl;
#endif
const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS();
Standard_Boolean tosplit = GToSplit(FOR,TB1);
Standard_Boolean tomerge = GToMerge(FOR);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer iFOR = BDS.Shape(FOR);
#endif
Standard_Integer rkFOR = BDS.AncestorRank(FOR);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
GdumpSHASTA(FOR,TB1,"--- GFillFaceSFS START ");
cout<<" tosplit "<<tosplit<<" tomerge "<<tomerge<<endl;
@@ -205,7 +205,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
if (makemerge) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
GdumpSHASTA(FOR,TB1,"[[[[[[[[[[[[[[[[[[[[[[[[[[ GFillFaceSFS makemerge START ");
cout<<endl;
@@ -213,7 +213,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
#endif
Standard_Boolean performfufa = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
performfufa = !TopOpeBRepBuild_GetcontextNOFUFA();
#endif
if (performfufa) {
@@ -256,7 +256,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
GM = Gin;
GM.ChangeConfig(TopOpeBRepDS_SAMEORIENTED,TopOpeBRepDS_SAMEORIENTED);
if (dodo) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
GdumpSAMDOM(LF1, (char *) "LF1 (LFSO1) : ");
GdumpSAMDOM(LF2, (char *) "LF2 (LFSO2) : ");
@@ -302,7 +302,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
GM.ChangeConfig(TopOpeBRepDS_SAMEORIENTED,TopOpeBRepDS_DIFFORIENTED);
FUN_setmotherope(GM); // +12/07
if (dodo) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
TopAbs_State TB11,TB21; GM.StatesON(TB11,TB21);
cout<<endl;
@@ -361,7 +361,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
GM.ChangeConfig(TopOpeBRepDS_SAMEORIENTED,TopOpeBRepDS_DIFFORIENTED);
FUN_setmotherope(GM); // +12/07
if (dodo) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
TopAbs_State TB12,TB22; GM.StatesON(TB12,TB22);
cout<<endl;
@@ -389,7 +389,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
FUN_unsetmotherope(); // +12/07
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
GdumpSHASTA(FOR,TB1,"]]]]]]]]]]]]]]]]]]]]]]]]]] GFillFaceSFS makemerge END ");
cout<<endl;
@@ -401,14 +401,14 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
// FuseFace
SFS.ChangeStartShapes().Extent();
if (performfufa) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) debffflo(iF);
#endif
// const TopTools_ListOfShape& lou = Splits(FF,TopAbs_OUT); Standard_Integer nou = lou.Extent();
// const TopTools_ListOfShape& lin = Splits(FF,TopAbs_IN); Standard_Integer nin = lin.Extent();
// GCopyList(lou,*GLOBAL_lfr1);
// GCopyList(lin,*GLOBAL_lfr1);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nlfr1 = GLOBAL_lfr1->Extent();
#endif
@@ -418,7 +418,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
fufa.PerformFace();
Standard_Boolean isdone = fufa.IsDone();
if (!isdone) return;
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean ismodified = fufa.IsModified();
#endif
const TopTools_ListOfShape& lfr2 = fufa.LFuseFace();
@@ -428,7 +428,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
for (TopTools_ListIteratorOfListOfShape itlfr2(lfr2);itlfr2.More();itlfr2.Next()) {
const TopoDS_Shape& flfr2 = itlfr2.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
DEBSHASET(ss,"--- FillFaceSFS apres fufa",SFS," AddStartElement SFS+ face ");
GdumpSHA(flfr2,(Standard_Address)ss.ToCString());
@@ -453,7 +453,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool
myEdgeAvoid.Clear();
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
GdumpSHASTA(FOR,TB1,"--- GFillFaceSFS END ");cout<<endl;
}

16
src/TopOpeBRepBuild/TopOpeBRepBuild_ffwesk.cxx
View File

@@ -23,7 +23,7 @@
#include <TopOpeBRepTool_EXPORT.hxx>
#include <TopOpeBRepTool_2d.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_EXPORT void debfctwesmess(const Standard_Integer i,const TCollection_AsciiString& s = "");
Standard_EXPORT void debffwesON(const Standard_Integer i);
Standard_EXPORT void debffwesk(const Standard_Integer i) {cout<<"++ debffwesk "<<i<<endl;}
@@ -51,14 +51,14 @@ void TopOpeBRepBuild_Builder::GFillFacesWESK(const TopTools_ListOfShape& LS1,con
const TopoDS_Shape& F1 = LS1.First();
myFaceReference = TopoDS::Face(F1);
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF1 =
#endif
BDS.Shape(F1);
Standard_Integer iref = BDS.SameDomainRef(F1);
TopAbs_Orientation oref = BDS.Shape(iref).Orientation();
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean tSPS = GtraceSPS(F1,iF1);
if(tSPS) cout<<"\n%%%%%%%%%%%%% K = "<<Kfill<<" %%%%%%%%%%%%% ";
if(tSPS) GdumpSHASTA(iF1,TB1,WES,"GFillFacesWESK","myFaceReference");
@@ -75,7 +75,7 @@ void TopOpeBRepBuild_Builder::GFillFacesWESK(const TopTools_ListOfShape& LS1,con
TB = TB1;
it.Initialize(LS1);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
cout<<"\n^^^^^^^^ GFillFacesWESK : traitement de 1/2";
TopAbs_State TB11,TB21; G.StatesON(TB11,TB21);
@@ -125,13 +125,13 @@ void TopOpeBRepBuild_Builder::GFillFacesWESK(const TopTools_ListOfShape& LS1,con
GFillFaceWES(S,LS2,G,WES);
}
else if (Kfill == 2) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debfctwesmess(iF1);
#endif
GFillCurveTopologyWES(S,G,WES);
}
else if (Kfill == 3) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) debffwesON(iF1);
#endif
GFillONPartsWES(S,G,LS2,WES);
@@ -147,7 +147,7 @@ void TopOpeBRepBuild_Builder::GFillFacesWESK(const TopTools_ListOfShape& LS1,con
TB = TB2;
it.Initialize(LS2);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS){
cout<<"\n^^^^^^^^ GFillFacesWESK : traitement de 2/1";
TopAbs_State TB12,TB22; G.StatesON(TB12,TB22);
@@ -192,7 +192,7 @@ void TopOpeBRepBuild_Builder::GFillFacesWESK(const TopTools_ListOfShape& LS1,con
GFillCurveTopologyWES(S,G,WES);
}
else if (Kfill == 3) {
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) debffwesON(iF1);
#endif
GFillONPartsWES(S,G,LS1,WES);

12
src/TopOpeBRepBuild/TopOpeBRepBuild_keep.cxx
View File

@@ -17,7 +17,7 @@
#include <TopOpeBRepBuild_Builder.ixx>
#include <TopOpeBRepDS_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Integer GLOBAL_iexE;
extern Standard_Integer GLOBAL_iexF;
Standard_Boolean STATIC_trace_iexE = Standard_False;
@@ -57,7 +57,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::GKeepShape1
pos = ShapePosition(S,LSclass);
if ( pos != TB ) keep = Standard_False;
}
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
Standard_Integer iface = 0, isoli = 0;
Standard_Boolean tSPSface = Standard_False;
@@ -96,19 +96,19 @@ Standard_Boolean TopOpeBRepBuild_Builder::GKeepShape1
// S is used for trace only
//=======================================================================
void TopOpeBRepBuild_Builder::GKeepShapes
#ifdef DEB
#ifdef OCCT_DEBUG
(const TopoDS_Shape& S,
#else
(const TopoDS_Shape&,
#endif
const TopTools_ListOfShape& LSclass,const TopAbs_State TB,const TopTools_ListOfShape& Lin,TopTools_ListOfShape& Lou)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iS; Standard_Boolean tSPS = GtraceSPS(S,iS);
if (tSPS) debkeep(iS);
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer n = 0;
#endif
TopTools_ListIteratorOfListOfShape it(Lin);
@@ -121,7 +121,7 @@ void TopOpeBRepBuild_Builder::GKeepShapes
if ( pos != TB ) keep = Standard_False;
}
#ifdef DEB
#ifdef OCCT_DEBUG
TopAbs_ShapeEnum t = SL.ShapeType();
if(tSPS){cout<<"GKeepShapes : ";}
if(tSPS){cout<<"new ";TopAbs::Print(t,cout);cout<<" "<<++n;}

44
src/TopOpeBRepBuild/TopOpeBRepBuild_kpkole.cxx
View File

@@ -32,7 +32,7 @@
#include <TopOpeBRepBuild_kpresu.hxx>
#include <Standard_ProgramError.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GettraceKPB();
void debiskole() {}
#endif
@@ -50,7 +50,7 @@ Standard_EXPORT void FUNKP_KPmakefaces(const TopOpeBRepBuild_Builder& BU, const
void TopOpeBRepBuild_Builder::MergeKPartiskole()
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) KPreturn(myIsKPart);
debiskole();
@@ -83,7 +83,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole()
itm1.Initialize(myKPMAPf1f2);
if ( ! itm1.More() ) return;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TKPB) {
cout<<""<<endl;
for (; itm1.More();itm1.Next()) {
@@ -125,7 +125,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole()
if ( pfOU==NULL) return;
if ( pfIN==NULL) return;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer ifOU; Standard_Boolean tSPS = GtraceSPS(*pfOU,ifOU);
if(tSPS || TKPB) {
// Standard_Integer iOU = myDataStructure->Shape(*pfOU);
@@ -188,7 +188,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole()
ChangeMerged(she1,myState1);
ChangeMerged(she2,myState2);
#ifdef DEB
#ifdef OCCT_DEBUG
if (TKPB) { cout<<"stsol1 ";TopAbs::Print(stsol1,cout); cout<<" "; }
if (TKPB) { cout<<"stsol2 ";TopAbs::Print(stsol2,cout); cout<<endl; }
debiskole();
@@ -254,7 +254,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole()
it2.Initialize(lf2);
const TopoDS_Shape& f2 = it2.Value();
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
Standard_Integer ii1 = myDataStructure->Shape(f1);
Standard_Integer ii2 = myDataStructure->Shape(f2);
#endif*/
@@ -330,7 +330,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole()
} // === fin RESNEWSHE
else {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
cout<<"MergeKPartiskole : ires = "<<ires<<endl;
#endif
}
@@ -356,7 +356,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole()
loshe1.Append(shecur);
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nshe1 = loshe1.Extent();
#endif
TopTools_ListIteratorOfListOfShape itloshe1;
@@ -381,7 +381,7 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole()
loshe2.Append(shecur);
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nshe2 = loshe2.Extent();
#endif
TopTools_ListIteratorOfListOfShape itloshe2;
@@ -437,17 +437,17 @@ Standard_Integer TopOpeBRepBuild_Builder::KPiskole()
itlf1.More();itlf1.Next()) {
const TopoDS_Shape& f1 = itlf1.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean isb1 = myKPMAPf1f2.IsBound(f1); // DEB
#endif
lf1.Clear(); lf1.Append(f1);
lf2.Clear(); KPSameDomain(lf1,lf2);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer n1 = lf1.Extent();
// Standard_Integer n2 = lf2.Extent();
#endif
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF1; Standard_Boolean tSPS1 = GtraceSPS(f1,iF1);
if(tSPS1) {
GdumpSHA(f1, (char *) "KPiskole ");cout<<endl;
@@ -459,7 +459,7 @@ Standard_Integer TopOpeBRepBuild_Builder::KPiskole()
itlf2.More(); itlf2.Next() ) {
const TopoDS_Shape& f2 = itlf2.Value();
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Boolean isb2 = myKPMAPf1f2.IsBound(f2); // DEB
#endif
TopAbs_State state1,state2;
@@ -566,7 +566,7 @@ void TopOpeBRepBuild_Builder::KPiskoleanalyse(const TopAbs_State Stfac1, const T
}
}
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
if (TKPB) cout<<"ires = "<<ires<<" icla1 "<<icla1<<" icla2 "<<icla2<<endl;
#endif
@@ -588,7 +588,7 @@ Standard_EXPORT void FUNKP_KPmakefaces(const TopOpeBRepBuild_Builder& BU,
Standard_Integer rankIN = 0;
TopTools_ListOfShape LFSO,LFDO;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF1; Standard_Boolean tSPS = BU.GtraceSPS(Fac1,iF1);
if(tSPS) { BU.GdumpSHA(Fac1, (char *) "KPmakeFace ");cout<<endl; }
#endif
@@ -613,7 +613,7 @@ Standard_EXPORT void FUNKP_KPmakefaces(const TopOpeBRepBuild_Builder& BU,
BU.GFindSameRank(LFSO,rankIN,LFIN);
BU.GFindSameRank(LFDO,rankIN,LFIN);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
BU.GdumpSAMDOM(LFSO, (char *) "LESO : ");
BU.GdumpSAMDOM(LFDO, (char *) "LEDO : ");
@@ -646,7 +646,7 @@ Standard_EXPORT void FUNKP_KPmakefaces(const TopOpeBRepBuild_Builder& BU,
const TopoDS_Face& F1 = TopoDS::Face(Fac1);
wtof.MakeFaces(F1,Lres);
#ifdef DEB
#ifdef OCCT_DEBUG
// Standard_Integer nlres = Lres.Extent(); // DEB
#endif
@@ -672,7 +672,7 @@ TopoDS_Shape TopOpeBRepBuild_Builder::KPmakeface(const TopoDS_Shape& Fac1,
Standard_Integer rankIN = 0;
TopTools_ListOfShape LFSO,LFDO;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF1;
Standard_Boolean tSPS = GtraceSPS(Fac1,iF1);
if(tSPS) {
@@ -703,7 +703,7 @@ TopoDS_Shape TopOpeBRepBuild_Builder::KPmakeface(const TopoDS_Shape& Fac1,
GFindSameRank(LFSO,rankIN,LFIN);
GFindSameRank(LFDO,rankIN,LFIN);
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
GdumpSAMDOM(LFSO, (char *) "LESO : ");
GdumpSAMDOM(LFDO, (char *) "LEDO : ");
@@ -779,14 +779,14 @@ Standard_Boolean TopOpeBRepBuild_Builder::KPiskolesh(const TopoDS_Shape& Sarg,
TopTools_ListOfShape& lShsd,
TopTools_ListOfShape& lfhsd) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean TKPB = TopOpeBRepBuild_GettraceKPB();
#endif
const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS();
Standard_Boolean iskolesh = FUNKP_KPiskolesh(*this,BDS,Sarg,lShsd,lfhsd);
if (!iskolesh) return Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer nfhsd =
#endif
KPlhsd(Sarg,TopAbs_FACE,lfhsd);
@@ -803,7 +803,7 @@ Standard_Boolean TopOpeBRepBuild_Builder::KPiskolesh(const TopoDS_Shape& Sarg,
Standard_Integer nehg = KPlhg(fac,TopAbs_EDGE,lehg);
if ( nehg != 0 ) return Standard_False;
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer isol = myDataStructure->Shape(Sarg);
Standard_Integer ifac = myDataStructure->Shape(fac);
if(TKPB){cout<<"isol "<<isol<<endl;}

8
src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx
View File

@@ -23,7 +23,7 @@
#include <TopOpeBRepDS_EXPORT.hxx>
#include <TopOpeBRepBuild_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern void debfillp(const Standard_Integer i);
extern void debedbu(const Standard_Integer i) {cout<<"++ debedbu "<<i<<endl;}
#endif
@@ -39,7 +39,7 @@ extern void debedbu(const Standard_Integer i) {cout<<"++ debedbu "<<i<<endl;}
void TopOpeBRepBuild_Builder::GPVSMakeEdges
(const TopoDS_Shape& EF,TopOpeBRepBuild_PaveSet& PVS,TopTools_ListOfShape& LOE) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(EF,iE);
if (tSPS) debfillp(iE);
#endif
@@ -50,7 +50,7 @@ void TopOpeBRepBuild_Builder::GPVSMakeEdges
PVS.InitLoop();
Standard_Boolean novertex = ( ! PVS.MoreLoop() );
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS&&novertex)cout<<"#--- GPVSMakeEdges : no vertex from edge "<<iE<<endl;
#endif
if (novertex) return;
@@ -69,7 +69,7 @@ void TopOpeBRepBuild_Builder::GPVSMakeEdges
void TopOpeBRepBuild_Builder::GEDBUMakeEdges
(const TopoDS_Shape& EF,TopOpeBRepBuild_EdgeBuilder& EDBU,TopTools_ListOfShape& LOE) const
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iE; Standard_Boolean tSPS = GtraceSPS(EF,iE);
if(tSPS){cout<<endl;GdumpSHA(EF, (char *) "#--- GEDBUMakeEdges ");cout<<endl;}
if(tSPS){GdumpEDBU(EDBU);}

20
src/TopOpeBRepBuild/TopOpeBRepBuild_makefaces.cxx
View File

@@ -39,7 +39,7 @@
#include <TopOpeBRepTool_2d.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepBuild_GetcontextNOPURGE();
extern Standard_Boolean TopOpeBRepBuild_GetcontextNOCORRISO();
extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
@@ -62,7 +62,7 @@ extern void* GFABUMAKEFACEPWES_DEB;
Standard_EXPORT Standard_Boolean FUN_tool_ClosedW(const TopoDS_Wire& W);
// Unused :
/*#ifdef DEB
/*#ifdef OCCT_DEBUG
static void FUN_Raise(){cout<<"--------- ERROR in GWESMakeFaces ---------"<<endl;}
#endif*/
@@ -73,7 +73,7 @@ static void FUN_Raise(){cout<<"--------- ERROR in GWESMakeFaces ---------"<<endl
void TopOpeBRepBuild_Builder::GWESMakeFaces
(const TopoDS_Shape& FF,TopOpeBRepBuild_WireEdgeSet& WES,TopTools_ListOfShape& LOF)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(FF,iF);
DEBSHASET(s,"#--- GWESMakeFaces ",WES," ");
if(tSPS){ GdumpSHA(FF,(Standard_Address)s.ToCString());cout<<endl; WES.DumpSS();}
@@ -90,7 +90,7 @@ void TopOpeBRepBuild_Builder::GWESMakeFaces
// This can occur when the face has a closing edge. To avoid this,
// we delete the lonesome closing edge from the wire.
Standard_Boolean topurge = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GetcontextNOPURGE()) topurge = Standard_False;
#endif
@@ -190,7 +190,7 @@ void TopOpeBRepBuild_Builder::GWESMakeFaces
if (!puok) Standard_Failure::Raise("TopOpeBRepBuild::GWESMakeFaces");
topurge = !MshNOK.IsEmpty();
#ifdef DEB
#ifdef OCCT_DEBUG
if (tSPS) DEBpurclo = Standard_False;
#endif
} // topurge
@@ -206,7 +206,7 @@ void TopOpeBRepBuild_Builder::GWESMakeFaces
// translates edge's pcurve to have it in F's UVbounds
// translates edge's pcurve to have it connexed to others in UV space
Standard_Boolean corronISO = Standard_True;
#ifdef DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepBuild_GetcontextNOCORRISO()) corronISO = Standard_False;
if (tSPS) debcorriso(iF);
#endif
@@ -311,7 +311,7 @@ static Standard_Integer FUN_CheckORI(TopAbs_Orientation O1,
void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBuild_FaceBuilder& FABU,
TopTools_ListOfShape& LOF,TopTools_DataMapOfShapeInteger& MWisOld)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iF;Standard_Boolean tSPS=GtraceSPS(FF,iF);
if(tSPS) {
cout<<endl;GdumpSHA(FF,(char *) "#--- GFABUMakeFaces ");cout<<endl;
@@ -526,7 +526,7 @@ void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBu
} // !isold
//--ofv.
#ifdef DEB
#ifdef OCCT_DEBUG
if ( tSPS ) cout<<"#--- GFABUMakeFaces "<<iF<<" : "<<ne<<" edges"<<endl;
#endif
@@ -559,7 +559,7 @@ void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBu
Standard_Boolean topurge = FUN_purgeFon1nonoriE(newFace);
if (topurge) {
#ifdef TOPOPEBREPBUILD_DEB
#ifdef OCCT_DEBUG
if (TopOpeBRepDS_GettraceSTRANGE())
cout<<"Builder::GFABUMakeFaces -> purgeFon1nonoriE\n";
#endif
@@ -588,7 +588,7 @@ void TopOpeBRepBuild_Builder::GFABUMakeFaces(const TopoDS_Shape& FF,TopOpeBRepBu
} // FABU.MoreFace()
#ifdef DEB
#ifdef OCCT_DEBUG
if(tSPS) {
cout<<endl;GdumpSHA(FF, (char *) "#--- GFABUMakeFaces avant regularize");cout<<endl;
GdumpFABU(FABU);debgfabu(iF);

8
src/TopOpeBRepBuild/TopOpeBRepBuild_makesolids.cxx
View File

@@ -29,7 +29,7 @@
#include <TopOpeBRepTool.hxx>
#include <TopOpeBRepBuild_define.hxx>
#ifdef DEB
#ifdef OCCT_DEBUG
extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
Standard_EXPORT void debgsobu(const Standard_Integer /*iSO*/) {}
#endif
@@ -41,7 +41,7 @@ Standard_EXPORT void debgsobu(const Standard_Integer /*iSO*/) {}
void TopOpeBRepBuild_Builder::GSFSMakeSolids
(const TopoDS_Shape& SOF,TopOpeBRepBuild_ShellFaceSet& SFS,TopTools_ListOfShape& LOSO)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Integer iSO; Standard_Boolean tSPS = GtraceSPS(SOF,iSO);
if(tSPS){GdumpSHA(SOF, (char *) "#--- GSFSMakeSolids ");cout<<endl;}
#endif
@@ -60,7 +60,7 @@ void TopOpeBRepBuild_Builder::GSFSMakeSolids
void TopOpeBRepBuild_Builder::GSOBUMakeSolids
(const TopoDS_Shape& SOF,TopOpeBRepBuild_SolidBuilder& SOBU,TopTools_ListOfShape& LOSO)
{
#ifdef DEB
#ifdef OCCT_DEBUG
Standard_Boolean trcso = TopOpeBRepDS_GettraceSTRANGE();
Standard_Integer iSO; Standard_Boolean tSPS = GtraceSPS(SOF,iSO);
if(tSPS){GdumpSHA(SOF, (char *) "#--- GSOBUMakeSolids ");cout<<endl;}
@@ -119,7 +119,7 @@ void TopOpeBRepBuild_Builder::GSOBUMakeSolids
TopExp_Explorer ex(newSolid,TopAbs_VERTEX);
Standard_Boolean isempty = ex.More();
if (!isempty) {
#ifdef DEB
#ifdef OCCT_DEBUG
if (trcso) cout <<"TopOpeBRepBuild_Builder::GSOBUMakeSolids ->EMPTY SOLID\n";
#endif
continue;

4
src/TopOpeBRepBuild/TopOpeBRepBuild_trace.cxx
View File

@@ -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>
@@ -175,5 +175,5 @@ static Standard_Boolean TopOpeBRepBuild_traceFE = Standard_False; // trace Fuse
Standard_EXPORT void TopOpeBRepBuild_SettraceFE(const Standard_Boolean b) { TopOpeBRepBuild_traceFE = b; }
Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GettraceFE() { return TopOpeBRepBuild_traceFE; }
// #ifdef DEB
// #ifdef OCCT_DEBUG
#endif