*** empty log message ***

diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py
index 02d4203a0ff9545c9c413ec976bc9c0d0fb0941f..a6794ed8d426b359ffa36a09f7acac6f54aefe48 100644 (file)
--- a/Ihm/I_MCSIMP.py
+++ b/Ihm/I_MCSIMP.py
@@ -581,14 +581,15 @@ class MCSIMP(I_OBJECT.OBJECT):
       return valid,comment
 
   def valideMatrice(self,cr):
+       #Attention, la matrice contient comme dernier tuple l ordre des variables
        if self.monType.methodeCalculTaille != None :
            apply (MCSIMP.__dict__[self.monType.methodeCalculTaille],(self,))
        try :
        #if 1 :
            ok=0
-           if len(self.valeur) == self.monType.nbLigs:
+           if len(self.valeur) == self.monType.nbLigs +1:
               ok=1
-              for i in range(len(self.valeur)):
+              for i in range(len(self.valeur) -1):
                   if len(self.valeur[i])!= self.monType.nbCols:
                      ok=0
            if ok: 

diff --git a/InterfaceQT4/monMatricePanel.py b/InterfaceQT4/monMatricePanel.py
index accb097c7a990e6cb2fb2cfb4e2bdcf010172ff4..eb42674b6ad3e7808b71987c95bf7ccb0a369315 100644 (file)
--- a/InterfaceQT4/monMatricePanel.py
+++ b/InterfaceQT4/monMatricePanel.py
@@ -120,13 +120,8 @@ class MonMatricePanel(Ui_desMatrice,QDialog):
        if self.listeVariables == [] :
            QMessageBox.critical( self, "Mauvaise Commande ", "Aucune variable connue")
            return
-       header=QStringList()
-       for var in self.listeVariables :
-          header << var
        self.TBMatrice.setColumnCount(len(self.listeVariables))
        self.TBMatrice.setRowCount(len(self.listeVariables))
-       self.TBMatrice.setVerticalHeaderLabels(header)
-       self.TBMatrice.setHorizontalHeaderLabels(header)
        self.nbLigs=len(self.listeVariables)
        self.nbCols=len(self.listeVariables)
 
@@ -134,24 +129,35 @@ class MonMatricePanel(Ui_desMatrice,QDialog):
        for row in range(self.nbLigs):
           for column in range(self.nbCols):
               if row == column :
-                 initialFloat=0
-               else :
                  initialFloat=1
+               else :
+                 initialFloat=0
                self.TBMatrice.setItem(row,column,QTableWidgetItem(str(initialFloat)))
+       header=QStringList()
+       for var in self.listeVariables :
+          header << var
+       self.TBMatrice.setVerticalHeaderLabels(header)
+       self.TBMatrice.setHorizontalHeaderLabels(header)
 
   def  initialValeur(self):
       liste=self.node.item.get_valeur()
-      if (len(liste)) != self.nbLigs  :
+      if (len(liste)) != self.nbLigs +1  :
          QMessageBox.critical( self, "Mauvaise dimension de matrice", "le nombre de ligne n est pas egal a " + str(self.nbLigs))
       for i in range(self.nbLigs):
-          inter=liste[i]
+          inter=liste[i+1]
           if (len(inter)) != self.nbCols :
              QMessageBox.critical( self, "Mauvaise dimension de matrice", "le nombre de colonne n est pas egal a " + str(self.nbCols))
           for j in range(self.nbCols):
-              self.TBMatrice.setItem(i,j,QTableWidgetItem(str(liste[i][j])))
+              self.TBMatrice.setItem(i,j,QTableWidgetItem(str(liste[i+1][j])))
+      header=QStringList()
+      for var in liste[0]:
+          header << var
+      self.TBMatrice.setVerticalHeaderLabels(header)
+      self.TBMatrice.setHorizontalHeaderLabels(header)
               
   def acceptVal(self):
       liste=[]
