From 534160e8a473a3f137b0dd7ac2384be9fc60da1e Mon Sep 17 00:00:00 2001 From: Artem Zhidkov Date: Wed, 27 May 2020 22:13:30 +0300 Subject: [PATCH] Issue #19190: group filter "on a solid" Improve classifier algorithm for the faces with holes. --- src/FiltersPlugin/CMakeLists.txt | 11 +-- src/FiltersPlugin/Test/Test19190.py | 82 +++++++++++++++++++ .../GeomAlgoAPI_SolidClassifier.cpp | 17 +++- 3 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 src/FiltersPlugin/Test/Test19190.py diff --git a/src/FiltersPlugin/CMakeLists.txt b/src/FiltersPlugin/CMakeLists.txt index 5db375f3e..1c9bca592 100644 --- a/src/FiltersPlugin/CMakeLists.txt +++ b/src/FiltersPlugin/CMakeLists.txt @@ -122,8 +122,10 @@ ADD_UNIT_TESTS( TestFilter_BelongsTo_Exclude.py TestFilter_OnPlane.py TestFilter_OnPlane_Exclude.py + TestFilter_OnPlane_Multi.py TestFilter_OnLine.py TestFilter_OnLine_Exclude.py + TestFilter_OnLine_Multi.py TestFilter_OnGeometry_Edge1.py TestFilter_OnGeometry_Edge2.py TestFilter_OnGeometry_Face1.py @@ -140,6 +142,7 @@ ADD_UNIT_TESTS( TestFilter_OnPlaneSide_Plane.py TestFilter_OnPlaneSide_Exclude_Face.py TestFilter_OnPlaneSide_Exclude_Plane.py + TestFilter_OnPlaneSide_Multi.py TestFilter_OppositeToEdge.py TestFilter_OppositeToEdge_Exclude.py TestFilter_RelativeToSolid_In.py @@ -154,6 +157,7 @@ ADD_UNIT_TESTS( TestFilter_RelativeToSolid_Exclude_NotOn.py TestFilter_RelativeToSolid_Exclude_InAndOn.py TestFilter_RelativeToSolid_Exclude_OutAndOn.py + TestFilter_RelativeToSolid_Multi.py TestFilter_ExternalFaces1.py TestFilter_ExternalFaces2.py TestFilter_ExternalFaces_Exclude1.py @@ -198,14 +202,11 @@ ADD_UNIT_TESTS( TestFilter_TopoConnectedFaces_Prop_Exclude_Face1.py TestFilter_TopoConnectedFaces_Prop_Exclude_Face2.py TestFilter_TopoConnectedFaces_Prop_Exclude_Face3.py + TestFilter_TopoConnectedFaces_Multi.py Test2946.py Test2951.py Test3241.py Test17924.py Test17962.py - TestFilter_OnLine_Multi.py - TestFilter_OnPlane_Multi.py - TestFilter_OnPlaneSide_Multi.py - TestFilter_RelativeToSolid_Multi.py - TestFilter_TopoConnectedFaces_Multi.py + Test19190.py ) diff --git a/src/FiltersPlugin/Test/Test19190.py b/src/FiltersPlugin/Test/Test19190.py new file mode 100644 index 000000000..961708a3d --- /dev/null +++ b/src/FiltersPlugin/Test/Test19190.py @@ -0,0 +1,82 @@ +# Copyright (C) 2020 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 +# + +from salome.shaper import model + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchLine_1 = Sketch_1.addLine(87.62648221343873, 42.39493620569578, -76.44861660079052, 42.39493620569578) +SketchLine_2 = Sketch_1.addLine(-76.44861660079052, 42.39493620569578, -76.44861660079052, -42.23747486149789) +SketchLine_3 = Sketch_1.addLine(-76.44861660079052, -42.23747486149789, 87.62648221343873, -42.23747486149789) +SketchLine_4 = Sketch_1.addLine(87.62648221343873, -42.23747486149789, 87.62648221343873, 42.39493620569578) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint()) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint()) +SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint()) +SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) +SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_1.result()) +SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_2.result()) +SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_3.result()) +SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_4.result()) +SketchLine_5 = Sketch_1.addLine(-32.93478260869566, 42.39493620569578, -17.36561264822134, -42.23747486149789) +SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_5.startPoint(), SketchLine_1.result()) +SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_3.result()) +SketchLine_6 = Sketch_1.addLine(34.93083003952569, -42.23747486149789, 44.11264822134387, 42.39493620569579) +SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_6.startPoint(), SketchLine_3.result()) +SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchLine_1.result()) +model.do() +Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("COMPOUND", "all-in-Sketch_1")], model.selection(), 100, 0) +Cylinder_1 = model.addCylinder(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), model.selection("EDGE", "PartSet/OZ"), 35, 120) +Fuse_1_objects_1 = [model.selection("SOLID", "Extrusion_1_1_1"), model.selection("SOLID", "Cylinder_1_1"), model.selection("SOLID", "Extrusion_1_1_3")] +Fuse_1 = model.addFuse(Part_1_doc, Fuse_1_objects_1, removeEdges = True, keepSubResults = True) +Fuse_1.result().setColor(76, 76, 153) +Fuse_1.result().subResult(0).setColor(254, 127, 127) +Fuse_1.result().subResult(1).setColor(153, 153, 76) +Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "Fuse_1_1_2/Modified_Face&Sketch_1/SketchLine_2"), 75, True) +Filters = model.filters(Part_1_doc, [model.addFilter(name = "RelativeToSolid", args = [model.selection("SOLID", "Fuse_1_1_2"), "on"])]) +model.end() + +from GeomAPI import * + +model.testNbResults(Fuse_1, 1) +model.testNbSubResults(Fuse_1, [2]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.SOLID, [2]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.FACE, [14]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.EDGE, [54]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.VERTEX, [108]) +model.testResultsVolumes(Fuse_1, [1465576.14]) + +solid1 = Fuse_1.result().subResult(0).resultSubShapePair()[0] +solid2 = Fuse_1.result().subResult(1).resultSubShapePair()[0] + +Reference = {} +exp = GeomAPI_ShapeExplorer(solid1.shape(), GeomAPI_Shape.FACE) +Reference[model.selection(solid1, exp.current())] = False; exp.next() +Reference[model.selection(solid1, exp.current())] = True; exp.next() +while exp.more(): + Reference[model.selection(solid1, exp.current())] = False + exp.next() +exp = GeomAPI_ShapeExplorer(solid2.shape(), GeomAPI_Shape.FACE) +while exp.more(): + Reference[model.selection(solid1, exp.current())] = True + exp.next() + +model.checkFilter(Part_1_doc, model, Filters, Reference) diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp index 7034eb319..9e49e502d 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_SolidClassifier.cpp @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include #include #include @@ -58,7 +60,20 @@ classifyMiddlePoint(BRepClass3d_SolidClassifier& theClassifier, const double theTolerance) { GeomPointPtr aMiddlePoint = theShape->middlePoint(); - theClassifier.Perform(aMiddlePoint->impl(), theTolerance); + gp_Pnt aPointOnFace = aMiddlePoint->impl(); + 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(); + 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()); } -- 2.30.2