From e8c94112e2ea0a497b5a05f31364ac828e1cd0e5 Mon Sep 17 00:00:00 2001
From: Gerald NICOLAS <gerald.nicolas@edf.fr>
Date: Tue, 27 Dec 2016 10:27:59 +0100
Subject: [PATCH] =?utf8?q?Voisinages=20des=20volumes=20raccord=C3=A9s=20pa?=
 =?utf8?q?r=20non=20conformit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 doc/en/divers.rst                     |  5 +-
 doc/fr/divers.rst                     |  4 +-
 src/HOMARDGUI/CreateHypothesis.ui     | 70 ++++++++++++++++-----------
 src/HOMARDGUI/MonCreateHypothesis.cxx | 15 +++---
 src/HOMARDGUI/MonEditHypothesis.cxx   | 10 +++-
 5 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/doc/en/divers.rst b/doc/en/divers.rst
index 483d40a2..020e06a5 100644
--- a/doc/en/divers.rst
+++ b/doc/en/divers.rst
@@ -74,8 +74,11 @@ SALOME RELEASE 7.6 :
 
 SALOME RELEASE 8.1 :
     - Interface with med 3.2.0
-    - New options withinthe choice conformal/non-conformal.
+    - New options within the choice conformal/non-conformal.
     - Less meshes are involved in the case of a non conformal refinement of a mesh made of hexahedra.
     - Correction of an error when refinement and unrefinement are coupled for a mesh made of hexahedra.
 
+SALOME RELEASE 8.3 :
+    - Interface with med 3.2.1
+    - Output of the list of the meshes that are connected with a non conformal link.
 
diff --git a/doc/fr/divers.rst b/doc/fr/divers.rst
index 0c932893..cd827a1b 100644
--- a/doc/fr/divers.rst
+++ b/doc/fr/divers.rst
@@ -78,5 +78,7 @@ SALOME VERSION 8.1 :
     - Diminution du nombre de mailles impactées dans le cas d’un raffinement non conforme d’un maillage en hexaèdres.
     - Correction d'une anomalie en raffinement / déraffinement d’un maillage en hexaèdres.
 
-
+SALOME VERSION 8.3 :
+    - Interfaçage avec med 3.2.1
+    - Sortie des listes de mailles volumiques raccordées par non-conformité
 
diff --git a/src/HOMARDGUI/CreateHypothesis.ui b/src/HOMARDGUI/CreateHypothesis.ui
index d97cb575..00c65dc8 100644
--- a/src/HOMARDGUI/CreateHypothesis.ui
+++ b/src/HOMARDGUI/CreateHypothesis.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>848</width>
-    <height>1600</height>
+    <height>1650</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -46,7 +46,7 @@
      <x>0</x>
      <y>0</y>
      <width>844</width>
-     <height>1596</height>
+     <height>1646</height>
     </rect>
    </property>
    <property name="sizeGripEnabled" stdset="0">
@@ -76,7 +76,7 @@
       </layout>
      </widget>
     </item>
-    <item row="0" column="1" colspan="2">
+    <item row="0" column="1">
      <spacer name="horizontalSpacer_9">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -89,7 +89,7 @@
       </property>
      </spacer>
     </item>
-    <item row="1" column="0" colspan="2">
+    <item row="1" column="0">
      <widget class="QGroupBox" name="GBTypeAdaptation">
       <property name="title">
        <string>Type of adaptation</string>
@@ -128,7 +128,7 @@
       </layout>
      </widget>
     </item>
-    <item row="1" column="3">
+    <item row="1" column="2">
      <spacer name="horizontalSpacer_6">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -148,7 +148,7 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="3">
+    <item row="2" column="2">
      <spacer name="horizontalSpacer_8">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -193,7 +193,7 @@
       </layout>
      </widget>
     </item>
-    <item row="3" column="3">
+    <item row="3" column="2">
      <spacer name="horizontalSpacer_7">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -206,7 +206,7 @@
       </property>
      </spacer>
     </item>
-    <item row="4" column="0" colspan="2">
+    <item row="4" column="0">
      <widget class="QGroupBox" name="GBFieldFile">
       <property name="title">
        <string/>
@@ -238,7 +238,7 @@
       </layout>
      </widget>
     </item>
-    <item row="5" column="0" colspan="4">
+    <item row="5" column="0" colspan="3">
      <widget class="QGroupBox" name="GBFieldManagement">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -690,7 +690,7 @@
       </layout>
      </widget>
     </item>
-    <item row="6" column="0" colspan="3">
+    <item row="6" column="0" colspan="2">
      <widget class="QGroupBox" name="GBAreaManagement">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -878,7 +878,7 @@
       </layout>
      </widget>
     </item>
-    <item row="7" column="3">
+    <item row="7" column="2">
      <spacer name="horizontalSpacer_5">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -898,7 +898,7 @@
       </property>
      </widget>
     </item>