+      liste.append(self.listeVariables)
       if self.TBMatrice.rowCount() != self.nbLigs :
          QMessageBox.critical( self, "Mauvaise dimension de matrice", "le nombre de ligne n est pas egal a " + str(self.nbLigs))
       if self.TBMatrice.columnCount() != self.nbCols :
@@ -166,4 +172,5 @@ class MonMatricePanel(Ui_desMatrice,QDialog):
                  QMessageBox.critical( self, "Mauvaise Valeur", "l element " + str(i) + "," +str(j) +"n est pas correct")
               listeCol.append(val)
           liste.append(listeCol)
+      # on ajoute l ordre des variables aux valeurs
       self.node.item.set_valeur(liste)

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 92aea0ea46bf19c8d5c476e8df30fc0d38020e03..79941b2bc0d24f76bd61fd7a3ff0096e74927c71 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -52,6 +52,7 @@ class Appli(Ui_Eficas,QMainWindow):
         Ui_Eficas.__init__(self)
         self.setupUi(self)
         self.ajoutIcones()
+        if code=='ASTER' : self.ASTER()
         self.viewmanager = MyTabview(self) 
         self.recentMenu=self.menuFichier.addMenu(self.trUtf8('&Recents'))
         self.connecterSignaux() 
@@ -70,10 +71,21 @@ class Appli(Ui_Eficas,QMainWindow):
         self.ouvreFichiers()
         self.setWindowTitle(self.VERSION_EFICAS)
         
-    def OPENTURNS(self) :
-        self.MenuBar.removeItem(5)
-        self.MenuBar.removeItem(6)
-        self.MenuBar.removeItem(7)
+    def ASTER(self) :
+        self.menuTraduction = self.menubar.addMenu("menuTraduction")
+        self.actionTraduitV7V8 = QAction(self)
+        self.actionTraduitV7V8.setObjectName("actionTraduitV7V8")
+        self.actionTraduitV8V9 = QAction(self)
+        self.actionTraduitV8V9.setObjectName("actionTraduitV8V9")
+        self.menuTraduction.addAction(self.actionTraduitV7V8)
+        self.menuTraduction.addAction(self.actionTraduitV8V9)
+        self.menuTraduction.setTitle(QApplication.translate("Eficas", "Traduction", None, QApplication.UnicodeUTF8))
+        self.actionTraduitV7V8.setText(QApplication.translate("Eficas","TraduitV7V8", None, QApplication.UnicodeUTF8))
+        self.actionTraduitV8V9.setText(QApplication.translate("Eficas","TraduitV8V9", None, QApplication.UnicodeUTF8))
+        self.connect(self.actionTraduitV7V8,SIGNAL("activated()"),self.traductionV7V8)
+        self.connect(self.actionTraduitV8V9,SIGNAL("activated()"),self.traductionV8V9)
+
+
 
     def ajoutIcones(self) :
         # Pour pallier les soucis de repertoire d icone
@@ -118,9 +130,6 @@ class Appli(Ui_Eficas,QMainWindow):
         self.connect(self.actionParametres_Eficas,SIGNAL("activated()"),self.optionEditeur)
         self.connect(self.actionLecteur_Pdf,SIGNAL("activated()"),self.optionPdf)
 
-        self.connect(self.actionTraduitV7V8,SIGNAL("activated()"),self.traductionV7V8)
-        self.connect(self.actionTraduitV8V9,SIGNAL("activated()"),self.traductionV8V9)
-
         #self.connect(self.helpIndexAction,SIGNAL("activated()"),self.helpIndex)
         #self.connect(self.helpContentsAction,SIGNAL("activated()"),self.helpContents)
                              
@@ -275,6 +284,7 @@ class Appli(Ui_Eficas,QMainWindow):
         
     def handleClearRecent(self):
         self.recent = QStringList()
+        self.sauveRecents()
         
     def fileNew(self):        
         self.viewmanager.newEditor()        

