From f03f3d9abd4fa9f16d7c5e8ff67e6f08197c529f Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Fri, 21 Sep 2018 14:41:52 +0200 Subject: [PATCH] merge V9 --- Adao/configuration_Adao.py | 8 ++------ Adao/prefs_Adao.py | 7 +++++-- Adao/qtDico.py | 2 +- Adao/qtEficas_Adao.py | 2 +- Ihm/I_JDC.py | 4 ++-- Ihm/I_MCCOMPO.py | 4 ++-- Ihm/I_MCLIST.py | 2 +- Ihm/I_MCSIMP.py | 2 +- Noyau/N_FACT.py | 5 +++-- Noyau/N_MCCOMPO.py | 2 +- Noyau/N_MCSIMP.py | 2 +- UiQT5/makefile | 12 +++++++----- 12 files changed, 27 insertions(+), 25 deletions(-) diff --git a/Adao/configuration_Adao.py b/Adao/configuration_Adao.py index 5e1c7245..580c9921 100644 --- 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 ae4ded16..4e758db6 100644 --- 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 b1f781e0..51156caa 100755 --- 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 a1303831..05eaee9a 100755 --- 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 99589568..a66550c2 100644 --- 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 e8079a7c..23419327 100644 --- 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 15e80c99..b9eb660a 100644 --- 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 13888db5..681160b0 100644 --- 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 6de7e404..4e45660c 100644 --- 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 c4d641fd..6f0af8f5 100644 --- 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 73d01872..a06134df 100644 --- 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 df82e3e8..f30c48bf 100644 --- 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 -- 2.39.2