From 1a2e039ab9654cc8eaecb5654b80af6f50dc6dba Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Sun, 23 Aug 2026 15:00:47 +0100 Subject: [PATCH] Coding - Clean up the trace debug files (#1487) Some *trace* old debug classes existed for long time. Their purpose is accumulte some trace logic for TopOpe or BRepFeat packages. The problem is that that functionality is no longer used by active developers. And the functionality in some cases changes behavior and make more complicated to debug. Lack of documentation how to work with and impact on behavior and usage of global/static variables make these classes heavy legacy. --- .../TKBool/TopOpeBRep/FILES.cmake | 1 - .../TopOpeBRep_EdgesIntersector.cxx | 7 - .../TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx | 10 - .../TKBool/TopOpeBRep/TopOpeBRep_kpart.cxx | 11 - .../TopOpeBRep/TopOpeBRep_traceBOOPNINT.cxx | 236 ----------- .../TKBool/TopOpeBRep/TopOpeBRep_vpr.cxx | 31 -- .../TKBool/TopOpeBRepBuild/FILES.cmake | 1 - .../TopOpeBRepBuild_Area1dBuilder.cxx | 95 ----- .../TopOpeBRepBuild_Area2dBuilder.cxx | 8 - .../TopOpeBRepBuild_BuildEdges.cxx | 8 - .../TopOpeBRepBuild_BuildFaces.cxx | 16 - .../TopOpeBRepBuild_Builder.cxx | 95 ----- .../TopOpeBRepBuild_BuilderON.cxx | 44 +- .../TopOpeBRepBuild_BuilderON2d.cxx | 2 - .../TopOpeBRepBuild/TopOpeBRepBuild_End.cxx | 6 - .../TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx | 23 - .../TopOpeBRepBuild_FaceBuilder.cxx | 7 - .../TopOpeBRepBuild_FuseFace.cxx | 162 +------ .../TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx | 40 -- .../TopOpeBRepBuild_GridEE.cxx | 15 +- .../TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx | 155 ------- .../TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx | 3 - .../TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx | 23 - .../TopOpeBRepBuild_Section.cxx | 1 - .../TopOpeBRepBuild_ShapeSet.cxx | 37 -- .../TopOpeBRepBuild_ShellFaceClassifier.cxx | 47 --- .../TopOpeBRepBuild_ShellFaceSet.cxx | 30 -- .../TopOpeBRepBuild_WireEdgeSet.cxx | 16 - .../TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx | 4 - .../TopOpeBRepBuild_kpkole.cxx | 97 ----- .../TopOpeBRepBuild_makefaces.cxx | 13 - .../TopOpeBRepBuild/TopOpeBRepBuild_trace.cxx | 394 ------------------ .../TopOpeBRepTool_FuseEdges.cxx | 55 --- .../TKFeat/BRepFeat/BRepFeat_Form.cxx | 70 ---- .../TKFeat/BRepFeat/BRepFeat_MakeDPrism.cxx | 68 --- .../BRepFeat/BRepFeat_MakeLinearForm.cxx | 93 +---- .../TKFeat/BRepFeat/BRepFeat_MakePipe.cxx | 42 -- .../TKFeat/BRepFeat/BRepFeat_MakePrism.cxx | 62 --- .../TKFeat/BRepFeat/BRepFeat_MakeRevol.cxx | 61 --- .../BRepFeat/BRepFeat_MakeRevolutionForm.cxx | 99 ----- .../TKFeat/BRepFeat/BRepFeat_RibSlot.cxx | 116 +----- .../TKFeat/BRepFeat/BRepFeat_trace.cxx | 96 ----- .../TKFeat/BRepFeat/FILES.cmake | 1 - .../TKFeat/LocOpe/LocOpe_DPrism.cxx | 12 - 44 files changed, 12 insertions(+), 2401 deletions(-) delete mode 100644 src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_traceBOOPNINT.cxx delete mode 100644 src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_trace.cxx delete mode 100644 src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_trace.cxx diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/FILES.cmake b/src/ModelingAlgorithms/TKBool/TopOpeBRep/FILES.cmake index 7b974d71ca..0581d9c170 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/FILES.cmake +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/FILES.cmake @@ -51,7 +51,6 @@ set(OCCT_TopOpeBRep_FILES TopOpeBRep_sort.cxx TopOpeBRep_trace.cxx TopOpeBRep_traceALWL.cxx - TopOpeBRep_traceBOOPNINT.cxx TopOpeBRep_TypeLineCurve.hxx TopOpeBRep_VPointInter.cxx TopOpeBRep_VPointInter.hxx diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx index f077bcca56..a9c39b5e62 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx @@ -50,8 +50,6 @@ extern bool TopOpeBRep_GettracePROEDG(); extern bool TopOpeBRep_GetcontextTOL0(); extern bool TopOpeBRep_GetcontextNOFEI(); extern bool TopOpeBRep_GettraceFITOL(); -extern bool TopOpeBRep_GettraceEEFF(); -extern void debeeff(); #include Standard_EXPORT TOPKRO KRO_DSFILLER_INTEE("intersection edge/edge"); #endif @@ -603,11 +601,6 @@ void TopOpeBRep_EdgesIntersector::Perform(const TopoDS_Shape& E1, myTrueNbPoints = myNbPoints + 2 * myNbSegments; myPointIndex = 0; -#ifdef OCCT_DEBUG - if (TopOpeBRep_GettraceEEFF()) - debeeff(); -#endif - MakePoints2d(); if (ReduceSegment) { diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx index 87b81f05d0..ef31bac45a 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx @@ -55,9 +55,6 @@ Standard_EXPORT void debrline() std::cout << "+ debrline" << std::endl; } -extern bool TopOpeBRep_GettraceNVP(int a, int b, int c, int d, int e); -extern bool GLOBAL_bvpr; -extern void debvprmess(int f1, int f2, int il, int vp, int si); extern bool TopOpeBRep_GetcontextNOPUNK(); static void FUN_traceRLine(const TopOpeBRep_LineInter&) {} @@ -509,13 +506,6 @@ void TopOpeBRep_FacesFiller::ProcessVPnotonR(const TopOpeBRep_VPointInter& VP) int ShapeIndex = 0; int iVP = VP.Index(); -#ifdef OCCT_DEBUG - int ili = myLine->Index(), ivp = iVP, isi = ShapeIndex; - GLOBAL_bvpr = TopOpeBRep_GettraceNVP(myexF1, myexF2, ili, ivp, isi); - if (GLOBAL_bvpr) - debvprmess(myexF1, myexF2, ili, ivp, isi); -#endif - int iINON1, iINONn, nINON; myLine->VPBounds(iINON1, iINONn, nINON); NCollection_List>::Iterator itCPIL(myDSCIL); diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_kpart.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_kpart.cxx index 93c2eef937..8e600d1289 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_kpart.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_kpart.cxx @@ -252,12 +252,6 @@ bool FUNBREP_topowalki_new(const occ::handle& return keep; } // FUNBREP_topowalki_new -#ifdef OCCT_DEBUG -extern bool GLOBAL_bvpr; - -Standard_EXPORT void debvpr2(void) {} -#endif - //---------------------------------------------------------------------- bool FUNBREP_topowalki(const occ::handle& Ifound, const NCollection_List>& DSCIL, @@ -410,11 +404,6 @@ bool FUNBREP_topowalki(const occ::handle& if (keep) { -#ifdef OCCT_DEBUG - if (GLOBAL_bvpr) - debvpr2(); -#endif - if (CPIfound && samepar) { double PIfound = TopOpeBRepDS_InterferenceTool::Parameter(Ifound); diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_traceBOOPNINT.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_traceBOOPNINT.cxx deleted file mode 100644 index 75c3bd2671..0000000000 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_traceBOOPNINT.cxx +++ /dev/null @@ -1,236 +0,0 @@ -// Created on: 1997-10-22 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifdef OCCT_DEBUG - - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - - #define AS(x) (Standard_PCharacter) TCollection_AsciiString((x)).ToCString(); - #define I 10 - #define J 10 - #define OK(x, y) (x) < I && (y) < J - #define T(x, y) myT[(x)][(y)] - #define L0(x, y) for ((x) = 0; (x) < (y); (x)++) - #define A(v) (atoi(a[(v)])) - -class BOOPNINTL -{ -public: - BOOPNINTL(); - bool Get(int n, char** a); - int Set(const bool b, int n, char** a); - -private: - NCollection_List myTL[I]; - bool myTB[I]; - int mynl; -}; - -BOOPNINTL::BOOPNINTL() -{ - Set(false, 0, NULL); -} - -int BOOPNINTL::Set(const bool b, int n, char** a) -{ - if (n == 0) - { - int i; - L0(i, I) - { - myTB[i] = false; - myTL[i].Clear(); - } - mynl = 0; - return 0; - } - else if (mynl + 1 < I) - { - myTB[mynl] = b; - int i; - L0(i, n) myTL[mynl].Append(atoi(a[i])); - mynl++; - return 0; - } - else - { - return 1; - } -} - -bool BOOPNINTL::Get(int n, char** a) -{ - if (!n) - return false; - int il; - L0(il, mynl) - { - const NCollection_List& L = myTL[il]; - if (L.IsEmpty()) - continue; - NCollection_List::Iterator itL(L); - int ia = 0; - bool found = true; - for (; itL.More() && (ia < n); itL.Next(), ia++) - { - int Lval = itL.Value(); - int aval = atoi(a[ia]); - if (Lval != aval) - { - found = false; - break; - } - } - if (found) - { - return myTB[il]; - } - } - return false; -} - -// =========== -static bool TopOpeBRep_traceEEFF = false; - -Standard_EXPORT void TopOpeBRep_SettraceEEFF(const bool b) -{ - TopOpeBRep_traceEEFF = b; -} - -Standard_EXPORT bool TopOpeBRep_GettraceEEFF() -{ - return TopOpeBRep_traceEEFF; -} - -BOOPNINTL BOOPEEFF; - -Standard_EXPORT int TopOpeBRep_SettraceEEFF(const bool b, int n, char** a) -{ - int err = BOOPEEFF.Set(b, n, a); - if (n == 0) - TopOpeBRep_SettraceEEFF(b); - return err; -} - -Standard_EXPORT bool TopOpeBRep_GettraceEEFF(int n, char** a) -{ - bool b = BOOPEEFF.Get(n, a); - return b; -} - -Standard_EXPORT bool TopOpeBRep_GettraceEEFF(const int i1, const int i2, const int i3, const int i4) -{ - char* t[4]; - t[0] = AS(i1); - t[1] = AS(i2); - t[2] = AS(i3); - t[3] = AS(i4); - bool b = BOOPEEFF.Get(4, t); - return b; -} - -// =========== -static bool TopOpeBRep_traceNVP = false; - -Standard_EXPORT void TopOpeBRep_SettraceNVP(const bool b) -{ - TopOpeBRep_traceNVP = b; -} - -Standard_EXPORT bool TopOpeBRep_GettraceNVP() -{ - return TopOpeBRep_traceNVP; -} - -BOOPNINTL BOOPNVP; - -Standard_EXPORT int TopOpeBRep_SettraceNVP(const bool b, int n, char** a) -{ - int err = BOOPNVP.Set(b, n, a); - if (n == 0) - TopOpeBRep_SettraceNVP(b); - return err; -} - -Standard_EXPORT bool TopOpeBRep_GettraceNVP(int n, char** a) -{ - return BOOPNVP.Get(n, a); -} - -Standard_EXPORT bool TopOpeBRep_GettraceNVP(int i1, int i2, int i3, int i4, int i5) -{ - char* t[5]; - t[0] = AS(i1); - t[1] = AS(i2); - t[2] = AS(i3); - t[3] = AS(i4); - t[4] = AS(i5); - bool b = BOOPNVP.Get(5, t); - return b; -} - -// =========== -static bool TopOpeBRep_traceSHA = false; - -Standard_EXPORT void TopOpeBRep_SettraceSHA(const bool b) -{ - TopOpeBRep_traceSHA = b; -} - -Standard_EXPORT bool TopOpeBRep_GettraceSHA() -{ - return TopOpeBRep_traceSHA; -} - -BOOPNINTL BOOPSHA; - -Standard_EXPORT int TopOpeBRep_SettraceSHA(const bool b, int n, char** a) -{ - int err = BOOPSHA.Set(b, n, a); - if (n == 0) - TopOpeBRep_SettraceSHA(b); - return err; -} - -Standard_EXPORT bool TopOpeBRep_GettraceSHA(int n, char** a) -{ - return BOOPSHA.Get(n, a); -} - -Standard_EXPORT bool TopOpeBRep_GettraceSHA(const int i1) -{ - char* t[1]; - t[0] = AS(i1); - return BOOPSHA.Get(1, t); -} - -// #ifdef OCCT_DEBUG -#endif diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_vpr.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_vpr.cxx index 306a6b465e..269e6506cc 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_vpr.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_vpr.cxx @@ -53,20 +53,6 @@ #define M_REVERSED(st) (st == TopAbs_REVERSED) #ifdef OCCT_DEBUG -extern bool TopOpeBRep_GettraceNVP(int a, int b, int c, int d, int e); - -bool GLOBAL_bvpr = false; - -void debvpr() {}; - -void debvprmess(int f1, int f2, int il, int vp, int si) -{ - std::cout << "f1,f2,il,vp,si : " << f1 << "," << f2 << "," << il << "," << vp << "," << si - << std::endl; - std::cout.flush(); - debvpr(); -} - void debpoint(int i) { std::cout << "+ debpoint" << i << std::endl; @@ -948,13 +934,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonR(const TopOpeBRep_VPointInter& VP, dgOOe = BRep_Tool::Degenerated(OOedge); } -#ifdef OCCT_DEBUG - int ili = myLine->Index(), ivp = iVP, isi = ShapeIndex; - GLOBAL_bvpr = TopOpeBRep_GettraceNVP(myexF1, myexF2, ili, ivp, isi); - if (GLOBAL_bvpr) - debvprmess(myexF1, myexF2, ili, ivp, isi); -#endif - // degenerated edge processing // --------------------------- int PVIndex = 0; // POINT or VERTEX index @@ -1382,11 +1361,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonR(const TopOpeBRep_VPointInter& VP, // Gfound = VP corresponds with an existing geometry of ShapeIndex bool Gfound = (EPIfound || CPIfound); -#ifdef OCCT_DEBUG - if (GLOBAL_bvpr) - debvprmess(myexF1, myexF2, ili, ivp, isi); -#endif - // =================================================================== // Current VPoint VP is kept // =================================================================== @@ -1662,11 +1636,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonR(const TopOpeBRep_VPointInter& VP, } } // EPIfound -#ifdef OCCT_DEBUG - if (GLOBAL_bvpr) - debvprmess(myexF1, myexF2, ili, ivp, isi); -#endif - // xpu030998 : edge has restriction on OOface, do NOT append EPIf // cto904A3 (edge19,OOface14,vG16), if (myLineINL) diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/FILES.cmake b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/FILES.cmake index d1ac305dfc..28a117b399 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/FILES.cmake +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/FILES.cmake @@ -105,7 +105,6 @@ set(OCCT_TopOpeBRepBuild_FILES TopOpeBRepBuild_Tools2d.cxx TopOpeBRepBuild_Tools2d.hxx TopOpeBRepBuild_Tools_1.cxx - TopOpeBRepBuild_trace.cxx TopOpeBRepBuild_VertexInfo.cxx TopOpeBRepBuild_VertexInfo.hxx TopOpeBRepBuild_WireEdgeClassifier.cxx diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx index 7e0d1da501..ca69884c83 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx @@ -20,10 +20,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceAREA(); -#endif - //================================================================================================= #ifdef OCCT_DEBUG @@ -86,19 +82,6 @@ void TopOpeBRepBuild_Area1dBuilder::InitAreaBuilder(TopOpeBRepBuild_LoopSet& const occ::handle& L = LS.Loop(); bool boundaryL = L->IsShape(); -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceAREA()) - { - std::cout << "++++ new loop : "; - L->Dump(); - if (boundaryL) - std::cout << " is bound"; - else - std::cout << " is not bound"; - std::cout << std::endl; - } -#endif - // L = shape et ForceClass : on traite L comme un block // L = shape et !ForceClass : on traite L comme un pur shape // L = !shape : on traite L comme un block @@ -281,19 +264,6 @@ void TopOpeBRepBuild_Area1dBuilder::InitAreaBuilder(TopOpeBRepBuild_LoopSet& } // end of block loop } // end of LoopSet LS scan -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceAREA()) - { - if (!myArea.IsEmpty()) - { - std::cout << "------- Areas -------" << std::endl; - for (AreaIter.Initialize(myArea); AreaIter.More(); AreaIter.Next()) - DumpList(AreaIter.Value()); - std::cout << "---------------------" << std::endl; - } - } -#endif - InitArea(); } @@ -309,19 +279,6 @@ void TopOpeBRepBuild_Area1dBuilder::ADD_Loop_TO_LISTOFLoop( ) const { LOL.Append(L); - -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceAREA()) - { - std::cout << "--------------------- add area loop to area : "; - L->Dump(); - std::cout << std::endl; - if (ss != NULL) - std::cout << (char*)ss << std::endl; - DumpList(LOL); - std::cout << "---------------------" << std::endl; - } -#endif } //================================================================================================= @@ -338,29 +295,7 @@ void TopOpeBRepBuild_Area1dBuilder::REM_Loop_FROM_LISTOFLoop( { #endif -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceAREA()) - { - if (ITA.More()) - { - std::cout << "--------------------- remove area loop from area : "; - ITA.Value()->Dump(); - std::cout << std::endl; - if (s != NULL) - std::cout << s << std::endl; - } - } -#endif - A.Remove(ITA); - -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceAREA()) - { - DumpList(A); - std::cout << "---------------------" << std::endl; - } -#endif } //================================================================================================= @@ -378,36 +313,6 @@ void TopOpeBRepBuild_Area1dBuilder::ADD_LISTOFLoop_TO_LISTOFLoop( void* const) const #endif { -#ifdef OCCT_DEBUG - char* s = (char*)ss; - char* s1 = (char*)ss1; - char* s2 = (char*)ss2; - - if (TopOpeBRepBuild_GettraceAREA()) - { - std::cout << "--------------------- add area 1 to area 2 : "; - if (s != NULL) - std::cout << s; - std::cout << std::endl; - std::cout << "1 : "; - if (s1 != NULL) - std::cout << s1; - std::cout << std::endl; - DumpList(A1); - } -#endif A2.Append(A1); - -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceAREA()) - { - std::cout << "2 : "; - if (s2 != NULL) - std::cout << s2; - std::cout << std::endl; - DumpList(A2); - std::cout << "---------------------" << std::endl; - } -#endif } diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx index 151e37793e..5887ac0608 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx @@ -19,10 +19,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceAREA(); -#endif - //================================================================================================= TopOpeBRepBuild_Area2dBuilder::TopOpeBRepBuild_Area2dBuilder() = default; @@ -248,10 +244,6 @@ void TopOpeBRepBuild_Area2dBuilder::InitAreaBuilder(TopOpeBRepBuild_LoopSet& { if (myArea.IsEmpty()) { -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceAREA()) - std::cout << "---" << std::endl << "--- purge" << std::endl << "---" << std::endl; -#endif NCollection_List> newArea3; newArea3.Append(boundaryloops); myArea.Append(newArea3); diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx index 8e0c213a20..e594ba5b0d 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx @@ -38,10 +38,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceCU(); -#endif - namespace { struct TopOpeBRepBuild_SurfaceCurve @@ -155,10 +151,6 @@ bool TopOpeBRepBuild_FindCurveEnd(const occ::handle void TopOpeBRepBuild_Builder::BuildEdges(const int iC, const occ::handle& HDS) { -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceCU()) - std::cout << "\nBuildEdges on C " << iC << std::endl; -#endif const TopOpeBRepDS_Curve& C = HDS->Curve(iC); const occ::handle& C3D = C.Curve(); const occ::handle& I1 = C.GetSCI1(); diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx index 4378a3a351..2db986bfab 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx @@ -28,15 +28,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceCU(); -extern bool TopOpeBRepBuild_GettraceCUV(); -extern bool TopOpeBRepBuild_GettraceSPF(); -extern bool TopOpeBRepBuild_GettraceSPS(); -extern bool TopOpeBRepBuild_GetcontextSF2(); -extern bool TopOpeBRepBuild_GettraceSHEX(); -#endif - //================================================================================================= void TopOpeBRepBuild_Builder::BuildFaces(const int iS, @@ -91,9 +82,6 @@ void TopOpeBRepBuild_Builder::BuildFaces(const int } } // -#ifdef OCCT_DEBUG - bool tSE = TopOpeBRepBuild_GettraceSPF(); -#endif // TopOpeBRepDS_CurveIterator SCurves(HDS->SurfaceCurves(iS)); for (; SCurves.More(); SCurves.Next()) @@ -106,10 +94,6 @@ void TopOpeBRepBuild_Builder::BuildFaces(const int { continue; } -#ifdef OCCT_DEBUG - if (tSE) - std::cout << std::endl << "BuildFaces : C " << iC << " on S " << iS << std::endl; -#endif TopoDS_Shape anEdge; NCollection_List::Iterator Iti(NewEdges(iC)); for (; Iti.More(); Iti.Next()) diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx index 58af6e9541..01fe86885f 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx @@ -51,11 +51,6 @@ #include #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceCU(); -extern bool TopOpeBRepBuild_GettraceCUV(); -extern bool TopOpeBRepBuild_GettraceSPF(); -extern bool TopOpeBRepBuild_GettraceSPS(); -extern bool TopOpeBRepBuild_GetcontextSF2(); Standard_EXPORT void debmarksplit(const int i) { @@ -1116,13 +1111,6 @@ void TopOpeBRepBuild_Builder::SplitEdge(const TopoDS_Shape& E, const TopAbs_State ToBuild1, const TopAbs_State ToBuild2) { -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GetcontextSF2()) - { - SplitEdge2(E, ToBuild1, ToBuild2); - return; - } -#endif SplitEdge1(E, ToBuild1, ToBuild2); } @@ -1346,13 +1334,6 @@ void TopOpeBRepBuild_Builder::SplitFace(const TopoDS_Shape& Foriented, const TopAbs_State ToBuild1, const TopAbs_State ToBuild2) { -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GetcontextSF2()) - { - SplitFace2(Foriented, ToBuild1, ToBuild2); - return; - } -#endif SplitFace1(Foriented, ToBuild1, ToBuild2); } @@ -1407,23 +1388,6 @@ void TopOpeBRepBuild_Builder::SplitFace1(const TopoDS_Shape& Foriented, // ---------------------------------------------- TopOpeBRepBuild_WireEdgeSet WES(Fforward, this); -#ifdef OCCT_DEBUG - bool tSPF = TopOpeBRepBuild_GettraceSPF(); - int iFace = myDataStructure->Shape(Foriented); - if (tSPF) - { - std::cout << std::endl; - GdumpSHASTA(Foriented, ToBuild1, "=== SplitFace "); - } - if (tSPF) - { - GdumpSAMDOM(LF1, (char*)"1 : "); - GdumpSAMDOM(LF2, (char*)"2 : "); - } - if (tSPF) - debspf(iFace); -#endif - NCollection_List::Iterator itLF1, itLF2; for (itLF1.Initialize(LF1); itLF1.More(); itLF1.Next()) @@ -1528,18 +1492,6 @@ void TopOpeBRepBuild_Builder::SplitFace2(const TopoDS_Shape& Foriented, int n1 = LF1.Extent(); int n2 = LF2.Extent(); -#ifdef OCCT_DEBUG - bool tSPF = TopOpeBRepBuild_GettraceSPF(); - // int iFace = myDataStructure->Shape(Foriented); - if (tSPF) - { - std::cout << std::endl; - GdumpSHASTA(Foriented, ToBuild1, "=== SplitFace "); - GdumpSAMDOM(LF1, (char*)"samedomain 1 : "); - GdumpSAMDOM(LF2, (char*)"samedomain 2 : "); - } -#endif - // SplitFace on a face having other same domained faces on the // other shape : do not reverse orientation of faces in FillFace if (!n2) @@ -1571,16 +1523,6 @@ void TopOpeBRepBuild_Builder::SplitFace2(const TopoDS_Shape& Foriented, FindSameRank(LFSO, rankX, LFSO2); FindSameRank(LFOO, rankX, LFOO2); -#ifdef OCCT_DEBUG - if (tSPF) - { - GdumpSAMDOM(LFSO1, (char*)"LFSO1 : "); - GdumpSAMDOM(LFOO1, (char*)"LFOO1 : "); - GdumpSAMDOM(LFSO2, (char*)"LFSO2 : "); - GdumpSAMDOM(LFOO2, (char*)"LFOO2 : "); - } -#endif - TopAbs_State tob1 = ToBuild1; TopAbs_State tob2 = ToBuild2; TopAbs_State tob1comp = (ToBuild1 == TopAbs_IN) ? TopAbs_OUT : TopAbs_IN; @@ -1792,19 +1734,6 @@ void TopOpeBRepBuild_Builder::SplitSolid(const TopoDS_Shape& S1oriented, // ----------------------------------------- TopOpeBRepBuild_ShellFaceSet SFS; -#ifdef OCCT_DEBUG - bool tSPS = TopOpeBRepBuild_GettraceSPS(); - // int iSolid = myDataStructure->Shape(S1oriented); - if (tSPS) - { - std::cout << std::endl; - GdumpSHASTA(S1oriented, ToBuild1, "___ SplitSolid "); - GdumpSAMDOM(LS1, (char*)"1 : "); - GdumpSAMDOM(LS2, (char*)"2 : "); - } - SFS.DEBNumber(GdumpSHASETindex()); -#endif - STATIC_SOLIDINDEX = 1; NCollection_List::Iterator itLS1; for (itLS1.Initialize(LS1); itLS1.More(); itLS1.Next()) @@ -1836,18 +1765,6 @@ void TopOpeBRepBuild_Builder::SplitSolid(const TopoDS_Shape& S1oriented, TopAbs_Orientation ori = SSurfaces.Orientation(ToBuild1); myBuildTool.Orientation(aFace, ori); -#ifdef OCCT_DEBUG - if (tSPS) - { - TCollection_AsciiString ss("--- SplitSolid "); - ss = ss + SFS.DEBNumber() + " AddElement SFS+ face "; - GdumpSHA(aFace, (void*)ss.ToCString()); - std::cout << " "; - TopAbs::Print(ToBuild1, std::cout) << " : 1 face "; - TopAbs::Print(ori, std::cout); - std::cout << std::endl; - } -#endif SFS.AddElement(aFace); } } @@ -2163,18 +2080,6 @@ void TopOpeBRepBuild_Builder::FillFace(const TopoDS_Shape& F1, TopOpeBRepBuild_WireEdgeSet& WES, const bool RevOri) { -#ifdef OCCT_DEBUG - bool tSPF = TopOpeBRepBuild_GettraceSPF(); - // int iFace = myDataStructure->Shape(F1); - if (tSPF) - { - std::cout << std::endl; - } - if (tSPF) - { - GdumpSHASTA(F1, ToBuild1, "=-= FillFace "); - } -#endif myListOfFace = LF2; FillShape(F1, ToBuild1, LF2, ToBuild2, WES, RevOri); myListOfFace.Clear(); diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx index 8bc597e395..741012ac44 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx @@ -34,9 +34,6 @@ #include #ifdef OCCT_DEBUG -Standard_EXPORT bool TopOpeBRepBuild_GetcontextEINTERNAL(); -Standard_EXPORT bool TopOpeBRepBuild_GetcontextEEXTERNAL(); -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOSG(); Standard_EXPORT void debON(const int iF) { @@ -1239,17 +1236,10 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const occ::handle // #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GetcontextNOFE(); -#endif //================================================================================================= @@ -364,9 +361,6 @@ void TopOpeBRepBuild_Builder::End() } bool makeFE = true; -#ifdef OCCT_DEBUG - makeFE = !TopOpeBRepBuild_GetcontextNOFE(); -#endif if (makeFE) { diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx index 8cd175acb4..b48ac7f911 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx @@ -24,9 +24,6 @@ #include #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GetcontextNOREGUFA(); -extern bool TopOpeBRepBuild_GetcontextREGUXPU(); -extern bool TopOpeBRepBuild_GettraceSAVFREGU(); void debregufa(const int /*iF*/) {} #endif @@ -166,18 +163,6 @@ void TopOpeBRepBuild_Builder::RegularizeFace(const TopoDS_Shape& FF, bool toregu = true; bool usewtof = true; -#ifdef OCCT_DEBUG - int iF; - bool tSPSFF = GtraceSPS(FF, iF); - // bool savfregu = TopOpeBRepBuild_GettraceSAVFREGU(); - if (TopOpeBRepBuild_GetcontextNOREGUFA()) - toregu = false; - if (TopOpeBRepBuild_GetcontextREGUXPU()) - usewtof = false; - if (tSPSFF) - debregufa(iF); -#endif - // If the same edge appears FOR+REV in the resulting face and // whereas it's not a closing edge, set it as INTERNAL instead. // FRA60275(iF=4) + PRO16297 @@ -245,14 +230,6 @@ void TopOpeBRepBuild_Builder::RegularizeFace(const TopoDS_Shape& FF, return; } -#ifdef OCCT_DEBUG - if (tSPSFF) - { - std::cout << "RegularizeFace " << iF << std::endl; - debregufa(iF); - } -#endif - // LOF = nouvelles faces regularisees de newFace NCollection_List::Iterator itlnf(newfaces); for (; itlnf.More(); itlnf.Next()) diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx index 4d2996217e..3378e84d76 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx @@ -49,7 +49,6 @@ #endif #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettracePURGE(); void debifb() {} #endif @@ -351,12 +350,6 @@ void TopOpeBRepBuild_FaceBuilder::CorrectGclosedWire( mapVon1Edge) { // prequesitory : edges described by are not closed,not degenerated -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettracePURGE()) - { - std::cout << std::endl << "* CorrectGclosedWire :" << std::endl << std::endl; - } -#endif int nVV = mapVVref.Extent(); for (int i = 1; i <= nVV; i++) diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx index e5c56a33fe..ecb9a2cac7 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx @@ -50,10 +50,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceFUFA(); -#endif - static void GroupShape( NCollection_List&, bool, @@ -74,11 +70,6 @@ void TopOpeBRepBuild_FuseFace::Init(const NCollection_List& LIF, const NCollection_List& LRF, const int CXM) { -#ifdef OCCT_DEBUG - bool trc = TopOpeBRepBuild_GettraceFUFA(); - if (trc) - std::cout << "TopOpeBRepBuild_FuseFace::Init" << std::endl; -#endif myLIF = LIF; myLRF = LRF; if (CXM == 1) @@ -89,19 +80,6 @@ void TopOpeBRepBuild_FuseFace::Init(const NCollection_List& LIF, { myInternal = true; } // CXM -#ifdef OCCT_DEBUG - if (trc) - { - if (myInternal) - { - std::cout << " TopOpeBRepBuild_FuseFace::Init : Keep internal connections" << std::endl; - } - else - { - std::cout << " TopOpeBRepBuild_FuseFace::Init : Suppress internal connections" << std::endl; - } - } -#endif myLFF.Clear(); @@ -125,21 +103,11 @@ void TopOpeBRepBuild_FuseFace::Init(const NCollection_List& LIF, void TopOpeBRepBuild_FuseFace::PerformFace() { -#ifdef OCCT_DEBUG - bool trc = TopOpeBRepBuild_GettraceFUFA(); - if (trc) - std::cout << "TopOpeBRepBuild_FuseFace::PerformFace()" << std::endl; -#endif myModified = false; myLFF.Clear(); if (myLRF.IsEmpty()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Empty list of reconstructed faces" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -149,11 +117,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() int number = myLRF.Extent(); if (number == 1) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : only 1 reconstructed face" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -184,12 +147,7 @@ void TopOpeBRepBuild_FuseFace::PerformFace() BRepCheck_Analyzer ana(fac); if (!ana.IsValid(fac)) { -// if (!BRepCheck_Analyzer::IsValid(fac)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Invalid reconstructed face" - << std::endl; -#endif + // if (!BRepCheck_Analyzer::IsValid(fac)) { myModified = false; myDone = true; myLFF = myLRF; @@ -202,10 +160,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() // Orientation 3d de l'espace limite par la face if (Ori3dForward && Ori3dReversed) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Bad faces 3d orientation" << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -220,10 +174,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() GroupShape(mylist, Keep_Edge, mapFacLFac); if (mapFacLFac.IsEmpty()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Empty list of faces" << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -233,10 +183,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() int n2 = mapFacLFac.Extent(); if (n1 == n2) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : No connection" << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -273,10 +219,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() GroupShape(LWir, Keep_Edge, mapWirLWir); if (mapWirLWir.IsEmpty()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Empty list of wires" << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -313,11 +255,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() GroupShape(LEdg, Keep_Edge, mapEdgLEdg); if (mapEdgLEdg.IsEmpty()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Empty list of edges" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -343,11 +280,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() { if (OriReversed) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Bad faces orientation" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -359,11 +291,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() { if (OriForward) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Bad faces orientation" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -435,11 +362,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() MW.Add(myWireLE); if (!MW.IsDone()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Failure in making wire" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -536,11 +458,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() if (!MF.IsDone()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Failure in making face" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -561,11 +478,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() if (myLFF.IsEmpty()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace : Empty list of fusionned faces" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -574,11 +486,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() myModified = true; myDone = true; - -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformFace() : Done" << std::endl; -#endif } //======================================================================= @@ -589,11 +496,6 @@ void TopOpeBRepBuild_FuseFace::PerformFace() void TopOpeBRepBuild_FuseFace::PerformEdge() { -#ifdef OCCT_DEBUG - bool trc = TopOpeBRepBuild_GettraceFUFA(); - if (trc) - std::cout << "TopOpeBRepBuild_FuseFace::PerformEdge()" << std::endl; -#endif NCollection_DataMap, TopTools_ShapeMapHasher> mapVerLEdg, mapTampon; @@ -673,11 +575,6 @@ void TopOpeBRepBuild_FuseFace::PerformEdge() myModified = true; myDone = true; - -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::PerformEdge() : Done" << std::endl; -#endif } //======================================================================= @@ -687,11 +584,6 @@ void TopOpeBRepBuild_FuseFace::PerformEdge() void TopOpeBRepBuild_FuseFace::ClearEdge() { -#ifdef OCCT_DEBUG - bool trc = TopOpeBRepBuild_GettraceFUFA(); - if (trc) - std::cout << "TopOpeBRepBuild_FuseFace::ClearEdge()" << std::endl; -#endif NCollection_List::Iterator it1, it2; TopAbs_Orientation ori; @@ -740,11 +632,6 @@ void TopOpeBRepBuild_FuseFace::ClearEdge() MW.Add(myWireLE); if (!MW.IsDone()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::ClearEdge : Failure in making wire" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -763,10 +650,6 @@ void TopOpeBRepBuild_FuseFace::ClearEdge() // Reconstrution de 1 face de LRF if (myFaceLW.IsEmpty()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::ClearEdge : Empty list of wires" << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -785,10 +668,6 @@ void TopOpeBRepBuild_FuseFace::ClearEdge() } if (!MF.IsDone()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::ClearEdge : Failure in making face" << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -800,11 +679,6 @@ void TopOpeBRepBuild_FuseFace::ClearEdge() // Fin Niveau 1 if (myLFFnew.IsEmpty()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::ClearEdge : Empty list of fusionned faces" - << std::endl; -#endif myModified = false; myDone = true; myLFF = myLRF; @@ -814,11 +688,6 @@ void TopOpeBRepBuild_FuseFace::ClearEdge() myModified = true; myDone = true; - -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::ClearEdge() : Done" << std::endl; -#endif } //======================================================================= @@ -826,19 +695,7 @@ void TopOpeBRepBuild_FuseFace::ClearEdge() // purpose : Nettoyage des Faces : Suppression des vertex internes et externes //======================================================================= -void TopOpeBRepBuild_FuseFace::ClearVertex() -{ -#ifdef OCCT_DEBUG - bool trc = TopOpeBRepBuild_GettraceFUFA(); - if (trc) - std::cout << "TopOpeBRepBuild_FuseFace::ClearVertex()" << std::endl; -#endif - -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::ClearVertex() : Done" << std::endl; -#endif -} +void TopOpeBRepBuild_FuseFace::ClearVertex() {} //================================================================================================= @@ -1079,9 +936,6 @@ static void MakeEdge( NCollection_DataMap, TopTools_ShapeMapHasher>& mymapEdgLEdg) { -#ifdef OCCT_DEBUG - bool trc = TopOpeBRepBuild_GettraceFUFA(); -#endif NCollection_List::Iterator it; NCollection_DataMap, TopTools_ShapeMapHasher>:: @@ -1138,11 +992,6 @@ static void MakeEdge( int number = myEdgeLV.Extent(); if (!(number == 2)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace::MakeEdge : Failure in reconstructing new edge" - << std::endl; -#endif return; } it.Initialize(myEdgeLV); @@ -1180,9 +1029,6 @@ static void MakeEdge( bool SameSupport(const TopoDS_Edge& E1, const TopoDS_Edge& E2) { -#ifdef OCCT_DEBUG - bool trc = TopOpeBRepBuild_GettraceFUFA(); -#endif if (E1.IsNull() || E2.IsNull()) { @@ -1231,10 +1077,6 @@ bool SameSupport(const TopoDS_Edge& E1, const TopoDS_Edge& E2) && typC1 != STANDARD_TYPE(Geom_Ellipse) && typC1 != STANDARD_TYPE(Geom_BSplineCurve) && typC1 != STANDARD_TYPE(Geom_BezierCurve)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " TopOpeBRepBuild_FuseFace : Type de Support non traite" << std::endl; -#endif return false; } diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx index b60d6f7fd9..4107290499 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx @@ -21,10 +21,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GetcontextSPEON(); -#endif - //================================================================================================= bool TopOpeBRepBuild_Builder::GToSplit(const TopoDS_Shape& S, const TopAbs_State TB) const @@ -51,42 +47,6 @@ bool TopOpeBRepBuild_Builder::GToSplit(const TopoDS_Shape& S, const TopAbs_State } #endif -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GetcontextSPEON()) - { // CONTEXT - tSPS = true; // CONTEXT - bool hasON = false; // CONTEXT - bool isE = (S.ShapeType() == TopAbs_EDGE); // CONTEXT - if (isE) - { // CONTEXT - const TopoDS_Edge& E = TopoDS::Edge(S); // CONTEXT - bool issE = myDataStructure->DS().IsSectionEdge(E); // CONTEXT - if (issE) - { // CONTEXT - bool issplitON = IsSplit(E, TopAbs_ON); // CONTEXT - if (issplitON) - { // CONTEXT - int n = Splits(E, TopAbs_ON).Extent(); // CONTEXT - hasON = (n > 0); // CONTEXT - } // CONTEXT - } // CONTEXT - } // CONTEXT - bool tosplitH = tosplit || hasON; // CONTEXT - if (tSPS) - { - std::cout << "GToSplit context SPEON"; - } // CONTEXT - if (tSPS) - { - std::cout << " " << tosplitH << " : tosplit " << tosplit; - } // CONTEXT - if (tSPS) - { - std::cout << " || hasON " << hasON << std::endl; - } // CONTEXT - } // CONTEXT -#endif - return tosplit; } // GToSplit diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx index 713bc26836..a312517ba4 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx @@ -44,10 +44,6 @@ #include #include -#ifdef OCCT_DEBUG -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOSG(); -#endif - #define M_FORWARD(st) (st == TopAbs_FORWARD) #define M_REVERSED(st) (st == TopAbs_REVERSED) #define M_INTERNAL(st) (st == TopAbs_INTERNAL) @@ -857,17 +853,10 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& { ori = TopAbs::Complement(ori); } -#ifdef OCCT_DEBUG - if (!TopOpeBRepBuild_GetcontextNOSG()) + if (!samegeom) { -#endif - if (!samegeom) - { - ori = TopAbs::Complement(ori); - } -#ifdef OCCT_DEBUG + ori = TopAbs::Complement(ori); } -#endif bool lesmemes = E.IsEqual(myEdgeReference); if (!lesmemes) diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx index a61c205b2e..8608a152e0 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx @@ -43,10 +43,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceKPB(); -#endif - static void FUN_Raise() { #ifdef OCCT_DEBUG @@ -112,14 +108,6 @@ int TopOpeBRepBuild_Builder::FindIsKPart() { KPClearMaps(); -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - { - std::cout << std::endl << "--- IsKPart ? ---" << std::endl; - } -#endif - int isfafa = KPisfafa(); // face,face SameDomain if (isfafa) @@ -577,12 +565,6 @@ Standard_EXPORT void debiskoletge() {} void TopOpeBRepBuild_Builder::MergeKPartiskoletge() { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - KPreturn(myIsKPart); - debiskoletge(); -#endif const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS(); // int ibid; @@ -628,15 +610,6 @@ void TopOpeBRepBuild_Builder::MergeKPartiskoletge() #endif myDataStructure->Shape(fac2); // DEB -#ifdef OCCT_DEBUG - if (TKPB) - { - std::cout << "" << std::endl; - std::cout << "face " << iF1 << " : "; - std::cout << iF2 << std::endl; - } -#endif - TopOpeBRepDS_Config config2 = BDS.SameDomainOri(fac2); bool SameOriented = (config2 == TopOpeBRepDS_SAMEORIENTED); @@ -839,11 +812,6 @@ void TopOpeBRepBuild_Builder::MergeKPartiskoletge() void TopOpeBRepBuild_Builder::MergeKPartisdisj() { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - KPreturn(myIsKPart); -#endif if (myIsKPart != 2) { @@ -1033,11 +1001,6 @@ void TopOpeBRepBuild_Builder::MergeKPartisdisj() void TopOpeBRepBuild_Builder::MergeKPartisfafa() { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - KPreturn(myIsKPart); -#endif if (myIsKPart == 3) { // isfafa @@ -1104,11 +1067,6 @@ void TopOpeBRepBuild_Builder::MergeKPartisfafa() void TopOpeBRepBuild_Builder::MergeKPartissoso() { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - KPreturn(myIsKPart); -#endif if (myIsKPart == 4) { // issoso @@ -1252,10 +1210,6 @@ static bool allIonsectionedges( int TopOpeBRepBuild_Builder::KPiskoletge() { - /*#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - #endif*/ - NCollection_List lShsd1, lShsd2; // liste de solides HasSameDomain NCollection_List lfhsd1, lfhsd2; // liste de faces HasSameDomain @@ -1388,9 +1342,6 @@ int TopOpeBRepBuild_Builder::KPiskoletge() int TopOpeBRepBuild_Builder::KPisdisj() { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); -#endif // myShape1 et myShape2 : aucune interference const TopOpeBRepDS_DataStructure& DS = myDataStructure->DS(); @@ -1409,13 +1360,6 @@ int TopOpeBRepBuild_Builder::KPisdisj() int isdisj1 = KPisdisjsh(myShape1); int isdisj2 = KPisdisjsh(myShape2); -#ifdef OCCT_DEBUG - if (TKPB) - { - std::cout << "isdisj : " << isdisj1 << " " << isdisj2 << std::endl; - } -#endif - int isdisj = (isdisj1 && isdisj2) ? 1 : 0; return isdisj; } @@ -1427,10 +1371,6 @@ int TopOpeBRepBuild_Builder::KPisdisj() int TopOpeBRepBuild_Builder::KPisfafa() { - /*#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - #endif*/ - return KPisfafash(myShape1) != 0 && KPisfafash(myShape2) != 0 ? 1 : 0; } @@ -1441,10 +1381,6 @@ int TopOpeBRepBuild_Builder::KPisfafa() int TopOpeBRepBuild_Builder::KPissoso() { - /*#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - #endif*/ - return KPissososh(myShape1) != 0 && KPissososh(myShape2) != 0 ? 1 : 0; } @@ -1553,17 +1489,6 @@ TopAbs_State TopOpeBRepBuild_Builder::KPclasSS(const TopoDS_Shape& TopAbs_State state = TopAbs_UNKNOWN; state = myShapeClassifier.StateShapeShape(S1, exLS1, S2); -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceKPB()) - { - const gp_Pnt& P1 = myShapeClassifier.P3D(); - std::cout << "point P1 " << P1.X() << " " << P1.Y() << " " << P1.Z(); - std::cout << " "; - TopAbs::Print(state, std::cout); - std::cout << std::endl; - } -#endif - return state; } @@ -1582,17 +1507,6 @@ TopAbs_State TopOpeBRepBuild_Builder::KPclasSS(const TopoDS_Shape& S1, { TopAbs_State state = myShapeClassifier.StateShapeShape(S1, exS1, S2); -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceKPB()) - { - const gp_Pnt& P1 = myShapeClassifier.P3D(); - std::cout << "point P1 " << P1.X() << " " << P1.Y() << " " << P1.Z(); - std::cout << " "; - TopAbs::Print(state, std::cout); - std::cout << std::endl; - } -#endif - return state; } @@ -1621,9 +1535,6 @@ bool TopOpeBRepBuild_Builder::KPiskoletgesh(const TopoDS_Shape& Sarg NCollection_List& lShsd, NCollection_List& lfhsd) const { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); -#endif const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS(); bool iskolesh = FUNKP_KPiskolesh((*this), BDS, Sarg, lShsd, lfhsd); if (!iskolesh) @@ -1674,35 +1585,6 @@ bool TopOpeBRepBuild_Builder::KPiskoletgesh(const TopoDS_Shape& Sarg // ne++; } // if (ne > 1) return false; - -#ifdef OCCT_DEBUG - int isol = myDataStructure->Shape(Sarg); - int ifac = myDataStructure->Shape(fac); - if (TKPB) - { - std::cout << "isol " << isol << std::endl; - } - if (TKPB) - { - std::cout << "nfhsd " << nfhsd << std::endl; - } - if (TKPB) - { - std::cout << "ifac " << ifac << std::endl; - } - if (TKPB) - { - std::cout << "isplan " << isplan << std::endl; - } - if (TKPB) - { - std::cout << "iscylinder " << iscylinder << std::endl; - } - if (TKPB) - { - std::cout << std::endl; - } -#endif } return true; @@ -2089,12 +1971,6 @@ void TopOpeBRepBuild_Builder::KPiskoletgeanalyse(const TopOpeBRepDS_Config confi ires = RESSHAPE2; } } // SameOriented - -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - std::cout << "ires = " << ires << std::endl; -#endif } //================================================================================================= @@ -2186,12 +2062,6 @@ void TopOpeBRepBuild_Builder::KPisdisjanalyse(const TopAbs_State Stsol1, icla2 = SHECLASAUTR; //-- } } - -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - std::cout << "ires = " << ires << " icla1 " << icla1 << " icla2 " << icla2 << std::endl; -#endif } //======================================================================= @@ -2283,18 +2153,6 @@ void TopOpeBRepBuild_Builder::KPclassFF(const TopoDS_Shape& F1, { St1 = KPclassF(F1, F2); St2 = KPclassF(F2, F1); - -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceKPB()) - { - std::cout << "Stf1 "; - TopAbs::Print(St1, std::cout); - std::cout << " "; - std::cout << "Stf2 "; - TopAbs::Print(St2, std::cout); - std::cout << std::endl; - } -#endif } //======================================================================= @@ -2366,19 +2224,6 @@ bool TopOpeBRepBuild_Builder::KPContains(const TopoDS_Shape& S int TopOpeBRepBuild_Builder::KPreturn(const int b) { -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceKPB()) - { - std::cout << "--- IsKPart " << b; - if (b == 1) - std::cout << " iskole"; - if (b == 2) - std::cout << " isdisj"; - if (b == 3) - std::cout << " isfafa"; - std::cout << " ---" << std::endl; - } -#endif return b; } diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx index ff053e4e11..0ff4e2d8c1 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx @@ -42,9 +42,6 @@ #include // #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceSPS(); -#endif //------------ // static int ifvNbFace = 0; // static char *name = " "; diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx index 89ab2e49fd..79ffa63627 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx @@ -26,9 +26,6 @@ #include #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GetcontextNOREGUSO(); -extern bool TopOpeBRepBuild_GetcontextREGUXPU(); -extern bool TopOpeBRepBuild_GettraceSAVSREGU(); Standard_EXPORT void debreguso(const int iS) { @@ -135,18 +132,6 @@ void TopOpeBRepBuild_Builder::RegularizeSolid(const TopoDS_Shape& SS bool toregu = true; bool usestos = true; -#ifdef OCCT_DEBUG - int iS; - bool tSPS = GtraceSPS(SS, iS); - // bool savsregu = TopOpeBRepBuild_GettraceSAVSREGU(); - if (TopOpeBRepBuild_GetcontextNOREGUSO()) - toregu = false; - if (TopOpeBRepBuild_GetcontextREGUXPU()) - usestos = false; - if (tSPS) - debreguso(iS); -#endif - if (!toregu) { LOSO.Append(newSolid); @@ -219,14 +204,6 @@ void TopOpeBRepBuild_Builder::RegularizeSolid(const TopoDS_Shape& SS return; } -#ifdef OCCT_DEBUG - if (tSPS) - { - std::cout << "RegularizeSolid " << iS << std::endl; - debreguso(iS); - } -#endif - // LOSO = nouvelles Solids regularisees de newSolid NCollection_List::Iterator itlnf(newSolids); for (; itlnf.More(); itlnf.Next()) diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx index 3c388a6ca7..31283b1ee7 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx @@ -45,7 +45,6 @@ #define MGhc2 occ::handle #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceSPS(); Standard_EXPORT void debsplitse(const int) {} diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx index c60409ab97..75c34b9000 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx @@ -22,9 +22,6 @@ #include #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceCHK(); -extern bool TopOpeBRepBuild_GettraceCHKOK(); -extern bool TopOpeBRepBuild_GettraceCHKNOK(); Standard_EXPORT void debaddss() {} @@ -338,14 +335,6 @@ int TopOpeBRepBuild_ShapeSet::MaxNumberSubShape(const TopoDS_Shape& Shape) void TopOpeBRepBuild_ShapeSet::CheckShape(const bool checkshape) { myCheckShape = checkshape; - -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceCHK() && !myCheckShape) - { - DumpName(std::cout, "no checkshape set on "); - std::cout << std::endl; - } -#endif } //================================================================================================= @@ -396,32 +385,6 @@ void TopOpeBRepBuild_ShapeSet::DumpCheck(Standard_OStream&, { return; } - -#ifdef OCCT_DEBUG - TopAbs_ShapeEnum t = S.ShapeType(); - if (!chk) - { - if (TopOpeBRepBuild_GettraceCHK() || TopOpeBRepBuild_GettraceCHKNOK()) - { - DumpName(OS, "*********************** "); - OS << str << " "; - TopAbs::Print(t, OS); - OS << " : incorrect" << std::endl; - } - } - else - { - if (TopOpeBRepBuild_GettraceCHK() || TopOpeBRepBuild_GettraceCHKOK()) - { - DumpName(OS, ""); - OS << str << " "; - TopAbs::Print(t, OS); - OS << " : correct" << std::endl; - } - } - if (!chk) - debaddss(); -#endif } //================================================================================================= diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx index 60f40250e3..b8a6e72364 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx @@ -24,10 +24,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceCHK(); -#endif - //================================================================================================= TopOpeBRepBuild_ShellFaceClassifier::TopOpeBRepBuild_ShellFaceClassifier( @@ -49,11 +45,6 @@ void TopOpeBRepBuild_ShellFaceClassifier::Clear() TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareShapes(const TopoDS_Shape& B1, const TopoDS_Shape& B2) { -#ifdef OCCT_DEBUG -// const TopAbs_ShapeEnum t1 = B1.ShapeType(); -// const TopAbs_ShapeEnum t2 = B2.ShapeType(); -#endif - ResetShape(B1); myShell = TopoDS::Shell(B2); mySolidClassifier.LoadShell(myShell); @@ -67,11 +58,6 @@ TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareShapes(const TopoDS_Sha TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareElementToShape(const TopoDS_Shape& F, const TopoDS_Shape& SHE) { -#ifdef OCCT_DEBUG -// const TopAbs_ShapeEnum t1 = F.ShapeType(); -// const TopAbs_ShapeEnum t2 = SHE.ShapeType(); -#endif - ResetElement(F); myShell = TopoDS::Shell(SHE); mySolidClassifier.LoadShell(myShell); @@ -84,10 +70,6 @@ TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::CompareElementToShape(const To void TopOpeBRepBuild_ShellFaceClassifier::ResetShape(const TopoDS_Shape& SHE) { -#ifdef OCCT_DEBUG -// const TopAbs_ShapeEnum t1 = SHE.ShapeType(); -#endif - TopExp_Explorer ex(SHE, TopAbs_FACE); const TopoDS_Face& F = TopoDS::Face(ex.Current()); ResetElement(F); @@ -127,9 +109,6 @@ void TopOpeBRepBuild_ShellFaceClassifier::ResetElement(const TopoDS_Shape& F) bool TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoDS_Shape& F) { -#ifdef OCCT_DEBUG -// const TopAbs_ShapeEnum t = F.ShapeType(); -#endif bool bRet = true; // if (myFirstCompare) @@ -167,38 +146,12 @@ bool TopOpeBRepBuild_ShellFaceClassifier::CompareElement(const TopoDS_Shape& F) return bRet; } -#ifdef OCCT_DEBUG - #include - #include - #include -static int STATIC_ishell = 0; -#endif - //================================================================================================= TopAbs_State TopOpeBRepBuild_ShellFaceClassifier::State() { TopAbs_State state; double tol3d = Precision::Confusion(); - -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GettraceCHK()) - { - STATIC_ishell++; - TCollection_AsciiString home("/home/wb/mdl/gti/prod/TTOPOPE/src/test/data/"); - TCollection_AsciiString sname("shell_"); - sname = home + sname + STATIC_ishell; - TCollection_AsciiString vname("vertex_"); - vname = home + vname + STATIC_ishell; - BRep_Builder B; - TopoDS_Vertex V; - B.MakeVertex(V, myPoint3d, tol3d); - std::cout << "TopOpeBRepBuild_ShellFaceClassifier : write shell " << sname; - std::cout << " vertex " << vname << std::endl; - BRepTools::Write(myShell, sname.ToCString()); - BRepTools::Write(V, vname.ToCString()); - } -#endif mySolidClassifier.Classify(myShell, myPoint3d, tol3d); state = mySolidClassifier.State(); return state; diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx index 70cfbb513b..7490b54297 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx @@ -19,10 +19,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceCHK(); -#endif - //================================================================================================= TopOpeBRepBuild_ShellFaceSet::TopOpeBRepBuild_ShellFaceSet() @@ -46,32 +42,6 @@ TopOpeBRepBuild_ShellFaceSet::TopOpeBRepBuild_ShellFaceSet TopOpeBRepBuild_ShapeSet(TopAbs_EDGE) { mySolid = TopoDS::Solid(S); - -#ifdef OCCT_DEBUG - myDEBName = "SFS"; - if (A != NULL) - { - TopOpeBRepBuild_Builder* pB = ((TopOpeBRepBuild_Builder*)((void*)A)); - myDEBNumber = pB->GdumpSHASETindex(); - int iS; - bool tSPS = pB->GtraceSPS(S, iS); - if (tSPS) - { - std::cout << "creation SFS " << myDEBNumber << " on "; - } - if (tSPS) - { - pB->GdumpSHA(S, NULL); - std::cout << std::endl; - } - } - - if (TopOpeBRepBuild_GettraceCHK() && !myCheckShape) - { - DumpName(std::cout, "no checkshape in creation of "); - std::cout << std::endl; - } -#endif } //================================================================================================= diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx index 17773c57b5..feb4c6fe78 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx @@ -37,13 +37,7 @@ #include #ifdef OCCT_DEBUG -extern bool TopOpeBRep_GettraceSHA(const int i); -extern bool TopOpeBRepBuild_GettraceSS(); -extern bool TopOpeBRepBuild_GetcontextSSCONNEX(); -extern bool TopOpeBRepBuild_GettraceCHK(); TopOpeBRepBuild_Builder* LOCAL_PBUILDER_DEB = NULL; - -void debwesclo(const int) {} #endif //================================================================================================= @@ -87,9 +81,6 @@ void TopOpeBRepBuild_WireEdgeSet::AddShape(const TopoDS_Shape& S) void TopOpeBRepBuild_WireEdgeSet::AddStartElement(const TopoDS_Shape& S) { -#ifdef OCCT_DEBUG - -#endif bool tocheck = true; bool isedge = (S.ShapeType() == TopAbs_EDGE); if (isedge) @@ -442,13 +433,6 @@ void TopOpeBRepBuild_WireEdgeSet::LocalD1(const TopoDS_Shape& SF, bool TopOpeBRepBuild_WireEdgeSet::IsClosed(const TopoDS_Shape& E) const { -#ifdef OCCT_DEBUG - int ista = myOMSS.FindIndex(E); - bool tsh = (ista) ? TopOpeBRep_GettraceSHA(ista) : false; - if (tsh) - debwesclo(ista); -#endif - const TopoDS_Edge& EE = TopoDS::Edge(E); bool closed = BRep_Tool::IsClosed(EE, myFace); return closed; diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx index b2ad230de7..7392eb7406 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx @@ -38,7 +38,6 @@ #define DEBSHASET(sarg, meth, shaset, str) \ TCollection_AsciiString sarg((meth)); \ (sarg) = (sarg) + (shaset).DEBNumber() + (str); -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOFUFA(); Standard_EXPORT void debffsfs(const int i) { @@ -353,9 +352,6 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& #endif bool performfufa = true; -#ifdef OCCT_DEBUG - performfufa = !TopOpeBRepBuild_GetcontextNOFUFA(); -#endif if (performfufa) { GLOBAL_lfrtoprocess = true; diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_kpkole.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_kpkole.cxx index 17cd3ac854..bc2ef080e2 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_kpkole.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_kpkole.cxx @@ -32,7 +32,6 @@ #include #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceKPB(); void debiskole() {} #endif @@ -55,12 +54,6 @@ Standard_EXPORT void FUNKP_KPmakefaces(const TopOpeBRepBuild_Builder& BU, void TopOpeBRepBuild_Builder::MergeKPartiskole() { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - KPreturn(myIsKPart); - debiskole(); -#endif int ibid; @@ -96,29 +89,6 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole() return; } -#ifdef OCCT_DEBUG - if (TKPB) - { - std::cout << "" << std::endl; - for (; itm1.More(); itm1.Next()) - { - const TopoDS_Shape& f = itm1.Key(); - int fi = myDataStructure->Shape(f); - std::cout << "face " << fi << " : "; - const NCollection_List& l = itm1.Value(); - NCollection_List::Iterator it(l); - for (; it.More(); it.Next()) - { - const TopoDS_Shape& ff = it.Value(); - int ffi = myDataStructure->Shape(ff); - std::cout << ffi << " "; - } - std::cout << std::endl; - } - itm1.Initialize(myKPMAPf1f2); - } -#endif - NCollection_List LFIN; NCollection_List* plfIN = nullptr; const TopoDS_Shape* pfOU = nullptr; @@ -164,20 +134,6 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole() return; } -#ifdef OCCT_DEBUG - int ifOU; - bool tSPS = GtraceSPS(*pfOU, ifOU); - if (tSPS || TKPB) - { - // int iOU = myDataStructure->Shape(*pfOU); - // int iIN = myDataStructure->Shape(*pfIN); - GdumpSHA(*pfOU, (char*)"MergeKPartiskole pfOU "); - std::cout << std::endl; - GdumpSAMDOM(LFIN, (char*)"LFIN : "); - debiskole(); - } -#endif - int rankpfOU = GShapeRank(*pfOU); int rankpfIN = GShapeRank(*pfIN); if (rankpfOU != 1 && rankpfOU != 2) @@ -266,22 +222,6 @@ void TopOpeBRepBuild_Builder::MergeKPartiskole() ChangeMerged(she1, myState1); ChangeMerged(she2, myState2); -#ifdef OCCT_DEBUG - if (TKPB) - { - std::cout << "stsol1 "; - TopAbs::Print(stsol1, std::cout); - std::cout << " "; - } - if (TKPB) - { - std::cout << "stsol2 "; - TopAbs::Print(stsol2, std::cout); - std::cout << std::endl; - } - debiskole(); -#endif - TopoDS_Shell newshe; if (ires == RESNULL) @@ -834,11 +774,6 @@ void TopOpeBRepBuild_Builder::KPiskoleanalyse(const TopAbs_State Stfac1, } } -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); - if (TKPB) - std::cout << "ires = " << ires << " icla1 " << icla1 << " icla2 " << icla2 << std::endl; -#endif } // TopOpeBRepBuild_Builder::KPiskoleanalyse Standard_EXPORT void FUNKP_KPmakefaces(const TopOpeBRepBuild_Builder& BU, @@ -1086,9 +1021,6 @@ bool TopOpeBRepBuild_Builder::KPiskolesh(const TopoDS_Shape& Sarg, NCollection_List& lShsd, NCollection_List& lfhsd) const { -#ifdef OCCT_DEBUG - bool TKPB = TopOpeBRepBuild_GettraceKPB(); -#endif const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS(); bool iskolesh = FUNKP_KPiskolesh(*this, BDS, Sarg, lShsd, lfhsd); if (!iskolesh) @@ -1122,35 +1054,6 @@ bool TopOpeBRepBuild_Builder::KPiskolesh(const TopoDS_Shape& Sarg, { return false; } - -#ifdef OCCT_DEBUG - int isol = myDataStructure->Shape(Sarg); - int ifac = myDataStructure->Shape(fac); - if (TKPB) - { - std::cout << "isol " << isol << std::endl; - } - if (TKPB) - { - std::cout << "nfhsd " << nfhsd << std::endl; - } - if (TKPB) - { - std::cout << "ifac " << ifac << std::endl; - } - if (TKPB) - { - std::cout << "isplan " << isplan << std::endl; - } - if (TKPB) - { - std::cout << "nehg " << nehg << std::endl; - } - if (TKPB) - { - std::cout << std::endl; - } -#endif } return true; diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_makefaces.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_makefaces.cxx index 4da5aa8d5e..d6217bdb92 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_makefaces.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_makefaces.cxx @@ -38,9 +38,6 @@ #include #ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GetcontextNOPURGE(); -extern bool TopOpeBRepBuild_GetcontextNOCORRISO(); -extern bool TopOpeBRepBuild_GettraceCHK(); #define DEBSHASET(sarg, meth, shaset, str) \ TCollection_AsciiString sarg((meth)); \ (sarg) = (sarg) + (shaset).DEBNumber() + (str); @@ -112,10 +109,6 @@ void TopOpeBRepBuild_Builder::GWESMakeFaces(const TopoDS_Shape& FF, // This can occur when the face has a closing edge. To avoid this, // we delete the lonesome closing edge from the wire. bool topurge = true; -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GetcontextNOPURGE()) - topurge = false; -#endif if (topurge) { @@ -211,12 +204,6 @@ void TopOpeBRepBuild_Builder::GWESMakeFaces(const TopoDS_Shape& FF, // translates edge's pcurve to have it in F's UVbounds // translates edge's pcurve to have it connexed to others in UV space bool corronISO = true; -#ifdef OCCT_DEBUG - if (TopOpeBRepBuild_GetcontextNOCORRISO()) - corronISO = false; - if (tSPS) - debcorriso(iF); -#endif bool ffcloseds = FUN_tool_closedS(FF); corronISO = corronISO && ffcloseds; if (corronISO) diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_trace.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_trace.cxx deleted file mode 100644 index 4dea4f7290..0000000000 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_trace.cxx +++ /dev/null @@ -1,394 +0,0 @@ -// Created on: 1996-01-29 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifdef OCCT_DEBUG - - #include - -static bool TopOpeBRepBuild_traceCU = false; // dump curves - -Standard_EXPORT void TopOpeBRepBuild_SettraceCU(const bool b) -{ - TopOpeBRepBuild_traceCU = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceCU() -{ - return TopOpeBRepBuild_traceCU; -} - -static bool TopOpeBRepBuild_traceCUV = false; // dump curves verbose or not - -Standard_EXPORT void TopOpeBRepBuild_SettraceCUV(const bool b) -{ - TopOpeBRepBuild_traceCUV = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceCUV() -{ - return TopOpeBRepBuild_traceCUV; -} - -static bool TopOpeBRepBuild_traceSPF = false; // SplitFace - -Standard_EXPORT void TopOpeBRepBuild_SettraceSPF(const bool b) -{ - TopOpeBRepBuild_traceSPF = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceSPF() -{ - return TopOpeBRepBuild_traceSPF; -} - -static bool TopOpeBRepBuild_traceSPS = false; // SplitSolid - -Standard_EXPORT void TopOpeBRepBuild_SettraceSPS(const bool b) -{ - TopOpeBRepBuild_traceSPS = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceSPS() -{ - return TopOpeBRepBuild_traceSPS; -} - -static bool TopOpeBRepBuild_traceSHEX = false; // Check edge - -Standard_EXPORT void TopOpeBRepBuild_SettraceSHEX(const bool b) -{ - TopOpeBRepBuild_traceSHEX = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceSHEX() -{ - return TopOpeBRepBuild_traceSHEX; -} - -static bool TopOpeBRepBuild_contextSF2 = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextSF2(const bool b) -{ - TopOpeBRepBuild_contextSF2 = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextSF2() -{ - return TopOpeBRepBuild_contextSF2; -} - -static bool TopOpeBRepBuild_contextSPEON = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextSPEON(const bool b) -{ - TopOpeBRepBuild_contextSPEON = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextSPEON() -{ - return TopOpeBRepBuild_contextSPEON; -} - -static bool TopOpeBRepBuild_traceSS = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceSS(const bool b) -{ - TopOpeBRepBuild_traceSS = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceSS() -{ - return TopOpeBRepBuild_traceSS; -} - -static bool TopOpeBRepBuild_contextSSCONNEX = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextSSCONNEX(const bool b) -{ - TopOpeBRepBuild_contextSSCONNEX = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextSSCONNEX() -{ - return TopOpeBRepBuild_contextSSCONNEX; -} - -static bool TopOpeBRepBuild_traceAREA = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceAREA(const bool b) -{ - TopOpeBRepBuild_traceAREA = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceAREA() -{ - return TopOpeBRepBuild_traceAREA; -} - -static bool TopOpeBRepBuild_traceKPB = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceKPB(const bool b) -{ - TopOpeBRepBuild_traceKPB = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceKPB() -{ - return TopOpeBRepBuild_traceKPB; -} - -static bool TopOpeBRepBuild_traceCHK = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceCHK(const bool b) -{ - TopOpeBRepBuild_traceCHK = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceCHK() -{ - return TopOpeBRepBuild_traceCHK; -} - -static bool TopOpeBRepBuild_traceCHKOK = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceCHKOK(const bool b) -{ - TopOpeBRepBuild_traceCHKOK = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceCHKOK() -{ - return TopOpeBRepBuild_traceCHKOK; -} - -static bool TopOpeBRepBuild_traceCHKNOK = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceCHKNOK(const bool b) -{ - TopOpeBRepBuild_traceCHKNOK = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceCHKNOK() -{ - return TopOpeBRepBuild_traceCHKNOK; -} - -static bool TopOpeBRepBuild_tracePURGE = false; - -Standard_EXPORT void TopOpeBRepBuild_SettracePURGE(const bool b) -{ - TopOpeBRepBuild_tracePURGE = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettracePURGE() -{ - return TopOpeBRepBuild_tracePURGE; -} - -static bool TopOpeBRepBuild_traceSAVFREGU = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceSAVFREGU(const bool b) -{ - TopOpeBRepBuild_traceSAVFREGU = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceSAVFREGU() -{ - return TopOpeBRepBuild_traceSAVFREGU; -} - -static bool TopOpeBRepBuild_traceSAVSREGU = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceSAVSREGU(const bool b) -{ - TopOpeBRepBuild_traceSAVSREGU = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceSAVSREGU() -{ - return TopOpeBRepBuild_traceSAVSREGU; -} - -static bool TopOpeBRepBuild_traceFUFA = false; - -Standard_EXPORT void TopOpeBRepBuild_SettraceFUFA(const bool b) -{ - TopOpeBRepBuild_traceFUFA = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceFUFA() -{ - return TopOpeBRepBuild_traceFUFA; -} - -static bool TopOpeBRepBuild_contextNOPURGE = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextNOPURGE(const bool b) -{ - TopOpeBRepBuild_contextNOPURGE = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOPURGE() -{ - bool b = TopOpeBRepBuild_contextNOPURGE; - if (b) - std::cout << "context (TopOpeBRepBuild) NOPURGE actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_contextNOREGUFA = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextNOREGUFA(const bool b) -{ - TopOpeBRepBuild_contextNOREGUFA = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOREGUFA() -{ - bool b = TopOpeBRepBuild_contextNOREGUFA; - if (b) - std::cout << "context (TopOpeBRepBuild) NOREGUFA actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_contextNOREGUSO = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextNOREGUSO(const bool b) -{ - TopOpeBRepBuild_contextNOREGUSO = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOREGUSO() -{ - bool b = TopOpeBRepBuild_contextNOREGUSO; - if (b) - std::cout << "context (TopOpeBRepBuild) NOREGUSO actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_contextREGUXPU = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextREGUXPU(const bool b) -{ - TopOpeBRepBuild_contextREGUXPU = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextREGUXPU() -{ - return TopOpeBRepBuild_contextREGUXPU; -} - -static bool TopOpeBRepBuild_contextNOCORRISO = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextNOCORRISO(const bool b) -{ - TopOpeBRepBuild_contextNOCORRISO = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOCORRISO() -{ - return TopOpeBRepBuild_contextNOCORRISO; -} - -static bool TopOpeBRepBuild_contextEINTERNAL = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextEINTERNAL(const bool b) -{ - TopOpeBRepBuild_contextEINTERNAL = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextEINTERNAL() -{ - bool b = TopOpeBRepBuild_contextEINTERNAL; - if (b) - std::cout << "context (TopOpeBRepBuild) EINTERNAL actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_contextEEXTERNAL = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextEEXTERNAL(const bool b) -{ - TopOpeBRepBuild_contextEEXTERNAL = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextEEXTERNAL() -{ - bool b = TopOpeBRepBuild_contextEEXTERNAL; - if (b) - std::cout << "context (TopOpeBRepBuild) EEXTERNAL actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_contextNOSG = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextNOSG(const bool b) -{ - TopOpeBRepBuild_contextNOSG = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOSG() -{ - bool b = TopOpeBRepBuild_contextNOSG; - if (b) - std::cout << "context (TopOpeBRepBuild) NOSG actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_contextNOFUFA = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextNOFUFA(const bool b) -{ - TopOpeBRepBuild_contextNOFUFA = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOFUFA() -{ - bool b = TopOpeBRepBuild_contextNOFUFA; - if (b) - std::cout << "context (TopOpeBRepBuild) NOFUFA actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_contextNOFE = false; - -Standard_EXPORT void TopOpeBRepBuild_SetcontextNOFE(const bool b) -{ - TopOpeBRepBuild_contextNOFE = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GetcontextNOFE() -{ - bool b = TopOpeBRepBuild_contextNOFE; - if (b) - std::cout << "context (TopOpeBRepBuild) NOFE actif" << std::endl; - return b; -} - -static bool TopOpeBRepBuild_traceFE = false; // trace FuseEdges - -Standard_EXPORT void TopOpeBRepBuild_SettraceFE(const bool b) -{ - TopOpeBRepBuild_traceFE = b; -} - -Standard_EXPORT bool TopOpeBRepBuild_GettraceFE() -{ - return TopOpeBRepBuild_traceFE; -} - -// #ifdef OCCT_DEBUG -#endif diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx index eb6fdfc1fe..6d1ec35ae1 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx @@ -58,10 +58,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool TopOpeBRepBuild_GettraceFE(); -#endif - //================================================================================================= TopOpeBRepTool_FuseEdges::TopOpeBRepTool_FuseEdges( @@ -214,15 +210,6 @@ TopoDS_Shape& TopOpeBRepTool_FuseEdges::Shape() void TopOpeBRepTool_FuseEdges::BuildListEdges() { -#ifdef OCCT_DEBUG - bool tFE = TopOpeBRepBuild_GettraceFE(); -#endif - -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl << "FuseEdges : BuildListEdges " << std::endl; -#endif - //-------------------------------------------------------- // Step One : Build the map ancestors //-------------------------------------------------------- @@ -270,15 +257,6 @@ void TopOpeBRepTool_FuseEdges::BuildListEdges() void TopOpeBRepTool_FuseEdges::BuildListResultEdges() { -#ifdef OCCT_DEBUG - bool tFE = TopOpeBRepBuild_GettraceFE(); -#endif - -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl << "FuseEdges : BuildListResultEdges " << std::endl; -#endif - // if we have edges to fuse if (myMapLstEdg.Extent() > 0) { @@ -325,11 +303,6 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges() C = occ::down_cast(C)->BasisCurve(); } -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl << "FuseEdges : Creating New Edge " << std::endl; -#endif - BRepLib_MakeEdge ME(C, VF, VL); if (!ME.IsDone()) @@ -338,11 +311,6 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges() // the curve which is not infinite and limited to old vertices // we try to use ExtendCurveToPoint, then rebuild the NewEdge -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl - << "FuseEdges : MakeEdge failed. Trying to Extend Curve " << std::endl; -#endif occ::handle ExtC = occ::down_cast(C->Copy()); if (!ExtC.IsNull()) { @@ -365,10 +333,6 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges() NewEdge = ME.Edge(); -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl << "FuseEdges : Updating pcurve " << std::endl; -#endif if (UpdatePCurve(OldEdge, NewEdge, LmapEdg)) { myMapEdg.Bind(iLst, NewEdge); @@ -384,20 +348,11 @@ void TopOpeBRepTool_FuseEdges::BuildListResultEdges() void TopOpeBRepTool_FuseEdges::Perform() { -#ifdef OCCT_DEBUG - bool tFE = TopOpeBRepBuild_GettraceFE(); -#endif - if (!myResultEdgesDone) { BuildListResultEdges(); } -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl << "FuseEdges : Perform " << std::endl; -#endif - // if we have fused edges if (myMapEdg.Extent() > 0) { @@ -434,11 +389,6 @@ void TopOpeBRepTool_FuseEdges::Perform() } } -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl << "FuseEdges : Building New Shape " << std::endl; -#endif - // perform the effective substitution Bsub.Build(myShape); @@ -458,11 +408,6 @@ void TopOpeBRepTool_FuseEdges::Perform() { myShape = (Bsub.Copy(myShape)).First(); } - -#ifdef OCCT_DEBUG - if (tFE) - std::cout << std::endl << "FuseEdges : " << NbVertices() << " vertices removed" << std::endl; -#endif } myShapeDone = true; diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Form.cxx b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Form.cxx index 29c3bbce8d..2c10a72300 100644 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Form.cxx +++ b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Form.cxx @@ -44,10 +44,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -#endif - static void Descendants(const TopoDS_Shape&, BRepFeat_Builder&, NCollection_Map&); @@ -59,18 +55,8 @@ static void Descendants(const TopoDS_Shape&, void BRepFeat_Form::GlobalPerform() { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_Form::GlobalPerform ()" << std::endl; -#endif - if (!mySbOK || !myGSOK || !mySFOK || !mySUOK || !myGFOK || !mySkOK || !myPSOK) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Fields not initialized in BRepFeat_Form" << std::endl; -#endif myStatusError = BRepFeat_NotInitialized; NotDone(); return; @@ -83,10 +69,6 @@ void BRepFeat_Form::GlobalPerform() if (myJustFeat && !myFuse) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Invalid option : myJustFeat + Cut" << std::endl; -#endif myStatusError = BRepFeat_InvOption; NotDone(); return; @@ -123,10 +105,6 @@ void BRepFeat_Form::GlobalPerform() if (!exp.More()) { FromInShape = false; -#ifdef OCCT_DEBUG - if (trc) - std::cout << " From not in Shape" << std::endl; -#endif break; } } @@ -148,10 +126,6 @@ void BRepFeat_Form::GlobalPerform() if (!exp.More()) { UntilInShape = false; -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Until not in Shape" << std::endl; -#endif break; } } @@ -332,10 +306,6 @@ void BRepFeat_Form::GlobalPerform() if (theOpe == 1) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Gluer" << std::endl; -#endif bool Collage = true; // cut by FFrom && FUntil TopoDS_Shape Comp; @@ -603,10 +573,6 @@ void BRepFeat_Form::GlobalPerform() if (theOpe == 1) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " still Gluer" << std::endl; -#endif theGlue.Perform(); if (theGlue.IsDone()) { @@ -617,10 +583,6 @@ void BRepFeat_Form::GlobalPerform() UpdateDescendants(theGlue); myNewEdges = theGlue.Edges(); myTgtEdges = theGlue.TgtEdges(); -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Gluer result" << std::endl; -#endif Done(); myShape = theGlue.ResultingShape(); } @@ -641,10 +603,6 @@ void BRepFeat_Form::GlobalPerform() if (theOpe == 2 && ChangeOpe && myJustGluer) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Gluer failure" << std::endl; -#endif myJustGluer = false; theOpe = 0; // Done(); @@ -655,17 +613,9 @@ void BRepFeat_Form::GlobalPerform() if (theOpe == 2) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " No Gluer" << std::endl; -#endif TopoDS_Shape theGShape = myGShape; if (ChangeOpe) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Passage to topological operations" << std::endl; -#endif } TopoDS_Shape Comp; @@ -1165,10 +1115,6 @@ void BRepFeat_Form::GlobalPerform() // Case when no part of the tool is preserved if (!KeepParts) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " No parts of tool kept" << std::endl; -#endif myStatusError = BRepFeat_NoParts; NotDone(); return; @@ -1377,9 +1323,6 @@ const NCollection_List& BRepFeat_Form::TgtEdges() const bool BRepFeat_Form::TransformShapeFU(const int flag) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); -#endif bool Trf = false; TopoDS_Shape shapefu; @@ -1399,10 +1342,6 @@ bool BRepFeat_Form::TransformShapeFU(const int flag) TopExp_Explorer exp(shapefu, TopAbs_FACE); if (!exp.More()) { // no faces... It is necessary to return an error -#ifdef OCCT_DEBUG - if (trc) - std::cout << " BRepFeat_Form::TransformShapeFU : invalid Shape" << std::endl; -#endif return Trf; } @@ -1466,15 +1405,6 @@ bool BRepFeat_Form::TransformShapeFU(const int flag) myMap(fac).Append(fac); } } -#ifdef OCCT_DEBUG - if (trc) - { - if (Trf && (flag == 0)) - std::cout << " TransformShapeFU From" << std::endl; - if (Trf && (flag == 1)) - std::cout << " TransformShapeFU Until" << std::endl; - } -#endif return Trf; } diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeDPrism.cxx b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeDPrism.cxx index 7e4e8ebae6..c80784f4c5 100644 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeDPrism.cxx +++ b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeDPrism.cxx @@ -50,10 +50,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -#endif - static void MajMap(const TopoDS_Shape&, const LocOpe_DPrism&, NCollection_DataMap>& //============================================================================ void BRepFeat_MakeDPrism::BossEdges(const int signature) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_MakeDPrism::BossEdges (integer)" << std::endl; -#endif NCollection_List theLastShape; theLastShape.Clear(); if (signature == 1 || signature == -1) diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeLinearForm.cxx index 0e957f3a91..95b9bc28b2 100644 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeLinearForm.cxx +++ b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakeLinearForm.cxx @@ -60,11 +60,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -extern bool BRepFeat_GettraceFEATRIB(); -#endif - static void MajMap(const TopoDS_Shape&, // base const LocOpe_LinearForm&, NCollection_DataMap s = BRep_Tool::Surface(FirstFace); if (s->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) @@ -359,10 +324,6 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, // ---case of sliding : construction of the profile face if (Sliding) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " still Sliding" << std::endl; -#endif TopoDS_Face Prof; bool ProfileOK; ProfileOK = SlidingProfile(Prof, @@ -381,13 +342,6 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { -#ifdef OCCT_DEBUG - if (trc) - { - std::cout << "Not computable" << std::endl; - std::cout << "Face profile not computable" << std::endl; - } -#endif myStatusError = BRepFeat_NoFaceProf; NotDone(); return; @@ -765,14 +719,6 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, // ---Case without sliding : construction of the profile face if (!Sliding) { -#ifdef OCCT_DEBUG - if (trc) - { - if (Modify) - std::cout << " Sliding failure" << std::endl; - std::cout << " no Sliding" << std::endl; - } -#endif TopoDS_Face Prof; bool ProfileOK; ProfileOK = NoSlidingProfile(Prof, @@ -794,13 +740,6 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { -#ifdef OCCT_DEBUG - if (trc) - { - std::cout << "Not computable" << std::endl; - std::cout << " Face profile not computable" << std::endl; - } -#endif myStatusError = BRepFeat_NoFaceProf; NotDone(); return; @@ -857,11 +796,6 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, void BRepFeat_MakeLinearForm::Add(const TopoDS_Edge& E, const TopoDS_Face& F) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_MakeLinearForm::Add" << std::endl; -#endif if (mySlface.IsEmpty()) { TopExp_Explorer exp; @@ -904,17 +838,8 @@ void BRepFeat_MakeLinearForm::Add(const TopoDS_Edge& E, const TopoDS_Face& F) void BRepFeat_MakeLinearForm::Perform() { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_MakeLinearForm::Perform()" << std::endl; -#endif if (mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Fields not initialized" << std::endl; -#endif myStatusError = BRepFeat_NotInitialized; NotDone(); return; @@ -961,10 +886,6 @@ void BRepFeat_MakeLinearForm::Perform() const TopoDS_Edge& e = TopoDS::Edge(exx.Current()); if (!myMap.IsBound(e)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Sliding face not in Base shape" << std::endl; -#endif myStatusError = BRepFeat_IncSlidFace; NotDone(); return; @@ -976,13 +897,6 @@ void BRepFeat_MakeLinearForm::Perform() if (!myGluedF.IsEmpty() && !mySUntil.IsNull()) { -#ifdef OCCT_DEBUG - if (trc) - { - std::cout << "The case is not computable" << std::endl; - std::cout << " Glued faces not empty and Until shape not null" << std::endl; - } -#endif myStatusError = BRepFeat_InvShape; NotDone(); return; @@ -1038,11 +952,6 @@ bool BRepFeat_MakeLinearForm::Propagate(NCollection_List& SliList, const gp_Pnt& Lastpnt, bool& falseside) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEATRIB(); - if (trc) - std::cout << "BRepFeat_MakeLinearForm::Propagate" << std::endl; -#endif gp_Pnt Firstpoint = Firstpnt; gp_Pnt Lastpoint = Lastpnt; diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakePipe.cxx b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakePipe.cxx index e5bb4690de..0d2d8668be 100644 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakePipe.cxx +++ b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_MakePipe.cxx @@ -32,10 +32,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -#endif - static void MajMap(const TopoDS_Shape&, // base LocOpe_Pipe&, NCollection_DataMap #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -#endif - static void MajMap(const TopoDS_Shape&, // base const LocOpe_Prism&, NCollection_DataMap #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -#endif - static void MajMap(const TopoDS_Shape&, // base const LocOpe_Revol&, NCollection_DataMap #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -extern bool BRepFeat_GettraceFEATRIB(); -#endif - static void MajMap(const TopoDS_Shape&, // base const LocOpe_RevolutionForm&, NCollection_DataMap s = BRep_Tool::Surface(FirstFace); if (s->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { @@ -384,10 +353,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, GeomAPI_ProjectPointOnCurve proj(myFirstPnt, Line); if (proj.NbPoints() < 1) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " No First Point projection" << std::endl; -#endif myStatusError = BRepFeat_NoProjPt; NotDone(); return; @@ -398,10 +363,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, GeomAPI_ProjectPointOnCurve proj1(myLastPnt, Line); if (proj.NbPoints() < 1) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " No Last Point projection" << std::endl; -#endif myStatusError = BRepFeat_NoProjPt; NotDone(); return; @@ -521,10 +482,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, // ---case of sliding : construction of the face profile if (Sliding) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " still Sliding" << std::endl; -#endif TopoDS_Face Prof; bool ProfileOK; ProfileOK = SlidingProfile(Prof, @@ -543,13 +500,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { -#ifdef OCCT_DEBUG - if (trc) - { - std::cout << "Not computable" << std::endl; - std::cout << "Face profile not computable" << std::endl; - } -#endif myStatusError = BRepFeat_NoFaceProf; NotDone(); return; @@ -923,14 +873,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, // ---Case without sliding : construction of the face profile if (!Sliding) { -#ifdef OCCT_DEBUG - if (trc) - { - if (Modify) - std::cout << " Sliding failure" << std::endl; - std::cout << " no Sliding" << std::endl; - } -#endif TopExp_Explorer explo1(BndFace, TopAbs_WIRE); TopoDS_Wire WWW = TopoDS::Wire(explo1.Current()); BRepTools_WireExplorer explo(WWW); @@ -1061,13 +1003,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { -#ifdef OCCT_DEBUG - if (trc) - { - std::cout << "Not computable" << std::endl; - std::cout << " Face profile not computable" << std::endl; - } -#endif myStatusError = BRepFeat_NoFaceProf; NotDone(); return; @@ -1124,11 +1059,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, void BRepFeat_MakeRevolutionForm::Add(const TopoDS_Edge& E, const TopoDS_Face& F) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_MakeRevolutionForm::Add" << std::endl; -#endif if (mySlface.IsEmpty()) { TopExp_Explorer exp; @@ -1168,17 +1098,8 @@ void BRepFeat_MakeRevolutionForm::Add(const TopoDS_Edge& E, const TopoDS_Face& F void BRepFeat_MakeRevolutionForm::Perform() { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_MakeRevolutionForm::Perform()" << std::endl; -#endif if (mySbase.IsNull() || mySkface.IsNull() || myPbase.IsNull()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Fields not initialized" << std::endl; -#endif myStatusError = BRepFeat_NotInitialized; NotDone(); return; @@ -1285,10 +1206,6 @@ void BRepFeat_MakeRevolutionForm::Perform() if (!ASI1.IsDone() || !ASI2.IsDone() || ASI1.NbPoints(1) != 1 || ASI2.NbPoints(1) != 1) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Intersection failure" << std::endl; -#endif myStatusError = BRepFeat_BadIntersect; NotDone(); return; @@ -1408,10 +1325,6 @@ void BRepFeat_MakeRevolutionForm::Perform() const TopoDS_Edge& e = TopoDS::Edge(exx.Current()); if (!myMap.IsBound(e)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Sliding face not in Base shape" << std::endl; -#endif myStatusError = BRepFeat_IncSlidFace; NotDone(); return; @@ -1422,13 +1335,6 @@ void BRepFeat_MakeRevolutionForm::Perform() if (!myGluedF.IsEmpty() && !mySUntil.IsNull()) { -#ifdef OCCT_DEBUG - if (trc) - { - std::cout << "The case is not computable" << std::endl; - std::cout << " Glued faces not empty and Until shape not null" << std::endl; - } -#endif myStatusError = BRepFeat_InvShape; NotDone(); return; @@ -1449,11 +1355,6 @@ bool BRepFeat_MakeRevolutionForm::Propagate(NCollection_List& SliL const gp_Pnt& Lastpnt, bool& falseside) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEATRIB(); - if (trc) - std::cout << "BRepFeat_MakeRevolutionForm::Propagate" << std::endl; -#endif gp_Pnt Firstpoint = Firstpnt; gp_Pnt Lastpoint = Lastpnt; diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_RibSlot.cxx b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_RibSlot.cxx index 44a42c5c25..0927b4f5cc 100644 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_RibSlot.cxx +++ b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_RibSlot.cxx @@ -69,11 +69,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -extern bool BRepFeat_GettraceFEATRIB(); -#endif - //======================================================================= // function : LFPerform // purpose : topological reconstruction of ribs @@ -81,19 +76,9 @@ extern bool BRepFeat_GettraceFEATRIB(); void BRepFeat_RibSlot::LFPerform() { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_RibSlot::LFPerform()" << std::endl; -#endif if (mySbase.IsNull() || myPbase.IsNull() || mySkface.IsNull() || myGShape.IsNull() || myLFMap.IsEmpty()) { -#ifdef OCCT_DEBUG - std::cout << "Topological reconstruction is impossible" << std::endl; - if (trc) - std::cout << " Fields not initialized" << std::endl; -#endif myStatusError = BRepFeat_NotInitialized; NotDone(); return; @@ -269,11 +254,6 @@ bool BRepFeat_RibSlot::IsDeleted(const TopoDS_Shape& F) const NCollection_List& BRepFeat_RibSlot::Modified(const TopoDS_Shape& F) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_RibSlot::Modified" << std::endl; -#endif if (myMap.IsBound(F)) { static NCollection_List list; @@ -296,11 +276,6 @@ const NCollection_List& BRepFeat_RibSlot::Modified(const TopoDS_Sh const NCollection_List& BRepFeat_RibSlot::Generated(const TopoDS_Shape& S) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_RibSlot::Generated" << std::endl; -#endif if (S.ShapeType() != TopAbs_FACE) { myGenerated.Clear(); @@ -445,11 +420,6 @@ gp_Pnt BRepFeat_RibSlot::CheckPoint(const TopoDS_Edge& e, const occ::handle& Pln) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEATRIB(); - if (trc) - std::cout << "BRepFeat_RibSlot::CheckPoint" << std::endl; -#endif // Vector product : normal to plane X direction Wire // -> gives the material side // Proofing point somewhat inside the material side @@ -481,11 +451,6 @@ gp_Pnt BRepFeat_RibSlot::CheckPoint(const TopoDS_Edge& e, gp_Dir BRepFeat_RibSlot::Normal(const TopoDS_Face& F, const gp_Pnt& P) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEATRIB(); - if (trc) - std::cout << "BRepFeat_RibSlot::Normal" << std::endl; -#endif double U, V; gp_Pnt pt; @@ -581,11 +546,6 @@ double BRepFeat_RibSlot::IntPar(const occ::handle& C, const gp_Pnt& void BRepFeat_RibSlot::EdgeExtention(TopoDS_Edge& e, const double bnd, const bool FirstLast) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_RibSlot::EdgeExtention" << std::endl; -#endif double f, l; occ::handle cu = BRep_Tool::Curve(e, f, l); occ::handle C = new Geom_TrimmedCurve(cu, f, l); @@ -649,11 +609,6 @@ TopoDS_Face BRepFeat_RibSlot::ChoiceOfFaces(NCollection_List& face const occ::handle& Pln) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEATRIB(); - if (trc) - std::cout << "BRepFeat_RibSlot::ChoiceOfFaces" << std::endl; -#endif TopoDS_Face FFF; gp_Pnt pp; @@ -713,11 +668,6 @@ double BRepFeat_RibSlot::HeightMax(const TopoDS_Shape& theSbase, gp_Pnt& p1, gp_Pnt& p2) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEATRIB(); - if (trc) - std::cout << "BRepFeat_RibSlot::HeightMax" << std::endl; -#endif Bnd_Box Box; BRepBndLib::Add(theSbase, Box); if (!theSUntil.IsNull()) @@ -761,11 +711,6 @@ bool BRepFeat_RibSlot::ExtremeFaces(const bool RevolRib, TopoDS_Edge& OnLastEdge) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_RibSlot::ExtremeFaces" << std::endl; -#endif bool Data = true; FirstFace.Nullify(); LastFace.Nullify(); @@ -793,10 +738,6 @@ bool BRepFeat_RibSlot::ExtremeFaces(const bool RevolRib, // ---the wire includes only one edge if (NumberOfEdges == 1) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " One Edge" << std::endl; -#endif exp.ReInit(); double f, l; //, f1, l1, temp; gp_Pnt firstpoint, lastpoint; @@ -1000,11 +941,7 @@ bool BRepFeat_RibSlot::ExtremeFaces(const bool RevolRib, return true; } -//--- FirstFace or LastFace was not found -#ifdef OCCT_DEBUG - if (trc) - std::cout << " FirstFace or LastFace null" << std::endl; -#endif + //--- FirstFace or LastFace was not found LocOpe_CSIntersector ASI(mySbase); NCollection_Sequence> scur; scur.Clear(); @@ -1051,10 +988,6 @@ bool BRepFeat_RibSlot::ExtremeFaces(const bool RevolRib, } else { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Less than 2 intersection points" << std::endl; -#endif Data = false; return Data; } @@ -1076,10 +1009,6 @@ bool BRepFeat_RibSlot::ExtremeFaces(const bool RevolRib, // ---The wire consists of several edges else { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Multiple Edges" << std::endl; -#endif BRepTools_WireExplorer ex(myWire); for (; ex.More(); ex.Next()) { @@ -1309,10 +1238,6 @@ bool BRepFeat_RibSlot::ExtremeFaces(const bool RevolRib, } else { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " First or Last not OK" << std::endl; -#endif return false; } } @@ -1335,11 +1260,6 @@ void BRepFeat_RibSlot::PtOnEdgeVertex(const bool RevolRib, TopoDS_Vertex& OnVertex) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEATRIB(); - if (trc) - std::cout << "BRepFeat_RibSlot::PtOnEdgeVertex" << std::endl; -#endif bool TestOK; // PtOnEdge = false; // OnEdge.Nullify(); @@ -1430,11 +1350,6 @@ bool BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof, const TopoDS_Edge& LastEdge) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_RibSlot::SlidingProfile" << std::endl; -#endif bool ProfileOK = true; // --case of sliding : construction of the wire of the profile // --> 1 part bounding box + 1 part wire @@ -1570,10 +1485,6 @@ bool BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof, if (BndEdge1.IsNull() || BndEdge2.IsNull()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Null bounding edge" << std::endl; -#endif ProfileOK = false; return ProfileOK; } @@ -1735,10 +1646,6 @@ bool BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof, if (!BRepAlgo::IsValid(fac)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Invalid Face" << std::endl; -#endif ProfileOK = false; return ProfileOK; } @@ -1775,10 +1682,6 @@ bool BRepFeat_RibSlot::SlidingProfile(TopoDS_Face& Prof, if (!BRepAlgo::IsValid(Prof)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Invalid Face Profile" << std::endl; -#endif ProfileOK = false; return ProfileOK; } @@ -1808,11 +1711,6 @@ bool BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof, const bool OnLastFace) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - std::cout << "BRepFeat_RibSlot::NoSlidingProfile" << std::endl; -#endif bool ProfileOK = true; double l1, f1, f2, l2; //, p; @@ -1981,10 +1879,6 @@ bool BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof, if (BndEdge1.IsNull() || BndEdge2.IsNull()) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Null bounding edge" << std::endl; -#endif ProfileOK = false; return ProfileOK; } @@ -2621,10 +2515,6 @@ bool BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof, if (!BRepAlgo::IsValid(fac)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Invalid Face" << std::endl; -#endif ProfileOK = false; return ProfileOK; } @@ -2657,10 +2547,6 @@ bool BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof, if (!BRepAlgo::IsValid(Prof)) { -#ifdef OCCT_DEBUG - if (trc) - std::cout << " Invalid Face Profile" << std::endl; -#endif ProfileOK = false; return ProfileOK; } diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_trace.cxx b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_trace.cxx deleted file mode 100644 index 10a478903f..0000000000 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_trace.cxx +++ /dev/null @@ -1,96 +0,0 @@ -// Created on: 1998-09-21 -// Created by: LECLERE Florence -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifdef OCCT_DEBUG - - #include - -static bool BRepFeat_traceFEAT = true; - -Standard_EXPORT void BRepFeat_SettraceFEAT(const bool b) -{ - BRepFeat_traceFEAT = b; -} - -Standard_EXPORT bool BRepFeat_GettraceFEAT() -{ - return BRepFeat_traceFEAT; -} - -static bool BRepFeat_traceFEATFORM = false; - -Standard_EXPORT void BRepFeat_SettraceFEATFORM(const bool b) -{ - BRepFeat_traceFEATFORM = b; -} - -Standard_EXPORT bool BRepFeat_GettraceFEATFORM() -{ - return BRepFeat_traceFEATFORM; -} - -static bool BRepFeat_traceFEATPRISM = false; - -Standard_EXPORT void BRepFeat_SettraceFEATPRISM(const bool b) -{ - BRepFeat_traceFEATPRISM = b; -} - -Standard_EXPORT bool BRepFeat_GettraceFEATPRISM() -{ - return BRepFeat_traceFEATPRISM; -} - -static bool BRepFeat_traceFEATRIB = false; - -Standard_EXPORT void BRepFeat_SettraceFEATRIB(const bool b) -{ - BRepFeat_traceFEATRIB = b; -} - -Standard_EXPORT bool BRepFeat_GettraceFEATRIB() -{ - return BRepFeat_traceFEATRIB; -} - -static bool BRepFeat_traceFEATDRAFT = false; - -Standard_EXPORT void BRepFeat_SettraceFEATDRAFT(const bool b) -{ - BRepFeat_traceFEATDRAFT = b; -} - -Standard_EXPORT bool BRepFeat_GettraceFEATDRAFT() -{ - return BRepFeat_traceFEATDRAFT; -} - -static bool BRepFeat_contextCHRONO = false; - -Standard_EXPORT void BRepFeat_SetcontextCHRONO(const bool b) -{ - BRepFeat_contextCHRONO = b; -} - -Standard_EXPORT bool BRepFeat_GetcontextCHRONO() -{ - bool b = BRepFeat_contextCHRONO; - if (b) - std::cout << "context (BRepFeat) CHRONO actif" << std::endl; - return b; -} - -#endif diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/FILES.cmake b/src/ModelingAlgorithms/TKFeat/BRepFeat/FILES.cmake index ad7fdb70a4..e2c3c21e14 100644 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/FILES.cmake +++ b/src/ModelingAlgorithms/TKFeat/BRepFeat/FILES.cmake @@ -41,5 +41,4 @@ set(OCCT_BRepFeat_FILES BRepFeat_SplitShape.lxx BRepFeat_Status.hxx BRepFeat_StatusError.hxx - BRepFeat_trace.cxx ) diff --git a/src/ModelingAlgorithms/TKFeat/LocOpe/LocOpe_DPrism.cxx b/src/ModelingAlgorithms/TKFeat/LocOpe/LocOpe_DPrism.cxx index be355555c5..036741257a 100644 --- a/src/ModelingAlgorithms/TKFeat/LocOpe/LocOpe_DPrism.cxx +++ b/src/ModelingAlgorithms/TKFeat/LocOpe/LocOpe_DPrism.cxx @@ -51,10 +51,6 @@ #include #include -#ifdef OCCT_DEBUG -extern bool BRepFeat_GettraceFEAT(); -#endif - #define NECHANT 7 // voir BRepFeat.cxx //================================================================================================= @@ -719,14 +715,6 @@ occ::handle LocOpe_DPrism::BarycCurve() const } if (mySpine.Orientation() == TopAbs_REVERSED) { -#ifdef OCCT_DEBUG - bool trc = BRepFeat_GettraceFEAT(); - if (trc) - { - std::cout << "LocOpe_DPrism::BarycCurve()" << std::endl; - std::cout << " Reversed Spine orientation" << std::endl; - } -#endif // Normale.Reverse(); //cts20871 } gp_Vec Vec = dz * Normale.XYZ();