Options pour MAP

diff --git a/MAP/configuration_MAP.py b/MAP/configuration_MAP.py
index 7277809fce4b37652e451bce5842ef5f8d4daec1..2401224ef7ca639322efc789d2d2dee8b1648189 100644 (file)
--- a/MAP/configuration_MAP.py
+++ b/MAP/configuration_MAP.py
@@ -67,8 +67,8 @@ class CONFIG:
       self.savedir      = self.rep_user\r
       self.exec_acrobat = self.rep_user\r
  \r
-      self.labels_user=('exec_acrobat', 'catalogues','savedir','path_doc','map_path','PATH_PYGMEE','PATH_BENHUR','PATH_ASTER','PATH_MODULE','PATH_STUDY','NAME_SCHEME','PATH_FDVGRID')\r
-      self.labels_eficas=("map_path","rep_user","INSTALLDIR","path_doc","exec_acrobat","rep_cata","initialdir","savedir","catalogues",'PATH_PYGMEE','PATH_BENHUR','PATH_ASTER','PATH_MODULE','PATH_STUDY','NAME_SCHEME','PATH_FDVGRID')\r
+      self.labels_user=('exec_acrobat', 'catalogues','savedir','path_doc','map_path','PATH_PYGMEE','PATH_BENHUR','PATH_ASTER','PATH_MODULE','PATH_STUDY','NAME_SCHEME','PATH_FDVGRID','PATH_MAP','OpenTURNS_path')\r
+      self.labels_eficas=("map_path","rep_user","INSTALLDIR","path_doc","exec_acrobat","rep_cata","initialdir","savedir","catalogues",'PATH_PYGMEE','PATH_BENHUR','PATH_ASTER','PATH_MODULE','PATH_STUDY','NAME_SCHEME','PATH_FDVGRID','PATH_MAP','OpenTURNS_path')\r
 \r
       #Lecture des fichiers utilisateurs\r
       self.lecture_fichier_ini_standard()\r

diff --git a/MAP/prefs_MAP.py b/MAP/prefs_MAP.py
index e4dec3917205541c04d786e0aedf61a67d2d9010..871526870702f39b3d9ea84610c85714d156701b 100644 (file)
--- a/MAP/prefs_MAP.py
+++ b/MAP/prefs_MAP.py
@@ -31,12 +31,13 @@ initialdir=REPINI
 \r
 # INSTALLDIR sert à localiser l'installation d'Eficas\r
 INSTALLDIR=os.path.join(REPINI,'..')\r
-PATH_PYGMEE="/local/noyret/MAP/components/pygmee_v1"\r
-PATH_BENHUR="/local/noyret/MAP/components/benhur"\r
-PATH_FDVGRID="/local/noyret/MAP/components/fdvgrid/ther2d/bin"\r
+PATH_MAP="/local/noyret/MAP/"\r
+PATH_PYGMEE=PATH_MAP+"/components/pygmee_v1"\r
+PATH_BENHUR=PATH_MAP+"/components/benhur"\r
+PATH_FDVGRID=PATH_MAP+"components/fdvgrid/ther2d/bin"\r
+PATH_MODULE=PATH_MAP+"/modules/polymers"\r
+PATH_STUDY=PATH_MAP+"/studies/demonstrateur_poly_st1"\r
 PATH_ASTER="/local/noyret/bin/Aster10/bin"\r
-PATH_MODULE="/local/noyret/MAP/modules/polymers"\r
-PATH_STUDY="/local/noyret/MAP/studies/demonstrateur_poly_st1"\r
 \r
 \r
 # Codage des strings qui accepte les accents (en remplacement de 'ascii')\r
@@ -50,5 +51,6 @@ path_doc        = os.path.join(REPINI,'Doc')
 exec_acrobat    = "/usr/bin/xpdf"\r
 savedir         = os.environ['HOME']\r
 \r
+OpenTURNS_path='/opt/Openturns/Install_0_13_2/lib/python2.5/site-packages'\r
+sys.path[:0]=[INSTALLDIR, OpenTURNS_path]\r
 \r
-sys.path[:0]=[INSTALLDIR]\r

