il : ajout Carmel3D

diff --git a/InterfaceQT4/monChoixCode.py b/InterfaceQT4/monChoixCode.py
index a5323a62a2a4677d26c4f95a9eaf279762d493a1..3e876dd144f6f9869cbd89ae38f57194ef0da597 100644 (file)
--- a/InterfaceQT4/monChoixCode.py
+++ b/InterfaceQT4/monChoixCode.py
@@ -47,7 +47,7 @@ class MonChoixCode(Ui_ChoixCode,QDialog):
 
   def verifieInstall(self):
       self.groupCodes=QButtonGroup(self)
-      for code in ('Aster','Cuve2dg','MAP','Openturns_Study','Openturns_Wrapper'):
+      for code in ('Aster','Cuve2dg','MAP','Openturns_Study','Openturns_Wrapper','Carmel3D'):
           nom='rB_'+code
           bouton=getattr(self,nom)
           dirCode=os.path.abspath(os.path.join(os.getcwd(),'..',code))

diff --git a/UiQT4/desChoixCode.ui b/UiQT4/desChoixCode.ui
index 455257be9b045f72a5678119d62014e2cd5b32a5..607b09a52453594841f537cff37d9bf883456e74 100644 (file)
--- a/UiQT4/desChoixCode.ui
+++ b/UiQT4/desChoixCode.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ChoixCode</class>
- <widget class="QWidget" name="ChoixCode" >
-  <property name="geometry" >
+ <widget class="QWidget" name="ChoixCode">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,31 +10,31 @@
     <height>442</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Choix du code</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" colspan="2" >
-    <layout class="QHBoxLayout" name="horizontalLayout" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="label_choix" >
-       <property name="minimumSize" >
+      <widget class="QLabel" name="label_choix">
+       <property name="minimumSize">
         <size>
          <width>0</width>
          <height>30</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Veuillez choisir un code :</string>
        </property>
       </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -43,15 +44,15 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="1" >
-    <spacer name="verticalSpacer_2" >
-     <property name="orientation" >
+   <item row="1" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Preferred</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>70</height>
@@ -59,17 +60,17 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <layout class="QHBoxLayout" name="horizontalLayout_3" >
-     <item>
-      <spacer name="horizontalSpacer_3" >
-       <property name="orientation" >
+   <item row="2" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Preferred</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -77,73 +78,86 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QWidget" native="1" name="widget" >
-       <layout class="QVBoxLayout" name="verticalLayout" >
+     <item row="0" column="1">
+      <widget class="QWidget" name="widget" native="true">
+       <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <widget class="QRadioButton" name="rB_Aster" >
-          <property name="minimumSize" >
+         <widget class="QRadioButton" name="rB_Aster">
+          <property name="minimumSize">
            <size>
             <width>0</width>
             <height>30</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Aster</string>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="rB_Cuve2dg" >
-          <property name="minimumSize" >
+         <widget class="QRadioButton" name="rB_Carmel3D">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Carmel3D</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="rB_Cuve2dg">
+          <property name="minimumSize">
            <size>
             <width>0</width>
             <height>30</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Cuve2dg</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="rB_MAP" >
-          <property name="minimumSize" >
+         <widget class="QRadioButton" name="rB_MAP">
+          <property name="minimumSize">
            <size>
             <width>0</width>
             <height>30</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>MAP</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="rB_Openturns_Study" >
-          <property name="minimumSize" >
+         <widget class="QRadioButton" name="rB_Openturns_Study">
+          <property name="minimumSize">
            <size>
             <width>0</width>
             <height>30</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Openturns_Study</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="rB_Openturns_Wrapper" >
-          <property name="minimumSize" >
+         <widget class="QRadioButton" name="rB_Openturns_Wrapper">
+          <property name="minimumSize">
            <size>
             <width>0</width>
             <height>30</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Openturns_Wrapper</string>
           </property>
          </widget>
@@ -151,12 +165,12 @@
        </layout>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_4" >
-       <property name="orientation" >
+     <item row="0" column="2">
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -166,40 +180,43 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" >
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
+   <item row="3" column="1">
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeType">
+      <enum>QSizePolicy::Preferred</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>86</height>
+       <height>58</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="2" >
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
+   <item row="4" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QPushButton" name="pB_OK" >
-       <property name="minimumSize" >
+      <widget class="QPushButton" name="pB_OK">
+       <property name="minimumSize">
         <size>
          <width>80</width>
          <height>30</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>OK</string>
        </property>
       </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer_2" >
-       <property name="orientation" >
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -208,14 +225,14 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="pB_cancel" >
-       <property name="minimumSize" >
+      <widget class="QPushButton" name="pB_cancel">
+       <property name="minimumSize">
         <size>
          <width>80</width>
          <height>30</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Cancel</string>
        </property>
       </widget>