Adjust to CVS HEAD modifications

[modules/smesh.git] / src / SMESH_I / smeshpy.py

diff --git a/src/SMESH_I/smeshpy.py b/src/SMESH_I/smeshpy.py
index 12f298536aefa66e49c24c4bf0bee74a6783f0b9..9fb4709e7e31216ceb1a114de9172fe36295751c 100644 (file)
--- a/src/SMESH_I/smeshpy.py
+++ b/src/SMESH_I/smeshpy.py
@@ -40,18 +40,19 @@ class smeshpy:
 
     def __init__(self):
         try:
-            self._geom = salome.lcc.FindOrLoadComponent("FactoryServer","Geometry")
+            self._geom = salome.lcc.FindOrLoadComponent("FactoryServer","GEOM")
             self._smesh = salome.lcc.FindOrLoadComponent("FactoryServer","SMESH")
         except:
             MESSAGE( "exception in smeshpy:__init__" )
-        self._studyId = salome.myStudyId
+        self._study = salome.myStudy
+        self._smesh.SetCurrentStudy(self._study)
 
     #--------------------------------------------------------------------------
 
-    def Init(self, shapeId):
+    def CreateMesh(self, shapeId):
         try:
             shape = salome.IDToObject(shapeId)
-            aMesh = self._smesh.Init(self._geom, self._studyId, shape)
+            aMesh = self._smesh.CreateMesh(shape)
             return aMesh
         except:
             MESSAGE( "exception in smeshpy:Init" )
@@ -59,9 +60,9 @@ class smeshpy:
 
     #--------------------------------------------------------------------------
 
-    def CreateHypothesis(self, name):
+    def CreateHypothesis(self, name, libname):
         try:
-            hyp = self._smesh.CreateHypothesis(name,self._studyId)
+            hyp = self._smesh.CreateHypothesis(name, libname)
             return hyp
         except:
             MESSAGE( "exception in smeshpy:CreateHypothesis" )
@@ -84,7 +85,7 @@ class smeshpy:
 ##def SmeshInit(shapeId):
 ##    import salome
 ##    import SMESH
-##    geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+##    geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 ##    smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH")
 ##    shape = salome.IDToObject(shapeId)
 ##    studyId = salome.myStudyId