]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Issue #2239: Sketch not updated after having changed the parameter of multi-translati...
authorazv <azv@opencascade.com>
Fri, 4 Aug 2017 10:12:34 +0000 (13:12 +0300)
committerazv <azv@opencascade.com>
Fri, 4 Aug 2017 10:12:34 +0000 (13:12 +0300)
Update validator by minimal value supported.

src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/Test/Test2239.py [new file with mode: 0644]
src/SketchPlugin/plugin-Sketch.xml

index 82e27cd77e41a9efeee2f3899f5003402c08016a..73670e3b34afbf8ba473aaffb5c6636b904bab31 100644 (file)
@@ -198,4 +198,6 @@ ADD_UNIT_TESTS(TestSketchPointLine.py
                TestTrimCircle05.py
                TestTrimCircleAndArc01.py
                TestTrimLine01.py
-               TestTrimLine02.py)
+               TestTrimLine02.py
+               Test2239.py
+)
diff --git a/src/SketchPlugin/Test/Test2239.py b/src/SketchPlugin/Test/Test2239.py
new file mode 100644 (file)
index 0000000..71e5cea
--- /dev/null
@@ -0,0 +1,87 @@
+## 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<mailto:webmaster.salome@opencascade.com>
+##
+
+"""
+    Test2239.py
+    Test case for issue #2239 "Sketch not updated after having changed the parameter of multi-translation to 1"
+"""
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Parameter_N = model.addParameter(Part_1_doc, "N", "5")
+Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
+SketchLine_1 = Sketch_1.addLine(20, 0, 0, 0)
+SketchPoint_1 = Sketch_1.addPoint(model.selection("VERTEX", "PartSet/Origin"))
+SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchPoint_1.result())
+SketchLine_2 = Sketch_1.addLine(0, 0, 0, 20)
+SketchLine_3 = Sketch_1.addLine(0, 20, 20, 20)
+SketchLine_4 = Sketch_1.addLine(20, 20, 20, 0)
+SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint())
+SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint())
+SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint())
+SketchConstraintCoincidence_5 = 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())
+SketchConstraintEqual_1 = Sketch_1.setEqual(SketchLine_3.result(), SketchLine_4.result())
+SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_3.result(), 20)
+SketchLine_5 = Sketch_1.addLine(20, 0, 30, 0)
+SketchLine_5.setAuxiliary(True)
+SketchConstraintHorizontal_3 = Sketch_1.setHorizontal(SketchLine_5.result())
+SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_5.startPoint(), SketchLine_1.startPoint())
+SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_5.result(), 10)
+SketchMultiTranslation_1_objects = [SketchLine_1.result(), SketchLine_2.result(), SketchLine_3.result(), SketchLine_4.result()]
+SketchMultiTranslation_1 = Sketch_1.addTranslation(SketchMultiTranslation_1_objects, SketchLine_1.endPoint(), SketchLine_5.endPoint(), "N")
+model.do()
+
+model.testNbResults(Sketch_1, 1)
+model.testNbSubShapes(Sketch_1, GeomAPI_Shape.EDGE, [20])
+model.testNbSubShapes(Sketch_1, GeomAPI_Shape.VERTEX, [40])
+
+# check MultiTranslation error
+Parameter_N.setValue(1)
+model.do()
+assert(SketchMultiTranslation_1.feature().error() != "")
+
+
+# check MultiTranslation error disappears
+Parameter_N.setValue(2)
+model.do()
+assert(SketchMultiTranslation_1.feature().error() == "")
+
+model.testNbResults(Sketch_1, 1)
+model.testNbSubShapes(Sketch_1, GeomAPI_Shape.EDGE, [8])
+model.testNbSubShapes(Sketch_1, GeomAPI_Shape.VERTEX, [16])
+
+# check MultiTranslation is still correct
+Parameter_N.setValue(5)
+model.do()
+assert(SketchMultiTranslation_1.feature().error() == "")
+
+model.testNbResults(Sketch_1, 1)
+model.testNbSubShapes(Sketch_1, GeomAPI_Shape.EDGE, [20])
+model.testNbSubShapes(Sketch_1, GeomAPI_Shape.VERTEX, [40])
+
+model.end()
index 863d825318fe9659776d706eab9459a9ef2f6568..aa9fd2ce58e019117922f8ae68027d6d8b8a6c9b 100644 (file)
@@ -478,7 +478,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
             label="Total number of objects"
             tooltip="Total number of objects"
             default="2" min="2" use_reset="false">
-          <validator id="GeomValidators_Positive"/>
+          <validator id="GeomValidators_Positive" parameters="1"/>
         </integervalue>
         <validator id="PartSet_MultyTranslationSelection" />
       </feature>
@@ -523,7 +523,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
             label="Total number of objects"
             tooltip="Total number of objects"
             default="2" min="2" use_reset="false">
-          <validator id="GeomValidators_Positive"/>
+          <validator id="GeomValidators_Positive" parameters="1"/>
         </integervalue>
         <validator id="PartSet_MultyTranslationSelection" />
       </feature>