From 536a3cb80c3c7d77b3304b7442cc1ea1860617e5 Mon Sep 17 00:00:00 2001 From: ski Date: Wed, 29 Jun 2016 10:46:05 +0300 Subject: [PATCH] 0027525: Coding - eliminate warnings on Windows for OCCT with static type of libraries Useless *.cxx files were removed to eliminate linker warning LNK4221. Package TopOpeBRepDS was cleaned up from old debugging routines. Merged OSD_signal_WNT.cxx into OSD_signal.cxx Class Standard_ErrorHandlerCallback was moved into the Standard_ErrorHandler class as nested class Callback Eliminated warning about unused variable. --- src/BOPAlgo/BOPAlgo_WireEdgeSet.cxx | 21 - src/BOPAlgo/FILES | 1 - src/BOPDS/BOPDS_Curve.cxx | 19 - src/BOPDS/BOPDS_FaceInfo.cxx | 19 - src/BOPDS/BOPDS_PassKeyBoolean.cxx | 19 - src/BOPDS/BOPDS_PassKeyMapHasher.cxx | 20 - src/BOPDS/BOPDS_PaveMapHasher.cxx | 17 - src/BOPDS/BOPDS_Point.cxx | 18 - src/BOPDS/BOPDS_Tools.cxx | 16 - src/BOPDS/FILES | 7 - src/BOPTools/BOPTools_SetMapHasher.cxx | 17 - src/BOPTools/FILES | 1 - src/BRepAlgo/BRepAlgo_BooleanOperation.cxx | 5 - .../BRepFilletAPI_LocalOperation.cxx | 20 - src/BRepFilletAPI/FILES | 1 - src/BRepPrimAPI/BRepPrimAPI_MakeSweep.cxx | 19 - src/BRepPrimAPI/FILES | 1 - src/DsgPrs/DsgPrs.cxx | 12 - src/Extrema/Extrema_Curve2dTool.cxx | 23 - src/Extrema/Extrema_POnSurf.cxx | 17 - src/Extrema/Extrema_POnSurfParams.cxx | 16 - src/Extrema/FILES | 3 - src/GC/FILES | 1 - src/GC/GC_Root.cxx | 16 - src/GCE2d/FILES | 1 - src/GCE2d/GCE2d_Root.cxx | 16 - src/GeomInt/FILES | 1 - .../GeomInt_TheMultiLineToolOfWLApprox_0.cxx | 30 - src/HLRAlgo/FILES | 3 - src/HLRAlgo/HLRAlgo_PolyHidingData.cxx | 18 - src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx | 18 - src/HLRAlgo/HLRAlgo_TriangleData.cxx | 18 - src/HLRBRep/FILES | 2 - src/HLRBRep/HLRBRep_CLPropsATool.cxx | 20 - src/HLRBRep/HLRBRep_LineTool.cxx | 26 - src/IntImpParGen/FILES | 1 - src/IntImpParGen/IntImpParGen_ImpTool.cxx | 18 - src/IntPatch/FILES | 1 - src/IntPatch/IntPatch_PolyhedronTool.cxx | 22 - src/IntSurf/FILES | 3 - src/IntSurf/IntSurf_Couple.cxx | 16 - src/IntSurf/IntSurf_InteriorPointTool.cxx | 17 - src/IntSurf/IntSurf_PathPointTool.cxx | 19 - src/IntTools/FILES | 2 - .../IntTools_CurveRangeSampleMapHasher.cxx | 18 - .../IntTools_SurfaceRangeSampleMapHasher.cxx | 18 - src/LocOpe/FILES | 1 - src/LocOpe/LocOpe_PntFace.cxx | 20 - src/MAT2d/FILES | 1 - src/MAT2d/MAT2d_MapBiIntHasher.cxx | 19 - src/OSD/FILES | 1 - src/OSD/OSD_signal.cxx | 576 +++++++++++- src/OSD/OSD_signal_WNT.cxx | 607 ------------- src/Precision/FILES | 1 - src/Precision/Precision.cxx | 18 - src/Standard/FILES | 2 - src/Standard/Standard.hxx | 1 - src/Standard/Standard_ErrorHandler.cxx | 45 +- src/Standard/Standard_ErrorHandler.hxx | 75 +- .../Standard_ErrorHandlerCallback.cxx | 63 -- .../Standard_ErrorHandlerCallback.hxx | 92 -- src/Standard/Standard_Mutex.hxx | 4 +- src/TNaming/FILES | 6 - src/TNaming/TNaming_Builder.cxx | 25 - src/TNaming/TNaming_Iterator.cxx | 27 - src/TNaming/TNaming_IteratorOnShapesSet.cxx | 22 - src/TNaming/TNaming_NewShapeIterator.cxx | 30 - src/TNaming/TNaming_OldShapeIterator.cxx | 30 - src/TNaming/TNaming_RefShape.cxx | 23 - src/TObj/FILES | 1 - src/TObj/TObj_SequenceOfObject.cxx | 19 - src/TestTopOpe/TestTopOpe.cxx | 22 - src/TestTopOpe/TestTopOpe_HDSCommands.cxx | 83 +- .../TestTopOpeTools_TraceCommands.cxx | 52 -- src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx | 60 +- .../TopOpeBRep_EdgesIntersector.cxx | 20 - src/TopOpeBRep/TopOpeBRep_FFDumper.cxx | 14 +- .../TopOpeBRep_FFTransitionTool.cxx | 29 +- src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx | 24 - .../TopOpeBRep_FaceEdgeFiller_DEB.cxx | 2 - src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx | 57 -- src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx | 140 +-- src/TopOpeBRep/TopOpeBRep_LineInter.cxx | 14 - src/TopOpeBRep/TopOpeBRep_Point2d.cxx | 9 +- src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx | 3 - .../TopOpeBRep_ProcessSectionEdges.cxx | 62 +- src/TopOpeBRep/TopOpeBRep_VPointInter.cxx | 10 +- src/TopOpeBRep/TopOpeBRep_kpart.cxx | 102 --- src/TopOpeBRep/TopOpeBRep_mergePDS.cxx | 1 - src/TopOpeBRep/TopOpeBRep_vpr.cxx | 68 +- src/TopOpeBRep/TopOpeBRep_vprclo.cxx | 17 - src/TopOpeBRep/TopOpeBRep_vprdeg.cxx | 16 +- .../TopOpeBRepBuild_Area1dBuilder.cxx | 1 - .../TopOpeBRepBuild_AreaBuilder.cxx | 10 - .../TopOpeBRepBuild_BuildFaces.cxx | 3 - .../TopOpeBRepBuild_Builder.cxx | 5 - .../TopOpeBRepBuild_BuilderON2d.cxx | 5 +- .../TopOpeBRepBuild_FaceBuilder.cxx | 12 - .../TopOpeBRepBuild_GridEE.cxx | 17 - .../TopOpeBRepBuild_GridFF.cxx | 20 - .../TopOpeBRepBuild_GridSS.cxx | 26 +- .../TopOpeBRepBuild_Griddump.cxx | 30 +- .../TopOpeBRepBuild_Section.cxx | 8 +- .../TopOpeBRepBuild_WireEdgeClassifier.cxx | 8 - .../TopOpeBRepBuild_makefaces.cxx | 5 - .../TopOpeBRepBuild_makesolids.cxx | 5 - src/TopOpeBRepDS/FILES | 6 - src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx | 322 +------ src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx | 103 +-- src/TopOpeBRepDS/TopOpeBRepDS_Curve.cxx | 48 - src/TopOpeBRepDS/TopOpeBRepDS_Curve.hxx | 2 - .../TopOpeBRepDS_CurvePointInterference.cxx | 22 - .../TopOpeBRepDS_CurvePointInterference.hxx | 4 - src/TopOpeBRepDS/TopOpeBRepDS_DSX.hxx | 37 - .../TopOpeBRepDS_DataStructure.cxx | 56 +- src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx | 851 ------------------ src/TopOpeBRepDS/TopOpeBRepDS_Dumper.hxx | 50 +- src/TopOpeBRepDS/TopOpeBRepDS_EIR.cxx | 291 +----- src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx | 363 +------- src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.hxx | 1 - .../TopOpeBRepDS_Edge3dInterferenceTool.cxx | 7 - .../TopOpeBRepDS_EdgeInterferenceTool.cxx | 12 - .../TopOpeBRepDS_EdgeVertexInterference.cxx | 18 - .../TopOpeBRepDS_EdgeVertexInterference.hxx | 3 +- src/TopOpeBRepDS/TopOpeBRepDS_FIR.cxx | 163 +--- .../TopOpeBRepDS_FaceEdgeInterference.cxx | 16 - .../TopOpeBRepDS_FaceEdgeInterference.hxx | 3 - .../TopOpeBRepDS_FaceInterferenceTool.cxx | 84 +- src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx | 13 - .../TopOpeBRepDS_FilterCurveInterferences.cxx | 15 - .../TopOpeBRepDS_FilterEdgeInterferences.cxx | 78 +- .../TopOpeBRepDS_FilterFaceInterferences.cxx | 102 +-- src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx | 87 +- src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx | 9 - .../TopOpeBRepDS_HDataStructure.cxx | 131 +-- .../TopOpeBRepDS_Interference.cxx | 68 -- .../TopOpeBRepDS_Interference.hxx | 9 +- .../TopOpeBRepDS_PointIterator.cxx | 5 - .../TopOpeBRepDS_ProcessEdgeInterferences.cxx | 178 +--- .../TopOpeBRepDS_ProcessFaceInterferences.cxx | 133 +-- .../TopOpeBRepDS_ProcessInterferencesTool.cxx | 87 +- .../TopOpeBRepDS_ShapeShapeInterference.cxx | 18 - .../TopOpeBRepDS_ShapeShapeInterference.hxx | 2 - .../TopOpeBRepDS_SolidSurfaceInterference.cxx | 15 - .../TopOpeBRepDS_SolidSurfaceInterference.hxx | 2 - .../TopOpeBRepDS_SurfaceCurveInterference.cxx | 48 - .../TopOpeBRepDS_SurfaceCurveInterference.hxx | 5 - src/TopOpeBRepDS/TopOpeBRepDS_TKI.cxx | 68 +- src/TopOpeBRepDS/TopOpeBRepDS_TKI.hxx | 8 - src/TopOpeBRepDS/TopOpeBRepDS_TOOL.cxx | 15 +- src/TopOpeBRepDS/TopOpeBRepDS_Transition.cxx | 37 - src/TopOpeBRepDS/TopOpeBRepDS_Transition.hxx | 7 +- src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx | 24 - src/TopOpeBRepDS/TopOpeBRepDS_reDEB.cxx | 37 - src/TopOpeBRepDS/TopOpeBRepDS_reDEB.hxx | 34 - src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx | 82 +- src/TopOpeBRepDS/TopOpeBRepDS_samdom.cxx | 5 +- src/TopOpeBRepDS/TopOpeBRepDS_trace.cxx | 152 ---- src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.cxx | 160 ---- src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx | 64 -- src/TopTools/FILES | 2 - .../TopTools_OrientedShapeMapHasher.cxx | 19 - src/TopTools/TopTools_ShapeMapHasher.cxx | 19 - src/TopoDS/FILES | 9 - src/TopoDS/TopoDS.cxx | 29 - src/TopoDS/TopoDS_CompSolid.cxx | 18 - src/TopoDS/TopoDS_Compound.cxx | 18 - src/TopoDS/TopoDS_Edge.cxx | 18 - src/TopoDS/TopoDS_Face.cxx | 18 - src/TopoDS/TopoDS_Shell.cxx | 18 - src/TopoDS/TopoDS_Solid.cxx | 18 - src/TopoDS/TopoDS_Vertex.cxx | 18 - src/TopoDS/TopoDS_Wire.cxx | 18 - src/math/FILES | 3 - src/math/math_FunctionSetWithDerivatives.cxx | 17 - .../math_MultipleVarFunctionWithGradient.cxx | 16 - .../math_MultipleVarFunctionWithHessian.cxx | 19 - 177 files changed, 801 insertions(+), 6902 deletions(-) delete mode 100644 src/BOPAlgo/BOPAlgo_WireEdgeSet.cxx delete mode 100644 src/BOPDS/BOPDS_Curve.cxx delete mode 100644 src/BOPDS/BOPDS_FaceInfo.cxx delete mode 100644 src/BOPDS/BOPDS_PassKeyBoolean.cxx delete mode 100644 src/BOPDS/BOPDS_PassKeyMapHasher.cxx delete mode 100644 src/BOPDS/BOPDS_PaveMapHasher.cxx delete mode 100644 src/BOPDS/BOPDS_Point.cxx delete mode 100644 src/BOPDS/BOPDS_Tools.cxx delete mode 100644 src/BOPTools/BOPTools_SetMapHasher.cxx delete mode 100644 src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cxx delete mode 100644 src/BRepPrimAPI/BRepPrimAPI_MakeSweep.cxx delete mode 100644 src/Extrema/Extrema_Curve2dTool.cxx delete mode 100644 src/Extrema/Extrema_POnSurf.cxx delete mode 100644 src/Extrema/Extrema_POnSurfParams.cxx delete mode 100644 src/GC/GC_Root.cxx delete mode 100644 src/GCE2d/GCE2d_Root.cxx delete mode 100644 src/GeomInt/GeomInt_TheMultiLineToolOfWLApprox_0.cxx delete mode 100644 src/HLRAlgo/HLRAlgo_PolyHidingData.cxx delete mode 100644 src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx delete mode 100644 src/HLRAlgo/HLRAlgo_TriangleData.cxx delete mode 100644 src/HLRBRep/HLRBRep_CLPropsATool.cxx delete mode 100644 src/HLRBRep/HLRBRep_LineTool.cxx delete mode 100644 src/IntImpParGen/IntImpParGen_ImpTool.cxx delete mode 100644 src/IntPatch/IntPatch_PolyhedronTool.cxx delete mode 100644 src/IntSurf/IntSurf_Couple.cxx delete mode 100644 src/IntSurf/IntSurf_InteriorPointTool.cxx delete mode 100644 src/IntSurf/IntSurf_PathPointTool.cxx delete mode 100644 src/IntTools/IntTools_CurveRangeSampleMapHasher.cxx delete mode 100644 src/IntTools/IntTools_SurfaceRangeSampleMapHasher.cxx delete mode 100644 src/LocOpe/LocOpe_PntFace.cxx delete mode 100644 src/MAT2d/MAT2d_MapBiIntHasher.cxx delete mode 100644 src/OSD/OSD_signal_WNT.cxx delete mode 100644 src/Precision/Precision.cxx delete mode 100644 src/Standard/Standard_ErrorHandlerCallback.cxx delete mode 100644 src/Standard/Standard_ErrorHandlerCallback.hxx delete mode 100644 src/TNaming/TNaming_Builder.cxx delete mode 100644 src/TNaming/TNaming_Iterator.cxx delete mode 100644 src/TNaming/TNaming_IteratorOnShapesSet.cxx delete mode 100644 src/TNaming/TNaming_NewShapeIterator.cxx delete mode 100644 src/TNaming/TNaming_OldShapeIterator.cxx delete mode 100644 src/TNaming/TNaming_RefShape.cxx delete mode 100644 src/TObj/TObj_SequenceOfObject.cxx delete mode 100644 src/TopOpeBRepDS/TopOpeBRepDS_DSX.hxx delete mode 100644 src/TopOpeBRepDS/TopOpeBRepDS_reDEB.cxx delete mode 100644 src/TopOpeBRepDS/TopOpeBRepDS_reDEB.hxx delete mode 100644 src/TopOpeBRepDS/TopOpeBRepDS_trace.cxx delete mode 100644 src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.cxx delete mode 100644 src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx delete mode 100644 src/TopTools/TopTools_OrientedShapeMapHasher.cxx delete mode 100644 src/TopTools/TopTools_ShapeMapHasher.cxx delete mode 100644 src/TopoDS/TopoDS.cxx delete mode 100644 src/TopoDS/TopoDS_CompSolid.cxx delete mode 100644 src/TopoDS/TopoDS_Compound.cxx delete mode 100644 src/TopoDS/TopoDS_Edge.cxx delete mode 100644 src/TopoDS/TopoDS_Face.cxx delete mode 100644 src/TopoDS/TopoDS_Shell.cxx delete mode 100644 src/TopoDS/TopoDS_Solid.cxx delete mode 100644 src/TopoDS/TopoDS_Vertex.cxx delete mode 100644 src/TopoDS/TopoDS_Wire.cxx delete mode 100644 src/math/math_FunctionSetWithDerivatives.cxx delete mode 100644 src/math/math_MultipleVarFunctionWithGradient.cxx delete mode 100644 src/math/math_MultipleVarFunctionWithHessian.cxx diff --git a/src/BOPAlgo/BOPAlgo_WireEdgeSet.cxx b/src/BOPAlgo/BOPAlgo_WireEdgeSet.cxx deleted file mode 100644 index d0af89f660..0000000000 --- a/src/BOPAlgo/BOPAlgo_WireEdgeSet.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Created by: Peter KURNEV -// Copyright (c) 2010-2014 OPEN CASCADE SAS -// Copyright (c) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -// Copyright (c) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, -// EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. - - -#include -#include -#include diff --git a/src/BOPAlgo/FILES b/src/BOPAlgo/FILES index fd7ca3e9da..df1bea264e 100644 --- a/src/BOPAlgo/FILES +++ b/src/BOPAlgo/FILES @@ -57,7 +57,6 @@ BOPAlgo_ShellSplitter.cxx BOPAlgo_ShellSplitter.hxx BOPAlgo_Tools.cxx BOPAlgo_Tools.hxx -BOPAlgo_WireEdgeSet.cxx BOPAlgo_WireEdgeSet.hxx BOPAlgo_WireEdgeSet.lxx BOPAlgo_WireSplitter.cxx diff --git a/src/BOPDS/BOPDS_Curve.cxx b/src/BOPDS/BOPDS_Curve.cxx deleted file mode 100644 index 77771a2df9..0000000000 --- a/src/BOPDS/BOPDS_Curve.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created by: Peter KURNEV -// 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. - - -#include -#include -#include -#include diff --git a/src/BOPDS/BOPDS_FaceInfo.cxx b/src/BOPDS/BOPDS_FaceInfo.cxx deleted file mode 100644 index 0d0e6fb587..0000000000 --- a/src/BOPDS/BOPDS_FaceInfo.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created by: Peter KURNEV -// Copyright (c) 2010-2014 OPEN CASCADE SAS -// Copyright (c) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -// Copyright (c) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, -// EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. - - -#include diff --git a/src/BOPDS/BOPDS_PassKeyBoolean.cxx b/src/BOPDS/BOPDS_PassKeyBoolean.cxx deleted file mode 100644 index 62d91ccfc5..0000000000 --- a/src/BOPDS/BOPDS_PassKeyBoolean.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created by: Peter KURNEV -// Copyright (c) 2010-2014 OPEN CASCADE SAS -// Copyright (c) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -// Copyright (c) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, -// EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. - - -#include diff --git a/src/BOPDS/BOPDS_PassKeyMapHasher.cxx b/src/BOPDS/BOPDS_PassKeyMapHasher.cxx deleted file mode 100644 index 2cc3270ef0..0000000000 --- a/src/BOPDS/BOPDS_PassKeyMapHasher.cxx +++ /dev/null @@ -1,20 +0,0 @@ -// Created by: Peter KURNEV -// Copyright (c) 2010-2014 OPEN CASCADE SAS -// Copyright (c) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -// Copyright (c) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, -// EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. - - -#include -#include diff --git a/src/BOPDS/BOPDS_PaveMapHasher.cxx b/src/BOPDS/BOPDS_PaveMapHasher.cxx deleted file mode 100644 index 5171f7cda1..0000000000 --- a/src/BOPDS/BOPDS_PaveMapHasher.cxx +++ /dev/null @@ -1,17 +0,0 @@ -// Created by: Eugeny MALTCHIKOV -// 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. - - -#include -#include diff --git a/src/BOPDS/BOPDS_Point.cxx b/src/BOPDS/BOPDS_Point.cxx deleted file mode 100644 index bea344b697..0000000000 --- a/src/BOPDS/BOPDS_Point.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created by: Peter KURNEV -// 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. - - -#include -#include -#include diff --git a/src/BOPDS/BOPDS_Tools.cxx b/src/BOPDS/BOPDS_Tools.cxx deleted file mode 100644 index c8ab468c3d..0000000000 --- a/src/BOPDS/BOPDS_Tools.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// Created by: Peter KURNEV -// 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. - - -#include diff --git a/src/BOPDS/FILES b/src/BOPDS/FILES index 407bdae843..2ed0f45834 100644 --- a/src/BOPDS/FILES +++ b/src/BOPDS/FILES @@ -1,7 +1,6 @@ BOPDS_CommonBlock.cxx BOPDS_CommonBlock.hxx BOPDS_CoupleOfPaveBlocks.hxx -BOPDS_Curve.cxx BOPDS_Curve.hxx BOPDS_Curve.lxx BOPDS_DataMapOfIntegerListOfPaveBlock.hxx @@ -13,7 +12,6 @@ BOPDS_DataMapOfShapeCoupleOfPaveBlocks.hxx BOPDS_DS.cxx BOPDS_DS.hxx BOPDS_DS.lxx -BOPDS_FaceInfo.cxx BOPDS_FaceInfo.hxx BOPDS_FaceInfo.lxx BOPDS_IndexedDataMapOfPaveBlockListOfInteger.hxx @@ -40,10 +38,8 @@ BOPDS_MapOfPaveBlock.hxx BOPDS_PassKey.cxx BOPDS_PassKey.hxx BOPDS_PassKey.lxx -BOPDS_PassKeyBoolean.cxx BOPDS_PassKeyBoolean.hxx BOPDS_PassKeyBoolean.lxx -BOPDS_PassKeyMapHasher.cxx BOPDS_PassKeyMapHasher.hxx BOPDS_PassKeyMapHasher.lxx BOPDS_Pave.cxx @@ -51,13 +47,11 @@ BOPDS_Pave.hxx BOPDS_Pave.lxx BOPDS_PaveBlock.cxx BOPDS_PaveBlock.hxx -BOPDS_PaveMapHasher.cxx BOPDS_PaveMapHasher.hxx BOPDS_PaveMapHasher.lxx BOPDS_PDS.hxx BOPDS_PIterator.hxx BOPDS_PIteratorSI.hxx -BOPDS_Point.cxx BOPDS_Point.hxx BOPDS_Point.lxx BOPDS_ShapeInfo.cxx @@ -65,7 +59,6 @@ BOPDS_ShapeInfo.hxx BOPDS_ShapeInfo.lxx BOPDS_SubIterator.cxx BOPDS_SubIterator.hxx -BOPDS_Tools.cxx BOPDS_Tools.hxx BOPDS_Tools.lxx BOPDS_VectorOfCurve.hxx diff --git a/src/BOPTools/BOPTools_SetMapHasher.cxx b/src/BOPTools/BOPTools_SetMapHasher.cxx deleted file mode 100644 index 2855836f8a..0000000000 --- a/src/BOPTools/BOPTools_SetMapHasher.cxx +++ /dev/null @@ -1,17 +0,0 @@ -// Created by: Peter KURNEV -// 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. - - -#include -#include diff --git a/src/BOPTools/FILES b/src/BOPTools/FILES index 8a2ca326f4..c608840ea2 100755 --- a/src/BOPTools/FILES +++ b/src/BOPTools/FILES @@ -22,7 +22,6 @@ BOPTools_ListOfShapeSet.hxx BOPTools_MapOfSet.hxx BOPTools_Set.cxx BOPTools_Set.hxx -BOPTools_SetMapHasher.cxx BOPTools_SetMapHasher.hxx BOPTools_SetMapHasher.lxx BOPTools_ShapeSet.cxx diff --git a/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx b/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx index 5c1a383743..76e308773a 100644 --- a/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx +++ b/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -116,10 +115,6 @@ BRepAlgo_BooleanOperation::~BRepAlgo_BooleanOperation() HDS->ChangeDS().Init(); } -#ifdef OCCT_DEBUG - TopOpeBRepDS_SettraceSPSX_HDS(HDS); -#endif - // fill the data Structure TopOpeBRep_DSFiller DSFiller; diff --git a/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cxx b/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cxx deleted file mode 100644 index cb7211a37b..0000000000 --- a/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cxx +++ /dev/null @@ -1,20 +0,0 @@ -// Created on: 1998-02-02 -// Created by: Jean Yves LEBEY -// 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. - - -#include -#include -#include diff --git a/src/BRepFilletAPI/FILES b/src/BRepFilletAPI/FILES index 5763abed41..497c29905b 100644 --- a/src/BRepFilletAPI/FILES +++ b/src/BRepFilletAPI/FILES @@ -1,4 +1,3 @@ -BRepFilletAPI_LocalOperation.cxx BRepFilletAPI_LocalOperation.hxx BRepFilletAPI_MakeChamfer.cxx BRepFilletAPI_MakeChamfer.hxx diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeSweep.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeSweep.cxx deleted file mode 100644 index ac57b4793a..0000000000 --- a/src/BRepPrimAPI/BRepPrimAPI_MakeSweep.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created on: 1994-02-18 -// Created by: Remi LEQUETTE -// Copyright (c) 1994-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. - - -#include -#include diff --git a/src/BRepPrimAPI/FILES b/src/BRepPrimAPI/FILES index 7f3f666f69..f7d3a6a964 100644 --- a/src/BRepPrimAPI/FILES +++ b/src/BRepPrimAPI/FILES @@ -16,7 +16,6 @@ BRepPrimAPI_MakeRevolution.cxx BRepPrimAPI_MakeRevolution.hxx BRepPrimAPI_MakeSphere.cxx BRepPrimAPI_MakeSphere.hxx -BRepPrimAPI_MakeSweep.cxx BRepPrimAPI_MakeSweep.hxx BRepPrimAPI_MakeTorus.cxx BRepPrimAPI_MakeTorus.hxx diff --git a/src/DsgPrs/DsgPrs.cxx b/src/DsgPrs/DsgPrs.cxx index 2da93b38c1..99917f0c86 100644 --- a/src/DsgPrs/DsgPrs.cxx +++ b/src/DsgPrs/DsgPrs.cxx @@ -489,16 +489,8 @@ void DsgPrs::ComputeFilletRadiusPresentation( const Standard_Real /*ArrowLength* FilletCirc.SetRadius( Center.Distance( FirstPoint ) ); //*** gp_Vec vec1( dir1 ); vec1 *= FilletCirc.Radius(); -#ifdef OCCT_DEBUG - gp_Pnt p1 = -#endif - Center.Translated( vec1 ); gp_Vec vec2( dir2 ); vec2 *= FilletCirc.Radius(); -#ifdef OCCT_DEBUG - gp_Pnt p2 = -#endif - Center.Translated( vec2 ); gp_Vec PosVec; if(! Center.IsEqual( Position, Precision::Confusion() )) PosVec.SetXYZ( gp_Vec(Center, Position).XYZ() ); @@ -542,9 +534,6 @@ void DsgPrs::ComputeFilletRadiusPresentation( const Standard_Real /*ArrowLength* } FirstParCirc = ElCLib::Parameter( FilletCirc, FirstPoint ); LastParCirc = ElCLib::Parameter( FilletCirc, SecondPoint ); - -#ifdef OCCT_DEBUG -#endif } else //Angle equal 0 or PI or R = 0 { @@ -552,7 +541,6 @@ void DsgPrs::ComputeFilletRadiusPresentation( const Standard_Real /*ArrowLength* EndOfArrow = BasePnt; } - if(drawRevers) { gp_Vec Vd(DrawPosition, EndOfArrow); diff --git a/src/Extrema/Extrema_Curve2dTool.cxx b/src/Extrema/Extrema_Curve2dTool.cxx deleted file mode 100644 index bca47bf325..0000000000 --- a/src/Extrema/Extrema_Curve2dTool.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Created on: 1995-07-19 -// Created by: Modelistation -// Copyright (c) 1995-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. - - -#include -#include -#include -#include -#include -#include diff --git a/src/Extrema/Extrema_POnSurf.cxx b/src/Extrema/Extrema_POnSurf.cxx deleted file mode 100644 index 2dd54c5193..0000000000 --- a/src/Extrema/Extrema_POnSurf.cxx +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 1995-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. - - -#include -#include diff --git a/src/Extrema/Extrema_POnSurfParams.cxx b/src/Extrema/Extrema_POnSurfParams.cxx deleted file mode 100644 index 8e094b48fd..0000000000 --- a/src/Extrema/Extrema_POnSurfParams.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// 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. - - -#include -#include diff --git a/src/Extrema/FILES b/src/Extrema/FILES index 3be6cd0ad4..1156af9202 100644 --- a/src/Extrema/FILES +++ b/src/Extrema/FILES @@ -9,7 +9,6 @@ Extrema_CCLocFOfLocECC.hxx Extrema_CCLocFOfLocECC2d.hxx Extrema_CCLocFOfLocECC2d_0.cxx Extrema_CCLocFOfLocECC_0.cxx -Extrema_Curve2dTool.cxx Extrema_Curve2dTool.hxx Extrema_Curve2dTool.lxx Extrema_CurveLocator.gxx @@ -142,10 +141,8 @@ Extrema_POnCurv.hxx Extrema_POnCurv2d.hxx Extrema_POnCurv2d_0.cxx Extrema_POnCurv_0.cxx -Extrema_POnSurf.cxx Extrema_POnSurf.hxx Extrema_POnSurf.lxx -Extrema_POnSurfParams.cxx Extrema_POnSurfParams.hxx Extrema_POnSurfParams.lxx Extrema_SequenceOfPOnCurv.hxx diff --git a/src/GC/FILES b/src/GC/FILES index e42d6b7d2c..ef4d71c960 100644 --- a/src/GC/FILES +++ b/src/GC/FILES @@ -34,6 +34,5 @@ GC_MakeTrimmedCone.cxx GC_MakeTrimmedCone.hxx GC_MakeTrimmedCylinder.cxx GC_MakeTrimmedCylinder.hxx -GC_Root.cxx GC_Root.hxx GC_Root.lxx diff --git a/src/GC/GC_Root.cxx b/src/GC/GC_Root.cxx deleted file mode 100644 index 96eb916d16..0000000000 --- a/src/GC/GC_Root.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 1995-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. - - -#include diff --git a/src/GCE2d/FILES b/src/GCE2d/FILES index cb055530f0..be3f091996 100644 --- a/src/GCE2d/FILES +++ b/src/GCE2d/FILES @@ -26,6 +26,5 @@ GCE2d_MakeSegment.cxx GCE2d_MakeSegment.hxx GCE2d_MakeTranslation.cxx GCE2d_MakeTranslation.hxx -GCE2d_Root.cxx GCE2d_Root.hxx GCE2d_Root.lxx diff --git a/src/GCE2d/GCE2d_Root.cxx b/src/GCE2d/GCE2d_Root.cxx deleted file mode 100644 index 7aa223ea13..0000000000 --- a/src/GCE2d/GCE2d_Root.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 1995-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. - - -#include diff --git a/src/GeomInt/FILES b/src/GeomInt/FILES index 4a56fa8ab2..21f9b293d8 100755 --- a/src/GeomInt/FILES +++ b/src/GeomInt/FILES @@ -53,7 +53,6 @@ GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx GeomInt_TheMultiLineOfWLApprox.hxx GeomInt_TheMultiLineOfWLApprox_0.cxx GeomInt_TheMultiLineToolOfWLApprox.hxx -GeomInt_TheMultiLineToolOfWLApprox_0.cxx GeomInt_ThePrmPrmSvSurfacesOfWLApprox.hxx GeomInt_ThePrmPrmSvSurfacesOfWLApprox_0.cxx GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox.hxx diff --git a/src/GeomInt/GeomInt_TheMultiLineToolOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheMultiLineToolOfWLApprox_0.cxx deleted file mode 100644 index f720c122a3..0000000000 --- a/src/GeomInt/GeomInt_TheMultiLineToolOfWLApprox_0.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 1995-01-27 -// Created by: Jacques GOUSSARD -// Copyright (c) 1995-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. - -#include - -#include -#include - - -#define TheMultiLine GeomInt_TheMultiLineOfWLApprox -#define TheMultiLine_hxx -#define TheMultiMPoint ApproxInt_SvSurfaces -#define TheMultiMPoint_hxx -#define ApproxInt_MultiLineTool GeomInt_TheMultiLineToolOfWLApprox -#define ApproxInt_MultiLineTool_hxx -#include - diff --git a/src/HLRAlgo/FILES b/src/HLRAlgo/FILES index 4cb5aad3ae..c3badb1728 100644 --- a/src/HLRAlgo/FILES +++ b/src/HLRAlgo/FILES @@ -38,7 +38,6 @@ HLRAlgo_PolyAlgo.lxx HLRAlgo_PolyData.cxx HLRAlgo_PolyData.hxx HLRAlgo_PolyData.lxx -HLRAlgo_PolyHidingData.cxx HLRAlgo_PolyHidingData.hxx HLRAlgo_PolyHidingData.lxx HLRAlgo_PolyInternalData.cxx @@ -47,7 +46,6 @@ HLRAlgo_PolyInternalData.lxx HLRAlgo_PolyInternalNode.cxx HLRAlgo_PolyInternalNode.hxx HLRAlgo_PolyInternalNode.lxx -HLRAlgo_PolyInternalSegment.cxx HLRAlgo_PolyInternalSegment.hxx HLRAlgo_PolyInternalSegment.lxx HLRAlgo_PolyShellData.cxx @@ -56,7 +54,6 @@ HLRAlgo_PolyShellData.lxx HLRAlgo_Projector.cxx HLRAlgo_Projector.hxx HLRAlgo_Projector.lxx -HLRAlgo_TriangleData.cxx HLRAlgo_TriangleData.hxx HLRAlgo_TriangleData.lxx HLRAlgo_WiresBlock.cxx diff --git a/src/HLRAlgo/HLRAlgo_PolyHidingData.cxx b/src/HLRAlgo/HLRAlgo_PolyHidingData.cxx deleted file mode 100644 index daaf093b28..0000000000 --- a/src/HLRAlgo/HLRAlgo_PolyHidingData.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1995-06-21 -// Created by: Christophe MARION -// Copyright (c) 1995-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. - - -#include diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx deleted file mode 100644 index 14d43396d8..0000000000 --- a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1996-12-03 -// Created by: Christophe MARION -// 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. - - -#include diff --git a/src/HLRAlgo/HLRAlgo_TriangleData.cxx b/src/HLRAlgo/HLRAlgo_TriangleData.cxx deleted file mode 100644 index aec2127456..0000000000 --- a/src/HLRAlgo/HLRAlgo_TriangleData.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1993-01-11 -// Created by: Christophe MARION -// Copyright (c) 1993-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. - - -#include diff --git a/src/HLRBRep/FILES b/src/HLRBRep/FILES index 1e18766853..017217cad5 100644 --- a/src/HLRBRep/FILES +++ b/src/HLRBRep/FILES @@ -22,7 +22,6 @@ HLRBRep_CInter.hxx HLRBRep_CInter_0.cxx HLRBRep_CLProps.hxx HLRBRep_CLProps_0.cxx -HLRBRep_CLPropsATool.cxx HLRBRep_CLPropsATool.hxx HLRBRep_CLPropsATool.lxx HLRBRep_Curve.cxx @@ -67,7 +66,6 @@ HLRBRep_InternalAlgo.cxx HLRBRep_InternalAlgo.hxx HLRBRep_Intersector.cxx HLRBRep_Intersector.hxx -HLRBRep_LineTool.cxx HLRBRep_LineTool.hxx HLRBRep_LineTool.lxx HLRBRep_ListIteratorOfListOfBPnt2D.hxx diff --git a/src/HLRBRep/HLRBRep_CLPropsATool.cxx b/src/HLRBRep/HLRBRep_CLPropsATool.cxx deleted file mode 100644 index 96be339d10..0000000000 --- a/src/HLRBRep/HLRBRep_CLPropsATool.cxx +++ /dev/null @@ -1,20 +0,0 @@ -// Created on: 1992-08-18 -// Created by: Herve LEGRAND -// Copyright (c) 1992-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. - - -#include -#include -#include diff --git a/src/HLRBRep/HLRBRep_LineTool.cxx b/src/HLRBRep/HLRBRep_LineTool.cxx deleted file mode 100644 index c1e59f8b93..0000000000 --- a/src/HLRBRep/HLRBRep_LineTool.cxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 1993-12-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1993-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/src/IntImpParGen/FILES b/src/IntImpParGen/FILES index 24b2e7f494..731f82eea9 100755 --- a/src/IntImpParGen/FILES +++ b/src/IntImpParGen/FILES @@ -1,7 +1,6 @@ IntImpParGen.cxx IntImpParGen.hxx IntImpParGen_ImpParTool.gxx -IntImpParGen_ImpTool.cxx IntImpParGen_ImpTool.hxx IntImpParGen_Intersector.gxx IntImpParGen_Tool.cxx diff --git a/src/IntImpParGen/IntImpParGen_ImpTool.cxx b/src/IntImpParGen/IntImpParGen_ImpTool.cxx deleted file mode 100644 index 76af4d3a80..0000000000 --- a/src/IntImpParGen/IntImpParGen_ImpTool.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 1995-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. - - -#include -#include -#include diff --git a/src/IntPatch/FILES b/src/IntPatch/FILES index 49c276673a..ea0520e550 100755 --- a/src/IntPatch/FILES +++ b/src/IntPatch/FILES @@ -55,7 +55,6 @@ IntPatch_Polygo.hxx IntPatch_Polygo.lxx IntPatch_Polyhedron.cxx IntPatch_Polyhedron.hxx -IntPatch_PolyhedronTool.cxx IntPatch_PolyhedronTool.hxx IntPatch_PolyhedronTool.lxx IntPatch_PolyLine.cxx diff --git a/src/IntPatch/IntPatch_PolyhedronTool.cxx b/src/IntPatch/IntPatch_PolyhedronTool.cxx deleted file mode 100644 index 1fde5e9918..0000000000 --- a/src/IntPatch/IntPatch_PolyhedronTool.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// Created on: 1993-05-06 -// Created by: Jacques GOUSSARD -// Copyright (c) 1993-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. - - -#include -#include -#include -#include -#include diff --git a/src/IntSurf/FILES b/src/IntSurf/FILES index 290be828b8..2441b2d995 100644 --- a/src/IntSurf/FILES +++ b/src/IntSurf/FILES @@ -1,13 +1,11 @@ IntSurf.cxx IntSurf.hxx IntSurf_Allocator.hxx -IntSurf_Couple.cxx IntSurf_Couple.hxx IntSurf_Couple.lxx IntSurf_InteriorPoint.cxx IntSurf_InteriorPoint.hxx IntSurf_InteriorPoint.lxx -IntSurf_InteriorPointTool.cxx IntSurf_InteriorPointTool.hxx IntSurf_InteriorPointTool.lxx IntSurf_LineOn2S.cxx @@ -18,7 +16,6 @@ IntSurf_ListOfPntOn2S.hxx IntSurf_PathPoint.cxx IntSurf_PathPoint.hxx IntSurf_PathPoint.lxx -IntSurf_PathPointTool.cxx IntSurf_PathPointTool.hxx IntSurf_PathPointTool.lxx IntSurf_PntOn2S.cxx diff --git a/src/IntSurf/IntSurf_Couple.cxx b/src/IntSurf/IntSurf_Couple.cxx deleted file mode 100644 index 09ae47be78..0000000000 --- a/src/IntSurf/IntSurf_Couple.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 1995-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. - - -#include diff --git a/src/IntSurf/IntSurf_InteriorPointTool.cxx b/src/IntSurf/IntSurf_InteriorPointTool.cxx deleted file mode 100644 index 1ce6e9a482..0000000000 --- a/src/IntSurf/IntSurf_InteriorPointTool.cxx +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 1995-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. - - -#include -#include diff --git a/src/IntSurf/IntSurf_PathPointTool.cxx b/src/IntSurf/IntSurf_PathPointTool.cxx deleted file mode 100644 index 7656ff136e..0000000000 --- a/src/IntSurf/IntSurf_PathPointTool.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 1995-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. - - -#include -#include -#include -#include diff --git a/src/IntTools/FILES b/src/IntTools/FILES index 9e9f59bd44..340f3b1ac3 100644 --- a/src/IntTools/FILES +++ b/src/IntTools/FILES @@ -27,7 +27,6 @@ IntTools_CurveRangeLocalizeData.lxx IntTools_CurveRangeSample.cxx IntTools_CurveRangeSample.hxx IntTools_CurveRangeSample.lxx -IntTools_CurveRangeSampleMapHasher.cxx IntTools_CurveRangeSampleMapHasher.hxx IntTools_CurveRangeSampleMapHasher.lxx IntTools_DataMapIteratorOfDataMapOfCurveSampleBox.hxx @@ -78,7 +77,6 @@ IntTools_SurfaceRangeLocalizeData.lxx IntTools_SurfaceRangeSample.cxx IntTools_SurfaceRangeSample.hxx IntTools_SurfaceRangeSample.lxx -IntTools_SurfaceRangeSampleMapHasher.cxx IntTools_SurfaceRangeSampleMapHasher.hxx IntTools_SurfaceRangeSampleMapHasher.lxx IntTools_Tools.cxx diff --git a/src/IntTools/IntTools_CurveRangeSampleMapHasher.cxx b/src/IntTools/IntTools_CurveRangeSampleMapHasher.cxx deleted file mode 100644 index 0cdb4bf2b6..0000000000 --- a/src/IntTools/IntTools_CurveRangeSampleMapHasher.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 2005-10-14 -// Created by: Mikhail KLOKOV -// Copyright (c) 2005-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. - - -#include -#include diff --git a/src/IntTools/IntTools_SurfaceRangeSampleMapHasher.cxx b/src/IntTools/IntTools_SurfaceRangeSampleMapHasher.cxx deleted file mode 100644 index 44dd3ab8a6..0000000000 --- a/src/IntTools/IntTools_SurfaceRangeSampleMapHasher.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 2005-10-14 -// Created by: Mikhail KLOKOV -// Copyright (c) 2005-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. - - -#include -#include diff --git a/src/LocOpe/FILES b/src/LocOpe/FILES index 821ffaef6d..0fe8ca4d97 100644 --- a/src/LocOpe/FILES +++ b/src/LocOpe/FILES @@ -41,7 +41,6 @@ LocOpe_Operation.hxx LocOpe_Pipe.cxx LocOpe_Pipe.hxx LocOpe_Pipe.lxx -LocOpe_PntFace.cxx LocOpe_PntFace.hxx LocOpe_PntFace.lxx LocOpe_Prism.cxx diff --git a/src/LocOpe/LocOpe_PntFace.cxx b/src/LocOpe/LocOpe_PntFace.cxx deleted file mode 100644 index 93f821b8ba..0000000000 --- a/src/LocOpe/LocOpe_PntFace.cxx +++ /dev/null @@ -1,20 +0,0 @@ -// Created on: 1995-05-29 -// Created by: Jacques GOUSSARD -// Copyright (c) 1995-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. - - -#include -#include -#include diff --git a/src/MAT2d/FILES b/src/MAT2d/FILES index 336aecacc0..5f95ac3f87 100644 --- a/src/MAT2d/FILES +++ b/src/MAT2d/FILES @@ -21,7 +21,6 @@ MAT2d_DataMapOfIntegerConnexion.hxx MAT2d_DataMapOfIntegerPnt2d.hxx MAT2d_DataMapOfIntegerSequenceOfConnexion.hxx MAT2d_DataMapOfIntegerVec2d.hxx -MAT2d_MapBiIntHasher.cxx MAT2d_MapBiIntHasher.hxx MAT2d_MapBiIntHasher.lxx MAT2d_Mat2d.cxx diff --git a/src/MAT2d/MAT2d_MapBiIntHasher.cxx b/src/MAT2d/MAT2d_MapBiIntHasher.cxx deleted file mode 100644 index efc88f8964..0000000000 --- a/src/MAT2d/MAT2d_MapBiIntHasher.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created on: 1993-11-19 -// Created by: Yves FRICAUD -// Copyright (c) 1993-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. - - -#include -#include diff --git a/src/OSD/FILES b/src/OSD/FILES index a7742466fa..689218cfdd 100755 --- a/src/OSD/FILES +++ b/src/OSD/FILES @@ -78,7 +78,6 @@ OSD_SIGINT.hxx OSD_SIGKILL.hxx OSD_signal.cxx OSD_Signal.hxx -OSD_signal_WNT.cxx OSD_SIGQUIT.hxx OSD_SIGSEGV.hxx OSD_SIGSYS.hxx diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx index 6f7f009472..31e407ee3d 100644 --- a/src/OSD/OSD_signal.cxx +++ b/src/OSD/OSD_signal.cxx @@ -13,8 +13,579 @@ #include +#include +#include +#include -#ifndef _WIN32 +#ifdef _WIN32 +//---------------------------- Windows NT System -------------------------------- + +#define STRICT +#ifdef NOUSER +#undef NOUSER +#endif +#include + +#ifndef STATUS_FLOAT_MULTIPLE_FAULTS + // + #define STATUS_FLOAT_MULTIPLE_FAULTS (0xC00002B4L) + #define STATUS_FLOAT_MULTIPLE_TRAPS (0xC00002B5L) +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#ifdef _MSC_VER +#include +#include +#endif + +#include +#include +#include + +static Standard_Boolean fMsgBox; +static Standard_Boolean fFltExceptions; +static Standard_Boolean fDbgLoaded; +static Standard_Boolean fCtrlBrk; + +// used to forbid simultaneous execution of setting / executing handlers +static Standard_Mutex THE_SIGNAL_MUTEX; + +static LONG __fastcall _osd_raise ( DWORD, LPSTR ); +static BOOL WINAPI _osd_ctrl_break_handler ( DWORD ); + +static LONG _osd_debug ( void ); + +//# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW | _EM_UNDERFLOW ) +# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW ) + +//======================================================================= +//function : CallHandler +//purpose : +//======================================================================= +static LONG CallHandler (DWORD dwExceptionCode, + ptrdiff_t ExceptionInformation1, + ptrdiff_t ExceptionInformation0) +{ + +#if !defined(__CYGWIN32__) && !defined(__MINGW32__) + + Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling + static char buffer[ 2048 ]; + int flterr = 0; + + buffer[0] = '\0' ; + +// cout << "CallHandler " << dwExceptionCode << endl ; + switch ( dwExceptionCode ) { + case EXCEPTION_FLT_DENORMAL_OPERAND: +// cout << "CallHandler : EXCEPTION_FLT_DENORMAL_OPERAND:" << endl ; + lstrcpyA ( buffer, "FLT DENORMAL OPERAND" ); + flterr = 1 ; + break ; + case EXCEPTION_FLT_DIVIDE_BY_ZERO: +// cout << "CallHandler : EXCEPTION_FLT_DIVIDE_BY_ZERO:" << endl ; + lstrcpyA ( buffer, "FLT DIVIDE BY ZERO" ); + flterr = 1 ; + break ; + case EXCEPTION_FLT_INEXACT_RESULT: +// cout << "CallHandler : EXCEPTION_FLT_INEXACT_RESULT:" << endl ; + lstrcpyA ( buffer, "FLT INEXACT RESULT" ); + flterr = 1 ; + break ; + case EXCEPTION_FLT_INVALID_OPERATION: +// cout << "CallHandler : EXCEPTION_FLT_INVALID_OPERATION:" << endl ; + lstrcpyA ( buffer, "FLT INVALID OPERATION" ); + flterr = 1 ; + break ; + case EXCEPTION_FLT_OVERFLOW: +// cout << "CallHandler : EXCEPTION_FLT_OVERFLOW:" << endl ; + lstrcpyA ( buffer, "FLT OVERFLOW" ); + flterr = 1 ; + break ; + case EXCEPTION_FLT_STACK_CHECK: +// cout << "CallHandler : EXCEPTION_FLT_STACK_CHECK:" << endl ; + lstrcpyA ( buffer, "FLT STACK CHECK" ); + flterr = 1 ; + break ; + case EXCEPTION_FLT_UNDERFLOW: +// cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ; + lstrcpyA ( buffer, "FLT UNDERFLOW" ); + flterr = 1 ; + break ; + case STATUS_FLOAT_MULTIPLE_TRAPS: +// cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ; + lstrcpyA ( buffer, "FLT MULTIPLE TRAPS (possible overflow in conversion of double to integer)" ); + flterr = 1 ; + break ; + case STATUS_FLOAT_MULTIPLE_FAULTS: +// cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ; + lstrcpyA ( buffer, "FLT MULTIPLE FAULTS" ); + flterr = 1 ; + break ; + case STATUS_NO_MEMORY: +// cout << "CallHandler : STATUS_NO_MEMORY:" << endl ; + OSD_Exception_STATUS_NO_MEMORY :: + Raise ( "MEMORY ALLOCATION ERROR ( no room in the process heap )" ); + case EXCEPTION_ACCESS_VIOLATION: +// cout << "CallHandler : EXCEPTION_ACCESS_VIOLATION:" << endl ; + wsprintf ( buffer, "%s%s%s0x%.8p%s%s%s", "ACCESS VIOLATION", + fMsgBox ? "\n" : " ", "at address ", + ExceptionInformation1 , + " during '", + ExceptionInformation0 ? "WRITE" : "READ", + "' operation"); + break; + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: +// cout << "CallHandler : EXCEPTION_ARRAY_BOUNDS_EXCEEDED:" << endl ; + lstrcpyA ( buffer, "ARRAY BOUNDS EXCEEDED" ); + break; + case EXCEPTION_DATATYPE_MISALIGNMENT: +// cout << "CallHandler : EXCEPTION_DATATYPE_MISALIGNMENT:" << endl ; + lstrcpyA ( buffer, "DATATYPE MISALIGNMENT" ); + break; + + case EXCEPTION_ILLEGAL_INSTRUCTION: +// cout << "CallHandler : EXCEPTION_ILLEGAL_INSTRUCTION:" << endl ; + lstrcpyA ( buffer, "ILLEGAL INSTRUCTION" ); + break; + + case EXCEPTION_IN_PAGE_ERROR: +// cout << "CallHandler : EXCEPTION_IN_PAGE_ERROR:" << endl ; + lstrcpyA ( buffer, "IN_PAGE ERROR" ); + break; + + case EXCEPTION_INT_DIVIDE_BY_ZERO: +// cout << "CallHandler : EXCEPTION_INT_DIVIDE_BY_ZERO:" << endl ; + lstrcpyA ( buffer, "INTEGER DIVISION BY ZERO" ); + break; + + case EXCEPTION_INT_OVERFLOW: +// cout << "CallHandler : EXCEPTION_INT_OVERFLOW:" << endl ; + lstrcpyA ( buffer, "INTEGER OVERFLOW" ); + break; + + case EXCEPTION_INVALID_DISPOSITION: +// cout << "CallHandler : EXCEPTION_INVALID_DISPOSITION:" << endl ; + lstrcpyA ( buffer, "INVALID DISPOSITION" ); + break; + + case EXCEPTION_NONCONTINUABLE_EXCEPTION: +// cout << "CallHandler : EXCEPTION_NONCONTINUABLE_EXCEPTION:" << endl ; + lstrcpyA ( buffer, "NONCONTINUABLE EXCEPTION" ); + break; + + case EXCEPTION_PRIV_INSTRUCTION: +// cout << "CallHandler : EXCEPTION_PRIV_INSTRUCTION:" << endl ; + lstrcpyA ( buffer, "PRIVELEGED INSTRUCTION ENCOUNTERED" ); + break; + + case EXCEPTION_STACK_OVERFLOW: +// cout << "CallHandler : EXCEPTION_STACK_OVERFLOW:" << endl ; +#if defined( _MSC_VER ) && ( _MSC_VER >= 1300 ) + // try recovering from stack overflow: available in MS VC++ 7.0 + if (!_resetstkoflw()) + lstrcpyA ( buffer, "Unrecoverable STACK OVERFLOW" ); + else +#endif + lstrcpyA ( buffer, "STACK OVERFLOW" ); + break; + + default: + wsprintf( buffer, "unknown exception code 0x%x, params 0x%p 0x%p", + dwExceptionCode, ExceptionInformation1, ExceptionInformation0 ); + + } // end switch + + // provide message to the user with possibility to stop + int idx = lstrlenA ( buffer ); + if ( idx && fMsgBox && dwExceptionCode != EXCEPTION_NONCONTINUABLE_EXCEPTION ) { + // reset FP operations before message box, otherwise it may fail to show up + _fpreset(); + _clearfp(); + + MessageBeep ( MB_ICONHAND ); + int aChoice = ::MessageBox (0, buffer, "OCCT Exception Handler", MB_ABORTRETRYIGNORE | MB_ICONSTOP); + if (aChoice == IDRETRY) + { + _osd_debug(); + DebugBreak(); + } else if (aChoice == IDABORT) + exit(0xFFFF); + } + + // reset FPE state + if ( flterr ) { + if ( !fFltExceptions ) return EXCEPTION_EXECUTE_HANDLER; + _fpreset () ; + _clearfp() ; + _controlfp ( 0, _OSD_FPX ) ; // JR add : +// cout << "OSD::WntHandler _controlfp( 0, _OSD_FPX ) " << hex << _controlfp(0,0) << dec << endl ; + } + return _osd_raise ( dwExceptionCode, buffer ); +#else + return 0; +#endif +} + +//======================================================================= +//function : SIGWntHandler +//purpose : Will only be used if user calls ::raise() function with +// signal type set in OSD::SetSignal() - SIGSEGV, SIGFPE, SIGILL +// (the latter will likely be removed in the future) +//======================================================================= +static void SIGWntHandler (int signum, int sub_code) +{ +#if !defined(__CYGWIN32__) && !defined(__MINGW32__) + Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling + switch( signum ) { + case SIGFPE : + if ( signal( signum , (void(*)(int))SIGWntHandler ) == SIG_ERR ) + cout << "signal error" << endl ; + switch( sub_code ) { + case _FPE_INVALID : + CallHandler( EXCEPTION_FLT_INVALID_OPERATION ,0,0) ; + break ; + case _FPE_DENORMAL : + CallHandler( EXCEPTION_FLT_DENORMAL_OPERAND ,0,0) ; + break ; + case _FPE_ZERODIVIDE : + CallHandler( EXCEPTION_FLT_DIVIDE_BY_ZERO ,0,0) ; + break ; + case _FPE_OVERFLOW : + CallHandler( EXCEPTION_FLT_OVERFLOW ,0,0) ; + break ; + case _FPE_UNDERFLOW : + CallHandler( EXCEPTION_FLT_UNDERFLOW ,0,0) ; + break ; + case _FPE_INEXACT : + CallHandler( EXCEPTION_FLT_INEXACT_RESULT ,0,0) ; + break ; + default: + cout << "SIGWntHandler(default) -> Standard_NumericError::Raise(\"Floating Point Error\");" << endl; + Standard_NumericError::Raise("Floating Point Error"); + break ; + } + break ; + case SIGSEGV : + if ( signal( signum, (void(*)(int))SIGWntHandler ) == SIG_ERR ) + cout << "signal error" << endl ; + CallHandler( EXCEPTION_ACCESS_VIOLATION ,0,0) ; + break ; + case SIGILL : + if ( signal( signum, (void(*)(int))SIGWntHandler ) == SIG_ERR ) + cout << "signal error" << endl ; + CallHandler( EXCEPTION_ILLEGAL_INSTRUCTION ,0,0) ; + break ; + default: + cout << "SIGWntHandler unexpected signal : " << signum << endl ; + break ; + } + DebugBreak (); +#endif +} + +//======================================================================= +//function : TranslateSE +//purpose : Translate Structural Exceptions into C++ exceptions +// Will be used when user's code is compiled with /EHa option +//======================================================================= +#ifdef _MSC_VER +// If this file compiled with the default MSVC options for exception +// handling (/GX or /EHsc) then the following warning is issued: +// warning C4535: calling _set_se_translator() requires /EHa +// However it is correctly inserted and used when user's code compiled with /EHa. +// So, here we disable the warning. +#pragma warning (disable:4535) + +static void TranslateSE( unsigned int theCode, EXCEPTION_POINTERS* theExcPtr ) +{ + Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling + ptrdiff_t info1 = 0, info0 = 0; + if ( theExcPtr ) { + info1 = theExcPtr->ExceptionRecord->ExceptionInformation[1]; + info0 = theExcPtr->ExceptionRecord->ExceptionInformation[0]; + } + CallHandler(theCode, info1, info0); +} +#endif + +//======================================================================= +//function : WntHandler +//purpose : Will be used when user's code is compiled with /EHs +// option and unless user sets his own exception handler with +// ::SetUnhandledExceptionFilter(). +//======================================================================= +static LONG WINAPI WntHandler (EXCEPTION_POINTERS *lpXP) +{ + DWORD dwExceptionCode = lpXP->ExceptionRecord->ExceptionCode; + + return CallHandler (dwExceptionCode, + lpXP->ExceptionRecord->ExceptionInformation[1], + lpXP->ExceptionRecord->ExceptionInformation[0]); +} + +//======================================================================= +//function : SetSignal +//purpose : +//======================================================================= +void OSD::SetSignal (const Standard_Boolean theFloatingSignal) +{ +#if !defined(__CYGWIN32__) && !defined(__MINGW32__) + Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling + LPTOP_LEVEL_EXCEPTION_FILTER aPreviousFilter; + + OSD_Environment env (TEXT("CSF_DEBUG_MODE")); + TCollection_AsciiString val = env.Value(); + if (!env.Failed()) + { + cout << "Environment variable CSF_DEBUG_MODE setted.\n"; + fMsgBox = Standard_True; + } + else + { + fMsgBox = Standard_False; + } + + // Set exception handler (ignored when running under debugger). It will be used in most cases + // when user's code is compiled with /EHs + // Replaces the existing top-level exception filter for all existing and all future threads + // in the calling process + aPreviousFilter = ::SetUnhandledExceptionFilter (/*(LPTOP_LEVEL_EXCEPTION_FILTER)*/ WntHandler); + + // Signal handlers will only be used when the method ::raise() will be used + // Handlers must be set for every thread + if (signal (SIGSEGV, (void(*)(int))SIGWntHandler) == SIG_ERR) + cout << "signal(OSD::SetSignal) error\n"; + if (signal (SIGFPE, (void(*)(int))SIGWntHandler) == SIG_ERR) + cout << "signal(OSD::SetSignal) error\n"; + if (signal (SIGILL, (void(*)(int))SIGWntHandler) == SIG_ERR) + cout << "signal(OSD::SetSignal) error\n"; + + // Set Ctrl-C and Ctrl-Break handler + fCtrlBrk = Standard_False; + SetConsoleCtrlHandler (&_osd_ctrl_break_handler, TRUE); + +#ifdef _MSC_VER +// _se_translator_function pOldSeFunc = + _set_se_translator (TranslateSE); +#endif + + fFltExceptions = theFloatingSignal; + if (theFloatingSignal) + { + _controlfp (0, _OSD_FPX); // JR add : + } + else { + _controlfp (_OSD_FPX, _OSD_FPX); // JR add : + } +#endif +} // end OSD :: SetSignal + +//============================================================================ +//==== ControlBreak +//============================================================================ +void OSD::ControlBreak () { + if ( fCtrlBrk ) { + fCtrlBrk = Standard_False; + OSD_Exception_CTRL_BREAK :: Raise ( TEXT( "*** INTERRUPT ***" ) ); + } +} // end OSD :: ControlBreak + +//============================================================================ +//==== _osd_ctrl_break_handler +//============================================================================ +static BOOL WINAPI _osd_ctrl_break_handler ( DWORD dwCode ) { + if ( dwCode == CTRL_C_EVENT || dwCode == CTRL_BREAK_EVENT ) { + MessageBeep ( MB_ICONEXCLAMATION ); + fCtrlBrk = Standard_True; + } else + exit ( 254 ); + + return TRUE; +} // end _osd_ctrl_break_handler + +//============================================================================ +//==== _osd_raise +//============================================================================ +static LONG __fastcall _osd_raise ( DWORD dwCode, LPSTR msg ) +{ + if (msg[0] == '\x03') ++msg; + + switch (dwCode) + { + case EXCEPTION_ACCESS_VIOLATION: + OSD_Exception_ACCESS_VIOLATION::Raise (msg); + break; + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + OSD_Exception_ARRAY_BOUNDS_EXCEEDED::Raise (msg); + break; + case EXCEPTION_DATATYPE_MISALIGNMENT: + Standard_ProgramError::Raise (msg); + break; + case EXCEPTION_ILLEGAL_INSTRUCTION: + OSD_Exception_ILLEGAL_INSTRUCTION::Raise (msg); + break; + case EXCEPTION_IN_PAGE_ERROR: + OSD_Exception_IN_PAGE_ERROR::Raise (msg); + break; + case EXCEPTION_INT_DIVIDE_BY_ZERO: + Standard_DivideByZero::Raise (msg); + break; + case EXCEPTION_INT_OVERFLOW: + OSD_Exception_INT_OVERFLOW::Raise (msg); + break; + case EXCEPTION_INVALID_DISPOSITION: + OSD_Exception_INVALID_DISPOSITION::Raise (msg); + break; + case EXCEPTION_NONCONTINUABLE_EXCEPTION: + OSD_Exception_NONCONTINUABLE_EXCEPTION::Raise (msg); + break; + case EXCEPTION_PRIV_INSTRUCTION: + OSD_Exception_PRIV_INSTRUCTION::Raise (msg); + break; + case EXCEPTION_STACK_OVERFLOW: + OSD_Exception_STACK_OVERFLOW::Raise (msg); + break; + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + Standard_DivideByZero::Raise (msg); + break; + case EXCEPTION_FLT_STACK_CHECK: + case EXCEPTION_FLT_OVERFLOW: + Standard_Overflow::Raise (msg); + break; + case EXCEPTION_FLT_UNDERFLOW: + Standard_Underflow::Raise (msg); + break; + case EXCEPTION_FLT_INVALID_OPERATION: + case EXCEPTION_FLT_DENORMAL_OPERAND: + case EXCEPTION_FLT_INEXACT_RESULT: + case STATUS_FLOAT_MULTIPLE_TRAPS: + case STATUS_FLOAT_MULTIPLE_FAULTS: + Standard_NumericError::Raise (msg); + break; + default: + break; + } // end switch + return EXCEPTION_EXECUTE_HANDLER; +} // end _osd_raise + +//============================================================================ +//==== _osd_debug +//============================================================================ +#if defined(__CYGWIN32__) || defined(__MINGW32__) +#define __try +#define __finally +#define __leave return 0 +#endif + +LONG _osd_debug ( void ) { + + LONG action ; + + if ( !fDbgLoaded ) { + + HKEY hKey = NULL; + HANDLE hEvent = INVALID_HANDLE_VALUE; + DWORD dwKeyType; + DWORD dwValueLen; + TCHAR keyValue[ MAX_PATH ]; + TCHAR cmdLine[ MAX_PATH ]; + SECURITY_ATTRIBUTES sa; + PROCESS_INFORMATION pi; + STARTUPINFO si; + + __try { + + if ( RegOpenKey ( + HKEY_LOCAL_MACHINE, + TEXT( "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug" ), + &hKey + ) != ERROR_SUCCESS + ) __leave; + + dwValueLen = sizeof ( keyValue ); + + if ( RegQueryValueEx ( + hKey, TEXT( "Debugger" ), NULL, &dwKeyType, ( unsigned char* )keyValue, &dwValueLen + ) != ERROR_SUCCESS + ) __leave; + + sa.nLength = sizeof ( SECURITY_ATTRIBUTES ); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + if ( ( hEvent = CreateEvent ( &sa, TRUE, FALSE, NULL ) ) == NULL ) __leave; + + wsprintf ( cmdLine, keyValue, GetCurrentProcessId (), hEvent ); + + ZeroMemory ( &si, sizeof ( STARTUPINFO ) ); + + si.cb = sizeof ( STARTUPINFO ); + si.dwFlags = STARTF_FORCEONFEEDBACK; + + // cout << "_osd_debug -> CreateProcess" << endl ; + if ( !CreateProcess ( + NULL, cmdLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, + NULL, NULL, &si, &pi + ) + ) __leave; + + // cout << "_osd_debug -> WaitForSingleObject " << endl ; + WaitForSingleObject ( hEvent, INFINITE ); + // cout << "_osd_debug <- WaitForSingleObject -> CloseHandle " << endl ; + + CloseHandle ( pi.hProcess ); + CloseHandle ( pi.hThread ); + + // cout << "_osd_debug fDbgLoaded " << endl ; + fDbgLoaded = TRUE; + + } // end __try + + __finally { + +// cout << "_osd_debug -> CloseHandle(hKey) " << endl ; + if ( hKey != INVALID_HANDLE_VALUE ) CloseHandle ( hKey ); +// cout << "_osd_debug -> CloseHandle(hEvent) " << endl ; + if ( hEvent != INVALID_HANDLE_VALUE ) CloseHandle ( hEvent ); +// cout << "_osd_debug end __finally " << endl ; + + } // end __finally + + } /* end if */ + + action = fDbgLoaded ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_EXECUTE_HANDLER; +// cout << "_osd_debug return " << action << " EXCEPTION_CONTINUE_EXECUTION(" +// << EXCEPTION_CONTINUE_EXECUTION << ")" << endl ; + return action ; + +} // end _osd_debug + +#if defined(__CYGWIN32__) || defined(__MINGW32__) +#undef __try +#undef __finally +#undef __leave +#endif + +#else //---------- All Systems except Windows NT : ---------------------------------- @@ -29,10 +600,7 @@ #include #include #include -#include #include -#include -#include #include diff --git a/src/OSD/OSD_signal_WNT.cxx b/src/OSD/OSD_signal_WNT.cxx deleted file mode 100644 index 7c09160596..0000000000 --- a/src/OSD/OSD_signal_WNT.cxx +++ /dev/null @@ -1,607 +0,0 @@ -// 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. - - -#include - -#ifdef _WIN32 - -//---------------------------- Windows NT System -------------------------------- - -#define STRICT -#ifdef NOUSER -#undef NOUSER -#endif -#include - -#ifndef STATUS_FLOAT_MULTIPLE_FAULTS - // - #define STATUS_FLOAT_MULTIPLE_FAULTS (0xC00002B4L) - #define STATUS_FLOAT_MULTIPLE_TRAPS (0xC00002B5L) -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include - -#ifdef _MSC_VER -#include -#include -#endif - -#include -#include -#include - -static Standard_Boolean fMsgBox; -static Standard_Boolean fFltExceptions; -static Standard_Boolean fDbgLoaded; -static Standard_Boolean fCtrlBrk; - -// used to forbid simultaneous execution of setting / executing handlers -static Standard_Mutex THE_SIGNAL_MUTEX; - -static LONG __fastcall _osd_raise ( DWORD, LPSTR ); -static BOOL WINAPI _osd_ctrl_break_handler ( DWORD ); - -static LONG _osd_debug ( void ); - -//# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW | _EM_UNDERFLOW ) -# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW ) - -//======================================================================= -//function : CallHandler -//purpose : -//======================================================================= -static LONG CallHandler (DWORD dwExceptionCode, - ptrdiff_t ExceptionInformation1, - ptrdiff_t ExceptionInformation0) -{ - -#if !defined(__CYGWIN32__) && !defined(__MINGW32__) - - Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling - static char buffer[ 2048 ]; - int flterr = 0; - - buffer[0] = '\0' ; - -// cout << "CallHandler " << dwExceptionCode << endl ; - switch ( dwExceptionCode ) { - - case EXCEPTION_FLT_DENORMAL_OPERAND: -// cout << "CallHandler : EXCEPTION_FLT_DENORMAL_OPERAND:" << endl ; - lstrcpyA ( buffer, "FLT DENORMAL OPERAND" ); - flterr = 1 ; - break ; - case EXCEPTION_FLT_DIVIDE_BY_ZERO: -// cout << "CallHandler : EXCEPTION_FLT_DIVIDE_BY_ZERO:" << endl ; - lstrcpyA ( buffer, "FLT DIVIDE BY ZERO" ); - flterr = 1 ; - break ; - case EXCEPTION_FLT_INEXACT_RESULT: -// cout << "CallHandler : EXCEPTION_FLT_INEXACT_RESULT:" << endl ; - lstrcpyA ( buffer, "FLT INEXACT RESULT" ); - flterr = 1 ; - break ; - case EXCEPTION_FLT_INVALID_OPERATION: -// cout << "CallHandler : EXCEPTION_FLT_INVALID_OPERATION:" << endl ; - lstrcpyA ( buffer, "FLT INVALID OPERATION" ); - flterr = 1 ; - break ; - case EXCEPTION_FLT_OVERFLOW: -// cout << "CallHandler : EXCEPTION_FLT_OVERFLOW:" << endl ; - lstrcpyA ( buffer, "FLT OVERFLOW" ); - flterr = 1 ; - break ; - case EXCEPTION_FLT_STACK_CHECK: -// cout << "CallHandler : EXCEPTION_FLT_STACK_CHECK:" << endl ; - lstrcpyA ( buffer, "FLT STACK CHECK" ); - flterr = 1 ; - break ; - case EXCEPTION_FLT_UNDERFLOW: -// cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ; - lstrcpyA ( buffer, "FLT UNDERFLOW" ); - flterr = 1 ; - break ; - case STATUS_FLOAT_MULTIPLE_TRAPS: -// cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ; - lstrcpyA ( buffer, "FLT MULTIPLE TRAPS (possible overflow in conversion of double to integer)" ); - flterr = 1 ; - break ; - case STATUS_FLOAT_MULTIPLE_FAULTS: -// cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ; - lstrcpyA ( buffer, "FLT MULTIPLE FAULTS" ); - flterr = 1 ; - break ; - - case STATUS_NO_MEMORY: -// cout << "CallHandler : STATUS_NO_MEMORY:" << endl ; - OSD_Exception_STATUS_NO_MEMORY :: - Raise ( "MEMORY ALLOCATION ERROR ( no room in the process heap )" ); - - case EXCEPTION_ACCESS_VIOLATION: -// cout << "CallHandler : EXCEPTION_ACCESS_VIOLATION:" << endl ; - wsprintf ( buffer, "%s%s%s0x%.8p%s%s%s", "ACCESS VIOLATION", - fMsgBox ? "\n" : " ", "at address ", - ExceptionInformation1 , - " during '", - ExceptionInformation0 ? "WRITE" : "READ", - "' operation"); - break; - - case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: -// cout << "CallHandler : EXCEPTION_ARRAY_BOUNDS_EXCEEDED:" << endl ; - lstrcpyA ( buffer, "ARRAY BOUNDS EXCEEDED" ); - break; - - case EXCEPTION_DATATYPE_MISALIGNMENT: -// cout << "CallHandler : EXCEPTION_DATATYPE_MISALIGNMENT:" << endl ; - lstrcpyA ( buffer, "DATATYPE MISALIGNMENT" ); - break; - - case EXCEPTION_ILLEGAL_INSTRUCTION: -// cout << "CallHandler : EXCEPTION_ILLEGAL_INSTRUCTION:" << endl ; - lstrcpyA ( buffer, "ILLEGAL INSTRUCTION" ); - break; - - case EXCEPTION_IN_PAGE_ERROR: -// cout << "CallHandler : EXCEPTION_IN_PAGE_ERROR:" << endl ; - lstrcpyA ( buffer, "IN_PAGE ERROR" ); - break; - - case EXCEPTION_INT_DIVIDE_BY_ZERO: -// cout << "CallHandler : EXCEPTION_INT_DIVIDE_BY_ZERO:" << endl ; - lstrcpyA ( buffer, "INTEGER DIVISION BY ZERO" ); - break; - - case EXCEPTION_INT_OVERFLOW: -// cout << "CallHandler : EXCEPTION_INT_OVERFLOW:" << endl ; - lstrcpyA ( buffer, "INTEGER OVERFLOW" ); - break; - - case EXCEPTION_INVALID_DISPOSITION: -// cout << "CallHandler : EXCEPTION_INVALID_DISPOSITION:" << endl ; - lstrcpyA ( buffer, "INVALID DISPOSITION" ); - break; - - case EXCEPTION_NONCONTINUABLE_EXCEPTION: -// cout << "CallHandler : EXCEPTION_NONCONTINUABLE_EXCEPTION:" << endl ; - lstrcpyA ( buffer, "NONCONTINUABLE EXCEPTION" ); - break; - - case EXCEPTION_PRIV_INSTRUCTION: -// cout << "CallHandler : EXCEPTION_PRIV_INSTRUCTION:" << endl ; - lstrcpyA ( buffer, "PRIVELEGED INSTRUCTION ENCOUNTERED" ); - break; - - case EXCEPTION_STACK_OVERFLOW: -// cout << "CallHandler : EXCEPTION_STACK_OVERFLOW:" << endl ; -#if defined( _MSC_VER ) && ( _MSC_VER >= 1300 ) - // try recovering from stack overflow: available in MS VC++ 7.0 - if (!_resetstkoflw()) - lstrcpyA ( buffer, "Unrecoverable STACK OVERFLOW" ); - else -#endif - lstrcpyA ( buffer, "STACK OVERFLOW" ); - break; - - default: - wsprintf( buffer, "unknown exception code 0x%x, params 0x%p 0x%p", - dwExceptionCode, ExceptionInformation1, ExceptionInformation0 ); - - } // end switch - - // provide message to the user with possibility to stop - int idx = lstrlenA ( buffer ); - if ( idx && fMsgBox && dwExceptionCode != EXCEPTION_NONCONTINUABLE_EXCEPTION ) { - // reset FP operations before message box, otherwise it may fail to show up - _fpreset(); - _clearfp(); - - MessageBeep ( MB_ICONHAND ); - int aChoice = ::MessageBox (0, buffer, "OCCT Exception Handler", MB_ABORTRETRYIGNORE | MB_ICONSTOP); - if (aChoice == IDRETRY) - { - _osd_debug(); - DebugBreak(); - } - else if (aChoice == IDABORT) - exit(0xFFFF); - } - - // reset FPE state - if ( flterr ) { - if ( !fFltExceptions ) - return EXCEPTION_EXECUTE_HANDLER; - _fpreset () ; - _clearfp() ; - _controlfp ( 0, _OSD_FPX ) ; // JR add : -// cout << "OSD::WntHandler _controlfp( 0, _OSD_FPX ) " << hex << _controlfp(0,0) << dec << endl ; - } - return _osd_raise ( dwExceptionCode, buffer ); -#else - return 0; -#endif -} - -//======================================================================= -//function : SIGWntHandler -//purpose : Will only be used if user calls ::raise() function with -// signal type set in OSD::SetSignal() - SIGSEGV, SIGFPE, SIGILL -// (the latter will likely be removed in the future) -//======================================================================= -static void SIGWntHandler (int signum, int sub_code) -{ -#if !defined(__CYGWIN32__) && !defined(__MINGW32__) - Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling - switch( signum ) { - case SIGFPE : - if ( signal( signum , (void(*)(int))SIGWntHandler ) == SIG_ERR ) - cout << "signal error" << endl ; - switch( sub_code ) { - case _FPE_INVALID : - CallHandler( EXCEPTION_FLT_INVALID_OPERATION ,0,0) ; - break ; - case _FPE_DENORMAL : - CallHandler( EXCEPTION_FLT_DENORMAL_OPERAND ,0,0) ; - break ; - case _FPE_ZERODIVIDE : - CallHandler( EXCEPTION_FLT_DIVIDE_BY_ZERO ,0,0) ; - break ; - case _FPE_OVERFLOW : - CallHandler( EXCEPTION_FLT_OVERFLOW ,0,0) ; - break ; - case _FPE_UNDERFLOW : - CallHandler( EXCEPTION_FLT_UNDERFLOW ,0,0) ; - break ; - case _FPE_INEXACT : - CallHandler( EXCEPTION_FLT_INEXACT_RESULT ,0,0) ; - break ; - default: - cout << "SIGWntHandler(default) -> Standard_NumericError::Raise(\"Floating Point Error\");" << endl; - Standard_NumericError::Raise("Floating Point Error"); - break ; - } - break ; - case SIGSEGV : - if ( signal( signum, (void(*)(int))SIGWntHandler ) == SIG_ERR ) - cout << "signal error" << endl ; - CallHandler( EXCEPTION_ACCESS_VIOLATION ,0,0) ; - break ; - case SIGILL : - if ( signal( signum, (void(*)(int))SIGWntHandler ) == SIG_ERR ) - cout << "signal error" << endl ; - CallHandler( EXCEPTION_ILLEGAL_INSTRUCTION ,0,0) ; - break ; - default: - cout << "SIGWntHandler unexpected signal : " << signum << endl ; - break ; - } - DebugBreak (); -#endif -} - -//======================================================================= -//function : TranslateSE -//purpose : Translate Structural Exceptions into C++ exceptions -// Will be used when user's code is compiled with /EHa option -//======================================================================= -#ifdef _MSC_VER - -// If this file compiled with the default MSVC options for exception -// handling (/GX or /EHsc) then the following warning is issued: -// warning C4535: calling _set_se_translator() requires /EHa -// However it is correctly inserted and used when user's code compiled with /EHa. -// So, here we disable the warning. -#pragma warning (disable:4535) - -static void TranslateSE( unsigned int theCode, EXCEPTION_POINTERS* theExcPtr ) -{ - Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling - ptrdiff_t info1 = 0, info0 = 0; - if ( theExcPtr ) { - info1 = theExcPtr->ExceptionRecord->ExceptionInformation[1]; - info0 = theExcPtr->ExceptionRecord->ExceptionInformation[0]; - } - CallHandler(theCode, info1, info0); -} -#endif -//======================================================================= -//function : WntHandler -//purpose : Will be used when user's code is compiled with /EHs -// option and unless user sets his own exception handler with -// ::SetUnhandledExceptionFilter(). -//======================================================================= -static LONG WINAPI WntHandler (EXCEPTION_POINTERS *lpXP) -{ - DWORD dwExceptionCode = lpXP->ExceptionRecord->ExceptionCode; - - return CallHandler (dwExceptionCode, - lpXP->ExceptionRecord->ExceptionInformation[1], - lpXP->ExceptionRecord->ExceptionInformation[0]); -} -//======================================================================= -//function : SetSignal -//purpose : -//======================================================================= -void OSD::SetSignal (const Standard_Boolean theFloatingSignal) -{ -#if !defined(__CYGWIN32__) && !defined(__MINGW32__) - Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling - LPTOP_LEVEL_EXCEPTION_FILTER aPreviousFilter; - - OSD_Environment env (TEXT("CSF_DEBUG_MODE")); - TCollection_AsciiString val = env.Value(); - if (!env.Failed()) - { - cout << "Environment variable CSF_DEBUG_MODE setted.\n"; - fMsgBox = Standard_True; - } - else - { - fMsgBox = Standard_False; - } - - // Set exception handler (ignored when running under debugger). It will be used in most cases - // when user's code is compiled with /EHs - // Replaces the existing top-level exception filter for all existing and all future threads - // in the calling process - aPreviousFilter = ::SetUnhandledExceptionFilter (/*(LPTOP_LEVEL_EXCEPTION_FILTER)*/ WntHandler); - - // Signal handlers will only be used when the method ::raise() will be used - // Handlers must be set for every thread - if (signal (SIGSEGV, (void(*)(int))SIGWntHandler) == SIG_ERR) - cout << "signal(OSD::SetSignal) error\n"; - if (signal (SIGFPE, (void(*)(int))SIGWntHandler) == SIG_ERR) - cout << "signal(OSD::SetSignal) error\n"; - if (signal (SIGILL, (void(*)(int))SIGWntHandler) == SIG_ERR) - cout << "signal(OSD::SetSignal) error\n"; - - // Set Ctrl-C and Ctrl-Break handler - fCtrlBrk = Standard_False; - SetConsoleCtrlHandler (&_osd_ctrl_break_handler, TRUE); - -#ifdef _MSC_VER -// _se_translator_function pOldSeFunc = - _set_se_translator (TranslateSE); -#endif - - fFltExceptions = theFloatingSignal; - if (theFloatingSignal) - { - _controlfp (0, _OSD_FPX); // JR add : - } - else { - _controlfp (_OSD_FPX, _OSD_FPX); // JR add : - } -#endif -} // end OSD :: SetSignal - -//============================================================================ -//==== ControlBreak -//============================================================================ - -void OSD :: ControlBreak () { - - if ( fCtrlBrk ) { - - fCtrlBrk = Standard_False; - OSD_Exception_CTRL_BREAK :: Raise ( TEXT( "*** INTERRUPT ***" ) ); - - } // end if - -} // end OSD :: ControlBreak - -//============================================================================ -//==== _osd_ctrl_break_handler -//============================================================================ - -static BOOL WINAPI _osd_ctrl_break_handler ( DWORD dwCode ) { - - if ( dwCode == CTRL_C_EVENT || dwCode == CTRL_BREAK_EVENT ) { - - MessageBeep ( MB_ICONEXCLAMATION ); - fCtrlBrk = Standard_True; - - } else - - exit ( 254 ); - - return TRUE; - -} // end _osd_ctrl_break_handler - -//============================================================================ -//==== _osd_raise -//============================================================================ - -static LONG __fastcall _osd_raise ( DWORD dwCode, LPSTR msg ) -{ - if (msg[0] == '\x03') ++msg; - - switch (dwCode) - { - case EXCEPTION_ACCESS_VIOLATION: - OSD_Exception_ACCESS_VIOLATION::Raise (msg); - break; - case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: - OSD_Exception_ARRAY_BOUNDS_EXCEEDED::Raise (msg); - break; - case EXCEPTION_DATATYPE_MISALIGNMENT: - Standard_ProgramError::Raise (msg); - break; - case EXCEPTION_ILLEGAL_INSTRUCTION: - OSD_Exception_ILLEGAL_INSTRUCTION::Raise (msg); - break; - case EXCEPTION_IN_PAGE_ERROR: - OSD_Exception_IN_PAGE_ERROR::Raise (msg); - break; - case EXCEPTION_INT_DIVIDE_BY_ZERO: - Standard_DivideByZero::Raise (msg); - break; - case EXCEPTION_INT_OVERFLOW: - OSD_Exception_INT_OVERFLOW::Raise (msg); - break; - case EXCEPTION_INVALID_DISPOSITION: - OSD_Exception_INVALID_DISPOSITION::Raise (msg); - break; - case EXCEPTION_NONCONTINUABLE_EXCEPTION: - OSD_Exception_NONCONTINUABLE_EXCEPTION::Raise (msg); - break; - case EXCEPTION_PRIV_INSTRUCTION: - OSD_Exception_PRIV_INSTRUCTION::Raise (msg); - break; - case EXCEPTION_STACK_OVERFLOW: - OSD_Exception_STACK_OVERFLOW::Raise (msg); - break; - case EXCEPTION_FLT_DIVIDE_BY_ZERO: - Standard_DivideByZero::Raise (msg); - break; - case EXCEPTION_FLT_STACK_CHECK: - case EXCEPTION_FLT_OVERFLOW: - Standard_Overflow::Raise (msg); - break; - case EXCEPTION_FLT_UNDERFLOW: - Standard_Underflow::Raise (msg); - break; - case EXCEPTION_FLT_INVALID_OPERATION: - case EXCEPTION_FLT_DENORMAL_OPERAND: - case EXCEPTION_FLT_INEXACT_RESULT: - case STATUS_FLOAT_MULTIPLE_TRAPS: - case STATUS_FLOAT_MULTIPLE_FAULTS: - Standard_NumericError::Raise (msg); - break; - default: - break; - } // end switch - return EXCEPTION_EXECUTE_HANDLER; -} // end _osd_raise - -//============================================================================ -//==== _osd_debug -//============================================================================ - -#if defined(__CYGWIN32__) || defined(__MINGW32__) -#define __try -#define __finally -#define __leave return 0 -#endif - -LONG _osd_debug ( void ) { - - LONG action ; - - if ( !fDbgLoaded ) { - - HKEY hKey = NULL; - HANDLE hEvent = INVALID_HANDLE_VALUE; - DWORD dwKeyType; - DWORD dwValueLen; - TCHAR keyValue[ MAX_PATH ]; - TCHAR cmdLine[ MAX_PATH ]; - SECURITY_ATTRIBUTES sa; - PROCESS_INFORMATION pi; - STARTUPINFO si; - - __try { - - if ( RegOpenKey ( - HKEY_LOCAL_MACHINE, - TEXT( "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug" ), - &hKey - ) != ERROR_SUCCESS - ) __leave; - - dwValueLen = sizeof ( keyValue ); - - if ( RegQueryValueEx ( - hKey, TEXT( "Debugger" ), NULL, &dwKeyType, ( unsigned char* )keyValue, &dwValueLen - ) != ERROR_SUCCESS - ) __leave; - - sa.nLength = sizeof ( SECURITY_ATTRIBUTES ); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = TRUE; - - if ( ( hEvent = CreateEvent ( &sa, TRUE, FALSE, NULL ) ) == NULL ) __leave; - - wsprintf ( cmdLine, keyValue, GetCurrentProcessId (), hEvent ); - - ZeroMemory ( &si, sizeof ( STARTUPINFO ) ); - - si.cb = sizeof ( STARTUPINFO ); - si.dwFlags = STARTF_FORCEONFEEDBACK; - -// cout << "_osd_debug -> CreateProcess" << endl ; - if ( !CreateProcess ( - NULL, cmdLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, - NULL, NULL, &si, &pi - ) - ) __leave; - -// cout << "_osd_debug -> WaitForSingleObject " << endl ; - WaitForSingleObject ( hEvent, INFINITE ); -// cout << "_osd_debug <- WaitForSingleObject -> CloseHandle " << endl ; - - CloseHandle ( pi.hProcess ); - CloseHandle ( pi.hThread ); - -// cout << "_osd_debug fDbgLoaded " << endl ; - fDbgLoaded = TRUE; - - } // end __try - - __finally { - -// cout << "_osd_debug -> CloseHandle(hKey) " << endl ; - if ( hKey != INVALID_HANDLE_VALUE ) CloseHandle ( hKey ); -// cout << "_osd_debug -> CloseHandle(hEvent) " << endl ; - if ( hEvent != INVALID_HANDLE_VALUE ) CloseHandle ( hEvent ); -// cout << "_osd_debug end __finally " << endl ; - - } // end __finally - - } /* end if */ - - action = fDbgLoaded ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_EXECUTE_HANDLER; -// cout << "_osd_debug return " << action << " EXCEPTION_CONTINUE_EXECUTION(" -// << EXCEPTION_CONTINUE_EXECUTION << ")" << endl ; - return action ; - -} // end _osd_debug - -#if defined(__CYGWIN32__) || defined(__MINGW32__) -#undef __try -#undef __finally -#undef __leave -#endif -#endif // _WIN32 diff --git a/src/Precision/FILES b/src/Precision/FILES index 5b8f799ca3..727f319209 100644 --- a/src/Precision/FILES +++ b/src/Precision/FILES @@ -1,3 +1,2 @@ -Precision.cxx Precision.hxx Precision.lxx diff --git a/src/Precision/Precision.cxx b/src/Precision/Precision.cxx deleted file mode 100644 index 700794b38b..0000000000 --- a/src/Precision/Precision.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1993-03-08 -// Created by: Remi LEQUETTE -// Copyright (c) 1993-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. - - -#include diff --git a/src/Standard/FILES b/src/Standard/FILES index 0169bc9b43..3ebe4f93df 100755 --- a/src/Standard/FILES +++ b/src/Standard/FILES @@ -22,8 +22,6 @@ Standard_DivideByZero.hxx Standard_DomainError.hxx Standard_ErrorHandler.cxx Standard_ErrorHandler.hxx -Standard_ErrorHandlerCallback.cxx -Standard_ErrorHandlerCallback.hxx Standard_ExtCharacter.hxx Standard_ExtString.cxx Standard_ExtString.hxx diff --git a/src/Standard/Standard.hxx b/src/Standard/Standard.hxx index 02d3e4fb29..383fb0c835 100644 --- a/src/Standard/Standard.hxx +++ b/src/Standard/Standard.hxx @@ -22,7 +22,6 @@ #include #include -class Standard_ErrorHandlerCallback; class Standard_ErrorHandler; class Standard_GUID; class Standard_Persistent; diff --git a/src/Standard/Standard_ErrorHandler.cxx b/src/Standard/Standard_ErrorHandler.cxx index 491380bedc..04cbc1bb69 100644 --- a/src/Standard/Standard_ErrorHandler.cxx +++ b/src/Standard/Standard_ErrorHandler.cxx @@ -18,7 +18,6 @@ //============================================================================ #include #include -#include #include #include @@ -125,7 +124,7 @@ void Standard_ErrorHandler::Unlink() Standard_Address aPtr = aCurrent->myCallbackPtr; myCallbackPtr = 0; while ( aPtr ) { - Standard_ErrorHandlerCallback* aCallback = (Standard_ErrorHandlerCallback*)aPtr; + Standard_ErrorHandler::Callback* aCallback = (Standard_ErrorHandler::Callback*)aPtr; aPtr = aCallback->myNext; // Call destructor explicitly, as we know that it will not be called automatically aCallback->DestroyCallback(); @@ -267,3 +266,45 @@ Standard_ErrorHandler* Standard_ErrorHandler::FindHandler(const Standard_Handler return anActive; } + +#if defined(NO_CXX_EXCEPTION) || defined(OCC_CONVERT_SIGNALS) + +Standard_ErrorHandler::Callback::Callback () + : myHandler(0), myPrev(0), myNext(0) +{ +} + +Standard_ErrorHandler::Callback::~Callback () +{ + UnregisterCallback(); +} + +void Standard_ErrorHandler::Callback::RegisterCallback () +{ + if ( myHandler ) return; // already registered + + // find current active exception handler + Standard_ErrorHandler *aHandler = + Standard_ErrorHandler::FindHandler(Standard_HandlerVoid, Standard_False); + + // if found, add this callback object first to the list + if ( aHandler ) { + myHandler = aHandler; + myNext = aHandler->myCallbackPtr; + if ( myNext ) ((Standard_ErrorHandler::Callback*)myNext)->myPrev = this; + aHandler->myCallbackPtr = this; + } +} + +void Standard_ErrorHandler::Callback::UnregisterCallback () +{ + if ( ! myHandler ) return; + if ( myNext ) + ((Standard_ErrorHandler::Callback*)myNext)->myPrev = myPrev; + if ( myPrev ) + ((Standard_ErrorHandler::Callback*)myPrev)->myNext = myNext; + else if ( ((Standard_ErrorHandler*)myHandler)->myCallbackPtr == this) + ((Standard_ErrorHandler*)myHandler)->myCallbackPtr = (Standard_ErrorHandler::Callback*)myNext; + myHandler = myNext = myPrev = 0; +} +#endif \ No newline at end of file diff --git a/src/Standard/Standard_ErrorHandler.hxx b/src/Standard/Standard_ErrorHandler.hxx index 115784d052..333d68c2b8 100644 --- a/src/Standard/Standard_ErrorHandler.hxx +++ b/src/Standard/Standard_ErrorHandler.hxx @@ -95,7 +95,6 @@ #endif class Standard_Failure; -class Standard_ErrorHandlerCallback; //! Class implementing mechanics of conversion of signals to exceptions. //! @@ -159,6 +158,56 @@ private: //! Returns the current handler (closest in the stack in the current execution thread) Standard_EXPORT static Standard_PErrorHandler FindHandler (const Standard_HandlerStatus theStatus, const Standard_Boolean theUnlink); +public: + //! Defines a base class for callback objects that can be registered + //! in the OCC error handler (the class simulating C++ exceptions) + //! so as to be correctly destroyed when error handler is activated. + //! + //! Note that this is needed only when Open CASCADE is compiled with + //! NO_CXX_EXCEPTION or OCC_CONVERT_SIGNALS options (i.e. on UNIX/Linux). + //! In that case, raising OCC exception and/or signal will not cause + //! C++ stack unwinding and destruction of objects created in the stack. + //! + //! This class is intended to protect critical objects and operations in + //! the try {} catch {} block from being bypassed by OCC signal or exception. + //! + //! Inherit your object from that class, implement DestroyCallback() function, + //! and call Register/Unregister in critical points. + //! + //! Note that you must ensure that your object has life span longer than + //! that of the try {} block in which it calls Register(). + class Callback + { + public: + DEFINE_STANDARD_ALLOC + + //! Registers this callback object in the current error handler (if found). + void RegisterCallback(); + + //! Unregisters this callback object from the error handler. + void UnregisterCallback(); + + //! Destructor + virtual ~Callback(); + + //! The callback function to perform necessary callback action. + //! Called by the exception handler when it is being destroyed but + //! still has this callback registered. + Standard_EXPORT virtual void DestroyCallback() = 0; + + protected: + + //! Empty constructor + Callback(); + + private: + Standard_Address myHandler; + Standard_Address myPrev; + Standard_Address myNext; + + friend class Standard_ErrorHandler; + }; + private: Standard_PErrorHandler myPrevious; @@ -166,10 +215,30 @@ private: Standard_JmpBuf myLabel; Standard_HandlerStatus myStatus; Standard_ThreadId myThread; - Standard_Address myCallbackPtr; + Callback* myCallbackPtr; friend class Standard_Failure; - friend class Standard_ErrorHandlerCallback; }; +// If neither NO_CXX_EXCEPTION nor OCC_CONVERT_SIGNALS is defined, +// provide empty inline implementation +#if ! defined(NO_CXX_EXCEPTION) && ! defined(OCC_CONVERT_SIGNALS) +inline Standard_ErrorHandler::Callback::Callback () + : myHandler(0), myPrev(0), myNext(0) +{ +} +inline Standard_ErrorHandler::Callback::~Callback () +{ +} +inline void Standard_ErrorHandler::Callback::RegisterCallback () +{ +} +inline void Standard_ErrorHandler::Callback::UnregisterCallback () +{ +} +#endif + +// Definition of the old name "Standard_ErrorHandlerCallback" was kept for compatibility +typedef Standard_ErrorHandler::Callback Standard_ErrorHandlerCallback; + #endif // _Standard_ErrorHandler_HeaderFile diff --git a/src/Standard/Standard_ErrorHandlerCallback.cxx b/src/Standard/Standard_ErrorHandlerCallback.cxx deleted file mode 100644 index df71c93380..0000000000 --- a/src/Standard/Standard_ErrorHandlerCallback.cxx +++ /dev/null @@ -1,63 +0,0 @@ -// Created on: 2006-04-13 -// Created by: Andrey BETENEV -// Copyright (c) 2006-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. - -// If either NO_CXX_EXCEPTION or OCC_CONVERT_SIGNALS is defined, -// provide complete implementation - -#include -#include - -#if defined(NO_CXX_EXCEPTION) || defined(OCC_CONVERT_SIGNALS) - -Standard_ErrorHandlerCallback::Standard_ErrorHandlerCallback () - : myHandler(0), myPrev(0), myNext(0) -{ -} - -Standard_ErrorHandlerCallback::~Standard_ErrorHandlerCallback () -{ - UnregisterCallback(); -} - -void Standard_ErrorHandlerCallback::RegisterCallback () -{ - if ( myHandler ) return; // already registered - - // find current active exception handler - Standard_ErrorHandler *aHandler = - Standard_ErrorHandler::FindHandler(Standard_HandlerVoid, Standard_False); - - // if found, add this callback object first to the list - if ( aHandler ) { - myHandler = aHandler; - myNext = aHandler->myCallbackPtr; - if ( myNext ) ((Standard_ErrorHandlerCallback*)myNext)->myPrev = this; - aHandler->myCallbackPtr = this; - } -} - -void Standard_ErrorHandlerCallback::UnregisterCallback () -{ - if ( ! myHandler ) return; - if ( myNext ) - ((Standard_ErrorHandlerCallback*)myNext)->myPrev = myPrev; - if ( myPrev ) - ((Standard_ErrorHandlerCallback*)myPrev)->myNext = myNext; - else if ( ((Standard_ErrorHandler*)myHandler)->myCallbackPtr == this) - ((Standard_ErrorHandler*)myHandler)->myCallbackPtr = myNext; - myHandler = myNext = myPrev = 0; -} - -#endif diff --git a/src/Standard/Standard_ErrorHandlerCallback.hxx b/src/Standard/Standard_ErrorHandlerCallback.hxx deleted file mode 100644 index 60d89debbd..0000000000 --- a/src/Standard/Standard_ErrorHandlerCallback.hxx +++ /dev/null @@ -1,92 +0,0 @@ -// Created on: 2006-04-13 -// Created by: Andrey BETENEV -// Copyright (c) 2006-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. - -#ifndef _Standard_ErrorHandlerCallback_HeaderFile -#define _Standard_ErrorHandlerCallback_HeaderFile - -#include -#include - -class Standard_ErrorHandler; - -//! Defines a base class for callback objects that can be registered -//! in the OCC error handler (the class simulating C++ exceptions) -//! so as to be correctly destroyed when error handler is activated. -//! -//! Note that this is needed only when Open CASCADE is compiled with -//! NO_CXX_EXCEPTION or OCC_CONVERT_SIGNALS options (i.e. on UNIX/Linux). -//! In that case, raising OCC exception and/or signal will not cause -//! C++ stack unwinding and destruction of objects created in the stack. -//! -//! This class is intended to protect critical objects and operations in -//! the try {} catch {} block from being bypassed by OCC signal or exception. -//! -//! Inherit your object from that class, implement DestroyCallback() function, -//! and call Register/Unregister in critical points. -//! -//! Note that you must ensure that your object has life span longer than -//! that of the try {} block in which it calls Register(). -class Standard_ErrorHandlerCallback -{ -public: - - DEFINE_STANDARD_ALLOC - - //! Registers this callback object in the current error handler (if found). - void RegisterCallback(); - - //! Unregisters this callback object from the error handler. - void UnregisterCallback(); - - //! Destructor - virtual ~Standard_ErrorHandlerCallback (); - - //! The callback function to perform necessary callback action. - //! Called by the exception handler when it is being destroyed but - //! still has this callback registered. - Standard_EXPORT virtual void DestroyCallback() = 0; - -friend class Standard_ErrorHandler; - -protected: - - //! Empty constructor - Standard_ErrorHandlerCallback(); - -private: - Standard_Address myHandler; - Standard_Address myPrev; - Standard_Address myNext; -}; - -// If neither NO_CXX_EXCEPTION nor OCC_CONVERT_SIGNALS is defined, -// provide empty inline implementation -#if ! defined(NO_CXX_EXCEPTION) && ! defined(OCC_CONVERT_SIGNALS) -inline Standard_ErrorHandlerCallback::Standard_ErrorHandlerCallback () - : myHandler(0), myPrev(0), myNext(0) -{ -} -inline Standard_ErrorHandlerCallback::~Standard_ErrorHandlerCallback () -{ -} -inline void Standard_ErrorHandlerCallback::RegisterCallback () -{ -} -inline void Standard_ErrorHandlerCallback::UnregisterCallback () -{ -} -#endif - -#endif // _Standard_ErrorHandlerCallback_HeaderFile diff --git a/src/Standard/Standard_Mutex.hxx b/src/Standard/Standard_Mutex.hxx index 3f9ce595a2..c7d31285f4 100644 --- a/src/Standard/Standard_Mutex.hxx +++ b/src/Standard/Standard_Mutex.hxx @@ -18,7 +18,7 @@ #include #include -#include +#include #if defined(_WIN32) #include @@ -62,7 +62,7 @@ * TryLock(), and UnregisterCallback() before Unlock() (or use Sentry classes). */ -class Standard_Mutex : public Standard_ErrorHandlerCallback +class Standard_Mutex : public Standard_ErrorHandler::Callback { public: /** diff --git a/src/TNaming/FILES b/src/TNaming/FILES index 5f5737f7cc..04d740caf4 100644 --- a/src/TNaming/FILES +++ b/src/TNaming/FILES @@ -1,6 +1,5 @@ TNaming.cxx TNaming.hxx -TNaming_Builder.cxx TNaming_Builder.hxx TNaming_CopyShape.cxx TNaming_CopyShape.hxx @@ -15,10 +14,8 @@ TNaming_DeltaOnRemoval.hxx TNaming_Evolution.hxx TNaming_Identifier.cxx TNaming_Identifier.hxx -TNaming_Iterator.cxx TNaming_Iterator.hxx TNaming_Iterator.lxx -TNaming_IteratorOnShapesSet.cxx TNaming_IteratorOnShapesSet.hxx TNaming_IteratorOnShapesSet.lxx TNaming_ListIteratorOfListOfIndexedDataMapOfShapeListOfShape.hxx @@ -43,16 +40,13 @@ TNaming_Naming.hxx TNaming_NamingTool.cxx TNaming_NamingTool.hxx TNaming_NCollections.hxx -TNaming_NewShapeIterator.cxx TNaming_NewShapeIterator.hxx TNaming_NewShapeIterator.lxx -TNaming_OldShapeIterator.cxx TNaming_OldShapeIterator.hxx TNaming_OldShapeIterator.lxx TNaming_PtrAttribute.hxx TNaming_PtrNode.hxx TNaming_PtrRefShape.hxx -TNaming_RefShape.cxx TNaming_RefShape.hxx TNaming_RefShape.lxx TNaming_SameShapeIterator.cxx diff --git a/src/TNaming/TNaming_Builder.cxx b/src/TNaming/TNaming_Builder.cxx deleted file mode 100644 index adeba96b0e..0000000000 --- a/src/TNaming/TNaming_Builder.cxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 1996-12-19 -// Created by: Yves FRICAUD -// 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. - - -#include -#include -#include -#include -#include -#include - -// See methods'body in TNaming_NamedShape.cxx diff --git a/src/TNaming/TNaming_Iterator.cxx b/src/TNaming/TNaming_Iterator.cxx deleted file mode 100644 index 0a04cc413f..0000000000 --- a/src/TNaming/TNaming_Iterator.cxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 1997-02-26 -// Created by: Yves FRICAUD -// 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. - - -#include -#include -#include -#include -#include -#include -#include -#include - -// See methods'bodies in TNaming_NamedShape.cxx diff --git a/src/TNaming/TNaming_IteratorOnShapesSet.cxx b/src/TNaming/TNaming_IteratorOnShapesSet.cxx deleted file mode 100644 index 2107743979..0000000000 --- a/src/TNaming/TNaming_IteratorOnShapesSet.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// Created on: 1997-05-06 -// Created by: Yves FRICAUD -// 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. - - -#include -#include -#include -#include -#include diff --git a/src/TNaming/TNaming_NewShapeIterator.cxx b/src/TNaming/TNaming_NewShapeIterator.cxx deleted file mode 100644 index 6548923e80..0000000000 --- a/src/TNaming/TNaming_NewShapeIterator.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 1996-12-20 -// Created by: Yves FRICAUD -// 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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// See methods'body in TNaming_NamedShape.cxx diff --git a/src/TNaming/TNaming_OldShapeIterator.cxx b/src/TNaming/TNaming_OldShapeIterator.cxx deleted file mode 100644 index c78579b16d..0000000000 --- a/src/TNaming/TNaming_OldShapeIterator.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 1996-12-20 -// Created by: Yves FRICAUD -// 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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// See methods'body in TNaming_NamedShape.cxx diff --git a/src/TNaming/TNaming_RefShape.cxx b/src/TNaming/TNaming_RefShape.cxx deleted file mode 100644 index 07259df4b4..0000000000 --- a/src/TNaming/TNaming_RefShape.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Created on: 1996-12-19 -// Created by: Yves FRICAUD -// 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. - - -#include -#include -#include -#include - -// See methods'body in TNaming_NamedShape.cxx diff --git a/src/TObj/FILES b/src/TObj/FILES index f9ae34ee29..fa51a748a7 100755 --- a/src/TObj/FILES +++ b/src/TObj/FILES @@ -31,7 +31,6 @@ TObj_ReferenceIterator.hxx TObj_SequenceIterator.cxx TObj_SequenceIterator.hxx TObj_SequenceOfIterator.hxx -TObj_SequenceOfObject.cxx TObj_SequenceOfObject.hxx TObj_TIntSparseArray.cxx TObj_TIntSparseArray.hxx diff --git a/src/TObj/TObj_SequenceOfObject.cxx b/src/TObj/TObj_SequenceOfObject.cxx deleted file mode 100644 index 6166d5f794..0000000000 --- a/src/TObj/TObj_SequenceOfObject.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created on: 2004-11-23 -// Created by: Pavel TELKOV -// Copyright (c) 2004-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. - -// The original implementation Copyright: (C) RINA S.p.A - -#include - diff --git a/src/TestTopOpe/TestTopOpe.cxx b/src/TestTopOpe/TestTopOpe.cxx index 5fcb3f663c..b32f08e164 100644 --- a/src/TestTopOpe/TestTopOpe.cxx +++ b/src/TestTopOpe/TestTopOpe.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include #include @@ -67,9 +66,6 @@ void TestTopOpe::Shapes(const TopoDS_Shape& S1,const TopoDS_Shape& S2) { if (PHDSD != NULL) { PHDSD->SetShape1(S1);PHDSD->SetShape2(S2); } if (PBOOP != NULL) { PBOOP->SetShape1(S1);PBOOP->SetShape2(S2); } -#ifdef OCCT_DEBUG - TopOpeBRepDS_SettraceSPSX_SS(S1,S2); -#endif } //======================================================================= @@ -80,26 +76,8 @@ void TestTopOpe::CurrentDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) { if (PHDSD != NULL) { PHDSD->SetCurrentHDS(HDS); } if (PBOOP != NULL) { PBOOP->SetCurrentHDS(HDS); } -#ifdef OCCT_DEBUG - TopOpeBRepDS_SettraceSPSX_HDS(HDS); -#endif } -#ifdef OCCT_DEBUG -Standard_EXPORT void debloi(const TopOpeBRepDS_ListOfInterference& L) -{ - if (PBOOP == NULL) return; - TopOpeBRepDS_Dumper DSD(PBOOP->ChangeCurrentDS()); - DSD.DumpLOI(L,cout,""); -} -Standard_EXPORT void debi(const Handle(TopOpeBRepDS_Interference)& I) -{ - if (PBOOP == NULL) return; - TopOpeBRepDS_Dumper DSD(PBOOP->ChangeCurrentDS()); - DSD.DumpI(I,cout,"","\n"); -} -#endif - //======================================================================= //function : CurrentHB //purpose : diff --git a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx index af1dda9010..4ee4483320 100644 --- a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx @@ -105,8 +105,6 @@ public: TestTopOpe_HDSDisplayer* PHDSD = NULL; static TestTopOpeDraw_Displayer* POCD = NULL; -//Standard_IMPORT extern Standard_Integer TopOpeBRepDS_GLOBALHDSinterfselector; -Standard_IMPORT Standard_Integer TopOpeBRepDS_GLOBALHDSinterfselector; static Standard_Boolean SFindKeep = Standard_False; static Standard_Boolean GFindKeep = Standard_False; @@ -144,7 +142,6 @@ public: Standard_Integer Set(Standard_Integer na,const char** a,Standard_Integer iargK,Standard_Integer iargI); virtual ~tsee_entity() {} - void virtual Dump() const; void virtual See() = 0; }; @@ -180,12 +177,6 @@ Standard_Integer tsee_entity::Set(Standard_Integer na,const char** a,Standard_In return 0; } -void tsee_entity::Dump() const { - TopOpeBRepDS_Dumper Dumper(myEHDS); - if (myEisgeome) Dumper.DumpGeometry(myETK,myEindex,cout); - if (myEisshape) Dumper.DumpTopology(myETK,myEindex,cout); -} - class tsee_entity0 : public tsee_entity { public: gp_Pnt Pnt() const; @@ -682,7 +673,6 @@ Standard_Integer tsee_SeeShapefunc(Draw_Interpretor& di,Standard_Integer na_in,c if (!E1.myEOK || !E2.myEOK) return 1; E1.See();E2.See(); - E1.Dump();E2.Dump(); di<<"Distance "<CurrentHDS(); if (HDS.IsNull()) {COUTNOHDS(di);return 0;} PHDSD->CurrentBDS(); - - TopOpeBRepDS_Dumper Dumper(HDS); - if ( na == 1 ) { Dumper.Dump(cout,TDSkeep,TDScompact); return 0; } - - TDSpar Tpar(a[1]); - Standard_Integer ids; - - if (na == 2) { - if (Tpar.isshap()) { - if (Tpar.TS() != TopAbs_SHAPE) Dumper.DumpTopology(Tpar.TK(),cout); - else Dumper.DumpTopology(cout); - } - else if (Tpar.isgeom()) { - Dumper.DumpGeometry(Tpar.TK(),cout,TDSkeep,TDScompact); - } - else if (Tpar.issect()) { - Dumper.DumpSectionEdge(Tpar.TK(),cout); - } - else if (Tpar.isafev()) { - TopOpeBRepDS_Explorer x; - for (x.Init(HDS,TopAbs_FACE,TDSkeep);x.More();x.Next()) Dumper.DumpTopology(x.Type(),x.Index(),cout); - for (x.Init(HDS,TopAbs_EDGE,TDSkeep);x.More();x.Next()) Dumper.DumpTopology(x.Type(),x.Index(),cout); - for (x.Init(HDS,TopAbs_VERTEX,TDSkeep);x.More();x.Next()) Dumper.DumpTopology(x.Type(),x.Index(),cout); - } - - else if (Tpar.isdege()) { - TopOpeBRepDS_Explorer x; - for (x.Init(HDS,TopAbs_EDGE,TDSkeep);x.More();x.Next()) { - if (BRep_Tool::Degenerated(x.Edge())) Dumper.DumpTopology(x.Type(),x.Index(),cout); - } - } - return 0; - } // (na == 2) - - // nna > 2 : dump DS entities of type TK index Draw::Atoi(a[2])..a[narg-1]) - for (ia = 2; ia < na; ia++) { - - if ( !strcmp(a[ia],"sd") ) { // dump all shapes HasSameDomain of type TS - for (TopOpeBRepDS_Explorer x(HDS,Tpar.TS(),Standard_False);x.More();x.Next()) { - Standard_Boolean isSsd = HDS->HasSameDomain(x.Current()); - if (isSsd ) Dumper.DumpTopology(Tpar.TK(),x.Index(),cout); - } - } - else { - ids = Draw::Atoi(a[ia]); - if ( Tpar.isshap() ) { - if (Tpar.TS() != TopAbs_SHAPE) Dumper.DumpTopology(Tpar.TK(),ids,cout); - else { - TopAbs_ShapeEnum t = HDS->Shape(ids,SFindKeep).ShapeType(); - TopOpeBRepDS_Kind k = TopOpeBRepDS::ShapeToKind(t); - Dumper.DumpTopology(k,ids,cout); - } - } - else if ( Tpar.isgeom() ) { - Dumper.DumpGeometry(Tpar.TK(),ids,cout,TDSkeep,TDScompact); - } - else if ( Tpar.issect() ) { - Dumper.DumpSectionEdge(TopOpeBRepDS_EDGE,ids,cout); - } - } - } // ia < na - + return 0; } @@ -1303,7 +1225,6 @@ Standard_Integer tdsri(Draw_Interpretor& di,Standard_Integer na_in,const char** Standard_Integer i=0; TopOpeBRepDS_ListIteratorOfListOfInterference it(li); while (it.More()) { if(++i == ii) { - it.Value()->Dump(cout,"\n--> remove ","\n"); li.Remove(it); } else it.Next(); diff --git a/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx b/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx index 2ac2e0038d..151a193111 100644 --- a/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx +++ b/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx @@ -28,22 +28,6 @@ Standard_IMPORT void TopClass_SettraceFC(const Standard_Boolean); Standard_IMPORT void TopOpeBRepTool_SettraceEND(const Standard_Boolean); Standard_IMPORT void TopOpeBRepTool_SettraceKRO(const Standard_Boolean); Standard_IMPORT void TopOpeBRepTool_SetcontextNOSEW(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SetcontextNOPNC(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceEDSF(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceDSP(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceDSF(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceDSFK(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceDSNC(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceDSLT(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceDEGEN(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceDSFD(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettracePCI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettracePEI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettracePFI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettracePI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceSTRANGE(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceGAP(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SetcontextNOGAP(const Standard_Boolean); Standard_IMPORT void TopOpeBRep_SettraceFITOL(const Standard_Boolean); Standard_IMPORT void TopOpeBRep_SettraceBIPS(const Standard_Boolean); Standard_IMPORT void TopOpeBRep_SettraceSI(const Standard_Boolean); @@ -63,9 +47,6 @@ Standard_IMPORT void TopOpeBRepBuild_SettraceCHKOK(const Standard_Boolean); Standard_IMPORT void TopOpeBRepBuild_SettraceCHKNOK(const Standard_Boolean); Standard_IMPORT void TopOpeBRepBuild_SettraceCU(const Standard_Boolean); Standard_IMPORT void TopOpeBRepBuild_SettraceCUV(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceSPSX(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRepDS_SettraceCX(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRepDS_SettraceSPSXX(const Standard_Boolean, Standard_Integer, char**); Standard_IMPORT void TopOpeBRepBuild_SettraceSPF(const Standard_Boolean); Standard_IMPORT void TopOpeBRepBuild_SettraceSPS(const Standard_Boolean); Standard_IMPORT void TopOpeBRepBuild_SettraceSHEX(const Standard_Boolean); @@ -110,13 +91,6 @@ Standard_IMPORT void TopOpeBRepTool_SettraceCL2DDR(const Standard_Boolean, Stand Standard_IMPORT void TopOpeBRepTool_SettraceCL2DPR(const Standard_Boolean, Standard_Integer, char**); Standard_IMPORT void TopOpeBRepTool_SettraceCL3DDR(const Standard_Boolean, Standard_Integer, char**); Standard_IMPORT void TopOpeBRepTool_SettraceCL3DPR(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRepDS_SettraceBUTO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceTRPE(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceEDPR(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceISTO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SettraceSANTRAN(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SetcontextNOPFI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepDS_SetcontextMKTONREG(const Standard_Boolean); #endif #ifdef OCCT_DEBUG @@ -127,20 +101,6 @@ static Standard_Integer InitTraceTopOpeKernel (TestTopOpeTools_Trace& T) if (T.Add("tfc",(tf_value)TopClass_SettraceFC)) return 1; if (T.Add("tend",(tf_value)TopOpeBRepTool_SettraceEND)) return 1; if (T.Add("tkro",(tf_value)TopOpeBRepTool_SettraceKRO)) return 1; - if (T.Add("tdsfk",(tf_value)TopOpeBRepDS_SettraceDSFK)) return 1; - if (T.Add("tedsf",(tf_value)TopOpeBRepDS_SettraceEDSF)) return 1; - if (T.Add("tdsp",(tf_value)TopOpeBRepDS_SettraceDSP)) return 1; - if (T.Add("tdsf",(tf_value)TopOpeBRepDS_SettraceDSF)) return 1; - if (T.Add("tdsnc",(tf_value)TopOpeBRepDS_SettraceDSNC)) return 1; - if (T.Add("tdegen",(tf_value)TopOpeBRepDS_SettraceDEGEN)) return 1; - if (T.Add("tdslt",(tf_value)TopOpeBRepDS_SettraceDSLT)) return 1; - if (T.Add("tdsfd",(tf_value)TopOpeBRepDS_SettraceDSFD)) return 1; - if (T.Add("tpci",(tf_value)TopOpeBRepDS_SettracePCI)) return 1; - if (T.Add("tpei",(tf_value)TopOpeBRepDS_SettracePEI)) return 1; - if (T.Add("tpfi",(tf_value)TopOpeBRepDS_SettracePFI)) return 1; - if (T.Add("tpi",(tf_value)TopOpeBRepDS_SettracePI)) return 1; - if (T.Add("tstrange",(tf_value)TopOpeBRepDS_SettraceSTRANGE)) return 1; - if (T.Add("tgap",(tf_value)TopOpeBRepDS_SettraceGAP)) return 1; if (T.Add("tfitol",(tf_value)TopOpeBRep_SettraceFITOL)) return 1; if (T.Add("tbips",(tf_value)TopOpeBRep_SettraceBIPS)) return 1; if (T.Add("tsi",(tf_value)TopOpeBRep_SettraceSI)) return 1; @@ -154,9 +114,6 @@ static Standard_Integer InitTraceTopOpeKernel (TestTopOpeTools_Trace& T) if (T.Add("tnok",(tf_value)TopOpeBRepBuild_SettraceCHKNOK)) return 1; if (T.Add("tcu",(tf_value)TopOpeBRepBuild_SettraceCU)) return 1; if (T.Add("tcuv",(tf_value)TopOpeBRepBuild_SettraceCUV)) return 1; - if (T.Add("tcx",(tf_intarg)TopOpeBRepDS_SettraceCX)) return 1; // tcx 0|1 [i1 ...] - if (T.Add("tspsx",(tf_intarg)TopOpeBRepDS_SettraceSPSX)) return 1; // tspsx 0|1 [i1 ...] - if (T.Add("tspsxx",(tf_intarg)TopOpeBRepDS_SettraceSPSXX)) return 1; // tspsxx 0|1 [i1 i2] if (T.Add("tspf",(tf_value)TopOpeBRepBuild_SettraceSPF)) return 1; // splitface if (T.Add("tsps",(tf_value)TopOpeBRepBuild_SettraceSPS)) return 1; // splitsolid if (T.Add("tshex",(tf_value)TopOpeBRepBuild_SettraceSHEX)) return 1; @@ -182,10 +139,6 @@ static Standard_Integer InitTraceTopOpeKernel (TestTopOpeTools_Trace& T) if (T.Add("tcl2dpr",(tf_intarg)TopOpeBRepTool_SettraceCL2DPR)) return 1; if (T.Add("tcl3ddr",(tf_intarg)TopOpeBRepTool_SettraceCL3DDR)) return 1; if (T.Add("tcl3dpr",(tf_intarg)TopOpeBRepTool_SettraceCL3DPR)) return 1; - if (T.Add("tbuto",(tf_value)TopOpeBRepDS_SettraceBUTO)) return 1; - if (T.Add("ttrpe",(tf_value)TopOpeBRepDS_SettraceTRPE)) return 1; - if (T.Add("tedpr",(tf_value)TopOpeBRepDS_SettraceEDPR)) return 1; - if (T.Add("tisto",(tf_value)TopOpeBRepDS_SettraceISTO)) return 1; if (T.Add("tproedg",(tf_value)TopOpeBRep_SettracePROEDG)) return 1; if (T.Add("tconic",(tf_value)TopOpeBRep_SettraceCONIC)) return 1; return 0; @@ -197,7 +150,6 @@ Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace& T) //---------------------------------------------------------------------------- { if (T.Add("nosew",(tf_value)TopOpeBRepTool_SetcontextNOSEW)) return 1; - if (T.Add("nopnc",(tf_value)TopOpeBRepDS_SetcontextNOPNC)) return 1; if (T.Add("nosg",(tf_value)TopOpeBRepBuild_SetcontextNOSG)) return 1; if (T.Add("ssconnex",(tf_value)TopOpeBRepBuild_SetcontextSSCONNEX)) return 1; if (T.Add("sf2",(tf_value)TopOpeBRepBuild_SetcontextSF2)) return 1; @@ -211,7 +163,6 @@ Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace& T) if (T.Add("nofufa",(tf_value)TopOpeBRepBuild_SetcontextNOFUFA)) return 1; if (T.Add("einternal",(tf_value)TopOpeBRepBuild_SetcontextEINTERNAL)) return 1; if (T.Add("eexternal",(tf_value)TopOpeBRepBuild_SetcontextEEXTERNAL)) return 1; - if (T.Add("santran",(tf_value)TopOpeBRepDS_SettraceSANTRAN)) return 1; if (T.Add("noproedg",(tf_value)TopOpeBRep_SetcontextNOPROEDG)) return 1; if (T.Add("rest1",(tf_value)TopOpeBRep_SetcontextREST1)) return 1; if (T.Add("rest2",(tf_value)TopOpeBRep_SetcontextREST2)) return 1; @@ -222,9 +173,6 @@ Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace& T) if (T.Add("ffor",(tf_value)TopOpeBRep_SetcontextFFOR)) return 1; if (T.Add("nopunk",(tf_value)TopOpeBRep_SetcontextNOPUNK)) return 1; if (T.Add("nofei",(tf_value)TopOpeBRep_SetcontextNOFEI)) return 1; - if (T.Add("nopfi",(tf_value)TopOpeBRepDS_SetcontextNOPFI)) return 1; - if (T.Add("mktonreg",(tf_value)TopOpeBRepDS_SetcontextMKTONREG)) return 1; - if (T.Add("nogap",(tf_value)TopOpeBRepDS_SetcontextNOGAP)) return 1; return 0; } diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx index 7720a32ad4..c4752fb8fd 100644 --- a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx @@ -36,12 +36,8 @@ #include #ifdef OCCT_DEBUG -#include #include -extern Standard_Boolean TopOpeBRepDS_GettraceEDSF(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); extern Standard_Boolean TopOpeBRep_GettraceEEFF(); -Standard_EXPORT void debefre(const Standard_Integer IE) {cout<<"+++ debefre E"<Dimension(); - myPEI->Dump(str,myPDS->Shape(myE1),myPDS->Shape(myE2)); - } -#endif + Standard_Boolean esd = myPEI->SameDomain(); if (esd) myPDS->FillShapesSameDomain(E1,E2); @@ -109,17 +95,6 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E if ( ! myF1.IsNull() ) myPDS->AddShape(myF1,1); if ( ! myF2.IsNull() ) myPDS->AddShape(myF2,2); -#ifdef OCCT_DEBUG - Standard_Boolean pointofsegment = P2D.IsPointOfSegment(); -#endif - -#ifdef OCCT_DEBUG - if (trc) { - if (pointofsegment && esd) debposesd(); - else if (pointofsegment && !esd) debposnesd(); - } -#endif - TopOpeBRepDS_Transition T1 = P2D.Transition(1); TopOpeBRepDS_Transition T2 = P2D.Transition(2); @@ -467,55 +442,22 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB TopOpeBRepDS_TKI tki; tki.FillOnGeometry(LI); -#ifdef OCCT_DEBUG - Standard_Integer EIX = myPDS->Shape(E); Standard_Boolean TRC=DSREDUEDGETRCE(EIX); - if (TRC) cout< 1) {cout<<"TopOpeBRep_EdgesFiller : > 1 I on UNUN/F on E"<ChangeTransition(); Standard_Integer ifb = TU.IndexBefore(); const TopoDS_Face& fb = TopoDS::Face(myPDS->Shape(ifb)); -#ifdef OCCT_DEBUG - Standard_Integer ifa = TU.IndexAfter(); - if (ifb != ifa) {cout<<"TopOpeBRep_EdgesFiller : ifb != ifa on E"< ";TN.Dump(cout);cout< TN ko"< ** newT on e(1) = ";T1.Dump(cout);cout< ** newT on e(2) = ";T2.Dump(cout);cout<Face(ISI); Standard_Boolean Closed = TopOpeBRepTool_ShapeTool::Closed(E,F); Standard_Boolean Degen = BRep_Tool::Degenerated(E); @@ -252,7 +243,6 @@ void TopOpeBRep_FFDumper::DumpVP(const TopOpeBRep_VPointInter& VP,const Standard if (Closed) cout<<"on closing edge "; else cout<<"on edge "; if (Degen) cout<<" on degenerated edge "; TopAbs::Print(O,cout); cout<<" (ds"< #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); -#endif - //----------------------------------------------------------------------- //function : TransitionToOrientation //purpose : static @@ -68,22 +64,12 @@ static Standard_Boolean TransitionToOrientation case IntSurf_Outside : result = TopAbs_EXTERNAL; break; case IntSurf_Unknown : Odefined = Standard_False; -#ifdef OCCT_DEBUG -// if ( TopOpeBRepDS_GettraceDSF() ) { -// cout<<"TopOpeBRepDS:TransitionToOrientation : unknown situation"<DS()); - } -#endif - // exit if no point. FEINT.InitPoint(); if ( ! FEINT.MorePoint() ) return; @@ -258,9 +251,6 @@ void TopOpeBRep_FaceEdgeFiller::StoreInterference // append I to list LI LI.Append(I); -#ifdef OCCT_DEBUG - Standard_Boolean appendtoG = Standard_False; -#endif Standard_Integer G = I->Geometry(); // append I to list of interference connected to G = I->Geometry() @@ -273,16 +263,10 @@ void TopOpeBRep_FaceEdgeFiller::StoreInterference break; case TopOpeBRepDS_SURFACE : -#ifdef OCCT_DEBUG - appendtoG = Standard_True; -#endif BDS.ChangeSurfaceInterferences(G).Append(I); break; case TopOpeBRepDS_CURVE : -#ifdef OCCT_DEBUG - appendtoG = Standard_True; -#endif BDS.ChangeCurveInterferences(G).Append(I); break; @@ -293,14 +277,6 @@ void TopOpeBRep_FaceEdgeFiller::StoreInterference default: break; } - -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceDSF()) { - cout<<"append "; I->Dump(cout); - if (appendtoG) cout<<" and to G"<Index(),nli = myFacesIntersector->NbLines(); - Standard_Boolean tcx = TopOpeBRepDS_GettraceCX(ili); - Standard_Boolean tDSF = TopOpeBRepDS_GettraceDSF(); - Standard_Boolean traceDSNC = TopOpeBRepDS_GettraceDSNC(); - if(tDSF)cout<<"trc tnvp 1 "<DumpLine(*myLine); - if (traceDSNC) cout<<"line "<HasVPonR(); if (HasVPonR) FillLineVPonR(); else FillLine(); @@ -389,12 +370,7 @@ void TopOpeBRep_FacesFiller::ProcessLine() if (inl) return; myHDS->SortOnParameter(myDSCIL); - -#ifdef OCCT_DEBUG - TopOpeBRepDS_Dumper Dumper(myHDS); - if (tDSF||traceDSNC) Dumper.DumpLOI(myDSCIL,cout,"current curve : "); -#endif - + AddShapesLine(); } @@ -424,26 +400,11 @@ void TopOpeBRep_FacesFiller::ProcessVPInotonR(TopOpeBRep_VPointInterIterator& VP //======================================================================= void TopOpeBRep_FacesFiller::ProcessVPnotonR(const TopOpeBRep_VPointInter& VP) { -#ifdef OCCT_DEBUG - Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF(); - Standard_Boolean traceDSP = TopOpeBRepDS_GettraceDSP(); - Standard_Boolean traceISTO = TopOpeBRepDS_GettraceISTO(); - if (traceDSF) cout<Index(),ivp=iVP,isi=ShapeIndex; - if(traceDSF || traceDSP){ - cout<<"trc tnvp 1 "<TypeLineCurve() != TopOpeBRep_RESTRICTION) {return;} Standard_Boolean addIFE = Standard_True; @@ -568,12 +525,6 @@ void TopOpeBRep_FacesFiller::ProcessRLine() Standard_Integer rank = myDS->AncestorRank(iErest); Standard_Integer OOrank = (rank == 1)? 2: 1; -#ifdef OCCT_DEBUG - if (tDSF) {cout<<"+ edge restriction "<SectionEdge(Erest); - cout<<" (DS "<AddShape(myF1,1); Standard_Integer iF2 = myDS->AddShape(myF2,2); Handle(TopOpeBRepDS_Interference) IFE; @@ -589,10 +540,6 @@ void TopOpeBRep_FacesFiller::ProcessRLine() if (nopunk) processUNK = Standard_False; #endif if (processUNK && (T1unk || T2unk)) { -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSTRANGE(); trc = trc || tDSF; - if (trc) cout<<"T UNKNOWN FEI F"<Shape(F); TopoDS_Shape OOF = (*this).Face(OOrank); Standard_Integer iOOF = myDS->Shape(OOF); Standard_Boolean findTOOF = (T1unk && (OOrank == 1)) || (T2unk && (OOrank == 2)); @@ -606,12 +553,6 @@ void TopOpeBRep_FacesFiller::ProcessRLine() if (OOTok) { if (OOrank == 1) FDS_SetT(T1,T); else FDS_SetT(T2,T); -#ifdef OCCT_DEBUG - if (trc) { - cout<<"F"<DumpVP(VP);} -#endif Standard_Integer absindex = VP.ShapeIndex(); // 0,1,2,3 Standard_Real parRest; Standard_Boolean okR = VP.ParonE(Erest,parRest); @@ -771,16 +697,10 @@ void TopOpeBRep_FacesFiller::ProcessRLine() Standard_Integer iOOFace = myDS->Shape(OOFace); TopoDS_Edge edge,OOedge; Standard_Integer OOedgeIndex; -#ifdef OCCT_DEBUG - Standard_Integer SIedgeIndex; -#endif Standard_Real paredge; Standard_Integer onbound; if (SIErest) { edge = Erest; -#ifdef OCCT_DEBUG - SIedgeIndex = iErest; -#endif paredge = parRest; onbound = obRest; OOedge = OOE; @@ -790,9 +710,6 @@ void TopOpeBRep_FacesFiller::ProcessRLine() OOedgeIndex = iErest; onbound = obOO; edge = OOE; -#ifdef OCCT_DEBUG - SIedgeIndex = iOO; -#endif paredge = OOpar; } // PVIndex : @@ -867,11 +784,6 @@ void TopOpeBRep_FacesFiller::ProcessRLine() if (!ok) continue; transEdge.Before(Tr.Before()); transEdge.After(Tr.After()); } -#ifdef OCCT_DEBUG - if (tDSF) {cout<<"*-> new transEdge (edge"< kept myLastVPison0 = ::FUN_haslastvpon0(*myLine); - -#ifdef OCCT_DEBUG - if (tDSF) { - if (myLineIsonEdge) cout<<" geometric line is on edge"<VPBounds(iINON1,iINONn,nINON); if ( nINON == 0 ) return; @@ -1030,11 +931,7 @@ void TopOpeBRep_FacesFiller::FillLine() const TopOpeBRep_VPointInter& VP = VPI.CurrentVP(); if ( ! VP.Keep() ) continue; - -#ifdef OCCT_DEBUG - if (tDSF) cout< rejet"; - cout<AddCurve(DSC); - -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC()) - cout<<"new DSC "<DumpLineTransitions(cout); -#endif } I->Support(myDSCIndex); @@ -1217,12 +1100,6 @@ Standard_Boolean TopOpeBRep_FacesFiller::GetGeometry(TopOpeBRepDS_ListIteratorOf { TopOpeBRepDS_Point DSP = TopOpeBRep_PointGeomTool::MakePoint(VP); Standard_Boolean b = myHDS->GetGeometry(IT,DSP,G,K); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSP(); - if (b && trc) { - Standard_Boolean newinDS = Standard_False; myHFFD->DumpDSP(VP,K,G,newinDS); - } -#endif return b; } @@ -1245,13 +1122,6 @@ Standard_Integer TopOpeBRep_FacesFiller::MakeGeometry(const TopOpeBRep_VPointInt K = TopOpeBRepDS_POINT; } -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSP(); - if (trc) { - Standard_Boolean newinDS = Standard_True; myHFFD->DumpDSP(VP,K,G,newinDS); - } -#endif - return G; } diff --git a/src/TopOpeBRep/TopOpeBRep_LineInter.cxx b/src/TopOpeBRep/TopOpeBRep_LineInter.cxx index 27a84601bb..edabcd5c0f 100644 --- a/src/TopOpeBRep/TopOpeBRep_LineInter.cxx +++ b/src/TopOpeBRep/TopOpeBRep_LineInter.cxx @@ -53,8 +53,6 @@ #ifdef OCCT_DEBUG extern Standard_Boolean TopOpeBRep_GetcontextALWLNBP(Standard_Integer&); extern Standard_Boolean TopOpeBRep_GettraceCONIC(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); #endif //----------------------------------------------------------------------- @@ -647,16 +645,6 @@ void TopOpeBRep_LineInter::DumpBipoint void TopOpeBRep_LineInter::SetOK(const Standard_Boolean B) { -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC()) { - if (myOK != B) { - cout<<"line "<NOK"; else cout<<"NOK->OK"; - cout< #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); -#endif - Standard_EXPORT Standard_Boolean FUN_EqualponR(const TopOpeBRep_LineInter& Lrest, const TopOpeBRep_VPointInter& VP1, const TopOpeBRep_VPointInter& VP2); @@ -65,7 +59,6 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES) { #ifdef OCCT_DEBUG - Standard_Boolean b22 = TopOpeBRepDS_GettraceDSNC(); Standard_Boolean trRL=Standard_False; #endif @@ -100,16 +93,7 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES) mapES.Add(E); LES.Append(E); } - -#ifdef OCCT_DEBUG - if (b22) { - if (add) cout<<" : add restriction edge of line "; - else cout<<" rejection of restriction edge of line "; - cout<AddSectionEdge(E); -#ifdef OCCT_DEBUG - Standard_Integer iE = -#endif - myDS->Shape(E); -#ifdef OCCT_DEBUG - Standard_Integer rE = -#endif - myDS->AncestorRank(E); -#ifdef OCCT_DEBUG - if (DSNC) cout<<"add section edge "<AddSectionEdge(E); + myDS->Shape(E); + myDS->AncestorRank(E); } TColStd_ListOfInteger LOI; TColStd_ListIteratorOfListOfInteger itLOI; @@ -391,25 +354,6 @@ void TopOpeBRep_FacesFiller::ProcessSectionEdges() TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmapELE; -#ifdef OCCT_DEBUG - if (DSNC) { - for (itmapELE.Initialize(mapELE); itmapELE.More(); itmapELE.Next()) { - const TopoDS_Edge& E1 = TopoDS::Edge(itmapELE.Key()); - Standard_Integer iE1 = myDS->Shape(E1); - Standard_Integer rE1 = myDS->AncestorRank(iE1); - cout<<"sd3d edge "<Shape(E2); - Standard_Integer rE2 = myDS->AncestorRank(iE2); - cout<Shape(E1); diff --git a/src/TopOpeBRep/TopOpeBRep_VPointInter.cxx b/src/TopOpeBRep/TopOpeBRep_VPointInter.cxx index c763f16f8a..ec7f720124 100644 --- a/src/TopOpeBRep/TopOpeBRep_VPointInter.cxx +++ b/src/TopOpeBRep/TopOpeBRep_VPointInter.cxx @@ -37,7 +37,6 @@ #include #ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); static TCollection_AsciiString PRODINP("dinp "); #endif @@ -320,10 +319,10 @@ Standard_OStream& TopOpeBRep_VPointInter::Dump(const Standard_Integer I,const To #ifdef OCCT_DEBUG if (closingedge) OS<<"on closing edge "; else OS<<"on edge "; TopAbs::Print(O,cout); cout<<" of "< #ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); extern Standard_Boolean TopOpeBRep_GetcontextNEWKP(); #endif @@ -136,86 +135,6 @@ static Standard_Boolean FUNBREP_SameUV(const TopOpeBRep_VPointInter& VP1, return sameuv; } -#ifdef OCCT_DEBUG -//------------------------------------------------------------------- -void FUNBREP_topokpartDEB -(const Handle(TopOpeBRepDS_Interference)& /*Ifound*/, - const TopOpeBRepDS_ListOfInterference& DSCIL, - const TopOpeBRep_LineInter& L, - const TopOpeBRep_VPointInter& VP, - const TopOpeBRepDS_Transition& lasttransLine, - const TopOpeBRepDS_DataStructure& /*BDS*/, - const TopoDS_Shape& /*E*/, - const TopoDS_Shape& /*F*/, - const Standard_Real /*toluv*/, - const Standard_Boolean CPIfound, - const Standard_Boolean samepar, - const Standard_Boolean couture, - const Standard_Real& parline, - const TopOpeBRepDS_Transition& transLine) -//------------------------------------------------------------------- -{ - Standard_Integer iVP = VP.Index(); - Standard_Boolean fermee = L.IsVClosed(); - Standard_Boolean onsort = (transLine.Orientation(TopAbs_OUT) == TopAbs_FORWARD); - Standard_Boolean lastdefinie = ! lasttransLine.IsUnknown(); - Standard_Boolean lastonsort = Standard_False; - if (lastdefinie) lastonsort = (lasttransLine.Orientation(TopAbs_OUT) == TopAbs_FORWARD); - - Standard_Boolean LITdefinie = Standard_False; - Standard_Boolean LITonsort = Standard_False; - TopOpeBRepDS_Transition LIT; - Standard_Boolean nointerf = DSCIL.IsEmpty(); - - if (nointerf) STATIC_lastVPind = 0; - if (!nointerf) { - const Handle(TopOpeBRepDS_Interference)& I = DSCIL.Last(); - LIT = I->Transition(); - LITdefinie = ! LIT.IsUnknown(); - if (LITdefinie) LITonsort = (LIT.Orientation(TopAbs_OUT) == TopAbs_FORWARD); - } - - Standard_Boolean iswalki = (L.TypeLineCurve() == TopOpeBRep_WALKING); - if (iswalki) cout<<"kpwalk "; - else cout<<"kpglin "; - - cout<<"\tVP "<Transition(); // xpu12-12-97 -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceDSF()) { - FUNBREP_topokpartDEB(Ifound,DSCIL,L,VP,lasttransLine,BDS,E,F,toluv, - CPIfound,samepar,couture,parline,transLine); - } -#endif // A line is valid if at least it has VPi1 and VPi2 with i1 < i2 and : // transition on line for VPi1 : OUT/IN and for VPi2 : IN/OUT. diff --git a/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx b/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx index f31277345c..cbd87b2956 100644 --- a/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx +++ b/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx @@ -127,7 +127,6 @@ void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) cout<Dump(cout,"# BREP_mergePDS resu ","\n"); } #endif diff --git a/src/TopOpeBRep/TopOpeBRep_vpr.cxx b/src/TopOpeBRep/TopOpeBRep_vpr.cxx index b4752b42c1..6cd28ac533 100644 --- a/src/TopOpeBRep/TopOpeBRep_vpr.cxx +++ b/src/TopOpeBRep/TopOpeBRep_vpr.cxx @@ -70,10 +70,6 @@ #define M_REVERSED(st) (st == TopAbs_REVERSED) #ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceISTO(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSP(); -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i); extern Standard_Boolean TopOpeBRep_GettraceNVP(Standard_Integer a,Standard_Integer b,Standard_Integer c,Standard_Integer d,Standard_Integer e); Standard_Boolean GLOBAL_bvpr = Standard_False; @@ -224,11 +220,6 @@ static void FUN_VPgeometryfound } TopOpeBRepDS_ListIteratorOfListOfInterference itCPIL(DSCIL); -#ifdef OCCT_DEBUG - Standard_Boolean trc = Standard_False; - if (trc) {TopOpeBRepDS_Dumper DSD(HDS); TCollection_AsciiString aa("DSCIL :"); - DSD.DumpLOI(DSCIL,cout,aa);} -#endif CPIfound = FF.GetGeometry(itCPIL,VP,PVIndex,PVKind); if (CPIfound) ICPI = itCPIL.Value(); @@ -581,11 +572,6 @@ static void FUN_processCPI // NYI : compute uvtol with the original faces. By default, we set toluv = TolClass Standard_Real toluv = 1.e-8; Standard_Boolean keep = FUNBREP_topokpart(Ifound,DSCIL,L,VP,(*pDS),E,F,toluv,parline,ttransLine); - -#ifdef OCCT_DEBUG - Standard_Integer trc=TopOpeBRepDS_GettraceDSF(); - if (trc){if(keep)cout<<"\t-> on garde";else cout<<"\t-> on jette";cout<Index(),ivp=iVP,isi=ShapeIndex; - if(traceDSF || traceDSP){ - cout<"<'s geometry TopOpeBRepDS_ListOfInterference lITOOFonVP; // {I on = (T on , G on , S)} @@ -869,10 +829,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR newtransEdge = newtransEdge || closing || OOclosing; newtransEdge = newtransEdge && (!myLineINL); if (newtransEdge){ -#ifdef OCCT_DEBUG - Standard_Integer iedge = -#endif - myDS->Shape(edge); + myDS->Shape(edge); newtransEdge = !found; if (found) { // Getting first transition found @@ -891,12 +848,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonR if (ok) {transEdge.Before(Tr.Before()); transEdge.After(Tr.After());} newtransEdge = ok; } -#ifdef OCCT_DEBUG - if (traceDSF && (found || newtransEdge)) - {if (found) cout<<"*-> found "; if (newtransEdge) cout<<"*-> new "; - cout<<"transEdge (edge "<AddShape(edge,ShapeIndex); -#ifdef OCCT_DEBUG - Standard_Boolean trce = TopOpeBRepDS_GettraceSPSX(SIedgeIndex); if(trce) debarc(SIedgeIndex); -#endif Standard_Boolean SIisvertex = VP.IsVertex(ShapeIndex); Standard_Boolean OOisvertex = VP.IsVertex(OOShapeIndex); @@ -1004,10 +952,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonR // Gfound = VP corresponds with an existing geometry of ShapeIndex Standard_Boolean Gfound = ( EPIfound || CPIfound ); #ifdef OCCT_DEBUG - Standard_Boolean trcpv = TopOpeBRepDS_GettraceSPSX(PVIndex); - Standard_Boolean ispoint = (PVKind == TopOpeBRepDS_POINT); - if(trcpv && ispoint) debpoint(PVIndex); - if(trcpv && !ispoint) debvertex(PVIndex); if (GLOBAL_bvpr) debvprmess(myexF1,myexF2,ili,ivp,isi); #endif @@ -1076,9 +1020,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonR } } if ( correctON ) { -#ifdef OCCT_DEBUG - Standard_Boolean trcooe=TopOpeBRepDS_GettraceSPSX(OOedgeIndex);if (trcooe) debooarc(OOedgeIndex); -#endif if (OOedgeIndex == 0) OOedgeIndex = myDS->AddShape(OOedge,OOShapeIndex); // VP a ete classifie ON sur l'edge . @@ -1123,13 +1064,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonR TopAbs_State stb,sta; ok = MKT.MkTonE(stb,sta); if (ok) { tOOedge.Before(stb); tOOedge.After(sta); -#ifdef OCCT_DEBUG - if(traceDSF){ - cout<<"* !on2edges && TopAbs_ON *\n"; - if(OOisrest) cout<<"* edge "< "< "<AddShape(Face,ShapeIndex); diff --git a/src/TopOpeBRep/TopOpeBRep_vprclo.cxx b/src/TopOpeBRep/TopOpeBRep_vprclo.cxx index 5515175977..629e78e788 100644 --- a/src/TopOpeBRep/TopOpeBRep_vprclo.cxx +++ b/src/TopOpeBRep/TopOpeBRep_vprclo.cxx @@ -51,8 +51,6 @@ #define M_REVERSED(st) (st == TopAbs_REVERSED) #ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i1); Standard_EXPORT void debarc(const Standard_Integer i); Standard_EXPORT void debooarc(const Standard_Integer i); #endif @@ -183,14 +181,8 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V if (iOOFace == 0) iOOFace = myDS->AddShape(OOFace,OOShapeIndex); // current VPoint is on -#ifdef OCCT_DEBUG - Standard_Integer SIedgeIndex = 0; -#endif const TopoDS_Edge& edge = TopoDS::Edge(VP.Edge(ShapeIndex)); if (!myDS->HasShape(edge)) myDS->AddShape(edge,ShapeIndex); -#ifdef OCCT_DEBUG - else SIedgeIndex = myDS->Shape(edge); -#endif Standard_Real paredge = VP.EdgeParameter(ShapeIndex); @@ -206,12 +198,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V else OOedgeIndex = myDS->AddShape(OOedge,OOShapeIndex); } -#ifdef OCCT_DEBUG - Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF(); - Standard_Boolean trce = TopOpeBRepDS_GettraceSPSX(SIedgeIndex); if(trce) debarc(SIedgeIndex); - Standard_Boolean trcooe = TopOpeBRepDS_GettraceSPSX(OOedgeIndex); if(trcooe) debooarc(OOedgeIndex); -#endif - // =================================================================== // --- Edge/(POINT,VERTEX) Interference (EPI) creation --- // =================================================================== @@ -222,9 +208,6 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V // transEdge should be INTERNAL/EXTERNAL. Standard_Boolean Tunk = transEdge.IsUnknown(); -#ifdef OCCT_DEBUG - if (!Tunk && traceDSF) cout<<"-> on closing : transAdd = "<AddShape(Fi,rankFi); -#ifdef OCCT_DEBUG - Standard_Integer iEd = -#endif - myDS->AddShape(dgEd,rankdg); + myDS->AddShape(dgEd,rankdg); // Standard_Integer iOOEi = 0; // if (hasOOEi) iOOEi = myDS->AddShape(OOEi,rankFi); -#ifdef OCCT_DEBUG - Standard_Boolean trace = traceDSF || traceDEGEN; - if (trace) cout<<" VP is on degenerated edge "<AncestorRank(myDS->Shape(PVIndex)); if ((makeI == MKI1)||(makeI == MKI12)) { diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx index ebd13a2d42..e9302f1ada 100644 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx @@ -30,7 +30,6 @@ #ifdef OCCT_DEBUG extern Standard_Boolean TopOpeBRepBuild_GettraceAREA(); -extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx index b92c471581..47f2874cc9 100644 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx @@ -27,10 +27,6 @@ #include #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); -#endif - //======================================================================= //function : TopOpeBRepBuild_AreaBuilder //purpose : @@ -115,12 +111,6 @@ void TopOpeBRepBuild_AreaBuilder::Atomize(TopAbs_State& state, "AreaBuilder : Position Unknown"); } else { -#ifdef OCCT_DEBUG - if ( TopOpeBRepDS_GettraceSTRANGE() ) { - cout<<"AreaBuilder : state "; TopAbs::Print(state,cout); - cout<<" taken as "; TopAbs::Print(newstate,cout); cout<SurfaceCurves(iS)); @@ -85,7 +83,6 @@ void TopOpeBRepBuild_Builder::BuildFaces(const Standard_Integer iS, const TopOpeBRepDS_Curve& CDS = HDS->Curve(iC); #ifdef OCCT_DEBUG if (tSE) cout<FaceCurves(aFace); for (; FCurves.More(); FCurves.Next()) { Standard_Integer iC = FCurves.Current(); -#ifdef OCCT_DEBUG - Standard_Boolean tCU = TopOpeBRepBuild_GettraceCU(); - Standard_Boolean NtCUV = !TopOpeBRepBuild_GettraceCUV(); - if(tCU) {cout<Curve(iC).Dump(cout,iC,NtCUV);} -#endif const TopTools_ListOfShape& LnewE = NewEdges(iC); for (TopTools_ListIteratorOfListOfShape Iti(LnewE); Iti.More(); Iti.Next()) { anEdge = Iti.Value(); diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON2d.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON2d.cxx index bff2a268b4..6a864439ae 100644 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON2d.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON2d.cxx @@ -75,9 +75,7 @@ void TopOpeBRepBuild_BuilderON::Perform2d #ifdef OCCT_DEBUG Standard_Integer iFOR;Standard_Boolean tFOR=myPB->GtraceSPS(FOR,iFOR); if (tFOR) debfillonf(iFOR); - if (tFOR) {cout<Dump(cout);cout<GtraceSPS(GI); // Standard_Boolean tEFOR = (tE && tFOR); if (tFOR) {debON2d(iFOR);} - if (tFOR) {I->Dump(cout);cout< void debifb() {} #endif @@ -92,10 +90,6 @@ TopOpeBRepBuild_FaceBuilder::TopOpeBRepBuild_FaceBuilder(TopOpeBRepBuild_WireEdg void TopOpeBRepBuild_FaceBuilder::InitFaceBuilder(TopOpeBRepBuild_WireEdgeSet& WES,const TopoDS_Shape& F,const Standard_Boolean ForceClass) { myFace = TopoDS::Face(F); -#ifdef OCCT_DEBUG - Standard_Boolean deb = TopOpeBRepDS_GettraceSPSX(myFace); - if (deb) debifb(); -#endif MakeLoops(WES); TopOpeBRepBuild_BlockBuilder& BB = myBlockBuilder; TopOpeBRepBuild_WireEdgeClassifier WEC(F,BB); @@ -374,10 +368,8 @@ void TopOpeBRepBuild_FaceBuilder::CorrectGclosedWire(const TopTools_IndexedDataM { // prequesitory : edges described by are not closed,not degenerated #ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSTRANGE(); if (TopOpeBRepBuild_GettracePURGE()) { cout<Dump(cout,"\nnewinterf ","\n\n"); debfillp2(iEDS);} -#endif {tki.Next(); continue;} } // isSE @@ -542,10 +532,6 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E, TopAbs_ShapeEnum SB1,SA1;Standard_Integer IB1,IA1;TopOpeBRepDS_Kind GT1,ST1;Standard_Integer G1,S1; FDS_Idata(I1,SB1,IB1,SA1,IA1,GT1,G1,ST1,S1); -#ifdef OCCT_DEBUG - if(tSPS) {I1->Dump(cout,"\n? keepinterf ","\n\n"); debfillp2(iEDS);} -#endif - Standard_Boolean keepinterf1 = Standard_False; if (isEd) { keepinterf1 = Standard_True; @@ -569,9 +555,6 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E, Standard_Boolean id2d = (I1 == i2d); if (tSPS) { cout<<"DEB : GFillPointTopologyPVS E"<Dump(cout,"2d : ","\n"); - i3d->Dump(cout,"3d : ","\n"); - I1->Dump (cout,"I1 : ","\n"); if (id3d) cout<<"--> Interference 3d "; if (id2d) cout<<"--> Interference 2d "; if (keepinterf1) cout<<" traitee"< extern void* GFABUMAKEFACEPWES_DEB; #define DEBSHASET(sarg,meth,shaset,str) TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str); Standard_Integer GLOBAL_iexE = 0; @@ -153,10 +152,6 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU, // {I = (T(F),ES,FTRA)} / Fsdm F and ES interfers with E which has splits ON // E is edge of F { -#ifdef OCCT_DEBUG - Standard_Integer iF;Standard_Boolean tF=BU.GtraceSPS(F,iF); -#endif - const TopOpeBRepDS_DataStructure& BDS = BU.DataStructure()->DS(); const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(E); Standard_Integer IE = BDS.Shape(E); @@ -215,9 +210,6 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU, if (ok) { newT.Index(ITRA); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED; Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,ITRA,IE,Standard_True,C); -#ifdef OCCT_DEBUG - if (tF) {cout<<"f"<Dump(cout);cout<AddShapeInterference(F,newI); } } @@ -233,9 +225,6 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU, if (ok) { newT.Index(IF); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED; Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,IF,IE,Standard_False,C); -#ifdef OCCT_DEBUG - if (tF) {cout<<"f"<Dump(cout);cout<AddShapeInterference(FTRA,newI); } @@ -243,9 +232,6 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU, if (ok) { newT.Index(IF); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED; Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,IF,S,Standard_True,C); -#ifdef OCCT_DEBUG - if (tF) {cout<Dump(cout);cout<AddShapeInterference(FTRA,newI); } @@ -264,9 +250,6 @@ Standard_Boolean FUN_computeLIFfaces2d(const TopOpeBRepBuild_Builder& BU, if (ok) { newT.Index(ITRA); TopOpeBRepDS_Config C = TopOpeBRepDS_SAMEORIENTED; Handle(TopOpeBRepDS_Interference) newI = TopOpeBRepDS_InterferenceTool::MakeFaceEdgeInterference(newT,ITRA,S,Standard_False,C); -#ifdef OCCT_DEBUG - if (tF) {cout<<"f"<Dump(cout);cout<AddShapeInterference(F,newI); } } @@ -869,11 +852,8 @@ static void FUN_samgeomori(const TopOpeBRepDS_DataStructure& BDS, const Standard #ifdef OCCT_DEBUG cout<<"o-o GridFF ffil F"< "; GKeepShape(EOR,LSclass,TB1);cout.flush();} else {cout<<" : ftg --> non gardee"<Shape(iEinterf).ShapeType() != TopAbs_EDGE) iEinterf = 0; @@ -970,19 +965,13 @@ static Standard_Boolean FUN_SplitEvisoONperiodicF(const Handle(TopOpeBRepDS_HDat TopOpeBRepDS_Kind GT,ST;Standard_Integer GI,SI;FDS_data(SSI,GT,GI,ST,SI); const TopoDS_Face& FS = TopoDS::Face( HDS->Shape(SI)); -#ifdef OCCT_DEBUG - Standard_Integer iFS = -#endif - HDS->Shape(FS); + HDS->Shape(FS); // Standard_Boolean FSper = FUN_periodicS(FS); Standard_Boolean FSper = FUN_tool_closedS(FS); if (!FSper) continue; const TopoDS_Edge& EG = TopoDS::Edge(HDS->Shape(GI)); -#ifdef OCCT_DEBUG - Standard_Integer iEG = -#endif - HDS->Shape(EG); + HDS->Shape(EG); Standard_Boolean isrest = HDS->DS().IsSectionEdge(EG); if (!isrest) continue; @@ -1014,19 +1003,10 @@ static Standard_Boolean FUN_SplitEvisoONperiodicF(const Handle(TopOpeBRepDS_HDat TopOpeBRepDS_DataStructure& BDS = HDS->ChangeDS(); TopOpeBRepDS_ListOfInterference EPIlist; FUN_getEPIonEds(FS,HDS,EPIlist); TopOpeBRepDS_ListOfInterference loCPI; -#ifdef OCCT_DEBUG - Standard_Boolean recadre = -#endif - FUN_EPIforEvisoONperiodicF(EG,FS,EPIlist, HDS,loCPI); + FUN_EPIforEvisoONperiodicF(EG,FS,EPIlist, HDS,loCPI); TopOpeBRepDS_ListOfInterference& lIEG = BDS.ChangeShapeInterferences(EG); lIEG.Append(loCPI); - -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSTRANGE(); - if (trc) {cout<<"!! recadre is "; if (!recadre) cout<<"not "; - cout<<"done on face FS "< #ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -extern Standard_Boolean TopOpeBRepDS_GettraceSPSXX(const Standard_Integer,const Standard_Integer); static TCollection_AsciiString PRODINS("dins "); #endif @@ -643,19 +641,10 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer ) con //function : GtraceSPS //purpose : //======================================================================= -#ifdef OCCT_DEBUG -Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer i, - const Standard_Integer j) const -#else Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const Standard_Integer , const Standard_Integer ) const -#endif { - Standard_Boolean b = Standard_False; -#ifdef OCCT_DEBUG - b = TopOpeBRepDS_GettraceSPSXX(i,j); -#endif - return b; + return Standard_False; } //======================================================================= @@ -680,24 +669,11 @@ Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape& ) const //function : GtraceSPS //purpose : //======================================================================= -#ifdef OCCT_DEBUG -Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape& S, - Standard_Integer& IS) const -#else Standard_Boolean TopOpeBRepBuild_Builder::GtraceSPS(const TopoDS_Shape&, Standard_Integer& IS) const -#endif { - IS = 0; Standard_Boolean b = Standard_False; -#ifdef OCCT_DEBUG - if ( ! myDataStructure.IsNull() ) { - if ( ! S.IsNull() ) { - IS = myDataStructure->Shape(S); - b = TopOpeBRepDS_GettraceSPSX(IS); - } - } -#endif - return b; + IS = 0; + return Standard_False; } diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx index 36a2b4bb39..af5ce58773 100644 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx @@ -64,7 +64,6 @@ #ifdef OCCT_DEBUG extern Standard_Boolean TopOpeBRepBuild_GettraceSPS(); -extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); Standard_EXPORT void debsplitse(const Standard_Integer) {} Standard_EXPORT void debsplitsemess(const Standard_Integer i,const TCollection_AsciiString& s = ""); Standard_EXPORT void debsplitsemess(const Standard_Integer i,const TCollection_AsciiString& s){cout<<"+++ debsplitse "<DS(); Standard_Integer i,n = BDS.NbSectionEdges(); - -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceDSNC() && !mySplitSectionEdgesDone) - cout<<"TopOpeBRepBuild_Builder::SSE : compute "< #ifdef OCCT_DEBUG -#define TSTRA TopOpeBRepDS_GettraceSTRANGE() static TCollection_AsciiString PRODINS("dins "); -extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); #endif //Standard_IMPORT extern TopOpeBRepBuild_Builder* GLOBAL_PBUILDER; @@ -149,12 +147,6 @@ TopAbs_State TopOpeBRepBuild_WireEdgeClassifier::Compare } } //UNKNOWN - if (state == TopAbs_UNKNOWN) { -#ifdef OCCT_DEBUG - if (TSTRA) cout<<"TopOpeBRepBuild_Builder::WES::Compare UNKNOWN -> ShapeClassifier "< purgeFon1nonoriE\n"; -#endif continue; } diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_makesolids.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_makesolids.cxx index e0dbfecc1f..93e3e0b92a 100644 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_makesolids.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_makesolids.cxx @@ -52,7 +52,6 @@ #include #ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); Standard_EXPORT void debgsobu(const Standard_Integer /*iSO*/) {} #endif @@ -83,7 +82,6 @@ void TopOpeBRepBuild_Builder::GSOBUMakeSolids (const TopoDS_Shape& SOF,TopOpeBRepBuild_SolidBuilder& SOBU,TopTools_ListOfShape& LOSO) { #ifdef OCCT_DEBUG - Standard_Boolean trcso = TopOpeBRepDS_GettraceSTRANGE(); Standard_Integer iSO; Standard_Boolean tSPS = GtraceSPS(SOF,iSO); if(tSPS){GdumpSHA(SOF, (char *) "#--- GSOBUMakeSolids ");cout<EMPTY SOLID\n"; -#endif continue; } diff --git a/src/TopOpeBRepDS/FILES b/src/TopOpeBRepDS/FILES index ad51a1ec7a..548bd921bc 100755 --- a/src/TopOpeBRepDS/FILES +++ b/src/TopOpeBRepDS/FILES @@ -47,7 +47,6 @@ TopOpeBRepDS_DRAW.cxx TopOpeBRepDS_DRAW.hxx TopOpeBRepDS_DSS.cxx TopOpeBRepDS_DSS.hxx -TopOpeBRepDS_DSX.hxx TopOpeBRepDS_Dumper.cxx TopOpeBRepDS_Dumper.hxx TopOpeBRepDS_Edge3dInterferenceTool.cxx @@ -116,8 +115,6 @@ TopOpeBRepDS_ProcessEdgeInterferences.cxx TopOpeBRepDS_ProcessFaceInterferences.cxx TopOpeBRepDS_ProcessInterferencesTool.cxx TopOpeBRepDS_ProcessInterferencesTool.hxx -TopOpeBRepDS_reDEB.cxx -TopOpeBRepDS_reDEB.hxx TopOpeBRepDS_redu.cxx TopOpeBRepDS_Reducer.cxx TopOpeBRepDS_Reducer.hxx @@ -148,8 +145,5 @@ TopOpeBRepDS_TKI.cxx TopOpeBRepDS_TKI.hxx TopOpeBRepDS_TOOL.cxx TopOpeBRepDS_TOOL.hxx -TopOpeBRepDS_trace.cxx -TopOpeBRepDS_traceDSX.cxx -TopOpeBRepDS_traceDSX.hxx TopOpeBRepDS_Transition.cxx TopOpeBRepDS_Transition.hxx diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx index f12d292aed..4da8245dc1 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx @@ -78,126 +78,13 @@ #include // includes especially needed by the static Project function -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); -extern Standard_Boolean TopOpeBRepDS_GettraceBUTO(); -extern Standard_Boolean TopOpeBRepDS_GettraceTRPE(); -extern Standard_Boolean TopOpeBRepDS_GettraceSANTRAN(); -static void DUMPCURVES(const Handle(Geom_Curve)& C3D,const TopOpeBRepDS_Curve& C) -{ - if ( !C3D.IsNull() ) { - Standard_Real dp1 = C3D->FirstParameter(); - Standard_Real dp2 = C3D->LastParameter(); - cout<<"TopOpeBRepDS_BuildTool : C3D = "<FirstParameter(); - Standard_Real dp2 = C.Curve1()->LastParameter(); - cout<<"TopOpeBRepDS_BuildTool : PC1 = "<FirstParameter(); - Standard_Real dp2 = C.Curve2()->LastParameter(); - cout<<"TopOpeBRepDS_BuildTool : PC2 = "< #include #endif -//----------------------------------------------------------------------- -//function : PrintSurface -//purpose : print the name of a surface on a stream -// a mettre dans TopOpeBRepDS_Dumper.cxx NYI -//----------------------------------------------------------------------- - -#ifdef OCCT_DEBUG -static Standard_OStream& PrintSurface(const TopoDS_Face& F, Standard_OStream& s) -{ - BRepAdaptor_Surface STA_Surface(F); - GeomAbs_SurfaceType t = STA_Surface.GetType(); - switch(t) { - case GeomAbs_Plane : s<<"PLANE"; break; - case GeomAbs_Cylinder : s<<"CYLINDER"; break; - case GeomAbs_Cone : s<<"CONE"; break; - case GeomAbs_Sphere : s<<"SPHERE"; break; - case GeomAbs_Torus : s<<"TORUS"; break; - case GeomAbs_BezierSurface : s<<"BEZIERSURFACE"; break; - case GeomAbs_BSplineSurface : s<<"BSPLINESURFACE"; break; - case GeomAbs_SurfaceOfRevolution : s<<"SURFACEOFREVOLUTION"; break; - case GeomAbs_SurfaceOfExtrusion : s<<"SURFACEOFEXTRUSION"; break; - case GeomAbs_OtherSurface : default : s<<"OTHERSURFACE"; break; - } - return s; -} -#endif - Standard_EXPORT Handle(Geom2d_Curve) BASISCURVE2D(const Handle(Geom2d_Curve)& C); -//----------------------------------------------------------------------- -//function : GetOrigin -//purpose : a mettre dans TopOpeBRepDS_Dumper.cxx NYI -//----------------------------------------------------------------------- - -#ifdef OCCT_DEBUG -static Standard_Boolean GetOrigin(const Handle(Geom2d_Curve)& PCIN, gp_Pnt2d& o) -{ - if (PCIN.IsNull()) return Standard_False; - Handle(Geom2d_Curve) PC = ::BASISCURVE2D(PCIN); - if (PC.IsNull()) return Standard_False; - - Handle(Standard_Type) T = PC->DynamicType(); - if ((T==STANDARD_TYPE(Geom2d_Circle)) || - (T==STANDARD_TYPE(Geom2d_Ellipse)) || - (T==STANDARD_TYPE(Geom2d_Parabola)) || - (T==STANDARD_TYPE(Geom2d_Hyperbola))) { - o = Handle(Geom2d_Conic)::DownCast(PC)->Location(); - return Standard_True; - } - else if (T==STANDARD_TYPE(Geom2d_Line)) { - o = Handle(Geom2d_Line)::DownCast(PC)->Location(); - return Standard_True; - } - else { - return Standard_False; - } -// return Standard_False; -} -#endif - -//----------------------------------------------------------------------- -//function : GetOrigin -//purpose : a mettre dans TopOpeBRepDS_Dumper.cxx NYI -//----------------------------------------------------------------------- - -#ifdef OCCT_DEBUG -static Standard_Boolean GetOrigin(const Handle(Geom_Curve)& CIN, gp_Pnt& o) -{ - if (CIN.IsNull()) return Standard_False; - Handle(Geom_Curve) C = TopOpeBRepTool_ShapeTool::BASISCURVE(CIN); - if (C.IsNull()) return Standard_False; - - Handle(Standard_Type) T = C->DynamicType(); - if ((T==STANDARD_TYPE(Geom_Circle)) || - (T==STANDARD_TYPE(Geom_Ellipse)) || - (T==STANDARD_TYPE(Geom_Parabola)) || - (T==STANDARD_TYPE(Geom_Hyperbola))) { - o = Handle(Geom_Conic)::DownCast(C)->Location(); - return Standard_True; - } - else if (T==STANDARD_TYPE(Geom_Line)) { - o = Handle(Geom_Line)::DownCast(C)->Position().Location(); - return Standard_True; - } - else { - return Standard_False; - } -} -#endif - Standard_Boolean FUN_UisoLineOnSphe (const TopoDS_Shape& F, const Handle(Geom2d_Curve)& PC) @@ -310,13 +197,6 @@ void TopOpeBRepDS_BuildTool::MakeVertex(TopoDS_Shape& V, myBuilder.MakeVertex(TopoDS::Vertex(V),P.Point(),P.Tolerance()); } -#ifdef OCCT_DEBUG -//----------------------------------------------------------------------- -static Standard_OStream& DUMPPNT(const gp_Pnt& P, Standard_OStream& OS) -//----------------------------------------------------------------------- -{ OS<Degree() == 1) { myBuilder.Range(TopoDS::Edge(E),1,BSC->NbPoles()); -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceBUTO()) { - cout<NbPoles()<newtol) newtol=r1; // if (r2>newtol) newtol=r2; -//#ifdef OCCT_DEBUG -// if (TopOpeBRepDS_GettraceDSNC()) cout<<"newtol = "<MakeCurve(C,newC1); TopOpeBRepDS_Curve& newC = HDS->ChangeCurve(inewC); -#ifdef OCCT_DEBUG -// Standard_Boolean tDSNC = TopOpeBRepDS_GettraceDSNC(); - Standard_Boolean tBUTO = TopOpeBRepDS_GettraceBUTO(); -#endif - // C1 curves have been approximated by BSplines of degree 1 : // compute new geometry on curves. @@ -697,11 +549,6 @@ void TopOpeBRepDS_BuildTool::ApproxCurves TopoDS_Vertex Vmin,Vmax;Standard_Real parmin,parmax; GetOrientedEdgeVertices(E,Vmin,Vmax,parmin,parmax); -#ifdef OCCT_DEBUG - if (tBUTO) cout<<"Recompute1 min,max = "< tol) return Standard_False; -#ifdef OCCT_DEBUG -// Standard_Real deltav = vsup-vinf; -#endif Standard_Boolean isvgrowing = (vsup - vinf > -tol); gp_Dir2d vdir; @@ -827,16 +660,6 @@ Standard_Boolean FUN_makeUisoLineOnSphe if (!PC.IsNull()) { Handle(Geom2d_Line) L = Handle(Geom2d_Line)::DownCast(PC); L->SetLin2d(gp_Lin2d(origin,vdir)); -#ifdef OCCT_DEBUG -#ifdef DRAW - Standard_Boolean trc = TopOpeBRepDS_GettraceBUTO(); - if (trc) { - FUN_draw(gp_Pnt2d(uinf,vinf)); - FUN_draw(gp_Pnt2d(usup,vsup)); - FUN_draw(L,p3dl-p3df); - } -#endif -#endif } // (!PC.IsNull()) return Standard_True; @@ -850,20 +673,10 @@ void TopOpeBRepDS_BuildTool::ComputePCurves const Standard_Boolean comppc2, const Standard_Boolean compc3d) const { -#ifdef OCCT_DEBUG -// Standard_Boolean tDSNC = TopOpeBRepDS_GettraceDSNC(); - Standard_Boolean tBUTO = TopOpeBRepDS_GettraceBUTO(); - Standard_Boolean tTRPE = TopOpeBRepDS_GettraceTRPE(); -#endif - const TopoDS_Face& F1 = TopoDS::Face(newC.Shape1()); const TopoDS_Face& F2 = TopoDS::Face(newC.Shape2()); const Handle(Geom_Curve)& C3D = C.Curve(); -#ifdef OCCT_DEBUG -// const Handle(Geom2d_Curve)& PC1 = C.Curve1(); -// const Handle(Geom2d_Curve)& PC2 = C.Curve2(); -#endif // get bounding vertices Vmin,Vmax supported by the new edge // and their corresponding parameters parmin,parmax . @@ -871,11 +684,6 @@ void TopOpeBRepDS_BuildTool::ComputePCurves TopoDS_Vertex Vmin,Vmax;Standard_Real parmin,parmax; GetOrientedEdgeVertices(E,Vmin,Vmax,parmin,parmax); -#ifdef OCCT_DEBUG - if (tBUTO) cout<<"Recompute2 min,max = "< parmin,parmax "< "<Copy()); PCT->Translate(gp_Vec2d(du,dv)); @@ -1388,34 +1158,6 @@ Standard_EXPORT void TopOpeBRepDS_SetThePCurve(const BRep_Builder& B, } } -#ifdef OCCT_DEBUG -//------------------------------------------------------------------------ -static void DUMPPCURVE(const TopoDS_Edge& EE, - const TopoDS_Face& FF, - const Handle(Geom2d_Curve)& PC) -//------------------------------------------------------------------------ -{ - TopLoc_Location L; Standard_Real Cf,Cl; - Handle(Geom_Curve) C = BRep_Tool::Curve(EE,L,Cf,Cl); - if (C->IsPeriodic()) { - cout<FirstParameter(); PCl = PC->LastParameter(); - gp_Pnt2d oPC; - if (::GetOrigin(PC,oPC)) - cout<<"(PC)PCurve origin : "< Precision::PConfusion()); @@ -1533,10 +1251,6 @@ void TopOpeBRepDS_BuildTool::PCurve(TopoDS_Shape& F, } TopOpeBRepDS_SetThePCurve(myBuilder,EE,FF,E.Orientation(),PCT); - -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceTRPE()) DUMPPCURVE(EE,FF,PCT); -#endif } } @@ -1656,11 +1370,6 @@ void TopOpeBRepDS_BuildTool::RecomputeBSpline1Curve TopoDS_Shape& EE, TopOpeBRepDS_Curve& C2) const { -#ifdef OCCT_DEBUG - Standard_Boolean tDSNC = TopOpeBRepDS_GettraceDSNC(); - Standard_Boolean tBUTO = TopOpeBRepDS_GettraceBUTO(); -#endif - // C1 curves have been approximated by BSplines of degree 1 : // compute new geometry on curves. @@ -1685,11 +1394,7 @@ void TopOpeBRepDS_BuildTool::RecomputeBSpline1Curve TopoDS_Vertex Vmin,Vmax; Standard_Real parmin,parmax; ::GetOrientedEdgeVertices(E,Vmin,Vmax,parmin,parmax); -#ifdef OCCT_DEBUG - if (tBUTO) cout<<"Recompute1 min,max = "<IsPeriodic() ) { // ellipse on cone : periodize parmin,parmax Standard_Real period = C3D->LastParameter() - C3D->FirstParameter(); @@ -1790,10 +1484,6 @@ void TopOpeBRepDS_BuildTool::RecomputeCurveOnCone else { f = parmax; l = parmin; } parmin = f; parmax = l; ElCLib::AdjustPeriodic(f,f+period,Precision::PConfusion(),parmin,parmax); -#ifdef OCCT_DEBUG - if (tBUTO||tTRPE) cout<<"Recompute2 : parmin,parmax "< parmin,parmax "<NbSurfaces() < I) { -#ifdef OCCT_DEBUG - cout<<"Surpassed index of TopOpeBRepDS_SURFACE. actual index : "<NbSurfaces(); -#endif if(myMapSurfaceStatus.IsBound(I)) myMapSurfaceStatus.UnBind(I); myMapSurfaceStatus.Bind(I, TopOpeBRepDS_NOK); @@ -165,10 +158,6 @@ Standard_Boolean TopOpeBRepDS_Check::CheckDS(const Standard_Integer I, case TopOpeBRepDS_CURVE : { if(myHDS->NbCurves() < I) { -#ifdef OCCT_DEBUG - cout<<"Surpassed index of TopOpeBRepDS_CURVE. actual index : "<NbCurves(); -#endif if(myMapCurveStatus.IsBound(I)) myMapCurveStatus.UnBind(I); myMapCurveStatus.Bind(I, TopOpeBRepDS_NOK); @@ -182,10 +171,6 @@ Standard_Boolean TopOpeBRepDS_Check::CheckDS(const Standard_Integer I, case TopOpeBRepDS_POINT : { if(myHDS->NbPoints() < I) { -#ifdef OCCT_DEBUG - cout<<"Surpassed index of TopOpeBRepDS_POINT : actual index : "<NbPoints()<NbShapes() < I) { -#ifdef OCCT_DEBUG - cout<<"Surpassed index of TopOpeBRepDS_Shape_. actual index : "<NbShapes(); -#endif if(myMapShapeStatus.IsBound(I)) myMapShapeStatus.UnBind(I); myMapShapeStatus.Bind(I,TopOpeBRepDS_NOK); @@ -226,13 +207,6 @@ Standard_Boolean TopOpeBRepDS_Check::CheckDS(const Standard_Integer I, break ; } if(S.ShapeType() != se) { -#ifdef OCCT_DEBUG - cout<<"Error : Shape "<Shape(i); const TopTools_ListOfShape& losi = BDS.ShapeSameDomain(Sind); if(!CheckShapes(losi)) { -#ifdef OCCT_DEBUG - cout<<"Shape of ShapeSameDomain (n*n "< 1.e50"); IsOK = Standard_False; } } @@ -485,14 +404,8 @@ Standard_Boolean CheckEdgeParameter(const Handle(TopOpeBRepDS_HDataStructure)& m Handle(TopOpeBRepDS_CurvePointInterference) CPI (Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I1)); if(!CPI.IsNull()) { Standard_Integer Param = -//#ifdef OCCT_DEBUG -// TopOpeBRepDS_InterferenceTool::Parameter(CPI); -//#else (Standard_Integer ) TopOpeBRepDS_InterferenceTool::Parameter(CPI); -//#endif if(Param > 1.e50) { - I1->Dump(cout,"!!**!!** WARNING : sur l'interference : \n", - "parameter > 1.e50"); IsOK = Standard_False; } } @@ -649,16 +562,8 @@ Standard_OStream& TopOpeBRepDS_Check::PrintShape return OS; } OS<<" "; -#ifdef OCCT_DEBUG - const TopoDS_Shape& S = -#endif - myHDS->Shape(index); - -#ifdef OCCT_DEBUG - PrintShape(S.ShapeType(),cout); - OS<<" "<Shape(index); + return OS; } diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Curve.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Curve.cxx index 04b2d01cb3..902edd62aa 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_Curve.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_Curve.cxx @@ -343,54 +343,6 @@ void TopOpeBRepDS_Curve::ChangeIsWalk(const Standard_Boolean B) myIsWalk = B; } - -//======================================================================= -//function : Dump -//purpose : -//======================================================================= - -#ifdef OCCT_DEBUG -Standard_OStream& TopOpeBRepDS_Curve::Dump (Standard_OStream& OS, - const Standard_Integer index, - const Standard_Boolean compact)const -{ - OS<<"Curve : "; if (index != 0) OS<DumpPCurve(OS,compact); - else OS<<" is null"; - OS<DumpPCurve(OS,compact); - else OS<<" is null"; - OS< - -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX(const Standard_Boolean b,Standard_Integer n,char** a); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const TopoDS_Shape& S); -Standard_EXPORT Standard_Integer TopOpeBRepDS_GetindexSPSX(const TopoDS_Shape& S); -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX(const Standard_Integer i,const Standard_Boolean b); - -Standard_EXPORT void TopOpeBRepDS_SettraceSPSXX(const Standard_Boolean b, Standard_Integer n, char** a); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSXX(const Standard_Integer i1,const Standard_Integer i2); - -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX_SS(const TopoDS_Shape&,const TopoDS_Shape&); -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX_HDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS); -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX_SSHDS(const TopoDS_Shape&,const TopoDS_Shape&, const Handle(TopOpeBRepDS_HDataStructure)& HDS); -#endif - -#endif diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx index 11b7d64251..102f4fe2d2 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx @@ -37,14 +37,6 @@ #include #include -//modified by NIZNHY-PKV Tue Oct 30 09:21:39 2001 f -//modified by NIZNHY-PKV Tue Oct 30 09:21:44 2001 t -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -#include -#include -#endif - //======================================================================= //function : TopOpeBRepDS_DataStructure //purpose : @@ -103,10 +95,7 @@ Standard_Integer TopOpeBRepDS_DataStructure::AddSurface(const TopOpeBRepDS_Surfa //======================================================================= void TopOpeBRepDS_DataStructure::RemoveSurface(const Standard_Integer I) { -#ifdef OCCT_DEBUG -// Standard_Boolean in = -#endif - mySurfaces.UnBind(I); + mySurfaces.UnBind(I); } //======================================================================= @@ -164,10 +153,6 @@ Standard_Integer TopOpeBRepDS_DataStructure::AddCurve(const TopOpeBRepDS_Curve& TopOpeBRepDS_CurveData CD(C); myCurves.Bind(myNbCurves,CD); -#ifdef OCCT_DEBUG - // const TopOpeBRepDS_Curve& CCC = Curve(myNbCurves); -#endif - return myNbCurves; } @@ -317,10 +302,6 @@ Standard_Integer TopOpeBRepDS_DataStructure::AddShape(const TopoDS_Shape& S) TopOpeBRepDS_ShapeData SD; iS = myShapes.Add(S,SD); // a shape is its own reference, oriented as itself -#ifdef OCCT_DEBUG - Standard_Boolean b = TopOpeBRepDS_GettraceSPSX(iS); - if (b) {cout<<"DS : add ";TopOpeBRepDS::Print(S.ShapeType(),iS,cout);cout< myNbPoints ) { -#ifdef OCCT_DEBUG - cout<<"acces au POINT "< myNbPoints ) { -#ifdef OCCT_DEBUG - cout<<"acces au POINT "<DynamicType(); - if (T==STANDARD_TYPE(Geom_Circle)) OS<<"CIRCLE"; - else if (T==STANDARD_TYPE(Geom_Line)) OS<<"LINE"; - else if (T==STANDARD_TYPE(Geom_Ellipse)) OS<<"ELLIPSE"; - else if (T==STANDARD_TYPE(Geom_Parabola)) OS<<"ELLIPSE"; - else if (T==STANDARD_TYPE(Geom_Hyperbola)) OS<<"HYPERBOLA"; - else if (T==STANDARD_TYPE(Geom_BezierCurve)) OS<<"BEZIER"; - else if (T==STANDARD_TYPE(Geom_BSplineCurve)) - OS<<"BSPLINE("<Degree()<<")"; - else if (T==STANDARD_TYPE(Geom_TrimmedCurve)) - {OS<<"TRIMMED ";PrintType(Handle(Geom_TrimmedCurve)::DownCast(C)->BasisCurve(),OS);} - else if (T==STANDARD_TYPE(Geom_OffsetCurve)) OS<<"OFFSETCURVE"; - else OS<<"***UNKNOWN***"; - if (T!=STANDARD_TYPE(Geom_TrimmedCurve)) OS<<"3D"; -#endif - - return OS; -} - -//======================================================================= -//function : PrintType -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_Dumper::PrintType(const Handle(Geom2d_Curve)& -#ifdef OCCT_DEBUG - C -#endif - ,Standard_OStream& OS) -{ -#ifdef OCCT_DEBUG - if (C.IsNull()) { - OS<<"NULL CURVE2d"; - return OS; - } - Handle(Standard_Type) T = C->DynamicType(); - if (T==STANDARD_TYPE(Geom2d_Circle)) OS<<"CIRCLE"; - else if (T==STANDARD_TYPE(Geom2d_Line)) OS<<"LINE"; - else if (T==STANDARD_TYPE(Geom2d_Ellipse)) OS<<"ELLIPSE"; - else if (T==STANDARD_TYPE(Geom2d_Parabola)) OS<<"ELLIPSE"; - else if (T==STANDARD_TYPE(Geom2d_Hyperbola)) OS<<"HYPERBOLA"; - else if (T==STANDARD_TYPE(Geom2d_BezierCurve)) OS<<"BEZIER"; - else if (T==STANDARD_TYPE(Geom2d_BSplineCurve)) - OS<<"BSPLINE("<Degree()<<")"; - else if (T==STANDARD_TYPE(Geom2d_TrimmedCurve)) - {OS<<"TRIMMED ";PrintType(Handle(Geom2d_TrimmedCurve)::DownCast(C)->BasisCurve(),OS);} - else if (T==STANDARD_TYPE(Geom2d_OffsetCurve)) OS<<"OFFSETCURVE"; - else OS<<"***UNKNOWN***"; - if (T!=STANDARD_TYPE(Geom2d_TrimmedCurve)) OS<<"2D"; -#endif - - return OS; -} - -//======================================================================= -//function : Print -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_Dumper::Print(const gp_Pnt& -#ifdef OCCT_DEBUG - P -#endif - ,Standard_OStream& OS) -{ -#ifdef OCCT_DEBUG - OS<Degree(); - Standard_Integer nbpoles = B->NbPoles(); - Standard_Integer nbknots = B->NbKnots(); - Standard_Boolean rational = B->IsRational(); - Standard_Boolean periodic = B->IsPeriodic(); - - OS<<"BSplineCurve : "; - if (periodic) OS<<"periodic, "; - OS<<"degree "< 4) OS << setw(lb) << "\t ...\n"; - } - else if (i == n) lb = l; - else continue; - - OS<Pole(i),OS); - if (rational) OS<<" "<Weight(i); - - OS< 4) OS << setw(lb) << "\t ...\n"; - lb = l; - } - else if (i == n) lb = l; - else continue; - - OS<Knot(i)<<" "<Multiplicity(i); - - OS<Degree(); - Standard_Integer nbpoles = B->NbPoles(); - Standard_Integer nbknots = B->NbKnots(); - Standard_Boolean rational = B->IsRational(); - Standard_Boolean periodic = B->IsPeriodic(); - - OS<<"BSplineCurve : "; - if (periodic) OS<<"periodic, "; - OS<<"degree "< 4) OS << setw(lb) << "\t ...\n"; - } - else if (i == n) lb = l; - else continue; - - OS<Pole(i),OS); - if (rational) OS<<" "<Weight(i); - - OS< 4) OS << setw(lb) << "\t ...\n"; - } - else if (i == n) lb = l; - else continue; - - OS<Knot(i)<<" "<Multiplicity(i); - - OS<DynamicType() == STANDARD_TYPE(Geom_BSplineCurve)) - TopOpeBRepDS_Dumper::Print(DBSP3D(C),OS,compact); - else - GeomTools_CurveSet::PrintCurve(C,OS,Standard_False); - } -#endif - - return OS; -} - - -//======================================================================= -//function : Print -//purpose : -//======================================================================= - -#ifdef OCCT_DEBUG -Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom2d_Curve)& C, - Standard_OStream& OS,const Standard_Boolean compact) -{ -#define DBSP2D(tut) (*((Handle(Geom2d_BSplineCurve)*)&(tut))) - if (!C.IsNull()) { - if (C->DynamicType() == STANDARD_TYPE(Geom2d_BSplineCurve)) - TopOpeBRepDS_Dumper::Print(DBSP2D(C),OS,compact); - else - GeomTools_Curve2dSet::PrintCurve2d(C,OS,Standard_False); - } - - return OS; -} -#endif - -// DUMP OF HDATASTRUCTURE - -//----------------------------------------------------------------------- -#ifdef OCCT_DEBUG -//unreferenced function, commented -/*static void souligne(const TCollection_AsciiString& t,Standard_OStream& OS,const char c = '-') -{ for(char i=0;iNbGeometry(K); - if (!nt) return OS; - - Standard_Integer n=0; - if (K==TopOpeBRepDS_POINT){TopOpeBRepDS_PointExplorer ex(myHDS->DS(),findkeep);n=ex.NbPoint();} - else if(K==TopOpeBRepDS_CURVE){TopOpeBRepDS_CurveExplorer ex(myHDS->DS());n=ex.NbCurve();} - else if(K==TopOpeBRepDS_SURFACE){TopOpeBRepDS_SurfaceExplorer ex(myHDS->DS());n=ex.NbSurface();} - if (!n) return OS; - TCollection_AsciiString s = "---- "; ::Print(K,s); - OS<DS()); - Standard_Boolean isp = pex.IsPoint(I); - Standard_Boolean isk = pex.IsPointKeep(I); - if(!findkeep || isk) { - TCollection_AsciiString kstr;::Print(K,kstr);kstr=kstr+" "+I+" :"; - Standard_Integer lk = kstr.Length(); - OS<DS()); - Standard_Boolean isc = cex.IsCurve(I); - Standard_Boolean isk = cex.IsCurveKeep(I); - if(!findkeep || isk) { - TCollection_AsciiString kstr;::Print(K,kstr);kstr=kstr+" "+I+" :"; - Standard_Integer lk = kstr.Length(); - OS<PCurve(); - if ( !SCI2.IsNull()) - PC2 = Handle(TopOpeBRepDS_SurfaceCurveInterference)::DownCast(SCI2)->PCurve(); - - OS<DS()); - Standard_Boolean iss = sex.IsSurface(I); - Standard_Boolean isk = sex.IsSurfaceKeep(I); - if(!findkeep || isk) { - TCollection_AsciiString kstr; ::Print(K,kstr); kstr=kstr+" "+I+" : "; - Standard_Integer lk = kstr.Length(); - OS<NbTopology(K); - if ( ! nk ) return OS; - - OS<NbTopology(); - OS<DS().NbSectionEdges(); - if ( ! nse ) return OS; - - OS<DS(); - const TopoDS_Shape& E = DS.SectionEdge(I,SEFindKeep); - if(E.IsNull()) return OS; - Standard_Integer it = myHDS->DS().Shape(E,SEFindKeep); - if (it == 0) { - // E trouvee "Restriction" par les intersections n'est pas dans la DS. - OS<DS(); - if ( ! TopOpeBRepDS::IsTopology(K) ) return OS; - if ( I <= 0 ) return OS; - TopAbs_ShapeEnum t = TopOpeBRepDS::KindToShape(K); - - if ( DS.Shape(I,fk).ShapeType() != t ) return OS; - Standard_Integer rankI = DS.AncestorRank(I); - TCollection_AsciiString s1,s2; - if(DS.KeepShape(I)) { - s1 = ((rankI == 1) ? (char*) "*" : (char*) ""); - s2 = ((rankI == 2) ? (char*) "*" : (char*) ""); - } - else { - s1 = ((rankI == 1) ? (char*) "~" : (char*) ""); - s2 = ((rankI == 2) ? (char*) "~" : (char*) ""); - } - TCollection_AsciiString ss = TopOpeBRepDS::SPrint(K,I,s1,s2); - - if ( t == TopAbs_VERTEX ) { - Standard_Integer lk = ss.Length() + 3; - TCollection_AsciiString istr(lk,' '); - gp_Pnt P = TopOpeBRepTool_ShapeTool::Pnt(DS.Shape(I,fk)); - Standard_Real tol = TopOpeBRepTool_ShapeTool::Tolerance(DS.Shape(I,fk)); - OS<<"\n"<Dump(OS,"","\n"); - } - } - else OS<<" has no interference\n"; - - // SameDomain - const TopoDS_Shape& S = myHDS->Shape(I,fk); - if ( myHDS->HasSameDomain(S) ) { - const TopTools_ListOfShape& L = myHDS->DS().ShapeSameDomain(S); - if ( L.Extent() ) { - OS<Geometry(); TopOpeBRepDS_Kind GK = I->GeometryType(); - I->Dump(OS); - if (GK == TopOpeBRepDS_POINT) { - gp_Pnt P = myHDS->Point(G).Point(); - OS<<" P = "<Shape(G,fk)); - OS<<" V = "< #include -#ifdef OCCT_DEBUG -#include -Standard_EXPORT void debredpnc(const Standard_Integer ie){cout<<"+++ debredpnc e"< "< -> +
  • { reducedLI.Clear(); -#ifdef OCCT_DEBUG - Standard_Boolean TRC=DSREDUEDGETRCE(SIX); - TRC = Standard_False; //MOINSTRACE - if(TRC) {cout<Dump(cout,"init :","\n");} -#endif } // !isComplex -#ifdef OCCT_DEBUG - if(TRC) I2->Dump(cout,"add : ","\n"); -#endif EFITool.Add(E,E2,F2,I2); LI.Remove(it2); -#ifdef OCCT_DEBUG - if(TRC){cout<<"resulting : "; Handle(TopOpeBRepDS_Interference) IBID = new TopOpeBRepDS_Interference(); - EFITool.Transition(IBID);IBID->Transition().Dump(cout);cout<Parameter()); } -#ifdef OCCT_DEBUG - if (TRC){cout<<"reduced T E"<Dump(cout);cout< nIreduced "< nI "< nI "< Ir = (IN/IN(SE),VG,SE) { reducedLI.Clear(); -#ifdef OCCT_DEBUG - Standard_Integer nI = LI.Extent(); // DEB -#endif const TopoDS_Edge& E = TopoDS::Edge(BDS.Shape(SIX)); -#ifdef OCCT_DEBUG - Standard_Boolean TRC=DSREDUEDGETRCE(SIX); - TRC = Standard_False; //MOINSTRACE - if (TRC) cout<ChangeTransition().Set(TopAbs_INTERNAL); reducedLI.Append(I1); LI.Remove(it1); -#ifdef OCCT_DEBUG - nI = LI.Extent(); // DEB -#endif } else it1.Next(); } //it1 - -#ifdef OCCT_DEBUG - if (TRC) cout<<"reclSE2 E"< nI "< reste "< = (T,G,S)}, unkeep I = EVI with G = vertex of { -#ifdef OCCT_DEBUG - Standard_Boolean TRC=DSREDUEDGETRCE(EIX); - TRC = Standard_False; //MOINSTRACE - if (TRC) {cout< rejet EVI on Gb 1 on "<Dump(cout);cout< I =(T, G, S) -// in Ir =(Tr,G,Sr) -// I gives less information than reduced Ir -{ - - Standard_Boolean TRC=DSREDUEDGETRCE(EIX); - TRC = Standard_False; //MOINSTRACE - if (TRC) cout< ordered :"< residual :"<ChangeDS(); const TopoDS_Shape& E = BDS.Shape(EIX); -#ifdef OCCT_DEBUG - Standard_Boolean TRC=DSREDUEDGETRCE(EIX); - if (TRC) { - cout< (lF + lFE) + lE + [LI] // lF = {interference on edge : (T(face),G=POINT/VERTEX,S) @@ -764,12 +558,6 @@ static void FUN_ProcessEdgeInterferences(const Standard_Integer EIX TopOpeBRepDS_ListOfInterference lFE; FUN_selectSKinterference(lF,TopOpeBRepDS_EDGE,lFE); TopOpeBRepDS_ListOfInterference lE; FUN_selectTRASHAinterference(LI,TopAbs_EDGE,lE); -#ifdef OCCT_DEBUG - TopOpeBRepDS_Dumper DSD(HDS); - Standard_Boolean trcl = TRC; -// trcl = Standard_False; // MOINSTRACE -#endif - // xpu210798 : CTS21216 (e7,G=P3,S=E9,FTRASHA=f8,f10) // EIX is section edge // 2dI1=(REVERSED(ftrasha1),G,ES), 2dI2=(FORWARD(ftrasha2),G,ES) @@ -780,16 +568,7 @@ static void FUN_ProcessEdgeInterferences(const Standard_Integer EIX // lF -> lF // lFE -> lI2dFE + [lFE] / lI2dFE={FEI=(T(FTRASHA),G,SE) : no FFI=(T(FTRASHA),G,FTRASHA)} FUN_selectpure2dI(lF,lFE,lI2dFE); -#ifdef OCCT_DEBUG - if (trcl) { - cout< lRI2dFE + lI2dFE"< lRI2dFE + lI2dFE -#ifdef OCCT_DEBUG - if (trcl) { TCollection_AsciiString bb("lRI2dFE :"); DSD.DumpLOI(lRI2dFE,cout,bb);} -#endif lFE.Append(lI2dFE); lFE.Append(lRI2dFE); } @@ -812,32 +591,10 @@ static void FUN_ProcessEdgeInterferences(const Standard_Integer EIX TopOpeBRepDS_ListOfInterference l1dE; FUN_select2dI(EIX,BDS,TopAbs_EDGE,lE,l1dE); TopOpeBRepDS_ListOfInterference l1dEsd; FUN_select1dI(EIX,BDS,lE,l1dEsd); -#ifdef OCCT_DEBUG - if (trcl) { - cout<<"lFE("< l3dFE (S=EDGE) [+l3dFEresi] + l2dFE + [lFE +lFEresi]"< l3dF (S=FACE) [+lF]"< l1dE + lE"< lR3dFE [+l3dFE (non reduced 3dI)] TopOpeBRepDS_ListOfInterference lR3dFE; FUN_ReducerEdge3d(EIX,BDS,l3dFE,lR3dFE); -#ifdef OCCT_DEBUG - if (trcl) { cout<<"l3dFE("< lR3dFE + l3dFE"<");DSD.DumpLOI(LI,cout,aa);} -#endif } // ProcessEdgeInterferences //======================================================================= @@ -909,12 +662,6 @@ void TopOpeBRepDS_EIR::ProcessEdgeInterferences(const Standard_Integer EIX) { TopOpeBRepDS_DataStructure& BDS = myHDS->ChangeDS(); -#ifdef OCCT_DEBUG - TopOpeBRepDS_Dumper DSD(myHDS); - Standard_Boolean TRC=DSREDUEDGETRCE(EIX); - if (TRC) {cout<Transition(),S,OOG,par,K,ST,Standard_False); newloi.Append(newI); -#ifdef OCCT_DEBUG - if (TRC) {cout<<"on e"<Dump(cout);cout<<"gives ";newI->Dump(cout);cout< 0 ou 1 face accede E => pas d'autre fcx pouvant generer une courbe 3d TopTools_ListIteratorOfListOfShape itlfx(lfx); @@ -1036,22 +774,9 @@ void TopOpeBRepDS_EIR::ProcessEdgeInterferences(const Standard_Integer EIX) if (curvefound) break; } // itlfx.More() -#ifdef OCCT_DEBUG -// Standard_Integer nLI = LI.Extent(); -#endif if (curvefound) { LI.Append(loi); } - else { -#ifdef OCCT_DEBUG -// if (TRC) { -// debredpnc(EIX); - TCollection_AsciiString ss = "\n--- TopOpeBRepDS_EIR::ProcessEdgeInterferences : suppress pnc of E"; ss = ss + EIX; - DSD.DumpLOI(loi,cout,ss); -// } -#endif - } - } // tki.More() } // (!isfafa) diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx index 96746b7462..5942c7ac7a 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx @@ -50,35 +50,6 @@ #include #include -#ifdef OCCT_DEBUG -#include -#include -#include -#include -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -Standard_EXPORT void debse1(const Standard_Integer i) {cout<<"+ debse1 se"<Dump(cout); cout<Transition(); -#endif + TopAbs_ShapeEnum SB1,SA1;Standard_Integer IB1,IA1;TopOpeBRepDS_Kind GT1,ST1;Standard_Integer G1,S1; FDS_Idata(I,SB1,IB1,SA1,IA1,GT1,G1,ST1,S1); @@ -393,9 +346,6 @@ Standard_EXPORT Standard_Real FDS_Parameter(const Handle(TopOpeBRepDS_Interferen else if ( I->IsKind(STANDARD_TYPE(TopOpeBRepDS_CurvePointInterference)) ) p = Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I)->Parameter(); else { -#ifdef OCCT_DEBUG - cout<<"EdgeInterference : mauvais type d'interference"<DS(); -#endif - const TopTools_ListOfShape& lf1 = FDSCNX_EdgeConnexitySameShape(E,HDS); - Standard_Integer nlf1 = lf1.Extent(); - if (nlf1 < 2) return Standard_False; - - TopTools_MapOfShape mapf; - TopTools_ListIteratorOfListOfShape it1(lf1); - for (; it1.More(); it1.Next()){ - const TopoDS_Shape& f = it1.Value(); - mapf.Add(f); - TopExp_Explorer exe(f,TopAbs_EDGE); - for (; exe.More(); exe.Next()){ - const TopoDS_Edge& e = TopoDS::Edge(exe.Current()); - if (e.IsSame(E)) continue; - Standard_Integer iori = FUN_tool_orientVinE(V,e); - if (iori == 0) continue; - const TopTools_ListOfShape& lf2 = FDSCNX_EdgeConnexitySameShape(e,HDS); - TopTools_ListIteratorOfListOfShape it2(lf2); - for (; it2.More(); it2.Next()) mapf.Add(it2.Value()); - } // exe - } // it1 - TopTools_MapIteratorOfMapOfShape itm(mapf); - for (; itm.More(); itm.Next()) lFcx.Append(itm.Key()); - return lFcx.Extent(); -} -#endif*/ - // ---------------------------------------------------------------------- Standard_EXPORT void FUN_ds_PURGEforE9(const Handle(TopOpeBRepDS_HDataStructure)& HDS) // ---------------------------------------------------------------------- @@ -637,10 +543,6 @@ Standard_EXPORT void FUN_ds_PURGEforE9(const Handle(TopOpeBRepDS_HDataStructure) if (isdgE) continue; Standard_Integer IE = BDS.Shape(E); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(IE); - if (trc) debe9(IE); -#endif const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(E); TopOpeBRepDS_ListOfInterference LIcopy; FDS_assign(LI,LIcopy); TopOpeBRepDS_ListOfInterference l3dF; Standard_Integer n3dF = FUN_selectSKinterference(LIcopy,TopOpeBRepDS_FACE,l3dF); @@ -670,9 +572,6 @@ Standard_EXPORT void FUN_ds_PURGEforE9(const Handle(TopOpeBRepDS_HDataStructure) if (!foundinsdm) {it.Next(); continue;} // E is IN geometry(F) (cto002D2;e33,f31) // E is edge of FF sdm with F -#ifdef OCCT_DEBUG - if (trc) {cout<<"-> SE9 removing I3dF :";I->Dump(cout);cout<Transition(); -#endif TopOpeBRepDS_Kind GT,ST; Standard_Integer G1,S; FDS_data(I,GT,G1,ST,S); @@ -762,10 +654,7 @@ Standard_EXPORT void FUN_ds_completeforSE1(const Handle(TopOpeBRepDS_HDataStruct // -> do NOT reduce to I = (INTERNAL(IfES),G1,S) (we can have EXTERNAL Tr) FDS_copy(loi,loicopy); TopOpeBRepDS_ListOfInterference lI4; -#ifdef OCCT_DEBUG -// Standard_Integer nI4 = -#endif - FUN_selectITRASHAinterference(loicopy,IfES,lI4); + FUN_selectITRASHAinterference(loicopy,IfES,lI4); Standard_Boolean hasFORREV=Standard_False; TopOpeBRepDS_ListOfInterference lfor; Standard_Integer nFOR = FUN_selectTRAORIinterference(lI4,TopAbs_FORWARD,lfor); TopOpeBRepDS_ListOfInterference lrev; Standard_Integer nREV = FUN_selectTRAORIinterference(lI4,TopAbs_REVERSED,lrev); @@ -781,13 +670,6 @@ Standard_EXPORT void FUN_ds_completeforSE1(const Handle(TopOpeBRepDS_HDataStruct Standard_Boolean B = Standard_False; if (isevi) B = Handle(TopOpeBRepDS_EdgeVertexInterference)::DownCast(I)->GBound(); Handle(TopOpeBRepDS_Interference) newI = MakeEPVInterference(newT,S,G1,par,K,TopOpeBRepDS_EDGE,B); -#ifdef OCCT_DEBUG - if (trc) { - cout<<"completeforSE1 on section edge "<Dump(cout); - cout<StoreInterference(newI,SE); break; } // it(lI3) @@ -817,15 +699,8 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct for (Standard_Integer i = 1; i <= nse; i++) { const TopoDS_Edge& SE = TopoDS::Edge(BDS.SectionEdge(i)); Standard_Integer rkSE = BDS.AncestorRank(SE); -#ifdef OCCT_DEBUG - Standard_Integer ISE = -#endif - BDS.Shape(SE); + BDS.Shape(SE); const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(SE); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(ISE); - if (trc) debse2(ISE); -#endif TopOpeBRepDS_TKI tki; tki.FillOnGeometry(LI); @@ -850,10 +725,7 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct // has NO {I'=(T'(face'), G not Gbound, face')} TopOpeBRepDS_ListOfInterference loicopy; FDS_assign(loi,loicopy); TopOpeBRepDS_ListOfInterference l1; -#ifdef OCCT_DEBUG -// Standard_Integer nI = -#endif - FUN_selectTRASHAinterference(loicopy,TopAbs_FACE,l1); + FUN_selectTRASHAinterference(loicopy,TopAbs_FACE,l1); TopOpeBRepDS_ListOfInterference lF; Standard_Integer nF = FUN_selectSKinterference(l1,TopOpeBRepDS_FACE,lF); if (nF > 1) continue; TopOpeBRepDS_ListOfInterference lFE; Standard_Integer nFE = FUN_selectSKinterference(l1,TopOpeBRepDS_EDGE,lFE); @@ -862,9 +734,7 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct // I = (T(FTRA),G not Gbound, ES) const Handle(TopOpeBRepDS_Interference)& I = lFE.First(); Standard_Real par = FDS_Parameter(I); -#ifdef OCCT_DEBUG -// const TopOpeBRepDS_Transition& T = I->Transition(); -#endif + TopOpeBRepDS_Kind ST; Standard_Integer S; FDS_data(I,K,G,ST,S); TopAbs_ShapeEnum tsb,tsa; Standard_Integer isb,isa; FDS_Tdata(I,tsb,isb,tsa,isa); const TopoDS_Face& FTRA= TopoDS::Face(BDS.Shape(isb)); @@ -887,8 +757,8 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct Standard_Real t1 = BDS.Point(G).Tolerance(); Standard_Real t2 = FUN_tool_maxtol(ES); Standard_Real t = (t1 > t2) ? t1 : t2; Standard_Real d = 1.e1;Standard_Boolean ok = FUN_tool_projPonE(p3d,ES,OOpar,d); - if (!ok) {FUN_Raise(); continue;} - if (d > t) {FUN_Raise(); continue;} + if (!ok) {continue;} + if (d > t) {continue;} } if (vertex) { // rkG == rkES const TopoDS_Vertex& vG = TopoDS::Vertex(BDS.Shape(G)); @@ -912,8 +782,8 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct gp_Pnt p = BRep_Tool::Pnt(vG); Standard_Real parES,dd=1.e1; Standard_Boolean ok = FUN_tool_projPonE(p,ES,parES,dd); - if (!ok) {FUN_Raise(); continue;} - if (dd > t) {FUN_Raise(); continue;} + if (!ok) {continue;} + if (dd > t) {continue;} OOpar = parES; } else OOpar = BRep_Tool::Parameter(TopoDS::Vertex(oov),ES); @@ -921,7 +791,7 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct } gp_Pnt2d OOuv; Standard_Boolean ok = FUN_tool_paronEF(ES,OOpar,FCX,OOuv); - if (!ok) {FUN_Raise(); continue;} + if (!ok) {continue;} TopOpeBRepDS_Transition newT; // ------- @@ -934,7 +804,7 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct ok = MKT.Initialize(SE,par1,par2,par, FCX,OOuv, factor); if (ok) ok = MKT.SetRest(ES,OOpar); if (ok) ok = MKT.MkTonE(stb,sta); - if (!ok) {FUN_Raise(); continue;} + if (!ok) {continue;} newT.Before(stb); newT.After(sta); newT.Index(IFCX); Handle(TopOpeBRepDS_Interference) newI; @@ -942,9 +812,6 @@ Standard_EXPORT void FUN_ds_completeforSE2(const Handle(TopOpeBRepDS_HDataStruct Standard_Boolean B = Standard_False; if (vertex) B = Handle(TopOpeBRepDS_EdgeVertexInterference)::DownCast(I)->GBound(); newI = MakeEPVInterference(newT,IFCX,G,par,K,TopOpeBRepDS_FACE,B); -#ifdef OCCT_DEBUG - if (trc) {cout<<"completeforSE2 on section edge "<Dump(cout);cout<StoreInterference(newI,SE); } // itfcx } // tki @@ -1000,9 +867,9 @@ static Standard_Boolean FUN_ds_completeforSE3(const TopOpeBRepDS_DataStructure& parE = FDS_Parameter(I3); Standard_Real parline; Standard_Boolean ok = FUN_tool_parE(SE,parE,Eline,parline); - if (!ok) {FUN_Raise(); return Standard_False;} + if (!ok) {return Standard_False;} gp_Pnt2d uv; ok = FUN_tool_paronEF(Eline,parline,F,uv); - if (!ok) {FUN_Raise(); return Standard_False;} + if (!ok) {return Standard_False;} Standard_Real par1,par2; FUN_tool_bounds(SE,par1,par2); Standard_Real factor = 1.e-4; @@ -1011,7 +878,7 @@ static Standard_Boolean FUN_ds_completeforSE3(const TopOpeBRepDS_DataStructure& ok = MKT.Initialize(SE,par1,par2,parE, F,uv, factor); if (ok) ok = MKT.SetRest(Eline,parline); if (ok) ok = MKT.MkTonE(stb,sta); - if (!ok) {FUN_Raise(); return Standard_False;} + if (!ok) {return Standard_False;} Tr.Before(stb); Tr.After(sta); Tr.Index(ITRASHA); return Standard_True; } @@ -1037,10 +904,6 @@ Standard_EXPORT void FUN_ds_completeforSE3(const Handle(TopOpeBRepDS_HDataStruct const TopoDS_Edge& SE = BDS.SectionEdge(i); Standard_Integer ISE = BDS.Shape(SE); const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(SE); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(ISE); - if (trc) debse3(ISE); -#endif TopOpeBRepDS_ListOfInterference newLI; Standard_Boolean hasnewLI = Standard_False; TopOpeBRepDS_TKI tki; @@ -1057,20 +920,12 @@ Standard_EXPORT void FUN_ds_completeforSE3(const Handle(TopOpeBRepDS_HDataStruct // delete interferences =(T(face IF),G,S) TopOpeBRepDS_ListOfInterference lIdel; FUN_selectITRASHAinterference(loicopy,ITRASHA,lIdel); -#ifdef OCCT_DEBUG - if (trc) {FDS_dumpLI(lIdel,"completeforSE3, delete :");} -#endif Handle(TopOpeBRepDS_Interference) TrFE, TrFF; //-------------- hasnewLI = Standard_True; TrFE = MakeEPVInterference(Tr, ISE,G,parE,K,TopOpeBRepDS_EDGE,Standard_False); TrFF = MakeEPVInterference(Tr,ITRASHA,G,parE,K,TopOpeBRepDS_FACE,Standard_False); -#ifdef OCCT_DEBUG - if (trc) {cout<<"completeforSE3 on section edge "<Dump(cout);cout<Dump(cout);cout< tol) return Standard_False; @@ -1396,10 +1247,6 @@ Standard_EXPORT void FUN_ds_addSEsdm1d(const Handle(TopOpeBRepDS_HDataStructure) TopOpeBRepDS_DataStructure& BDS = HDS->ChangeDS(); Standard_Integer ns = BDS.NbShapes(); for (Standard_Integer i= 1; i <= ns; i++) { -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(i); - if (trc) debsdm1(i); -#endif const TopoDS_Shape& S = BDS.Shape(i); if (S.ShapeType() != TopAbs_EDGE) continue; const TopoDS_Edge& E = TopoDS::Edge(S); @@ -1475,15 +1322,8 @@ Standard_EXPORT void FUN_ds_completeforSE4(const Handle(TopOpeBRepDS_HDataStruct Standard_Integer nse = BDS.NbSectionEdges(); for (Standard_Integer i = 1; i <= nse; i++) { const TopoDS_Edge& SE = BDS.SectionEdge(i); -#ifdef OCCT_DEBUG - Standard_Integer ISE = -#endif - BDS.Shape(SE); + BDS.Shape(SE); const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(SE); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(ISE); - if (trc) debse4(ISE); -#endif TopOpeBRepDS_ListOfInterference newLI; TopOpeBRepDS_TKI tki; @@ -1524,9 +1364,6 @@ Standard_EXPORT void FUN_ds_completeforSE4(const Handle(TopOpeBRepDS_HDataStruct TopOpeBRepDS_Transition newT(newO); newT.Index(isb); Standard_Real par = FDS_Parameter(I); Handle(TopOpeBRepDS_Interference) newI = MakeEPVInterference(newT,S,G,par,K,Standard_False); -#ifdef OCCT_DEBUG - if (trc) {cout<<"completeforSE4 on section edge "<Dump(cout);cout<StoreInterference(newI,SE); } // tki } // i=1..nse @@ -1553,15 +1390,8 @@ Standard_EXPORT void FUN_ds_completeforSE5(const Handle(TopOpeBRepDS_HDataStruct Standard_Integer nse = BDS.NbSectionEdges(); for (Standard_Integer i = 1; i <= nse; i++) { const TopoDS_Edge& SE = BDS.SectionEdge(i); -#ifdef OCCT_DEBUG - Standard_Integer ISE = -#endif - BDS.Shape(SE); + BDS.Shape(SE); const TopOpeBRepDS_ListOfInterference& LOI = BDS.ShapeInterferences(SE); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(ISE); - if (trc) debse5(ISE); -#endif // xpu020399 : cto901A2 (e26) TopOpeBRepDS_ListOfInterference LOIc; FDS_copy(LOI,LOIc); @@ -1628,9 +1458,6 @@ Standard_EXPORT void FUN_ds_completeforSE5(const Handle(TopOpeBRepDS_HDataStruct for (; it.More(); it.Next()){ const Handle(TopOpeBRepDS_Interference)& I = it.Value(); Handle(TopOpeBRepDS_Interference) newI = I; newI->ChangeTransition().Set(newO); -#ifdef OCCT_DEBUG - if (trc) {cout<<"completeforSE5 se"<";newI->Dump(cout);cout< 0.); Standard_Boolean isvf = (iv == 1); Standard_Boolean isforw = (SO && isvf) || (!SO && !isvf); @@ -1755,9 +1567,6 @@ Standard_EXPORT void FUN_ds_completeforSE6(const Handle(TopOpeBRepDS_HDataStruct } newT.Index(iEsd); Handle(TopOpeBRepDS_Interference) newI1d = MakeEPVInterference(newT,iEsd,G,parE,TopOpeBRepDS_VERTEX,Standard_False); -#ifdef OCCT_DEBUG - if (trc) {cout<<"completeforS61 on section edge "<Dump(cout);cout<StoreInterference(newI1d,SE); } // it2d(l2dFE) @@ -1784,15 +1593,7 @@ Standard_EXPORT void FUN_ds_completeforE7(const Handle(TopOpeBRepDS_HDataStructu const TopoDS_Edge& E = TopoDS::Edge(EE); Standard_Boolean isdgE = BRep_Tool::Degenerated(E); if (isdgE) continue; - -#ifdef OCCT_DEBUG - Standard_Integer IE = -#endif - BDS.Shape(E); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(IE); - if (trc) debe7(IE); -#endif + BDS.Shape(E); const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(E); TopOpeBRepDS_TKI tki; @@ -1801,10 +1602,7 @@ Standard_EXPORT void FUN_ds_completeforE7(const Handle(TopOpeBRepDS_HDataStructu TopOpeBRepDS_Kind K; Standard_Integer G; const TopOpeBRepDS_ListOfInterference& loi = tki.Value(K,G); TopOpeBRepDS_ListOfInterference loicopy; FDS_assign(loi,loicopy); TopOpeBRepDS_ListOfInterference l1; -#ifdef OCCT_DEBUG -// Standard_Integer n1 = -#endif - FUN_selectSKinterference(loicopy,TopOpeBRepDS_FACE,l1); + FUN_selectSKinterference(loicopy,TopOpeBRepDS_FACE,l1); TopOpeBRepDS_ListOfInterference lFOR; Standard_Integer nFOR = FUN_selectTRAORIinterference(l1,TopAbs_FORWARD,lFOR); TopOpeBRepDS_ListOfInterference lREV; Standard_Integer nREV = FUN_selectTRAORIinterference(l1,TopAbs_REVERSED,lREV); if ((nFOR == 0) || (nREV == 0)) continue; @@ -1828,27 +1626,27 @@ Standard_EXPORT void FUN_ds_completeforE7(const Handle(TopOpeBRepDS_HDataStructu Standard_Integer IES = 0; if (nFSE == 0) { gp_Pnt2d uvFS; Standard_Boolean ok = FUN_tool_parF(E,par,FS,uvFS); - if (!ok) {FUN_Raise(); continue;} + if (!ok) {continue;} TopOpeBRepTool_makeTransition MKT; TopAbs_State stb = TopAbs_UNKNOWN,sta = TopAbs_UNKNOWN; ok = MKT.Initialize(E,par1,par2,par, FS,uvFS, factor); if (ok) ok = MKT.MkTonE(stb,sta); - if (!ok) {FUN_Raise(); continue;} + if (!ok) {continue;} newT.Before(stb); newT.After(sta); } else { IES = lFSE.First()->Support(); const TopoDS_Edge& ES = TopoDS::Edge(BDS.Shape(IES)); Standard_Real parES; Standard_Boolean ok = FUN_tool_parE(E,par,ES,parES); - if (!ok) {FUN_Raise(); continue;} + if (!ok) {continue;} gp_Pnt2d uvFS; ok = FUN_tool_paronEF(ES,parES,FS,uvFS); - if (!ok) {FUN_Raise(); continue;} + if (!ok) {continue;} TopOpeBRepTool_makeTransition MKT; TopAbs_State stb = TopAbs_UNKNOWN,sta = TopAbs_UNKNOWN; ok = MKT.Initialize(E,par1,par2,par, FS,uvFS, factor); if (ok) ok = MKT.SetRest(ES,parES); if (ok) ok = MKT.MkTonE(stb,sta); - if (!ok) {FUN_Raise(); continue;} + if (!ok) {continue;} newT.Before(stb); newT.After(sta); } @@ -1869,16 +1667,10 @@ Standard_EXPORT void FUN_ds_completeforE7(const Handle(TopOpeBRepDS_HDataStructu if (iFS != 0) { TopOpeBRepDS_ListOfInterference& loii = tki.ChangeValue(K,G); TopOpeBRepDS_ListOfInterference lEFS; -#ifdef OCCT_DEBUG -// Standard_Integer nIFS = -#endif - FUN_selectITRASHAinterference(loii,iFS,lEFS); + FUN_selectITRASHAinterference(loii,iFS,lEFS); for (TopOpeBRepDS_ListIteratorOfListOfInterference iti(lnewI); iti.More(); iti.Next()) { Handle(TopOpeBRepDS_Interference) newI = iti.Value(); loii.Append(newI); -#ifdef OCCT_DEBUG - if (trc) {cout<<"completeforE7 on edge "<Dump(cout);cout<HasSameDomain(BDS.Shape(GG)); if (Ghsdm) continue; @@ -1932,15 +1718,8 @@ Standard_EXPORT void FUN_ds_completeforSE8(const Handle(TopOpeBRepDS_HDataStruct TopOpeBRepDS_ListOfInterference li; FDS_assign(loi,li); TopOpeBRepDS_ListOfInterference l1dE; Standard_Integer n1d = FUN_selectTRASHAinterference(li,TopAbs_EDGE,l1dE); // li->l1dE+li(<=>lF?) TopOpeBRepDS_ListOfInterference lFE; -#ifdef OCCT_DEBUG -// Standard_Integer nFE = -#endif - FUN_selectSKinterference(li,TopOpeBRepDS_EDGE,lFE); // li(<=>lF?)->lFE+li(<=>lFF) + FUN_selectSKinterference(li,TopOpeBRepDS_EDGE,lFE); // li(<=>lF?)->lFE+li(<=>lFF) TopOpeBRepDS_ListOfInterference l2dFE; Standard_Integer n2d = FUN_selectpure2dI(li,lFE,l2dFE); // lFE->l2dFE+lFE(<=>l3dFE) -#ifdef OCCT_DEBUG -// Standard_Integer n3d = lFE.Extent(); -#endif - Standard_Boolean redu2d = (n1d > 0)&&(n2d > 0); // ------------------------------- if (redu2d) { // {I1d=(Tr(Esd),vG,Esd), I2d=(Tr(F),vG,E)} @@ -1950,9 +1729,6 @@ Standard_EXPORT void FUN_ds_completeforSE8(const Handle(TopOpeBRepDS_HDataStruct TopOpeBRepDS_Transition newT2d; Standard_Boolean ok = FUN_ds_redu2d1d(BDS,ISE,I2dFE,l1dE, newT2d); if (!ok) {it.Next(); continue;} I2dFE->ChangeTransition() = newT2d; al2dFE.Append(I2dFE); -#ifdef OCCT_DEBUG - if (trc) {cout<<"SE8 -> on SE"<Dump(cout);cout<HasSameDomain(SE); if (!hsd) continue; if (!BDS.ShapeInterferences(SE).IsEmpty()) continue; @@ -2006,10 +1778,7 @@ Standard_EXPORT void FUN_ds_completeforSE9(const Handle(TopOpeBRepDS_HDataStruct TopOpeBRepDS_ListOfInterference LIcopy; FDS_assign(LI,LIcopy); TopOpeBRepDS_ListOfInterference LISE; -#ifdef OCCT_DEBUG -// Standard_Integer nise = -#endif - FUN_selectSIinterference(LIcopy,ISE,LISE); + FUN_selectSIinterference(LIcopy,ISE,LISE); TopOpeBRepDS_TKI tki; tki.FillOnGeometry(LISE); for (tki.Init(); tki.More(); tki.Next()) { @@ -2017,10 +1786,6 @@ Standard_EXPORT void FUN_ds_completeforSE9(const Handle(TopOpeBRepDS_HDataStruct Standard_Integer G; // const TopOpeBRepDS_ListOfInterference& loi = tki.Value(K,G); -#ifdef OCCT_DEBUG -// const Handle(TopOpeBRepDS_Interference)& I = loi.First(); -// TopAbs_Orientation O = I->Transition().Orientation(TopAbs_IN); -#endif const TopoDS_Vertex& vG = TopoDS::Vertex(BDS.Shape(G)); Standard_Boolean hsd1 = HDS->HasSameDomain(vG); if (hsd1) continue; //nyixpu011098 @@ -2039,9 +1804,6 @@ Standard_EXPORT void FUN_ds_completeforSE9(const Handle(TopOpeBRepDS_HDataStruct Standard_Real par = BRep_Tool::Parameter(vG,SE); Handle(TopOpeBRepDS_Interference) newI = MakeEPVInterference(newT,iEsd,G,par,TopOpeBRepDS_VERTEX,TopOpeBRepDS_EDGE,Standard_True); -#ifdef OCCT_DEBUG - if (trc) {cout<<"completeforSE6 on section edge "<Dump(cout);cout<StoreInterference(newI,SE); } }//ite(EsdSE) @@ -2212,15 +1974,7 @@ Standard_EXPORT void FUN_ds_redusamsha(const Handle(TopOpeBRepDS_HDataStructure) if (BDS.Shape(i).ShapeType() != TopAbs_EDGE) continue; const TopoDS_Edge& E = TopoDS::Edge(BDS.Shape(i)); -#ifdef OCCT_DEBUG -// Standard_Boolean isse = BDS.IsSectionEdge(E); -// Standard_Integer rkE = BDS.AncestorRank(E); -#endif Standard_Integer IE = BDS.Shape(E); -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(IE); - if (trc) debsamsha(IE); -#endif TopOpeBRepDS_TKI tki; const TopOpeBRepDS_ListOfInterference& LI = BDS.ShapeInterferences(i); tki.FillOnGeometry(LI); @@ -2228,10 +1982,7 @@ Standard_EXPORT void FUN_ds_redusamsha(const Handle(TopOpeBRepDS_HDataStructure) TopOpeBRepDS_Kind K; Standard_Integer G; const TopOpeBRepDS_ListOfInterference& loi = tki.Value(K,G); TopOpeBRepDS_ListOfInterference loicopy; FDS_copy(loi,loicopy); // loi -> l1+l2 TopOpeBRepDS_ListOfInterference l0; -#ifdef OCCT_DEBUG -// Standard_Integer n0 = -#endif - FUN_selectTRASHAinterference(loicopy,TopAbs_EDGE,l0);//xpu091198(cylcong) + FUN_selectTRASHAinterference(loicopy,TopAbs_EDGE,l0);//xpu091198(cylcong) TopOpeBRepDS_ListOfInterference l1; Standard_Integer nfound = FUN_selectTRASHAinterference(loicopy,TopAbs_FACE,l1); TopOpeBRepDS_ListOfInterference l2; nfound = FUN_selectSKinterference(l1,TopOpeBRepDS_EDGE,l2); // l2 = {I=(T(faceTRASHA),G,Sedge)} @@ -2277,9 +2028,6 @@ Standard_EXPORT void FUN_ds_redusamsha(const Handle(TopOpeBRepDS_HDataStructure) else break; } //it1(li) if (newI.IsNull()) continue; -#ifdef OCCT_DEBUG - if (trc) {cout<<"redusamsha se"<";newI->Dump(cout);cout<ChangeDS(); Standard_Integer ns = BDS.NbShapes(); for (Standard_Integer i = 1; i <= ns; i++) { -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(i); - if (trc) debgb1(i); -#endif const TopoDS_Shape& s = BDS.Shape(i); if (s.ShapeType() != TopAbs_EDGE) continue; @@ -2411,9 +2155,6 @@ Standard_EXPORT void FUN_ds_unkeepEVIonGb1(const Handle(TopOpeBRepDS_HDataStruct newloi.Append(I); continue; } -#ifdef OCCT_DEBUG - if (trc) {cout<<"unkeepEVIonGb1 on e"<Dump(cout);cout<Dump(cout);cout<<" ->";} -#endif newT.Set(newO); IGb1->SetGeometry(Gsd); IGb1->SetGBound(Standard_False); IGb1->Transition(newT); -#ifdef OCCT_DEBUG - if (trc) {IGb1->Dump(cout);cout< 1.e-2) tol = 1.e-2; -#ifdef OCCT_DEBUG - cout<<"$$$$$$$$$$$$$$$$$$$$$$$$ FUN_paronOOE : dist "< #include -#ifdef OCCT_DEBUG -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -#endif - //======================================================================= //function : TopOpeBRepDS_EdgeInterferenceTool //purpose : @@ -50,9 +46,6 @@ static Standard_Real Parameter(const Handle(TopOpeBRepDS_Interference)& I) else if ( I->IsKind(STANDARD_TYPE(TopOpeBRepDS_CurvePointInterference)) ) p = Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I)->Parameter(); else { -#ifdef OCCT_DEBUG - cout<<"EdgeInterference : mauvais type d'interference"<Support()<<" "; - cout<Transition().Dump(cout);cout<Dump(cout,s,cr);} -#endif FITool.Add(FI,F,Ecpx,isEGsp,I); -#ifdef OCCT_DEBUG - FDS_DUMPTRANSITION(TRCF,"--> resultat partiel sur face ",iFI,FITool); -#endif } //------------------------------------------------------ @@ -224,12 +140,6 @@ void FUN_reduceEDGEgeometry1 const TopOpeBRepDS_DataMapOfShapeListOfShapeOn1State& ) { Standard_Boolean TRCF = Standard_False; -#ifdef OCCT_DEBUG - Standard_Boolean TRCE = Standard_False; - TRCE = FTRCE(iEG);if (TRCE) debrededg(iEG); - TRCF = FTRCF(iFI);if (TRCF) debredfac(iFI); -#endif - TopOpeBRepDS_ListIteratorOfListOfInterference ili(LI); if (!ili.More()) return; // choix de l'arete Ecpx, lieu de resolution de la transition complexe @@ -287,9 +197,6 @@ void FUN_reduceEDGEgeometry1 // TopOpeBRepDS_Transition T1 = I1->Transition(); TopAbs_Orientation O1 = T1.Orientation(TopAbs_IN); // xpu :090498 // Standard_Boolean revT1 = toreverse && (M_FORWARD(O1) || M_REVERSED(O1)); // xpu :090498 -#ifdef OCCT_DEBUG -// if ((TRCE || TRCF) && revT1) cout<<"-> REVERSE T"<ChangeTransition() = T1.Complement(); //xpu :090498 FITool.Init(FI,Ecpx,isEGsp,I1); FDS_ADDEDGE(TRCF,"\ninit transition complexe F",iFI,FITool,FI,F1,Ecpx,isEGsp,I1); @@ -298,9 +205,6 @@ void FUN_reduceEDGEgeometry1 // TopOpeBRepDS_Transition T2 = I2->Transition(); TopAbs_Orientation O2 = T2.Orientation(TopAbs_IN); // xpu :090498 // Standard_Boolean revT2 = toreverse && (M_FORWARD(O2) || M_REVERSED(O2)); // xpu :090498 -#ifdef OCCT_DEBUG -// if ((TRCE || TRCF) && revT2) cout<<"-> REVERSE T"<ChangeTransition() = T2.Complement(); //xpu :090498 FDS_ADDEDGE(TRCF,"add transition complexe F",iFI,FITool,FI,F2,Ecpx,isEGsp,I2); // if (revT2) I2->ChangeTransition() = T2.Complement(); //xpu :090498 @@ -309,7 +213,6 @@ void FUN_reduceEDGEgeometry1 } if (isComplex) { FITool.Transition(I1); - FDS_DUMPTRANSITION(TRCF,"--> result transition on face ",iFI,FITool); // DEB } it1.Next(); } // it1.More() @@ -360,12 +263,6 @@ const TopOpeBRepDS_DataMapOfShapeListOfShapeOn1State& MEsp) TopOpeBRepDS_MapOfShapeData mosd; FUN_GmapS(LI,BDS,mosd); -#ifdef OCCT_DEBUG - Standard_Boolean TRC = FTRCF(iFI); - if (TRC) FUN_dumpmosd(mosd,BDS,iFI,""); - if (TRC) debredfac(iFI); -#endif - TopOpeBRepDS_ListOfInterference LIout; //modified by NIZNHY-PKV Thu Mar 16 09:44:24 2000 f Standard_Integer i, aN; @@ -381,21 +278,10 @@ const TopOpeBRepDS_DataMapOfShapeListOfShapeOn1State& MEsp) Standard_Boolean egissect = BDS.IsSectionEdge(TopoDS::Edge(EG)); Standard_Boolean eghasesd = (! esdeg.IsEmpty()); -#ifdef OCCT_DEBUG -// Standard_Integer egiref = BDS.SameDomainRef(iEG); -// Standard_Integer egisref = (iEG == egiref); -// TopOpeBRepDS_Config egc = BDS.SameDomainOri(iEG); -#endif - TopOpeBRepDS_ListOfInterference& LIEG = mosd.ChangeFromKey(EG).ChangeInterferences(); Standard_Integer nExt = LIEG.Extent(); // LIEG = toutes les interferences dont le Support() est une // face possedant une interference dont la Geometry() est EG. - -#ifdef OCCT_DEBUG - if (TRC) FUN_dumploiS(EG,LIEG,BDS," "); -#endif - if (nExt == 0) { continue; } @@ -522,58 +408,15 @@ void TopOpeBRepDS_FIR::ProcessFaceInterferences (const Standard_Integer SIX,const TopOpeBRepDS_DataMapOfShapeListOfShapeOn1State& MEsp) { TopOpeBRepDS_DataStructure& BDS = myHDS->ChangeDS(); - -#ifdef OCCT_DEBUG - Standard_Boolean TRC = FTRCF(SIX); - if (TRC) debredfac(SIX); -#endif - // F is the Face, LI is list of interferences to compact -#ifdef OCCT_DEBUG -// const TopoDS_Shape& F = BDS.Shape(SIX); -#endif TopOpeBRepDS_ListOfInterference& LI = BDS.ChangeShapeInterferences(SIX); TopOpeBRepDS_ListOfInterference lw, lE, lFE, lFEF, lF; lw.Assign(LI); -#ifdef OCCT_DEBUG - Standard_Integer nF, nFE, nFEF, nE; -#endif - ::FUN_selectTRASHAinterference(lw,TopAbs_FACE,lF); ::FUN_selectGKinterference(lF,MDSke,lFE); ::FUN_selectSKinterference(lFE,MDSkf,lFEF); ::FUN_selectTRASHAinterference(lw,TopAbs_EDGE,lE); - -#ifdef OCCT_DEBUG - nF = lF.Extent(); - nFE = lFE.Extent(); - nFEF = lFEF.Extent(); - nE = lE.Extent(); - if(TRC){ - if(nF||nFE||nFEF||nE){cout< on FACE . Standard_EXPORT TopOpeBRepDS_FaceEdgeInterference(const TopOpeBRepDS_Transition& T, const Standard_Integer S, const Standard_Integer G, const Standard_Boolean GIsBound, const TopOpeBRepDS_Config C); - - Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& OS) const Standard_OVERRIDE; - diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cxx index 926358783d..357a685b92 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cxx @@ -37,29 +37,6 @@ #include #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); -extern Standard_Boolean TopOpeBRepDS_GettracePEI(); -extern Standard_Boolean TopOpeBRepDS_GettracePFI(); -extern Standard_Boolean TopOpeBRepDS_GettracePI(); -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -static Standard_Boolean FTRCF(const Standard_Integer F) { - Standard_Boolean b1 = TopOpeBRepDS_GettracePFI(); - Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); - Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(F); - return (b1 || b2 || b3); -} -//unreferenced function, commented -/* -static Standard_Boolean FTRCE(const Standard_Integer E) { - Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); - Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); - Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(E); - return (b1 || b2 || b3); -}*/ -extern void debredfac(const Standard_Integer I); -#endif - static Standard_Boolean STATIC_TOREVERSE = Standard_False; // xpu150498 #define M_FORWARD(ori) (ori == TopAbs_FORWARD) #define M_REVERSED(ori) (ori == TopAbs_REVERSED) @@ -92,22 +69,6 @@ Standard_EXPORT Standard_Boolean FUN_Parameters return ok; } -//------------------------------------------------------ -// Unused : -/*#ifdef OCCT_DEBUG -static Standard_Boolean FUN_Parameters -(const Standard_Real& Param,const TopoDS_Shape& E,const TopoDS_Shape& F,Standard_Real& u,Standard_Real& v) -{ - // Get 2d coordinates of point of param on of . - BRepAdaptor_Curve2d curv2d(TopoDS::Edge(E),TopoDS::Face(F)); - gp_Pnt2d p2d; - curv2d.D0(Param,p2d); - p2d.Coord(u,v); - return Standard_True; -} -#endif -*/ - //------------------------------------------------------ Standard_EXPORT void FUN_ComputeGeomData (const TopoDS_Shape& F,const gp_Pnt2d& uv,gp_Dir& Norm) @@ -124,18 +85,6 @@ static Standard_Boolean FUN_sphere(const TopoDS_Shape& F) return (GAS.GetType() == GeomAbs_Sphere); } -//------------------------------------------------------ -//unreferenced function, commented -/*#ifdef OCCT_DEBUG -static void FUN_middleUV(const TopoDS_Shape& F,Standard_Real& u,Standard_Real& v) -{ - Handle(Geom_Surface) su = TopOpeBRepTool_ShapeTool::BASISSURFACE(TopoDS::Face(F)); - GeomAdaptor_Surface GAS(su); - u = (GAS.LastUParameter() + GAS.FirstUParameter())*.5; - v = (GAS.LastVParameter() + GAS.FirstVParameter())*.5; -} -#endif*/ - //------------------------------------------------------ Standard_EXPORT void FUN_ComputeGeomData (const TopoDS_Shape& F,const gp_Pnt2d& uv, @@ -206,11 +155,7 @@ void TopOpeBRepDS_FaceInterferenceTool::Init Handle(TopOpeBRepDS_ShapeShapeInterference) I (Handle(TopOpeBRepDS_ShapeShapeInterference)::DownCast(Iin)); if (I.IsNull()) return; const TopoDS_Face& FI = TopoDS::Face(FFI); const TopoDS_Edge& E = TopoDS::Edge(EE); -#ifdef OCCT_DEBUG -// Standard_Integer iFI = myPBDS->Shape(FI); - // Standard_Boolean TRCFI = FTRCF(iFI);if (TRCFI) debredfac(iFI); -#endif - + // xpu150498 STATIC_TOREVERSE = Standard_False; if (EEisnew) { @@ -271,40 +216,17 @@ void TopOpeBRepDS_FaceInterferenceTool::Add const TopoDS_Face& FI = TopoDS::Face(FFI); const TopoDS_Face& FT = TopoDS::Face(FFT); const TopoDS_Edge& E = TopoDS::Edge(EE); -#ifdef OCCT_DEBUG - Standard_Integer iFI = -#endif - myPBDS->Shape(FI); + myPBDS->Shape(FI); // myPBDS->Shape(FT); - -#ifdef OCCT_DEBUG - Standard_Boolean TRCFI = FTRCF(iFI);if (TRCFI) debredfac(iFI); -#endif - if (!E.IsSame(myEdge)) {FUN_RaiseError();return;} if (!myrefdef) { Init(FI,E,EEisnew,I); // premiere interference sur face orientee : Init return; } - -#ifdef OCCT_DEBUG -// TopAbs_Orientation FTori = FT.Orientation(); -#endif TopOpeBRepDS_Kind GT,ST; Standard_Integer G,S; FDS_data(I,GT,G,ST,S); -#ifdef OCCT_DEBUG -// Standard_Boolean gisb = I->GBound(); -#endif const TopoDS_Edge& EG = TopoDS::Edge(myPBDS->Shape(G)); -#ifdef OCCT_DEBUG -// Standard_Boolean ghassd3d = -#endif - FDS_HasSameDomain3d(*myPBDS,EG); -#ifdef OCCT_DEBUG -// Standard_Integer gr = myPBDS->SameDomainRef(G); -// const TopoDS_Edge& ER = TopoDS::Edge(myPBDS->Shape(gr)); -// Standard_Integer gisr = (G == gr); -#endif + FDS_HasSameDomain3d(*myPBDS,EG); Standard_Boolean same = !STATIC_TOREVERSE; // xpu150498 TopAbs_Orientation oriloc = I->Transition().Orientation(TopAbs_IN); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx index 20af19d9b5..1df21e9b92 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx @@ -23,19 +23,6 @@ #include #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettracePEI(); -extern Standard_Boolean TopOpeBRepDS_GettracePI(); -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -//unreferenced function, commented -/*static Standard_Boolean TRCE(const Standard_Integer EIX) { - Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); - Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); - Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(EIX); - return (b1 || b2 || b3); -}*/ -#endif - //======================================================================= //function : TopOpeBRepDS_Filter //purpose : diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx index bff10e9d9c..e724528478 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx @@ -22,16 +22,6 @@ #include #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettracePI(); -extern Standard_Boolean TopOpeBRepDS_GettracePCI(); -static Standard_Boolean TRCC() { - Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); - Standard_Boolean b3 = TopOpeBRepDS_GettracePCI(); - return (b2 || b3); -} -#endif - //======================================================================= //function : ProcessCurveInterferences //purpose : @@ -67,11 +57,6 @@ void TopOpeBRepDS_Filter::ProcessCurveInterferences // do NOT delete CPIREV!! Standard_Boolean remove = (GT2 == GT1) && (G2 == G1) && (O1 == O2); if ( remove ) { -#ifdef OCCT_DEBUG - if ( TRCC() ){ - cout<<"remove ";I2->Dump(cout);cout<<" from C "< #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettracePEI(); -extern Standard_Boolean TopOpeBRepDS_GettracePI(); -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -extern Standard_Boolean TopOpeBRepDS_GettraceEDPR(); -static Standard_Boolean TRCE(const Standard_Integer SIX) { - Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); - Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); - Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(SIX); - return (b1 || b2 || b3); -} -Standard_EXPORT void debfilterPEI(const Standard_Integer i){cout<ChangeDS(); - -#ifdef OCCT_DEBUG - Standard_Boolean TRC=TRCE(SIX); - if (TRC) debfilter(SIX); - if (TRC) cout<<"FUN_FilterEdge on "< #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceGAP(); -extern Standard_Boolean TopOpeBRepDS_GetcontextNOGAP(); -#endif - //======================================================================= //function : TopOpeBRepDS_GapFiller //purpose : @@ -68,11 +63,6 @@ TopOpeBRepDS_GapFiller::TopOpeBRepDS_GapFiller(const Handle(TopOpeBRepDS_HDataSt void TopOpeBRepDS_GapFiller::Perform() { - -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GetcontextNOGAP () != 0) return; -#endif - myGapTool->Init(myHDS); TColStd_MapOfInteger View; //------------------------------------------------------------ @@ -127,14 +117,6 @@ void TopOpeBRepDS_GapFiller::FindAssociatedPoints(const Handle(TopOpeBRepDS_Inte if (myAsso->HasAssociation(itSI.Value())) return; } -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceGAP() == 1) { - cout<Geometry()<Geometry(); - } - cout<Associated(I); TopOpeBRepDS_ListIteratorOfListOfInterference it(LI); -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceGAP() == 1) { - cout <<"Points "; - for (it.Initialize(LI); it.More(); it.Next()) { - cout <<" "<Geometry(); - } - cout <"; - } -#endif - Standard_Real TolMax = 0,UMin = Precision::Infinite(); Standard_Real UMax = -UMin, U; TopoDS_Edge E,CE ; @@ -526,11 +451,6 @@ void TopOpeBRepDS_GapFiller::ReBuildGeom(const Handle(TopOpeBRepDS_Interference) } myGapTool->EdgeSupport(it.Value(),CE); if (!CE.IsSame(E)) { -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceGAP() == 1){ - cout <<"GapFiller : points pas sur la meme edge -> cas non traite"<ChangeDS().AddPoint(P); -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceGAP() == 1) { - cout <<" New Point : "<Geometry()); myGapTool->SetParameterOnEdge(it.Value(),E,U); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx index 481f0b0153..e2b5fc0ab8 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx @@ -27,10 +27,6 @@ IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_GapTool,MMgt_TShared) -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettraceGAP(); -#endif - //======================================================================= //function : TopOpeBRepDS_GapTool //purpose : @@ -120,11 +116,6 @@ Standard_Boolean TopOpeBRepDS_GapTool::Curve(const Handle(TopOpeBRepDS_Interfere } } } -#ifdef OCCT_DEBUG - if (TopOpeBRepDS_GettraceGAP()) { - cout <<"TopOpeBRepDS_GapTool::Curve Point "<Geometry()<<" -> Pas sur Courbe "<Transition(); - - TopAbs_ShapeEnum sb = T.ShapeBefore(); - Standard_Integer ib = T.IndexBefore(); - Standard_Boolean bok = Standard_True; - if (ib != 0) { - TopAbs_ShapeEnum sbds = myDS.Shape(ib).ShapeType(); - bok = (sbds == sb); - } - - TopAbs_ShapeEnum sa = T.ShapeAfter(); - Standard_Integer ia = T.IndexAfter(); - Standard_Boolean aok = Standard_True; - if (ia != 0) { - TopAbs_ShapeEnum sads = myDS.Shape(ia).ShapeType(); - aok = (sads == sa); - } - - TopOpeBRepDS_Kind ks = I->SupportType(); - TopAbs_ShapeEnum ss = TopOpeBRepDS::KindToShape(ks); - Standard_Integer is = I->Support(); - Standard_Boolean sok = Standard_True; - if ((is != 0) && (ks >= TopOpeBRepDS_EDGE)) { - TopAbs_ShapeEnum ssds = myDS.Shape(is).ShapeType(); - sok = (ssds == ss); - } - - if (!aok) { - if (TRC(ia)) cout<<"HDSstore ia,ib is "<Geometry(); // append I to list of interference connected to G = I->Geometry() @@ -789,16 +704,10 @@ void TopOpeBRepDS_HDataStructure::StoreInterference break; case TopOpeBRepDS_SURFACE : -#ifdef OCCT_DEBUG - appendtoG = Standard_True; -#endif myDS.ChangeSurfaceInterferences(G).Append(I); break; case TopOpeBRepDS_CURVE : -#ifdef OCCT_DEBUG - appendtoG = Standard_True; -#endif myDS.ChangeCurveInterferences(G).Append(I); break; @@ -809,15 +718,6 @@ void TopOpeBRepDS_HDataStructure::StoreInterference default: break; } - -#ifdef OCCT_DEBUG - Standard_Boolean trc = ::traceSTORE(); - if (trc) { - cout<Dump(cout); - if (appendtoG) cout<<" and to G"< n ) { @@ -868,13 +750,6 @@ void TopOpeBRepDS_HDataStructure::StoreInterference return; } -#ifdef OCCT_DEBUG - Standard_Boolean trc = ::traceSTORE(); - const TopoDS_Shape& S = Shape(IS); - TopOpeBRepDS_Kind ks = TopOpeBRepDS::ShapeToKind(S.ShapeType()); - if (trc) TopOpeBRepDS::Print(ks,IS,cout,str," : "); -#endif - StoreInterference(I,myDS.ChangeShapeInterferences(IS)); } diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx index b9750698de..f1998f21fa 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx @@ -232,71 +232,3 @@ const { return (myGeometryType == I->myGeometryType && myGeometry == I->myGeometry); } - - -//======================================================================= -//function : DumpS -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_Interference::DumpS(Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - TopOpeBRepDS::Print(mySupportType,mySupport,OS,"S=",""); - OS.flush(); -#endif - return OS; -} - - -//======================================================================= -//function : DumpG -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_Interference::DumpG(Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - TopOpeBRepDS::Print(myGeometryType,myGeometry,OS,"G=",""); -#endif - return OS; -} - - -//======================================================================= -//function : Dump -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_Interference::Dump -(Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - myTransition.Dump(OS); OS<<" "; DumpG(OS); OS<<" on "; DumpS(OS); -#endif - return OS; -} - -//======================================================================= -//function : Dump -//purpose : -//======================================================================= -#ifdef OCCT_DEBUG -Standard_OStream& TopOpeBRepDS_Interference::Dump -(Standard_OStream& OS, - const TCollection_AsciiString& s1, - const TCollection_AsciiString& s2) const -{ - OS<Dump(cout);cout<Dump(cout);cout<Dump(cout);cout<ChangeDS(); TopOpeBRepDS_ListOfInterference L1,L2; TopOpeBRepDS_ListIteratorOfListOfInterference it1; @@ -485,9 +371,6 @@ Standard_EXPORT void FUN_orderSTATETRANSonG LI.Clear(); LI.Append(L1); LI.Append(L2); -#ifdef OCCT_DEBUG - if(TRC && modif){ FDS_dumpLI(LI,"apres groupage STATETRANS : "); } -#endif } // FUN_orderSTATETRANSonG //------------------------------------------------------ @@ -499,11 +382,6 @@ Standard_EXPORT void FUN_orderSTATETRANS // L = L1 + L2; (TopOpeBRepDS_ListOfInterference& LI,const Handle(TopOpeBRepDS_HDataStructure)& HDS,const Standard_Integer SIX) { -#ifdef OCCT_DEBUG - Standard_Boolean TRC=TRCE(SIX); - if (TRC) deborderSTATETRANS(SIX); -#endif - TopOpeBRepDS_TKI tki; tki.FillOnGeometry(LI); tki.Init(); @@ -525,11 +403,6 @@ Standard_EXPORT void FUN_resolveEUNKNOWN //------------------------------------------------------ (TopOpeBRepDS_ListOfInterference& LI,TopOpeBRepDS_DataStructure& BDS,const Standard_Integer SIX) { -#ifdef OCCT_DEBUG - Standard_Boolean TRC=TRCE(SIX); if (TRC) debredunke(SIX); - Standard_Boolean modif = Standard_False; -#endif - const TopoDS_Shape& E = BDS.Shape(SIX); TopOpeBRepDS_ListIteratorOfListOfInterference it1; @@ -543,11 +416,6 @@ Standard_EXPORT void FUN_resolveEUNKNOWN const TopOpeBRepDS_Transition& T1 = I1->Transition(); Standard_Boolean isunk = T1.IsUnknown(); if (!isunk) continue; - -#ifdef OCCT_DEBUG - modif = Standard_True; - if(TRC){debredunke(SIX);TCollection_AsciiString s="E";s=s+SIX+" T UNKNOWN ";I1->Dump(cout,s,"\n");} -#endif TopOpeBRepDS_Kind GT1,ST1; Standard_Integer G1,S1; TopAbs_ShapeEnum tsb1,tsa1; Standard_Integer isb1,isa1; FDS_Idata(I1,tsb1,isb1,tsa1,isa1,GT1,G1,ST1,S1); @@ -557,10 +425,6 @@ Standard_EXPORT void FUN_resolveEUNKNOWN Standard_Boolean etgf = idt && idi; // edge tangent a une face en 1 point if (!etgf) continue; -#ifdef OCCT_DEBUG - if(TRC){debredunke(SIX);TCollection_AsciiString s="E";s=s+SIX+" etgf ";I1->Dump(cout,s,"\n");} -#endif - Handle(TopOpeBRepDS_CurvePointInterference) cpi = MAKECPI(I1); if (cpi.IsNull()) continue; @@ -587,33 +451,14 @@ Standard_EXPORT void FUN_resolveEUNKNOWN TopOpeBRepDS_Transition& newT1 = I1->ChangeTransition(); newT1.Set(stateb,statea,tsb1,tsa1); - -#ifdef OCCT_DEBUG - if(TRC){debredunke(SIX);TCollection_AsciiString s="E";s=s+SIX+" T corrected ";I1->Dump(cout,s,"\n");} -#endif - } - -#ifdef OCCT_DEBUG - if(TRC && modif){ FDS_dumpLI(LI,"apres correction UNKNOWN : "); } -#endif - FUN_unkeepUNKNOWN(LI,BDS,SIX); - -#ifdef OCCT_DEBUG - if(TRC && modif){ FDS_dumpLI(LI,"sans suppression UNKNOWN residuels : "); } -#endif } // ---------------------------------------------------------------------- Standard_EXPORT void FUN_purgeDSonSE(const Handle(TopOpeBRepDS_HDataStructure)& HDS,const Standard_Integer EIX,TopOpeBRepDS_ListOfInterference& LI) // ---------------------------------------------------------------------- { -#ifdef OCCT_DEBUG - Standard_Boolean trc = TopOpeBRepDS_GettraceSPSX(EIX); - if (trc) {cout<Dump(cout);cout<Dump(cout);cout<Dump(cout);cout<Transition(); Standard_Boolean isunk = T1.IsUnknown(); if (!isunk) continue; - -#ifdef OCCT_DEBUG - modif = Standard_True; - if(TRC){debredunkf(SIX);TCollection_AsciiString s="F";s=s+SIX+" T UNKNOWN ";I1->Dump(cout,s,"\n");} -#endif TopOpeBRepDS_Kind GT1,ST1; Standard_Integer G1,S1; TopAbs_ShapeEnum tsb1,tsa1; Standard_Integer isb1,isa1; FDS_Idata(I1,tsb1,isb1,tsa1,isa1,GT1,G1,ST1,S1); @@ -285,10 +247,6 @@ Standard_EXPORT void FUN_resolveFUNKNOWN const TopoDS_Edge& EE = TopoDS::Edge(BDS.Shape(G1)); Standard_Real fE,lE; BRep_Tool::Range(EE,fE,lE); - -#ifdef OCCT_DEBUG - if(TRC){debredunkf(SIX);TCollection_AsciiString s="F";s=s+SIX+" etgf ";I1->Dump(cout,s,"\n");} -#endif Handle(TopOpeBRepDS_FaceEdgeInterference) fei = MAKEFEI(I1); if (fei.IsNull()) continue; @@ -364,95 +322,6 @@ Standard_EXPORT void FUN_resolveFUNKNOWN TopAbs_State stmp = stateb; stateb = statea; statea = stmp; } newT1.Set(stateb,statea,tsb1,tsa1); - -#ifdef OCCT_DEBUG - if(TRC){debredunkf(SIX);TCollection_AsciiString s="F";s=s+SIX+" T corrected ";I1->Dump(cout,s,"\n");} -#endif - } - -#ifdef OCCT_DEBUG - if(TRC && modif){ FDS_dumpLI(LI,"apres correction UNKNOWN : "); } -#endif - FUN_unkeepUNKNOWN(LI,BDS,SIX); - -#ifdef OCCT_DEBUG - if(TRC && modif){ FDS_dumpLI(LI,"sans suppression UNKNOWN residuels : "); } -#endif } - -//========================== DEB start -#ifdef OCCT_DEBUG -//Standard_IMPORT void FUN_ComputeGeomData(const TopoDS_Shape& F,const Standard_Real& u,const Standard_Real& v,gp_Dir& Norm); -//------------------------------------------------------ -// Automatic testing for complex faces interference on line with cylinders and planes xpu NYI: general case -//------------------------------------------------------ -Standard_Boolean TestTransition(const TopOpeBRepDS_Transition& T,const TopoDS_Face& F,const TopoDS_Edge& E,const TopoDS_Solid& So) // DEB only -{ - TopAbs_State b, a; - b = T.Before(); a = T.After(); - - BRepAdaptor_Curve ac(E); - GeomAbs_CurveType ctyp = ac.GetType(); - // TCollection_AsciiString nt; TestTopOpeDraw_TTOT::CurveToString(ctyp,nt); - if (ctyp != GeomAbs_Line) { - // cout << " Case "< #include -#ifdef OCCT_DEBUG -extern Standard_Boolean TopOpeBRepDS_GettracePEI(); -extern Standard_Boolean TopOpeBRepDS_GettracePI(); -extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -static Standard_Boolean TRCE(const Standard_Integer EIX) { - Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); - Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); - Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(EIX); - return (b1 || b2 || b3); -} -Standard_EXPORT void debredudoub(const Standard_Integer /*i*/) {} -Standard_EXPORT void debredudoub1(const Standard_Integer /*i*/) {} -Standard_EXPORT void debredudoub2(const Standard_Integer /*i*/) {} -Standard_EXPORT void debredunk(const Standard_Integer /*i*/) {} -#endif - //----------------------------------------------------------------------- Standard_EXPORT Handle(TopOpeBRepDS_Interference) MakeCPVInterference (const TopOpeBRepDS_Transition& T, // transition @@ -343,15 +327,11 @@ Standard_EXPORT void FUN_reducedoublons //------------------------------------------------------ (TopOpeBRepDS_ListOfInterference& LI,const TopOpeBRepDS_DataStructure& BDS,const Standard_Integer SIX) { -#ifdef OCCT_DEBUG - Standard_Boolean TRC=TRCE(SIX); if (TRC) debredudoub(SIX); - Standard_Boolean modif = Standard_False; -#endif + const TopoDS_Shape& E = BDS.Shape(SIX); TopOpeBRepDS_ListIteratorOfListOfInterference it1; // process interferences of LI with VERTEX geometry - it1.Initialize(LI); while (it1.More() ) { Handle(TopOpeBRepDS_Interference)& I1 = it1.Value(); @@ -360,10 +340,6 @@ Standard_EXPORT void FUN_reducedoublons TopAbs_ShapeEnum tsb1,tsa1; Standard_Integer isb1,isa1; FDS_Tdata(I1,tsb1,isb1,tsa1,isa1); -#ifdef OCCT_DEBUG - if (TRC) debredudoub1(SIX); -#endif - TopOpeBRepDS_ListIteratorOfListOfInterference it2(it1); it2.Next(); while ( it2.More() ) { @@ -373,10 +349,6 @@ Standard_EXPORT void FUN_reducedoublons TopAbs_ShapeEnum tsb2,tsa2; Standard_Integer isb2,isa2; FDS_Tdata(I2,tsb2,isb2,tsa2,isa2); -#ifdef OCCT_DEBUG - if (TRC) debredudoub2(SIX); -#endif - Standard_Boolean idGS = (GT2 == GT1 && G2 == G1 && ST2 == ST1 && S2 == S1); if (idGS) { @@ -412,10 +384,6 @@ Standard_EXPORT void FUN_reducedoublons } if (idT) { // les 2 interferences I1 et I2 sont identiques : on supprime I2 -#ifdef OCCT_DEBUG - if(TRC){cout<<"shape "<Dump(cout);cout<Dump(cout);cout<Support()); TopOpeBRepDS_ListOfInterference lII; TopOpeBRepDS_ListIteratorOfListOfInterference it1(lI); while (it1.More()) { @@ -874,16 +806,7 @@ Standard_EXPORT void FUN_select3dinterference // I = (T(face),G=POINT/VERTEX,S=EDGE) in // <-> I' = (T(face),G=POINT/VERTEX,S=FACE) in -#ifdef OCCT_DEBUG -// Standard_Integer n3dFE = -#endif - ::FUN_select3dI(SIX,BDS,lFE,lFEresi,l3dFE); -#ifdef OCCT_DEBUG -// Standard_Integer n3dFF = -#endif - ::FUN_select3dISEsameISF(lFE,l3dFE,l3dFEresi,lF,l3dF); -#ifdef OCCT_DEBUG -// Standard_Integer n2dFE = -#endif - FUN_select2dI(SIX,BDS,TopAbs_FACE,lFE,l2dFE); + ::FUN_select3dI(SIX,BDS,lFE,lFEresi,l3dFE); + ::FUN_select3dISEsameISF(lFE,l3dFE,l3dFEresi,lF,l3dF); + FUN_select2dI(SIX,BDS,TopAbs_FACE,lFE,l2dFE); } diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx index 56f8d8e9fe..8a3500e373 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx @@ -66,21 +66,3 @@ Standard_Boolean TopOpeBRepDS_ShapeShapeInterference::GBound()const void TopOpeBRepDS_ShapeShapeInterference::SetGBound(const Standard_Boolean b) { myGBound = b; } - -//======================================================================= -//function : Dump -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_ShapeShapeInterference::Dump - (Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - OS<<"("; TopOpeBRepDS::Print(myC,OS); OS<<") "; - if (myGBound) OS<<"(Gb 1) "; - else OS<<"(Gb 0) "; - TopOpeBRepDS_Interference::Dump(OS); -#endif - - return OS; -} diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx index 5828a85e5f..294fb471fa 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx @@ -69,8 +69,6 @@ public: Standard_EXPORT void SetGBound (const Standard_Boolean b); - Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& OS) const Standard_OVERRIDE; - diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx index f73d1a1c14..daee40ec11 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx @@ -34,18 +34,3 @@ TopOpeBRepDS_SolidSurfaceInterference::TopOpeBRepDS_SolidSurfaceInterference TopOpeBRepDS_Interference(T,ST,S,GT,G) { } - - -//======================================================================= -//function : Dump -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_SolidSurfaceInterference::Dump - (Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - OS<<"SSI ";TopOpeBRepDS_Interference::Dump(OS); -#endif - return OS; -} diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx index cd2b73bff8..ce9da00a35 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx @@ -39,8 +39,6 @@ public: Standard_EXPORT TopOpeBRepDS_SolidSurfaceInterference(const TopOpeBRepDS_Transition& Transition, const TopOpeBRepDS_Kind SupportType, const Standard_Integer Support, const TopOpeBRepDS_Kind GeometryType, const Standard_Integer Geometry); - Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& OS) const Standard_OVERRIDE; - diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx index bce882a58e..8dcad5b830 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx @@ -23,10 +23,6 @@ IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_SurfaceCurveInterference,TopOpeBRepDS_Interference) -#ifdef OCCT_DEBUG -#include -#endif - //======================================================================= //function : TopOpeBRepDS_SurfaceCurveInterference //purpose : @@ -86,47 +82,3 @@ void TopOpeBRepDS_SurfaceCurveInterference::PCurve { myPCurve = PC; } - - -//======================================================================= -//function : DumpPCurve -//purpose : -//======================================================================= - -Standard_OStream& TopOpeBRepDS_SurfaceCurveInterference::DumpPCurve - (Standard_OStream& OS, -#ifdef OCCT_DEBUG - const Standard_Boolean compact -#else - const Standard_Boolean -#endif - )const -{ -#ifdef OCCT_DEBUG - Dump(OS); OS<Lower();i<=myT->Upper();i++) { - TopOpeBRepDS_Kind k = TableIndexToKind(i); - DumpTKI(k); - } - cout<Value(TI); - for (MDSdmiodmoiloi it(M);it.More();it.Next()) { - Standard_Integer G = it.Key(); - DumpTKI(K,G,"","\n"); - } -} - -//======================================================================= -//function : DumpTKI -//purpose : -//======================================================================= -void TopOpeBRepDS_TKI::DumpTKI -(const TopOpeBRepDS_Kind K,const Standard_Integer G,const TCollection_AsciiString& s1,const TCollection_AsciiString& s2) const -{ - if (!HasInterferences(K,G)) return; - const TopOpeBRepDS_ListOfInterference& loi = Interferences(K,G); - DumpTKI(K,G,loi,s1,s2); -} - -//======================================================================= -//function : DumpTKI -//purpose : -//======================================================================= -void TopOpeBRepDS_TKI::DumpTKI -(const TopOpeBRepDS_Kind K,const Standard_Integer G,const TopOpeBRepDS_ListOfInterference& L,const TCollection_AsciiString& s1,const TCollection_AsciiString& s2) const -{ - if (!HasInterferences(K,G)) return; - TCollection_AsciiString s; - if (s1.Length()) s = s1; - else s = TopOpeBRepDS::SPrint(K,G,"at "," : "); - TCollection_AsciiString sb(s.Length(),' '); - Standard_Integer i=0; - for (TopOpeBRepDS_ListIteratorOfListOfInterference it(L);it.More();it.Next(),i++) { - if (i) it.Value()->Dump(cout,sb,s2); - else it.Value()->Dump(cout,s,s2); - } -} - //======================================================================= //function : DumpTKIIterator //purpose : @@ -255,8 +191,8 @@ void TopOpeBRepDS_TKI::DumpTKIIterator(const TCollection_AsciiString& s1,const T cout< #include -static void FUN_Raise() -{ -#ifdef OCCT_DEBUG - cout<<"****************************** TopOpeBRepDS_TOOL"<Support())); @@ -112,7 +99,7 @@ Standard_Integer TopOpeBRepDS_TOOL::EShareG(const Handle(TopOpeBRepDS_HDataStruc Standard_Integer G = I->Geometry(); const TopoDS_Vertex& vG = TopoDS::Vertex(BDS.Shape(G)); TopoDS_Vertex vsd; Standard_Boolean ok = FUN_ds_getoov(vG,BDS,vsd); - if (!ok) {FUN_Raise(); continue;} + if (!ok) continue; Standard_Boolean Gb1 = Handle(TopOpeBRepDS_ShapeShapeInterference)::DownCast(I)->GBound(); TopoDS_Vertex vE = Gb1 ? vG : vsd; TopoDS_Vertex vEsd = Gb1 ? vsd : vG; diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Transition.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Transition.cxx index 4c32556c1b..4d31ef53f7 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_Transition.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_Transition.cxx @@ -346,40 +346,3 @@ Standard_Boolean TopOpeBRepDS_Transition::IsUnknown() const return (myStateBefore == TopAbs_UNKNOWN) && (myStateAfter == TopAbs_UNKNOWN); } -//======================================================================= -//function : DumpB -//purpose : -//======================================================================= -Standard_OStream& TopOpeBRepDS_Transition::DumpB(Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - TopOpeBRepDS::Print(myStateBefore,OS); - TopOpeBRepDS::Print(TopOpeBRepDS::ShapeToKind(myShapeBefore),myIndexBefore,OS); -#endif - return OS; -} - -//======================================================================= -//function : DumpA -//purpose : -//======================================================================= -Standard_OStream& TopOpeBRepDS_Transition::DumpA(Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - TopOpeBRepDS::Print(myStateAfter,OS); - TopOpeBRepDS::Print(TopOpeBRepDS::ShapeToKind(myShapeAfter),myIndexAfter,OS); -#endif - return OS; -} - -//======================================================================= -//function : Dump -//purpose : -//======================================================================= -Standard_OStream& TopOpeBRepDS_Transition::Dump(Standard_OStream& OS) const -{ -#ifdef OCCT_DEBUG - OS<<"("; DumpB(OS); OS<<","; DumpA(OS); OS<<")"; -#endif - return OS; -} diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Transition.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_Transition.hxx index 6007778f03..cdde7f7df6 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_Transition.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_Transition.hxx @@ -107,12 +107,7 @@ public: //! returns True if both states are UNKNOWN Standard_EXPORT Standard_Boolean IsUnknown() const; - - Standard_EXPORT Standard_OStream& DumpA (Standard_OStream& OS) const; - - Standard_EXPORT Standard_OStream& DumpB (Standard_OStream& OS) const; - - Standard_EXPORT Standard_OStream& Dump (Standard_OStream& OS) const; + diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx index e1685f8afb..7237ba83f1 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx @@ -148,15 +148,6 @@ Standard_EXPORT Standard_Boolean FDSCNX_HasConnexFace(const TopoDS_Shape& S,cons Standard_EXPORT void FDSCNX_FaceEdgeConnexFaces(const TopoDS_Shape& F,const TopoDS_Shape& E,const Handle(TopOpeBRepDS_HDataStructure)& HDS,TopTools_ListOfShape& LF) { LF.Clear(); -#ifdef OCCT_DEBUG -// Standard_Integer Fi = -#endif -// HDS->Shape(F); -#ifdef OCCT_DEBUG -// Standard_Integer Ei = -#endif -// HDS->Shape(E); - // verifier que E est une arete de connexite de F Standard_Boolean EofF = Standard_False; const TopTools_ListOfShape& loe = FDSCNX_EdgeConnexitySameShape(F,HDS); if (loe.IsEmpty()) return; @@ -174,10 +165,6 @@ Standard_EXPORT void FDSCNX_FaceEdgeConnexFaces(const TopoDS_Shape& F,const Topo const TopTools_ListOfShape& lof = FDSCNX_EdgeConnexitySameShape(E,HDS); if (lof.IsEmpty()) return; for (TopTools_ListIteratorOfListOfShape it(lof);it.More();it.Next()) { const TopoDS_Shape& f = it.Value(); -#ifdef OCCT_DEBUG -// Standard_Integer fi = -#endif -// HDS->Shape(f); Standard_Boolean b = f.IsSame(F); if (!b) { LF.Append(f); @@ -192,10 +179,6 @@ Standard_EXPORT void FDSCNX_DumpIndex(const Handle(TopOpeBRepDS_HDataStructure)& if (I<1 || I>ns) return; Standard_Integer i=I; const TopoDS_Shape& s=BDS.Shape(i); -#ifdef OCCT_DEBUG -// Standard_Integer is= -#endif -// BDS.Shape(s); TopAbs_ShapeEnum ts=s.ShapeType(); const TopTools_ListOfShape& ls=FDSCNX_EdgeConnexitySameShape(s,HDS); if (ts == TopAbs_EDGE) { @@ -206,10 +189,6 @@ Standard_EXPORT void FDSCNX_DumpIndex(const Handle(TopOpeBRepDS_HDataStructure)& TopTools_ListIteratorOfListOfShape ils(ls);if(!ils.More())return; for(;ils.More();ils.Next()) { const TopoDS_Shape& e=ils.Value(); -#ifdef OCCT_DEBUG -// Standard_Integer ie=BDS.Shape(e); -// TopAbs_ShapeEnum te=e.ShapeType(); -#endif TopTools_ListOfShape lf;FDSCNX_FaceEdgeConnexFaces(s,e,HDS,lf); TopTools_ListIteratorOfListOfShape ilf(lf);if(!ilf.More())continue; for(;ilf.More();ilf.Next())cout< -#include - -#ifdef OCCT_DEBUG -Standard_EXPORT Standard_Boolean DSREDUEDGETRCE(const Standard_Integer EIX) { - Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); - Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); - Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(EIX); - return (b1 || b2 || b3); -} -Standard_EXPORT void debreducerE(const Standard_Integer ie) -{cout<<"+++ debreducerE e"< -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceEDPR(); -Standard_EXPORT Standard_Boolean DSREDUEDGETRCE(const Standard_Integer); -Standard_EXPORT void debreducerE(const Standard_Integer); -Standard_EXPORT void debreducerEP(const Standard_Integer); -Standard_EXPORT void debreducerEV(const Standard_Integer,const Standard_Integer); -Standard_EXPORT void debreducer3d(const Standard_Integer); -Standard_EXPORT void debredpvg(const Standard_Integer); -#endif - -#endif diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx index bb0a92209a..508683468e 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx @@ -37,29 +37,15 @@ #define MDSdmoiloi TopOpeBRepDS_DataMapOfIntegerListOfInterference #define MDSdmiodmoiloi TopOpeBRepDS_DataMapIteratorOfDataMapOfIntegerListOfInterference -#ifdef OCCT_DEBUG -#include -extern Standard_Boolean TopOpeBRepDS_GetcontextMKTONREG(); -#endif - //------------------------------------------------------ Standard_EXPORT void FDS_repvg2 (const TopOpeBRepDS_DataStructure& BDS,const Standard_Integer EIX,const TopOpeBRepDS_Kind GT,TopOpeBRepDS_ListOfInterference& LI,TopOpeBRepDS_ListOfInterference& RLI) //------------------------------------------------------ { -#ifdef OCCT_DEBUG - Standard_Boolean TRC=DSREDUEDGETRCE(EIX); - TRC = Standard_False; //xpu170898 -#endif const TopoDS_Edge& E = TopoDS::Edge(BDS.Shape(EIX)); Standard_Boolean isEd = BRep_Tool::Degenerated(E); if (isEd) return; -#ifdef OCCT_DEBUG - if (TRC) cout<Dump(cout);cout<Transition().Dump(cout);cout<Dump(cout,"add ","\n"); -#endif if (ispoint) EITool.Add(E,PDS,I2); else if (isvertex) EITool.Add(E2,VDS,I2); LI.Remove(it2); -#ifdef OCCT_DEBUG - if(TRC){cout<<"result ";Handle(TopOpeBRepDS_Interference) IBID = new TopOpeBRepDS_Interference(); - EITool.Transition(IBID);IBID->Transition().Dump(cout);cout< reste "< reste "<SameDomainReference(sref); + HDS->SameDomainReference(sref); TopOpeBRepDS_Config oref = HDS->SameDomainOrientation(sref); for (it.Initialize(LS1); it.More(); it.Next() ) { diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_trace.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_trace.cxx deleted file mode 100644 index 3d73ef25d2..0000000000 --- a/src/TopOpeBRepDS/TopOpeBRepDS_trace.cxx +++ /dev/null @@ -1,152 +0,0 @@ -// Created on: 1994-03-18 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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 Standard_Boolean TopOpeBRepDS_traceBUTO = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceBUTO(const Standard_Boolean b) -{ TopOpeBRepDS_traceBUTO = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceBUTO() -{ return TopOpeBRepDS_traceBUTO; } - -static Standard_Boolean TopOpeBRepDS_traceTRPE = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceTRPE(const Standard_Boolean b) -{ TopOpeBRepDS_traceTRPE = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceTRPE() -{ return TopOpeBRepDS_traceTRPE; } - -static Standard_Boolean TopOpeBRepDS_traceEDPR = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceEDPR(const Standard_Boolean b) -{ TopOpeBRepDS_traceEDPR = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceEDPR() -{ return TopOpeBRepDS_traceEDPR; } - -static Standard_Boolean TopOpeBRepDS_traceISTO = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceISTO(const Standard_Boolean b) -{ TopOpeBRepDS_traceISTO = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceISTO() -{ return TopOpeBRepDS_traceISTO; } - -static Standard_Boolean TopOpeBRepDS_traceSANTRAN = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceSANTRAN(const Standard_Boolean b) -{ TopOpeBRepDS_traceSANTRAN = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSANTRAN() -{ return TopOpeBRepDS_traceSANTRAN; } - -static Standard_Boolean TopOpeBRepDS_contextNOPFI = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SetcontextNOPFI(const Standard_Boolean b) -{ TopOpeBRepDS_contextNOPFI = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GetcontextNOPFI() -{ return TopOpeBRepDS_contextNOPFI; } - -static Standard_Boolean TopOpeBRepDS_contextMKTONREG = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SetcontextMKTONREG(const Standard_Boolean b) -{ TopOpeBRepDS_contextMKTONREG = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GetcontextMKTONREG() -{ return TopOpeBRepDS_contextMKTONREG; } - -static Standard_Boolean TopOpeBRepDS_contextNOPNC = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SetcontextNOPNC(const Standard_Boolean b) -{ TopOpeBRepDS_contextNOPNC = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GetcontextNOPNC() -{ return TopOpeBRepDS_contextNOPNC; } - -static Standard_Boolean TopOpeBRepDS_traceDSNC = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceDSNC(const Standard_Boolean b) -{ TopOpeBRepDS_traceDSNC = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC() -{ return TopOpeBRepDS_traceDSNC; } - -static Standard_Boolean TopOpeBRepDS_traceDSF = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceDSF(const Standard_Boolean b) -{ TopOpeBRepDS_traceDSF = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF() -{ return TopOpeBRepDS_traceDSF; } - -static Standard_Boolean TopOpeBRepDS_traceDSP = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceDSP(const Standard_Boolean b) -{ TopOpeBRepDS_traceDSP = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSP() -{ return TopOpeBRepDS_traceDSP; } - -static Standard_Boolean TopOpeBRepDS_traceEDSF = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceEDSF(const Standard_Boolean b) -{ TopOpeBRepDS_traceEDSF = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceEDSF() -{ return TopOpeBRepDS_traceEDSF; } - -static Standard_Boolean TopOpeBRepDS_traceDSFD = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceDSFD(const Standard_Boolean b) -{ TopOpeBRepDS_traceDSFD = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSFD() -{ return TopOpeBRepDS_traceDSFD; } - -static Standard_Boolean TopOpeBRepDS_traceDSFK = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceDSFK(const Standard_Boolean b) { TopOpeBRepDS_traceDSFK = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSFK() { return TopOpeBRepDS_traceDSFK; } - -static Standard_Boolean TopOpeBRepDS_traceDSLT = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceDSLT(const Standard_Boolean b) { TopOpeBRepDS_traceDSLT = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSLT() { return TopOpeBRepDS_traceDSLT; } - -static Standard_Boolean TopOpeBRepDS_traceDEGEN = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceDEGEN(const Standard_Boolean b) -{ TopOpeBRepDS_traceDEGEN = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDEGEN() -{ return TopOpeBRepDS_traceDEGEN; } - -static Standard_Boolean TopOpeBRepDS_tracePCI = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettracePCI(const Standard_Boolean b) { TopOpeBRepDS_tracePCI = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePCI() { return TopOpeBRepDS_tracePCI; } - -static Standard_Boolean TopOpeBRepDS_tracePEI = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettracePEI(const Standard_Boolean b) { TopOpeBRepDS_tracePEI = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePEI() { return TopOpeBRepDS_tracePEI; } - -static Standard_Boolean TopOpeBRepDS_tracePFI = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettracePFI(const Standard_Boolean b) { TopOpeBRepDS_tracePFI = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePFI() { return TopOpeBRepDS_tracePFI; } - -static Standard_Boolean TopOpeBRepDS_tracePI = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettracePI(const Standard_Boolean b) { TopOpeBRepDS_tracePI = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePI() { return TopOpeBRepDS_tracePI; } - -static Standard_Boolean TopOpeBRepDS_traceSTRANGE = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceSTRANGE(const Standard_Boolean b) {TopOpeBRepDS_traceSTRANGE = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE() { return TopOpeBRepDS_traceSTRANGE; } - -static Standard_Boolean TopOpeBRepDS_traceGap = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SettraceGAP(const Standard_Boolean b) {TopOpeBRepDS_traceGap = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceGAP() { return TopOpeBRepDS_traceGap; } - -static Standard_Boolean TopOpeBRepDS_contextNOGAP = Standard_False; -Standard_EXPORT void TopOpeBRepDS_SetcontextNOGAP(const Standard_Boolean b) {TopOpeBRepDS_contextNOGAP = b; } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GetcontextNOGAP(char* str) { - if (TopOpeBRepDS_contextNOGAP) { - cout<<"context NOGAP actif"; if (str!=NULL) cout< - -////////////////////////////////////////////////////////////// - -TopOpeBRepDS_traceDS::TopOpeBRepDS_traceDS() -{} - -void TopOpeBRepDS_traceDS::SetHDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) -{ - myHDS = HDS; - myne = 0; - myhe.Nullify(); - Allocate(); -} - -void TopOpeBRepDS_traceDS::Allocate() -{ - Standard_Integer n = Nelem(); - Standard_Boolean all = (myhe.IsNull()) || (n > myne); - if (all) { - if (n == 0) n = 1000; - myhe = new TColStd_HArray1OfBoolean(0,n); - myhe->Init(Standard_False); - } - if (n) myne = n; -} - -Standard_Integer TopOpeBRepDS_traceDS::Nelem() const -{ - return 0; -} - -const Handle(TopOpeBRepDS_HDataStructure)& TopOpeBRepDS_traceDS::GetHDS() const -{ - return myHDS; -} - -void TopOpeBRepDS_traceDS::Set(const Standard_Integer ie, const Standard_Boolean b) -{ - Allocate(); - if (!(ie>=1 && ie<=myne)) return; - myhe->SetValue(ie,b); -} - -void TopOpeBRepDS_traceDS::Set(const Standard_Boolean b, Standard_Integer na, char** a) -{ - Allocate(); - Standard_Integer ia; - if (!na) myhe->Init(b); - else for (ia=0; ia=1 && ie<=myne)) return Standard_False; - return myhe->Value(ie); -} - -////////////////////////////////////////////////////////////// - -TopOpeBRepDS_traceCURVE::TopOpeBRepDS_traceCURVE(){} -Standard_Integer TopOpeBRepDS_traceCURVE::Nelem() const -{ - if (myHDS.IsNull()) return 0; - else return myHDS->NbCurves(); -} - -////////////////////////////////////////////////////////////// - -#include -#include - -TopOpeBRepDS_traceSHAPE::TopOpeBRepDS_traceSHAPE() {myns = 0;} -void TopOpeBRepDS_traceSHAPE::SetSS(const TopoDS_Shape& s1,const TopoDS_Shape& s2) -{ - TopTools_IndexedMapOfShape M; - M.Clear(); - //JMB s1 ou s2 peut etre nul (voir ChFi3d chez lvt) - if (!s1.IsNull()) { - TopExp::MapShapes(s1,M); - } - Standard_Integer n1 = M.Extent(); - M.Clear(); - if (!s2.IsNull()) { - TopExp::MapShapes(s2,M); - } - Standard_Integer n2 = M.Extent(); - myns = n1+n2; -} - -void TopOpeBRepDS_traceSHAPE::SetSSHDS(const TopoDS_Shape& s1,const TopoDS_Shape& s2,const Handle(TopOpeBRepDS_HDataStructure)& HDS) -{ - SetSS(s1,s2); - SetHDS(HDS); -} - -Standard_Integer TopOpeBRepDS_traceSHAPE::Nelem() const -{ - return myns; -} - -Standard_Integer TopOpeBRepDS_traceSHAPE::Index(const TopoDS_Shape& S) const -{ - if (myHDS.IsNull()) return 0; - Standard_Integer i = myHDS->Shape(S); - return i; -} - -Standard_Boolean TopOpeBRepDS_traceSHAPE::GetS(const TopoDS_Shape& S) const -{ - if (myHDS.IsNull()) return Standard_False; - Standard_Integer is = myHDS->Shape(S); - Standard_Boolean b = GetI(is); - return b; -} - -////////////////////////////////////////////////////////////// -static TopOpeBRepDS_traceCURVE VCX; -Standard_EXPORT void TopOpeBRepDS_SettraceCX(const Standard_Boolean b,Standard_Integer n,char** a) { VCX.Set(b,n,a); } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceCX(const Standard_Integer i) { return VCX.GetI(i); } - -////////////////////////////////////////////////////////////// -static TopOpeBRepDS_traceSHAPE VSPSX; -static TopOpeBRepDS_traceSHAPE VSPSXX; - -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX(const Standard_Boolean b,Standard_Integer n,char** a) { VSPSX.Set(b,n,a); } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i) { return VSPSX.GetI(i); } -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const TopoDS_Shape& S) { return VSPSX.GetS(S); } -Standard_EXPORT Standard_Integer TopOpeBRepDS_GetindexSPSX(const TopoDS_Shape& S) { return VSPSX.Index(S); } -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX(const Standard_Integer i,const Standard_Boolean b) { VSPSX.Set(i,b); } -Standard_EXPORT void TopOpeBRepDS_SettraceSPSXX(const Standard_Boolean b, Standard_Integer n, char** a) { VSPSXX.Set(b,n,a);} -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSXX(const Standard_Integer i1,const Standard_Integer i2) -{ Standard_Boolean b1 = VSPSXX.GetI(i1); Standard_Boolean b2 = VSPSXX.GetI(i2); return (b1 && b2); } -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX_SS(const TopoDS_Shape& S1,const TopoDS_Shape& S2) -{ VSPSX.SetSS(S1,S2); VSPSXX.SetSS(S1,S2); } -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX_HDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) -{ VSPSX.SetHDS(HDS); VSPSXX.SetHDS(HDS); } -Standard_EXPORT void TopOpeBRepDS_SettraceSPSX_SSHDS -(const TopoDS_Shape& a,const TopoDS_Shape& b,const Handle(TopOpeBRepDS_HDataStructure)& HDS) -{ VSPSX.SetSSHDS(a,b,HDS); VSPSXX.SetSSHDS(a,b,HDS); } - -#endif diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx deleted file mode 100644 index 5a80056351..0000000000 --- a/src/TopOpeBRepDS/TopOpeBRepDS_traceDSX.hxx +++ /dev/null @@ -1,64 +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. - -#ifndef _TopOpeBRepDS_traceDSX_HeaderFile -#define _TopOpeBRepDS_traceDSX_HeaderFile - -#ifdef OCCT_DEBUG - -#include -#include -#include -#include - -class TopOpeBRepDS_traceDS : public MMgt_TShared { -public: - TopOpeBRepDS_traceDS(); - virtual Standard_Integer Nelem() const; - void SetHDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS); - const Handle(TopOpeBRepDS_HDataStructure)& GetHDS() const; - void Set(const Standard_Integer i, const Standard_Boolean b); - void Set(const Standard_Boolean b, Standard_Integer n, char** a); - Standard_Boolean GetI(const Standard_Integer i) const; - void Allocate(); -protected: - Handle(TopOpeBRepDS_HDataStructure) myHDS; - Standard_Integer myne; Handle(TColStd_HArray1OfBoolean) myhe; -}; - -class TopOpeBRepDS_traceCURVE : public TopOpeBRepDS_traceDS { -public: - TopOpeBRepDS_traceCURVE(); - Standard_Integer Nelem() const; -}; - -class TopOpeBRepDS_traceSHAPE : public TopOpeBRepDS_traceDS { -public: - TopOpeBRepDS_traceSHAPE(); - Standard_Integer Nelem() const; - void SetSS(const TopoDS_Shape&,const TopoDS_Shape&); - void SetSSHDS(const TopoDS_Shape&,const TopoDS_Shape&,const Handle(TopOpeBRepDS_HDataStructure)&); - Standard_Integer Index(const TopoDS_Shape&) const; - Standard_Boolean GetS(const TopoDS_Shape&) const; -private: - Standard_Integer myns; -}; - -// #ifdef OCCT_DEBUG -#endif - -// #define _TopOpeBRepDS_traceDSX_HeaderFile -#endif diff --git a/src/TopTools/FILES b/src/TopTools/FILES index db61849e2d..0a9d20a8c6 100644 --- a/src/TopTools/FILES +++ b/src/TopTools/FILES @@ -43,11 +43,9 @@ TopTools_MapOfOrientedShape.hxx TopTools_MapOfShape.hxx TopTools_MutexForShapeProvider.cxx TopTools_MutexForShapeProvider.hxx -TopTools_OrientedShapeMapHasher.cxx TopTools_OrientedShapeMapHasher.hxx TopTools_OrientedShapeMapHasher.lxx TopTools_SequenceOfShape.hxx -TopTools_ShapeMapHasher.cxx TopTools_ShapeMapHasher.hxx TopTools_ShapeMapHasher.lxx TopTools_ShapeSet.cxx diff --git a/src/TopTools/TopTools_OrientedShapeMapHasher.cxx b/src/TopTools/TopTools_OrientedShapeMapHasher.cxx deleted file mode 100644 index 8ed8b3ca52..0000000000 --- a/src/TopTools/TopTools_OrientedShapeMapHasher.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created on: 1993-01-14 -// Created by: Remi LEQUETTE -// Copyright (c) 1993-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. - - -#include -#include diff --git a/src/TopTools/TopTools_ShapeMapHasher.cxx b/src/TopTools/TopTools_ShapeMapHasher.cxx deleted file mode 100644 index 109020814c..0000000000 --- a/src/TopTools/TopTools_ShapeMapHasher.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created on: 1993-01-14 -// Created by: Remi LEQUETTE -// Copyright (c) 1993-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. - - -#include -#include diff --git a/src/TopoDS/FILES b/src/TopoDS/FILES index 28adbed18f..cfb467e74b 100644 --- a/src/TopoDS/FILES +++ b/src/TopoDS/FILES @@ -1,19 +1,14 @@ -TopoDS.cxx TopoDS.hxx TopoDS.lxx TopoDS_Builder.cxx TopoDS_Builder.hxx TopoDS_Builder.lxx -TopoDS_Compound.cxx TopoDS_Compound.hxx TopoDS_Compound.lxx -TopoDS_CompSolid.cxx TopoDS_CompSolid.hxx TopoDS_CompSolid.lxx -TopoDS_Edge.cxx TopoDS_Edge.hxx TopoDS_Edge.lxx -TopoDS_Face.cxx TopoDS_Face.hxx TopoDS_Face.lxx TopoDS_FrozenShape.hxx @@ -29,10 +24,8 @@ TopoDS_LockedShape.hxx TopoDS_Shape.cxx TopoDS_Shape.hxx TopoDS_Shape.lxx -TopoDS_Shell.cxx TopoDS_Shell.hxx TopoDS_Shell.lxx -TopoDS_Solid.cxx TopoDS_Solid.hxx TopoDS_Solid.lxx TopoDS_TCompound.cxx @@ -63,9 +56,7 @@ TopoDS_TWire.cxx TopoDS_TWire.hxx TopoDS_TWire.lxx TopoDS_UnCompatibleShapes.hxx -TopoDS_Vertex.cxx TopoDS_Vertex.hxx TopoDS_Vertex.lxx -TopoDS_Wire.cxx TopoDS_Wire.hxx TopoDS_Wire.lxx diff --git a/src/TopoDS/TopoDS.cxx b/src/TopoDS/TopoDS.cxx deleted file mode 100644 index fac070bcae..0000000000 --- a/src/TopoDS/TopoDS.cxx +++ /dev/null @@ -1,29 +0,0 @@ -// Created on: 1994-07-29 -// Created by: Modeling -// Copyright (c) 1994-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. - -#define No_Standard_TypeMismatch - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/src/TopoDS/TopoDS_CompSolid.cxx b/src/TopoDS/TopoDS_CompSolid.cxx deleted file mode 100644 index f31ce52041..0000000000 --- a/src/TopoDS/TopoDS_CompSolid.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-16 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/TopoDS/TopoDS_Compound.cxx b/src/TopoDS/TopoDS_Compound.cxx deleted file mode 100644 index 14bcc125bd..0000000000 --- a/src/TopoDS/TopoDS_Compound.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-16 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/TopoDS/TopoDS_Edge.cxx b/src/TopoDS/TopoDS_Edge.cxx deleted file mode 100644 index f62a66b801..0000000000 --- a/src/TopoDS/TopoDS_Edge.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-16 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/TopoDS/TopoDS_Face.cxx b/src/TopoDS/TopoDS_Face.cxx deleted file mode 100644 index 379c7fb626..0000000000 --- a/src/TopoDS/TopoDS_Face.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-16 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/TopoDS/TopoDS_Shell.cxx b/src/TopoDS/TopoDS_Shell.cxx deleted file mode 100644 index 2d02a799a3..0000000000 --- a/src/TopoDS/TopoDS_Shell.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-16 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/TopoDS/TopoDS_Solid.cxx b/src/TopoDS/TopoDS_Solid.cxx deleted file mode 100644 index 21ea77a419..0000000000 --- a/src/TopoDS/TopoDS_Solid.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-16 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/TopoDS/TopoDS_Vertex.cxx b/src/TopoDS/TopoDS_Vertex.cxx deleted file mode 100644 index f00baed5f9..0000000000 --- a/src/TopoDS/TopoDS_Vertex.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-12 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/TopoDS/TopoDS_Wire.cxx b/src/TopoDS/TopoDS_Wire.cxx deleted file mode 100644 index 6243542691..0000000000 --- a/src/TopoDS/TopoDS_Wire.cxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 1991-04-16 -// Created by: Remi LEQUETTE -// Copyright (c) 1991-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. - - -#include diff --git a/src/math/FILES b/src/math/FILES index 328dcf0a88..dc40792364 100755 --- a/src/math/FILES +++ b/src/math/FILES @@ -53,7 +53,6 @@ math_FunctionSet.hxx math_FunctionSetRoot.cxx math_FunctionSetRoot.hxx math_FunctionSetRoot.lxx -math_FunctionSetWithDerivatives.cxx math_FunctionSetWithDerivatives.hxx math_FunctionWithDerivative.cxx math_FunctionWithDerivative.hxx @@ -92,9 +91,7 @@ math_Matrix.hxx math_Matrix.lxx math_MultipleVarFunction.cxx math_MultipleVarFunction.hxx -math_MultipleVarFunctionWithGradient.cxx math_MultipleVarFunctionWithGradient.hxx -math_MultipleVarFunctionWithHessian.cxx math_MultipleVarFunctionWithHessian.hxx math_NewtonFunctionRoot.cxx math_NewtonFunctionRoot.hxx diff --git a/src/math/math_FunctionSetWithDerivatives.cxx b/src/math/math_FunctionSetWithDerivatives.cxx deleted file mode 100644 index 751c07130e..0000000000 --- a/src/math/math_FunctionSetWithDerivatives.cxx +++ /dev/null @@ -1,17 +0,0 @@ -// 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. - - -#include -#include diff --git a/src/math/math_MultipleVarFunctionWithGradient.cxx b/src/math/math_MultipleVarFunctionWithGradient.cxx deleted file mode 100644 index 08c0d26b31..0000000000 --- a/src/math/math_MultipleVarFunctionWithGradient.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 1997-1999 Matra Datavision -// Copyright (c) 1999-2015 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. - - -#include diff --git a/src/math/math_MultipleVarFunctionWithHessian.cxx b/src/math/math_MultipleVarFunctionWithHessian.cxx deleted file mode 100644 index 87e48a2666..0000000000 --- a/src/math/math_MultipleVarFunctionWithHessian.cxx +++ /dev/null @@ -1,19 +0,0 @@ -// Created on: 1996-05-03 -// Created by: Philippe MANGIN -// Copyright (c) 1996-1999 Matra Datavision -// Copyright (c) 1999-2015 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. - - -#include -#include