diff --git a/src/TopOpeBRep/FILES b/src/TopOpeBRep/FILES index 42703457d6..b5ff405806 100755 --- a/src/TopOpeBRep/FILES +++ b/src/TopOpeBRep/FILES @@ -25,7 +25,6 @@ TopOpeBRep_FaceEdgeIntersector.hxx TopOpeBRep_FacesFiller.cxx TopOpeBRep_FacesFiller.hxx TopOpeBRep_FacesFiller_1.cxx -TopOpeBRep_FacesFiller_VPonR.cxx TopOpeBRep_FacesIntersector.cxx TopOpeBRep_FacesIntersector.hxx TopOpeBRep_FFDumper.cxx diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.hxx b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.hxx index c79d8c6a3b..f31a324552 100644 --- a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.hxx +++ b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.hxx @@ -99,8 +99,6 @@ public: Standard_EXPORT void Tolerances (Standard_Real& tol1, Standard_Real& tol2) const; - Standard_EXPORT Standard_Real Tolerance2() const; - Standard_EXPORT Standard_Integer NbPoints() const; Standard_EXPORT Standard_Integer NbSegments() const; diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller.hxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller.hxx index e4d1598f78..634f99a095 100644 --- a/src/TopOpeBRep/TopOpeBRep_FacesFiller.hxx +++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller.hxx @@ -226,7 +226,6 @@ public: Standard_EXPORT static Standard_Boolean EqualpPonR (const TopOpeBRep_LineInter& Lrest, const TopOpeBRep_VPointInter& VP1, const TopOpeBRep_VPointInter& VP2); - Standard_EXPORT static Standard_Boolean EqualpP (const TopOpeBRep_LineInter& L, const Standard_Integer iVP1, const Standard_Integer iVP2); diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller_VPonR.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller_VPonR.cxx deleted file mode 100644 index 01d7607309..0000000000 --- a/src/TopOpeBRep/TopOpeBRep_FacesFiller_VPonR.cxx +++ /dev/null @@ -1,15 +0,0 @@ -// Created on: 1995-08-04 -// Created by: Jean Yves LEBEY et XPU surtout -// 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. diff --git a/src/TopOpeBRep/TopOpeBRep_GeomTool.hxx b/src/TopOpeBRep/TopOpeBRep_GeomTool.hxx index f56f1babf7..2fe68795e4 100644 --- a/src/TopOpeBRep/TopOpeBRep_GeomTool.hxx +++ b/src/TopOpeBRep/TopOpeBRep_GeomTool.hxx @@ -45,8 +45,7 @@ public: Standard_EXPORT static void MakeCurve (const Standard_Real min, const Standard_Real max, const TopOpeBRep_LineInter& L, Handle(Geom_Curve)& C); - Standard_EXPORT static void MakePrivateCurves (const Standard_Real min, const Standard_Real max, const TopOpeBRep_LineInter& L, const TopoDS_Shape& S1, const TopoDS_Shape& S2, Handle(Geom_Curve)& C, Handle(Geom2d_Curve)& PC1, Handle(Geom2d_Curve)& PC2, Standard_Boolean& New, Standard_Real& tolreached2d1, Standard_Real& tolreached2d2); - + Standard_EXPORT static Handle(Geom_Curve) MakeBSpline1fromWALKING3d (const TopOpeBRep_LineInter& L); Standard_EXPORT static Handle(Geom2d_Curve) MakeBSpline1fromWALKING2d (const TopOpeBRep_LineInter& L, const Standard_Integer SI); diff --git a/src/TopOpeBRepDS/FILES b/src/TopOpeBRepDS/FILES index 548bd921bc..c06fa500ac 100755 --- a/src/TopOpeBRepDS/FILES +++ b/src/TopOpeBRepDS/FILES @@ -45,8 +45,6 @@ TopOpeBRepDS_DoubleMapIteratorOfDoubleMapOfIntegerShape.hxx TopOpeBRepDS_DoubleMapOfIntegerShape.hxx TopOpeBRepDS_DRAW.cxx TopOpeBRepDS_DRAW.hxx -TopOpeBRepDS_DSS.cxx -TopOpeBRepDS_DSS.hxx TopOpeBRepDS_Dumper.cxx TopOpeBRepDS_Dumper.hxx TopOpeBRepDS_Edge3dInterferenceTool.cxx diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_DSS.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_DSS.cxx deleted file mode 100644 index 45fd12e3c0..0000000000 --- a/src/TopOpeBRepDS/TopOpeBRepDS_DSS.cxx +++ /dev/null @@ -1,20 +0,0 @@ -// Created on: 1998-02-05 -// 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/TopOpeBRepDS/TopOpeBRepDS_DSS.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_DSS.hxx deleted file mode 100644 index a13d7d37a4..0000000000 --- a/src/TopOpeBRepDS/TopOpeBRepDS_DSS.hxx +++ /dev/null @@ -1,168 +0,0 @@ -// Created on: 1998-02-05 -// 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. - -#ifndef _TopOpeBRepDS_DSS_HeaderFile -#define _TopOpeBRepDS_DSS_HeaderFile - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -class TopoDS_Shape; -class TopOpeBRepDS_Interference; - - - -class TopOpeBRepDS_DSS -{ -public: - - DEFINE_STANDARD_ALLOC - - - Standard_EXPORT TopOpeBRepDS_DSS(); - - Standard_EXPORT void Clear(); - - //! Insert a shape S. Returns the index. - Standard_EXPORT Standard_Integer AddShape (const TopoDS_Shape& S); - - //! Insert a shape S which ancestor is I = 1 or 2. Returns the index. - Standard_EXPORT Standard_Integer AddShape (const TopoDS_Shape& S, const Standard_Integer I); - - Standard_EXPORT Standard_Boolean KeepShape (const Standard_Integer I, const Standard_Boolean K = Standard_True) const; - - Standard_EXPORT Standard_Boolean KeepShape (const TopoDS_Shape& S, const Standard_Boolean K = Standard_True) const; - - Standard_EXPORT void ChangeKeepShape (const Standard_Integer I, const Standard_Boolean K); - - Standard_EXPORT void ChangeKeepShape (const TopoDS_Shape& S, const Standard_Boolean K); - - Standard_EXPORT const TopOpeBRepDS_ListOfInterference& ShapeInterferences (const TopoDS_Shape& S, const Standard_Boolean K = Standard_True) const; - - Standard_EXPORT TopOpeBRepDS_ListOfInterference& ChangeShapeInterferences (const TopoDS_Shape& S); - - Standard_EXPORT const TopOpeBRepDS_ListOfInterference& ShapeInterferences (const Standard_Integer I, const Standard_Boolean K = Standard_True) const; - - Standard_EXPORT TopOpeBRepDS_ListOfInterference& ChangeShapeInterferences (const Standard_Integer I); - - Standard_EXPORT const TopTools_ListOfShape& ShapeSameDomain (const TopoDS_Shape& S) const; - - Standard_EXPORT TopTools_ListOfShape& ChangeShapeSameDomain (const TopoDS_Shape& S); - - Standard_EXPORT const TopTools_ListOfShape& ShapeSameDomain (const Standard_Integer I) const; - - Standard_EXPORT TopTools_ListOfShape& ChangeShapeSameDomain (const Standard_Integer I); - - Standard_EXPORT TopOpeBRepDS_MapOfIntegerShapeData& ChangeShapeData(); - - Standard_EXPORT void AddShapeSameDomain (const TopoDS_Shape& S, const TopoDS_Shape& SSD); - - Standard_EXPORT void RemoveShapeSameDomain (const TopoDS_Shape& S, const TopoDS_Shape& SSD); - - Standard_EXPORT Standard_Integer SameDomainRef (const Standard_Integer I) const; - - Standard_EXPORT Standard_Integer SameDomainRef (const TopoDS_Shape& S) const; - - Standard_EXPORT void SameDomainRef (const Standard_Integer I, const Standard_Integer Ref); - - Standard_EXPORT void SameDomainRef (const TopoDS_Shape& S, const Standard_Integer Ref); - - Standard_EXPORT TopOpeBRepDS_Config SameDomainOri (const Standard_Integer I) const; - - Standard_EXPORT TopOpeBRepDS_Config SameDomainOri (const TopoDS_Shape& S) const; - - Standard_EXPORT void SameDomainOri (const Standard_Integer I, const TopOpeBRepDS_Config Ori); - - Standard_EXPORT void SameDomainOri (const TopoDS_Shape& S, const TopOpeBRepDS_Config Ori); - - Standard_EXPORT Standard_Integer SameDomainInd (const Standard_Integer I) const; - - Standard_EXPORT Standard_Integer SameDomainInd (const TopoDS_Shape& S) const; - - Standard_EXPORT void SameDomainInd (const Standard_Integer I, const Standard_Integer Ind); - - Standard_EXPORT void SameDomainInd (const TopoDS_Shape& S, const Standard_Integer Ind); - - Standard_EXPORT Standard_Integer AncestorRank (const Standard_Integer I) const; - - Standard_EXPORT Standard_Integer AncestorRank (const TopoDS_Shape& S) const; - - Standard_EXPORT void AncestorRank (const Standard_Integer I, const Standard_Integer Ianc); - - Standard_EXPORT void AncestorRank (const TopoDS_Shape& S, const Standard_Integer Ianc); - - Standard_EXPORT void AddShapeInterference (const TopoDS_Shape& S, const Handle(TopOpeBRepDS_Interference)& I); - - Standard_EXPORT void RemoveShapeInterference (const TopoDS_Shape& S, const Handle(TopOpeBRepDS_Interference)& I); - - Standard_EXPORT void FillShapesSameDomain (const TopoDS_Shape& S1, const TopoDS_Shape& S2); - - Standard_EXPORT void UnfillShapesSameDomain (const TopoDS_Shape& S1, const TopoDS_Shape& S2); - - Standard_EXPORT Standard_Integer NbShapes() const; - - //! returns the shape of index I stored the maps - Standard_EXPORT const TopoDS_Shape& Shape (const Standard_Integer I, const Standard_Boolean K = Standard_True) const; - - //! returns the index of shape , 0 if is not in the maps. - Standard_EXPORT Standard_Integer Shape (const TopoDS_Shape& S, const Standard_Boolean K = Standard_True) const; - - //! Returns True if has new geometries, i.e : - //! True if S is stored and has an interference list not empty - Standard_EXPORT Standard_Boolean HasGeometry (const TopoDS_Shape& S) const; - - //! Returns True if is stored in the maps - Standard_EXPORT Standard_Boolean HasShape (const TopoDS_Shape& S, const Standard_Boolean K = Standard_True) const; - - - - -protected: - - - - - -private: - - - - TopOpeBRepDS_DoubleMapOfIntegerShape myDMOIS; - Standard_Integer myNbDMOIS; - TopOpeBRepDS_MapOfIntegerShapeData myIMOSD; - TopOpeBRepDS_ListOfInterference myEmptyListOfInterference; - TopTools_ListOfShape myEmptyListOfShape; - TopoDS_Shape myEmptyShape; - - -}; - - - - - - - -#endif // _TopOpeBRepDS_DSS_HeaderFile diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.hxx index fbb5903ba6..56f7874317 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.hxx @@ -87,7 +87,6 @@ Standard_EXPORT Standard_Integer FUN_ds_hasI2d(const Standard_Integer EIX, const Standard_EXPORT void FUN_ds_PointToVertex(const Handle(TopOpeBRepDS_HDataStructure)& HDS); Standard_EXPORT Standard_Boolean FUN_ds_hasFEI(const TopOpeBRepDS_PDataStructure& pDS2d, const TopoDS_Shape& F, const Standard_Integer GI, const Standard_Integer ITRA); Standard_EXPORT Standard_Boolean FUN_ds_ONesd(const TopOpeBRepDS_DataStructure& BDS, const Standard_Integer IE, const TopoDS_Shape& EspON, Standard_Integer& IEsd); -Standard_EXPORT void FUN_ds_unkeepEVIonGb1(const Handle(TopOpeBRepDS_HDataStructure)& HDS, const TopAbs_State sta); Standard_EXPORT Standard_Boolean FDS_stateEwithF2d(const TopOpeBRepDS_DataStructure& BDS,const TopoDS_Edge& E,const Standard_Real pE, const TopOpeBRepDS_Kind KDS,const Standard_Integer GDS,const TopoDS_Face& F1, diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx index 32ee0d627f..78bc567a4d 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx @@ -63,9 +63,7 @@ public: //! Used by the previous one. Standard_EXPORT void AddAncestors (const TopoDS_Shape& S, const TopAbs_ShapeEnum T1, const TopAbs_ShapeEnum T2); - //! perform post processing of the DS. - Standard_EXPORT void Complete(); - + //! Check the integrity of the DS Standard_EXPORT void ChkIntg(); @@ -156,8 +154,6 @@ public: Standard_EXPORT void RemoveCurve (const Standard_Integer iC); - Standard_EXPORT void RemoveShape (const Standard_Integer iS); - Standard_EXPORT Standard_Integer NbGeometry (const TopOpeBRepDS_Kind K) const; Standard_EXPORT Standard_Integer NbTopology (const TopOpeBRepDS_Kind K) const; @@ -224,8 +220,6 @@ private: TopOpeBRepDS_DataStructure myDS; - Standard_Boolean myEdgesSameParameter; - TCollection_AsciiString myAscii; }; diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_repvg.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_repvg.hxx index 874cab9e3b..756c660877 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_repvg.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_repvg.hxx @@ -20,8 +20,6 @@ #include Standard_EXPORT void FDS_repvg (const TopOpeBRepDS_DataStructure& BDS,const Standard_Integer EIX,const TopOpeBRepDS_Kind GT,TopOpeBRepDS_ListOfInterference& LI,TopOpeBRepDS_ListOfInterference& reducedLI); -Standard_EXPORT void FDS_repvg1 -(const TopOpeBRepDS_DataStructure& BDS,const Standard_Integer EIX,const TopOpeBRepDS_Kind GT,TopOpeBRepDS_ListOfInterference& LI,TopOpeBRepDS_ListOfInterference& reducedLI); Standard_EXPORT void FDS_repvg2 (const TopOpeBRepDS_DataStructure& BDS,const Standard_Integer EIX,const TopOpeBRepDS_Kind GT,TopOpeBRepDS_ListOfInterference& LI,TopOpeBRepDS_ListOfInterference& reducedLI); #endif diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_samdom.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_samdom.hxx index bdec7d67e3..b1dd473f01 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_samdom.hxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_samdom.hxx @@ -22,7 +22,6 @@ Standard_EXPORT void FDSSDM_prepare(const Handle(TopOpeBRepDS_HDataStructure)&); Standard_EXPORT void FDSSDM_makes1s2(const TopoDS_Shape& S,TopTools_ListOfShape& L1,TopTools_ListOfShape& L2); Standard_EXPORT void FDSSDM_s1s2makesordor(const TopTools_ListOfShape& L1,const TopTools_ListOfShape& L2,const TopoDS_Shape& S,TopTools_ListOfShape& LSO,TopTools_ListOfShape& LDO); -Standard_EXPORT Standard_Boolean FDSSDM_hass1s2(const TopoDS_Shape& S); Standard_EXPORT void FDSSDM_s1s2(const TopoDS_Shape& S,TopTools_ListOfShape& LS1,TopTools_ListOfShape& LS2); Standard_EXPORT void FDSSDM_sordor(const TopoDS_Shape& S,TopTools_ListOfShape& LSO,TopTools_ListOfShape& LDO); Standard_EXPORT Standard_Boolean FDSSDM_contains(const TopoDS_Shape& S,const TopTools_ListOfShape& L); diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_2d.hxx b/src/TopOpeBRepTool/TopOpeBRepTool_2d.hxx index d11e6a177b..cea92798c4 100644 --- a/src/TopOpeBRepTool/TopOpeBRepTool_2d.hxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_2d.hxx @@ -32,5 +32,4 @@ Standard_EXPORT Handle(Geom2d_Curve) FC2D_CurveOnSurface(const TopoDS_Edge& E,co Standard_EXPORT Handle(Geom2d_Curve) FC2D_MakeCurveOnSurface(const TopoDS_Edge& E,const TopoDS_Face& F,Standard_Real& f,Standard_Real& l,Standard_Real& tol,const Standard_Boolean trim3d = Standard_False); Standard_EXPORT Handle(Geom2d_Curve) FC2D_EditableCurveOnSurface(const TopoDS_Edge& E,const TopoDS_Face& F,Standard_Real& f,Standard_Real& l,Standard_Real& tol,const Standard_Boolean trim3d = Standard_False); Standard_EXPORT Standard_Integer FC2D_AddNewCurveOnSurface(Handle(Geom2d_Curve) PC,const TopoDS_Edge& E,const TopoDS_Face& F,const Standard_Real& f,const Standard_Real& l,const Standard_Real& tol); -Standard_EXPORT Standard_Integer FC2D_RemNewCurveOnSurface(Handle(Geom2d_Curve) PC,const TopoDS_Edge& E,const TopoDS_Face& F); #endif diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.hxx b/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.hxx index c622c1de3c..04ec57ae17 100644 --- a/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.hxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.hxx @@ -103,7 +103,6 @@ Standard_EXPORT void FUN_tool_mkBnd2d(const TopoDS_Shape& W,const TopoDS_Shape& // ---------------------------------------------------------------------- Standard_EXPORT Standard_Boolean FUN_tool_IsClosingE(const TopoDS_Edge& E,const TopoDS_Shape& S,const TopoDS_Face& F); Standard_EXPORT Standard_Boolean FUN_tool_ClosingE(const TopoDS_Edge& E,const TopoDS_Wire& W,const TopoDS_Face& F); -Standard_EXPORT Standard_Boolean FUN_tool_ClosedE(const TopoDS_Edge& E,TopoDS_Shape& vclosing); // ---------------------------------------------------------------------- // shared topologies : diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.hxx b/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.hxx index d907252d54..40a5ef86d3 100644 --- a/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.hxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.hxx @@ -55,10 +55,6 @@ public: Standard_EXPORT Standard_Integer GetAllRest (TopTools_ListOfShape& lEi); - Standard_EXPORT Standard_Boolean Par (const Standard_Integer index, Standard_Real& pari) const; - - Standard_EXPORT Standard_Boolean Ei (const Standard_Integer index, TopoDS_Edge& ei) const; - Standard_EXPORT Standard_Boolean MkTonE (Standard_Integer& mkT, Standard_Real& par1, Standard_Real& par2); Standard_EXPORT Standard_Boolean MkTonE (const TopoDS_Edge& Ei, Standard_Integer& mkT, Standard_Real& par1, Standard_Real& par2);