Saisie GUI des choix de conformité

diff --git a/src/HOMARDGUI/CreateCase.h b/src/HOMARDGUI/CreateCase.h
index 73adbb0c2e5388660fa408af7d9f8e0aec4ebccc..dc57501a677d6718601f96a58fed3f541c69fa16 100644 (file)
--- a/src/HOMARDGUI/CreateCase.h
+++ b/src/HOMARDGUI/CreateCase.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CreateCase.ui'
 **
-** Created: Wed Jan 15 08:42:35 2014
+** Created: Tue Nov 24 11:06:19 2015
 **      by: Qt User Interface Compiler version 4.6.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -55,23 +55,17 @@ public:
     QHBoxLayout *hboxLayout2;
     QRadioButton *RBConforme;
     QRadioButton *RBNonConforme;
-    QSpacerItem *spacerItem2;
-    QGroupBox *GBTypeNoConf;
     QHBoxLayout *hboxLayout3;
-    QRadioButton *RB1NpM;
-    QRadioButton *RB1NpA;
-    QRadioButton *RBQuelconque;
-    QSpacerItem *spacerItem3;
-    QHBoxLayout *hboxLayout4;
     QCheckBox *CBBoundaryD;
     QCheckBox *CBBoundaryA;
-    QSpacerItem *spacerItem4;
+    QSpacerItem *spacerItem2;
+    QSpacerItem *spacerItem3;
     QGroupBox *GBBoundaryD;
     QGridLayout *gridLayout;
     QPushButton *PBBoundaryDiEdit;
     QPushButton *PBBoundaryDiNew;
     QComboBox *CBBoundaryDi;
-    QSpacerItem *spacerItem5;
+    QSpacerItem *spacerItem4;
     QPushButton *PBBoundaryDiHelp;
     QGroupBox *GBBoundaryA;
     QFormLayout *formLayout;
@@ -85,6 +79,10 @@ public:
     QGroupBox *GBAdvancedOptions;
     QGridLayout *gridLayout2;
     QCheckBox *CBPyramid;
+    QRadioButton *RBStandard;
+    QRadioButton *RBBox;
+    QRadioButton *RBNC1NpA;
+    QRadioButton *RBNCQuelconque;
     QSpacerItem *spacer_3;
     QSpacerItem *spacer_4;
     QLabel *Comment;
