merge V9

diff --git a/Adao/configuration_Adao.py b/Adao/configuration_Adao.py
index 5e1c7245f80574819de5945f2005859388e9608a..580c9921b6e9e8cf0e98b2c3659e37e33ece0948 100644 (file)
--- a/Adao/configuration_Adao.py
+++ b/Adao/configuration_Adao.py
@@ -37,12 +37,12 @@ from InterfaceQT4 import configuration
 
 # Classe de base permettant de lire, afficher
 # et sauvegarder les fichiers utilisateurs
-class CONFIG(configuration.CONFIG_BASE):
+class CONFIG(configuration.configBase):
 
   def __init__(self,appli,repIni):
 
     self.labels_eficas=['lang','rep_cata','catalogues','closeAutreCommande','closeFrameRechercheCommande','closeEntete','taille']
-    configuration.CONFIG_BASE.__init__(self,appli,repIni)
+    configuration.configBase.__init__(self,appli,repIni)
 
     self.rep_user = os.environ["HOME"]
     self.appli   = appli
@@ -60,9 +60,5 @@ class CONFIG(configuration.CONFIG_BASE):
     #self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"),)
 
 def make_config(appli,rep):
-
     return CONFIG(appli,rep)
 
-def make_config_style(appli,rep):
-
-    return None

diff --git a/Adao/prefs_Adao.py b/Adao/prefs_Adao.py
index ae4ded1690a84897363127edcb82c6180506fe67..4e758db64ac0a1256fb6babf4c02adfeccdf8890 100644 (file)
--- a/Adao/prefs_Adao.py
+++ b/Adao/prefs_Adao.py
@@ -16,7 +16,10 @@ encoding='iso-8859-1'
 catalogues = (
 # ('Adao','V1',os.path.join(repIni,'ADAO_Cata_V1.py'),'python','python'),
 # ('Adao','V770',os.path.join(repIni,'ADAO_Cata_V0_V7_7_0.py'),'python','python'),
- ('Adao','V83',os.path.join(repIni,'ADAO_Cata_V0_V8_3_0_DEV.py'),'dico','python'),
+# ('Adao','V83',os.path.join(repIni,'ADAO_Cata_V0_V8_3_0_DEV.py'),'dicoImbrique','dico'),
+# ('Adao','dico',os.path.join(repIni,'ADAO_Cata_V0_V8_3_0_DEV.py'),'dico','dico'),
+ ('Adao','V83',os.path.join(repIni,'ADAO_Cata_V0_V8_3_0_DEV.py'),'python','python'),
+# ('Adao','V83',os.path.join(repIni,'ADAO_Cata_PN.py'),'python','python'),
 # ('Adao','V751',os.path.join(repIni,'ADAO_Cata_V0_V7_5_1.py'),'python','python'),
 )
 
@@ -29,5 +32,5 @@ closeFrameRechercheCommande = True
 closeArbre = True
 translatorFichier = os.path.join(repIni,'Adao')
 nombreDeBoutonParLigne=1
-
+#dumpXSD=True
 

diff --git a/Adao/qtDico.py b/Adao/qtDico.py
index b1f781e057eda46f8b91346d3aa92b54c6608eee..51156caa39b14da5f75bf973ff1cc1d0c05243d8 100755 (executable)
--- a/Adao/qtDico.py
+++ b/Adao/qtDico.py
@@ -30,7 +30,7 @@ __import__(name)
 
 from InterfaceQT4 import eficas_go
 
-dico=eficas_go.lance_eficas_param(code=prefs.code,fichier="/local00/home/A96028/GitEficas/eficas/Adao/exemple01.comm",version="V760",macro="ASSIMILATION_STUDY")
+dico=eficas_go.lanceEficas_param(code=prefs.code,fichier="/local00/home/A96028/GitEficas/eficas/Adao/exemple01.comm",version="V760",macro="ASSIMILATION_STUDY")
 #print dico
 
 import pprint

diff --git a/Adao/qtEficas_Adao.py b/Adao/qtEficas_Adao.py
index a13038319f45dc0f71bfac472dd65352881d5162..05eaee9a776689b20d0d1a804f0c806206f825e2 100755 (executable)
--- a/Adao/qtEficas_Adao.py
+++ b/Adao/qtEficas_Adao.py
@@ -33,4 +33,4 @@ __import__(name)
 
 from InterfaceQT4 import eficas_go
 print eficas_go
-eficas_go.lance_eficas(code=prefs.code)
+eficas_go.lanceEficas(code=prefs.code)

