From 7f5522a8392270b62cee7a54e3926ef821276e36 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 15 Jan 2013 10:56:11 +0000 Subject: [PATCH] Mantis issue 0021718: EDF 1874: Ergonomic of multi-translation / multi-rotation --- src/GEOM_SWIG/GEOM_TestAll.py | 12 ++++++++---- src/GEOM_SWIG/GEOM_TestOthers.py | 13 +++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index bffea27ea..467463400 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -290,8 +290,10 @@ def TestAll (geompy, math): #Create Patterns MultiTrans1D = geompy.MakeMultiTranslation1D(Fillet, vz, step1, nbtimes1) MultiTrans2D = geompy.MakeMultiTranslation2D(Fillet, vz, step1, nbtimes1, vy, step2, nbtimes2) - MultiRot1D = geompy.MultiRotate1DNbTimes(Chamfer, vx, nbtimes1) - MultiRot2D = geompy.MultiRotate2DByStep(Chamfer, vx, angle1, nbtimes1, step1, nbtimes2) + MultiRot1Dt = geompy.MultiRotate1DNbTimes(Chamfer, vx, nbtimes1) + MultiRot1Ds = geompy.MultiRotate1DByStep(Chamfer, vx, math.pi/4., nbtimes1) + MultiRot2Dt = geompy.MultiRotate2DNbTimes(Chamfer, vx, nbtimes1, step1, nbtimes2) + MultiRot2Ds = geompy.MultiRotate2DByStep(Chamfer, vx, angle1, nbtimes1, step1, nbtimes2) #Create Informations objects CDG = geompy.MakeCDG(Prism) #(GEOM_Object)->GEOM_Object @@ -465,8 +467,10 @@ def TestAll (geompy, math): id_MultiTrans1D = geompy.addToStudy(MultiTrans1D, "MultiTrans1D") id_MultiTrans2D = geompy.addToStudy(MultiTrans2D, "MultiTrans2D") - id_MultiRot1D = geompy.addToStudy(MultiRot1D, "MultiRot1D") - id_MultiRot2D = geompy.addToStudy(MultiRot2D, "MultiRot2D") + id_MultiRot1Dt = geompy.addToStudy(MultiRot1Dt, "MultiRot1D NbTimes") + id_MultiRot1Ds = geompy.addToStudy(MultiRot1Ds, "MultiRot1D ByStep") + id_MultiRot2Dt = geompy.addToStudy(MultiRot2Dt, "MultiRot2D NbTimes") + id_MultiRot2Ds = geompy.addToStudy(MultiRot2Ds, "MultiRot2D ByStep") id_CDG = geompy.addToStudy(CDG, "CDG") id_Archimede = geompy.addToStudy(Archimede, "Archimede") diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index afd2a0af5..5ed4cbaab 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -186,11 +186,16 @@ def TestOtherOperations (geompy, math): pz = geompy.MakeVertex(0, 0, 100) vy = geompy.MakeVectorDXDYDZ(0, 100, 0) - MultiRot1D = geompy.MakeMultiRotation1DNbTimes(f12, vy, pz, 6) - MultiRot2D = geompy.MakeMultiRotation2DByStep(f12, vy, pz, math.pi/4, 6, 30, 3) + MultiRot1Dt = geompy.MakeMultiRotation1DNbTimes(f12, vy, pz, 6) + MultiRot1Ds = geompy.MakeMultiRotation1DByStep(f12, vy, pz, math.pi/5., 6) - id_MultiRot1D = geompy.addToStudy(MultiRot1D, "MakeMultiRotation1D") - id_MultiRot2D = geompy.addToStudy(MultiRot2D, "MakeMultiRotation2D") + MultiRot2Dt = geompy.MakeMultiRotation2DNbTimes(f12, vy, pz, 5, 30, 3) + MultiRot2Ds = geompy.MakeMultiRotation2DByStep(f12, vy, pz, math.pi/4., 6, 30, 3) + + geompy.addToStudy(MultiRot1Dt, "MakeMultiRotation1DNbTimes") + geompy.addToStudy(MultiRot1Ds, "MakeMultiRotation1DByStep") + geompy.addToStudy(MultiRot2Dt, "MakeMultiRotation2DNbTimes") + geompy.addToStudy(MultiRot2Ds, "MakeMultiRotation2DByStep") # MakeFilletAll radius_fillet = 10. -- 2.39.2