diff --git a/InterfaceTK/appli.py b/InterfaceTK/appli.py
index d4714b232b131d09ca9c5aef2c97e05fabd4c820..b4c6945e41211531c71eb2f1bc4d198afa0d1eeb 100644 (file)
--- a/InterfaceTK/appli.py
+++ b/InterfaceTK/appli.py
@@ -140,9 +140,9 @@ class APPLI:
       """
       if (self.test == 0):
          splash._splash.configure(text = "Chargement des paramètres utilisateur")
-      import configuration
-      self.CONFIGURATION = configuration.make_config(self,prefsCode.REPINI)
-      self.CONFIGStyle = configuration.make_config_style(self,prefsCode.REPINI)
+      import configuration_ASTER
+      self.CONFIGURATION = configuration_ASTER.make_config(self,prefsCode.REPINI)
+      self.CONFIGStyle = configuration_ASTER.make_config_style(self,prefsCode.REPINI)
 
   def cree_composants_graphiques(self):
       """

diff --git a/InterfaceTK/change_comm.py b/InterfaceTK/change_comm.py
index d44f006b4785d98563c88b4016ac631ca3be1f4f..de2a6511ae19be272d1f8040214d5f85065104c3 100755 (executable)
--- a/InterfaceTK/change_comm.py
+++ b/InterfaceTK/change_comm.py
@@ -48,8 +48,9 @@ class DUP :
 
        self.top=None
        self.test=2
-       import configuration
-       self.CONFIGURATION=configuration.make_config(self,prefsCode.REPINI)
+       import configuration_ASTER
+
+       self.CONFIGURATION=configuration_ASTER.make_config(self,prefsCode.REPINI)
 
        self.load_readercata()
        self.cata=self.readercata.cata

diff --git a/UiQT4/OptionsCuve.ui b/UiQT4/OptionsCuve.ui
new file mode 100644 (file)
index 0000000..cac61d7
--- /dev/null
+++ b/UiQT4/OptionsCuve.ui
@@ -0,0 +1,358 @@
+<ui version="4.0" >
+ <class>desOptions</class>
+ <widget class="QDialog" name="desOptions" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>657</width>
+    <height>645</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Option TURNS</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="groupBox1" >
+     <property name="minimumSize" >
+      <size>
+       <width>635</width>
+       <height>252</height>
+      </size>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>252</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Configurer une Version</string>
+     </property>
+     <widget class="QComboBox" name="CBVersions" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>30</y>
+        <width>121</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>0</width>
+        <height>40</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>121</width>
+        <height>40</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="Bok" >
+      <property name="geometry" >
+       <rect>
+        <x>500</x>
+        <y>30</y>
+        <width>121</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>90</width>
+        <height>40</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>121</width>
+        <height>40</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Valider</string>
+      </property>
+      <property name="autoDefault" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="PBajout" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>200</y>
+        <width>106</width>
+        <height>43</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Ajouter
+Version :</string>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LEVersionAjout" >
+      <property name="geometry" >
+       <rect>
+        <x>122</x>
+        <y>200</y>
+        <width>154</width>
+        <height>43</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>41</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="PBSup" >
+      <property name="geometry" >
+       <rect>
+        <x>360</x>
+        <y>200</y>
+        <width>106</width>
+        <height>43</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Supprimer
+Version :</string>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LEVersionSup" >
+      <property name="geometry" >
+       <rect>
+        <x>470</x>
+        <y>200</y>
+        <width>155</width>
+        <height>43</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>0</width>
+        <height>41</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QWidget" name="layoutWidget" >
+      <property name="geometry" >
+       <rect>
+        <x>7</x>
+        <y>100</y>
+        <width>621</width>
+        <height>65</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout" >
+       <item>
+        <widget class="QLabel" name="textLabel1_3" >
+         <property name="text" >
+          <string>Fichier catalogue (chemin complet) :</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="LERepCata" >
+         <property name="minimumSize" >
+          <size>
+           <width>501</width>
+           <height>41</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QGroupBox" name="groupBox3" >
+     <property name="minimumSize" >
+      <size>
+       <width>548</width>
+       <height>90</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Doc</string>
+     </property>
+     <widget class="QLabel" name="textLabel1" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>28</y>
+        <width>617</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>613</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>16777215</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Répertoire d'accès à la documentation :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepDoc" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>74</y>
+        <width>617</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QGroupBox" name="groupBox3_2" >
+     <property name="minimumSize" >
+      <size>
+       <width>548</width>
+       <height>90</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Espace de travail</string>
+     </property>
+     <widget class="QLabel" name="textLabel1_4" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>28</y>
+        <width>617</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>613</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>16777215</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Répertoire de sauvegarde par défaut :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LESaveDir" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>74</y>
+        <width>617</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QSplitter" name="splitter_3" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QCheckBox" name="Bdefaut" >
+      <property name="minimumSize" >
+       <size>
+        <width>340</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>16777215</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="font" >
+       <font>
+        <pointsize>12</pointsize>
+       </font>
+      </property>
+      <property name="text" >
+       <string>Réinitialiser avec les valeurs par defaut</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="PBQuit" >
+      <property name="minimumSize" >
+       <size>
+        <width>151</width>
+        <height>31</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Quitter</string>
+      </property>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/UiQT4/makefile b/UiQT4/makefile
index 4426d9b9eb7b8a65c1c3d3a8949b2e1f74a79e28..2005d5fbbd7a65842454826bace4aba8b98b3fe8 100644 (file)
--- a/UiQT4/makefile
+++ b/UiQT4/makefile
@@ -8,7 +8,7 @@ PY_FILES = desChoixCata.py desCommande.py desCommentaire.py desError.py desFormu
        desPlusieursBase.py desPlusieursInto.py desPoursuite.py desRacine.py desSelectVal.py \
        desUniqueASSD.py desUniqueBase.py desUniqueComp.py desUniqueInto.py desUniqueSDCOInto.py \
        desUniqueSDCO.py desVisu.py  aideQT.py OptionsEditeur.py OptionsPdf.py myMain.py \
