*** empty log message ***

diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py
index ff7932fc40f5f9264ab127418149f026bff9c00e..fbbf61b4de05c8c247d61186d5d50c2438757021 100644 (file)
--- a/InterfaceQT4/composimp.py
+++ b/InterfaceQT4/composimp.py
@@ -84,7 +84,6 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
                 from monFonctionPanel import MonFonctionPanel
                 klass = MonFonctionPanel
 
-        print klass
         if not klass:
             return None
         return klass( self, self.editor )
@@ -231,6 +230,7 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
 
   def get_liste_param_possible(self):
       liste_param=[]
+      print self.object.jdc.params
       for param in self.object.jdc.params:
           encorevalide=self.valide_item(param.valeur)
           if encorevalide:

diff --git a/InterfaceQT4/monListeParamPanel.py b/InterfaceQT4/monListeParamPanel.py
index 0a6728818e70040989e9cc282a655b2a0d6be2ee..3b9d5812e9f3858d334d83ab9ddd648be8b3314c 100644 (file)
--- a/InterfaceQT4/monListeParamPanel.py
+++ b/InterfaceQT4/monListeParamPanel.py
@@ -56,5 +56,10 @@ class MonListeParamPanel(DLisParam):
             self.dictListe[QString(repr(param))] = param
 
   def LBParamItemPressed(self):
+        print self.LBParam.selectedItems()
         i=self.LBParam.selectedItems()[0].text()
         self.panel.Ajout1Valeur(self.dictListe[i])
+
+  def on_BOk_clicked(self):
+        self.LBParamItemPressed()
+        self.close()

diff --git a/InterfaceQT4/monParamPanel.py b/InterfaceQT4/monParamPanel.py
index bbc27622d98d8ee72a347757804ca54d43846e9a..2ffc49a3a8ee0b0a2789e389229c2f77972e73ec 100644 (file)
--- a/InterfaceQT4/monParamPanel.py
+++ b/InterfaceQT4/monParamPanel.py
@@ -104,14 +104,21 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         self.Commentaire.setText(QString(""))
         commentaire="Valeur incorrecte"
         qtVal=self.lineEditVal.text()
+        valString=str(self.lineEditVal.text())
+        if (valString.find(' ') > -1) or (valString.find(',') > -1) :
+           commentaire="Valeur incorrecte"
+           self.Commentaire.setText(QString(commentaire))
+           return None
         boul=2
         try :
             val,boul=QString.toInt(qtVal)
+            if boul : valString=val
         except :
             pass
         if boul == 0 :
             try :
                 val,boul=QString.toDouble(qtVal)
+                if boul : valString=val
             except :
                 pass
         if boul == 0 :
@@ -121,12 +128,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
             except :
                 pass
         if boul: commentaire="Valeur correcte"
-        valString=str(self.lineEditVal.text())
         self.Commentaire.setText(QString(commentaire))
-        if (valString.find(' ') > -1) or (valString.find(',') > -1) :
-           commentaire="Valeur incorrecte"
-           self.Commentaire.setText(QString(commentaire))
-           return None
         self.Commentaire.setText(QString(commentaire))
         return valString
 

diff --git a/InterfaceQT4/monUniqueBasePanel.py b/InterfaceQT4/monUniqueBasePanel.py
index 0bbab299e4e6fc5317598a62f16ace576267c213..bfbf2550f787b927d1a9b59835147fe98539db0b 100644 (file)
--- a/InterfaceQT4/monUniqueBasePanel.py
+++ b/InterfaceQT4/monUniqueBasePanel.py
@@ -82,7 +82,7 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
         icon = QIcon(self.RepIcon+"/image240.png")
         self.BSalome.setIcon(icon)
         mc = self.node.item.get_definition()
-        if self.node.item.get_nom() != "FileName" :
+        if ( (self.node.item.get_nom() != "FileName" ) and ( mc.type[0]!="Fichier")) :
            self.BFichier.close()
         else :
           self.bParametres.close()

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index b76c1e4f6117e8978e1020ca7cfb6a2eea678434..b93c55159cbdccedc68cab9d0eb45ecc76d914a1 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -77,7 +77,8 @@ class READERCATA:
       if len(liste_cata_possibles)==0:          
           QMessageBox.critical( self.QWParent, "Import du catalogue","Pas de catalogue defini pour le code %s" % self.code)
           self.appliEficas.close()
-          sys.exit(1)
+          if self.appliEficas.salome == 0 :
+             sys.exit(1)
 
 
       if self.version_code is not None:
@@ -108,7 +109,8 @@ class READERCATA:
 
       if self.fic_cata == None :
           print "Pas de catalogue pour code %s, version %s" %(self.code,self.version_code)
-          sys.exit(0)
+          if self.appliEficas.salome == 0 :
+             sys.exit(1)
 
       self.determineMater()
 
@@ -122,7 +124,8 @@ class READERCATA:
       if not self.cata :          
           QMessageBox.critical( self.QWParent, "Import du catalogue","Impossible d'importer le catalogue %s" %self.fic_cata)
          self.appliEficas.close()
-          sys.exit(1)
+          if self.appliEficas.salome == 0 :
+             sys.exit(1)
       #
       # analyse du catalogue (ordre des mots-clés)
       #
@@ -223,7 +226,8 @@ class READERCATA:
       if len(liste_choix) == 0:          
           QMessageBox.critical( self.QWParent, "", "Aucun catalogue déclaré pour %s" %self.code)
          self.appliEficas.close()
-          sys.exit(1)
+          if self.appliEficas.salome == 0 :
+             sys.exit(1)
           
       # création d'une boite de dialogue modale
       widgetChoix=MonChoixCata(liste_choix,self, self.appliEficas, "", True )
@@ -242,8 +246,9 @@ class READERCATA:
           self.appliEficas.setWindowTitle(lab)
           #qApp.mainWidget().setCaption(lab)
       else :
-          sys.exit(0)
-
+         self.appliEficas.close()
+          if self.appliEficas.salome == 0 :
+             sys.exit(0)
 
 
    def traite_clefs_documentaires(self):

diff --git a/UiQT4/desListeParam.ui b/UiQT4/desListeParam.ui
index 0e3a9fe3c65fe243ca7e754270316f184061fd10..f7eb24830e09a2b8297e80c7a5e7dced186be4d2 100644 (file)
--- a/UiQT4/desListeParam.ui
+++ b/UiQT4/desListeParam.ui
@@ -1,26 +1,63 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DLisParam</class>
-  <widget class="QWidget" name="DLisParam" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>413</width>
-        <height>394</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>Sélection de paramétres</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item row="0" column="0" >
-        <widget class="QListWidget" name="LBParam" />
-      </item>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DLisParam</class>
+ <widget class="QWidget" name="DLisParam">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>420</width>
+    <height>425</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Sélection de paramétres</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QListWidget" name="LBParam"/>
+   </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>128</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="BOk">
+       <property name="text">
+        <string>Valider</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>168</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
 </ui>