From 54c20f308cbc36aa051185c8be99917c269f74f5 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 3 May 2011 13:37:59 +0000 Subject: [PATCH] Remove obsolete classes. --- src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx | 1 - src/GEOMAlgo/GEOMAlgo_Gluer1.cdl | 70 --- src/GEOMAlgo/GEOMAlgo_Gluer1.cxx | 541 -------------------- src/GEOMAlgo/GEOMAlgo_Gluer1.hxx | 125 ----- src/GEOMAlgo/GEOMAlgo_Gluer1.ixx | 24 - src/GEOMAlgo/GEOMAlgo_Gluer1.jxx | 25 - src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx | 6 +- src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx | 4 +- src/GEOMAlgo/Makefile.am | 5 - src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 39 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 4 +- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 1 - src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx | 2 - src/NMTTools/Makefile.am | 15 - src/NMTTools/NMTTools_DSFiller.cdl | 100 ---- src/NMTTools/NMTTools_DSFiller.cxx | 170 ------ src/NMTTools/NMTTools_DSFiller.hxx | 160 ------ src/NMTTools/NMTTools_DSFiller.ixx | 27 - src/NMTTools/NMTTools_DSFiller.jxx | 37 -- src/NMTTools/NMTTools_PCurveMaker.cdl | 57 --- src/NMTTools/NMTTools_PCurveMaker.cxx | 130 ----- src/NMTTools/NMTTools_PCurveMaker.hxx | 111 ---- src/NMTTools/NMTTools_PCurveMaker.ixx | 27 - src/NMTTools/NMTTools_PCurveMaker.jxx | 25 - src/NMTTools/NMTTools_PDSFiller.hxx | 30 -- 26 files changed, 22 insertions(+), 1716 deletions(-) delete mode 100755 src/GEOMAlgo/GEOMAlgo_Gluer1.cdl delete mode 100755 src/GEOMAlgo/GEOMAlgo_Gluer1.cxx delete mode 100644 src/GEOMAlgo/GEOMAlgo_Gluer1.hxx delete mode 100644 src/GEOMAlgo/GEOMAlgo_Gluer1.ixx delete mode 100644 src/GEOMAlgo/GEOMAlgo_Gluer1.jxx delete mode 100644 src/NMTTools/NMTTools_DSFiller.cdl delete mode 100644 src/NMTTools/NMTTools_DSFiller.cxx delete mode 100644 src/NMTTools/NMTTools_DSFiller.hxx delete mode 100644 src/NMTTools/NMTTools_DSFiller.ixx delete mode 100644 src/NMTTools/NMTTools_DSFiller.jxx delete mode 100644 src/NMTTools/NMTTools_PCurveMaker.cdl delete mode 100644 src/NMTTools/NMTTools_PCurveMaker.cxx delete mode 100644 src/NMTTools/NMTTools_PCurveMaker.hxx delete mode 100644 src/NMTTools/NMTTools_PCurveMaker.ixx delete mode 100644 src/NMTTools/NMTTools_PCurveMaker.jxx delete mode 100644 src/NMTTools/NMTTools_PDSFiller.hxx diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx index cafd30de6..c019f4108 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx @@ -58,7 +58,6 @@ #include #include -#include #include #include #include diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.cdl b/src/GEOMAlgo/GEOMAlgo_Gluer1.cdl deleted file mode 100755 index 98ce48732..000000000 --- a/src/GEOMAlgo/GEOMAlgo_Gluer1.cdl +++ /dev/null @@ -1,70 +0,0 @@ --- Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE --- --- This library is free software; you can redistribute it and/or --- modify it under the terms of the GNU Lesser General Public --- License as published by the Free Software Foundation; either --- version 2.1 of the License. --- --- This library is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --- Lesser General Public License for more details. --- --- You should have received a copy of the GNU Lesser General Public --- License along with this library; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --- --- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com --- - --- File: GEOMAlgo_Gluer1.cdl --- Created: Wed Jan 24 11:37:31 2007 --- Author: Peter KURNEV --- --- -class Gluer1 from GEOMAlgo - inherits Gluer from GEOMAlgo - - ---Purpose: - -uses - ListOfCoupleOfShapes from GEOMAlgo, - DataMapOfPassKeyShapeShape from GEOMAlgo - ---raises - -is - Create - returns Gluer1 from GEOMAlgo; - ---C++: alias "Standard_EXPORT virtual ~GEOMAlgo_Gluer1();" - - SetFacesToUnglue(me:out; - aLCS:ListOfCoupleOfShapes from GEOMAlgo); - - FacesToUnglue(me) - returns ListOfCoupleOfShapes from GEOMAlgo; - ---C++: return const& - - GluedFaces(me) - returns ListOfCoupleOfShapes from GEOMAlgo; - ---C++: return const& - - RejectedFaces(me) - returns ListOfCoupleOfShapes from GEOMAlgo; - ---C++: return const& - - Perform(me:out) - is redefined; - - UnglueFaces(me:out); - - FillGluedFaces(me:out) - is protected; - -fields - myGluedFaces :ListOfCoupleOfShapes from GEOMAlgo is protected; - myFacesToUnglue :ListOfCoupleOfShapes from GEOMAlgo is protected; - myRejectedFaces :ListOfCoupleOfShapes from GEOMAlgo is protected; - myMapGN :DataMapOfPassKeyShapeShape from GEOMAlgo is protected; - -end Gluer1; diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer1.cxx deleted file mode 100755 index b01e0802a..000000000 --- a/src/GEOMAlgo/GEOMAlgo_Gluer1.cxx +++ /dev/null @@ -1,541 +0,0 @@ -// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// File: GEOMAlgo_Gluer1.cxx -// Created: Wed Jan 24 11:52:27 2007 -// Author: Peter KURNEV -// -// -#include - -#include - -#include - -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -//======================================================================= -//class : GEOMAlgo_CoupleOfInteger -//purpose : -//======================================================================= -class GEOMAlgo_CoupleOfInteger { - // - public: - // - GEOMAlgo_CoupleOfInteger() { - myInt1=0; - myInt2=0; - } - // - ~GEOMAlgo_CoupleOfInteger() { - } - // - void SetValues(const Standard_Integer aI1, - const Standard_Integer aI2) { - myInt1=aI1; - myInt2=aI2; - } - // - void SetValue1(const Standard_Integer aI1) { - myInt1=aI1; - } - // - void SetValue2(const Standard_Integer aI1) { - myInt1=aI1; - } - // - void Values(Standard_Integer& aI1, - Standard_Integer& aI2) const { - aI1=myInt1; - aI2=myInt2; - } - // - Standard_Integer Value1()const { - return myInt1; - } - // - Standard_Integer Value2()const { - return myInt2; - } - // - protected: - Standard_Integer myInt1; - Standard_Integer myInt2; -}; -// -//======================================================================= -// -static - void SortShell(const Standard_Integer , - GEOMAlgo_CoupleOfInteger* ); -static - void RefineSolid(const TopoDS_Shape& , - const TopTools_DataMapOfShapeShape& , - TopTools_DataMapOfShapeShape& ); -static - void MakeFaceToReplace(const TopoDS_Face& , - TopoDS_Face& ); -// -//======================================================================= -//function : GEOMAlgo_Gluer1 -//purpose : -//======================================================================= - GEOMAlgo_Gluer1::GEOMAlgo_Gluer1() -: - GEOMAlgo_Gluer() -{ -} -//======================================================================= -//function : -//purpose : -//======================================================================= - GEOMAlgo_Gluer1::~GEOMAlgo_Gluer1() -{ -} -//======================================================================= -//function : SetFacesToUnglue -//purpose : -//======================================================================= - void GEOMAlgo_Gluer1::SetFacesToUnglue(const GEOMAlgo_ListOfCoupleOfShapes& aLCS) -{ - myFacesToUnglue=aLCS; -} -//======================================================================= -//function : FacesToUnglue -//purpose : -//======================================================================= - const GEOMAlgo_ListOfCoupleOfShapes& GEOMAlgo_Gluer1::FacesToUnglue()const -{ - return myFacesToUnglue; -} -//======================================================================= -//function : GluedFaces -//purpose : -//======================================================================= - const GEOMAlgo_ListOfCoupleOfShapes& GEOMAlgo_Gluer1::GluedFaces()const -{ - return myGluedFaces; -} -//======================================================================= -//function : RejectedFaces -//purpose : -//======================================================================= - const GEOMAlgo_ListOfCoupleOfShapes& GEOMAlgo_Gluer1::RejectedFaces()const -{ - return myRejectedFaces; -} -//======================================================================= -//function : Perform -//purpose : -//======================================================================= - void GEOMAlgo_Gluer1::Perform() -{ - // 1. - GEOMAlgo_Gluer::Perform(); - if (myErrorStatus) { - return; - } - // - FillGluedFaces(); - if (myErrorStatus) { - return; - } -} -//======================================================================= -//function : FillGluedFaces -//purpose : -//======================================================================= - void GEOMAlgo_Gluer1::FillGluedFaces() -{ - myErrorStatus=0; - // - Standard_Integer aNbIm, aNbS, i; - TopAbs_ShapeEnum aType; - TopTools_ListIteratorOfListOfShape aItLS; - TopTools_DataMapIteratorOfDataMapOfShapeListOfShape aItIm; - GEOMAlgo_CoupleOfShapes aCS; - GEOMAlgo_PassKeyShape aPKS; - // - myMapGN.Clear(); - myGluedFaces.Clear(); - // - aNbIm=myImages.Extent(); - aItIm.Initialize(myImages); - for (; aItIm.More(); aItIm.Next()) { - const TopoDS_Shape& aSnew=aItIm.Key(); - aType=aSnew.ShapeType(); - if (aType!=TopAbs_FACE) { - continue; - } - // - const TopTools_ListOfShape& aLS=aItIm.Value(); - aNbS=aLS.Extent(); - if (aNbS!=2) { - continue; - } - // - TopoDS_Shape aSold[2]; - aItLS.Initialize(aLS); - for (i=0; aItLS.More(); aItLS.Next(), ++i) { -// const TopoDS_Shape& aSi=aItLS.Value(); - aSold[i]=aItLS.Value(); - } - // - aCS.SetShapes(aSold[0], aSold[1]); - myGluedFaces.Append(aCS); - // - aPKS.Clear(); - aPKS.SetShapes(aSold[0], aSold[1]); - myMapGN.Bind(aPKS, aSnew); - } -} -//======================================================================= -//function : UnglueFaces -//purpose : -//======================================================================= - void GEOMAlgo_Gluer1::UnglueFaces() -{ - if (myErrorStatus) { - return; - } - // - Standard_Boolean bFound; - Standard_Integer i, aNbUN, aNbS, aNbF, iX; - TopTools_IndexedDataMapOfShapeListOfShape aMFSR, aMFS, aMSF; - TopTools_ListIteratorOfListOfShape aItLS, aItLS1; - GEOMAlgo_PassKeyShape aPKS; - GEOMAlgo_ListIteratorOfListOfCoupleOfShapes aItCS; - GEOMAlgo_DataMapOfPassKeyShapeShape aMapUN; - GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape aItUN; - GEOMAlgo_CoupleOfInteger *pIx; - // - if (myResult.IsNull()) { - myErrorStatus=200; // no result - return; - } - myWarningStatus=0; - myRejectedFaces.Clear(); - // - // 0. Fill map [Face]/Solid for myResult: aMFSR - TopExp::MapShapesAndAncestors(myResult, TopAbs_FACE, TopAbs_SOLID, aMFSR); - // - // 1. Fill Faces to process: aMapUN : [Fold1, Fold2] / Fnew - aNbUN=myFacesToUnglue.Extent(); - if (!aNbUN) { - // all faces that can be unglued will be unglued - aMapUN=myMapGN; - myFacesToUnglue=myGluedFaces; - } - else { - aItCS.Initialize(myFacesToUnglue); - for (; aItCS.More(); aItCS.Next()) { - const GEOMAlgo_CoupleOfShapes& aCS=aItCS.Value(); - const TopoDS_Shape& aS1=aCS.Shape1(); - const TopoDS_Shape& aS2=aCS.Shape2(); - aPKS.Clear(); - aPKS.SetShapes(aS1, aS2); - if (!myMapGN.IsBound(aPKS)) { - //some faces, wanted to unglue, are not glued at all; - myWarningStatus=2; - myRejectedFaces.Append(aCS); - continue; - } - // - const TopoDS_Shape& aFN=myMapGN.Find(aPKS); - aMapUN.Bind(aPKS, aFN); - } - } - // - // 2 Fill map FN/Solids for myResult: aMFS - aNbUN=aMapUN.Extent(); - aItUN.Initialize(aMapUN); - for (; aItUN.More(); aItUN.Next()) { - const TopoDS_Shape& aFN=aItUN.Value(); - if (!aMFSR.Contains(aFN)) { - myWarningStatus=3; // how can it be - continue; - } - // - const TopTools_ListOfShape& aLS=aMFSR.FindFromKey(aFN); - aNbS=aLS.Extent(); - if (aNbS!=2) { - // wrong result: More than 2 solids shared one face - myWarningStatus=4; - continue; - } - aMFS.Add(aFN, aLS); - } - // - // 3 Fill map Solids/FN for myResult: aMSF - aNbUN=aMFS.Extent(); - for (i=1; i<=aNbUN; ++i) { - const TopoDS_Shape& aFN=aMFS.FindKey(i); - const TopTools_ListOfShape& aLS=aMFS(i); - aItLS.Initialize(aLS); - for (; aItLS.More(); aItLS.Next()) { - const TopoDS_Shape& aS=aItLS.Value(); - if (aMSF.Contains(aS)) { - TopTools_ListOfShape& aLF=aMSF.ChangeFromKey(aS); - aLF.Append(aFN); - } - else { - TopTools_ListOfShape aLF; - aLF.Append(aFN); - aMSF.Add(aS, aLF); - } - } - } - // - // 4 Sort indices of aMSF - aNbS=aMSF.Extent(); - if (aNbS<2) { - // wrong number of solids that have shared face - myWarningStatus=5; - } - // - pIx=new GEOMAlgo_CoupleOfInteger[aNbS]; - // - for (i=1; i<=aNbS; ++i) { - const TopTools_ListOfShape& aLF=aMSF(i); - aNbF=aLF.Extent(); - pIx[i-1].SetValues(aNbF, i); - } - SortShell(aNbS, pIx); - // - // 5 Refine solids - // - TopTools_DataMapOfShapeShape aMFNFN2, aMFNFD; - TopTools_DataMapIteratorOfDataMapOfShapeShape aItMSS; - TopTools_MapOfShape aMFNP; - TopTools_IndexedMapOfShape aMFD; - // - for (iX=aNbS-1; iX>=0; --iX) { - i=pIx[iX].Value2(); - // solid from myResult aSN - const TopoDS_Shape& aSN=aMSF.FindKey(i); - // - // candidates to be faces to replace for aSN - const TopTools_ListOfShape& aLFN=aMSF(i); - aNbF=aLFN.Extent(); - // - // original solid for aSN -> aSD - const TopTools_ListOfShape& aLSD=myImages.Find(aSN); - const TopoDS_Shape& aSD=aLSD.First(); - // - // faces of original solid -> aMFD - aMFD.Clear(); - TopExp::MapShapes(aSD, TopAbs_FACE, aMFD); - // - // faces to replace for aSN [FN]/FD -> aMFNFD - aMFNFD.Clear(); - aItLS.Initialize(aLFN); - for (; aItLS.More(); aItLS.Next()) { - const TopoDS_Shape& aFN=aItLS.Value(); - if (!aMFNP.Add(aFN)) { - continue; - } - // - // original face from original solid -> FD - TopoDS_Shape aFD; - // - bFound=Standard_False; - const TopTools_ListOfShape& aLFD=myImages.Find(aFN); - aItLS1.Initialize(aLFD); - for (; aItLS1.More(); aItLS1.Next()) { - const TopoDS_Shape& aFDx=aItLS1.Value(); - if (aMFD.Contains(aFDx)) { - aFD=aFDx; - bFound=Standard_True; - break; - } - } - //if (!bFound) {...} - aMFNFD.Bind(aFN, aFD); - } // for (; aItLS.More(); aItLS.Next()) { - // - aNbF=aMFNFD.Extent(); - if (!aNbF) { - // nothing to do here - continue; - } - // update solid SN (and its shells) - RefineSolid(aSN, aMFNFD, aMFNFN2); - // - // update myOrigins / myImages - aItMSS.Initialize(aMFNFD); - for (; aItMSS.More(); aItMSS.Next()) { - const TopoDS_Shape& aFN=aItMSS.Key(); // face removed from aSN - const TopoDS_Shape& aFD=aItMSS.Value(); // old face from aSD - const TopoDS_Shape& aFN2=aMFNFN2.Find(aFN);// face added to aSN - // - // myOrigins - myOrigins.ChangeFind(aFD)=aFN2; - // - // myImages - TopTools_ListOfShape aLFDx; - // - TopTools_ListOfShape& aLFD=myImages.ChangeFind(aFN); - aItLS.Initialize(aLFD); - for (; aItLS.More(); aItLS.Next()) { - const TopoDS_Shape& aFDx=aItLS.Value(); - if (!aFDx.IsSame(aFD)) { - aLFDx.Append(aFDx); - } - } - aLFD=aLFDx; - // - aLFDx.Clear(); - aLFDx.Append(aFD); - myImages.Bind(aFN2, aLFDx); - } // for (; aItMSS.More(); aItMSS.Next()) { - } // for (iX=aNbS-1; iX>=0; --iX) { - // - delete [] pIx; -} -//======================================================================= -// function: RefineSolid -// purpose : replace faces (aMFN) of solid aSd by new ones -//======================================================================= -void RefineSolid(const TopoDS_Shape& aSd, - const TopTools_DataMapOfShapeShape& aMFNFD, - TopTools_DataMapOfShapeShape& aMFNFN2) -{ - TopoDS_Shape *pSh; - TopoDS_Face aF2; - TopoDS_Iterator aItSd, aItSh; - BRep_Builder aBB; - TopTools_ListOfShape aLF; - TopTools_ListIteratorOfListOfShape aItLF; - // - aItSd.Initialize(aSd); - for (; aItSd.More(); aItSd.Next()) { - const TopoDS_Shape& aSh=aItSd.Value(); - pSh=(TopoDS_Shape *)&aSh; - pSh->Free(Standard_True); - aLF.Clear(); - aItSh.Initialize(*pSh); - for (; aItSh.More(); aItSh.Next()) { - const TopoDS_Shape& aF=aItSh.Value(); - if (aMFNFD.IsBound(aF)) { - aLF.Append(aF); - } - } - // - aItLF.Initialize(aLF); - for (; aItLF.More(); aItLF.Next()) { - const TopoDS_Face& aF=TopoDS::Face(aItLF.Value()); - // - MakeFaceToReplace(aF, aF2); - // - aMFNFN2.Bind(aF, aF2); - aBB.Remove(*pSh, aF); - aBB.Add(*pSh, aF2); - } - pSh->Free(Standard_False); - } -} -//======================================================================= -//function : MakeFaceToReplace -//purpose : -//======================================================================= -void MakeFaceToReplace(const TopoDS_Face& aF, - TopoDS_Face& aFR) -{ - Standard_Real aTol; - Handle(Geom_Surface) aS; - TopLoc_Location aLoc; - TopoDS_Face aFFWD, aFnew; - TopoDS_Iterator aItF; - BRep_Builder aBB; - // - aFFWD=aF; - aFFWD.Orientation(TopAbs_FORWARD); - aS=BRep_Tool::Surface(aFFWD, aLoc); - aTol=BRep_Tool::Tolerance(aFFWD); - // - aBB.MakeFace (aFnew, aS, aLoc, aTol); - aItF.Initialize(aFFWD); - for (; aItF.More(); aItF.Next()) { - const TopoDS_Shape& aW=aItF.Value(); - aBB.Add(aFnew, aW); - } - aFnew.Orientation(aF.Orientation()); - aFR=aFnew; -} -//======================================================================= -// function: SortShell -// purpose : -//======================================================================= -void SortShell(const Standard_Integer n, - GEOMAlgo_CoupleOfInteger* a) -{ - Standard_Integer nd, i, j, l, d=1; - GEOMAlgo_CoupleOfInteger x; - // - while(d<=n) { - d*=2; - } - // - while (d) { - d=(d-1)/2; - // - nd=n-d; - for (i=0; i -1) { - goto m30; - } - }//if (a[l] < a[j]){ - }//for (i=0; i -#endif -#ifndef _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile -#include -#endif -#ifndef _GEOMAlgo_Gluer_HeaderFile -#include -#endif -class GEOMAlgo_ListOfCoupleOfShapes; - - -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - - -class GEOMAlgo_Gluer1 : public GEOMAlgo_Gluer { - -public: - - void* operator new(size_t,void* anAddress) - { - return anAddress; - } - void* operator new(size_t size) - { - return Standard::Allocate(size); - } - void operator delete(void *anAddress) - { - if (anAddress) Standard::Free((Standard_Address&)anAddress); - } - // Methods PUBLIC - // - - -Standard_EXPORT GEOMAlgo_Gluer1(); -Standard_EXPORT virtual ~GEOMAlgo_Gluer1(); - - -Standard_EXPORT void SetFacesToUnglue(const GEOMAlgo_ListOfCoupleOfShapes& aLCS) ; - - -Standard_EXPORT const GEOMAlgo_ListOfCoupleOfShapes& FacesToUnglue() const; - - -Standard_EXPORT const GEOMAlgo_ListOfCoupleOfShapes& GluedFaces() const; - - -Standard_EXPORT const GEOMAlgo_ListOfCoupleOfShapes& RejectedFaces() const; - - -Standard_EXPORT virtual void Perform() ; - - -Standard_EXPORT void UnglueFaces() ; - - - - - -protected: - - // Methods PROTECTED - // - - -Standard_EXPORT void FillGluedFaces() ; - - - // Fields PROTECTED - // -GEOMAlgo_ListOfCoupleOfShapes myGluedFaces; -GEOMAlgo_ListOfCoupleOfShapes myFacesToUnglue; -GEOMAlgo_ListOfCoupleOfShapes myRejectedFaces; -GEOMAlgo_DataMapOfPassKeyShapeShape myMapGN; - - -private: - - // Methods PRIVATE - // - - - // Fields PRIVATE - // - - -}; - - - - - -// other Inline functions and methods (like "C++: function call" methods) -// - - -#endif diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.ixx b/src/GEOMAlgo/GEOMAlgo_Gluer1.ixx deleted file mode 100644 index aeafa668d..000000000 --- a/src/GEOMAlgo/GEOMAlgo_Gluer1.ixx +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include - - - - diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.jxx b/src/GEOMAlgo/GEOMAlgo_Gluer1.jxx deleted file mode 100644 index 7ea906208..000000000 --- a/src/GEOMAlgo/GEOMAlgo_Gluer1.jxx +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile -#include -#endif -#ifndef _GEOMAlgo_Gluer1_HeaderFile -#include -#endif diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx index 44524b33f..8461be561 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx @@ -224,9 +224,9 @@ void GEOMAlgo_Gluer2::MakeEdge(const TopoDS_Edge& aE, Standard_Real aTol; BRep_Builder aBB; TopoDS_Edge E; - TopAbs_Orientation anOrE; + //TopAbs_Orientation anOrE; // - anOrE=aE.Orientation(); + //anOrE=aE.Orientation(); aTol=BRep_Tool::Tolerance(aE); // E=aEx; @@ -294,7 +294,7 @@ void GEOMAlgo_Gluer2::MakeVertex(const TopTools_ListOfShape& aLV, void GEOMAlgo_Gluer2::MapBRepShapes(const TopoDS_Shape& aS, TopTools_MapOfShape& aM) { - Standard_Boolean bHasBRep; + //Standard_Boolean bHasBRep; TopAbs_ShapeEnum aType; TopoDS_Iterator aIt; // diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx index 6f026158d..1769ed4fe 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx @@ -40,7 +40,7 @@ //======================================================================= void GEOMAlgo_Gluer2::PrepareHistory() { - Standard_Boolean bHasImage, bContainsSD; + //Standard_Boolean bHasImage, bContainsSD; // // 1. Clearing GEOMAlgo_BuilderShape::PrepareHistory(); diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx index 51b45136d..ed26ef688 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx @@ -155,7 +155,7 @@ void GEOMAlgo_Gluer2::PerformShapesToWork() // 1. Make pairs aItDMSLS.Initialize(myShapesToGlue); for (; aItDMSLS.More(); aItDMSLS.Next()) { - const TopoDS_Shape& aSkey=aItDMSLS.Key(); + //const TopoDS_Shape& aSkey=aItDMSLS.Key(); const TopTools_ListOfShape& aLSG=aItDMSLS.Value(); aItLS1.Initialize(aLSG); for (i=0; aItLS1.More(); aItLS1.Next(), ++i) { @@ -309,7 +309,7 @@ void GEOMAlgo_Gluer2::TreatPair(const NMTTools_CoupleOfShape& aCS, // 3. aItDMSLS.Initialize(aDMSLS); for (; aItDMSLS.More(); aItDMSLS.Next()) { - const TopoDS_Shape& aSkey=aItDMSLS.Key(); + //const TopoDS_Shape& aSkey=aItDMSLS.Key(); const TopTools_ListOfShape& aLS=aItDMSLS.Value(); aNbS=aLS.Extent(); if (aNbS!=2) { diff --git a/src/GEOMAlgo/Makefile.am b/src/GEOMAlgo/Makefile.am index a53a161b6..13de1448f 100644 --- a/src/GEOMAlgo/Makefile.am +++ b/src/GEOMAlgo/Makefile.am @@ -81,7 +81,6 @@ dist_libGEOMAlgo_la_SOURCES = \ GEOMAlgo_Gluer2_2.cxx \ GEOMAlgo_Gluer2_3.cxx \ GEOMAlgo_GluerAlgo.cxx \ - GEOMAlgo_Gluer1.cxx \ GEOMAlgo_HAlgo.cxx \ GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx \ GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx \ @@ -223,9 +222,6 @@ salomeinclude_HEADERS = \ GEOMAlgo_Gluer.hxx \ GEOMAlgo_Gluer.ixx \ GEOMAlgo_Gluer.jxx \ - GEOMAlgo_Gluer1.hxx \ - GEOMAlgo_Gluer1.ixx \ - GEOMAlgo_Gluer1.jxx \ GEOMAlgo_GlueDetector.hxx \ GEOMAlgo_Gluer2.hxx \ GEOMAlgo_GluerAlgo.hxx \ @@ -381,7 +377,6 @@ CDL_FILES = \ GEOMAlgo_FinderShapeOn2.cdl \ GEOMAlgo_GlueAnalyser.cdl \ GEOMAlgo_Gluer.cdl \ - GEOMAlgo_Gluer1.cdl \ GEOMAlgo_HAlgo.cdl \ GEOMAlgo_PassKey.cdl \ GEOMAlgo_PassKeyMapHasher.cdl \ diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index d80125d35..053a13bf7 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #include @@ -37,7 +36,7 @@ #include #include -#include +//#include #include #include "utilities.h" @@ -436,7 +435,6 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const BRepTools_Quilt Glue; if (aType == BLOCK_SIX_FACES) { - // Make block (hexahedral solid) from six faces for (Standard_Integer ind = 1; ind <= nbshapes; ind++) { if (anArgs(ind).ShapeType() != TopAbs_FACE) { @@ -445,8 +443,8 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const Glue.Add(anArgs(ind)); } - } else { - + } + else { // Make block (hexahedral solid) from two opposite faces if (anArgs(1).ShapeType() != TopAbs_FACE || anArgs(2).ShapeType() != TopAbs_FACE) { @@ -530,9 +528,8 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const } aShape = Sol; BRepLib::SameParameter(aShape, 1.E-5, Standard_True); - - } else if (aType == BLOCK_COMPOUND_GLUE) { - + } + else if (aType == BLOCK_COMPOUND_GLUE) { // Make blocks compound from a compound if (anArgs(1).ShapeType() != TopAbs_COMPOUND && anArgs(2).ShapeType() != TopAbs_COMPSOLID) { @@ -541,23 +538,15 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const TopoDS_Shape aCompound = anArgs(1); - // Glue coincident faces and edges (with Partition algorithm). - //NMTAlgo_Splitter1 PS; - //PS.AddShape(aCompound); - //PS.Compute(); - //PS.SetRemoveWebs(Standard_False); - // PS.Build(aCompound.ShapeType()); - //PS.Build(TopAbs_SOLID); - //aShape = PS.Shape(); - - GEOMAlgo_Gluer aGluer; - aGluer.SetShape(aCompound); - aGluer.SetCheckGeometry(Standard_True); - aGluer.Perform(); - aShape = aGluer.Result(); - - - } else { + // Glue coincident faces and edges + aShape = GEOMImpl_GlueDriver::GlueFaces(aCompound, Precision::Confusion(), Standard_True); + //GEOMAlgo_Gluer aGluer; + //aGluer.SetShape(aCompound); + //aGluer.SetCheckGeometry(Standard_True); + //aGluer.Perform(); + //aShape = aGluer.Result(); + } + else { } } else { // Multi-transformations and compound improving diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index 342866ea8..11ceaa125 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -28,8 +28,8 @@ #include #include -#include -#include "GEOMAlgo_Gluer1.hxx" +//#include +//#include "GEOMAlgo_Gluer1.hxx" #include "GEOMAlgo_Gluer2.hxx" #include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx" #include "GEOMAlgo_CoupleOfShapes.hxx" diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 31f7006fb..0bf2dd69a 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -50,7 +50,6 @@ #include "GEOMAlgo_FinderShapeOn2.hxx" #include "GEOMAlgo_ClsfBox.hxx" #include "GEOMAlgo_ClsfSolid.hxx" -#include "GEOMAlgo_Gluer1.hxx" #include "GEOMAlgo_GlueDetector.hxx" #include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx" #include "GEOMAlgo_CoupleOfShapes.hxx" diff --git a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx index 05e83c04a..e08e876b6 100644 --- a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx @@ -15,7 +15,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #include @@ -30,7 +29,6 @@ #include "GEOMAlgo_FinderShapeOn1.hxx" #include "GEOMAlgo_FinderShapeOn2.hxx" #include -#include #include #include diff --git a/src/NMTTools/Makefile.am b/src/NMTTools/Makefile.am index 1da8aedac..b2edcdfd2 100644 --- a/src/NMTTools/Makefile.am +++ b/src/NMTTools/Makefile.am @@ -159,18 +159,3 @@ CDL_FILES = \ NMTTools_Tools.cdl EXTRA_DIST += $(CDL_FILES) - -######################################## -# Non-used (obsolete?) files -######################################## -# NMTTools_PCurveMaker.cdl -# NMTTools_PCurveMaker.cxx -# NMTTools_PCurveMaker.hxx -# NMTTools_PCurveMaker.ixx -# NMTTools_PCurveMaker.jxx -# NMTTools_PDSFiller.hxx -# NMTTools_DSFiller.cdl -# NMTTools_DSFiller.cxx -# NMTTools_DSFiller.hxx -# NMTTools_DSFiller.ixx -# NMTTools_DSFiller.jxx diff --git a/src/NMTTools/NMTTools_DSFiller.cdl b/src/NMTTools/NMTTools_DSFiller.cdl deleted file mode 100644 index 4795de65d..000000000 --- a/src/NMTTools/NMTTools_DSFiller.cdl +++ /dev/null @@ -1,100 +0,0 @@ --- 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 library is free software; you can redistribute it and/or --- modify it under the terms of the GNU Lesser General Public --- License as published by the Free Software Foundation; either --- version 2.1 of the License. --- --- This library is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --- Lesser General Public License for more details. --- --- You should have received a copy of the GNU Lesser General Public --- License along with this library; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --- --- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com --- - --- File: NMTTools_DSFiller.cdl --- Created: Fri Dec 5 13:57:03 2003 --- Author: Peter KURNEV --- --- -class DSFiller from NMTTools - - ---Purpose: - -uses - Shape from TopoDS, - InterferencePool from BOPTools, - PInterferencePool from BOPTools, - ShapesDataStructure from NMTDS, - PShapesDataStructure from NMTDS, - PPaveFiller from NMTTools, - PaveFiller from NMTTools ---raises - -is - Create - returns DSFiller from NMTTools; - - Destroy (me:out); - ---C++: alias ~ - ---Purpose: Destructor - -- - -- Selectors/Modifiers - SetCompositeShape (me:out; - aS: Shape from TopoDS); - - CompositeShape(me) - returns Shape from TopoDS; - ---C++: return const& - - SetNewFiller(me; - aFlag:Boolean from Standard); - - IsNewFiller(me) - returns Boolean from Standard; - -- - -- Perform the algo - Perform (me:out); - -- - -- Protected section - Clear (me:out) - is protected; - -- - -- Query section - DS (me) - returns ShapesDataStructure from NMTDS; - ---C++: return const & - - InterfPool (me) - returns InterferencePool from BOPTools; - ---C++: return const & - - IsDone(me) - returns Boolean from Standard; - - PaveFiller(me) - returns PaveFiller from NMTTools; - ---C++: return const & - - ChangePaveFiller (me:out) - returns PaveFiller from NMTTools; - ---C++: return & - -fields - myCompositeShape : Shape from TopoDS is protected; - myDS : PShapesDataStructure from NMTDS is protected; - myInterfPool : PInterferencePool from BOPTools is protected; - myPaveFiller : PPaveFiller from NMTTools is protected; - - myIsDone : Boolean from Standard is protected; - myIsNewFiller : Boolean from Standard is protected; - -end DSFiller; diff --git a/src/NMTTools/NMTTools_DSFiller.cxx b/src/NMTTools/NMTTools_DSFiller.cxx deleted file mode 100644 index a7c075170..000000000 --- a/src/NMTTools/NMTTools_DSFiller.cxx +++ /dev/null @@ -1,170 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// File: NMTTools_DSFiller.cxx -// Created: Fri Dec 5 14:06:34 2003 -// Author: Peter KURNEV -// -// -#include -#include - -//======================================================================= -// function: NMTTools_DSFiller::NMTTools_DSFiller -// purpose: -//======================================================================= - NMTTools_DSFiller::NMTTools_DSFiller() -{ - myPaveFiller=NULL; - myInterfPool=NULL; - myDS=NULL; - myIsNewFiller=Standard_True; - myIsDone=Standard_False; -} -//======================================================================= -// function:Destroy -// purpose: -//======================================================================= - void NMTTools_DSFiller::Destroy() -{ - Clear(); -} -//======================================================================= -// function: Clear -// purpose: -//======================================================================= - void NMTTools_DSFiller::Clear() -{ - if (myPaveFiller!=NULL) { - delete myPaveFiller; - } - if (myInterfPool!=NULL) { - delete myInterfPool; - } - if (myDS!=NULL) { - delete myDS; - } - myPaveFiller=NULL; - myInterfPool=NULL; - myDS=NULL; -} -//======================================================================= -// function: SetCompositeShape -// purpose: -//======================================================================= - void NMTTools_DSFiller::SetCompositeShape(const TopoDS_Shape& aS) -{ - myCompositeShape=aS; -} -//======================================================================= -// function: CompositeShape -// purpose: -//======================================================================= - const TopoDS_Shape& NMTTools_DSFiller::CompositeShape()const -{ - return myCompositeShape; -} -//======================================================================= -// function: SetNewFiller -// purpose: -//======================================================================= - void NMTTools_DSFiller::SetNewFiller(const Standard_Boolean aFlag) const -{ - NMTTools_DSFiller* pDSFiller=(NMTTools_DSFiller*)this; - pDSFiller->myIsNewFiller=aFlag; -} -//======================================================================= -// function: IsNewFiller -// purpose: -//======================================================================= - Standard_Boolean NMTTools_DSFiller::IsNewFiller() const -{ - return myIsNewFiller; -} -//======================================================================= -// function: DS -// purpose: -//======================================================================= - const NMTDS_ShapesDataStructure& NMTTools_DSFiller::DS () const -{ - return *myDS; -} -//======================================================================= -// function: InterfPool -// purpose: -//======================================================================= - const BOPTools_InterferencePool& NMTTools_DSFiller::InterfPool () const -{ - return *myInterfPool; -} -//======================================================================= -// function: IsDone -// purpose: -//======================================================================= - Standard_Boolean NMTTools_DSFiller::IsDone()const -{ - return myIsDone; -} -//======================================================================= -// function: PaveFiller -// purpose: -//======================================================================= - const NMTTools_PaveFiller& NMTTools_DSFiller::PaveFiller()const -{ - return *myPaveFiller; -} -//======================================================================= -// function: ChangePaveFiller -// purpose: -//======================================================================= - NMTTools_PaveFiller& NMTTools_DSFiller::ChangePaveFiller() -{ - return *myPaveFiller; -} -//======================================================================= -// function: Perform -// purpose: -//======================================================================= - void NMTTools_DSFiller::Perform() -{ - myIsDone=Standard_False; - // - if (myCompositeShape.IsNull()) { - return; - } - // - // - // Clear contents of the DS if it was before - Clear(); - // - myIsNewFiller=Standard_True; - // - myDS = new NMTDS_ShapesDataStructure; - myDS->SetCompositeShape(myCompositeShape); - myDS->Init(); - // - myInterfPool= new BOPTools_InterferencePool (*myDS); - // - myPaveFiller = new NMTTools_PaveFiller(*myInterfPool); - myPaveFiller->Perform(); - myIsDone=myPaveFiller->IsDone(); -} diff --git a/src/NMTTools/NMTTools_DSFiller.hxx b/src/NMTTools/NMTTools_DSFiller.hxx deleted file mode 100644 index 9925b686a..000000000 --- a/src/NMTTools/NMTTools_DSFiller.hxx +++ /dev/null @@ -1,160 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _NMTTools_DSFiller_HeaderFile -#define _NMTTools_DSFiller_HeaderFile - -#ifndef _TopoDS_Shape_HeaderFile -#include -#endif -#ifndef _NMTDS_PShapesDataStructure_HeaderFile -#include -#endif -#ifndef _BOPTools_PInterferencePool_HeaderFile -#include -#endif -#ifndef _NMTTools_PPaveFiller_HeaderFile -#include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -class TopoDS_Shape; -class NMTDS_ShapesDataStructure; -class BOPTools_InterferencePool; -class NMTTools_PaveFiller; - - -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - - -class NMTTools_DSFiller { - -public: - - void* operator new(size_t,void* anAddress) - { - return anAddress; - } - void* operator new(size_t size) - { - return Standard::Allocate(size); - } - void operator delete(void *anAddress) - { - if (anAddress) Standard::Free((Standard_Address&)anAddress); - } - // Methods PUBLIC - // - - -Standard_EXPORT NMTTools_DSFiller(); - -//! Destructor
-//!
-//! Selectors/Modifiers
-Standard_EXPORT void Destroy() ; -~NMTTools_DSFiller() -{ - Destroy(); -} - - - -Standard_EXPORT void SetCompositeShape(const TopoDS_Shape& aS) ; - - -Standard_EXPORT const TopoDS_Shape& CompositeShape() const; - - -Standard_EXPORT void SetNewFiller(const Standard_Boolean aFlag) const; - - -Standard_EXPORT Standard_Boolean IsNewFiller() const; - - -Standard_EXPORT void Perform() ; - - -Standard_EXPORT const NMTDS_ShapesDataStructure& DS() const; - - -Standard_EXPORT const BOPTools_InterferencePool& InterfPool() const; - - -Standard_EXPORT Standard_Boolean IsDone() const; - - -Standard_EXPORT const NMTTools_PaveFiller& PaveFiller() const; - - -Standard_EXPORT NMTTools_PaveFiller& ChangePaveFiller() ; - - - - - -protected: - - // Methods PROTECTED - // - - -Standard_EXPORT void Clear() ; - - - // Fields PROTECTED - // -TopoDS_Shape myCompositeShape; -NMTDS_PShapesDataStructure myDS; -BOPTools_PInterferencePool myInterfPool; -NMTTools_PPaveFiller myPaveFiller; -Standard_Boolean myIsDone; -Standard_Boolean myIsNewFiller; - - -private: - - // Methods PRIVATE - // - - - // Fields PRIVATE - // - - -}; - - - - - -// other Inline functions and methods (like "C++: function call" methods) -// - - -#endif diff --git a/src/NMTTools/NMTTools_DSFiller.ixx b/src/NMTTools/NMTTools_DSFiller.ixx deleted file mode 100644 index cfa7700a5..000000000 --- a/src/NMTTools/NMTTools_DSFiller.ixx +++ /dev/null @@ -1,27 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include - - - - diff --git a/src/NMTTools/NMTTools_DSFiller.jxx b/src/NMTTools/NMTTools_DSFiller.jxx deleted file mode 100644 index c5b0d2e06..000000000 --- a/src/NMTTools/NMTTools_DSFiller.jxx +++ /dev/null @@ -1,37 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _TopoDS_Shape_HeaderFile -#include -#endif -#ifndef _NMTDS_ShapesDataStructure_HeaderFile -#include -#endif -#ifndef _BOPTools_InterferencePool_HeaderFile -#include -#endif -#ifndef _NMTTools_PaveFiller_HeaderFile -#include -#endif -#ifndef _NMTTools_DSFiller_HeaderFile -#include -#endif diff --git a/src/NMTTools/NMTTools_PCurveMaker.cdl b/src/NMTTools/NMTTools_PCurveMaker.cdl deleted file mode 100644 index 92f59bde9..000000000 --- a/src/NMTTools/NMTTools_PCurveMaker.cdl +++ /dev/null @@ -1,57 +0,0 @@ --- 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 library is free software; you can redistribute it and/or --- modify it under the terms of the GNU Lesser General Public --- License as published by the Free Software Foundation; either --- version 2.1 of the License. --- --- This library is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --- Lesser General Public License for more details. --- --- You should have received a copy of the GNU Lesser General Public --- License along with this library; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --- --- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com --- - --- File: NMTTools_PCurveMaker.cdl --- Created: --- Author: Peter KURNEV --- --- -class PCurveMaker from NMTTools - - ---Purpose: - -- Class provides computation p-curves for the edges and theirs - --- split parts - -uses - PDSFiller from NMTTools - -is - Create (aFiller:out PDSFiller from NMTTools) - returns PCurveMaker from NMTTools; - ---Purpose: - --- Constructor - --- - Do(me:out); - ---Purpose: - --- Launch the processor - --- - IsDone(me) - returns Boolean from Standard; - ---Purpose: - --- Returns TRUE if Ok - --- - -fields - myDSFiller: PDSFiller from NMTTools is protected; - myIsDone : Boolean from Standard is protected; - -end PCurveMaker; diff --git a/src/NMTTools/NMTTools_PCurveMaker.cxx b/src/NMTTools/NMTTools_PCurveMaker.cxx deleted file mode 100644 index fef473ca7..000000000 --- a/src/NMTTools/NMTTools_PCurveMaker.cxx +++ /dev/null @@ -1,130 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// File: NMTTools_PCurveMaker.cxx -// Created: -// Author: Peter KURNEV -// -// -#include - -#include - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - - -//======================================================================= -// function: NMTTools_PCurveMaker -// purpose: -//======================================================================= - NMTTools_PCurveMaker::NMTTools_PCurveMaker(NMTTools_PDSFiller& pDSFiller) -: - myIsDone(Standard_False) -{ - myDSFiller=pDSFiller; -} -//======================================================================= -// function: IsDone -// purpose: -//======================================================================= - Standard_Boolean NMTTools_PCurveMaker::IsDone() const -{ - return myIsDone; -} -//======================================================================= -// function: Do -// purpose: -//======================================================================= - void NMTTools_PCurveMaker::Do() -{ - Standard_Integer i, aNb, nF1, nF2, nE; - BOPTools_ListIteratorOfListOfPaveBlock anIt; - TopoDS_Face aF1FWD, aF2FWD; - // - NMTTools_PaveFiller *pFiller=(NMTTools_PaveFiller*) &(myDSFiller->PaveFiller()); - NMTDS_ShapesDataStructure *pDS=pFiller->DS(); - // - BOPTools_CArray1OfSSInterference& aFFs=(pFiller->InterfPool())->SSInterferences(); - // - aNb=aFFs.Extent(); - for (i=1; i<=aNb; ++i) { - BOPTools_SSInterference& aFF=aFFs(i); - // Faces - aFF.Indices(nF1, nF2); - const TopoDS_Face& aF1=TopoDS::Face(pDS->Shape(nF1)); - const TopoDS_Face& aF2=TopoDS::Face(pDS->Shape(nF2)); - // - // 1.Forwarding the Faces - aF1FWD=aF1; - aF1FWD.Orientation(TopAbs_FORWARD); - aF2FWD=aF2; - aF2FWD.Orientation(TopAbs_FORWARD); - // - // 2. In, On parts processing - const BOPTools_ListOfPaveBlock& aLPBInOn=aFF.PaveBlocks(); - anIt.Initialize(aLPBInOn); - for (; anIt.More(); anIt.Next()) { - const BOPTools_PaveBlock& aPB=anIt.Value(); - const BOPTools_PaveBlock& aPBInOn=pFiller->RealPaveBlock(aPB); - // - nE=aPBInOn.Edge(); - const TopoDS_Edge& aE=TopoDS::Edge(pDS->Shape(nE)); - - BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aE, aF1FWD); - BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aE, aF2FWD); - } - } // for (i=1; i<=aNb; i++) - myIsDone=Standard_True; -} - diff --git a/src/NMTTools/NMTTools_PCurveMaker.hxx b/src/NMTTools/NMTTools_PCurveMaker.hxx deleted file mode 100644 index fba175ef5..000000000 --- a/src/NMTTools/NMTTools_PCurveMaker.hxx +++ /dev/null @@ -1,111 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _NMTTools_PCurveMaker_HeaderFile -#define _NMTTools_PCurveMaker_HeaderFile - -#ifndef _NMTTools_PDSFiller_HeaderFile -#include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif - - -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - - -//! Class provides computation p-curves for the edges and theirs
-//! split parts
-class NMTTools_PCurveMaker { - -public: - - void* operator new(size_t,void* anAddress) - { - return anAddress; - } - void* operator new(size_t size) - { - return Standard::Allocate(size); - } - void operator delete(void *anAddress) - { - if (anAddress) Standard::Free((Standard_Address&)anAddress); - } - // Methods PUBLIC - // - - -//! Constructor
-Standard_EXPORT NMTTools_PCurveMaker(NMTTools_PDSFiller& aFiller); - - -//! Launch the processor
-Standard_EXPORT void Do() ; - - -//! Returns TRUE if Ok
-Standard_EXPORT Standard_Boolean IsDone() const; - - - - - -protected: - - // Methods PROTECTED - // - - - // Fields PROTECTED - // -NMTTools_PDSFiller myDSFiller; -Standard_Boolean myIsDone; - - -private: - - // Methods PRIVATE - // - - - // Fields PRIVATE - // - - -}; - - - - - -// other Inline functions and methods (like "C++: function call" methods) -// - - -#endif diff --git a/src/NMTTools/NMTTools_PCurveMaker.ixx b/src/NMTTools/NMTTools_PCurveMaker.ixx deleted file mode 100644 index 5d4acd91c..000000000 --- a/src/NMTTools/NMTTools_PCurveMaker.ixx +++ /dev/null @@ -1,27 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include - - - - diff --git a/src/NMTTools/NMTTools_PCurveMaker.jxx b/src/NMTTools/NMTTools_PCurveMaker.jxx deleted file mode 100644 index e7aa663a7..000000000 --- a/src/NMTTools/NMTTools_PCurveMaker.jxx +++ /dev/null @@ -1,25 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _NMTTools_PCurveMaker_HeaderFile -#include -#endif diff --git a/src/NMTTools/NMTTools_PDSFiller.hxx b/src/NMTTools/NMTTools_PDSFiller.hxx deleted file mode 100644 index d30625f28..000000000 --- a/src/NMTTools/NMTTools_PDSFiller.hxx +++ /dev/null @@ -1,30 +0,0 @@ -// 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 library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef _NMTTools_PDSFiller_HeaderFile -#define _NMTTools_PDSFiller_HeaderFile - -class NMTTools_DSFiller; - -typedef NMTTools_DSFiller* NMTTools_PDSFiller; - -#endif -- 2.39.2