-       desViewTexte.py desPixmap.py desMatrice.py OptionsOT.py
+       desViewTexte.py desPixmap.py desMatrice.py OptionsOT.py OptionsCuve.py
 
 %.py:%.ui
        ${PYUIC} -x -o $@ $<

diff --git a/UiQT4/myMain.ui b/UiQT4/myMain.ui
index 6cbe1a6e8fcc6bc298fca2ad288595470e24c6d4..4a1e785c90d7eb5471c39c58af9bd97e1db70319 100644 (file)
--- a/UiQT4/myMain.ui
+++ b/UiQT4/myMain.ui
@@ -68,13 +68,6 @@
     <addaction name="actionParametres_Eficas" />
     <addaction name="actionLecteur_Pdf" />
    </widget>
-   <widget class="QMenu" name="menuTraduction" >
-    <property name="title" >
-     <string>Traduction</string>
-    </property>
-    <addaction name="actionTraduitV7V8" />
-    <addaction name="actionTraduitV8V9" />
-   </widget>
    <widget class="QMenu" name="menuPatrons" >
     <property name="title" >
      <string>Patrons</string>
@@ -85,7 +78,6 @@
    <addaction name="menuJdC" />
    <addaction name="menu_Aide" />
    <addaction name="menuOptions" />
-   <addaction name="menuTraduction" />
    <addaction name="menuPatrons" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
@@ -238,16 +230,6 @@
     <string>Lecteur Pdf</string>
    </property>
   </action>
-  <action name="actionTraduitV7V8" >
-   <property name="text" >
-    <string>TraduitV7V8</string>
-   </property>
-  </action>
-  <action name="actionTraduitV8V9" >
-   <property name="text" >
-    <string>TraduitV8V9</string>
-   </property>
-  </action>
   <action name="actionEficas" >
    <property name="text" >
     <string>Eficas</string>