X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_SWIG%2Fsmesh.py;h=ea7c6d1312ad3c4cccdbd31ffa33b2ca28efd3b1;hb=87fd8ca50b1fe004fc046c66c5b5df6199861981;hp=da30bd82a8e6ceeefa3834650ee8cf40f24210c9;hpb=85f8b0f4495dc625b45b44c8c44c4969230d6065;p=modules%2Fsmesh.git diff --git a/src/SMESH_SWIG/smesh.py b/src/SMESH_SWIG/smesh.py index da30bd82a..ea7c6d131 100644 --- a/src/SMESH_SWIG/smesh.py +++ b/src/SMESH_SWIG/smesh.py @@ -46,11 +46,16 @@ smesh.SetCurrentStudy(salome.myStudy) # Private functions # ----------------- +NO_NAME = "NoName" + def GetName(obj): ior = salome.orb.object_to_string(obj) sobj = salome.myStudy.FindObjectIOR(ior) - attr = sobj.FindAttribute("AttributeName")[1] - return attr.Value() + if sobj is None: + return NO_NAME + else: + attr = sobj.FindAttribute("AttributeName")[1] + return attr.Value() def SetName(obj, name): ior = salome.orb.object_to_string(obj) @@ -91,8 +96,10 @@ class Mesh_Algorithm: name = GetName(piece) else: self.geom = geom - name = geompy.SubShapeName(geom, piece) - geompy.addToStudyInFather(piece, geom, name) + name = GetName(geom) + if name==NO_NAME: + name = geompy.SubShapeName(geom, piece) + geompy.addToStudyInFather(piece, geom, name) self.subm = mesh.mesh.GetSubMesh(geom, hypo) algo = smesh.CreateHypothesis(hypo, so) @@ -149,6 +156,7 @@ class Mesh_Segment(Mesh_Algorithm): hyp = self.Hypothesis("NumberOfSegments", [n]) else: hyp = self.Hypothesis("NumberOfSegments", [n,s]) + hyp.SetDistrType( 1 ) hyp.SetScaleFactor(s) hyp.SetNumberOfSegments(n) return hyp @@ -400,6 +408,9 @@ class Mesh: """ b = smesh.Compute(self.mesh, self.geom) if salome.sg.hasDesktop(): + smeshgui = salome.ImportComponentGUI("SMESH") + smeshgui.Init(salome.myStudyId) + smeshgui.SetMeshIcon( salome.ObjectToID( self.mesh ), b ) salome.sg.updateObjBrowser(1) return b @@ -424,6 +435,8 @@ class Mesh: type = SMESH.FACE elif tgeo == "SOLID": type = SMESH.VOLUME + elif tgeo == "SHELL": + type = SMESH.VOLUME elif tgeo == "COMPOUND": tgeo = geompy.GetType(grp) if tgeo == geompy.ShapeType["VERTEX"]: