correct previous integration (Porting to Python 2.6)

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

diff --git a/src/SMESH_I/smeshpy.py b/src/SMESH_I/smeshpy.py
index 986ffca7dccb041c7e0076abcf70b1faa0addeb7..5b820f22f30795abffc6095c63b0f5795ff1ec68 100644 (file)
--- a/src/SMESH_I/smeshpy.py
+++ b/src/SMESH_I/smeshpy.py
@@ -1,4 +1,29 @@
-
+#  -*- coding: iso-8859-1 -*-
+#  Copyright (C) 2007-2008  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
+#
+#  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.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
+#  File   : smeshpy.py
+#  Module : SMESH
+#
 import salome
 import SMESH
 
@@ -15,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" )
@@ -34,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" )
@@ -59,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