X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FqtEficasSsIhm.py;h=4374a8fb206ec8731a74480660ae95616fa25173;hb=8b202e4a0e933f400731a984944bf84aa9a06f48;hp=f2fb2245c6e9a442bd412462c18b39b0b811f743;hpb=077439ef6c2658c74d473ce67113108334b450ed;p=tools%2Feficas.git

diff --git a/InterfaceQT4/qtEficasSsIhm.py b/InterfaceQT4/qtEficasSsIhm.py
index f2fb2245..4374a8fb 100755
--- a/InterfaceQT4/qtEficasSsIhm.py
+++ b/InterfaceQT4/qtEficasSsIhm.py
@@ -22,17 +22,15 @@
 from __future__ import absolute_import
 from __future__ import print_function
 try :
-   from builtins import str
+    from builtins import str
 except : pass
 
 import os, sys
 
 from Extensions.eficas_exception import EficasException
 from Extensions import param2
-
 from InterfaceQT4.getVersion import getEficasVersion
 from InterfaceQT4.viewManagerSsIhm import MyViewManagerSsIhm
-
 from Editeur        import session
 
 
@@ -52,6 +50,8 @@ class AppliSsIhm:
         self.ssIhm=True
         self.code=code
         self.genereXSD=genereXSD
+        self.versionCode=versionCode
+        self.ssCode=ssCode
 
         self.dict_reels={}
         self.fichierIn=None
@@ -65,29 +65,30 @@ class AppliSsIhm:
         self.listeCode=['Adao','ADAO','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
         self.repIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'..','Editeur','icons')
 
-        self.fichierCata=session.d_env.fichierCata
+        if fichierCata== None: self.fichierCata=session.d_env.fichierCata
+        else : self.fichierCata=fichierCata
         if session.d_env.labelCode : self.labelCode=session.d_env.labelCode
         self.withXSD=session.d_env.withXSD
 
         if self.salome:
-          import Accas
-          try :
-            import eficasSalome
-            Accas.SalomeEntry = eficasSalome.SalomeEntry
-          except : 
-            print ('eficas hors salome')
+            import Accas
+            try :
+                import eficasSalome
+                Accas.SalomeEntry = eficasSalome.SalomeEntry
+            except :
+                print ('eficas hors salome')
 
         self.multi=multi
-        if self.multi : 
-              print ('pas de multi sans ihm')
+        if self.multi :
+            print ('pas de multi sans ihm')
 
 
         if langue=='fr': self.langue=langue
         else           : self.langue="ang"
 
         if self.multi == False :
-             self.definitCode(code,None)
-             if code==None: return
+            self.definitCode(code,ssCode)
+            if code==None: return
 
         self.suiteTelemac=False
         self.viewmanager=MyViewManagerSsIhm(self)
@@ -98,33 +99,33 @@ class AppliSsIhm:
         self.ssCode=ssCode
         if self.code == None:return # pour le cancel de la fenetre choix code
 
-        try : 
-          name='prefs_'+self.code
-          prefsCode=__import__(name)
-          self.repIni=prefsCode.repIni
-        except : 
-          self.repIni=os.path.dirname(os.path.abspath(__file__))
-          
+        try :
+            name='prefs_'+self.code
+            prefsCode=__import__(name)
+            self.repIni=prefsCode.repIni
+        except :
+            self.repIni=os.path.dirname(os.path.abspath(__file__))
+
 
         if ssCode != None :
-           self.formatFichierOut = ssCode  #par defaut
-           prefsCode.NAME_SCHEME = ssCode
+            self.formatFichierOut = ssCode  #par defaut
+            prefsCode.NAME_SCHEME = ssCode
         else :
-           self.formatFichierIn  = "python" #par defaut
-           self.formatFichierOut = "python" #par defaut
+            self.formatFichierIn  = "python" #par defaut
+            self.formatFichierOut = "python" #par defaut
 
         nameConf='configuration_'+self.code
         try :
-          configuration=__import__(nameConf)
-          self.maConfiguration = configuration.make_config(self,self.repIni)
+            configuration=__import__(nameConf)
+            self.maConfiguration = configuration.make_config(self,self.repIni)
         except :
-          from InterfaceQT4.configuration import makeConfig
-          #self.maConfiguration = configuration.makeConfig(self,prefsCode.repIni)
-          self.maConfiguration = makeConfig(self,self.repIni)
+            from InterfaceQT4.configuration import makeConfig
+            #self.maConfiguration = configuration.makeConfig(self,prefsCode.repIni)
+            self.maConfiguration = makeConfig(self,self.repIni)
 
         if hasattr (self,'maConfiguration') and self.maConfiguration.translatorFichier :
-           from Extensions import localisation
-           localisation.localise(None,self.langue,translatorFichier=self.maConfiguration.translatorFichier)
+            from Extensions import localisation
+            localisation.localise(None,self.langue,translatorFichier=self.maConfiguration.translatorFichier)
         if self.withXSD : self.maConfiguration.withXSD=True
 
 
@@ -138,18 +139,18 @@ class AppliSsIhm:
 
 
     def initEditor(self,fichier = None,jdc = None, units = None,include=0):
-        if (hasattr(self, 'editor')) and self.editor != None : 
-           print ('un seul editeur par application')
-           sys.exit()
+        if (hasattr(self, 'editor')) and self.editor != None :
+            print ('un seul editeur par application')
+            sys.exit()
         self.editor = self.viewmanager.getNewEditorNormal()
-        
+
     def initEditorNormal(self,fichier = None,jdc = None, units = None,include=0):
-        if (hasattr(self, 'editor')) and self.editor != None : 
-           print ('un seul editeur par application')
-           sys.Exit()
+        if (hasattr(self, 'editor')) and self.editor != None :
+            print ('un seul editeur par application')
+            sys.Exit()
         #self.editor = JDCEditorSsIhm(self,fichier, jdc, self.myQtab,units=units,include=include)
         self.editor = self.viewmanager.getNewEditorNormal()
-        
+
 
     def fileNew(self):
         self.editor=self.initEditor()
@@ -179,12 +180,13 @@ class AppliSsIhm:
         print ('ok ',ok)
 
     def dumpXsd(self, avecEltAbstrait = False):
-        current_cata    = CONTEXT.getCurrentCata()
-        texteXSD = current_cata.dumpXsd( avecEltAbstrait)
+        currentCata    = CONTEXT.getCurrentCata()
+        texteXSD = currentCata.dumpXsd( avecEltAbstrait)
         return texteXSD
         #if self.maConfiguration.afficheIhm==False : exit()
         #else : return texteXSD
 
+
 #,self.fileSaveAs
 #,self.fileClose
 #,self.fileExit
@@ -192,7 +194,7 @@ class AppliSsIhm:
 #,self.jdcRegles
 #,self.jdcFichierSource
 #,self.visuJdcPy
-       
+
 
 
 if __name__=='__main__':