X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_ShapeTools.cpp;h=a47c77c7f28d1fa298a72a1613b71a5eabdd06ff;hb=5fb6a80c4e86e21b1181b4e6ee940d946b5c52e4;hp=5dc12d2edfcf6369a900ad0ed281d832159e804b;hpb=41171d48cbcae06727fc7f93c043600cf4caebb8;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp index 5dc12d2ed..a47c77c7f 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -52,9 +51,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -81,6 +82,35 @@ #include #include +//================================================================================================== +static GProp_GProps props(const TopoDS_Shape& theShape) +{ + GProp_GProps aGProps; + + if (theShape.ShapeType() == TopAbs_EDGE || theShape.ShapeType() == TopAbs_WIRE) + { + BRepGProp::LinearProperties(theShape, aGProps); + } + else if (theShape.ShapeType() == TopAbs_FACE || theShape.ShapeType() == TopAbs_SHELL) + { + const Standard_Real anEps = 1.e-6; + BRepGProp::SurfaceProperties(theShape, aGProps, anEps); + } + else if (theShape.ShapeType() == TopAbs_SOLID || theShape.ShapeType() == TopAbs_COMPSOLID) + { + BRepGProp::VolumeProperties(theShape, aGProps); + } + else if (theShape.ShapeType() == TopAbs_COMPOUND) + { + for (TopoDS_Iterator anIt(theShape); anIt.More(); anIt.Next()) + { + aGProps.Add(props(anIt.Value())); + } + } + + return aGProps; +} + //================================================================================================== double GeomAlgoAPI_ShapeTools::volume(const std::shared_ptr theShape) { @@ -132,17 +162,40 @@ std::shared_ptr gp_Pnt aCentre; if(aShape.ShapeType() == TopAbs_VERTEX) { aCentre = BRep_Tool::Pnt(TopoDS::Vertex(aShape)); - } else if(aShape.ShapeType() == TopAbs_EDGE || aShape.ShapeType() == TopAbs_WIRE) { - BRepGProp::LinearProperties(aShape, aGProps); - aCentre = aGProps.CentreOfMass(); } else { - const Standard_Real anEps = 1.e-6; - BRepGProp::SurfaceProperties(aShape, aGProps, anEps); + aGProps = props(aShape); aCentre = aGProps.CentreOfMass(); } + return std::shared_ptr(new GeomAPI_Pnt(aCentre.X(), aCentre.Y(), aCentre.Z())); } +//================================================================================================== +double GeomAlgoAPI_ShapeTools::radius(const std::shared_ptr& theCylinder) +{ + double aRadius = -1.0; + if (theCylinder->isCylindrical()) { + const TopoDS_Shape& aShape = theCylinder->impl(); + Handle(Geom_Surface) aSurf = BRep_Tool::Surface(TopoDS::Face(aShape)); + Handle(Geom_CylindricalSurface) aCyl = Handle(Geom_CylindricalSurface)::DownCast(aSurf); + if (!aCyl.IsNull()) + aRadius = aCyl->Radius(); + } + return aRadius; +} + +//================================================================================================== +double GeomAlgoAPI_ShapeTools::minimalDistance(const GeomShapePtr& theShape1, + const GeomShapePtr& theShape2) +{ + const TopoDS_Shape& aShape1 = theShape1->impl(); + const TopoDS_Shape& aShape2 = theShape2->impl(); + + BRepExtrema_DistShapeShape aDist(aShape1, aShape2); + aDist.Perform(); + return aDist.IsDone() ? aDist.Value() : Precision::Infinite(); +} + //================================================================================================== std::shared_ptr GeomAlgoAPI_ShapeTools::combineShapes( const std::shared_ptr theCompound, @@ -182,8 +235,8 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::combineShapes( } // 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; } @@ -191,10 +244,10 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::combineShapes( // Get all shapes with common subshapes and free shapes. NCollection_Map aFreeShapes; NCollection_Vector> 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; } @@ -205,40 +258,39 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::combineShapes( } else { NCollection_List aTempList; NCollection_Map 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::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(); } } } @@ -341,7 +393,7 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::groupSharedTopology( { GeomShapePtr aResult = theCompound; - if(!theCompound.get()) { + if (!theCompound.get()) { return aResult; } @@ -350,23 +402,24 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::groupSharedTopology( addSimpleShapeToList(anInShape, anUngroupedShapes); // Iterate over all shapes and find shapes with shared vertices. - TopTools_ListOfShape aMapOrder; - BOPCol_DataMapOfShapeListOfShape aVertexShapesMap; - for(NCollection_List::Iterator aShapesIt(anUngroupedShapes); - aShapesIt.More(); - aShapesIt.Next()) { + TopTools_ListOfShape allVertices; + TopTools_DataMapOfShapeListOfShape aVertexShapesMap; + for (NCollection_List::Iterator aShapesIt(anUngroupedShapes); + aShapesIt.More(); + aShapesIt.Next()) { const TopoDS_Shape& aShape = aShapesIt.Value(); - for(TopExp_Explorer aShapeExp(aShape, TopAbs_VERTEX); - aShapeExp.More(); - aShapeExp.Next()) { + for (TopExp_Explorer aShapeExp(aShape, TopAbs_VERTEX); + aShapeExp.More(); + aShapeExp.Next()) { const TopoDS_Shape& aVertex = aShapeExp.Current(); if (!aVertexShapesMap.IsBound(aVertex)) { NCollection_List aList; aList.Append(aShape); - aMapOrder.Append(aVertex); + allVertices.Append(aVertex); aVertexShapesMap.Bind(aVertex, aList); - } else { - if(!aVertexShapesMap.ChangeFind(aVertex).Contains(aShape)) { + } + else { + if (!aVertexShapesMap.ChangeFind(aVertex).Contains(aShape)) { aVertexShapesMap.ChangeFind(aVertex).Append(aShape); } } @@ -374,55 +427,56 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::groupSharedTopology( } // Iterate over the map and group shapes. - NCollection_Vector aGroups; - while (!aMapOrder.IsEmpty()) { + NCollection_Vector 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 = aMapOrder.First(); - TopTools_ListOfShape aGroupedShapes = aVertexShapesMap.Find(aKey); + const TopoDS_Shape& aKey = allVertices.First(); + TopTools_ListOfShape aConnectedShapes = aVertexShapesMap.Find(aKey); aVertexShapesMap.UnBind(aKey); - aMapOrder.Remove(aKey); + allVertices.Remove(aKey); // Iterate over shapes in this group and add to it shapes from groups in map. - for(TopTools_ListOfShape::Iterator aGroupIt(aGroupedShapes); - aGroupIt.More(); aGroupIt.Next()) { - const TopoDS_Shape& aGroupedShape = aGroupIt.Value(); + for (TopTools_ListOfShape::Iterator aConnectedIt(aConnectedShapes); + aConnectedIt.More(); aConnectedIt.Next()) { + const TopoDS_Shape& aConnected = aConnectedIt.Value(); TopTools_ListOfShape aKeysToUnbind; - for(TopTools_ListOfShape::Iterator aKeysIt(aMapOrder); - aKeysIt.More(); - aKeysIt.Next()) { - const TopTools_ListOfShape& aGroupInMap = aVertexShapesMap(aKeysIt.Value()); - if(!aGroupInMap.Contains(aGroupedShape)) { - // Group in map does not containt shape from our group, so go to the next group in map. + 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; } - // Iterate over shape in group in map, and add new shapes into our group. - for(TopTools_ListOfShape::Iterator aGroupInMapIt(aGroupInMap); - aGroupInMapIt.More(); - aGroupInMapIt.Next()) { - const TopoDS_Shape& aShape = aGroupInMapIt.Value(); - if (!aGroupedShapes.Contains(aShape)) { - aGroupedShapes.Append(aShape); + // 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()); } // Unbind groups from map that we added to our group. - for(TopTools_ListOfShape::Iterator aKeysIt(aKeysToUnbind); - aKeysIt.More(); - aKeysIt.Next()) { + for (TopTools_ListOfShape::Iterator aKeysIt(aKeysToUnbind); + aKeysIt.More(); + aKeysIt.Next()) { aVertexShapesMap.UnBind(aKeysIt.Value()); - aMapOrder.Remove(aKeysIt.Value()); + allVertices.Remove(aKeysIt.Value()); } } - // Sort shapes. - TopTools_ListOfShape aSortedGroup; - for(int aST = TopAbs_COMPOUND; aST <= TopAbs_SHAPE; ++aST) { - TopTools_ListOfShape::Iterator anIt(aGroupedShapes); + // Sort shapes from the most complicated to the simplest ones + TopTools_MapOfShape 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()); - aGroupedShapes.Remove(anIt); - } else { + if (anIt.Value().ShapeType() == aST) { + aSortedGroup.Add(anIt.Value()); + aConnectedShapes.Remove(anIt); + } + else { anIt.Next(); } } @@ -434,14 +488,21 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::groupSharedTopology( BRep_Builder aBuilder; aBuilder.MakeCompound(aCompound); ListOfShape aCompSolids, aFreeSolids; - for(NCollection_Vector>::Iterator - anIt(aGroups); anIt.More(); anIt.Next()) { - NCollection_List aGroup = anIt.Value(); + for (NCollection_Vector::Iterator anIt(aGroups); anIt.More(); anIt.Next()) { + const TopTools_MapOfShape& aGroup = anIt.ChangeValue(); GeomShapePtr aGeomShape(new GeomAPI_Shape()); if(aGroup.Size() == 1) { - aGeomShape->setImpl(new TopoDS_Shape(aGroup.First())); + TopTools_MapOfShape::Iterator aOneShapeIter(aGroup); + aGeomShape->setImpl(new TopoDS_Shape(aOneShapeIter.Value())); } else { - aGeomShape->setImpl(new TopoDS_Shape(makeCompound(aGroup))); + // make sub-shapes in the group have order same as in original shape + TopTools_ListOfShape anOrderedGoup; + NCollection_List::Iterator anUngrouped(anUngroupedShapes); + for (; anUngrouped.More(); anUngrouped.Next()) { + if (aGroup.Contains(anUngrouped.Value())) + anOrderedGoup.Append(anUngrouped.Value()); + } + aGeomShape->setImpl(new TopoDS_Shape(makeCompound(anOrderedGoup))); aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape, GeomAPI_Shape::COMPSOLID, aCompSolids, @@ -846,13 +907,8 @@ void GeomAlgoAPI_ShapeTools::splitShape(const std::shared_ptr& th } aBOP.Perform(); -#ifdef USE_OCCT_720 if (aBOP.HasErrors()) return; -#else - if (aBOP.ErrorStatus()) - return; -#endif // Collect splits const TopTools_ListOfShape& aSplits = aBOP.Modified(aBaseEdge); @@ -896,13 +952,8 @@ void GeomAlgoAPI_ShapeTools::splitShape_p(const std::shared_ptr& } aBOP.Perform(); -#ifdef USE_OCCT_720 if (aBOP.HasErrors()) return; -#else - if (aBOP.ErrorStatus()) - return; -#endif // Collect splits const TopTools_ListOfShape& aSplits = aBOP.Modified(aBaseEdge); @@ -1014,3 +1065,25 @@ std::shared_ptr GeomAlgoAPI_ShapeTools::wireToEdge( } return anEdge; } + +ListOfShape GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(const GeomShapePtr& theShape) +{ + ListOfShape aSubShapes; + + if (!theShape->isCompound() && !theShape->isCompSolid() && + !theShape->isShell() && !theShape->isWire()) { + return aSubShapes; + } + + for (GeomAPI_ShapeIterator anIt(theShape); anIt.more(); anIt.next()) { + GeomShapePtr aSubShape = anIt.current(); + if (aSubShape->isVertex() || aSubShape->isEdge() || + aSubShape->isFace() || aSubShape->isSolid()) { + aSubShapes.push_back(aSubShape); + } else { + aSubShapes.splice(aSubShapes.end(), getLowLevelSubShapes(aSubShape)); + } + } + + return aSubShapes; +} \ No newline at end of file