@@ -101,7 +99,7 @@ public:
     {
         if (CreateCase->objectName().isEmpty())
             CreateCase->setObjectName(QString::fromUtf8("CreateCase"));
-        CreateCase->resize(601, 1100);
+        CreateCase->resize(600, 1026);
         QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -128,11 +126,11 @@ public:
         gridLayout_2->addWidget(LEName, 0, 1, 1, 1);
 
 
-        gridLayout_3->addWidget(WName, 0, 0, 1, 1);
+        gridLayout_3->addWidget(WName, 0, 0, 1, 2);
 
         horizontalSpacer = new QSpacerItem(199, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        gridLayout_3->addItem(horizontalSpacer, 0, 1, 1, 1);
+        gridLayout_3->addItem(horizontalSpacer, 0, 2, 1, 3);
 
         hboxLayout = new QHBoxLayout();
 #ifndef Q_OS_MAC
@@ -162,7 +160,7 @@ public:
 
         spacerItem = new QSpacerItem(20, 18, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_3->addItem(spacerItem, 2, 2, 1, 2);
+        gridLayout_3->addItem(spacerItem, 2, 5, 1, 1);
 
         hboxLayout1 = new QHBoxLayout();
 #ifndef Q_OS_MAC
@@ -188,11 +186,11 @@ public:
         hboxLayout1->addWidget(LEFileName);
 
 
-        gridLayout_3->addLayout(hboxLayout1, 3, 0, 2, 6);
+        gridLayout_3->addLayout(hboxLayout1, 3, 0, 1, 6);
 
         spacerItem1 = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_3->addItem(spacerItem1, 4, 3, 1, 3);
+        gridLayout_3->addItem(spacerItem1, 3, 6, 1, 1);
 
         GBTypeConf = new QGroupBox(CreateCase);
         GBTypeConf->setObjectName(QString::fromUtf8("GBTypeConf"));
@@ -216,66 +214,34 @@ public:
         hboxLayout2->addWidget(RBNonConforme);
 
 
-        gridLayout_3->addWidget(GBTypeConf, 5, 0, 1, 2);
-
-        spacerItem2 = new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        gridLayout_3->addItem(spacerItem2, 6, 3, 1, 1);
+        gridLayout_3->addWidget(GBTypeConf, 4, 0, 1, 3);
 
-        GBTypeNoConf = new QGroupBox(CreateCase);
-        GBTypeNoConf->setObjectName(QString::fromUtf8("GBTypeNoConf"));
-        hboxLayout3 = new QHBoxLayout(GBTypeNoConf);
+        hboxLayout3 = new QHBoxLayout();
 #ifndef Q_OS_MAC
         hboxLayout3->setSpacing(6);
 #endif
-#ifndef Q_OS_MAC
-        hboxLayout3->setContentsMargins(9, 9, 9, 9);
-#endif
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
-        RB1NpM = new QRadioButton(GBTypeNoConf);
-        RB1NpM->setObjectName(QString::fromUtf8("RB1NpM"));
-
-        hboxLayout3->addWidget(RB1NpM);
-
-        RB1NpA = new QRadioButton(GBTypeNoConf);
-        RB1NpA->setObjectName(QString::fromUtf8("RB1NpA"));
-
-        hboxLayout3->addWidget(RB1NpA);
-
-        RBQuelconque = new QRadioButton(GBTypeNoConf);
-        RBQuelconque->setObjectName(QString::fromUtf8("RBQuelconque"));
-
-        hboxLayout3->addWidget(RBQuelconque);
-
-
-        gridLayout_3->addWidget(GBTypeNoConf, 7, 0, 1, 6);
-
-        spacerItem3 = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        gridLayout_3->addItem(spacerItem3, 8, 3, 1, 3);
-
-        hboxLayout4 = new QHBoxLayout();
-#ifndef Q_OS_MAC
-        hboxLayout4->setSpacing(6);
-#endif
-        hboxLayout4->setContentsMargins(0, 0, 0, 0);
-        hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
         CBBoundaryD = new QCheckBox(CreateCase);
         CBBoundaryD->setObjectName(QString::fromUtf8("CBBoundaryD"));
 
-        hboxLayout4->addWidget(CBBoundaryD);
+        hboxLayout3->addWidget(CBBoundaryD);
 
         CBBoundaryA = new QCheckBox(CreateCase);
         CBBoundaryA->setObjectName(QString::fromUtf8("CBBoundaryA"));
 
-        hboxLayout4->addWidget(CBBoundaryA);
+        hboxLayout3->addWidget(CBBoundaryA);
+
 
+        gridLayout_3->addLayout(hboxLayout3, 5, 0, 1, 4);
+
+        spacerItem2 = new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_3->addLayout(hboxLayout4, 9, 0, 1, 4);
+        gridLayout_3->addItem(spacerItem2, 5, 4, 1, 1);
 
-        spacerItem4 = new QSpacerItem(20, 2, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        spacerItem3 = new QSpacerItem(20, 2, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_3->addItem(spacerItem4, 10, 3, 1, 1);
+        gridLayout_3->addItem(spacerItem3, 6, 3, 1, 1);
 
         GBBoundaryD = new QGroupBox(CreateCase);
         GBBoundaryD->setObjectName(QString::fromUtf8("GBBoundaryD"));
@@ -310,9 +276,9 @@ public:
 
         gridLayout->addWidget(CBBoundaryDi, 0, 0, 1, 1);
 
-        spacerItem5 = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum);
+        spacerItem4 = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum);
 
-        gridLayout->addItem(spacerItem5, 0, 1, 1, 1);
+        gridLayout->addItem(spacerItem4, 0, 1, 1, 1);
 
         PBBoundaryDiHelp = new QPushButton(GBBoundaryD);
         PBBoundaryDiHelp->setObjectName(QString::fromUtf8("PBBoundaryDiHelp"));
@@ -321,7 +287,7 @@ public:
         gridLayout->addWidget(PBBoundaryDiHelp, 0, 4, 1, 1);
 
 
-        gridLayout_3->addWidget(GBBoundaryD, 11, 0, 1, 6);
+        gridLayout_3->addWidget(GBBoundaryD, 7, 0, 1, 5);
 
         GBBoundaryA = new QGroupBox(CreateCase);
         GBBoundaryA->setObjectName(QString::fromUtf8("GBBoundaryA"));
@@ -369,16 +335,16 @@ public:
         formLayout->setLayout(0, QFormLayout::FieldRole, gridLayout1);
 
 
-        gridLayout_3->addWidget(GBBoundaryA, 12, 0, 1, 6);
+        gridLayout_3->addWidget(GBBoundaryA, 8, 0, 1, 7);
 
         spacer = new QSpacerItem(239, 41, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_3->addItem(spacer, 13, 0, 1, 2);
+        gridLayout_3->addItem(spacer, 9, 0, 1, 3);
 
         CBAdvanced = new QCheckBox(CreateCase);
         CBAdvanced->setObjectName(QString::fromUtf8("CBAdvanced"));
 
-        gridLayout_3->addWidget(CBAdvanced, 14, 0, 1, 1);
+        gridLayout_3->addWidget(CBAdvanced, 10, 0, 1, 2);
 
         GBAdvancedOptions = new QGroupBox(CreateCase);
         GBAdvancedOptions->setObjectName(QString::fromUtf8("GBAdvancedOptions"));
@@ -387,27 +353,49 @@ public:
         CBPyramid = new QCheckBox(GBAdvancedOptions);
         CBPyramid->setObjectName(QString::fromUtf8("CBPyramid"));
 
-        gridLayout2->addWidget(CBPyramid, 0, 0, 1, 1);
+        gridLayout2->addWidget(CBPyramid, 0, 0, 1, 2);
+
+        RBStandard = new QRadioButton(GBAdvancedOptions);
+        RBStandard->setObjectName(QString::fromUtf8("RBStandard"));
+        RBStandard->setChecked(true);
+
+        gridLayout2->addWidget(RBStandard, 1, 0, 1, 1);
+
+        RBBox = new QRadioButton(GBAdvancedOptions);
+        RBBox->setObjectName(QString::fromUtf8("RBBox"));
+        RBBox->setChecked(false);
+
+        gridLayout2->addWidget(RBBox, 1, 1, 1, 1);
+
+        RBNC1NpA = new QRadioButton(GBAdvancedOptions);
+        RBNC1NpA->setObjectName(QString::fromUtf8("RBNC1NpA"));
+
+        gridLayout2->addWidget(RBNC1NpA, 1, 2, 1, 1);
+
+        RBNCQuelconque = new QRadioButton(GBAdvancedOptions);
+        RBNCQuelconque->setObjectName(QString::fromUtf8("RBNCQuelconque"));
+
+        gridLayout2->addWidget(RBNCQuelconque, 1, 3, 1, 1);
 
 
-        gridLayout_3->addWidget(GBAdvancedOptions, 15, 0, 1, 1);
+        gridLayout_3->addWidget(GBAdvancedOptions, 11, 0, 1, 5);
 
         spacer_3 = new QSpacerItem(128, 13, QSizePolicy::Fixed, QSizePolicy::Minimum);
 
-        gridLayout_3->addItem(spacer_3, 15, 4, 1, 2);
+        gridLayout_3->addItem(spacer_3, 11, 6, 1, 1);
 
         spacer_4 = new QSpacerItem(239, 41, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_3->addItem(spacer_4, 16, 0, 1, 2);
+        gridLayout_3->addItem(spacer_4, 12, 0, 1, 3);
 
         Comment = new QLabel(CreateCase);
         Comment->setObjectName(QString::fromUtf8("Comment"));
 
-        gridLayout_3->addWidget(Comment, 17, 0, 1, 1);
+        gridLayout_3->addWidget(Comment, 13, 0, 1, 1);
 
         verticalSpacer = new QSpacerItem(20, 35, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_3->addItem(verticalSpacer, 18, 0, 1, 1);
+        gridLayout_3->addItem(verticalSpacer, 14, 1, 1, 1);
 
         GroupButtons = new QGroupBox(CreateCase);
         GroupButtons->setObjectName(QString::fromUtf8("GroupButtons"));
@@ -444,11 +432,11 @@ public:
         gridLayout3->addWidget(buttonCancel, 0, 2, 1, 1);
 
 
-        gridLayout_3->addWidget(GroupButtons, 19, 0, 1, 5);
+        gridLayout_3->addWidget(GroupButtons, 15, 0, 1, 5);
 
         spacer_2 = new QSpacerItem(128, 25, QSizePolicy::Fixed, QSizePolicy::Minimum);
 
-        gridLayout_3->addItem(spacer_2, 19, 5, 1, 1);
+        gridLayout_3->addItem(spacer_2, 15, 5, 1, 2);
 
 
         retranslateUi(CreateCase);
@@ -470,10 +458,6 @@ public:
         GBTypeConf->setTitle(QApplication::translate("CreateCase", "Conformity type", 0, QApplication::UnicodeUTF8));
         RBConforme->setText(QApplication::translate("CreateCase", "Conformal", 0, QApplication::UnicodeUTF8));
         RBNonConforme->setText(QApplication::translate("CreateCase", "Non conformal", 0, QApplication::UnicodeUTF8));
-        GBTypeNoConf->setTitle(QApplication::translate("CreateCase", "Non conformal option", 0, QApplication::UnicodeUTF8));
-        RB1NpM->setText(QApplication::translate("CreateCase", "1 hanging node per mesh", 0, QApplication::UnicodeUTF8));
-        RB1NpA->setText(QApplication::translate("CreateCase", "1 node per edge", 0, QApplication::UnicodeUTF8));
-        RBQuelconque->setText(QApplication::translate("CreateCase", "Free", 0, QApplication::UnicodeUTF8));
         CBBoundaryD->setText(QApplication::translate("CreateCase", "Discrete boundary", 0, QApplication::UnicodeUTF8));
         CBBoundaryA->setText(QApplication::translate("CreateCase", "Analytical boundary", 0, QApplication::UnicodeUTF8));
         GBBoundaryD->setTitle(QApplication::translate("CreateCase", "Discrete boundary", 0, QApplication::UnicodeUTF8));
@@ -489,6 +473,10 @@ public:
         CBAdvanced->setText(QApplication::translate("CreateCase", "Advanced options", 0, QApplication::UnicodeUTF8));
         GBAdvancedOptions->setTitle(QApplication::translate("CreateCase", "Advanced options", 0, QApplication::UnicodeUTF8));
         CBPyramid->setText(QApplication::translate("CreateCase", "Authorized pyramids", 0, QApplication::UnicodeUTF8));
+        RBStandard->setText(QApplication::translate("CreateCase", "Standard", 0, QApplication::UnicodeUTF8));
+        RBBox->setText(QApplication::translate("CreateCase", "Box", 0, QApplication::UnicodeUTF8));
+        RBNC1NpA->setText(QApplication::translate("CreateCase", "1 node per edge", 0, QApplication::UnicodeUTF8));
+        RBNCQuelconque->setText(QApplication::translate("CreateCase", "Free", 0, QApplication::UnicodeUTF8));
         Comment->setText(QApplication::translate("CreateCase", " No comment.", 0, QApplication::UnicodeUTF8));
         GroupButtons->setTitle(QString());
         buttonHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8));

diff --git a/src/HOMARDGUI/CreateCase.ui b/src/HOMARDGUI/CreateCase.ui
index d57d1c1de19fddb6dea198226d20031af105860e..a4857b0eb20731d9ebb48c50661e12fddd6d6616 100644 (file)
--- a/src/HOMARDGUI/CreateCase.ui
+++ b/src/HOMARDGUI/CreateCase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>601</width>
-    <height>1100</height>
+    <width>600</width>
+    <height>1026</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -41,7 +41,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0">
+   <item row="0" column="0" colspan="2">
     <widget class="QWidget" name="WName" native="true">
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
@@ -57,7 +57,7 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="0" column="2" colspan="3">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -107,7 +107,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="2" colspan="2">
+   <item row="2" column="5">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -120,7 +120,7 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" rowspan="2" colspan="6">
+   <item row="3" column="0" colspan="6">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
@@ -157,7 +157,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="3" colspan="3">
+   <item row="3" column="6">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -170,7 +170,7 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="4" column="0" colspan="3">
     <widget class="QGroupBox" name="GBTypeConf">
      <property name="title">
       <string>Conformity type</string>
@@ -202,69 +202,7 @@
      </layout>
     </widget>
    </item>
-   <item row="6" column="3">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>1</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="0" colspan="6">
-    <widget class="QGroupBox" name="GBTypeNoConf">
-     <property name="title">
-      <string>Non conformal option</string>
-     </property>
-     <layout class="QHBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <item>
-       <widget class="QRadioButton" name="RB1NpM">
-        <property name="text">
-         <string>1 hanging node per mesh</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="RB1NpA">
-        <property name="text">
-         <string>1 node per edge</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="RBQuelconque">
-        <property name="text">
-         <string>Free</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="8" column="3" colspan="3">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="9" column="0" colspan="4">
+   <item row="5" column="0" colspan="4">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
@@ -288,7 +226,20 @@
      </item>
     </layout>
    </item>
-   <item row="10" column="3">
+   <item row="5" column="4">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>1</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -301,7 +252,7 @@
      </property>
     </spacer>
    </item>
-   <item row="11" column="0" colspan="6">
+   <item row="7" column="0" colspan="5">
     <widget class="QGroupBox" name="GBBoundaryD">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -378,7 +329,7 @@
      </layout>
     </widget>
    </item>
-   <item row="12" column="0" colspan="6">
+   <item row="8" column="0" colspan="7">
     <widget class="QGroupBox" name="GBBoundaryA">
      <property name="minimumSize">
       <size>
@@ -454,7 +405,7 @@
      </layout>
     </widget>
    </item>
-   <item row="13" column="0" colspan="2">
+   <item row="9" column="0" colspan="3">
     <spacer name="spacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -467,30 +418,64 @@
      </property>
     </spacer>
    </item>
-   <item row="14" column="0">
+   <item row="10" column="0" colspan="2">
     <widget class="QCheckBox" name="CBAdvanced">
      <property name="text">
       <string>Advanced options</string>
      </property>
     </widget>
    </item>
-   <item row="15" column="0">
+   <item row="11" column="0" colspan="5">
     <widget class="QGroupBox" name="GBAdvancedOptions">
      <property name="title">
       <string>Advanced options</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
+      <item row="0" column="0" colspan="2">
        <widget class="QCheckBox" name="CBPyramid">
         <property name="text">
          <string>Authorized pyramids</string>
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QRadioButton" name="RBStandard">
+        <property name="text">
+         <string>Standard</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QRadioButton" name="RBBox">
+        <property name="text">
+         <string>Box</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QRadioButton" name="RBNC1NpA">
+        <property name="text">
+         <string>1 node per edge</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QRadioButton" name="RBNCQuelconque">
+        <property name="text">
+         <string>Free</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="15" column="4" colspan="2">
+   <item row="11" column="6">
     <spacer name="spacer_3">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -506,7 +491,7 @@
      </property>
     </spacer>
    </item>
-   <item row="16" column="0" colspan="2">
+   <item row="12" column="0" colspan="3">
     <spacer name="spacer_4">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -519,14 +504,14 @@
      </property>
     </spacer>
    </item>
-   <item row="17" column="0">
+   <item row="13" column="0">
     <widget class="QLabel" name="Comment">
      <property name="text">
       <string> No comment.</string>
      </property>
     </widget>
    </item>
-   <item row="18" column="0">
+   <item row="14" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -539,7 +524,7 @@
      </property>
     </spacer>
    </item>
-   <item row="19" column="0" colspan="5">
+   <item row="15" column="0" colspan="5">
     <widget class="QGroupBox" name="GroupButtons">
      <property name="title">
       <string/>
@@ -594,7 +579,7 @@
      </layout>
     </widget>
    </item>
-   <item row="19" column="5">
+   <item row="15" column="5" colspan="2">
     <spacer name="spacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>

diff --git a/src/HOMARDGUI/MonCreateCase.cxx b/src/HOMARDGUI/MonCreateCase.cxx
index 6b33b57243dad95e212573b32c3a2c404ba2c649..82adec493cc5cbc36b529cae62d8f4314a11acf5 100644 (file)
--- a/src/HOMARDGUI/MonCreateCase.cxx
+++ b/src/HOMARDGUI/MonCreateCase.cxx
@@ -48,7 +48,7 @@ MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 )
     :
     Ui_CreateCase(),
     _aCaseName(""),_aDirName(""),
-    _ConfType(1),
+    _ConfType(0),
     _Pyram(0)
 {
   MESSAGE("Debut du constructeur de MonCreateCase");
@@ -60,7 +60,6 @@ MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 )
   SetNewName() ;
   GBBoundaryA->setVisible(0);
   GBBoundaryD->setVisible(0);
-  GBTypeNoConf->setVisible(0);
   GBAdvancedOptions->setVisible(0);
   Comment->setVisible(0);
   CBPyramid->setChecked(false);
@@ -85,9 +84,6 @@ void MonCreateCase::InitConnect()
 
     connect( RBConforme,     SIGNAL(clicked()), this, SLOT(SetConforme()));
     connect( RBNonConforme,  SIGNAL(clicked()), this, SLOT(SetNonConforme()));
-    connect( RB1NpM,         SIGNAL(clicked()), this, SLOT(Set1NpM()));
-    connect( RB1NpA,         SIGNAL(clicked()), this, SLOT(Set1NpA()));
-    connect( RBQuelconque,   SIGNAL(clicked()), this, SLOT(SetQuelconque()));
 
     connect( CBBoundaryD,      SIGNAL(stateChanged(int)), this, SLOT(SetBoundaryD()));
     connect( PBBoundaryDiNew,  SIGNAL(pressed()), this, SLOT(PushBoundaryDiNew()));
@@ -99,6 +95,10 @@ void MonCreateCase::InitConnect()
     connect( PBBoundaryAnHelp, SIGNAL(pressed()), this, SLOT(PushBoundaryAnHelp()) );
 
     connect( CBAdvanced,     SIGNAL(stateChanged(int)), this, SLOT(SetAdvanced()));
+    connect( RBStandard,     SIGNAL(clicked()), this, SLOT(SetStandard()));
+    connect( RBBox,          SIGNAL(clicked()), this, SLOT(SetBox()));
+    connect( RBNC1NpA,       SIGNAL(clicked()), this, SLOT(SetNC1NpA()));
+    connect( RBNCQuelconque, SIGNAL(clicked()), this, SLOT(SetNCQuelconque()));
 
     connect( buttonOk,       SIGNAL(pressed()), this, SLOT(PushOnOK()));
     connect( buttonApply,    SIGNAL(pressed()), this, SLOT(PushOnApply(0)));
@@ -361,9 +361,10 @@ void MonCreateCase::SetFileName()
 void MonCreateCase::SetConforme()
 // ------------------------------------------------------------------------
 {
-  GBTypeNoConf->setVisible(0);
 //
   _ConfType=0;
+  RBNC1NpA->setVisible(0);
+  RBNCQuelconque->setVisible(0);
 //
   adjustSize();
 }
@@ -371,30 +372,39 @@ void MonCreateCase::SetConforme()
 void MonCreateCase::SetNonConforme()
 // ------------------------------------------------------------------------
 {
-  GBTypeNoConf->setVisible(1);
-  RB1NpM->setChecked(true);
 //
   _ConfType=1;
+  RBNC1NpA->setVisible(1);
+  RBNCQuelconque->setVisible(1);
 //
   adjustSize();
 }
 // ------------------------------------------------------------------------
-void MonCreateCase::Set1NpM()
+void MonCreateCase::SetStandard()
 // ------------------------------------------------------------------------
 {
-  _ConfType=2;
+  if ( ( _ConfType == 0 ) || ( _ConfType == -1 ) ) { _ConfType = 0 ; }
+  else { _ConfType = 1 ; }
+  RBStandard->setChecked(true);
 }
 // ------------------------------------------------------------------------
-void MonCreateCase::Set1NpA()
+void MonCreateCase::SetBox()
 // ------------------------------------------------------------------------
 {
-  _ConfType=1;
+  if ( ( _ConfType == 0 ) || ( _ConfType == -1 ) ) { _ConfType = -1 ; }
+  else { _ConfType = -2 ; }
 }
 // ------------------------------------------------------------------------
-void MonCreateCase::SetQuelconque()
+void MonCreateCase::SetNC1NpA()
 // ------------------------------------------------------------------------
 {
-  _ConfType=3;
+  _ConfType = 2;
+}
+// ------------------------------------------------------------------------
+void MonCreateCase::SetNCQuelconque()
+// ------------------------------------------------------------------------
+{
+  _ConfType = 3;
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::SetBoundaryD()
@@ -539,11 +549,22 @@ void MonCreateCase::SetAdvanced()
 // ------------------------------------------------------------------------
 {
   MESSAGE("Debut de SetAdvanced ");
-  if (CBAdvanced->isChecked()) { GBAdvancedOptions->setVisible(1); }
+  if (CBAdvanced->isChecked())
+  { GBAdvancedOptions->setVisible(1);
+    RBStandard->setVisible(1);
+    RBBox->setVisible(1);
+    if ( ( _ConfType == 0 ) || ( _ConfType == -1 ) )
+    { RBNC1NpA->setVisible(0);
+      RBNCQuelconque->setVisible(0);}
+    else
+    { RBNC1NpA->setVisible(1);
+      RBNCQuelconque->setVisible(1);}
+  }
   else
   { GBAdvancedOptions->setVisible(0);
     CBPyramid->setChecked(false);
     _Pyram = 0 ;
+    SetStandard() ;
  }
 //
   adjustSize();

diff --git a/src/HOMARDGUI/MonCreateCase.h b/src/HOMARDGUI/MonCreateCase.h
index 03d1c55b2733f774c370966ceaa8c1bad30917fc..c7e4cca1bf5989bef2afc14731faeb8d0be2d8ca 100644 (file)
--- a/src/HOMARDGUI/MonCreateCase.h
+++ b/src/HOMARDGUI/MonCreateCase.h
@@ -64,9 +64,10 @@ public slots:
 
     virtual void SetConforme();
     virtual void SetNonConforme();
-    virtual void Set1NpM();
-    virtual void Set1NpA();
-    virtual void SetQuelconque();
+    virtual void SetStandard();
+    virtual void SetBox();
+    virtual void SetNC1NpA();
+    virtual void SetNCQuelconque();
 
     virtual void SetBoundaryD();
     virtual void PushBoundaryDiNew();

diff --git a/src/HOMARDGUI/MonEditCase.cxx b/src/HOMARDGUI/MonEditCase.cxx
index 239d9e8d1fbaf6c56f146185fa3004978035433d..7fcc792f345cc8afc18b6c04ed3ead4818d97fa3 100644 (file)
--- a/src/HOMARDGUI/MonEditCase.cxx
+++ b/src/HOMARDGUI/MonEditCase.cxx
@@ -68,23 +68,8 @@ void MonEditCase::InitValEdit()
   PushFichier->setVisible(0);
 
   int ConfType=aCase->GetConfType();
-  if(ConfType==0)
-  {
-    RBConforme->setChecked(true);
-    GBTypeNoConf->setVisible(0);
-  }
-  else
-  {
-    RBNonConforme->setChecked(true);
-    GBTypeNoConf->setVisible(1);
-    if (ConfType==2) { RB1NpM->setChecked(true);};
-    if (ConfType==1) { RB1NpA->setChecked(true);};
-    if (ConfType==3) { RBQuelconque->setChecked(true);};
-    RB1NpM->setEnabled(false);
-    RB1NpA->setEnabled(false);
-    RBQuelconque->setEnabled(false);
-  };
-
+  if ( ( ConfType == 0 ) || ( ConfType == -1 ) ) { RBConforme->setChecked(true); }
+  else                                           { RBNonConforme->setChecked(true); };
   RBConforme->setEnabled(false);
   RBNonConforme->setEnabled(false);
 
@@ -181,15 +166,45 @@ void MonEditCase::InitValEdit()
   CBAdvanced->setEnabled(false) ;
   int Pyram = aCase->GetPyram();
   MESSAGE("Pyram "<<Pyram);
-  if ( Pyram > 0 )
+  if ( ( Pyram > 0 ) || ( ConfType < 0 ) || ( ConfType > 1 ) )
   { GBAdvancedOptions->setVisible(1);
-    CBPyramid->setChecked(true);
-    CBPyramid->setEnabled(false);
+    if ( Pyram > 0 )
+    { CBPyramid->setChecked(true);
+      CBPyramid->setEnabled(false);
+    }
+    else
+    { CBPyramid->setChecked(false);
+      CBPyramid->setVisible(0);
+    }
+    if ( ( ConfType == 0 ) || ( ConfType == -1 ) )
+    { if ( ConfType == 0 ) { RBStandard->setChecked(true); }
+      else                 { RBBox->setChecked(true); }
+      RBStandard->setVisible(1);
+      RBBox->setVisible(1);
+      RBNC1NpA->setVisible(0);
+      RBNCQuelconque->setVisible(0);
+      RBStandard->setEnabled(false);
+      RBBox->setEnabled(false);
+    }
+    else
+    { if (ConfType==-2) { RBBox->setChecked(true);};
+      if (ConfType==1) { RBStandard->setChecked(true);};
+      if (ConfType==2) { RBNC1NpA->setChecked(true);};
+      if (ConfType==3) { RBNCQuelconque->setChecked(true);};
+      RBStandard->setVisible(1);
+      RBBox->setVisible(1);
+      RBNC1NpA->setVisible(1);
+      RBNCQuelconque->setVisible(1);
+      RBStandard->setEnabled(false);
+      RBBox->setEnabled(false);
+      RBNC1NpA->setEnabled(false);
+      RBNCQuelconque->setEnabled(false);
+    }
   }
   else
   { GBAdvancedOptions->setVisible(0);
     CBPyramid->setChecked(false);
- }
+  }
 //
 // L'etat
   int etat = aCase->GetState();