mise en coherence avec la V7.7 d eficas canal historique

diff --git a/Adao/qtDico.py b/Adao/qtDico.py
index 8b79878c23d5bbbfeffb4280ff169ccab476c36b..a51f5b0a92dfb484981b5504a00c707142f89d8e 100755 (executable)
--- 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 959b58e4df4a32ddde5caa74e9d05daa21776d0d..3e878f2dbfad224bcaab63173a0f430b757d8c40 100644 (file)
--- 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 e2b39a9ead39cbac0e9e5a8b14ad1b2f1ebdd244..5d764cecd5b52d475aaf6251bd844a208fd389bf 100755 (executable)
--- 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 d626fafc91b6be2458244f773b58e0df1d8a75ca..2a6989d56b9c85ababa4ff1e6c4eb2f7bad988a2 100644 (file)
--- 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 edb7b31ef26d1f3be81022a51007dc953d244d88..3e9089a054fb0c8a96135dd7521d82534c98cff7 100644 (file)
--- 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 20c44b4917c9c55abc701da2fa2a0301fe70a3c7..b3912156115423f0f99251e22d2426968a7302c4 100644 (file)
--- a/UiQT4/desWidgetPlusieursBase.ui
+++ b/UiQT4/desWidgetPlusieursBase.ui
@@ -61,20 +61,39 @@ border: 1px solid gray;
         <enum>QLayout::SetFixedSize</enum>
        </property>
        <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
+        <widget class="QToolButton" name="BFermeListe">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="sizeHint" stdset="0">
+         <property name="maximumSize">
           <size>
            <width>21</width>
-           <height>20</height>
+           <height>25</height>
           </size>
          </property>
-        </spacer>
+         <property name="toolTip">
+          <string>permet de gérer la liste</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border:0px</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset>
+           <normaloff>../Editeur/icons/minusnode.png</normaloff>../Editeur/icons/minusnode.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>25</width>
+           <height>25</height>
+          </size>
+         </property>
+        </widget>
        </item>
        <item>
         <widget class="MonBoutonValide" name="RBValide">

diff --git a/UiQT4/desWidgetPlusieursInto.ui b/UiQT4/desWidgetPlusieursInto.ui
index ce9b3b8d98077751e0ed5f62b04330bc6ae4fb67..3f081093c441adf2e768bff5316fdc9f1a8c6dfe 100644 (file)
--- a/UiQT4/desWidgetPlusieursInto.ui
+++ b/UiQT4/desWidgetPlusieursInto.ui
@@ -55,20 +55,39 @@
         <enum>QLayout::SetFixedSize</enum>
        </property>
        <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+        <widget class="QToolButton" name="BFermeListe">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
+         <property name="maximumSize">
           <size>
            <width>21</width>
-           <height>20</height>
+           <height>25</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>permet de gérer la liste</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border:0px</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset>
+           <normaloff>../Editeur/icons/minusnode.png</normaloff>../Editeur/icons/minusnode.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>25</width>
+           <height>25</height>
           </size>
          </property>
-        </spacer>
+        </widget>
        </item>
        <item>
         <widget class="MonBoutonValide" name="RBValide">

diff --git a/UiQT4/desWidgetPlusieursPlie.ui b/UiQT4/desWidgetPlusieursPlie.ui
index efa539431c13e573c0a1aa99795357582a766e49..c9dbe943cff1b4d1222a07b737888b9db3d4aa76 100644 (file)
--- a/UiQT4/desWidgetPlusieursPlie.ui
+++ b/UiQT4/desWidgetPlusieursPlie.ui
@@ -175,6 +175,9 @@
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
         <widget class="QLineEdit" name="lineEditVal">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>1</horstretch>
@@ -194,8 +197,9 @@
           </size>
          </property>
          <property name="styleSheet">
-          <string notr="true">background:rgb(255,255,235);
-border:0px;</string>
+          <string notr="true">background:rgb(195,195,195);
+border:0px;
+</string>
          </property>
         </widget>
        </item>