From f9c710022d2b4038a6661bb2367f3e1c3f4d00ed Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Mon, 30 Nov 2015 15:25:45 +0100 Subject: [PATCH] mise en coherence avec la V7.7 d eficas canal historique --- Adao/qtDico.py | 6 +++-- InterfaceQT4/monWidgetPlusieursBase.py | 4 ++- InterfaceQT4/qtEficas.py | 2 +- MT/mesScripts_MT.py | 4 ++- Noyau/strfunc.py | 1 + UiQT4/desWidgetPlusieursBase.ui | 37 +++++++++++++++++++------- UiQT4/desWidgetPlusieursInto.ui | 37 +++++++++++++++++++------- UiQT4/desWidgetPlusieursPlie.ui | 8 ++++-- 8 files changed, 74 insertions(+), 25 deletions(-) diff --git a/Adao/qtDico.py b/Adao/qtDico.py index 8b79878c..a51f5b0a 100755 --- a/Adao/qtDico.py +++ b/Adao/qtDico.py @@ -30,6 +30,8 @@ __import__(name) from InterfaceQT4 import eficas_go -dico=eficas_go.lance_eficas_param(code=prefs.code,fichier="/local00/home/A96028/GitEficasTravail/eficas/Adao/kk.comm",version='V1',macro="ASSIMILATION_STUDY") -print dico +dico=eficas_go.lance_eficas_param(code=prefs.code,fichier="/local00/home/A96028/GitEficas/eficas/Adao/exemple01.comm",version="V760",macro="ASSIMILATION_STUDY") +#print dico +import pprint +pprint.pprint(dico) diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py index 959b58e4..3e878f2d 100644 --- a/InterfaceQT4/monWidgetPlusieursBase.py +++ b/InterfaceQT4/monWidgetPlusieursBase.py @@ -30,12 +30,13 @@ from desWidgetPlusieursBase import Ui_WidgetPlusieursBase from politiquesValidation import PolitiquePlusieurs from qtSaisie import SaisieValeur from gereListe import GereListe +from gereListe import GerePlie from gereListe import LECustom dicoLongueur={2:95,3:125,4:154,5:183,6:210} hauteurMax=253 -class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe): +class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie): def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): #print "MonWidgetPlusieursBase", nom @@ -46,6 +47,7 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe): self.listeAffichageWidget=[] Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) GereListe.__init__(self) + self.gereIconePlier() self.connect(self.BSelectFichier,SIGNAL("clicked()"), self.selectInFile) if sys.platform[0:5]!="linux": diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py index e2b39a9e..5d764cec 100755 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceQT4/qtEficas.py @@ -260,7 +260,7 @@ class Appli(Ui_Eficas,QMainWindow): self.menuMesh = self.menubar.addMenu(tr("Gestion Maillage")) self.menuMesh.setObjectName("Mesh") self.menuMesh.addAction(self.actionChercheGrpMaille) - self.griserActionsStructures() + #self.griserActionsStructures() def CARMELCND(self): self.enleverNewInclude() diff --git a/MT/mesScripts_MT.py b/MT/mesScripts_MT.py index d626fafc..2a6989d5 100644 --- a/MT/mesScripts_MT.py +++ b/MT/mesScripts_MT.py @@ -8,6 +8,8 @@ def view_zone(listeparam) : def view_ligne_arbre(listeparam) : item=listeparam[0] + print "kkk" + return import visu_geom visu_arbre = visu_geom.VisuGeom(from_eficas=True, eficas_item=item, @@ -47,6 +49,6 @@ def import_zone(listeparam): dict_commandes={ 'LIGNE_ARBRE':((view_ligne_arbre,"View",('item',),False,True,"affiche dans Geom la representation de la ligne d'arbre"),), 'ZONE':( - (view_zone,"View",('item',),False,False,"affiche dans Geom la representation de la zone "), + (view_zone,"View",('item',),False,True,"affiche dans Geom la representation de la zone "), (import_zone,"import_zone",('editor','self'),False,False,"import de fichier zone"),) } diff --git a/Noyau/strfunc.py b/Noyau/strfunc.py index edb7b31e..3e9089a0 100644 --- a/Noyau/strfunc.py +++ b/Noyau/strfunc.py @@ -98,6 +98,7 @@ def ufmt(uformat, *args): else: nargs.append(arg) arguments = tuple(nargs) + formatted_string="" try: formatted_string = uformat % arguments except UnicodeDecodeError, err: diff --git a/UiQT4/desWidgetPlusieursBase.ui b/UiQT4/desWidgetPlusieursBase.ui index 20c44b49..b3912156 100644 --- a/UiQT4/desWidgetPlusieursBase.ui +++ b/UiQT4/desWidgetPlusieursBase.ui @@ -61,20 +61,39 @@ border: 1px solid gray; QLayout::SetFixedSize - - - Qt::Horizontal - - - QSizePolicy::Fixed + + + + 0 + 0 + - + 21 - 20 + 25 - + + permet de gérer la liste + + + border:0px + + + ... + + + + ../Editeur/icons/minusnode.png../Editeur/icons/minusnode.png + + + + 25 + 25 + + + diff --git a/UiQT4/desWidgetPlusieursInto.ui b/UiQT4/desWidgetPlusieursInto.ui index ce9b3b8d..3f081093 100644 --- a/UiQT4/desWidgetPlusieursInto.ui +++ b/UiQT4/desWidgetPlusieursInto.ui @@ -55,20 +55,39 @@ QLayout::SetFixedSize - - - Qt::Horizontal + + + + 0 + 0 + - - QSizePolicy::Fixed - - + 21 - 20 + 25 + + + + permet de gérer la liste + + + border:0px + + + ... + + + + ../Editeur/icons/minusnode.png../Editeur/icons/minusnode.png + + + + 25 + 25 - + diff --git a/UiQT4/desWidgetPlusieursPlie.ui b/UiQT4/desWidgetPlusieursPlie.ui index efa53943..c9dbe943 100644 --- a/UiQT4/desWidgetPlusieursPlie.ui +++ b/UiQT4/desWidgetPlusieursPlie.ui @@ -175,6 +175,9 @@ + + false + 1 @@ -194,8 +197,9 @@ - background:rgb(255,255,235); -border:0px; + background:rgb(195,195,195); +border:0px; + -- 2.39.2