X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_SWIG%2FGEOM_TestOthers.py;h=2cb39a2bf9e298641dd69e8b34d6e4c1eead5716;hb=b5e1dcdd78a65f6747d02786a193b0d62c7d575c;hp=4f85d818335a910992bba877cce56b2223ad065f;hpb=eb33929a623da3858f8105e54f0834f8393f5414;p=modules%2Fgeom.git diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 4f85d8183..2cb39a2bf 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -7,7 +7,7 @@ # 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. +# 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 @@ -23,7 +23,6 @@ # File : GEOM_TestOthers.py # Author : Julia DOROVSKIKH # Module : GEOM -# $Header$ # # ! Please, if you edit this example file, update also # ! GEOM_SRC/doc/salome/gui/GEOM/input/tui_test_others.doc @@ -31,6 +30,7 @@ # ! documentation generation to identify certain places of this file import os +import GEOM def TestExportImport (geompy, shape): @@ -163,17 +163,29 @@ def TestOtherOperations (geompy, math): id_Orientation = geompy.addToStudy(Orientation, "OrientationChange") # MakeCommon, MakeCut, MakeFuse, MakeSection + p1 = geompy.MakeVertex(60, 120, 0) + p2 = geompy.MakeVertex( 0, 0, 0) + v = geompy.MakeVector(p1, p2) + height = 90 + radius1 = 50 + cylinder = geompy.MakeCylinder(p1, v, radius1, height) Sphere = geompy.MakeSphereR(100) - Common = geompy.MakeCommon (Box, Sphere) - Cut = geompy.MakeCut (Box, Sphere) - Fuse = geompy.MakeFuse (Box, Sphere) - Section = geompy.MakeSection(Box, Sphere) - - id_Common = geompy.addToStudy(Common, "Common") - id_Cut = geompy.addToStudy(Cut, "Cut") - id_Fuse = geompy.addToStudy(Fuse, "Fuse") + Common1 = geompy.MakeCommon (Box, Sphere) + Cut1 = geompy.MakeCut (Box, Sphere) + Fuse1 = geompy.MakeFuse (Box, Sphere) + Section = geompy.MakeSection (Box, Sphere) + Common2 = geompy.MakeCommonList([Box, Sphere, cylinder]) + Cut2 = geompy.MakeCutList (Box, [Sphere, cylinder]) + Fuse2 = geompy.MakeFuseList ([Box, Sphere, cylinder]) + + id_Common1 = geompy.addToStudy(Common1, "Common_1") + id_Cut1 = geompy.addToStudy(Cut1, "Cut_1") + id_Fuse1 = geompy.addToStudy(Fuse1, "Fuse_1") id_Section = geompy.addToStudy(Section, "Section") + id_Common2 = geompy.addToStudy(Common2, "Common_2") + id_Cut2 = geompy.addToStudy(Cut2, "Cut_2") + id_Fuse2 = geompy.addToStudy(Fuse2, "Fuse_2") # Partition p100 = geompy.MakeVertex(100, 100, 100) @@ -187,11 +199,16 @@ def TestOtherOperations (geompy, math): pz = geompy.MakeVertex(0, 0, 100) vy = geompy.MakeVectorDXDYDZ(0, 100, 0) - MultiRot1D = geompy.MakeMultiRotation1D(f12, vy, pz, 6) - MultiRot2D = geompy.MakeMultiRotation2D(f12, vy, pz, 45, 6, 30, 3) + MultiRot1Dt = geompy.MakeMultiRotation1DNbTimes(f12, vy, pz, 6) + MultiRot1Ds = geompy.MakeMultiRotation1DByStep(f12, vy, pz, math.pi/5., 6) + + MultiRot2Dt = geompy.MakeMultiRotation2DNbTimes(f12, vy, pz, 5, 30, 3) + MultiRot2Ds = geompy.MakeMultiRotation2DByStep(f12, vy, pz, math.pi/4., 6, 30, 3) - id_MultiRot1D = geompy.addToStudy(MultiRot1D, "MakeMultiRotation1D") - id_MultiRot2D = geompy.addToStudy(MultiRot2D, "MakeMultiRotation2D") + geompy.addToStudy(MultiRot1Dt, "MakeMultiRotation1DNbTimes") + geompy.addToStudy(MultiRot1Ds, "MakeMultiRotation1DByStep") + geompy.addToStudy(MultiRot2Dt, "MakeMultiRotation2DNbTimes") + id_MultiRot2D = geompy.addToStudy(MultiRot2Ds, "MakeMultiRotation2DByStep") # MakeFilletAll radius_fillet = 10. @@ -523,6 +540,11 @@ def TestOtherOperations (geompy, math): geompy.addToStudy(freeFacesWithoutExtra, "freeFacesWithoutExtra") + # UnionFaces + unitedFaces = geompy.UnionFaces(freeFaces) + + geompy.addToStudy(unitedFaces, "unitedFaces") + # GetSharedShapes sharedFaces = geompy.GetSharedShapes(part, freeFaces, geompy.ShapeType["FACE"]) @@ -594,13 +616,13 @@ def TestOtherOperations (geompy, math): # GetShapesOnPlane faces_on_pln = geompy.GetShapesOnPlane(blocksComp, geompy.ShapeType["FACE"], - v_0pp, geompy.GEOM.ST_ONIN) + v_0pp, GEOM.ST_ONIN) for face_i in faces_on_pln: geompy.addToStudy(face_i, "Face on Plane (N = (0, 1, 1)) or below it") # GetShapesOnPlaneIDs faces_above_pln_ids = geompy.GetShapesOnPlaneIDs(blocksComp, geompy.ShapeType["FACE"], - v_0pp, geompy.GEOM.ST_OUT) + v_0pp, GEOM.ST_OUT) faces_above = geompy.CreateGroup(blocksComp, geompy.ShapeType["FACE"]) geompy.UnionIDs(faces_above, faces_above_pln_ids) geompy.addToStudy(faces_above, "Group of faces above Plane (N = (0, 1, 1))") @@ -608,13 +630,13 @@ def TestOtherOperations (geompy, math): # GetShapesOnPlaneWithLocation Loc = geompy.MakeVertex(0, -50, 0) edges_on_pln = geompy.GetShapesOnPlaneWithLocation(blocksComp, geompy.ShapeType["EDGE"], - v_y, Loc, geompy.GEOM.ST_ON) + v_y, Loc, GEOM.ST_ON) for edge_i in edges_on_pln: geompy.addToStudy(edge_i, "Edge on Plane (N = (0, -1, 0) & Location = (0, -50, 0)") # GetShapesOnPlaneWithLocationIDs edges_on_pln_ids = geompy.GetShapesOnPlaneWithLocationIDs( - blocksComp, geompy.ShapeType["EDGE"], v_y, Loc, geompy.GEOM.ST_ON) + blocksComp, geompy.ShapeType["EDGE"], v_y, Loc, GEOM.ST_ON) group_edges_on_pln = geompy.CreateGroup(blocksComp, geompy.ShapeType["EDGE"]) geompy.UnionIDs(group_edges_on_pln, edges_on_pln_ids) grname = "Group of edges on Plane (N = (0, -1, 0) & Location = (0, -50, 0))" @@ -622,39 +644,39 @@ def TestOtherOperations (geompy, math): # GetShapesOnCylinder edges_out_cyl = geompy.GetShapesOnCylinder(blocksComp, geompy.ShapeType["EDGE"], - vy, 55, geompy.GEOM.ST_OUT) + vy, 55, GEOM.ST_OUT) for edge_i in edges_out_cyl: geompy.addToStudy(edge_i, "Edge out of Cylinder (axis = (0, 1, 0), r = 55)") # GetShapesOnCylinderIDs edges_in_cyl_ids = geompy.GetShapesOnCylinderIDs(blocksComp, geompy.ShapeType["EDGE"], - vy, 80, geompy.GEOM.ST_IN) + vy, 80, GEOM.ST_IN) edges_in = geompy.CreateGroup(blocksComp, geompy.ShapeType["EDGE"]) geompy.UnionIDs(edges_in, edges_in_cyl_ids) geompy.addToStudy(edges_in, "Group of edges inside Cylinder (axis = (0, 1, 0), r = 55)") # GetShapesOnCylinderWithLocation edges_out_cyl = geompy.GetShapesOnCylinderWithLocation(blocksComp, geompy.ShapeType["EDGE"], - vy, p11, 55, geompy.GEOM.ST_OUT) + vy, p11, 55, GEOM.ST_OUT) for edge_i in edges_out_cyl: geompy.addToStudy(edge_i, "Edge out of Cylinder (axis = (0, 1, 0), loc = (0, 0, 0), r = 55)") # GetShapesOnCylinderWithLocationIDs edges_in_cyl_ids = geompy.GetShapesOnCylinderWithLocationIDs(blocksComp, geompy.ShapeType["EDGE"], - vy, p11, 80, geompy.GEOM.ST_IN) + vy, p11, 80, GEOM.ST_IN) edges_in = geompy.CreateGroup(blocksComp, geompy.ShapeType["EDGE"]) geompy.UnionIDs(edges_in, edges_in_cyl_ids) geompy.addToStudy(edges_in, "Group of edges inside Cylinder (axis = (0, 1, 0), loc = (0, 0, 0), r = 80)") # GetShapesOnSphere vertices_on_sph = geompy.GetShapesOnSphere(blocksComp, geompy.ShapeType["VERTEX"], - p0, 100, geompy.GEOM.ST_ON) + p0, 100, GEOM.ST_ON) for vertex_i in vertices_on_sph: geompy.addToStudy(vertex_i, "Vertex on Sphere (center = (0, 0, 0), r = 100)") # GetShapesOnSphereIDs vertices_on_sph_ids = geompy.GetShapesOnSphereIDs(blocksComp, geompy.ShapeType["VERTEX"], - p0, 100, geompy.GEOM.ST_ON) + p0, 100, GEOM.ST_ON) vertices_on = geompy.CreateGroup(blocksComp, geompy.ShapeType["VERTEX"]) geompy.UnionIDs(vertices_on, vertices_on_sph_ids) geompy.addToStudy(vertices_on, "Group of vertices on Sphere (center = (0, 0, 0), r = 100)") @@ -675,7 +697,7 @@ def TestOtherOperations (geompy, math): geompy.addToStudy(quadrangle, "Quadrangle") edges_onin_quad = geompy.GetShapesOnQuadrangle(f12, geompy.ShapeType["EDGE"], - tl, tr, bl, br, geompy.GEOM.ST_ONIN) + tl, tr, bl, br, GEOM.ST_ONIN) comp = geompy.MakeCompound(edges_onin_quad) geompy.addToStudy(comp, "Edges of F12 ONIN Quadrangle") if len( edges_onin_quad ) != 4: @@ -683,14 +705,14 @@ def TestOtherOperations (geompy, math): # GetShapesOnQuadrangleIDs vertices_on_quad_ids = geompy.GetShapesOnQuadrangleIDs(f12, geompy.ShapeType["VERTEX"], - tl, tr, bl, br, geompy.GEOM.ST_ON) + tl, tr, bl, br, GEOM.ST_ON) vertices_on_quad = geompy.CreateGroup(f12, geompy.ShapeType["VERTEX"]) geompy.UnionIDs(vertices_on_quad, vertices_on_quad_ids) geompy.addToStudy(vertices_on_quad, "Group of vertices on Quadrangle F12") # GetShapesOnBox edges_on_box = geompy.GetShapesOnBox(b0, part, geompy.ShapeType["EDGE"], - geompy.GEOM.ST_ON) + GEOM.ST_ON) comp = geompy.MakeCompound(edges_on_box) geompy.addToStudy(comp, "Edges of part ON box b0") if len( edges_on_box ) != 12: @@ -698,7 +720,7 @@ def TestOtherOperations (geompy, math): # GetShapesOnBoxIDs faces_on_box_ids = geompy.GetShapesOnBoxIDs(b0, part, geompy.ShapeType["FACE"], - geompy.GEOM.ST_ON) + GEOM.ST_ON) faces_on_box = geompy.CreateGroup(part, geompy.ShapeType["FACE"]) geompy.UnionIDs(faces_on_box, faces_on_box_ids) geompy.addToStudyInFather(part, faces_on_box, "Group of faces on box b0") @@ -708,16 +730,15 @@ def TestOtherOperations (geompy, math): sph2 = geompy.MakeSphere(50, 50, -50, 40) pcyl = geompy.MakeVertex(50, 50, -50) cyli = geompy.MakeCylinder(pcyl, vz, 40, 100) - fuse = geompy.MakeFuse(sph1, cyli) - sh_1 = geompy.MakeFuse(fuse, sph2) + sh_1 = geompy.MakeFuseList([sph1, cyli, sph2]) # As after Fuse we have a compound, we need to obtain a solid from it - #shsh = geompy.SubShapeAll(fuse, geompy.ShapeType["SOLID"]) + #shsh = geompy.SubShapeAll(sh_1, geompy.ShapeType["SOLID"]) #sh_1 = shsh[0] geompy.addToStudy(sh_1, "sh_1") # GetShapesOnShape faces_in_sh = geompy.GetShapesOnShape(sh_1, part, geompy.ShapeType["FACE"], - geompy.GEOM.ST_IN) + GEOM.ST_IN) comp = geompy.MakeCompound(faces_in_sh) geompy.addToStudy(comp, "Faces of part IN shape sh_1") if len(faces_in_sh) != 11: @@ -725,12 +746,12 @@ def TestOtherOperations (geompy, math): # GetShapesOnShapeAsCompound faces_in_sh_c = geompy.GetShapesOnShapeAsCompound(sh_1, part, geompy.ShapeType["FACE"], - geompy.GEOM.ST_IN) + GEOM.ST_IN) geompy.addToStudy(faces_in_sh_c, "Faces of part IN shape sh_1 (as compound)") # GetShapesOnShapeIDs edges_in_sh_ids = geompy.GetShapesOnShapeIDs(sh_1, part, geompy.ShapeType["EDGE"], - geompy.GEOM.ST_IN) + GEOM.ST_IN) edges_in_sh = geompy.CreateGroup(part, geompy.ShapeType["EDGE"]) geompy.UnionIDs(edges_in_sh, edges_in_sh_ids) geompy.addToStudyInFather(part, edges_in_sh, "Group of edges in shape sh_1")