From 7d21639ccbce38a3920740dc8a5a59e2f51f8270 Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Tue, 26 Nov 2019 17:29:08 +0100 Subject: [PATCH] =?utf8?q?encore=20dans=20le=20gu=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- InterfaceQT4/editor.py | 2 +- InterfaceQT4/qtEficas.py | 2 +- InterfaceQT4/qtEficasSsIhm.py | 6 +++--- InterfaceQT4/readercataXML.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py index e63ad5ac..f6a84342 100755 --- a/InterfaceQT4/editor.py +++ b/InterfaceQT4/editor.py @@ -120,7 +120,7 @@ class JDCEditor(JDCEditorSsIhm,Ui_baseWidget,QWidget): self.Commandes_Ordre_Catalogue =self.readercata.Commandes_Ordre_Catalogue if self.appliEficas.readercata.demandeCatalogue==True : - nomFichierTranslation='translatorFichier'+'_'+str(self.appliEficas.readercata.versionCode) + nomFichierTranslation='translatorFichier'+'_'+str(self.appliEficas.readercata.labelCode) if hasattr(self.appliEficas.maConfiguration,nomFichierTranslation) : translatorFichier=getattr(self.appliEficas.maConfiguration,nomFichierTranslation) from Extensions import localisation diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py index 16a33d81..db99055a 100755 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceQT4/qtEficas.py @@ -47,7 +47,7 @@ class Appli(AppliSsIhm,Ui_Eficas,QMainWindow): """ Class implementing the main user interface. """ - def __init__(self,code=None,salome=1,parent=None, multi=False,langue='fr',ssIhm=False,versionCode=None): + def __init__(self,code=None,salome=1,parent=None, multi=False,langue='fr',ssIhm=False,labelCode=None): """ Constructor """ diff --git a/InterfaceQT4/qtEficasSsIhm.py b/InterfaceQT4/qtEficasSsIhm.py index 4a66cd5a..e5875817 100755 --- a/InterfaceQT4/qtEficasSsIhm.py +++ b/InterfaceQT4/qtEficasSsIhm.py @@ -40,13 +40,13 @@ class AppliSsIhm: """ Class implementing the main user interface. """ - def __init__(self,code=None,salome=1,parent=None,multi=False,langue='fr',ssIhm=True,versionCode=None): + def __init__(self,code=None,salome=1,parent=None,multi=False,langue='fr',ssIhm=True,labelCode=None): """ Constructor """ version=getEficasVersion() self.VERSION_EFICAS="Eficas QT5 Salome " + version - self.versionCode=versionCode + self.labelCode=labelCode self.salome=salome self.ssIhm=True @@ -193,4 +193,4 @@ class AppliSsIhm: if __name__=='__main__': # Modules Eficas - monEficas= AppliSsIhm(code='Adao',salome=0,versionCode='V83') + monEficas= AppliSsIhm(code='Adao',salome=0,labelCode='V83') diff --git a/InterfaceQT4/readercataXML.py b/InterfaceQT4/readercataXML.py index 5579a82b..8b309318 100644 --- a/InterfaceQT4/readercataXML.py +++ b/InterfaceQT4/readercataXML.py @@ -49,9 +49,9 @@ class ReaderCata (ReaderCataCommun): self.appliEficas.format_fichier='python' self.appliEficas.format_fichier_in ='xml' self.modeNouvCommande=self.appliEficas.maConfiguration.modeNouvCommande - self.versionCode=self.appliEficas.versionCode + self.labelCode=self.appliEficas.labelCode self.version_cata=None - self.fic_cata=None + self.ficCata=None self.OpenCata() self.cataitem=None self.titre='Eficas XML' @@ -65,11 +65,11 @@ class ReaderCata (ReaderCataCommun): def OpenCata(self): - #self.fic_cata = 'Cata_MED_FAM.xml' + #self.ficCata = 'Cata_MED_FAM.xml' #xml = open('/home/A96028/QT5GitEficasTravail/eficas/Med/Cata_MED_FAM.xml').read() #xml = open('/home/A96028/QT5GitEficasTravail/eficas/CataTestXSD/cata_test1.xml').read() self.choisitCata() - xml=open(self.fic_cata).read() + xml=open(self.ficCata).read() SchemaMed = readerEfiXsd.efficas.CreateFromDocument(xml) SchemaMed.exploreCata() self.cata=SchemaMed -- 2.39.2