diff --git a/Ihm/I_JDC.py b/Ihm/I_JDC.py
index 995895682d1419a349806e9cb44ba5ce860d8995..a66550c22d3927c1f9786d539d0c530fed12357f 100644 (file)
--- a/Ihm/I_JDC.py
+++ b/Ihm/I_JDC.py
@@ -434,7 +434,7 @@ class JDC(I_OBJECT.OBJECT):
         #if actif == 0 and etape.nom in ['DEBUT','POURSUITE']:actif=1
         #if actif == 1:
            etape.active()
-           self.enregistreEtapePyxb(etape)
+           #self.enregistreEtapePyxb(etape)
         #else:
         #   etape.inactive()
         #if etape.nom == 'FIN':actif=-1
@@ -478,7 +478,7 @@ class JDC(I_OBJECT.OBJECT):
       self.initModif()
       index_etape=self.etapes.index(etape)
 
-      etape.deletePyxbObject()
+      #etape.deletePyxbObject()
       self.etapes.remove(etape)
 
       if etape.niveau is not self:

diff --git a/Ihm/I_MCCOMPO.py b/Ihm/I_MCCOMPO.py
index e8079a7c9be270addffe9c2bc172df27df8247b4..234193270fcd9a7ca3a0d18e408c367312cda140 100644 (file)
--- a/Ihm/I_MCCOMPO.py
+++ b/Ihm/I_MCCOMPO.py
@@ -203,7 +203,7 @@ class MCCOMPO(I_OBJECT.OBJECT):
        return 0
 
     self.initModif()
-    objet.deletePyxbObject()
+    #objet.deletePyxbObject()
     self.mcListe.remove(objet)
     CONNECTOR.Emit(self,"supp",objet)
     objet.deleteMcGlobal()
@@ -255,7 +255,7 @@ class MCCOMPO(I_OBJECT.OBJECT):
            self.mcListe.insert(pos,objet)
          # Il ne faut pas oublier de reaffecter le parent d'obj (si copie)
          objet.reparent(self)
-         objet.addPyxbObject(self.findRangObjetDsArbre(objet))
+         #objet.addPyxbObject(self.findRangObjetDsArbre(objet))
          CONNECTOR.Emit(self,"add",objet)
          objet.updateMcGlobal()
          objet.updateConditionBloc()

diff --git a/Ihm/I_MCLIST.py b/Ihm/I_MCLIST.py
index 15e80c99cacc5747dca270759ab499052f171cbd..b9eb660a316105b02c981a2661a4f80b7e4072af 100644 (file)
--- a/Ihm/I_MCLIST.py
+++ b/Ihm/I_MCLIST.py
@@ -80,7 +80,7 @@ class MCList:
       self.remove(obj)
       CONNECTOR.Emit(self,"supp",obj)
       self.updateConditionBloc()
-      obj.deletePyxbObject()
+      #obj.deletePyxbObject()
       obj.supprime()
       self.etape.modified()
       self.finModif()

diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py
index 13888db54a2dc2d7ae5082e2d7d112bf450d2915..681160b0749575d4e69fe8c2dc5fcb8dfc53f33a 100644 (file)
--- a/Ihm/I_MCSIMP.py
+++ b/Ihm/I_MCSIMP.py
@@ -327,7 +327,7 @@ class MCSIMP(I_OBJECT.OBJECT):
         self.initModif()
         self.valeur = new_valeur
         self.val = new_valeur
-        self.setValeurObjPyxb(new_valeur)
+        #self.setValeurObjPyxb(new_valeur)
         self.updateConditionBloc()
         self.etape.modified()
         self.finModif()

diff --git a/Noyau/N_FACT.py b/Noyau/N_FACT.py
index 6de7e4045debd4d0f12911e7423f4fffcdfc0a14..4e45660ce66b7c79b9cbcf935617aa3759bbeade 100644 (file)
--- a/Noyau/N_FACT.py
+++ b/Noyau/N_FACT.py
@@ -134,7 +134,8 @@ class FACT(N_ENTITE.ENTITE):
             for v in val:
                 if type(v) == dict or isinstance(v, _F):
                     objet = self.class_instance(
-                        nom=nom, definition=self, val=v, parent=parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction[indice])
+                        nom=nom, definition=self, val=v, parent=parent,dicoPyxbDeConstruction=None)
+                        #nom=nom, definition=self, val=v, parent=parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction[indice])
                     indice=indice+1
                     l.append(objet)
                 elif isinstance(v, self.class_instance):
@@ -153,7 +154,7 @@ class FACT(N_ENTITE.ENTITE):
         else:
             l.append(N_OBJECT.ErrorObj(self, val, parent, nom))
         l.cata=l.jdc.cata
