-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: GeomAlgoAPI_ShapeTools.h
-// Created: 3 August 2015
-// Author: Dmitry Bobylev
+// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+//
+// 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, or (at your option) any later version.
+//
+// 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<mailto:webmaster.salome@opencascade.com>
+//
#include "GeomAlgoAPI_ShapeTools.h"
#include <GeomAPI_Face.h>
#include <GeomAPI_Pln.h>
#include <GeomAPI_Pnt.h>
+#include <GeomAPI_Wire.h>
#include <Bnd_Box.hxx>
-#include <BOPTools.hxx>
#include <BRep_Builder.hxx>
#include <BRepAdaptor_Curve.hxx>
+#include <BRepAlgo.hxx>
#include <BRepAlgo_FaceRestrictor.hxx>
#include <BRepBndLib.hxx>
#include <BRepBuilderAPI_FindPlane.hxx>
#include <BRepExtrema_ExtCF.hxx>
#include <BRepGProp.hxx>
#include <BRepTools.hxx>
+#include <BRepTools_WireExplorer.hxx>
#include <BRepTopAdaptor_FClass2d.hxx>
+#include <BRepClass_FaceClassifier.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom2d_Curve.hxx>
#include <BRepLib_CheckCurveOnSurface.hxx>
#include <GeomAPI_ProjectPointOnCurve.hxx>
#include <GeomLib_IsPlanarSurface.hxx>
#include <GeomLib_Tool.hxx>
+#include <GeomAPI_IntCS.hxx>
#include <gp_Pln.hxx>
#include <GProp_GProps.hxx>
#include <IntAna_IntConicQuad.hxx>
#include <TopoDS_Shell.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopoDS.hxx>
+#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
+
#include <BOPAlgo_Builder.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx>
#include <TopoDS_Edge.hxx>
return 0.0;
}
const Standard_Real anEps = 1.e-6;
- BRepGProp::VolumeProperties(aShape, aGProps, anEps);
+ if (aShape.ShapeType() <= TopAbs_SOLID)
+ BRepGProp::VolumeProperties(aShape, aGProps, anEps);
+ else
+ BRepGProp::SurfaceProperties(aShape, aGProps, anEps);
+ return aGProps.Mass();
+}
+
+//==================================================================================================
+double GeomAlgoAPI_ShapeTools::area (const std::shared_ptr<GeomAPI_Shape> theShape)
+{
+ GProp_GProps aGProps;
+ if(!theShape.get()) {
+ return 0.0;
+ }
+ const TopoDS_Shape& aShape = theShape->impl<TopoDS_Shape>();
+ if(aShape.IsNull()) {
+ return 0.0;
+ }
+ const Standard_Real anEps = 1.e-6;
+
+ BRepGProp::SurfaceProperties(aShape, aGProps, anEps);
return aGProps.Mass();
}
BRepGProp::LinearProperties(aShape, aGProps);
aCentre = aGProps.CentreOfMass();
} else {
- BRepGProp::SurfaceProperties(aShape, aGProps);
+ const Standard_Real anEps = 1.e-6;
+ BRepGProp::SurfaceProperties(aShape, aGProps, anEps);
aCentre = aGProps.CentreOfMass();
}
return std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aCentre.X(), aCentre.Y(), aCentre.Z()));
}
// Map subshapes and shapes.
- BOPCol_IndexedDataMapOfShapeListOfShape aMapSA;
- BOPTools::MapShapesAndAncestors(aShapesComp, aTS, aTA, aMapSA);
+ TopTools_IndexedDataMapOfShapeListOfShape aMapSA;
+ TopExp::MapShapesAndAncestors(aShapesComp, aTS, aTA, aMapSA);
if(aMapSA.IsEmpty()) {
return aResult;
}
// Get all shapes with common subshapes and free shapes.
NCollection_Map<TopoDS_Shape> aFreeShapes;
NCollection_Vector<NCollection_Map<TopoDS_Shape>> aShapesWithCommonSubshapes;
- for(BOPCol_IndexedDataMapOfShapeListOfShape::Iterator
+ for(TopTools_IndexedDataMapOfShapeListOfShape::Iterator
anIter(aMapSA); anIter.More(); anIter.Next()) {
const TopoDS_Shape& aShape = anIter.Key();
- BOPCol_ListOfShape& aListOfShape = anIter.ChangeValue();
+ TopTools_ListOfShape& aListOfShape = anIter.ChangeValue();
if(aListOfShape.IsEmpty()) {
continue;
}
} else {
NCollection_List<TopoDS_Shape> aTempList;
NCollection_Map<TopoDS_Shape> aTempMap;
- const TopoDS_Shape& aF = aListOfShape.First();
- const TopoDS_Shape& aL = aListOfShape.Last();
- aTempList.Append(aF);
- aTempList.Append(aL);
- aTempMap.Add(aF);
- aTempMap.Add(aL);
- aFreeShapes.Remove(aF);
- aFreeShapes.Remove(aL);
+ for (TopTools_ListOfShape::Iterator aListIt(aListOfShape); aListIt.More(); aListIt.Next()) {
+ aTempList.Append(aListIt.Value());
+ aTempMap.Add(aListIt.Value());
+ aFreeShapes.Remove(aListIt.Value());
+ }
aListOfShape.Clear();
for(NCollection_List<TopoDS_Shape>::Iterator
aTempIter(aTempList); aTempIter.More(); aTempIter.Next()) {
const TopoDS_Shape& aTempShape = aTempIter.Value();
- for(BOPCol_IndexedDataMapOfShapeListOfShape::Iterator
+ for(TopTools_IndexedDataMapOfShapeListOfShape::Iterator
anIter(aMapSA); anIter.More(); anIter.Next()) {
- BOPCol_ListOfShape& aTempListOfShape = anIter.ChangeValue();
+ TopTools_ListOfShape& aTempListOfShape = anIter.ChangeValue();
if(aTempListOfShape.IsEmpty()) {
continue;
} else if(aTempListOfShape.Size() == 1 && aTempListOfShape.First() == aTempShape) {
aTempListOfShape.Clear();
} else if(aTempListOfShape.Size() > 1) {
- if(aTempListOfShape.First() == aTempShape) {
- const TopoDS_Shape& aTL = aTempListOfShape.Last();
- if(aTempMap.Add(aTL)) {
- aTempList.Append(aTL);
- aFreeShapes.Remove(aTL);
- }
- aTempListOfShape.Clear();
- } else if(aTempListOfShape.Last() == aTempShape) {
- const TopoDS_Shape& aTF = aTempListOfShape.First();
- if(aTempMap.Add(aTF)) {
- aTempList.Append(aTF);
- aFreeShapes.Remove(aTF);
+ TopTools_ListOfShape::Iterator anIt1(aTempListOfShape);
+ for (; anIt1.More(); anIt1.Next()) {
+ if (anIt1.Value() == aTempShape) {
+ TopTools_ListOfShape::Iterator anIt2(aTempListOfShape);
+ for (; anIt2.More(); anIt2.Next())
+ {
+ if (anIt2.Value() != anIt1.Value()) {
+ if (aTempMap.Add(anIt2.Value())) {
+ aTempList.Append(anIt2.Value());
+ aFreeShapes.Remove(anIt2.Value());
+ }
+ }
+ }
+ aTempListOfShape.Clear();
+ break;
}
- aTempListOfShape.Clear();
}
}
}
{
GeomShapePtr aResult = theCompound;
- if(!theCompound.get()) {
+ if (!theCompound.get()) {
return aResult;
}
NCollection_List<TopoDS_Shape> anUngroupedShapes, aStillUngroupedShapes;
addSimpleShapeToList(anInShape, anUngroupedShapes);
- NCollection_Vector<NCollection_List<TopoDS_Shape>> aGroups;
- while(!anUngroupedShapes.IsEmpty()) {
- NCollection_List<TopoDS_Shape> aGroupedShapes;
- aGroupedShapes.Append(anUngroupedShapes.First());
- anUngroupedShapes.RemoveFirst();
- for(NCollection_List<TopoDS_Shape>::Iterator aGroupIt(aGroupedShapes);
- aGroupIt.More(); aGroupIt.Next()) {
- const TopoDS_Shape& aGroupedShape = aGroupIt.Value();
- for(TopExp_Explorer aGroupShapeExp(aGroupedShape, TopAbs_VERTEX);
- aGroupShapeExp.More();
- aGroupShapeExp.Next()) {
- // Find all shapes which have same vertex.
- aStillUngroupedShapes.Clear();
- const TopoDS_Shape& aVertex1 = aGroupShapeExp.Current();
- for(NCollection_List<TopoDS_Shape>::Iterator anUngroupedIt(anUngroupedShapes);
- anUngroupedIt.More();
- anUngroupedIt.Next()) {
- const TopoDS_Shape& anUngroupedShape = anUngroupedIt.Value();
- bool isAdded = false;
- for(TopExp_Explorer anUgroupedShapeExp(anUngroupedShape, TopAbs_VERTEX);
- anUgroupedShapeExp.More();
- anUgroupedShapeExp.Next()) {
- const TopoDS_Shape& aVertex2 = anUgroupedShapeExp.Current();
- if(aVertex1.IsSame(aVertex2)) {
- aGroupedShapes.Append(anUngroupedShape);
- isAdded = true;
- break;
- }
- }
- if(!isAdded) {
- aStillUngroupedShapes.Append(anUngroupedShape);
- }
+ // Iterate over all shapes and find shapes with shared vertices.
+ TopTools_ListOfShape allVertices;
+ TopTools_DataMapOfShapeListOfShape aVertexShapesMap;
+ for (NCollection_List<TopoDS_Shape>::Iterator aShapesIt(anUngroupedShapes);
+ aShapesIt.More();
+ aShapesIt.Next()) {
+ const TopoDS_Shape& aShape = aShapesIt.Value();
+ for (TopExp_Explorer aShapeExp(aShape, TopAbs_VERTEX);
+ aShapeExp.More();
+ aShapeExp.Next()) {
+ const TopoDS_Shape& aVertex = aShapeExp.Current();
+ if (!aVertexShapesMap.IsBound(aVertex)) {
+ NCollection_List<TopoDS_Shape> aList;
+ aList.Append(aShape);
+ allVertices.Append(aVertex);
+ aVertexShapesMap.Bind(aVertex, aList);
+ }
+ else {
+ if (!aVertexShapesMap.ChangeFind(aVertex).Contains(aShape)) {
+ aVertexShapesMap.ChangeFind(aVertex).Append(aShape);
+ }
+ }
+ }
+ }
+
+ // Iterate over the map and group shapes.
+ NCollection_Vector<TopTools_ListOfShape> aGroups; // groups of shapes connected by vertices
+ while (!allVertices.IsEmpty()) {
+ // Get first group of shapes in map, and then unbind it.
+ const TopoDS_Shape& aKey = allVertices.First();
+ TopTools_ListOfShape aConnectedShapes = aVertexShapesMap.Find(aKey);
+ aVertexShapesMap.UnBind(aKey);
+ allVertices.Remove(aKey);
+ // Iterate over shapes in this group and add to it shapes from groups in map.
+ for (TopTools_ListOfShape::Iterator aConnectedIt(aConnectedShapes);
+ aConnectedIt.More(); aConnectedIt.Next()) {
+ const TopoDS_Shape& aConnected = aConnectedIt.Value();
+ TopTools_ListOfShape aKeysToUnbind;
+ for (TopTools_ListOfShape::Iterator aKeysIt(allVertices);
+ aKeysIt.More();
+ aKeysIt.Next()) {
+ const TopTools_ListOfShape& anOtherConnected = aVertexShapesMap(aKeysIt.Value());
+ if (!anOtherConnected.Contains(aConnected)) {
+ // Other connected group does not containt shape from our connected group
+ continue;
}
- anUngroupedShapes = aStillUngroupedShapes;
- if(anUngroupedShapes.IsEmpty()) {
- break;
+ // Other is connected to our, so add them to our connected
+ for (TopTools_ListOfShape::Iterator anOtherIt(anOtherConnected);
+ anOtherIt.More();
+ anOtherIt.Next()) {
+ const TopoDS_Shape& aShape = anOtherIt.Value();
+ if (!aConnectedShapes.Contains(aShape)) {
+ aConnectedShapes.Append(aShape);
+ }
}
+ // Save key to unbind from this map.
+ aKeysToUnbind.Append(aKeysIt.Value());
}
- if(anUngroupedShapes.IsEmpty()) {
- break;
+ // Unbind groups from map that we added to our group.
+ for (TopTools_ListOfShape::Iterator aKeysIt(aKeysToUnbind);
+ aKeysIt.More();
+ aKeysIt.Next()) {
+ aVertexShapesMap.UnBind(aKeysIt.Value());
+ allVertices.Remove(aKeysIt.Value());
}
}
- aGroups.Append(aGroupedShapes);
+ // Sort shapes from the most complicated to the simplest ones
+ TopTools_ListOfShape aSortedGroup;
+ for (int aST = TopAbs_COMPOUND; aST <= TopAbs_SHAPE; ++aST) {
+ TopTools_ListOfShape::Iterator anIt(aConnectedShapes);
+ while (anIt.More()) {
+ if (anIt.Value().ShapeType() == aST) {
+ aSortedGroup.Append(anIt.Value());
+ aConnectedShapes.Remove(anIt);
+ }
+ else {
+ anIt.Next();
+ }
+ }
+ }
+ aGroups.Append(aSortedGroup);
}
TopoDS_Compound aCompound;
return anExt.IsParallel() == Standard_True;
}
+//==================================================================================================
+std::list<std::shared_ptr<GeomAPI_Vertex> > GeomAlgoAPI_ShapeTools::intersect(
+ const std::shared_ptr<GeomAPI_Edge> theEdge, const std::shared_ptr<GeomAPI_Face> theFace,
+ const bool thePointsOutsideFace)
+{
+ std::list<std::shared_ptr<GeomAPI_Vertex> > aResult;
+ if(!theEdge.get() || !theFace.get()) {
+ return aResult;
+ }
+
+ TopoDS_Edge anEdge = TopoDS::Edge(theEdge->impl<TopoDS_Shape>());
+ double aFirstOnCurve, aLastOnCurve;
+ Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFirstOnCurve, aLastOnCurve);
+
+ TopoDS_Face aFace = TopoDS::Face(theFace->impl<TopoDS_Shape>());
+ Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
+
+ GeomAPI_IntCS anIntAlgo(aCurve, aSurf);
+ if (!anIntAlgo.IsDone())
+ return aResult;
+ // searching for points-intersection
+ for(int anIntNum = 1; anIntNum <= anIntAlgo.NbPoints() + anIntAlgo.NbSegments(); anIntNum++) {
+ gp_Pnt anInt;
+ if (anIntNum <= anIntAlgo.NbPoints()) {
+ anInt = anIntAlgo.Point(anIntNum);
+ } else { // take the middle point on the segment of the intersection
+ Handle(Geom_Curve) anIntCurve = anIntAlgo.Segment(anIntNum - anIntAlgo.NbPoints());
+ anIntCurve->D0((anIntCurve->FirstParameter() + anIntCurve->LastParameter()) / 2., anInt);
+ }
+ aResult.push_back(std::shared_ptr<GeomAPI_Vertex>(
+ new GeomAPI_Vertex(anInt.X(), anInt.Y(), anInt.Z())));
+ }
+ return aResult;
+}
+
//==================================================================================================
void GeomAlgoAPI_ShapeTools::splitShape(const std::shared_ptr<GeomAPI_Shape>& theBaseShape,
const GeomAlgoAPI_ShapeTools::PointToRefsMap& thePointsInfo,
std::set<std::shared_ptr<GeomAPI_Shape> >& theShapes)
{
- // General Fuse to split edge by vertices
+ // to split shape at least one point should be presented in the points container
+ if (thePointsInfo.empty())
+ return;
+
+ // General Fuse to split edge by vertices
BOPAlgo_Builder aBOP;
TopoDS_Edge aBaseEdge = theBaseShape->impl<TopoDS_Edge>();
// Rebuild closed edge to place vertex to one of split points.
}
aBOP.Perform();
- if (aBOP.ErrorStatus())
+ if (aBOP.HasErrors())
return;
// Collect splits
}
aBOP.Perform();
- if (aBOP.ErrorStatus())
+ if (aBOP.HasErrors())
return;
// Collect splits
aCentreOfMassPoint.Y()-aPoint.Y(),
aCentreOfMassPoint.Z()-aPoint.Z()));
return aDir;
-}
\ No newline at end of file
+}
+
+//==================================================================================================
+static TopoDS_Wire fixParametricGaps(const TopoDS_Wire& theWire)
+{
+ TopoDS_Wire aFixedWire;
+ Handle(Geom_Curve) aPrevCurve;
+ double aPrevLastParam = 0.0;
+
+ BRep_Builder aBuilder;
+ aBuilder.MakeWire(aFixedWire);
+
+ BRepTools_WireExplorer aWExp(theWire);
+ for (; aWExp.More(); aWExp.Next()) {
+ TopoDS_Edge anEdge = aWExp.Current();
+ double aFirst, aLast;
+ Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFirst, aLast);
+ if (aCurve == aPrevCurve) {
+ // if parametric gap occurs, create new edge based on the copied curve
+ aCurve = Handle(Geom_Curve)::DownCast(aCurve->Copy());
+ TopoDS_Vertex aV1, aV2;
+ TopExp::Vertices(anEdge, aV1, aV2);
+ anEdge = TopoDS::Edge(anEdge.EmptyCopied());
+ aBuilder.UpdateEdge(anEdge, aCurve, BRep_Tool::Tolerance(anEdge));
+ aBuilder.Add(anEdge, aV1);
+ aBuilder.Add(anEdge, aV2);
+ }
+
+ aBuilder.Add(aFixedWire, anEdge);
+
+ aPrevCurve = aCurve;
+ aPrevLastParam = aLast;
+ }
+
+ return aFixedWire;
+}
+
+std::shared_ptr<GeomAPI_Edge> GeomAlgoAPI_ShapeTools::wireToEdge(
+ const std::shared_ptr<GeomAPI_Wire>& theWire)
+{
+ GeomEdgePtr anEdge;
+ if (theWire) {
+ TopoDS_Wire aWire = theWire->impl<TopoDS_Wire>();
+ // Workaround: when concatenate a wire consisting of two edges based on the same B-spline curve
+ // (non-periodic, but having equal start and end points), first of which is placed at the end
+ // on the curve and second is placed at the start, this workaround copies second curve to avoid
+ // treating these edges as a single curve by setting trim parameters.
+ aWire = fixParametricGaps(aWire);
+ TopoDS_Edge aNewEdge = BRepAlgo::ConcatenateWireC0(aWire);
+ anEdge = GeomEdgePtr(new GeomAPI_Edge);
+ anEdge->setImpl(new TopoDS_Edge(aNewEdge));
+ }
+ return anEdge;
+}
