X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_SWIG%2FsmeshBuilder.py;h=9d583de0471c29b7342ae999ba0d109812168028;hb=b752ff95e4467507897ad921a96fded587b414bb;hp=25bf8e9e0e1d0393af5ba052ecd1d4b30cc98277;hpb=54182913fbb9df65a3f4cc96f55db3618835ecd8;p=modules%2Fsmesh.git diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py index 25bf8e9e0..9d583de04 100644 --- a/src/SMESH_SWIG/smeshBuilder.py +++ b/src/SMESH_SWIG/smeshBuilder.py @@ -259,15 +259,15 @@ def AssureGeomPublished(mesh, geom, name=''): return ## Return the first vertex of a geometrical edge by ignoring orientation -def FirstVertexOnCurve(edge): - vv = geomBuilder.SubShapeAll( edge, geomBuilder.geomBuilder.ShapeType["VERTEX"]) +def FirstVertexOnCurve(mesh, edge): + vv = mesh.geompyD.SubShapeAll( edge, geomBuilder.geomBuilder.ShapeType["VERTEX"]) if not vv: raise TypeError, "Given object has no vertices" if len( vv ) == 1: return vv[0] - v0 = geomBuilder.MakeVertexOnCurve(edge,0.) - xyz = geomBuilder.PointCoordinates( v0 ) # coords of the first vertex - xyz1 = geomBuilder.PointCoordinates( vv[0] ) - xyz2 = geomBuilder.PointCoordinates( vv[1] ) + v0 = mesh.geompyD.MakeVertexOnCurve(edge,0.) + xyz = mesh.geompyD.PointCoordinates( v0 ) # coords of the first vertex + xyz1 = mesh.geompyD.PointCoordinates( vv[0] ) + xyz2 = mesh.geompyD.PointCoordinates( vv[1] ) dist1, dist2 = 0,0 for i in range(3): dist1 += abs( xyz[i] - xyz1[i] ) @@ -285,6 +285,7 @@ def FirstVertexOnCurve(edge): smeshInst = None engine = None doLcc = False +created = False ## This class allows to create, load or manipulate meshes # It has a set of methods to create load or copy meshes, to combine several meshes. @@ -312,7 +313,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): global engine global smeshInst global doLcc - #print "__new__", engine, smeshInst, doLcc + #print "==== __new__", engine, smeshInst, doLcc if smeshInst is None: # smesh engine is either retrieved from engine, or created @@ -327,26 +328,30 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): # FindOrLoadComponent called: # 1. CORBA resolution of server # 2. the __new__ method is called again - #print "smeshInst = lcc.FindOrLoadComponent ", engine, smeshInst, doLcc + #print "==== smeshInst = lcc.FindOrLoadComponent ", engine, smeshInst, doLcc smeshInst = salome.lcc.FindOrLoadComponent( "FactoryServer", "SMESH" ) else: # FindOrLoadComponent not called if smeshInst is None: # smeshBuilder instance is created from lcc.FindOrLoadComponent - #print "smeshInst = super(smeshBuilder,cls).__new__(cls) ", engine, smeshInst, doLcc + #print "==== smeshInst = super(smeshBuilder,cls).__new__(cls) ", engine, smeshInst, doLcc smeshInst = super(smeshBuilder,cls).__new__(cls) else: # smesh engine not created: existing engine found - #print "existing ", engine, smeshInst, doLcc + #print "==== existing ", engine, smeshInst, doLcc pass - + #print "====1 ", smeshInst return smeshInst + #print "====2 ", smeshInst return smeshInst def __init__(self): - #print "__init__" - SMESH._objref_SMESH_Gen.__init__(self) + global created + #print "--------------- smeshbuilder __init__ ---", created + if not created: + created = True + SMESH._objref_SMESH_Gen.__init__(self) ## Dump component to the Python script # This method overrides IDL function to allow default values for the parameters. @@ -515,25 +520,19 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): return aMesh ## Creates a Mesh object(s) importing data from the given MED file - # @return a list of Mesh class instances + # @return a tuple ( list of Mesh class instances, SMESH.DriverMED_ReadStatus ) # @ingroup l2_impexp def CreateMeshesFromMED( self,theFileName ): aSmeshMeshes, aStatus = SMESH._objref_SMESH_Gen.CreateMeshesFromMED(self,theFileName) - aMeshes = [] - for iMesh in range(len(aSmeshMeshes)) : - aMesh = Mesh(self, self.geompyD, aSmeshMeshes[iMesh]) - aMeshes.append(aMesh) + aMeshes = [ Mesh(self, self.geompyD, m) for m in aSmeshMeshes ] return aMeshes, aStatus ## Creates a Mesh object(s) importing data from the given SAUV file - # @return a list of Mesh class instances + # @return a tuple ( list of Mesh class instances, SMESH.DriverMED_ReadStatus ) # @ingroup l2_impexp def CreateMeshesFromSAUV( self,theFileName ): aSmeshMeshes, aStatus = SMESH._objref_SMESH_Gen.CreateMeshesFromSAUV(self,theFileName) - aMeshes = [] - for iMesh in range(len(aSmeshMeshes)) : - aMesh = Mesh(self, self.geompyD, aSmeshMeshes[iMesh]) - aMeshes.append(aMesh) + aMeshes = [ Mesh(self, self.geompyD, m) for m in aSmeshMeshes ] return aMeshes, aStatus ## Creates a Mesh object importing data from the given STL file @@ -545,18 +544,17 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): return aMesh ## Creates Mesh objects importing data from the given CGNS file - # @return an instance of Mesh class + # @return a tuple ( list of Mesh class instances, SMESH.DriverMED_ReadStatus ) # @ingroup l2_impexp def CreateMeshesFromCGNS( self, theFileName ): aSmeshMeshes, aStatus = SMESH._objref_SMESH_Gen.CreateMeshesFromCGNS(self,theFileName) - aMeshes = [] - for iMesh in range(len(aSmeshMeshes)) : - aMesh = Mesh(self, self.geompyD, aSmeshMeshes[iMesh]) - aMeshes.append(aMesh) + aMeshes = [ Mesh(self, self.geompyD, m) for m in aSmeshMeshes ] return aMeshes, aStatus - ## Creates a Mesh object importing data from the given GMF file - # @return [ an instance of Mesh class, SMESH::ComputeError ] + ## Creates a Mesh object importing data from the given GMF file. + # GMF files have .mesh extension for the ASCII format and .meshb for + # the bynary format. + # @return [ an instance of Mesh class, SMESH.ComputeError ] # @ingroup l2_impexp def CreateMeshesFromGMF( self, theFileName ): aSmeshMesh, error = SMESH._objref_SMESH_Gen.CreateMeshesFromGMF(self, @@ -670,10 +668,10 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): Tolerance=1e-07): if not CritType in SMESH.FunctorType._items: raise TypeError, "CritType should be of SMESH.FunctorType" - aCriterion = self.GetEmptyCriterion() + aCriterion = self.GetEmptyCriterion() aCriterion.TypeOfElement = elementType - aCriterion.Type = self.EnumToLong(CritType) - aCriterion.Tolerance = Tolerance + aCriterion.Type = self.EnumToLong(CritType) + aCriterion.Tolerance = Tolerance aThreshold = Threshold @@ -727,6 +725,30 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): else: raise ValueError,\ "The Threshold should be an ID of mesh face and not '%s'"%aThreshold + elif CritType == FT_ConnectedElements: + # Checks the Threshold + if isinstance(aThreshold, geomBuilder.GEOM._objref_GEOM_Object): # shape + aCriterion.ThresholdID = aThreshold.GetStudyEntry() + if not aCriterion.ThresholdID: + name = aThreshold.GetName() + if not name: + name = "%s_%s"%(aThreshold.GetShapeType(), id(aThreshold)%10000) + aCriterion.ThresholdID = self.geompyD.addToStudy( aThreshold, name ) + elif isinstance(aThreshold, int): # node id + aCriterion.Threshold = aThreshold + elif isinstance(aThreshold, list): # 3 point coordinates + if len( aThreshold ) < 3: + raise ValueError, "too few point coordinates, must be 3" + aCriterion.ThresholdStr = " ".join( [str(c) for c in aThreshold[:3]] ) + elif isinstance(aThreshold, str): + if aThreshold.isdigit(): + aCriterion.Threshold = aThreshold # node id + else: + aCriterion.ThresholdStr = aThreshold # hope that it's point coordinates + else: + raise ValueError,\ + "The Threshold should either a VERTEX, or a node ID, "\ + "or a list of point coordinates and not '%s'"%aThreshold elif CritType == FT_ElemGeomType: # Checks the Threshold try: @@ -803,6 +825,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): # @param UnaryOp FT_LogicalNOT or FT_Undefined # @param Tolerance the tolerance used by FT_BelongToGeom, FT_BelongToSurface, # FT_LyingOnGeom, FT_CoplanarFaces and FT_EqualNodes criteria + # @param mesh the mesh to initialize the filter with # @return SMESH_Filter # # Example of Filters usage @@ -812,13 +835,17 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): Compare=FT_EqualTo, Threshold="", UnaryOp=FT_Undefined, - Tolerance=1e-07): + Tolerance=1e-07, + mesh=None): aCriterion = self.GetCriterion(elementType, CritType, Compare, Threshold, UnaryOp, FT_Undefined,Tolerance) aFilterMgr = self.CreateFilterManager() aFilter = aFilterMgr.CreateFilter() aCriteria = [] aCriteria.append(aCriterion) aFilter.SetCriteria(aCriteria) + if mesh: + if isinstance( mesh, Mesh ): aFilter.SetMesh( mesh.GetMesh() ) + else : aFilter.SetMesh( mesh ) aFilterMgr.UnRegister() return aFilter @@ -955,6 +982,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): if not hasattr(src1, "_narrow"): return None src1 = src1._narrow(SMESH.SMESH_IDSource) if not src1: return None + unRegister = genObjUnRegister() if id1 != 0: m = src1.GetMesh() e = m.GetMeshEditor() @@ -962,6 +990,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): src1 = e.MakeIDSource([id1], SMESH.FACE) else: src1 = e.MakeIDSource([id1], SMESH.NODE) + unRegister.set( src1 ) pass if hasattr(src2, "_narrow"): src2 = src2._narrow(SMESH.SMESH_IDSource) @@ -972,11 +1001,12 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): src2 = e.MakeIDSource([id2], SMESH.FACE) else: src2 = e.MakeIDSource([id2], SMESH.NODE) + unRegister.set( src2 ) pass pass aMeasurements = self.CreateMeasurements() + unRegister.set( aMeasurements ) result = aMeasurements.MinDistance(src1, src2) - aMeasurements.UnRegister() return result ## Get bounding box of the specified object(s) @@ -1016,6 +1046,44 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen): aMeasurements.UnRegister() return result + ## Get sum of lengths of all 1D elements in the mesh object. + # @param elemId obj mesh, submesh or group + # @return sum of lengths of all 1D elements + # @ingroup l1_measurements + def GetLength(self, obj): + if isinstance(obj, Mesh): obj = obj.mesh + if isinstance(obj, Mesh_Algorithm): obj = obj.GetSubMesh() + aMeasurements = self.CreateMeasurements() + value = aMeasurements.Length(obj) + aMeasurements.UnRegister() + return value + + ## Get sum of areas of all 2D elements in the mesh object. + # @param elemId obj mesh, submesh or group + # @return sum of areas of all 2D elements + # @ingroup l1_measurements + def GetArea(self, obj): + if isinstance(obj, Mesh): obj = obj.mesh + if isinstance(obj, Mesh_Algorithm): obj = obj.GetSubMesh() + aMeasurements = self.CreateMeasurements() + value = aMeasurements.Area(obj) + aMeasurements.UnRegister() + return value + + ## Get sum of volumes of all 3D elements in the mesh object. + # @param elemId obj mesh, submesh or group + # @return sum of volumes of all 3D elements + # @ingroup l1_measurements + def GetVolume(self, obj): + if isinstance(obj, Mesh): obj = obj.mesh + if isinstance(obj, Mesh_Algorithm): obj = obj.GetSubMesh() + aMeasurements = self.CreateMeasurements() + value = aMeasurements.Volume(obj) + aMeasurements.UnRegister() + return value + + pass # end of class smeshBuilder + import omniORB #Registering the new proxy for SMESH_Gen omniORB.registerObjref(SMESH._objref_SMESH_Gen._NP_RepositoryId, smeshBuilder) @@ -1329,7 +1397,10 @@ class Mesh: if errText: errText += ". " errText += err.comment if allReasons != "":allReasons += "\n" - allReasons += '- "%s" failed%s. Error: %s' %(err.algoName, shapeText, errText) + if ok: + allReasons += '- "%s"%s - %s' %(err.algoName, shapeText, errText) + else: + allReasons += '- "%s" failed%s. Error: %s' %(err.algoName, shapeText, errText) pass # Treat hyp errors @@ -1498,6 +1569,8 @@ class Mesh: # @return SMESH.Hypothesis_Status # @ingroup l2_hypotheses def RemoveHypothesis(self, hyp, geom=0): + if not hyp: + return None if isinstance( hyp, Mesh_Algorithm ): hyp = hyp.GetAlgorithm() pass @@ -1537,14 +1610,23 @@ class Mesh: # @param version MED format version(MED_V2_1 or MED_V2_2) # @param overwrite boolean parameter for overwriting/not overwriting the file # @param meshPart a part of mesh (group, sub-mesh) to export instead of the mesh + # @param autoDimension: if @c True (default), a space dimension of a MED mesh can be either + # - 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. # @ingroup l2_impexp - def ExportMED(self, f, auto_groups=0, version=MED_V2_2, overwrite=1, meshPart=None): + def ExportMED(self, f, auto_groups=0, version=MED_V2_2, + overwrite=1, meshPart=None, autoDimension=True): if meshPart: + unRegister = genObjUnRegister() if isinstance( meshPart, list ): meshPart = self.GetIDSource( meshPart, SMESH.ALL ) - self.mesh.ExportPartToMED( meshPart, f, auto_groups, version, overwrite ) + unRegister.set( meshPart ) + self.mesh.ExportPartToMED( meshPart, f, auto_groups, version, overwrite, autoDimension) else: - self.mesh.ExportToMEDX(f, auto_groups, version, overwrite) + self.mesh.ExportToMEDX(f, auto_groups, version, overwrite, autoDimension) ## Exports the mesh in a file in SAUV format # @param f is the file name @@ -1561,8 +1643,10 @@ class Mesh: # @ingroup l2_impexp def ExportDAT(self, f, meshPart=None): if meshPart: + unRegister = genObjUnRegister() if isinstance( meshPart, list ): meshPart = self.GetIDSource( meshPart, SMESH.ALL ) + unRegister.set( meshPart ) self.mesh.ExportPartToDAT( meshPart, f ) else: self.mesh.ExportDAT(f) @@ -1573,8 +1657,10 @@ class Mesh: # @ingroup l2_impexp def ExportUNV(self, f, meshPart=None): if meshPart: + unRegister = genObjUnRegister() if isinstance( meshPart, list ): meshPart = self.GetIDSource( meshPart, SMESH.ALL ) + unRegister.set( meshPart ) self.mesh.ExportPartToUNV( meshPart, f ) else: self.mesh.ExportUNV(f) @@ -1586,8 +1672,10 @@ class Mesh: # @ingroup l2_impexp def ExportSTL(self, f, ascii=1, meshPart=None): if meshPart: + unRegister = genObjUnRegister() if isinstance( meshPart, list ): meshPart = self.GetIDSource( meshPart, SMESH.ALL ) + unRegister.set( meshPart ) self.mesh.ExportPartToSTL( meshPart, f, ascii ) else: self.mesh.ExportSTL(f, ascii) @@ -1598,21 +1686,27 @@ class Mesh: # @param meshPart a part of mesh (group, sub-mesh) to export instead of the mesh # @ingroup l2_impexp def ExportCGNS(self, f, overwrite=1, meshPart=None): + unRegister = genObjUnRegister() if isinstance( meshPart, list ): meshPart = self.GetIDSource( meshPart, SMESH.ALL ) + unRegister.set( meshPart ) if isinstance( meshPart, Mesh ): meshPart = meshPart.mesh elif not meshPart: meshPart = self.mesh self.mesh.ExportCGNS(meshPart, f, overwrite) - ## Exports the mesh in a file in GMF format + ## Exports the mesh in a file in GMF format. + # GMF files must have .mesh extension for the ASCII format and .meshb for + # the bynary format. Other extensions are not allowed. # @param f is the file name # @param meshPart a part of mesh (group, sub-mesh) to export instead of the mesh # @ingroup l2_impexp def ExportGMF(self, f, meshPart=None): + unRegister = genObjUnRegister() if isinstance( meshPart, list ): meshPart = self.GetIDSource( meshPart, SMESH.ALL ) + unRegister.set( meshPart ) if isinstance( meshPart, Mesh ): meshPart = meshPart.mesh elif not meshPart: @@ -1627,9 +1721,15 @@ class Mesh: # @param opt boolean parameter for creating/not creating # the groups Group_On_All_Nodes, Group_On_All_Faces, ... # @param overwrite boolean parameter for overwriting/not overwriting the file + # @param autoDimension: if @c True (default), a space dimension of a MED mesh can be either + # - 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. # @ingroup l2_impexp - def ExportToMED(self, f, version, opt=0, overwrite=1): - self.mesh.ExportToMEDX(f, opt, version, overwrite) + def ExportToMED(self, f, version, opt=0, overwrite=1, autoDimension=True): + self.mesh.ExportToMEDX(f, opt, version, overwrite, autoDimension) # Operations with groups: # ---------------------- @@ -1935,12 +2035,6 @@ class Mesh: def GetIDSource(self, ids, elemType): return self.editor.MakeIDSource(ids, elemType) - ## Gets MED Mesh - # @return an instance of SALOME_MED::MESH - # @ingroup l1_auxiliary - def GetMEDMesh(self): - return self.mesh.GetMEDMesh() - # Get informations about mesh contents: # ------------------------------------ @@ -2018,6 +2112,12 @@ class Mesh: def NbTrianglesOfOrder(self, elementOrder): return self.mesh.NbTrianglesOfOrder(elementOrder) + ## Returns the number of biquadratic triangles in the mesh + # @return an integer value + # @ingroup l1_meshinfo + def NbBiQuadTriangles(self): + return self.mesh.NbBiQuadTriangles() + ## Returns the number of quadrangles in the mesh # @return an integer value # @ingroup l1_meshinfo @@ -2391,7 +2491,7 @@ class Mesh: aMeasurements = self.smeshpyD.CreateMeasurements() aMeasure = aMeasurements.MinDistance(id1, id2) - aMeasurements.UnRegister() + genObjUnRegister([aMeasurements,id1, id2]) return aMeasure ## Get bounding box of the specified object(s) @@ -2424,6 +2524,7 @@ class Mesh: if len(IDs) > 0 and isinstance(IDs[0], int): IDs = [IDs] srclist = [] + unRegister = genObjUnRegister() for o in IDs: if isinstance(o, Mesh): srclist.append(o.mesh) @@ -2436,11 +2537,12 @@ class Mesh: srclist.append(self.editor.MakeIDSource(o, SMESH.FACE)) else: srclist.append(self.editor.MakeIDSource(o, SMESH.NODE)) + unRegister.set( srclist[-1] ) pass pass aMeasurements = self.smeshpyD.CreateMeasurements() + unRegister.set( aMeasurements ) aMeasure = aMeasurements.BoundingBox(srclist) - aMeasurements.UnRegister() return aMeasure # Mesh edition (SMESH_MeshEditor functionality): @@ -2493,10 +2595,12 @@ class Mesh: # can be retrieved from the returned object by calling GetIDs() # @ingroup l2_modif_add def Add0DElementsToAllNodes(self, theObject, theGroupName=""): + unRegister = genObjUnRegister() if isinstance( theObject, Mesh ): theObject = theObject.GetMesh() if isinstance( theObject, list ): theObject = self.GetIDSource( theObject, SMESH.ALL ) + unRegister.set( theObject ) return self.editor.Create0DElementsOnAllNodes( theObject, theGroupName ) ## Creates a ball element on a node with given ID. @@ -2766,11 +2870,13 @@ class Mesh: # @return number of reoriented faces # @ingroup l2_modif_changori def Reorient2D(self, the2DObject, theDirection, theFaceOrPoint ): + unRegister = genObjUnRegister() # check the2DObject if isinstance( the2DObject, Mesh ): the2DObject = the2DObject.GetMesh() if isinstance( the2DObject, list ): the2DObject = self.GetIDSource( the2DObject, SMESH.FACE ) + unRegister.set( the2DObject ) # check theDirection if isinstance( theDirection, geomBuilder.GEOM._objref_GEOM_Object): theDirection = self.smeshpyD.GetDirStruct( theDirection ) @@ -2824,7 +2930,6 @@ class Mesh: return self.editor.TriToQuadObject(theObject, Functor, MaxAngle) ## Splits quadrangles into triangles. - # # @param IDsOfElements the faces to be splitted. # @param theCriterion is a numerical functor, in terms of enum SMESH.FunctorType, used to # choose a diagonal for splitting. If @a theCriterion is None, which is a default @@ -2855,6 +2960,22 @@ class Mesh: Functor = self.smeshpyD.GetFunctor(theCriterion) return self.editor.QuadToTriObject(theObject, Functor) + ## Splits each of given quadrangles into 4 triangles. A node is added at the center of + # a quadrangle. + # @param theElements the faces to be splitted. This can be either mesh, sub-mesh, + # group or a list of face IDs. By default all quadrangles are split + # @ingroup l2_modif_cutquadr + def QuadTo4Tri (self, theElements=[]): + unRegister = genObjUnRegister() + if isinstance( theElements, Mesh ): + theElements = theElements.mesh + elif not theElements: + theElements = self.mesh + elif isinstance( theElements, list ): + theElements = self.GetIDSource( theElements, SMESH.FACE ) + unRegister.set( theElements ) + return self.editor.QuadTo4Tri( theElements ) + ## Splits quadrangles into triangles. # @param IDsOfElements the faces to be splitted # @param Diag13 is used to choose a diagonal for splitting. @@ -2892,10 +3013,12 @@ class Mesh: # Hex_5Tet - split the hexahedron into 5 tetrahedrons, etc # @ingroup l2_modif_cutquadr def SplitVolumesIntoTetra(self, elemIDs, method=smeshBuilder.Hex_5Tet ): + unRegister = genObjUnRegister() if isinstance( elemIDs, Mesh ): elemIDs = elemIDs.GetMesh() if ( isinstance( elemIDs, list )): elemIDs = self.editor.MakeIDSource(elemIDs, SMESH.VOLUME) + unRegister.set( elemIDs ) self.editor.SplitVolumesIntoTetra(elemIDs, method) ## Splits quadrangle faces near triangular facets of volumes @@ -3117,6 +3240,8 @@ class Mesh: # @param theToBiQuad If True, converts the mesh to bi-quadratic # @ingroup l2_modif_tofromqu def ConvertToQuadratic(self, theForce3d, theSubMesh=None, theToBiQuad=False): + if isinstance( theSubMesh, Mesh ): + theSubMesh = theSubMesh.mesh if theToBiQuad: self.editor.ConvertToBiQuadratic(theForce3d,theSubMesh) else: @@ -3124,6 +3249,9 @@ class Mesh: self.editor.ConvertToQuadraticObject(theForce3d,theSubMesh) else: self.editor.ConvertToQuadratic(theForce3d) + error = self.editor.GetLastError() + if error and error.comment: + print error.comment ## Converts the mesh from quadratic to ordinary, # deletes old quadratic elements, \n replacing @@ -3161,12 +3289,14 @@ class Mesh: # @ingroup l2_modif_edit def MakeBoundaryMesh(self, elements, dimension=SMESH.BND_2DFROM3D, groupName="", meshName="", toCopyElements=False, toCopyExistingBondary=False): + unRegister = genObjUnRegister() if isinstance( elements, Mesh ): elements = elements.GetMesh() if ( isinstance( elements, list )): elemType = SMESH.ALL if elements: elemType = self.GetElementType( elements[0], iselem=True) elements = self.editor.MakeIDSource(elements, elemType) + unRegister.set( elements ) mesh, group = self.editor.MakeBoundaryMesh(elements,dimension,groupName,meshName, toCopyElements,toCopyExistingBondary) if mesh: mesh = self.smeshpyD.Mesh(mesh) @@ -3475,8 +3605,10 @@ class Mesh: # @param LinearVariation forces the computation of rotation angles as linear # variation of the given Angles along path steps # @param HasRefPoint allows using the reference point - # @param RefPoint the point around which the shape is rotated (the mass center of the shape by default). + # @param RefPoint the point around which the elements are rotated (the mass + # center of the elements by default). # The User can specify any point as the Reference Point. + # RefPoint can be either GEOM Vertex, [x,y,z] or SMESH.PointStruct # @param MakeGroups forces the generation of new groups from existing ones # @param ElemType type of elements for extrusion (if param Base is a mesh) # @return list of created groups (SMESH_GroupBase) and SMESH::Extrusion_Error if MakeGroups=True, @@ -3485,9 +3617,12 @@ class Mesh: def ExtrusionAlongPathX(self, Base, Path, NodeStart, HasAngles, Angles, LinearVariation, HasRefPoint, RefPoint, MakeGroups, ElemType): - if ( isinstance( RefPoint, geomBuilder.GEOM._objref_GEOM_Object)): + if isinstance( RefPoint, geomBuilder.GEOM._objref_GEOM_Object): RefPoint = self.smeshpyD.GetPointStruct(RefPoint) pass + elif isinstance( RefPoint, list ): + RefPoint = PointStruct(*RefPoint) + pass Angles,AnglesParameters,hasVars = ParseAngles(Angles) Parameters = AnglesParameters + var_separator + RefPoint.parameters self.mesh.SetParameters(Parameters) @@ -3844,10 +3979,12 @@ class Mesh: # @return list of created groups (SMESH_GroupBase) if MakeGroups=True, # empty list otherwise def Scale(self, theObject, thePoint, theScaleFact, Copy, MakeGroups=False): + unRegister = genObjUnRegister() if ( isinstance( theObject, Mesh )): theObject = theObject.GetMesh() if ( isinstance( theObject, list )): theObject = self.GetIDSource(theObject, SMESH.ALL) + unRegister.set( theObject ) if ( isinstance( theScaleFact, float )): theScaleFact = [theScaleFact] if ( isinstance( theScaleFact, int )): @@ -3868,10 +4005,12 @@ class Mesh: # @param NewMeshName - the name of the newly created mesh # @return instance of Mesh class def ScaleMakeMesh(self, theObject, thePoint, theScaleFact, MakeGroups=False, NewMeshName=""): + unRegister = genObjUnRegister() if (isinstance(theObject, Mesh)): theObject = theObject.GetMesh() if ( isinstance( theObject, list )): theObject = self.GetIDSource(theObject,SMESH.ALL) + unRegister.set( theObject ) if ( isinstance( theScaleFact, float )): theScaleFact = [theScaleFact] if ( isinstance( theScaleFact, int )): @@ -3980,12 +4119,14 @@ class Mesh: # @return the list of groups of nodes # @ingroup l2_modif_trsf def FindCoincidentNodesOnPart (self, SubMeshOrGroup, Tolerance, exceptNodes=[]): + unRegister = genObjUnRegister() if (isinstance( SubMeshOrGroup, Mesh )): SubMeshOrGroup = SubMeshOrGroup.GetMesh() if not isinstance( exceptNodes, list): exceptNodes = [ exceptNodes ] if exceptNodes and isinstance( exceptNodes[0], int): exceptNodes = [ self.GetIDSource( exceptNodes, SMESH.NODE)] + unRegister.set( exceptNodes ) return self.editor.FindCoincidentNodesOnPartBut(SubMeshOrGroup, Tolerance,exceptNodes) ## Merges nodes @@ -4079,7 +4220,32 @@ class Mesh: def GetLastCreatedElems(self): return self.editor.GetLastCreatedElems() - ## Creates a hole in a mesh by doubling the nodes of some particular elements + ## Clears sequences of nodes and elements created by mesh edition oparations + # @ingroup l1_auxiliary + def ClearLastCreated(self): + self.editor.ClearLastCreated() + + ## Creates Duplicates given elements, i.e. creates new elements based on the + # same nodes as the given ones. + # @param theElements - container of elements to duplicate. It can be a Mesh, + # sub-mesh, group, filter or a list of element IDs. + # @param theGroupName - a name of group to contain the generated elements. + # If a group with such a name already exists, the new elements + # are added to the existng group, else a new group is created. + # If \a theGroupName is empty, new elements are not added + # in any group. + # @return a group where the new elements are added. None if theGroupName == "". + # @ingroup l2_modif_edit + def DoubleElements(self, theElements, theGroupName=""): + unRegister = genObjUnRegister() + if isinstance( theElements, Mesh ): + theElements = theElements.mesh + elif isinstance( theElements, list ): + theElements = self.GetIDSource( theElements, SMESH.ALL ) + unRegister.set( theElements ) + return self.editor.DoubleElements(theElements, theGroupName) + + ## Creates a hole in a mesh by doubling the nodes of some particular elements # @param theNodes identifiers of nodes to be doubled # @param theModifiedElems identifiers of elements to be updated by the new (doubled) # nodes. If list of element identifiers is empty then nodes are doubled but @@ -4269,26 +4435,41 @@ class Mesh: val = 0 return val - ## Get length of 1D element. - # @param elemId mesh element ID - # @return element's length value + ## Get length of 1D element or sum of lengths of all 1D mesh elements + # @param elemId mesh element ID (if not defined - sum of length of all 1D elements will be calculated) + # @return element's length value if \a elemId is specified or sum of all 1D mesh elements' lengths otherwise # @ingroup l1_measurements - def GetLength(self, elemId): - return self._valueFromFunctor(SMESH.FT_Length, elemId) + def GetLength(self, elemId=None): + length = 0 + if elemId == None: + length = self.smeshpyD.GetLength(self) + else: + length = self._valueFromFunctor(SMESH.FT_Length, elemId) + return length - ## Get area of 2D element. - # @param elemId mesh element ID - # @return element's area value + ## Get area of 2D element or sum of areas of all 2D mesh elements + # @param elemId mesh element ID (if not defined - sum of areas of all 2D elements will be calculated) + # @return element's area value if \a elemId is specified or sum of all 2D mesh elements' areas otherwise # @ingroup l1_measurements - def GetArea(self, elemId): - return self._valueFromFunctor(SMESH.FT_Area, elemId) + def GetArea(self, elemId=None): + area = 0 + if elemId == None: + area = self.smeshpyD.GetArea(self) + else: + area = self._valueFromFunctor(SMESH.FT_Area, elemId) + return area - ## Get volume of 3D element. - # @param elemId mesh element ID - # @return element's volume value + ## Get volume of 3D element or sum of volumes of all 3D mesh elements + # @param elemId mesh element ID (if not defined - sum of volumes of all 3D elements will be calculated) + # @return element's volume value if \a elemId is specified or sum of all 3D mesh elements' volumes otherwise # @ingroup l1_measurements - def GetVolume(self, elemId): - return self._valueFromFunctor(SMESH.FT_Volume3D, elemId) + def GetVolume(self, elemId=None): + volume = 0 + if elemId == None: + volume = self.smeshpyD.GetVolume(self) + else: + volume = self._valueFromFunctor(SMESH.FT_Volume3D, elemId) + return volume ## Get maximum element length. # @param elemId mesh element ID @@ -4432,6 +4613,28 @@ class hypMethodWrapper: raise ValueError, detail # wrong variable name return result + pass + +# A helper class that call UnRegister() of SALOME.GenericObj'es stored in it +class genObjUnRegister: + + def __init__(self, genObj=None): + self.genObjList = [] + self.set( genObj ) + return + + def set(self, genObj): + "Store one or a list of of SALOME.GenericObj'es" + if isinstance( genObj, list ): + self.genObjList.extend( genObj ) + else: + self.genObjList.append( genObj ) + return + + def __del__(self): + for genObj in self.genObjList: + if genObj and hasattr( genObj, "UnRegister" ): + genObj.UnRegister() for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ): #