-        l.buildObjPyxb(l)
+        #l.buildObjPyxb(l)
         return l
 
     def verifCata(self):

diff --git a/Noyau/N_MCCOMPO.py b/Noyau/N_MCCOMPO.py
index c4d641fd3adca053071278b7921d00bb7ae9a5fe..6f0af8f5b049edc2289e77a1f822d7f76fb04beb 100644 (file)
--- a/Noyau/N_MCCOMPO.py
+++ b/Noyau/N_MCCOMPO.py
@@ -155,7 +155,7 @@ class MCCOMPO(N_OBJECT.OBJECT):
         # on retourne la liste ainsi construite
         if self.jdc  : self.cata=self.jdc.cata
         else : self.cata = None
-        self.buildObjPyxb(mcListe)
+        #self.buildObjPyxb(mcListe)
         #else : print ('pas de construction pour ', self.nom, self.objPyxbDeConstruction)
         #print ('buildObjPyxb : ' , self.nom)
         #print(("MCCOMPO.buildMc fin_____________________________________", self.nom))

diff --git a/Noyau/N_MCSIMP.py b/Noyau/N_MCSIMP.py
index 73d018721541b4d6fea9c9522bfbf9a831679434..a06134df52366463e144fbfbad650ba7da841fd7 100644 (file)
--- a/Noyau/N_MCSIMP.py
+++ b/Noyau/N_MCSIMP.py
@@ -73,7 +73,7 @@ class MCSIMP(N_OBJECT.OBJECT):
             else : self.cata = None
             self.niveau = self.parent.niveau
             self.etape = self.parent.etape
-            self.buildObjPyxb()
+            #self.buildObjPyxb()
         else:
             # Le mot cle simple a été créé sans parent
             # est-ce possible ?

diff --git a/UiQT5/makefile b/UiQT5/makefile
index df82e3e82d1e9da95a31b2ff0607ad4ec9e22799..f30c48bf2f4cf3768b51ef737e3031c710362fb1 100644 (file)
--- a/UiQT5/makefile
+++ b/UiQT5/makefile
@@ -7,16 +7,18 @@ QTRELEASE = lrelease
 PY_FILES = myMain.py desBaseWidget.py desChoixCata.py desChoixCode.py desChoixCommandes.py \
         desChoixLangue.py desRecherche.py  desRechercheCatalogue.py\
        desSelectVal.py desViewTexte.py desViewRegles.py desVisu.py desWidgetCreeParam.py desWidgetCommande.py \
-       desWidgetOptionnel.py desWidgetOptionnelMC.py Tuple2.py Tuple3.py  \
-       desWidgetBloc.py desWidgetCB.py desWidgetCommentaire.py desWidgetDate.py \
-       desWidgetFact.py desWidgetFactPlie.py desWidgetFormule.py desGroupeOptionnel.py \
+       desWidgetOptionnel.py Tuple2.py Tuple3.py  Tuple4.py Tuple5.py Tuple6.py Tuple7.py Tuple8.py Tuple9.py\
+       Tuple10.py desWidgetBloc.py desWidgetCB.py desWidgetCBIntoSug.py desWidgetCommentaire.py desWidgetDate.py \
+       desWidgetFact.py desWidgetFactPlie.py desWidgetFactTableau.py desWidgetFormule.py desGroupeOptionnel.py \
        desWidgetHeure.py  desWidgetInformation.py desWidgetIntoSug.py desWidgetInactif.py \
        desWidgetMatrice.py desWidgetParam.py desWidgetPlusieursBase.py desWidgetPlusieursInto.py \
        desWidgetPlusieursIntoOrdonne.py desWidgetPlusieursTuple.py desWidgetRadioButton.py \
        desWidget4a6RadioButton.py desWidgetSimpBase.py desWidgetSDCOInto.py desWidgetSimpBool.py \
-        desWidgetSimpSalome.py  desPBOptionnelMT.py\
+        desWidgetSimpSalome.py  desPBOptionnelMT.py desWidgetTableau.py\
        desWidgetSimpComplexe.py desWidgetSimpFichier.py desWidgetSimpTxt.py desWidgetTuple2.py \
-       desWidgetTuple3.py desWidgetVide.py desWidgetUniqueSDCO.py desWidgetPlusieursPlie.py
+        desWidgetTuple3.py desWidgetTuple4.py desWidgetTuple5.py desWidgetTuple6.py desWidgetTuple7.py \
+        desWidgetTuple8.py desWidgetTuple9.py desWidgetTuple10.py desWidgetVide.py desWidgetUniqueSDCO.py \
+        desWidgetPlusieursPlie.py desWidgetNiveauFact.py dateEtHeure.py