diff --git a/UiQT4/OptionsMAP.ui b/UiQT4/OptionsMAP.ui
new file mode 100644 (file)
index 0000000..bbff570
--- /dev/null
+++ b/UiQT4/OptionsMAP.ui
@@ -0,0 +1,545 @@
+<ui version="4.0" >
+ <class>desOptions</class>
+ <widget class="QDialog" name="desOptions" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>662</width>
+    <height>768</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Option TURNS</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="1" column="0" >
+    <spacer name="verticalSpacer_2" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>18</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox2" >
+     <property name="minimumSize" >
+      <size>
+       <width>641</width>
+       <height>320</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Configurer les répertoires</string>
+     </property>
+     <widget class="QLabel" name="textLabel1_2" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>155</y>
+        <width>617</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text" >
+       <string>Répertoire d'installation d'Open TURNS :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepOT" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>180</y>
+        <width>617</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepDoc" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>263</y>
+        <width>617</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1_5" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>31</y>
+        <width>617</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text" >
+       <string>Répertoire d'installation des codes MAP :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepMAP" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>56</y>
+        <width>617</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepAster" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>118</y>
+        <width>617</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1_6" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>93</y>
+        <width>617</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text" >
+       <string>Répertoire d'installation de  code_Aster :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1" >
+      <property name="geometry" >
+       <rect>
+        <x>11</x>
+        <y>217</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>
+   </item>
+   <item row="3" column="0" >
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>18</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox3_2" >
+     <property name="minimumSize" >
+      <size>
+       <width>548</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Espace de travail</string>
+     </property>
+     <widget class="QLineEdit" name="LESaveDir" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>50</y>
+        <width>617</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>520</width>
+        <height>20</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1_4" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>20</y>
+        <width>617</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>613</width>
+        <height>10</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>
+   </item>
+   <item row="5" column="0" >
+    <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>
+   </item>
+   <item row="5" column="1" >
+    <widget class="QPushButton" name="PBQuit" >
+     <property name="minimumSize" >
+      <size>
+       <width>151</width>
+       <height>40</height>
+      </size>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>151</width>
+       <height>40</height>
+      </size>
+     </property>
+     <property name="text" >
+      <string>Quitter</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox1" >
+     <property name="minimumSize" >
+      <size>
+       <width>635</width>
+       <height>195</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>20</y>
+        <width>180</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>0</width>
+        <height>40</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>180</width>
+        <height>40</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="Bok" >
+      <property name="geometry" >
+       <rect>
+        <x>500</x>
+        <y>20</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>140</y>
+        <width>111</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>40</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Ajouter
+Version :</string>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LEVersionAjout" >
+      <property name="geometry" >
+       <rect>
+        <x>130</x>
+        <y>140</y>
+        <width>171</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>30</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="PBSup" >
+      <property name="geometry" >
+       <rect>
+        <x>210</x>
+        <y>20</y>
+        <width>111</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>40</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Supprimer
+Version :</string>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LEVersionSup" >
+      <property name="geometry" >
+       <rect>
+        <x>330</x>
+        <y>20</y>
+        <width>163</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>0</width>
+        <height>41</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1_3" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>70</y>
+        <width>617</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text" >
+       <string>Fichier catalogue (chemin complet) :</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LERepCata" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>90</y>
+        <width>617</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>501</width>
+        <height>20</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
+     <widget class="QLineEdit" name="LEFormatOUT" >
+      <property name="enabled" >
+       <bool>false</bool>
+      </property>
+      <property name="geometry" >
+       <rect>
+        <x>450</x>
+        <y>140</y>
+        <width>171</width>
+        <height>40</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>101</width>
+        <height>30</height>
+       </size>
+      </property>
+     </widget>
+     <widget class="QLabel" name="textLabel1_7" >
+      <property name="geometry" >
+       <rect>
+        <x>390</x>
+        <y>140</y>
+        <width>51</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>50</width>
+        <height>10</height>
+       </size>
+      </property>
+      <property name="maximumSize" >
+       <size>
+        <width>16777215</width>
+        <height>41</height>
+       </size>
+      </property>
+      <property name="text" >
+       <string>Schema</string>
+      </property>
+      <property name="wordWrap" >
+       <bool>false</bool>
+      </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 9dc8a8c45ac7a40238c47d2838f5681e2b40b8dd..241af709b18ab9bc220c1c85eaec3e2c24af0d3d 100644 (file)
--- a/UiQT4/makefile
+++ b/UiQT4/makefile
@@ -8,7 +8,8 @@ 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 OptionsCuve.py desChoixMap.py
+       desViewTexte.py desPixmap.py desMatrice.py OptionsOT.py OptionsCuve.py desChoixMap.py \
+        OptionsMAP.py
 
 %.py:%.ui
        ${PYUIC} -x -o $@ $<