X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCK_SWIG%2Fhexablock.py;h=f4d67e79ebe00d463347f90df60fbf50a6c954fd;hb=167be4931bccbbe01e53313d18a9d3dd1484ecb4;hp=43640d6372228c6cf015974e43214c09d9e0c178;hpb=0173cfb4a8a3082c93b9675b1d0e0ba1fbf93f54;p=modules%2Fhexablock.git

diff --git a/src/HEXABLOCK_SWIG/hexablock.py b/src/HEXABLOCK_SWIG/hexablock.py
index 43640d6..f4d67e7 100644
--- a/src/HEXABLOCK_SWIG/hexablock.py
+++ b/src/HEXABLOCK_SWIG/hexablock.py
@@ -1,5 +1,5 @@
 # -*- coding: latin-1 -*-
-# Copyright (C) 2009-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2009-2020  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -28,12 +28,12 @@ import salome
 salome.salome_init()
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 
 import SMESH
 from salome.smesh import smeshBuilder
-smesh = smeshBuilder.New(salome.myStudy)
+smesh = smeshBuilder.New()
 
 component = hexablock_swig.hex_instance ()
 
@@ -140,7 +140,7 @@ def mesh (doc, name=None, dim=3, container="FactoryServer"):
 
     stream = doc.getFirstExplicitShape ()
     if stream != None :
-       shape = geompy.RestoreShape (stream)
+       shape = geompy.RestoreShape (stream.encode())
     else :
        shape = geompy.MakeBox(0, 0, 0,  1, 1, 1)
 
@@ -149,7 +149,7 @@ def mesh (doc, name=None, dim=3, container="FactoryServer"):
 
     geompy.addToStudy(shape, name)
     comp_smesh = salome.lcc.FindOrLoadComponent(container, "SMESH")
-    comp_smesh.init_smesh(study, geomBuilder.geom)
+    comp_smesh.init_smesh(geomBuilder.geom)
     meshexa = comp_smesh.Mesh(shape)
 
     so = "libHexaBlockPluginEngine.so"
@@ -188,8 +188,8 @@ def getFromStudy(entry):
 
 # ==================================================== findOrCreateComponent
 # Find or create HexaBlock Study Component
-def findOrCreateComponent( study, builder ):
-    father = study.FindComponent( moduleName() )
+def findOrCreateComponent( builder ):
+    father = salome.myStudy.FindComponent( moduleName() )
     if father is None:
        father = builder.NewComponent( moduleName() )
        attr = builder.FindOrCreateAttribute( father, "AttributeName" )
@@ -208,7 +208,7 @@ def addToStudy(doc):
 
     study   = salome.myStudy
     builder = study.NewBuilder()
-    father  = findOrCreateComponent( study, builder )
+    father  = findOrCreateComponent( builder )
     name    = doc.getName ()
 
     present = study.FindObjectByName(name, moduleName())