-    <item row="8" column="3">
+    <item row="8" column="2">
      <spacer name="horizontalSpacer_4">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -911,7 +911,7 @@
       </property>
      </spacer>
     </item>
-    <item row="9" column="0">
+    <item row="9" column="0" rowspan="2">
      <widget class="QGroupBox" name="GBAdvancedOptions">
       <property name="title">
        <string>Advanced options</string>
@@ -1017,10 +1017,24 @@
          </property>
         </widget>
        </item>
+       <item row="6" column="0">
+        <widget class="QCheckBox" name="CBOutputParent">
+         <property name="text">
+          <string>Output of the parents</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QCheckBox" name="CBOutputVoisins">
+         <property name="text">
+          <string>Output of the neighbours</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </item>
-    <item row="9" column="3">
+    <item row="9" column="2">
      <spacer name="horizontalSpacer_3">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -1033,7 +1047,20 @@
       </property>
      </spacer>
     </item>
-    <item row="10" column="0" colspan="2">
+    <item row="10" column="1">
+     <spacer name="horizontalSpacer_2">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="11" column="0">
      <widget class="QGroupBox" name="GBButtons">
       <property name="title">
        <string/>
@@ -1076,19 +1103,6 @@
       </layout>
      </widget>
     </item>
-    <item row="10" column="2">
-     <spacer name="horizontalSpacer_2">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
    </layout>
   </widget>
  </widget>
diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx
index 77441cf7..c73c86f1 100644
--- a/src/HOMARDGUI/MonCreateHypothesis.cxx
+++ b/src/HOMARDGUI/MonCreateHypothesis.cxx
@@ -77,7 +77,8 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
       CBOutputLevel->setChecked(false);
       CBOutputQuality->setChecked(false);
       CBOutputDiameter->setChecked(false);
-//       CBOutputParent->setChecked(false);
+      CBOutputParent->setChecked(false);
+      CBOutputVoisins->setChecked(false);
       _ExtraOutput = 1 ;
 //
       adjustSize();
@@ -197,10 +198,11 @@ bool MonCreateHypothesis::PushOnApply()
     aHypothesis->SetAdapInit(_AdapInit);
 // Sortie optionnelle des niveaux de raffinement, des diametres, des qualites
     _ExtraOutput = 1 ;
-    if (CBOutputLevel->isChecked())    { _ExtraOutput = 2 ; }
-    if (CBOutputQuality->isChecked())  { _ExtraOutput = 3*_ExtraOutput ; }
-    if (CBOutputDiameter->isChecked()) { _ExtraOutput = 5*_ExtraOutput ; }
-//     if (CBOutputParent->isChecked())   { _ExtraOutput = 7*_ExtraOutput ; }
+    if (CBOutputLevel->isChecked())    { _ExtraOutput =  2 ; }
+    if (CBOutputQuality->isChecked())  { _ExtraOutput =  3*_ExtraOutput ; }
+    if (CBOutputDiameter->isChecked()) { _ExtraOutput =  5*_ExtraOutput ; }
+    if (CBOutputParent->isChecked())   { _ExtraOutput =  7*_ExtraOutput ; }
+    if (CBOutputVoisins->isChecked())  { _ExtraOutput = 11*_ExtraOutput ; }
     aHypothesis->SetExtraOutput(_ExtraOutput);
   }
 
@@ -913,7 +915,8 @@ void MonCreateHypothesis::SetAdvanced()
     CBOutputLevel->setChecked(false);
     CBOutputQuality->setChecked(false);
     CBOutputDiameter->setChecked(false);
-//     CBOutputParent->setChecked(false);
+    CBOutputParent->setChecked(false);
+    CBOutputVoisins->setChecked(false);
     _ExtraOutput = 1 ;
   }
 //
diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx
index 3853b63f..7522ea66 100644
--- a/src/HOMARDGUI/MonEditHypothesis.cxx
+++ b/src/HOMARDGUI/MonEditHypothesis.cxx
@@ -149,12 +149,18 @@ void MonEditHypothesis::InitValEdit()
       CBOutputDiameter->setEnabled(false);
     }
     else { CBOutputDiameter->setVisible(0) ; }
-/*    if ( ExtraOutput % 7 == 0 )
+    if ( ExtraOutput % 7 == 0 )
     {
       CBOutputParent->setChecked(true);
       CBOutputParent->setEnabled(false);
     }
-    else { CBOutputParent->setVisible(0) ; }*/
+    else { CBOutputParent->setVisible(0) ; }
+    if ( ExtraOutput % 11 == 0 )
+    {
+      CBOutputVoisins->setChecked(true);
+      CBOutputVoisins->setEnabled(false);
+    }
+    else { CBOutputVoisins->setVisible(0) ; }
   }
   else
   { GBAdvancedOptions->setVisible(0); }
-- 
2.39.2