X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FKERNEL_PY%2Fbatchmode_salome.py;h=59a0bfc8543bb563bc310df5117ae8891112693c;hb=dc4b16b9dd53dd42139fd22ef26556861db58989;hp=44028b7a055ac6150431b464b57d7e8521eea3fc;hpb=d9c3812022bf47f170380167372a7b61e7b1daa4;p=modules%2Fkernel.git diff --git a/src/KERNEL_PY/batchmode_salome.py b/src/KERNEL_PY/batchmode_salome.py index 44028b7a0..59a0bfc85 100755 --- a/src/KERNEL_PY/batchmode_salome.py +++ b/src/KERNEL_PY/batchmode_salome.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 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 @@ -35,10 +35,10 @@ from SALOME_NamingServicePy import * def ImportComponentGUI(ComponentName): libName = "lib" + ComponentName + "_Swig" command = "from " + libName + " import *" - exec ( command ) + exec (command, globals()) constructor = ComponentName + "GUI_Swig()" command = "gui = " + constructor - exec ( command ) + exec (command, globals()) return gui #-------------------------------------------------------------------------- @@ -65,12 +65,12 @@ def generateName(prefix = None): #WITHOUTIHMgetAllSelected = SalomeGUIgetAllSelected #WITHOUTIHMdef getDesktop(self) : -# return SalomePyQt.getDesktop() - #WITHOUTIHMreturn None +# return SalomePyQt.getDesktop() + #WITHOUTIHMreturn None #WITHOUTIHMdef getSelection(self) : -# return SalomePyQt.getSelection() - #WITHOUTIHMreturn None +# return SalomePyQt.getSelection() + #WITHOUTIHMreturn None #-------------------------------------------------------------------------- @@ -105,7 +105,7 @@ def IDToSObject(id): #-------------------------------------------------------------------------- -def PersistentPresentation(theStudy, theSO, theWithID): +def PersistentPresentation(theSO, theWithID): # put the sobject's content (with subchildren) to the string aResult = "" attrs = theSO.GetAllAttributes() @@ -154,9 +154,9 @@ def PersistentPresentation(theStudy, theSO, theWithID): aResult = "sobject: " + theSO.GetID() + " nbattrs: " + str(aLen - anUncopied) + aResult + '\n' else: aResult = " nbattrs: " + str(aLen - anUncopied) + aResult + '\n' - anIter = theStudy.NewChildIterator(theSO) + anIter = myStudy.NewChildIterator(theSO) while anIter.More(): - aResult += PersistentPresentation(theStudy, anIter.Value(), theWithID) + aResult += PersistentPresentation(anIter.Value(), theWithID) anIter.Next() return aResult @@ -178,28 +178,30 @@ def CheckCopyPaste(theSO, theInfo ,theComponentPaste): while aRoot.GetID() != "0:": aRoot = aRoot.GetFather() aTree = GetTree(aRoot) + aStudyPersist = PersistentPresentation(aRoot, 1) + aStudyPersist = PersistentPresentation(myStudy, aRoot, 1) - if not myStudyManager.CanCopy(theSO): - raise RuntimeError, " for "+theInfo+" returns false" + if not myStudy.CanCopy(theSO): + raise RuntimeError(" for "+theInfo+" returns false") - if not myStudyManager.Copy(theSO): - raise RuntimeError, " for "+theInfo+" returns false" + if not myStudy.Copy(theSO): + raise RuntimeError(" for "+theInfo+" returns false") - if not myStudyManager.CanPaste(theSO): - raise RuntimeError, " for "+theInfo+" returns false" + if not myStudy.CanPaste(theSO): + raise RuntimeError(" for "+theInfo+" returns false") # check: before paste study is not changed check - if aStudyPersist != PersistentPresentation(myStudy, aRoot, 1): - raise RuntimeError, "Study is changed before Paste calling for "+theInfo + if aStudyPersist != PersistentPresentation(aRoot, 1): + 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: - raise RuntimeError, " for "+theInfo+" returns None object" + if myStudy.Paste(aSObj) == None: + raise RuntimeError(" for "+theInfo+" returns None object") aNewTree = GetTree(aRoot) aLen = len(aTree) for a in range(0,aLen): @@ -209,7 +211,7 @@ def CheckCopyPaste(theSO, theInfo ,theComponentPaste): 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): @@ -246,7 +248,7 @@ while 1: 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) @@ -264,42 +266,30 @@ while 1: 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) -# get Study Manager reference +# get Study reference obj = None step = 0 sleeping_time = 0.01 sleeping_time_max = 1.0 while 1: - obj = naming_service.Resolve('myStudyManager') + obj = naming_service.Resolve('/Study') if obj is not None:break step = step + 1 if step > 100: break time.sleep(sleeping_time) sleeping_time = max(sleeping_time_max, 2*sleeping_time) pass - -myStudyManager = obj._narrow(SALOMEDS.StudyManager) - -if myStudyManager is None: - print "Warning: SALOMEDS.StudyManager has not been created !!!" - -# create new study -aListOfOpenStudies = myStudyManager.GetOpenStudies(); -myStudy = None; -if len(aListOfOpenStudies) == 0 : - myStudy = myStudyManager.NewStudy("Study1") -else: - myStudyName = aListOfOpenStudies[0] - myStudy = myStudyManager.GetStudyByName(myStudyName) -myStudyName = myStudy._get_Name() +myStudy = obj._narrow(SALOMEDS.Study) -myStudyId = myStudy._get_StudyId() -#print myStudyId +if myStudy is None: + print("Warning: SALOMEDS.Study has not been created !!!") + +myStudyName = myStudy._get_Name()