-## 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>
-##
+# Copyright (C) 2014-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.do()
# Get sketch points
-base_name = "Sketch_1/Vertex-SketchPoint_"
+base_name = "Sketch_1/SketchPoint_"
p_1, p_2, p_3, p_4, p_5 = [model.selection("VERTEX", base_name + str(i + 1)) for i in range(0, 5)]
# Get sketch edges
-Tangent_1 = model.selection("EDGE", "Sketch_1/Edge-SketchLine_1")
-Tangent_2 = model.selection("EDGE", "Sketch_1/Edge-SketchLine_2")
+Tangent_1 = model.selection("EDGE", "Sketch_1/SketchLine_1")
+Tangent_2 = model.selection("EDGE", "Sketch_1/SketchLine_2")
# =============================================================================
# Test 1. Create curve 1-2-3-4-5, closed off, reorder off, without tangents
model.checkResult(Interpolation_1, model, 1, [0], [0], [0], [1], [2])
-# # =============================================================================
-# # Test 2. Create curve 1-2-3-4-5-1, closed on, reorder off, without tangents
-# # =============================================================================
+# =============================================================================
+# Test 2. Create curve 1-2-3-4-5-1, closed on, reorder off, without tangents
+# =============================================================================
Interpolation_2 = model.addInterpolation(Part_1_doc, [p_1, p_2, p_3, p_4, p_5], True, False)
model.do()
model.checkResult(Interpolation_2, model, 1, [0], [0], [0], [1], [2])
-# # =============================================================================
-# # Test 3. Create curve 1-2-3-4, closed off, reorder on, without tangents
-# # =============================================================================
+# =============================================================================
+# Test 3. Create curve 1-2-3-4, closed off, reorder on, without tangents
+# =============================================================================
Interpolation_3 = model.addInterpolation(Part_1_doc, [p_1, p_2, p_3, p_4], False, True)
model.do()
Part_2_doc = Part_2.document()
Box_1 = model.addBox(Part_2_doc, 10, 10, 10)
-point_names = ("Box_1_1/Back&Box_1_1/Left&Box_1_1/Bottom",
- "Box_1_1/Back&Box_1_1/Left&Box_1_1/Top",
- "Box_1_1/Front&Box_1_1/Left&Box_1_1/Top",
- "Box_1_1/Front&Box_1_1/Left&Box_1_1/Bottom",
- "Box_1_1/Front&Box_1_1/Right&Box_1_1/Bottom",
- "Box_1_1/Front&Box_1_1/Right&Box_1_1/Top",
- "Box_1_1/Back&Box_1_1/Right&Box_1_1/Top",
- "Box_1_1/Back&Box_1_1/Right&Box_1_1/Bottom")
+point_names = ("[Box_1_1/Back][Box_1_1/Left][Box_1_1/Bottom]",
+ "[Box_1_1/Back][Box_1_1/Left][Box_1_1/Top]",
+ "[Box_1_1/Front][Box_1_1/Left][Box_1_1/Top]",
+ "[Box_1_1/Front][Box_1_1/Left][Box_1_1/Bottom]",
+ "[Box_1_1/Front][Box_1_1/Right][Box_1_1/Bottom]",
+ "[Box_1_1/Front][Box_1_1/Right][Box_1_1/Top]",
+ "[Box_1_1/Back][Box_1_1/Right][Box_1_1/Top]",
+ "[Box_1_1/Back][Box_1_1/Right][Box_1_1/Bottom]")
points = [model.selection("VERTEX", name) for name in point_names]
Interpolation_8 = model.addInterpolation(Part_2_doc, points, False, False)
Box_1 = model.addBox(Part_3_doc, 20, 30, 40)
points = [model.selection("VERTEX", name) for name in point_names]
-Tangent_1 = model.selection("EDGE", "Box_1_1/Back&Box_1_1/Top")
-Tangent_2 = model.selection("EDGE", "Box_1_1/Left&Box_1_1/Top")
+Tangent_1 = model.selection("EDGE", "[Box_1_1/Back][Box_1_1/Top]")
+Tangent_2 = model.selection("EDGE", "[Box_1_1/Left][Box_1_1/Top]")
Interpolation_9 = model.addInterpolation(Part_3_doc, points,
Tangent_1, Tangent_2, False, False)
# =============================================================================
# Test 12. Check Python dump
# =============================================================================
-assert(model.checkPythonDump())
+assert(model.checkPythonDump(model.ModelHighAPI.CHECK_NAMING))
