Salome HOME
Issue #1664 In the Sketcher, add the function Split a segment - correction for arc...
[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_ShapeTools.cpp
index 029743117c77fbd33550558955e1d989b3782406..7c0f462e086a033cd980920130a521a79856ba09 100644 (file)
@@ -8,9 +8,9 @@
 
 #include "GeomAlgoAPI_SketchBuilder.h"
 
+#include <GeomAPI_Edge.h>
 #include <GeomAPI_Dir.h>
 #include <GeomAPI_Face.h>
-#include <GeomAPI_PlanarEdges.h>
 #include <GeomAPI_Pln.h>
 #include <GeomAPI_Pnt.h>
 
 #include <BRepBuilderAPI_FindPlane.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepExtrema_ExtCF.hxx>
 #include <BRepGProp.hxx>
 #include <BRepTools.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom2d_Curve.hxx>
+#include <Handle_Geom2d_Curve.hxx>
 #include <BRepLib_CheckCurveOnSurface.hxx>
 #include <BRep_Tool.hxx>
 #include <Geom_Plane.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
 #include <GeomLib_Tool.hxx>
-#include <GeomProjLib.hxx>
 #include <gp_Pln.hxx>
 #include <GProp_GProps.hxx>
 #include <IntAna_IntConicQuad.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS.hxx>
 #include <TopExp_Explorer.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+
+#include <BOPAlgo_Builder.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <TopoDS_Edge.hxx>
 
 //==================================================================================================
 double GeomAlgoAPI_ShapeTools::volume(const std::shared_ptr<GeomAPI_Shape> theShape)
@@ -417,33 +419,33 @@ std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeTools::faceToInfinitePlane(const
 }
 
 //==================================================================================================
-std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeTools::fitPlaneToBox(const std::shared_ptr<GeomAPI_Shape> thePlane,
-                                                                     const std::list<std::shared_ptr<GeomAPI_Pnt> >& thePoints)
+std::shared_ptr<GeomAPI_Face> GeomAlgoAPI_ShapeTools::fitPlaneToBox(const std::shared_ptr<GeomAPI_Shape> thePlane,
+                                                                    const std::list<std::shared_ptr<GeomAPI_Pnt> >& thePoints)
 {
-  std::shared_ptr<GeomAPI_Shape> aResultShape;
+  std::shared_ptr<GeomAPI_Face> aResultFace;
 
   if(!thePlane.get()) {
-    return aResultShape;
+    return aResultFace;
   }
 
   const TopoDS_Shape& aShape = thePlane->impl<TopoDS_Shape>();
   if(aShape.ShapeType() != TopAbs_FACE) {
-    return aResultShape;
+    return aResultFace;
   }
 
   TopoDS_Face aFace = TopoDS::Face(aShape);
   Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
   if(aSurf.IsNull()) {
-    return aResultShape;
+    return aResultFace;
   }
 
   GeomLib_IsPlanarSurface isPlanar(aSurf);
   if(!isPlanar.IsPlanar()) {
-    return aResultShape;
+    return aResultFace;
   }
 
   if(thePoints.size() != 8) {
-    return aResultShape;
+    return aResultFace;
   }
 
   const gp_Pln& aFacePln = isPlanar.Plan();
@@ -463,10 +465,10 @@ std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeTools::fitPlaneToBox(const std::
     if(aPntV < VMin) VMin = aPntV;
     if(aPntV > VMax) VMax = aPntV;
   }
-  aResultShape.reset(new GeomAPI_Shape);
-  aResultShape->setImpl(new TopoDS_Shape(BRepLib_MakeFace(aFacePln, UMin, UMax, VMin, VMax).Face()));
+  aResultFace.reset(new GeomAPI_Face());
+  aResultFace->setImpl(new TopoDS_Face(BRepLib_MakeFace(aFacePln, UMin, UMax, VMin, VMax).Face()));
 
-  return aResultShape;
+  return aResultFace;
 }
 
 //==================================================================================================
@@ -669,44 +671,46 @@ bool GeomAlgoAPI_ShapeTools::isParallel(const std::shared_ptr<GeomAPI_Edge> theE
 }
 
 //==================================================================================================
-std::shared_ptr<GeomAPI_Vertex> GeomAlgoAPI_ShapeTools::findVertexOnEdge(const std::shared_ptr<GeomAPI_Edge> theEdge,
-                                                                         const double theValue,
-                                                                         const bool theIsPercent,
-                                                                         const bool theIsReverse)
+void GeomAlgoAPI_ShapeTools::splitShape(const std::shared_ptr<GeomAPI_Shape>& theBaseShape,
+                                        const std::set<std::shared_ptr<GeomAPI_Pnt> >& thePoints,
+                                        std::set<std::shared_ptr<GeomAPI_Shape> >& theShapes)
 {
-  std::shared_ptr<GeomAPI_Vertex> aVertex;
-
-  if(!theEdge.get()) {
-    return aVertex;
-  }
-
-  double aValue = theValue;
-  if(theIsPercent) {
-    aValue = theEdge->length() / 100.0 * aValue;
-  }
-
-  const TopoDS_Edge& anEdge = TopoDS::Edge(theEdge->impl<TopoDS_Shape>());
-  Standard_Real aUFirst, aULast;
-  Handle(Geom_Curve) anEdgeCurve = BRep_Tool::Curve(anEdge, aUFirst, aULast);
-
-  if(!anEdgeCurve.IsNull() ) {
-    Handle(Geom_Curve) aReOrientedCurve = anEdgeCurve;
-
-    if(theIsReverse) {
-      aReOrientedCurve = anEdgeCurve->Reversed();
-      aUFirst = anEdgeCurve->ReversedParameter(aULast);
-    }
-
-    // Get the point by length
-    GeomAdaptor_Curve anAdapCurve = GeomAdaptor_Curve(aReOrientedCurve);
-    GCPnts_AbscissaPoint anAbsPnt(anAdapCurve, aValue, aUFirst);
-    Standard_Real aParam = anAbsPnt.Parameter();
-    gp_Pnt aPnt = anAdapCurve.Value(aParam);
-    BRepBuilderAPI_MakeVertex aMkVertex(aPnt);
-    const TopoDS_Vertex& aShape = aMkVertex.Vertex();
-    aVertex.reset(new GeomAPI_Vertex());
-    aVertex->setImpl(new TopoDS_Vertex(aShape));
+  // 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.
+  // This will prevent edge to be split on seam vertex.
+  if (BRep_Tool::IsClosed(aBaseEdge))
+  {
+    Standard_Real aFirst, aLast;
+    Handle(Geom_Curve) aCurve = BRep_Tool::Curve(aBaseEdge, aFirst, aLast);
+
+    std::set<std::shared_ptr<GeomAPI_Pnt> >::const_iterator aPIt = thePoints.begin();
+    gp_Pnt aPoint((*aPIt)->x(), (*aPIt)->y(), (*aPIt)->z());
+
+    TopAbs_Orientation anOrientation = aBaseEdge.Orientation();
+    aBaseEdge = BRepBuilderAPI_MakeEdge(aCurve, aPoint, aPoint).Edge();
+    aBaseEdge.Orientation(anOrientation);
+  }
+  aBOP.AddArgument(aBaseEdge);
+
+  std::set<std::shared_ptr<GeomAPI_Pnt> >::const_iterator aPtIt = thePoints.begin();
+  for (; aPtIt != thePoints.end(); ++aPtIt) {
+    std::shared_ptr<GeomAPI_Pnt> aPnt = *aPtIt;
+    TopoDS_Vertex aV = BRepBuilderAPI_MakeVertex(gp_Pnt(aPnt->x(), aPnt->y(), aPnt->z()));
+    aBOP.AddArgument(aV);
+  }
+
+  aBOP.Perform();
+  if (aBOP.ErrorStatus())
+    return;
+  
+  // Collect splits
+  const TopTools_ListOfShape& aSplits = aBOP.Modified(aBaseEdge);
+  TopTools_ListIteratorOfListOfShape anIt(aSplits);
+  for (; anIt.More(); anIt.Next()) {
+    std::shared_ptr<GeomAPI_Shape> anEdge(new GeomAPI_Shape);
+    anEdge->setImpl(new TopoDS_Shape(anIt.Value()));
+    theShapes.insert(anEdge);
   }
-
-  return aVertex;
 }