Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Python 3: creation of encode/decode functions
[modules/kernel.git]
/
src
/
KERNEL_PY
/
batchmode_salome.py
diff --git
a/src/KERNEL_PY/batchmode_salome.py
b/src/KERNEL_PY/batchmode_salome.py
index 406615bade270875adcdf4f7b9beda4f7b81c899..8e361316437f00fc4a04e877b8e421222b52b2ea 100755
(executable)
--- a/
src/KERNEL_PY/batchmode_salome.py
+++ b/
src/KERNEL_PY/batchmode_salome.py
@@
-1,5
+1,5
@@
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
6
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
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-23,8
+23,7
@@
# File : batchmode_salome.py
# Module : SALOME
# File : batchmode_salome.py
# Module : SALOME
-#import salome_shared_modules
-#
+
from omniORB import CORBA
from LifeCycleCORBA import *
import SALOME
from omniORB import CORBA
from LifeCycleCORBA import *
import SALOME
@@
-36,10
+35,10
@@
from SALOME_NamingServicePy import *
def ImportComponentGUI(ComponentName):
libName = "lib" + ComponentName + "_Swig"
command = "from " + libName + " import *"
def ImportComponentGUI(ComponentName):
libName = "lib" + ComponentName + "_Swig"
command = "from " + libName + " import *"
- exec (
command
)
+ exec (
command, globals()
)
constructor = ComponentName + "GUI_Swig()"
command = "gui = " + constructor
constructor = ComponentName + "GUI_Swig()"
command = "gui = " + constructor
- exec (
command
)
+ exec (
command, globals()
)
return gui
#--------------------------------------------------------------------------
return gui
#--------------------------------------------------------------------------
@@
-66,12
+65,12
@@
def generateName(prefix = None):
#WITHOUTIHMgetAllSelected = SalomeGUIgetAllSelected
#WITHOUTIHMdef getDesktop(self) :
#WITHOUTIHMgetAllSelected = SalomeGUIgetAllSelected
#WITHOUTIHMdef getDesktop(self) :
-# return SalomePyQt.getDesktop()
- #WITHOUTIHMreturn None
+#
return SalomePyQt.getDesktop()
+
#WITHOUTIHMreturn None
#WITHOUTIHMdef getSelection(self) :
#WITHOUTIHMdef getSelection(self) :
-# return SalomePyQt.getSelection()
- #WITHOUTIHMreturn None
+#
return SalomePyQt.getSelection()
+
#WITHOUTIHMreturn None
#--------------------------------------------------------------------------
#--------------------------------------------------------------------------
@@
-182,25
+181,25
@@
def CheckCopyPaste(theSO, theInfo ,theComponentPaste):
aStudyPersist = PersistentPresentation(myStudy, aRoot, 1)
if not myStudyManager.CanCopy(theSO):
aStudyPersist = PersistentPresentation(myStudy, aRoot, 1)
if not myStudyManager.CanCopy(theSO):
- raise RuntimeError
, "<CanCopy> for "+theInfo+" returns false"
+ raise RuntimeError
("<CanCopy> for "+theInfo+" returns false")
if not myStudyManager.Copy(theSO):
if not myStudyManager.Copy(theSO):
- raise RuntimeError
, "<Copy> for "+theInfo+" returns false"
+ raise RuntimeError
("<Copy> for "+theInfo+" returns false")
if not myStudyManager.CanPaste(theSO):
if not myStudyManager.CanPaste(theSO):
- raise RuntimeError
, "<CanPaste> for "+theInfo+" returns false"
+ raise RuntimeError
("<CanPaste> for "+theInfo+" returns false")
# check: before paste study is not changed check
if aStudyPersist != PersistentPresentation(myStudy, aRoot, 1):
# check: before paste study is not changed check
if aStudyPersist != PersistentPresentation(myStudy, aRoot, 1):
- raise RuntimeError
, "Study is changed before Paste calling for "+theInfo
+ raise RuntimeError
("Study is changed before Paste calling for "+theInfo)
aSObj = theSO
if theComponentPaste:
aSObj = theSO.GetFatherComponent()
theInfo = theInfo + "(paste for component)"
if myStudyManager.Paste(aSObj) == None:
aSObj = theSO
if theComponentPaste:
aSObj = theSO.GetFatherComponent()
theInfo = theInfo + "(paste for component)"
if myStudyManager.Paste(aSObj) == None:
- raise RuntimeError
, "<Paste> for "+theInfo+" returns None object"
+ raise RuntimeError
("<Paste> for "+theInfo+" returns None object")
aNewTree = GetTree(aRoot)
aLen = len(aTree)
for a in range(0,aLen):
aNewTree = GetTree(aRoot)
aLen = len(aTree)
for a in range(0,aLen):
@@
-210,7
+209,7
@@
def CheckCopyPaste(theSO, theInfo ,theComponentPaste):
if aLen < len(aNewTree):
return myStudy.FindObjectID(aNewTree[aLen])
if aLen < len(aNewTree):
return myStudy.FindObjectID(aNewTree[aLen])
- raise RuntimeError
, "After Copy calling the tree is not changed"
+ raise RuntimeError
("After Copy calling the tree is not changed")
#--------------------------------------------------------------------------
def FindFileInDataDir(filename):
#--------------------------------------------------------------------------
def FindFileInDataDir(filename):
@@
-247,7
+246,7
@@
while 1:
pass
if orb is None:
pass
if orb is None:
- print
"Warning: ORB has not been initialized !!!"
+ print
("Warning: ORB has not been initialized !!!")
# create an LifeCycleCORBA instance
lcc = LifeCycleCORBA(orb)
# create an LifeCycleCORBA instance
lcc = LifeCycleCORBA(orb)
@@
-265,7
+264,7
@@
while 1:
pass
if lcc is None:
pass
if lcc is None:
- print
"Warning: LifeCycleCORBA object has not been initialized !!!"
+ print
("Warning: LifeCycleCORBA object has not been initialized !!!")
#create a naming service instance
naming_service = SALOME_NamingServicePy_i(orb)
#create a naming service instance
naming_service = SALOME_NamingServicePy_i(orb)
@@
-288,13
+287,13
@@
while 1:
myStudyManager = obj._narrow(SALOMEDS.StudyManager)
if myStudyManager is None:
myStudyManager = obj._narrow(SALOMEDS.StudyManager)
if myStudyManager is None:
- print
"Warning: SALOMEDS.StudyManager has not been created !!!"
+ print
("Warning: SALOMEDS.StudyManager has not been created !!!")
# create new study
aListOfOpenStudies = myStudyManager.GetOpenStudies();
myStudy = None;
if len(aListOfOpenStudies) == 0 :
# create new study
aListOfOpenStudies = myStudyManager.GetOpenStudies();
myStudy = None;
if len(aListOfOpenStudies) == 0 :
- myStudy = myStudyManager.NewStudy("
Study1
")
+ myStudy = myStudyManager.NewStudy("
étude
")
else:
myStudyName = aListOfOpenStudies[0]
myStudy = myStudyManager.GetStudyByName(myStudyName)
else:
myStudyName = aListOfOpenStudies[0]
myStudy = myStudyManager.GetStudyByName(myStudyName)
@@
-302,5
+301,5
@@
else:
myStudyName = myStudy._get_Name()
myStudyId = myStudy._get_StudyId()
myStudyName = myStudy._get_Name()
myStudyId = myStudy._get_StudyId()
-#
print myStudyId
+#
print(myStudyId)