From: PASCALE NOYRET Date: Mon, 30 May 2022 09:46:30 +0000 (+0200) Subject: chgt pour generateXML X-Git-Tag: merge_uncertainty_odysee_1210~75 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cc6d40114456c787fbe46b9cedecaf609d8310dd;p=tools%2Feficas.git chgt pour generateXML --- diff --git a/InterfaceQT4/editorSsIhm.py b/InterfaceQT4/editorSsIhm.py index 1480a343..8fb239fc 100755 --- a/InterfaceQT4/editorSsIhm.py +++ b/InterfaceQT4/editorSsIhm.py @@ -227,6 +227,8 @@ class JDCEditorSsIhm : CONTEXT.unsetCurrentStep() #jdc=self.readercata.cata[0].JdC(procedure=text, + # le jdc n est pas charge + if not(hasattr(self.readercata.cata, 'cata_ordonne_dico')) : return jdc=self.readercata.cata.JdC(procedure=text, appliEficas=self.appliEficas, cata=self.readercata.cata, diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py index fb8aba6e..092ee750 100755 --- a/InterfaceQT4/eficas_go.py +++ b/InterfaceQT4/eficas_go.py @@ -126,7 +126,7 @@ def genereXML(code=None): monEficasSsIhm = getEficasSsIhm(code=options.code, forceXML=True) monEditeur=JDCEditorSsIhm(monEficasSsIhm,fichier) if not(monEditeur.readercata.cata) : return 0 - if (not monEditeur.jdc) or not(monEditeur.jdc.isValid()): + if monEditeur.jdc and not(monEditeur.jdc.isValid()): print ('Fichier comm is not valid') return 0 #print ('Fichier comm is not valid') diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py index 57b29cce..b6152a40 100644 --- a/InterfaceQT4/readercata.py +++ b/InterfaceQT4/readercata.py @@ -283,6 +283,7 @@ class ReaderCata (ReaderCataCommun): #if self.appliEficas.ssIhm == False :print (' unable to load xsd driver ') self.QWParent.informe('XSD driver', 'unable to load xsd driver',critique=False) modeleMetier = None + return self.cata.DicoNomTypeDifferentNomElt=dicoEltDif