X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_SWIG%2FsmeshBuilder.py;h=ce0a35594f1a35befb4d9109ad41333536073ffd;hp=4e7c418e494ef2d46f09308338661fd1b08fecd8;hb=7f0def7f18f0ccf5a8acba125d2ce9d54ac4731d;hpb=f500e5a8b62895e81275f73d8fecd7a977711d78;ds=sidebyside diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py index 4e7c418e4..ce0a35594 100644 --- a/src/SMESH_SWIG/smeshBuilder.py +++ b/src/SMESH_SWIG/smeshBuilder.py @@ -1,9 +1,9 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE # # 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 @@ -93,6 +93,16 @@ import SALOME import SALOMEDS import os +class MeshMeta(type): + def __instancecheck__(cls, inst): + """Implement isinstance(inst, cls).""" + return any(cls.__subclasscheck__(c) + for c in {type(inst), inst.__class__}) + + def __subclasscheck__(cls, sub): + """Implement issubclass(sub, cls).""" + return type.__subclasscheck__(cls, sub) or (cls.__name__ == sub.__name__ and cls.__module__ == sub.__module__) + ## @addtogroup l1_auxiliary ## @{ @@ -374,9 +384,12 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): #print "init_smesh" self.SetCurrentStudy(theStudy,geompyD) - ## Creates an empty Mesh. This mesh can have an underlying geometry. - # @param obj the Geometrical object on which the mesh is built. If not defined, - # the mesh will have no underlying geometry. + ## Creates a mesh. This can be either an empty mesh, possibly having an underlying geometry, + # or a mesh wrapping a CORBA mesh given as a parameter. + # @param obj either (1) a CORBA mesh (SMESH._objref_SMESH_Mesh) got e.g. by calling + # salome.myStudy.FindObjectID("0:1:2:3").GetObject() or + # (2) a Geometrical object for meshing or + # (3) none. # @param name the name for the new mesh. # @return an instance of Mesh class. # @ingroup l2_construct @@ -1144,6 +1157,7 @@ def New( study, instance=None): # new nodes and elements and by changing the existing entities), to get information # about a mesh and to export a mesh into different formats. class Mesh: + __metaclass__ = MeshMeta geom = 0 mesh = 0 @@ -1552,13 +1566,24 @@ class Mesh: if not geom: geom = self.mesh.GetShapeToMesh() pass - AssureGeomPublished( self, geom, "shape for %s" % hyp.GetName()) - status = self.mesh.AddHypothesis(geom, hyp) - isAlgo = hyp._narrow( SMESH_Algo ) + isApplicable = True + if self.mesh.HasShapeToMesh(): + hyp_type = hyp.GetName() + lib_name = hyp.GetLibName() + checkAll = ( not geom.IsSame( self.mesh.GetShapeToMesh() )) + if checkAll and geom: + checkAll = geom.GetType() == 37 + isApplicable = self.smeshpyD.IsApplicable(hyp_type, lib_name, geom, checkAll) + if isApplicable: + AssureGeomPublished( self, geom, "shape for %s" % hyp.GetName()) + status = self.mesh.AddHypothesis(geom, hyp) + else: + status = HYP_BAD_GEOMETRY hyp_name = GetName( hyp ) geom_name = "" if geom: - geom_name = GetName( geom ) + geom_name = geom.GetName() + isAlgo = hyp._narrow( SMESH_Algo ) TreatHypoStatus( status, hyp_name, geom_name, isAlgo ) return status @@ -1630,17 +1655,24 @@ class Mesh: # - 1D if all mesh nodes lie on OX coordinate axis, or # - 2D if all mesh nodes lie on XOY coordinate plane, or # - 3D in the rest cases. - # # If @a autoDimension is @c False, the space dimension is always 3. + # @param fields : list of GEOM fields defined on the shape to mesh. + # @param geomAssocFields : each character of this string means a need to export a + # corresponding field; correspondence between fields and characters is following: + # - 'v' stands for _vertices_ field; + # - 'e' stands for _edges_ field; + # - 'f' stands for _faces_ field; + # - 's' stands for _solids_ field. # @ingroup l2_impexp def ExportMED(self, f, auto_groups=0, version=MED_V2_2, - overwrite=1, meshPart=None, autoDimension=True): - if meshPart: + overwrite=1, meshPart=None, autoDimension=True, fields=[], geomAssocFields=''): + if meshPart or fields or geomAssocFields: unRegister = genObjUnRegister() if isinstance( meshPart, list ): meshPart = self.GetIDSource( meshPart, SMESH.ALL ) unRegister.set( meshPart ) - self.mesh.ExportPartToMED( meshPart, f, auto_groups, version, overwrite, autoDimension) + self.mesh.ExportPartToMED( meshPart, f, auto_groups, version, overwrite, autoDimension, + fields, geomAssocFields) else: self.mesh.ExportToMEDX(f, auto_groups, version, overwrite, autoDimension) @@ -1901,7 +1933,7 @@ class Mesh: def RemoveGroupWithContents(self, group): self.mesh.RemoveGroupWithContents(group) - ## Gets the list of groups existing in the mesh + ## Gets the list of groups existing in the mesh in the order of creation (starting from the oldest one) # @return a sequence of SMESH_GroupBase # @ingroup l2_grps_create def GetGroups(self): @@ -2431,8 +2463,8 @@ class Mesh: ## Returns three components of normal of given mesh face # (or an empty array in KO case) # @ingroup l1_meshinfo - def GetFaceNormal(self, faceId): - return self.mesh.GetFaceNormal(faceId) + def GetFaceNormal(self, faceId, normalized=False): + return self.mesh.GetFaceNormal(faceId,normalized) ## Returns an element based on all given nodes. # @ingroup l1_meshinfo @@ -3076,14 +3108,20 @@ class Mesh: pass # axis if isinstance( startHexPoint, geomBuilder.GEOM._objref_GEOM_Object): - startHexPoint = self.geompyD.PointCoordinates( startHexPoint ) + startHexPoint = self.smeshpyD.GetPointStruct( startHexPoint ) + elif isinstance( startHexPoint, list ): + startHexPoint = SMESH.PointStruct( startHexPoint[0], + startHexPoint[1], + startHexPoint[2]) if isinstance( facetNormal, geomBuilder.GEOM._objref_GEOM_Object): - facetNormal = self.geompyD.VectorCoordinates( facetNormal ) - axis = SMESH.AxisStruct( startHexPoint[0], startHexPoint[1], startHexPoint[2], - facetNormal[0], facetNormal[1], facetNormal[2]) - self.mesh.SetParameters( axis.parameters ) + facetNormal = self.smeshpyD.GetDirStruct( facetNormal ) + elif isinstance( facetNormal, list ): + facetNormal = self.smeshpyD.MakeDirStruct( facetNormal[0], + facetNormal[1], + facetNormal[2]) + self.mesh.SetParameters( startHexPoint.parameters + facetNormal.PS.parameters ) - self.editor.SplitHexahedraIntoPrisms(elems, method, axis, allDomains) + self.editor.SplitHexahedraIntoPrisms(elems, startHexPoint, facetNormal, method, allDomains) ## Splits quadrangle faces near triangular facets of volumes # @@ -4468,9 +4506,11 @@ class Mesh: # Triangles are transformed in prisms, and quadrangles in hexahedrons. # @param theDomains - list of groups of volumes # @param createJointElems - if TRUE, create the elements + # @param onAllBoundaries - if TRUE, the nodes and elements are also created on + # the boundary between \a theDomains and the rest mesh # @return TRUE if operation has been completed successfully, FALSE otherwise - def DoubleNodesOnGroupBoundaries(self, theDomains, createJointElems ): - return self.editor.DoubleNodesOnGroupBoundaries( theDomains, createJointElems ) + def DoubleNodesOnGroupBoundaries(self, theDomains, createJointElems, onAllBoundaries=False ): + return self.editor.DoubleNodesOnGroupBoundaries( theDomains, createJointElems, onAllBoundaries ) ## Double nodes on some external faces and create flat elements. # Flat elements are mainly used by some types of mechanic calculations. @@ -4590,7 +4630,7 @@ class Mesh: return self._valueFromFunctor(SMESH.FT_Skew, elemId) pass # end of Mesh class - + ## Helper class for wrapping of SMESH.SMESH_Pattern CORBA class # class Pattern(SMESH._objref_SMESH_Pattern):