+// Copyright (C) 2007-2011 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: GEOMAlgo_Gluer.cxx
// Created: Sat Dec 04 12:45:53 2004
// Author: Peter KURNEV
// <peter@PREFEX>
-
-
+//
#include <GEOMAlgo_Gluer.ixx>
+#include <NMTDS_BoxBndTree.hxx>
+#include <NCollection_UBTreeFiller.hxx>
+
+#include <TColStd_MapIteratorOfMapOfInteger.hxx>
+#include <TColStd_MapOfInteger.hxx>
#include <TColStd_ListOfInteger.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <GEOMAlgo_IndexedDataMapOfIntegerShape.hxx>
#include <GEOMAlgo_IndexedDataMapOfShapeBox.hxx>
-#include <GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx>
-#include <GEOMAlgo_PassKey.hxx>
+#include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx>
+#include <GEOMAlgo_PassKeyShape.hxx>
#include <GEOMAlgo_Tools.hxx>
//
-
+//modified by NIZNHY-PKV Thu Jan 21 10:02:52 2010f
+#include <NMTDS_BndSphereTree.hxx>
+#include <NMTDS_BndSphere.hxx>
+#include <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
+//modified by NIZNHY-PKV Thu Jan 21 10:02:56 2010t
+//
static
void GetSubShapes(const TopoDS_Shape& aS,
TopTools_IndexedMapOfShape& aMSS);
myTolerance=0.0001;
myTol=myTolerance;
myCheckGeometry=Standard_True;
+ myKeepNonSolids=Standard_False;
myNbAlone=0;
}
//=======================================================================
return myCheckGeometry;
}
//=======================================================================
+//function : SetKeepNonSolids
+//purpose :
+//=======================================================================
+void GEOMAlgo_Gluer::SetKeepNonSolids(const Standard_Boolean aFlag)
+{
+ myKeepNonSolids=aFlag;
+}
+//=======================================================================
+//function : KeepNonSolids
+//purpose :
+//=======================================================================
+//Standard_Boolean GEOMAlgo_Gluer::KeepNonSolids()const
+//{
+// return myKeepNonSolids;
+//}
+//=======================================================================
//function : AloneShapes
//purpose :
//=======================================================================
}
}
}
+
//=======================================================================
//function : MakeVertices
//purpose :
{
myErrorStatus=0;
//
- Standard_Integer j, i, aNbV, aIndex, aNbVSD;
+ Standard_Integer j, i, aNbV, aNbVSD;
+ Standard_Real aTolV;
+ gp_Pnt aPV;
TColStd_ListIteratorOfListOfInteger aIt;
- Handle(Bnd_HArray1OfBox) aHAB;
- Bnd_BoundSortBox aBSB;
- TopoDS_Shape aSTmp, aVF;
+ TopoDS_Shape aVF;
TopoDS_Vertex aVnew;
TopTools_IndexedMapOfShape aMV, aMVProcessed;
TopTools_ListIteratorOfListOfShape aItS;
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape aItIm;
TopTools_DataMapOfShapeListOfShape aMVV;
GEOMAlgo_IndexedDataMapOfIntegerShape aMIS;
- GEOMAlgo_IndexedDataMapOfShapeBox aMSB;
+ //modified by NIZNHY-PKV Thu Jan 21 10:03:07 2010f
+ //GEOMAlgo_IndexedDataMapOfShapeBox aMSB;
+ NMTDS_IndexedDataMapOfShapeBndSphere aMSB;
+ //modified by NIZNHY-PKV Thu Jan 21 10:03:10 2010t
+ //
+ NMTDS_BndSphereTreeSelector aSelector;
+ NMTDS_BndSphereTree aBBTree;
+ NCollection_UBTreeFiller <Standard_Integer, NMTDS_BndSphere> aTreeFiller(aBBTree);
//
TopExp::MapShapes(myShape, TopAbs_VERTEX, aMV);
aNbV=aMV.Extent();
return;
}
//
- aHAB=new Bnd_HArray1OfBox(1, aNbV);
- //
for (i=1; i<=aNbV; ++i) {
- const TopoDS_Shape& aV=aMV(i);
- Bnd_Box aBox;
+ NMTDS_BndSphere aBox;
+ //
+ const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&aMV(i));
+ aPV=BRep_Tool::Pnt(aV);
+ aTolV=BRep_Tool::Tolerance(aV);
+ //
+ aBox.SetGap(myTol);
+ aBox.SetCenter(aPV);
+ aBox.SetRadius(aTolV);
+ //
+ aTreeFiller.Add(i, aBox);
//
- aBox.SetGap(myTol);
- BRepBndLib::Add(aV, aBox);
- aHAB->SetValue(i, aBox);
aMIS.Add(i, aV);
aMSB.Add(aV, aBox);
}
//
- aBSB.Initialize(aHAB);
+ aTreeFiller.Fill();
//
+ //------------------------------
+ // Chains
for (i=1; i<=aNbV; ++i) {
- const TopoDS_Shape& aV=aMV(i);
+ const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&aMV(i));
//
if (aMVProcessed.Contains(aV)) {
continue;
}
//
- const Bnd_Box& aBoxV=aMSB.FindFromKey(aV);
- const TColStd_ListOfInteger& aLI=aBSB.Compare(aBoxV);
- aNbVSD=aLI.Extent();
- if (!aNbVSD) {
- myErrorStatus=3; // it must not be
- return;
- }
+ Standard_Integer aNbIP, aIP, aNbIP1, aIP1;
+ TopTools_ListOfShape aLVSD;
+ TColStd_MapOfInteger aMIP, aMIP1, aMIPC;
+ TColStd_MapIteratorOfMapOfInteger aIt1;
//
- // Images
+ aMIP.Add(i);
+ while(1) {
+ aNbIP=aMIP.Extent();
+ aIt1.Initialize(aMIP);
+ for(; aIt1.More(); aIt1.Next()) {
+ aIP=aIt1.Key();
+ if (aMIPC.Contains(aIP)) {
+ continue;
+ }
+ //
+ const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP);
+ //modified by NIZNHY-PKV Thu Jan 21 10:04:09 2010f
+ const NMTDS_BndSphere& aBoxVP=aMSB.FindFromKey(aVP);
+ //const Bnd_Box& aBoxVP=aMSB.FindFromKey(aVP);
+ //modified by NIZNHY-PKV Thu Jan 21 10:04:11 2010t
+ //
+ aSelector.Clear();
+ aSelector.SetBox(aBoxVP);
+ //
+ aNbVSD=aBBTree.Select(aSelector);
+ if (!aNbVSD) {
+ continue; // it must not be
+ }
+ //
+ const TColStd_ListOfInteger& aLI=aSelector.Indices();
+ //
+ aIt.Initialize(aLI);
+ for (; aIt.More(); aIt.Next()) {
+ aIP1=aIt.Value();
+ if (aMIP.Contains(aIP1)) {
+ continue;
+ }
+ aMIP1.Add(aIP1);
+ } //for (; aIt.More(); aIt.Next()) {
+ }//for(; aIt1.More(); aIt1.Next()) {
+ //
+ aNbIP1=aMIP1.Extent();
+ if (!aNbIP1) {
+ break;
+ }
+ //
+ aIt1.Initialize(aMIP);
+ for(; aIt1.More(); aIt1.Next()) {
+ aIP=aIt1.Key();
+ aMIPC.Add(aIP);
+ }
+ //
+ aMIP.Clear();
+ aIt1.Initialize(aMIP1);
+ for(; aIt1.More(); aIt1.Next()) {
+ aIP=aIt1.Key();
+ aMIP.Add(aIP);
+ }
+ aMIP1.Clear();
+ }// while(1)
//
- TopTools_ListOfShape aLVSD;
+ // Fill myImages
+ aNbIP=aMIPC.Extent();
//
- aIt.Initialize(aLI);
- for (j=0; aIt.More(); aIt.Next(), ++j) {
- aIndex=aIt.Value();
- const TopoDS_Shape& aVx=aMIS.FindFromKey(aIndex);
- if(!j) {
- aVF=aVx;
+ if (!aNbIP) {// no SD vertices founded
+ aVF=aV;
+ aLVSD.Append(aV);
+ aMVProcessed.Add(aV);
+ }
+ else { // SD vertices founded [ aMIPC ]
+ aIt1.Initialize(aMIPC);
+ for(j=0; aIt1.More(); aIt1.Next(), ++j) {
+ aIP=aIt1.Key();
+ const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP);
+ if (!j) {
+ aVF=aVP;
+ }
+ aLVSD.Append(aVP);
+ aMVProcessed.Add(aVP);
}
- aLVSD.Append(aVx);
- aMVProcessed.Add(aVx);
}
- //
myImages.Bind(aVF, aLVSD);
- }
+ }// for (i=1; i<=aNbV; ++i) {
+ //------------------------------
//
// Make new vertices
aMV.Clear();
aItIm.Initialize(myImages);
for (; aItIm.More(); aItIm.Next()) {
- const TopoDS_Shape& aV=aItIm.Key();
+ const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&aItIm.Key());
const TopTools_ListOfShape& aLVSD=aItIm.Value();
aNbVSD=aLVSD.Extent();
if (aNbVSD>1) {
for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aV=aItIm.Key();
const TopTools_ListOfShape& aLVSD=aItIm.Value();
- //
aItS.Initialize(aLVSD);
for (; aItS.More(); aItS.Next()) {
const TopoDS_Shape& aVSD=aItS.Value();
}
}
//=======================================================================
-//function : MakeSolids
+//function : MakeSubShapes
//purpose :
//=======================================================================
-void GEOMAlgo_Gluer::MakeSolids()
+void GEOMAlgo_Gluer::MakeSubShapes (const TopoDS_Shape& theShape,
+ TopTools_MapOfShape& theMS,
+ TopoDS_Compound& theResult)
{
- myErrorStatus=0;
+ if (theMS.Contains(theShape))
+ return;
//
- Standard_Integer aNbS;
- TopAbs_Orientation anOr;
- TopoDS_Compound aCmp;
- TopoDS_Solid aNewSolid;
- TopTools_IndexedMapOfShape aMS;
- TopExp_Explorer aExpS, aExp;
BRep_Builder aBB;
//
- aBB.MakeCompound(aCmp);
+ theMS.Add(theShape);
//
- aNbS=aMS.Extent();
- aExpS.Init(myShape, TopAbs_SOLID);
- for (; aExpS.More(); aExpS.Next()) {
- const TopoDS_Solid& aSolid=TopoDS::Solid(aExpS.Current());
- if (aMS.Contains(aSolid)) {
- continue;
+ if (theShape.ShapeType() == TopAbs_COMPOUND ||
+ theShape.ShapeType() == TopAbs_COMPSOLID) {
+ TopoDS_Iterator It (theShape, Standard_True, Standard_True);
+ for (; It.More(); It.Next()) {
+ MakeSubShapes(It.Value(), theMS, theResult);
}
- aMS.Add(aSolid);
+ }
+ else if (theShape.ShapeType() == TopAbs_SOLID) {
+ // build a solid
+ TopoDS_Solid aNewSolid;
+ TopExp_Explorer aExpS, aExp;
+ //
+ const TopoDS_Solid& aSolid = TopoDS::Solid(theShape);
//
- anOr=aSolid.Orientation();
+ TopAbs_Orientation anOr = aSolid.Orientation();
//
aBB.MakeSolid(aNewSolid);
aNewSolid.Orientation(anOr);
//
aExp.Init(aSolid, TopAbs_SHELL);
- for (; aExp.More(); aExp.Next()) {
+ for (; aExp.More(); aExp.Next())
+ {
const TopoDS_Shape& aShell=aExp.Current();
const TopoDS_Shape& aShellR=myOrigins.Find(aShell);
aBB.Add(aNewSolid, aShellR);
myImages.Bind(aNewSolid, aLS);
myOrigins.Bind(aSolid, aNewSolid);
//
- aBB.Add(aCmp, aNewSolid);
+ aBB.Add(theResult, aNewSolid);
+ }
+ else if (theShape.ShapeType() == TopAbs_WIRE) {
+ if (myKeepNonSolids) {
+ // just add image
+ if (!myOrigins.IsBound(theShape)) {
+ // build wire
+ const TopoDS_Wire& aW=TopoDS::Wire(theShape);
+ //
+ TopoDS_Wire newWire;
+ aBB.MakeWire(newWire);
+ //
+ TopExp_Explorer aExpE (aW, TopAbs_EDGE);
+ for (; aExpE.More(); aExpE.Next()) {
+ const TopoDS_Edge& aE=TopoDS::Edge(aExpE.Current());
+ TopoDS_Edge aER=TopoDS::Edge(myOrigins.Find(aE));
+ //
+ aER.Orientation(TopAbs_FORWARD);
+ if (!BRep_Tool::Degenerated(aER)) {
+ // build p-curve
+ //if (bIsUPeriodic) {
+ // GEOMAlgo_Tools::RefinePCurveForEdgeOnFace(aER, aFFWD, aUMin, aUMax);
+ //}
+ //BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aER, aFFWD);
+ //
+ // orient image
+ Standard_Boolean bIsToReverse=BOPTools_Tools3D::IsSplitToReverse1(aER, aE, myContext);
+ if (bIsToReverse) {
+ aER.Reverse();
+ }
+ }
+ else {
+ aER.Orientation(aE.Orientation());
+ }
+ //
+ aBB.Add(newWire, aER);
+ }
+ // xf
+ TopTools_ListOfShape aLW;
+ //
+ aLW.Append(aW);
+ myImages.Bind(newWire, aLW);
+ myOrigins.Bind(aW, newWire);
+ }
+ const TopoDS_Shape& aShapeR = myOrigins.Find(theShape);
+ aBB.Add(theResult, aShapeR);
+ }
+ }
+ else
+ {
+ if (myKeepNonSolids) {
+ // just add image
+ const TopoDS_Shape& aShapeR = myOrigins.Find(theShape);
+ aBB.Add(theResult, aShapeR);
+ }
}
+}
+//=======================================================================
+//function : MakeSolids
+//purpose :
+//=======================================================================
+void GEOMAlgo_Gluer::MakeSolids()
+{
+ myErrorStatus=0;
+ //
+ BRep_Builder aBB;
+ TopoDS_Compound aCmp;
+ TopTools_MapOfShape aMS;
+ //
+ aBB.MakeCompound(aCmp);
+ //
+ // Add images of all initial sub-shapes in the result.
+ // If myKeepNonSolids==false, add only solids images.
+ MakeSubShapes(myShape, aMS, aCmp);
//
myResult=aCmp;
//
- aNbS=aMS.Extent();
- if (aNbS) {
- //Standard_Real aTol=1.e-7;
+ if (aMS.Extent()) {
BOP_CorrectTolerances::CorrectCurveOnSurface(myResult);
}
}
TopoDS_Shape aNewShape;
TopTools_IndexedMapOfShape aMF;
TopTools_ListIteratorOfListOfShape aItS;
- GEOMAlgo_PassKey aPKF;
- GEOMAlgo_IndexedDataMapOfPassKeyListOfShape aMPKLF;
+ GEOMAlgo_PassKeyShape aPKF;
+ GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape aMPKLF;
//
TopExp::MapShapes(myShape, aType, aMF);
//
for (i=1; i<=aNbF; ++i) {
const TopoDS_Shape& aS=aMF(i);
//
- aPKF.Clear();
if (aType==TopAbs_FACE) {
const TopoDS_Face& aF=TopoDS::Face(aS);
FacePassKey(aF, aPKF);
//
const TopoDS_Shape& aS1=aLSDF.First();
//
- //modified by NIZNHY-PKV Fri Jan 21 15:34:00 2005 f
- //
bHasNewSubShape=Standard_True;
// prevent creation of a new shape if there are not
- // new subshapes of aSS among the originals
+ // new sub-shapes of aSS among the originals
if (aNbSDF==1) {
bHasNewSubShape=HasNewSubShape(aS1);
if (!bHasNewSubShape) {
aNewShape.Orientation(TopAbs_FORWARD);
}
}
- //modified by NIZNHY-PKV Fri Jan 21 15:34:05 2005 t
//
- if (bHasNewSubShape) {//modified by NIZNHY-PKV Fri Jan 21 15:34:10 2005ft
+ if (bHasNewSubShape) {
if (aType==TopAbs_FACE) {
TopoDS_Face aNewFace;
//
//purpose :
//=======================================================================
void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF,
- GEOMAlgo_PassKey& aPK)
+ GEOMAlgo_PassKeyShape& aPK)
{
- Standard_Integer i, aNbE, aNbMax;
+ Standard_Integer i, aNbE;
TopTools_ListOfShape aLE;
TopTools_IndexedMapOfShape aME;
//
TopExp::MapShapes(aF, TopAbs_EDGE, aME);
aNbE=aME.Extent();
- aNbMax=aPK.NbMax();
- if (!aNbE || aNbE>aNbMax) {
- myErrorStatus=101; // temprorary
- return;
- }
//
for (i=1; i<=aNbE; ++i) {
const TopoDS_Shape& aE=aME(i);
const TopoDS_Shape& aER=myOrigins.Find(aE);
aLE.Append(aER);
}
- aPK.SetIds(aLE);
+ aPK.SetShapes(aLE);
}
//=======================================================================
//function : EdgePassKey
//purpose :
//=======================================================================
void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE,
- GEOMAlgo_PassKey& aPK)
+ GEOMAlgo_PassKeyShape& aPK)
{
TopoDS_Vertex aV1, aV2;
//
}
const TopoDS_Shape& aVR1=myOrigins.Find(aV1);
const TopoDS_Shape& aVR2=myOrigins.Find(aV2);
- aPK.SetIds(aVR1, aVR2);
+ aPK.SetShapes(aVR1, aVR2);
}
//=======================================================================
//function : MakeVertex
BOPTools_Tools::MakeSplitEdge(aEx, aVR1, aT1, aVR2, aT2, aNewEdge);
}
}
-//
//=======================================================================
//function : MakeFace
//purpose :
//
aBB.Add(newWire, aER);
}
- //modified by NIZNHY-PKV Mon Jan 31 17:26:36 2005f
- //
+ // xf
TopTools_ListOfShape aLW;
//
aLW.Append(aW);
myImages.Bind(newWire, aLW);
myOrigins.Bind(aW, newWire);
- //
- //modified by NIZNHY-PKV Mon Jan 31 17:26:41 2005 t
+ // xt
aBB.Add(newFace, newWire);
}
aNewFace=newFace;
}
return bRet;
}
-//
-//modified by NIZNHY-PKV Fri Jan 21 10:55:42 2005 f
//=======================================================================
//function : HasNewSubShape
//purpose :
aType=aS.ShapeType();
if (aType==TopAbs_VERTEX ||
aType==TopAbs_EDGE ||
- aType==TopAbs_WIRE || //modified by NIZNHY-PKV Mon Jan 31 17:18:36 2005ft
+ aType==TopAbs_WIRE ||
aType==TopAbs_FACE ||
- aType==TopAbs_SHELL || //modified by NIZNHY-PKV Mon Jan 31 17:18:36 2005ft
- aType==TopAbs_SOLID) { //modified by NIZNHY-PKV Mon Jan 31 17:18:36 2005ft
+ aType==TopAbs_SHELL ||
+ aType==TopAbs_SOLID) {
if(myOrigins.IsBound(aS)) {
const TopoDS_Shape& aSnew=myOrigins.Find(aS);
if (!aSnew.IsSame(aS)) {
//
return bRet;
}
-//modified by NIZNHY-PKV Fri Jan 21 10:59:21 2005 t
+
//
// ErrorStatus
//