From 7447a8313915d2691598cf7a26e4b11d4c3dd117 Mon Sep 17 00:00:00 2001 From: azv Date: Thu, 2 May 2019 15:41:33 +0300 Subject: [PATCH] Fix error when fusing a face with a solid from a compsolid. --- src/FeaturesPlugin/CMakeLists.txt | 4 +- .../FeaturesPlugin_BooleanFuse.cpp | 5 +- ...estBooleanFuse_MultiLevelCompound_v0_1.py} | 6 +- ...TestBooleanFuse_MultiLevelCompound_v0_2.py | 95 +++++++++++++++++++ ...TestBooleanFuse_MultiLevelCompound_v0_3.py | 94 ++++++++++++++++++ 5 files changed, 200 insertions(+), 4 deletions(-) rename src/FeaturesPlugin/Test/{TestBooleanFuse_MultiLevelCompound0.py => TestBooleanFuse_MultiLevelCompound_v0_1.py} (98%) create mode 100644 src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py create mode 100644 src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_3.py diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index 16bb83fa5..5555d4743 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -462,7 +462,9 @@ ADD_UNIT_TESTS(TestExtrusion.py Test2878.py TestBooleanCommon_MultiLevelCompound0.py TestBooleanCut_MultiLevelCompound0.py - TestBooleanFuse_MultiLevelCompound0.py + TestBooleanFuse_MultiLevelCompound_v0_1.py + TestBooleanFuse_MultiLevelCompound_v0_2.py + TestBooleanFuse_MultiLevelCompound_v0_3.py TestBooleanSmash_MultiLevelCompound0.py TestBooleanSplit_MultiLevelCompound0.py TestPartition_MultiLevelCompound0.py diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp index 53c8d66f7..83fb86895 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp @@ -126,8 +126,6 @@ void FeaturesPlugin_BooleanFuse::execute() aMakeShapeList->appendAlgo(aCutAlgo); } } - anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(), - anEdgesAndFaces.end()); // If we have compsolids then cut with not used solids all others. if (!aShapesToAdd.empty()) { @@ -146,6 +144,9 @@ void FeaturesPlugin_BooleanFuse::execute() } } + anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(), + anEdgesAndFaces.end()); + if (!aSolidsToFuse.empty()) { anObjects.clear(); anObjects.push_back(aSolidsToFuse.back()); diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound0.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_1.py similarity index 98% rename from src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound0.py rename to src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_1.py index 9ec81ae30..db007c14a 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound0.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_1.py @@ -79,7 +79,9 @@ Compound_1.result().subResult(1).subResult(0).setColor(0, 255, 0) Compound_1.result().subResult(1).subResult(1).setColor(0, 255, 0) Fuse_1_objects_1 = [model.selection("SOLID", "LinearCopy_2_1_1_1"), model.selection("SOLID", "Compound_1_1_1_1"), model.selection("COMPOUND", "Compound_1_1_2")] Fuse_1 = model.addFuse(Part_1_doc, Fuse_1_objects_1, True) -model.do() + +model.testHaveNamingSubshapes(Fuse_1, model, Part_1_doc) + model.end() from GeomAPI import GeomAPI_Shape @@ -91,3 +93,5 @@ model.testNbSubShapes(Fuse_1, GeomAPI_Shape.FACE, [31]) model.testNbSubShapes(Fuse_1, GeomAPI_Shape.EDGE, [156]) model.testNbSubShapes(Fuse_1, GeomAPI_Shape.VERTEX, [312]) model.testResultsVolumes(Fuse_1, [13659.954047657343835453502833843]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py new file mode 100644 index 000000000..00952d2fa --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py @@ -0,0 +1,95 @@ +# 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 SketchAPI import * + +from salome.shaper import model + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Cylinder_1 = model.addCylinder(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), model.selection("EDGE", "PartSet/OZ"), 5, 10) +LinearCopy_1 = model.addMultiTranslation(Part_1_doc, [model.selection("SOLID", "Cylinder_1_1")], model.selection("EDGE", "PartSet/OY"), 15, 3) +LinearCopy_2 = model.addMultiTranslation(Part_1_doc, [model.selection("COMPOUND", "LinearCopy_1_1")], model.selection("EDGE", "PartSet/OX"), -20, 2) +Extrusion_1 = model.addExtrusion(Part_1_doc, [], model.selection(), 10, 0) +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchLine_1 = Sketch_1.addLine(10, -5, 0, -5) +SketchLine_2 = Sketch_1.addLine(0, -5, 0, 0) +SketchLine_3 = Sketch_1.addLine(0, 0, 10, 0) +SketchLine_4 = Sketch_1.addLine(10, 0, 10, -5) +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(10, -5, 20, -5) +SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_1.startPoint(), SketchLine_5.startPoint()) +SketchLine_6 = Sketch_1.addLine(20, -5, 20, 0) +SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint()) +SketchLine_7 = Sketch_1.addLine(20, 0, 10, 0) +SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchLine_7.startPoint()) +SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_7.endPoint()) +SketchConstraintHorizontal_3 = Sketch_1.setHorizontal(SketchLine_5.result()) +SketchConstraintHorizontal_4 = Sketch_1.setHorizontal(SketchLine_7.result()) +SketchConstraintVertical_3 = Sketch_1.setVertical(SketchLine_6.result()) +SketchConstraintEqual_1 = Sketch_1.setEqual(SketchLine_1.result(), SketchLine_5.result()) +SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False) +SketchLine_8 = SketchProjection_1.createdFeature() +SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchAPI_Line(SketchLine_8).startPoint()) +SketchConstraintCoincidence_9.setName("SketchConstraintCoincidence_10") +SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_2.result(), 5) +SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_1.result(), 10) +Extrusion_1.setNestedSketch(Sketch_1) +Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_1_1_2/From_Face")) +SketchLine_9 = Sketch_2.addLine(22, 2.5, 6, 2.5) +SketchConstraintHorizontal_5 = Sketch_2.setHorizontal(SketchLine_9.result()) +SketchConstraintLength_3 = Sketch_2.setLength(SketchLine_9.result(), 16) +SketchProjection_2 = Sketch_2.addProjection(model.selection("EDGE", "[Extrusion_1_1_1/Generated_Face&Sketch_1/SketchLine_4][Extrusion_1_1_1/From_Face]"), False) +SketchLine_10 = SketchProjection_2.createdFeature() +SketchPoint_1 = Sketch_2.addPoint(10, 2.5) +SketchConstraintCoincidence_10 = Sketch_2.setCoincident(SketchPoint_1.coordinates(), SketchLine_9.result()) +SketchConstraintCoincidence_10.setName("SketchConstraintCoincidence_11") +SketchConstraintMiddle_1 = Sketch_2.setMiddlePoint(SketchPoint_1.coordinates(), SketchLine_10.result()) +SketchConstraintDistance_1 = Sketch_2.setDistance(SketchLine_9.startPoint(), SketchLine_10.result(), 12, True) +model.do() +Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_9")]) +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], model.selection("EDGE", "PartSet/OZ"), 13, 3) +Compound_1 = model.addCompound(Part_1_doc, [model.selection("COMPSOLID", "Extrusion_1_1"), model.selection("FACE", "Extrusion_2_1")]) +Fuse_1_objects_1 = [model.selection("SOLID", "Compound_1_1_1_1"), model.selection("SOLID", "LinearCopy_2_1_1_1"), model.selection("FACE", "Compound_1_1_2")] +Fuse_1 = model.addFuse(Part_1_doc, Fuse_1_objects_1, True) + +model.testHaveNamingSubshapes(Fuse_1, model, Part_1_doc) + +model.end() + +from GeomAPI import GeomAPI_Shape + +model.testNbResults(Fuse_1, 1) +model.testNbSubResults(Fuse_1, [2]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.SOLID, [1]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.FACE, [8]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.EDGE, [40]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.VERTEX, [80]) +model.testResultsVolumes(Fuse_1, [1089.04862267261933]) + +assert(model.checkPythonDump()) diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_3.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_3.py new file mode 100644 index 000000000..4e209565d --- /dev/null +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_3.py @@ -0,0 +1,94 @@ +# 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 SketchAPI import * + +from salome.shaper import model + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Cylinder_1 = model.addCylinder(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), model.selection("EDGE", "PartSet/OZ"), 5, 10) +LinearCopy_1 = model.addMultiTranslation(Part_1_doc, [model.selection("SOLID", "Cylinder_1_1")], model.selection("EDGE", "PartSet/OY"), 15, 3) +LinearCopy_2 = model.addMultiTranslation(Part_1_doc, [model.selection("COMPOUND", "LinearCopy_1_1")], model.selection("EDGE", "PartSet/OX"), -20, 2) +Extrusion_1 = model.addExtrusion(Part_1_doc, [], model.selection(), 10, 0) +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchLine_1 = Sketch_1.addLine(10, -5, 0, -5) +SketchLine_2 = Sketch_1.addLine(0, -5, 0, 0) +SketchLine_3 = Sketch_1.addLine(0, 0, 10, 0) +SketchLine_4 = Sketch_1.addLine(10, 0, 10, -5) +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(10, -5, 20, -5) +SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_1.startPoint(), SketchLine_5.startPoint()) +SketchLine_6 = Sketch_1.addLine(20, -5, 20, 0) +SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint()) +SketchLine_7 = Sketch_1.addLine(20, 0, 10, 0) +SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchLine_7.startPoint()) +SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_7.endPoint()) +SketchConstraintHorizontal_3 = Sketch_1.setHorizontal(SketchLine_5.result()) +SketchConstraintHorizontal_4 = Sketch_1.setHorizontal(SketchLine_7.result()) +SketchConstraintVertical_3 = Sketch_1.setVertical(SketchLine_6.result()) +SketchConstraintEqual_1 = Sketch_1.setEqual(SketchLine_1.result(), SketchLine_5.result()) +SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False) +SketchLine_8 = SketchProjection_1.createdFeature() +SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchAPI_Line(SketchLine_8).startPoint()) +SketchConstraintCoincidence_9.setName("SketchConstraintCoincidence_10") +SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_2.result(), 5) +SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_1.result(), 10) +Extrusion_1.setNestedSketch(Sketch_1) +Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_1_1_2/From_Face")) +SketchLine_9 = Sketch_2.addLine(22, 2.5, 6, 2.5) +SketchConstraintHorizontal_5 = Sketch_2.setHorizontal(SketchLine_9.result()) +SketchConstraintLength_3 = Sketch_2.setLength(SketchLine_9.result(), 16) +SketchProjection_2 = Sketch_2.addProjection(model.selection("EDGE", "[Extrusion_1_1_1/Generated_Face&Sketch_1/SketchLine_4][Extrusion_1_1_1/From_Face]"), False) +SketchLine_10 = SketchProjection_2.createdFeature() +SketchPoint_1 = Sketch_2.addPoint(10, 2.5) +SketchConstraintCoincidence_10 = Sketch_2.setCoincident(SketchPoint_1.coordinates(), SketchLine_9.result()) +SketchConstraintCoincidence_10.setName("SketchConstraintCoincidence_11") +SketchConstraintMiddle_1 = Sketch_2.setMiddlePoint(SketchPoint_1.coordinates(), SketchLine_10.result()) +SketchConstraintDistance_1 = Sketch_2.setDistance(SketchLine_9.startPoint(), SketchLine_10.result(), 12, True) +model.do() +Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/SketchLine_9")]) +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], model.selection("EDGE", "PartSet/OZ"), 13, 3) +Compound_1 = model.addCompound(Part_1_doc, [model.selection("COMPSOLID", "Extrusion_1_1"), model.selection("FACE", "Extrusion_2_1")]) +Fuse_1 = model.addFuse(Part_1_doc, [model.selection("SOLID", "Compound_1_1_1_1")], [model.selection("SOLID", "LinearCopy_2_1_1_1"), model.selection("FACE", "Compound_1_1_2")], True) + +model.testHaveNamingSubshapes(Fuse_1, model, Part_1_doc) + +model.end() + +from GeomAPI import GeomAPI_Shape + +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, [16]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.EDGE, [78]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.VERTEX, [156]) +model.testResultsVolumes(Fuse_1, [1589.048622670478835]) + +assert(model.checkPythonDump()) -- 2.39.2