From: mpv Date: Mon, 24 Jul 2017 14:23:22 +0000 (+0300) Subject: Fix for the issue #2228 : do not propagate result context forward in history, includi... X-Git-Tag: V_2.7.2~26 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c27bc66f8641cb233c14819de31d7e2eba2109d3;p=modules%2Fshaper.git Fix for the issue #2228 : do not propagate result context forward in history, including the current feature, like in this example. --- diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index 5664b23e1..315e60a88 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -665,7 +665,7 @@ void Model_AttributeSelection::selectSubShape( Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(aConShape, selectionLabel()); if (!aNS.IsNull()) { aNS = TNaming_Tool::CurrentNamedShape(aNS); - if (!aNS.IsNull()) { + if (!aNS.IsNull() && scope().Contains(aNS->Label())) { // scope check is for 2228 TDF_Label aLab = aNS->Label(); while(aLab.Depth() != 7 && aLab.Depth() > 5) aLab = aLab.Father(); diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 9f039b63b..8d574b697 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -167,4 +167,5 @@ ADD_UNIT_TESTS(TestConstants.py Test1995.py Test2170.py TestExternalConstruction.py + Test2228.py ) diff --git a/src/ModelAPI/Test/Test2228.py b/src/ModelAPI/Test/Test2228.py new file mode 100644 index 000000000..f7da0bf4c --- /dev/null +++ b/src/ModelAPI/Test/Test2228.py @@ -0,0 +1,76 @@ +## Copyright (C) 2014-2017 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() +Sketch_1 = model.addSketch(partSet, model.defaultPlane("XOY")) +SketchPoint_1 = Sketch_1.addPoint(model.selection("VERTEX", "Origin")) +SketchCircle_1 = Sketch_1.addCircle(0, 0, 0.3529019640553777) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchPoint_1.result(), SketchCircle_1.center()) +SketchCircle_2 = Sketch_1.addCircle(0, 0, 0.4492388920251514) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchPoint_1.coordinates(), SketchCircle_2.center()) +model.do() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "PartSet/Sketch_1/Face-SketchCircle_1_2r-SketchCircle_2_2f")], model.selection(), 5, 0) +Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/YOZ")) +SketchCircle_3 = Sketch_2.addCircle(-0.01730125245914903, 1.175069067120482, 0.2787321880802174) +SketchCircle_4 = Sketch_2.addCircle(-0.01730125245914903, 1.175069067120482, 0.3197841740766353) +SketchConstraintCoincidence_3 = Sketch_2.setCoincident(SketchCircle_3.center(), SketchCircle_4.center()) +model.do() +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchCircle_1_2r-SketchCircle_2_2f")], model.selection(), 0, 3) +Extrusion_3 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "PartSet/Sketch_1/Face-SketchCircle_1_2f")], model.selection(), model.selection("FACE", "Extrusion_1_1/To_Face_1"), 0, model.selection(), 0) +Boolean_1 = model.addCut(Part_1_doc, [model.selection("SOLID", "Extrusion_2_1")], [model.selection("SOLID", "Extrusion_3_1")]) +Sketch_3 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/XOZ")) +SketchLine_1 = Sketch_3.addLine(-3.362323990279312, -0.5188129046480872, 0.8318943090987101, -0.5188129046480872) +SketchLine_2 = Sketch_3.addLine(0.8318943090987101, -0.5188129046480872, 0.8318943090987101, 7.155729512171993) +SketchLine_3 = Sketch_3.addLine(0.8318943090987101, 7.155729512171993, -3.362323990279312, 7.155729512171993) +SketchLine_4 = Sketch_3.addLine(-3.362323990279312, 7.155729512171993, -3.362323990279312, -0.5188129046480872) +SketchConstraintCoincidence_4 = Sketch_3.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint()) +SketchConstraintCoincidence_5 = Sketch_3.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint()) +SketchConstraintCoincidence_6 = Sketch_3.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint()) +SketchConstraintCoincidence_7 = Sketch_3.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) +SketchConstraintHorizontal_1 = Sketch_3.setHorizontal(SketchLine_1.result()) +SketchConstraintVertical_1 = Sketch_3.setVertical(SketchLine_2.result()) +SketchConstraintHorizontal_2 = Sketch_3.setHorizontal(SketchLine_3.result()) +SketchConstraintVertical_2 = Sketch_3.setVertical(SketchLine_4.result()) +model.do() +Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-SketchLine_2"), model.selection("EDGE", "Sketch_2/Edge-SketchLine_3"), model.selection("EDGE", "Sketch_2/Edge-SketchLine_4"), model.selection("EDGE", "Sketch_2/Edge-SketchLine_1")]) +Extrusion_4 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Sketch_1/Wire-SketchCircle_2_2f")], model.selection(), model.selection("FACE", "Extrusion_2_1/From_Face_1"), 0, model.selection(), 0) +Boolean_2 = model.addCut(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1")], [model.selection("SOLID", "Extrusion_4_1")]) +Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Boolean_1_1"), model.selection("SOLID", "Boolean_2_1"), model.selection("FACE", "Face_1_1")]) +Remove_SubShapes_1 = model.addRemoveSubShapes(Part_1_doc, model.selection("COMPOUND", "Partition_1_1")) +Remove_SubShapes_1.setSubShapesToKeep([model.selection("COMPSOLID", "Partition_1_1_1"), model.selection("FACE", "Partition_1_1_3"), model.selection("FACE", "Partition_1_1_4"), model.selection("FACE", "Partition_1_1_5"), model.selection("FACE", "Partition_1_1_6"), model.selection("FACE", "Partition_1_1_7")]) +model.end() + + +# check that remove sub-shapes contains correct selection +from ModelAPI import * +aFactory = ModelAPI_Session.get().validators() +assert(aFactory.validate(Remove_SubShapes_1.feature())) +assert(Remove_SubShapes_1.subshapes().size() == 6) +assert(Remove_SubShapes_1.subshapes().value(0).namingName() == "Partition_1_1_1") +assert(Remove_SubShapes_1.subshapes().value(1).namingName() == "Partition_1_1_3") +assert(Remove_SubShapes_1.subshapes().value(2).namingName() == "Partition_1_1_4") +assert(Remove_SubShapes_1.subshapes().value(3).namingName() == "Partition_1_1_5") +assert(Remove_SubShapes_1.subshapes().value(4).namingName() == "Partition_1_1_6") +assert(Remove_SubShapes_1.subshapes().value(5).namingName() == "Partition_1_1_7")