et la plomberie autour du generator dico

diff --git a/InterfaceQT4/editorSsIhm.py b/InterfaceQT4/editorSsIhm.py
index db3f87e35adcc60085b47279fa52e7a6cc1480ec..55530f30350f40afedc569a71bb1b6e8b9e93d82 100755 (executable)
--- a/InterfaceQT4/editorSsIhm.py
+++ b/InterfaceQT4/editorSsIhm.py
@@ -338,11 +338,15 @@ class JDCEditorSsIhm :
     #-----------------------#
         if 'dico' in generator.plugins:
             self.generator=generator.plugins['dico']()
-            #print (self.generator)
-            jdc_formate=self.generator.gener(self.jdc)
-            #print (jdc_formate)
-            dico=self.generator.Dico
-            #print (dico)
+            texte_jdc=self.generator.gener(self.jdc)
+            return texte_jdc
+
+    #-----------------------#
+    def generDicoPython(self):
+    #-----------------------#
+        if 'dico' in generator.plugins:
+            self.generator=generator.plugins['dico']()
+            dico=self.generator.generDico(self.jdc)
             return dico
 
     #-----------------------#

diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py
index 62402fdd9046a3b5a7be592d6b059861b2e00038..bd70372ed21765ce6002161d4f109f6508160042 100755 (executable)
--- a/InterfaceQT4/eficas_go.py
+++ b/InterfaceQT4/eficas_go.py
@@ -151,6 +151,7 @@ def genereStructure(code=None):
     f.close()
 
 def validateFile(code,fichierCata,fichier):
+#------------------------------
     from Editeur  import session
     options=session.parse(['',])
     from .qtEficasSsIhm import AppliSsIhm
@@ -159,6 +160,28 @@ def validateFile(code,fichierCata,fichier):
     monEditeur=JDCEditorSsIhm(monEficasSsIhm,fichier)
     return monEditeur.jdc.isValid()
 
+def getObjectPython(code,fichierCata,fichier):
+#------------------------------
+    from Editeur  import session
+    options=session.parse(['',])
+    from Noyau.N_OBJECT import activeSurcharge
+    activeSurcharge()
+    from .qtEficasSsIhm import AppliSsIhm
+    from .editorSsIhm import JDCEditorSsIhm
+    monEficasSsIhm=AppliSsIhm(code=code, salome=0, fichierCata=fichierCata)
+    monEditeur=JDCEditorSsIhm(monEficasSsIhm,fichier)
+    return monEditeur.jdc
+
+def getDicoPython(code,fichierCata,fichier):
+#------------------------------
+    from Editeur  import session
+    options=session.parse(['',])
+    from .qtEficasSsIhm import AppliSsIhm
+    from .editorSsIhm import JDCEditorSsIhm
+    monEficasSsIhm=AppliSsIhm(code=code, salome=0, fichierCata=fichierCata)
+    monEditeur=JDCEditorSsIhm(monEficasSsIhm,fichier)
+    return monEditeur.generDicoPython()
+
 def validateDataSet(code=None):
 #------------------------------
     from Editeur  import session