fin modif pour projection cata-edg-rn

diff --git a/Accas/A_SIMP.py b/Accas/A_SIMP.py
index 59c5f444c4f0bb27d059aa8ca80efd3519110289..6b44672c37d4a11baaec57975d2e8ca6d078b387 100644 (file)
--- a/Accas/A_SIMP.py
+++ b/Accas/A_SIMP.py
@@ -26,7 +26,7 @@ from Efi2Xsd.AccasXsd import X_SIMP
 class SIMP(N_SIMP.SIMP,X_SIMP,I_ENTITE.ENTITE):
     class_instance=A_MCSIMP.MCSIMP
     def __init__(self,*tup,**args):
-        #print tup
-        #print args
+        #print (tup)
+        #print (args)
         I_ENTITE.ENTITE.__init__(self)
         N_SIMP.SIMP.__init__(self,*tup,**args)

diff --git a/InterfaceQT4/editorSsIhm.py b/InterfaceQT4/editorSsIhm.py
index 55530f30350f40afedc569a71bb1b6e8b9e93d82..766341d3aa7f2e98832ab1c5783cc7913b36f2d5 100755 (executable)
--- a/InterfaceQT4/editorSsIhm.py
+++ b/InterfaceQT4/editorSsIhm.py
@@ -840,6 +840,15 @@ class JDCEditorSsIhm :
 
         monMC.state='changed'
         return 1
+    def dumpXsd(self, avecEltAbstrait = False):
+    #-----------------------------------------#
+        texteXSD = self.readercata.cata.JdC.dumpXsd(avecEltAbstrait)
+        return texteXSD
+
+    def dumpStructure(self):
+    #----------------------------#
+        texteStructure = self.readercata.cata.JdC.dumpStructure()
+        return texteStructure
 
     #-------------------------------------#
     def changeDefautDefMC(self,nomEtape,listeMC,valeurs):

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index 05d942d9c14b1e75779f87801c56b3a00fff0966..226d31c966e5a37e5269ee46fd3529af0e9fb978 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -242,6 +242,7 @@ class ReaderCata (ReaderCataCommun):
         self.cata = self.importCata(self.fichierCata)
         if self.code == 'NonConnu' : self.code = self.cata.JdC.code
         modeleMetier = None
+        self.cata.fileModeleMetier = None
         dicoEltDif = {}
         if not (self.appliEficas.genereXSD) :
             if (self.appliEficas.maConfiguration.withXSD or self.appliEficas.withXSD)  :
@@ -254,7 +255,11 @@ class ReaderCata (ReaderCataCommun):
                     nomCataXsd = os.path.splitext(os.path.basename(self.fichierCata))[0]
                     fichierCataTrunc=os.path.splitext(os.path.basename(self.fichierCata))[0]
                     nomCataXsd = fichierCataTrunc+'_driver'
-                    pathCata = os.path.dirname(self.fichierCata)+'/raw/'+nomCataXsd+'.py'
+
+                    if  os.path.dirname(self.fichierCata) == "" : pathCata ='./raw/'+nomCataXsd+'.py'
+                    else :  pathCata = os.path.dirname(self.fichierCata)+'/raw/'+nomCataXsd+'.py'
+
+                    self.cata.fileModeleMetier= os.path.dirname(self.fichierCata)+'/raw/'+nomCataXsd+'.xsd'
                     import imp
                     modeleMetier= imp.load_source(nomCataXsd,pathCata)
                     #print ('nomCataXsd , pathCata ',nomCataXsd,pathCata)

diff --git a/ReacteurNumerique/getDicoPython.py b/ReacteurNumerique/getDicoPython.py
index 34e3a5404e7a8ea6e70995eefcf1864a374ff847..c6f58810aab2caca5eb3983c6890fbf9f735b57b 100755 (executable)
--- a/ReacteurNumerique/getDicoPython.py
+++ b/ReacteurNumerique/getDicoPython.py
@@ -6,9 +6,10 @@ import sys,os
 sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
 from InterfaceQT4.eficas_go import getDicoPython
 
-monDico=getDicoPython("ReacteurNumerique","cata_RN_EDG_PN.py","edg_REP1300_FULL_PN.comm")
+#monDico=getDicoPython("ReacteurNumerique","cata_RN_EDG_PN.py","edg_REP1300_FULL_PN.comm")
+monDico=getDicoPython("ReacteurNumerique","cata_RN_EDG_PN.py","/tmp/toto.comm")
 from pprint import pprint
-print (monDico)
+pprint (monDico)