From: vsr Date: Wed, 20 Feb 2013 08:19:22 +0000 (+0000) Subject: Update test scripts X-Git-Tag: V6_main_FINAL~26 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cee2bc87522304c65b557d6d97c95a72b6516bb5;p=modules%2Fgeom.git Update test scripts --- diff --git a/doc/salome/examples/3dsketcher.py b/doc/salome/examples/3dsketcher.py index 84dc28112..69b779898 100644 --- a/doc/salome/examples/3dsketcher.py +++ b/doc/salome/examples/3dsketcher.py @@ -5,7 +5,7 @@ import salome gg = salome.ImportComponentGUI("GEOM") # Create a 3D sketcher (wire) on the given points coordinates -sketcher1 = geompy.Make3DSketcher([ 0,0,0, 50,50,50, 0,50,0, 50,0,50, 10,20,100, 0,0,0 ]) +sketcher1 = geompy.Make3DSketcher([ 0,0,0, 50,50,50, 0,50,0, 50,0,25, 10,20,100, 0,0,0 ]) # add object in the study id_sketcher1 = geompy.addToStudy(sketcher1, "Sketcher1") @@ -24,7 +24,7 @@ sk = geompy.Sketcher3D() sk.addPointsAbsolute(1,2,3, 7,0,0, 10,-3.5,-11) # add one segment, defined by two angles in "OXY" coordinate system and length -sk.addPointAnglesLength("OXY", 45, 0, 100) +sk.addPointRadiusAnglesRelative(45, 0, 100, "OXY") # add three points with relative coordinates # three segments will be added by this command diff --git a/doc/salome/examples/Makefile.am b/doc/salome/examples/Makefile.am index bf5110fb1..f6d1df44a 100644 --- a/doc/salome/examples/Makefile.am +++ b/doc/salome/examples/Makefile.am @@ -27,12 +27,12 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am pyexamplesdir = $(docdir)/examples/GEOM BAD_TESTS = \ - 3dsketcher.py \ angle.py \ complex_objs_ex06.py \ repairing_operations_ex09.py GOOD_TESTS = \ + 3dsketcher.py \ advanced_geom_objs_ex01.py \ advanced_geom_objs_ex02.py \ advanced_geom_objs_ex03.py \ diff --git a/src/GEOM_SWIG/gsketcher.py b/src/GEOM_SWIG/gsketcher.py index a3810ae06..f0354e8c3 100644 --- a/src/GEOM_SWIG/gsketcher.py +++ b/src/GEOM_SWIG/gsketcher.py @@ -45,8 +45,8 @@ class Sketcher3D: sk = geompy.Sketcher3D() sk.addPointsAbsolute(0,0,0, 70,0,0) sk.addPointsRelative(0, 0, 130) - sk.addPointAnglesLength("OXY", 50, 0, 100) - sk.addPointAnglesLength("OXZ", 30, 80, 130) + sk.addPointRadiusAnglesRelative(50, 0, 100, 'OXY') + sk.addPointRadiusAnglesRelative(30, 80, 130, 'OXZ') sk.close() a3D_Sketcher_1 = sk.wire() """