Issue #19190: group filter "on a solid"

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_SolidClassifier.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp
index 7034eb3191ac69f1be6561c7bcbf8dbaa7536593..9e49e502d87c16ab2640528df765721658dbd82a 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp
@@ -26,6 +26,8 @@
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepClass_FaceClassifier.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <TopoDS.hxx>
@@ -58,7 +60,20 @@ classifyMiddlePoint(BRepClass3d_SolidClassifier& theClassifier,
                     const double theTolerance)
 {
   GeomPointPtr aMiddlePoint = theShape->middlePoint();
-  theClassifier.Perform(aMiddlePoint->impl<gp_Pnt>(), theTolerance);
+  gp_Pnt aPointOnFace = aMiddlePoint->impl<gp_Pnt>();
+  if (theShape->shapeType() == GeomAPI_Shape::FACE) {
+    // middle point may be out of face (within a hole),
+    // in this case, find the nearest point on the face
+    const TopoDS_Face& aFace = theShape->impl<TopoDS_Face>();
+    BRepClass_FaceClassifier aFaceClassifier(aFace, aPointOnFace, theTolerance);
+    if (aFaceClassifier.State() == TopAbs_OUT) {
+      BRepBuilderAPI_MakeVertex aVertex(aPointOnFace);
+      BRepExtrema_DistShapeShape aDistance(aVertex.Vertex(), aFace);
+      if (aDistance.NbSolution())
+        aPointOnFace = aDistance.PointOnShape2(1);
+    }
+  }
+  theClassifier.Perform(aPointOnFace, theTolerance);
   return stateToState(theClassifier.State());
 }