encore dans le gué

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index e63ad5ac9b383cea749bb33f1d9ecee785ac830a..f6a84342b2be6af27d4084a6203088a27fe2fe2e 100755 (executable)
--- 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 16a33d819a253a6601ae8717eadfb631c611a6a1..db99055a8e9a5fd55138de89cb90c82d531ef94f 100755 (executable)
--- 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 4a66cd5ac54e61f2dbf537d3d196ecffee048c19..e58758172039b9ca7111689c6b5b27cf56128d73 100755 (executable)
--- 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 5579a82b60aff7ada8f1b16dd5f1a8162cd816e0..8b3093184091c24a13400a925cb6f6e6508e36e8 100644 (file)
--- 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