Salome HOME
projects
/
modules
/
hexablock.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2020
[modules/hexablock.git]
/
src
/
HEXABLOCK_SWIG
/
hexablock.py
diff --git
a/src/HEXABLOCK_SWIG/hexablock.py
b/src/HEXABLOCK_SWIG/hexablock.py
index 43640d6372228c6cf015974e43214c09d9e0c178..f4d67e79ebe00d463347f90df60fbf50a6c954fd 100644
(file)
--- a/
src/HEXABLOCK_SWIG/hexablock.py
+++ b/
src/HEXABLOCK_SWIG/hexablock.py
@@
-1,5
+1,5
@@
# -*- coding: latin-1 -*-
# -*- coding: latin-1 -*-
-# Copyright (C) 2009-20
16
CEA/DEN, EDF R&D
+# Copyright (C) 2009-20
20
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
#
# 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
salome.salome_init()
from salome.geom import geomBuilder
-geompy = geomBuilder.New(
salome.myStudy
)
+geompy = geomBuilder.New()
import SMESH
from salome.smesh import smeshBuilder
import SMESH
from salome.smesh import smeshBuilder
-smesh = smeshBuilder.New(
salome.myStudy
)
+smesh = smeshBuilder.New()
component = hexablock_swig.hex_instance ()
component = hexablock_swig.hex_instance ()
@@
-140,7
+140,7
@@
def mesh (doc, name=None, dim=3, container="FactoryServer"):
stream = doc.getFirstExplicitShape ()
if stream != None :
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)
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")
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"
meshexa = comp_smesh.Mesh(shape)
so = "libHexaBlockPluginEngine.so"
@@
-188,8
+188,8
@@
def getFromStudy(entry):
# ==================================================== findOrCreateComponent
# Find or create HexaBlock Study Component
# ==================================================== findOrCreateComponent
# Find or create HexaBlock Study Component
-def findOrCreateComponent(
study,
builder ):
- father = study.FindComponent( moduleName() )
+def findOrCreateComponent( builder ):
+ father = s
alome.myS
tudy.FindComponent( moduleName() )
if father is None:
father = builder.NewComponent( moduleName() )
attr = builder.FindOrCreateAttribute( father, "AttributeName" )
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()
study = salome.myStudy
builder = study.NewBuilder()
- father = findOrCreateComponent(
study,
builder )
+ father = findOrCreateComponent( builder )
name = doc.getName ()
present = study.FindObjectByName(name, moduleName())
name = doc.getName ()
present = study.FindObjectByName(name, moduleName())