From 2bec189afe981399df161883483ddf4cd073582f Mon Sep 17 00:00:00 2001 From: azv Date: Wed, 31 Jul 2019 12:38:35 +0300 Subject: [PATCH] Fix "External faces" filter to avoid faces with INTERNAL flag --- src/FiltersPlugin/CMakeLists.txt | 6 +- .../FiltersPlugin_ExternalFaces.cpp | 8 ++- ...lFaces.py => TestFilter_ExternalFaces1.py} | 0 .../Test/TestFilter_ExternalFaces2.py | 69 +++++++++++++++++++ ...y => TestFilter_ExternalFaces_Exclude1.py} | 0 .../Test/TestFilter_ExternalFaces_Exclude2.py | 69 +++++++++++++++++++ 6 files changed, 149 insertions(+), 3 deletions(-) rename src/FiltersPlugin/Test/{TestFilter_ExternalFaces.py => TestFilter_ExternalFaces1.py} (100%) create mode 100644 src/FiltersPlugin/Test/TestFilter_ExternalFaces2.py rename src/FiltersPlugin/Test/{TestFilter_ExternalFaces_Exclude.py => TestFilter_ExternalFaces_Exclude1.py} (100%) create mode 100644 src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude2.py diff --git a/src/FiltersPlugin/CMakeLists.txt b/src/FiltersPlugin/CMakeLists.txt index c90061fef..8cebbbaa6 100644 --- a/src/FiltersPlugin/CMakeLists.txt +++ b/src/FiltersPlugin/CMakeLists.txt @@ -142,8 +142,10 @@ ADD_UNIT_TESTS( TestFilter_RelativeToSolid_Exclude_NotOn.py TestFilter_RelativeToSolid_Exclude_InAndOn.py TestFilter_RelativeToSolid_Exclude_OutAndOn.py - TestFilter_ExternalFaces.py - TestFilter_ExternalFaces_Exclude.py + TestFilter_ExternalFaces1.py + TestFilter_ExternalFaces2.py + TestFilter_ExternalFaces_Exclude1.py + TestFilter_ExternalFaces_Exclude2.py TestFilter_HorizontalFaces.py TestFilter_HorizontalFaces_Exclude.py TestFilter_VerticalFaces.py diff --git a/src/FiltersPlugin/FiltersPlugin_ExternalFaces.cpp b/src/FiltersPlugin/FiltersPlugin_ExternalFaces.cpp index 1ad322537..93fea41c6 100644 --- a/src/FiltersPlugin/FiltersPlugin_ExternalFaces.cpp +++ b/src/FiltersPlugin/FiltersPlugin_ExternalFaces.cpp @@ -36,6 +36,12 @@ bool FiltersPlugin_ExternalFaces::isOk(const GeomShapePtr& theShape, if (!theShape->isFace()) return false; + // verify INTERNAL flag + TopoDS_Shape aShape = theShape->impl(); + if (aShape.Orientation() == TopAbs_INTERNAL) + return false; + + // check number of solids containing the face ResultBodyPtr anOwner = ModelAPI_Tools::bodyOwner(theResult, true); if (!anOwner) { anOwner = std::dynamic_pointer_cast(theResult); @@ -47,6 +53,6 @@ bool FiltersPlugin_ExternalFaces::isOk(const GeomShapePtr& theShape, TopTools_IndexedDataMapOfShapeListOfShape aMapFS; TopExp::MapShapesAndUniqueAncestors(anOwnerShape->impl(), TopAbs_FACE, TopAbs_SOLID, aMapFS); - const TopTools_ListOfShape& aSolids = aMapFS.FindFromKey(theShape->impl()); + const TopTools_ListOfShape& aSolids = aMapFS.FindFromKey(aShape); return aSolids.Extent() <= 1; } diff --git a/src/FiltersPlugin/Test/TestFilter_ExternalFaces.py b/src/FiltersPlugin/Test/TestFilter_ExternalFaces1.py similarity index 100% rename from src/FiltersPlugin/Test/TestFilter_ExternalFaces.py rename to src/FiltersPlugin/Test/TestFilter_ExternalFaces1.py diff --git a/src/FiltersPlugin/Test/TestFilter_ExternalFaces2.py b/src/FiltersPlugin/Test/TestFilter_ExternalFaces2.py new file mode 100644 index 000000000..5e3121c9f --- /dev/null +++ b/src/FiltersPlugin/Test/TestFilter_ExternalFaces2.py @@ -0,0 +1,69 @@ +# Copyright (C) 2014-2019 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 +from SketchAPI import * +from GeomAPI import * + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Box_1 = model.addBox(Part_1_doc, 10, 10, 10) +Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Left"), model.selection("FACE", "Box_1_1/Right")) +Sketch_1 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) +SketchLine_1 = Sketch_1.addLine(15, 2, 5, 2) +SketchLine_2 = Sketch_1.addLine(5, 2, 5, 8) +SketchLine_3 = Sketch_1.addLine(5, 8, 15, 8) +SketchLine_4 = Sketch_1.addLine(15, 8, 15, 2) +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()) +SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False) +SketchPoint_1 = SketchProjection_1.createdFeature() +SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_2.result(), 5, True) +SketchConstraintDistance_2 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_4.result(), 15, True) +SketchConstraintDistance_3 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_1.result(), 2, True) +SketchConstraintDistance_4 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_3.result(), 8, True) +model.do() +Face_1 = model.addFace(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_4r-SketchLine_3r-SketchLine_2r-SketchLine_1r")]) +Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Box_1_1"), model.selection("FACE", "Face_1_1")], 20190506) +Filters = model.filters(Part_1_doc, [model.addFilter(name = "ExternalFaces")]) +model.end() + +Reference = {} + +ResultPartition = Partition_1.result().resultSubShapePair()[0] +exp = GeomAPI_ShapeExplorer(ResultPartition.shape(), GeomAPI_Shape.FACE) +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +assert(not exp.more()) + +model.checkFilter(Part_1_doc, model, Filters, Reference) diff --git a/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude.py b/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude1.py similarity index 100% rename from src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude.py rename to src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude1.py diff --git a/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude2.py b/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude2.py new file mode 100644 index 000000000..9148ba337 --- /dev/null +++ b/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude2.py @@ -0,0 +1,69 @@ +# Copyright (C) 2014-2019 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 +from SketchAPI import * +from GeomAPI import * + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Box_1 = model.addBox(Part_1_doc, 10, 10, 10) +Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Left"), model.selection("FACE", "Box_1_1/Right")) +Sketch_1 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) +SketchLine_1 = Sketch_1.addLine(15, 2, 5, 2) +SketchLine_2 = Sketch_1.addLine(5, 2, 5, 8) +SketchLine_3 = Sketch_1.addLine(5, 8, 15, 8) +SketchLine_4 = Sketch_1.addLine(15, 8, 15, 2) +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()) +SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False) +SketchPoint_1 = SketchProjection_1.createdFeature() +SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_2.result(), 5, True) +SketchConstraintDistance_2 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_4.result(), 15, True) +SketchConstraintDistance_3 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_1.result(), 2, True) +SketchConstraintDistance_4 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_3.result(), 8, True) +model.do() +Face_1 = model.addFace(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_4r-SketchLine_3r-SketchLine_2r-SketchLine_1r")]) +Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Box_1_1"), model.selection("FACE", "Face_1_1")], 20190506) +Filters = model.filters(Part_1_doc, [model.addFilter(name = "ExternalFaces", exclude = True)]) +model.end() + +Reference = {} + +ResultPartition = Partition_1.result().resultSubShapePair()[0] +exp = GeomAPI_ShapeExplorer(ResultPartition.shape(), GeomAPI_Shape.FACE) +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = True; exp.next() +Reference[model.selection(ResultPartition, exp.current())] = False; exp.next() +assert(not exp.more()) + +model.checkFilter(Part_1_doc, model, Filters, Reference) -- 2.39.2