From 75b5a5de646773e5a51d9986c36ec6e72ce31f87 Mon Sep 17 00:00:00 2001
From: nicolas <nicolas>
Date: Tue, 17 Sep 2013 13:51:51 +0000
Subject: [PATCH] Nouvelles icones

---
 doc/files/tutorial_1.py               |    2 +-
 doc/files/tutorial_2.py               |    2 +-
 doc/files/tutorial_3.py               |    2 +-
 doc/files/tutorial_4.py               |    2 +-
 doc/files/tutorial_4.xml              |    2 +-
 doc/files/tutorial_5.py               |    2 +-
 idl/HOMARD_Cas.idl                    |    3 +-
 idl/HOMARD_Gen.idl                    |    9 +-
 idl/Makefile.am                       |    5 +-
 resources/Makefile.am                 |    1 +
 resources/loop.png                    |  Bin 0 -> 816 bytes
 src/HOMARD/HOMARD_DriverTools.cxx     |   93 +-
 src/HOMARD/HOMARD_DriverTools.hxx     |    9 +-
 src/HOMARD/HOMARD_Iteration.cxx       |    2 +-
 src/HOMARD/Makefile.am                |    9 +-
 src/HOMARDGUI/CreateBoundaryAn.h      |   12 +-
 src/HOMARDGUI/CreateBoundaryAn.ui     |    2 +-
 src/HOMARDGUI/CreateBoundaryDi.h      |  159 +--
 src/HOMARDGUI/CreateBoundaryDi.ui     |   99 +-
 src/HOMARDGUI/CreateCase.h            |   12 +-
 src/HOMARDGUI/CreateCase.ui           |    2 +-
 src/HOMARDGUI/CreateHypothesis.h      |   16 +-
 src/HOMARDGUI/CreateHypothesis.ui     |    4 +-
 src/HOMARDGUI/CreateIteration.h       |   14 +-
 src/HOMARDGUI/CreateIteration.ui      |    2 +-
 src/HOMARDGUI/CreateYACS.h            |   54 +-
 src/HOMARDGUI/CreateYACS.ui           |   38 +-
 src/HOMARDGUI/CreateZone.h            | 1391 ++++++++++++-------------
 src/HOMARDGUI/CreateZone.ui           |    2 +-
 src/HOMARDGUI/HOMARDGUI.cxx           |   52 +-
 src/HOMARDGUI/HOMARDGUI.h             |    3 +-
 src/HOMARDGUI/HOMARDGUI_Utils.cxx     |   19 +-
 src/HOMARDGUI/HOMARDGUI_Utils.h       |    5 +-
 src/HOMARDGUI/HOMARD_msg_en.ts        |    4 +
 src/HOMARDGUI/HOMARD_msg_fr.ts        |    4 +
 src/HOMARDGUI/HOMARD_msg_ja.ts        |    4 +
 src/HOMARDGUI/Makefile.am             |    3 +
 src/HOMARDGUI/MonCreateBoundaryAn.cxx |   42 +-
 src/HOMARDGUI/MonCreateBoundaryAn.h   |    4 +-
 src/HOMARDGUI/MonCreateBoundaryDi.cxx |   46 +-
 src/HOMARDGUI/MonCreateBoundaryDi.h   |    8 +-
 src/HOMARDGUI/MonCreateCase.cxx       |   38 +-
 src/HOMARDGUI/MonCreateCase.h         |    4 +-
 src/HOMARDGUI/MonCreateHypothesis.cxx |   78 +-
 src/HOMARDGUI/MonCreateHypothesis.h   |    8 +-
 src/HOMARDGUI/MonCreateIteration.cxx  |   54 +-
 src/HOMARDGUI/MonCreateIteration.h    |    8 +-
 src/HOMARDGUI/MonCreateListGroup.cxx  |    6 +-
 src/HOMARDGUI/MonCreateListGroup.h    |    2 +-
 src/HOMARDGUI/MonCreateYACS.cxx       |   81 +-
 src/HOMARDGUI/MonCreateYACS.h         |   17 +-
 src/HOMARDGUI/MonCreateZone.cxx       |   68 +-
 src/HOMARDGUI/MonCreateZone.h         |    6 +-
 src/HOMARDGUI/MonEditBoundaryAn.cxx   |   18 +-
 src/HOMARDGUI/MonEditBoundaryAn.h     |    2 +-
 src/HOMARDGUI/MonEditBoundaryDi.cxx   |   22 +-
 src/HOMARDGUI/MonEditBoundaryDi.h     |    2 +-
 src/HOMARDGUI/MonEditCase.cxx         |   10 +-
 src/HOMARDGUI/MonEditCase.h           |    2 +-
 src/HOMARDGUI/MonEditFile.h           |    2 +-
 src/HOMARDGUI/MonEditHypothesis.cxx   |   44 +-
 src/HOMARDGUI/MonEditHypothesis.h     |    2 +-
 src/HOMARDGUI/MonEditIteration.cxx    |   16 +-
 src/HOMARDGUI/MonEditIteration.h      |    2 +-
 src/HOMARDGUI/MonEditZone.cxx         |   14 +-
 src/HOMARDGUI/MonEditZone.h           |    2 +-
 src/HOMARDGUI/MonIterInfo.cxx         |    6 +-
 src/HOMARDGUI/MonIterInfo.h           |    2 +-
 src/HOMARDGUI/MonMeshInfo.cxx         |   14 +-
 src/HOMARDGUI/MonMeshInfo.h           |    2 +-
 src/HOMARDGUI/MonPursueIteration.cxx  |   12 +-
 src/HOMARDGUI/MonPursueIteration.h    |    2 +-
 src/HOMARD_I/HOMARD_Cas_i.cxx         |   12 +-
 src/HOMARD_I/HOMARD_Cas_i.hxx         |    2 +-
 src/HOMARD_I/HOMARD_Gen_i.cxx         |  604 +++++++----
 src/HOMARD_I/HOMARD_Gen_i.hxx         |   25 +-
 src/HOMARD_I/HOMARD_Iteration_i.cxx   |    2 +-
 src/HOMARD_I/HOMARD_Zone_i.cxx        |    4 +-
 src/HOMARD_I/Makefile.am              |    2 +
 79 files changed, 1829 insertions(+), 1512 deletions(-)
 create mode 100644 resources/loop.png

diff --git a/doc/files/tutorial_1.py b/doc/files/tutorial_1.py
index 4e553d1c..3ab26775 100644
--- a/doc/files/tutorial_1.py
+++ b/doc/files/tutorial_1.py
@@ -41,7 +41,7 @@ if not os.path.isdir(dircase) :
 # ==================================
 # Ce repertoire contient les fichiers de donnees : tutorial_1.00.med
 pathHomard = os.getenv('HOMARD_ROOT_DIR')
-data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/_downloads")
+data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/fr/_downloads")
 #
 import salome
 salome.salome_init()
diff --git a/doc/files/tutorial_2.py b/doc/files/tutorial_2.py
index 34ff6b3f..30b35ad7 100644
--- a/doc/files/tutorial_2.py
+++ b/doc/files/tutorial_2.py
@@ -41,7 +41,7 @@ if not os.path.isdir(dircase) :
 # ==================================
 # Ce repertoire contient les fichiers de donnees : tutorial_2.00.med
 pathHomard = os.getenv('HOMARD_ROOT_DIR')
-data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/_downloads")
+data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/fr/_downloads")
 #
 import salome
 salome.salome_init()
diff --git a/doc/files/tutorial_3.py b/doc/files/tutorial_3.py
index 4aa2d0f2..ac9e91ec 100644
--- a/doc/files/tutorial_3.py
+++ b/doc/files/tutorial_3.py
@@ -41,7 +41,7 @@ if not os.path.isdir(dircase) :
 # ==================================
 # Ce repertoire contient les fichiers de donnees : tutorial_3.00.med, tutorial_3.01.med
 pathHomard = os.getenv('HOMARD_ROOT_DIR')
-data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/_downloads")
+data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/fr/_downloads")
 #
 import salome
 salome.salome_init()
diff --git a/doc/files/tutorial_4.py b/doc/files/tutorial_4.py
index 3dbaeb91..59467a9f 100644
--- a/doc/files/tutorial_4.py
+++ b/doc/files/tutorial_4.py
@@ -41,7 +41,7 @@ if not os.path.isdir(dircase) :
 # ==================================
 # Ce repertoire contient les fichiers de donnees : tutorial_4.00.med, tutorial_4.fr.med
 pathHomard = os.getenv('HOMARD_ROOT_DIR')
-data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/_downloads")
+data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/fr/_downloads")
 #
 import salome
 salome.salome_init()
diff --git a/doc/files/tutorial_4.xml b/doc/files/tutorial_4.xml
index 69dde7f9..fd588fc9 100644
--- a/doc/files/tutorial_4.xml
+++ b/doc/files/tutorial_4.xml
@@ -306,7 +306,7 @@ else :
    <inline name="DataInit">
       <script><code><![CDATA[import os
 pathHomard = os.getenv("HOMARD_ROOT_DIR")
-data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/_downloads")
+data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/fr/_downloads")
 print "data_dir =", data_dir
 print os.listdir(data_dir)
 #
diff --git a/doc/files/tutorial_5.py b/doc/files/tutorial_5.py
index a0dc708c..58908a33 100644
--- a/doc/files/tutorial_5.py
+++ b/doc/files/tutorial_5.py
@@ -41,7 +41,7 @@ if not os.path.isdir(dircase) :
 # ==================================
 # Ce repertoire contient les fichiers de donnees : tutorial_5.00.med, tutorial_5.fr.med
 pathHomard = os.getenv('HOMARD_ROOT_DIR')
-data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/_downloads")
+data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/fr/_downloads")
 #
 import salome
 salome.salome_init()
diff --git a/idl/HOMARD_Cas.idl b/idl/HOMARD_Cas.idl
index 747b4859..a278eabb 100644
--- a/idl/HOMARD_Cas.idl
+++ b/idl/HOMARD_Cas.idl
@@ -34,6 +34,7 @@
 #include "SALOMEDS.idl"
 
 #include "HOMARD_Iteration.idl"
+#include "HOMARD_YACS.idl"
 
 module HOMARD
 {
@@ -91,7 +92,7 @@ module HOMARD
     void     AddIteration (in string IterName)             raises (SALOME::SALOME_Exception);
 
 // YACS
-    long     WriteYACSSchema(in string ScriptFile, in string DirName, in string MeshFile)
+    HOMARD_YACS CreateYACSSchema(in string YACSName, in string ScriptFile, in string DirName, in string MeshFile)
                                                            raises (SALOME::SALOME_Exception);
 
 
diff --git a/idl/HOMARD_Gen.idl b/idl/HOMARD_Gen.idl
index 49192eaa..76ce7944 100644
--- a/idl/HOMARD_Gen.idl
+++ b/idl/HOMARD_Gen.idl
@@ -29,6 +29,7 @@
 #include "HOMARD_Iteration.idl"
 #include "HOMARD_Zone.idl"
 #include "HOMARD_Boundary.idl"
+#include "HOMARD_YACS.idl"
 
 module HOMARD
 {
@@ -37,6 +38,7 @@ module HOMARD
   typedef sequence<string> listeIterations;
   typedef sequence<string> listeCases;
   typedef sequence<string> listeBoundarys;
+  typedef sequence<string> listeYACSs;
 
   interface HOMARD_Gen : Engines::EngineComponent, SALOMEDS::Driver
   {
@@ -118,12 +120,14 @@ module HOMARD
     HOMARD_Cas        GetCase(in string CaseName)          raises (SALOME::SALOME_Exception);
     HOMARD_Hypothesis GetHypothesis(in string HypoName)    raises (SALOME::SALOME_Exception);
     HOMARD_Iteration  GetIteration(in string IterName)     raises (SALOME::SALOME_Exception);
+    HOMARD_YACS       GetYACS(in string YACSName)          raises (SALOME::SALOME_Exception);
     HOMARD_Zone       GetZone(in string ZoneName)          raises (SALOME::SALOME_Exception);
 
     listeBoundarys  GetAllBoundarysName()                  raises (SALOME::SALOME_Exception);
     listeCases      GetAllCasesName()                      raises (SALOME::SALOME_Exception);
     listeHypotheses GetAllHypothesesName()                 raises (SALOME::SALOME_Exception);
     listeIterations GetAllIterationsName()                 raises (SALOME::SALOME_Exception);
+    listeYACSs      GetAllYACSsName()                      raises (SALOME::SALOME_Exception);
     listeZones      GetAllZonesName()                      raises (SALOME::SALOME_Exception);
 
     void            MeshInfo(in string CaseName, in string MeshName, in string FileName,  in string DirName, in long Qual, in long Diam, in long Conn, in long Tail, in long Inte )
@@ -158,6 +162,7 @@ module HOMARD
                                                            raises (SALOME::SALOME_Exception);
     long DeleteIterationOption(in string IterName, in long Option1, in long Option2)
                                                            raises (SALOME::SALOME_Exception);
+    long DeleteYACS(in string YacsName, in long Option)    raises (SALOME::SALOME_Exception);
     long DeleteZone (in string ZoneName)                   raises (SALOME::SALOME_Exception);
 //
     void AssociateIterHypo(in string IterName, in string HypoName)
@@ -186,7 +191,9 @@ module HOMARD
                                                            raises (SALOME::SALOME_Exception);
 
 //
-    long   WriteYACSSchema(in string CaseName, in string ScriptFile, in string DirName, in string MeshFile)
+    HOMARD_YACS CreateYACSSchema(in string YACSName, in string CaseName, in string ScriptFile, in string DirName, in string MeshFile)
+                                                           raises (SALOME::SALOME_Exception);
+    long YACSWriteOnFile (in string YACSName, in string YACSFile)
                                                            raises (SALOME::SALOME_Exception);
 
   };
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 85c912ef..93fa93ce 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -24,7 +24,7 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-BASEIDL_FILES = HOMARD_Gen.idl HOMARD_Cas.idl HOMARD_Hypothesis.idl HOMARD_Iteration.idl HOMARD_Zone.idl HOMARD_Boundary.idl
+BASEIDL_FILES = HOMARD_Gen.idl HOMARD_Cas.idl HOMARD_Hypothesis.idl HOMARD_Iteration.idl HOMARD_Zone.idl HOMARD_Boundary.idl HOMARD_YACS.idl
 
 BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py)
 
@@ -41,7 +41,8 @@ nodist_libSalomeIDLHOMARD_la_SOURCES = \
         HOMARD_HypothesisSK.cc \
         HOMARD_IterationSK.cc \
         HOMARD_BoundarySK.cc \
-        HOMARD_GenSK.cc
+        HOMARD_GenSK.cc \
+        HOMARD_YACSSK.cc
 
 BUILT_SOURCES = $(nodist_libSalomeIDLHOMARD_la_SOURCES)
 
diff --git a/resources/Makefile.am b/resources/Makefile.am
index 4106f4e4..fecd15c1 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -49,6 +49,7 @@ dist_salomeres_DATA =   \
 	iter_next.png \
 	iter_non_calculee.png \
 	iter_poursuite.png \
+	loop.png \
 	med.png \
 	mesh_compute.png \
 	mesh_hypo_edit.png \
diff --git a/resources/loop.png b/resources/loop.png
new file mode 100644
index 0000000000000000000000000000000000000000..87e001dd80b2755858d4599857106a0c9c0b3500
GIT binary patch
literal 816
zcmV-01JC@4P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;rb$FWRCwBA{Qv(y12q9a0I`6G?+lD6rgAd;XCy{5
zHhlmA#Dc^@mIHB63}s|w3<Oe9K&%MFkAQd$(07bbwIIX6`Tzom1<g_nmjMkj22z=h
z9-he_0f7usvT_X1pFT0(yLC$-P|go1=KwVLAk1KZ0Ac`z;kW-F3Je&~F%ZnD?e6`5
z?(wt#XMy<iqo@B*K6vu~*!{=<8zxQp&&13OQp5~110aBy@P!%B1tHE}-pT&q5e)x;
zhJ*3H{|tZs|6}<3?;nGsmk)z`KoCf20?Z760Aj-DT_6Z?^zsH805k+>&>x^7VEp$V
z!_S{T8NPo0%wTSB4^{^=10aA{2t*_sGYc!&H9+&gF8uxbH^cX@Ux5bxVEFUvH&_hp
zNhkmaASMC^p1OMBJi~90i+=rL`10u!!-sco89u&$$ME^%M~1IozA)UpbP22urU4*;
z81W@+U>Ndq^YVU}wt5|dps+B*k8j@@e*E~(@bkwHhQELQGJN^`k)bg^7i72+(46}q
zJpciO*M(YIT7fc>k_-*mnGENS9|s!*!oPv8y?^^ALw|iO$gn1uVITkyKn&QD3J3!Y
zt1#5l`yc4!^j}9?`#%#C(;-P2+5cJwhW{mHWkKFL1H{Sb`Tzn5YousvYge$bu(Yd+
zi!(g^@BtL?iGTn8T>uOM_2*9>%K?=<1!}&AO)o$IVT2*juu`C5U1~tXo&y8^?Uyf=
zSFc{}AhvJ-2p}dj!}3{~naMT`1ONgE>_SkfVWO=i2{i0E$eXW$2^NUUfQEGwYY@l`
zP;LPTAh-*gnwp;TadI-eff!amiebp56hHvMT?i_^fL=}k3i1H)bfAI1NHGa!20#G8
u4Wv>5%K#8S$g%vNP}zvfo5&o100RIgKz|e1YHVKs0000<MNUMnLSTYLbW>aa

literal 0
HcmV?d00001

diff --git a/src/HOMARD/HOMARD_DriverTools.cxx b/src/HOMARD/HOMARD_DriverTools.cxx
index faf77553..187970ae 100644
--- a/src/HOMARD/HOMARD_DriverTools.cxx
+++ b/src/HOMARD/HOMARD_DriverTools.cxx
@@ -27,6 +27,7 @@
 #include "HOMARD_Hypothesis.hxx"
 #include "HOMARD_Iteration.hxx"
 #include "HOMARD_Zone.hxx"
+#include "HOMARD_YACS.hxx"
 #include <sstream>
 #include <cstdlib>
 #include "utilities.h"
@@ -78,6 +79,7 @@ namespace HOMARD
     case Hypothesis: signature = "HYPO"; break;
     case Iteration:  signature = "ITER"; break;
     case Boundary:   signature = "BOUNDARY"; break;
+    case YACS:       signature = "YACS"; break;
     default: break;
     }
     signature += separator();
@@ -94,7 +96,7 @@ namespace HOMARD
   }
 
 // =======================
-// Case
+// 1.1. Case
 // =======================
   /*!
     \brief Dump case to the string
@@ -138,8 +140,9 @@ namespace HOMARD
     return saux ;
   }
 //
-// Iteration
-// ==========
+// ==============
+// 1.2. Iteration
+// ==============
 //
   /*!
     \brief Dump iteration to the string
@@ -178,8 +181,9 @@ namespace HOMARD
     return saux ;
   }
 //
-// hypothese
-// ==============================
+// ==============
+// 1.3. hypothese
+// ==============
   /*!
     \brief Dump hypothesis to the string
     \param hypothesis hypothesis being dumped
@@ -241,8 +245,9 @@ namespace HOMARD
     return saux ;
   }
 //
-// Zone
-// =========================
+// =========
+// 1.4. Zone
+// =========
 
   /*!
     \brief Dump zone to the string
@@ -276,6 +281,7 @@ namespace HOMARD
     return saux ;
   }
 //
+// ==============================
 // 1.5. Archivage d'une frontiere
 // ==============================
 
@@ -322,9 +328,31 @@ namespace HOMARD
   }
 
 //
-// Restauration des objets
+// =========
+// 1.6. YACS
+// =========
+
+  /*!
+    \brief Dump YACS to the string
+    \param yacs yacs being dumped
+    \return string representation of the zone
+  */
+  std::string Dump( const HOMARD_YACS& yacs )
+  {
+    std::stringstream os;
+    std::string saux ;
+    MESSAGE( ". Sauvegarde du schema YACS "<<yacs.GetName());
+    os << yacs.GetName();
+    os << separator() << yacs.GetType();
+
+    saux = os.str();
+//     MESSAGE( ". Fin avec "<<saux);
+    return saux ;
+  }
+//
+// 2. Restauration des objets
 // ==========================
-// Case
+// 2.1. Case
 // ==========================
 //
   /*!
@@ -404,8 +432,9 @@ namespace HOMARD
     return true;
   }
 //
-//  Iteration
-// =================================
+// ==============
+// 2.2. Iteration
+// ==============
   /*!
     \brief Restore iteration from the string
     \param iteration iteration being restored
@@ -474,8 +503,9 @@ namespace HOMARD
   }
 
 //
-// hypothese
-// =================================
+// ==============
+// 2.3. hypothese
+// ==============
   /*!
     \brief Restore hypothesis from the string
     \param hypothesis hypothesis being restored
@@ -609,8 +639,9 @@ namespace HOMARD
   }
 
 //
-// Zone
-// ============================
+// =========
+// 2.4. Zone
+// =========
   /*!
     \brief Restore zone from the string
     \param zone zone being restored
@@ -673,6 +704,7 @@ namespace HOMARD
   }
 
 //
+// =================================
 // 2.5. Restauration d'une frontiere
 // =================================
 
@@ -680,7 +712,7 @@ namespace HOMARD
     \brief Restore boundary from the string
     \param boundary boundary being restored
     \param stream string representation of the boundary
-    \return \c true if zone is correctly restored or \c false otherwise
+    \return \c true if the boundary is correctly restored or \c false otherwise
   */
   bool Restore( HOMARD_Boundary& boundary, const std::string& stream )
   {
@@ -755,4 +787,33 @@ namespace HOMARD
     return true;
   }
 
+//
+// ==================================
+// 2.6. Restauration d'un schema YACS
+// ==================================
+
+  /*!
+    \brief Restore a schema YACS from the string
+    \param yacs yacs being restored
+    \param stream string representation of the schema yacs
+    \return \c true if yacs is correctly restored or \c false otherwise
+  */
+  bool Restore( HOMARD_YACS& yacs, const std::string& stream )
+  {
+    std::string::size_type start = 0;
+    std::string chunk;
+    bool ok;
+
+    chunk = getNextChunk( stream, start, ok );
+    if ( !ok ) return false;
+    yacs.SetName( chunk.c_str() );
+
+    chunk = getNextChunk( stream, start, ok );
+    if ( !ok ) return false;
+    int YACSType = atoi( chunk.c_str() ) ;
+    yacs.SetType( YACSType );
+
+    return true;
+  }
+
 } // namespace HOMARD /end/
diff --git a/src/HOMARD/HOMARD_DriverTools.hxx b/src/HOMARD/HOMARD_DriverTools.hxx
index b802d104..ba4a92ab 100644
--- a/src/HOMARD/HOMARD_DriverTools.hxx
+++ b/src/HOMARD/HOMARD_DriverTools.hxx
@@ -31,15 +31,16 @@ class HOMARD_Cas;
 class HOMARD_Iteration;
 class HOMARD_Hypothesis;
 class HOMARD_Zone;
+class HOMARD_YACS;
 
 namespace HOMARD
 {
   //! persistence entity type
-  typedef enum { Case, Zone, Hypothesis, Iteration, Boundary } SignatureType;
+  typedef enum { Case, Zone, Hypothesis, Iteration, Boundary, YACS } SignatureType;
 
   //! get persistence signature
   std::string GetSignature( SignatureType type );
-  
+
   //! get data separator
   std::string separator();
 
@@ -53,6 +54,8 @@ namespace HOMARD
   std::string Dump( const ::HOMARD_Hypothesis& hypothesis );
   //! dump zone to the string
   std::string Dump( const ::HOMARD_Zone& zone );
+  //! dump yacs to the string
+  std::string Dump( const ::HOMARD_YACS& yacs );
 
   //! restore boundary from the string
   bool Restore( ::HOMARD_Boundary& boundary, const std::string& stream );
@@ -64,6 +67,8 @@ namespace HOMARD
   bool Restore( ::HOMARD_Iteration& iteration, const std::string& stream );
   //! restore zone from the string
   bool Restore( ::HOMARD_Zone& zone, const std::string& stream );
+  //! restore yacs from the string
+  bool Restore( ::HOMARD_YACS& yacs, const std::string& stream );
 };
 
 #endif // HOMARD_DRIVERTOOLS_H
diff --git a/src/HOMARD/HOMARD_Iteration.cxx b/src/HOMARD/HOMARD_Iteration.cxx
index 55166324..16517a84 100644
--- a/src/HOMARD/HOMARD_Iteration.cxx
+++ b/src/HOMARD/HOMARD_Iteration.cxx
@@ -50,7 +50,7 @@ HOMARD_Iteration::HOMARD_Iteration():
   _FileInfo( "" ),
  _MessInfo( 1 )
 {
-  MESSAGE("HOMARD_Iter");
+  MESSAGE("HOMARD_Iteration");
 }
 //=============================================================================
 /*!
diff --git a/src/HOMARD/Makefile.am b/src/HOMARD/Makefile.am
index c3df60cd..09422f9f 100755
--- a/src/HOMARD/Makefile.am
+++ b/src/HOMARD/Makefile.am
@@ -31,6 +31,7 @@ salomeinclude_HEADERS = \
 	HOMARD_Zone.hxx \
 	HOMARD_Gen.hxx \
 	HOMARD_DriverTools.hxx \
+	HOMARD_YACS.hxx \
 	HomardDriver.hxx \
 	YACSDriver.hxx
 
@@ -44,6 +45,7 @@ dist_libHOMARDImpl_la_SOURCES = \
 	HOMARD_Zone.cxx \
 	HOMARD_Gen.cxx \
 	HOMARD_DriverTools.cxx \
+	HOMARD_YACS.cxx \
 	HomardDriver.cxx \
 	YACSDriver.cxx
 
@@ -54,10 +56,3 @@ libHOMARDImpl_la_LDFLAGS = \
 	$(KERNEL_LDFLAGS) \
 	-lSALOMELocalTrace
 
-# check_PROGRAMS = testhomard
-# 
-# TESTS = $(check_PROGRAMS)
-# 
-# testhomard_SOURCES = testhomard.cxx
-# 
-# testhomard_LDADD = libHOMARDImpl.la
diff --git a/src/HOMARDGUI/CreateBoundaryAn.h b/src/HOMARDGUI/CreateBoundaryAn.h
index 2714fcb0..48778fdd 100644
--- a/src/HOMARDGUI/CreateBoundaryAn.h
+++ b/src/HOMARDGUI/CreateBoundaryAn.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CreateBoundaryAn.ui'
 **
-** Created: Thu Mar 21 17:06:19 2013
+** Created: Tue Sep 17 14:08:40 2013
 **      by: Qt User Interface Compiler version 4.6.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -31,7 +31,7 @@ class Ui_CreateBoundaryAn
 public:
     QGridLayout *gridLayout_4;
     QLabel *Name;
-    QLineEdit *LEBoundaryName;
+    QLineEdit *LEName;
     QGroupBox *TypeBoundary;
     QGridLayout *gridLayout;
     QRadioButton *RBCylindre;
@@ -106,11 +106,11 @@ public:
 
         gridLayout_4->addWidget(Name, 0, 0, 1, 1);
 
-        LEBoundaryName = new QLineEdit(CreateBoundaryAn);
-        LEBoundaryName->setObjectName(QString::fromUtf8("LEBoundaryName"));
-        LEBoundaryName->setMaxLength(32);
+        LEName = new QLineEdit(CreateBoundaryAn);
+        LEName->setObjectName(QString::fromUtf8("LEName"));
+        LEName->setMaxLength(32);
 
-        gridLayout_4->addWidget(LEBoundaryName, 0, 1, 1, 1);
+        gridLayout_4->addWidget(LEName, 0, 1, 1, 1);
 
         TypeBoundary = new QGroupBox(CreateBoundaryAn);
         TypeBoundary->setObjectName(QString::fromUtf8("TypeBoundary"));
diff --git a/src/HOMARDGUI/CreateBoundaryAn.ui b/src/HOMARDGUI/CreateBoundaryAn.ui
index b35422c3..30eecf63 100644
--- a/src/HOMARDGUI/CreateBoundaryAn.ui
+++ b/src/HOMARDGUI/CreateBoundaryAn.ui
@@ -28,7 +28,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QLineEdit" name="LEBoundaryName">
+    <widget class="QLineEdit" name="LEName">
      <property name="maxLength">
       <number>32</number>
      </property>
diff --git a/src/HOMARDGUI/CreateBoundaryDi.h b/src/HOMARDGUI/CreateBoundaryDi.h
index 7caf93da..95c054c4 100644
--- a/src/HOMARDGUI/CreateBoundaryDi.h
+++ b/src/HOMARDGUI/CreateBoundaryDi.h
@@ -1,10 +1,10 @@
 /********************************************************************************
-** Form generated from reading ui file 'CreateBoundaryDi.ui'
+** Form generated from reading UI file 'CreateBoundaryDi.ui'
 **
-** Created: Thu Sep 1 16:37:21 2011
-**      by: Qt User Interface Compiler version 4.2.1
+** Created: Tue Sep 17 14:08:59 2013
+**      by: Qt User Interface Compiler version 4.6.3
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
 #ifndef CREATEBOUNDARYDI_H
@@ -18,10 +18,13 @@
 #include <QtGui/QDialog>
 #include <QtGui/QGridLayout>
 #include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>
 #include <QtGui/QPushButton>
 
+QT_BEGIN_NAMESPACE
+
 class Ui_CreateBoundaryDi
 {
 public:
@@ -36,109 +39,113 @@ public:
     QLineEdit *LEFileName;
     QPushButton *PushFichier;
     QLabel *Mesh;
-    QLineEdit *LEBoundaryName;
+    QLineEdit *LEName;
     QLabel *Name;
 
     void setupUi(QDialog *CreateBoundaryDi)
     {
-    CreateBoundaryDi->setObjectName(QString::fromUtf8("CreateBoundaryDi"));
-    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy.setHorizontalStretch(0);
-    sizePolicy.setVerticalStretch(0);
-    sizePolicy.setHeightForWidth(CreateBoundaryDi->sizePolicy().hasHeightForWidth());
-    CreateBoundaryDi->setSizePolicy(sizePolicy);
-    CreateBoundaryDi->setAutoFillBackground(true);
-    CreateBoundaryDi->setSizeGripEnabled(true);
-    gridLayout = new QGridLayout(CreateBoundaryDi);
-    gridLayout->setSpacing(6);
-    gridLayout->setMargin(9);
-    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
-    GBButtons = new QGroupBox(CreateBoundaryDi);
-    GBButtons->setObjectName(QString::fromUtf8("GBButtons"));
-    gridLayout1 = new QGridLayout(GBButtons);
-    gridLayout1->setSpacing(6);
-    gridLayout1->setMargin(9);
-    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
-    buttonHelp = new QPushButton(GBButtons);
-    buttonHelp->setObjectName(QString::fromUtf8("buttonHelp"));
-
-    gridLayout1->addWidget(buttonHelp, 0, 3, 1, 1);
+        if (CreateBoundaryDi->objectName().isEmpty())
+            CreateBoundaryDi->setObjectName(QString::fromUtf8("CreateBoundaryDi"));
+        CreateBoundaryDi->resize(566, 169);
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(CreateBoundaryDi->sizePolicy().hasHeightForWidth());
+        CreateBoundaryDi->setSizePolicy(sizePolicy);
+        CreateBoundaryDi->setAutoFillBackground(true);
+        CreateBoundaryDi->setSizeGripEnabled(true);
+        gridLayout = new QGridLayout(CreateBoundaryDi);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        GBButtons = new QGroupBox(CreateBoundaryDi);
+        GBButtons->setObjectName(QString::fromUtf8("GBButtons"));
+        gridLayout1 = new QGridLayout(GBButtons);
+#ifndef Q_OS_MAC
+        gridLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout1->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        buttonHelp = new QPushButton(GBButtons);
+        buttonHelp->setObjectName(QString::fromUtf8("buttonHelp"));
 
-    buttonCancel = new QPushButton(GBButtons);
-    buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+        gridLayout1->addWidget(buttonHelp, 0, 3, 1, 1);
 
-    gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1);
+        buttonCancel = new QPushButton(GBButtons);
+        buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
 
-    buttonApply = new QPushButton(GBButtons);
-    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+        gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1);
 
-    gridLayout1->addWidget(buttonApply, 0, 1, 1, 1);
+        buttonApply = new QPushButton(GBButtons);
+        buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
 
-    buttonOk = new QPushButton(GBButtons);
-    buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
+        gridLayout1->addWidget(buttonApply, 0, 1, 1, 1);
 
-    gridLayout1->addWidget(buttonOk, 0, 0, 1, 1);
+        buttonOk = new QPushButton(GBButtons);
+        buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
 
+        gridLayout1->addWidget(buttonOk, 0, 0, 1, 1);
 
-    gridLayout->addWidget(GBButtons, 3, 0, 1, 3);
 
-    CBGroupe = new QCheckBox(CreateBoundaryDi);
-    CBGroupe->setObjectName(QString::fromUtf8("CBGroupe"));
+        gridLayout->addWidget(GBButtons, 3, 0, 1, 3);
 
-    gridLayout->addWidget(CBGroupe, 2, 0, 1, 3);
+        CBGroupe = new QCheckBox(CreateBoundaryDi);
+        CBGroupe->setObjectName(QString::fromUtf8("CBGroupe"));
 
-    LEFileName = new QLineEdit(CreateBoundaryDi);
-    LEFileName->setObjectName(QString::fromUtf8("LEFileName"));
-    LEFileName->setMinimumSize(QSize(370, 21));
+        gridLayout->addWidget(CBGroupe, 2, 0, 1, 3);
 
-    gridLayout->addWidget(LEFileName, 1, 2, 1, 1);
+        LEFileName = new QLineEdit(CreateBoundaryDi);
+        LEFileName->setObjectName(QString::fromUtf8("LEFileName"));
+        LEFileName->setMinimumSize(QSize(370, 21));
 
-    PushFichier = new QPushButton(CreateBoundaryDi);
-    PushFichier->setObjectName(QString::fromUtf8("PushFichier"));
+        gridLayout->addWidget(LEFileName, 1, 2, 1, 1);
 
-    gridLayout->addWidget(PushFichier, 1, 1, 1, 1);
+        PushFichier = new QPushButton(CreateBoundaryDi);
+        PushFichier->setObjectName(QString::fromUtf8("PushFichier"));
 
-    Mesh = new QLabel(CreateBoundaryDi);
-    Mesh->setObjectName(QString::fromUtf8("Mesh"));
+        gridLayout->addWidget(PushFichier, 1, 1, 1, 1);
 
-    gridLayout->addWidget(Mesh, 1, 0, 1, 1);
+        Mesh = new QLabel(CreateBoundaryDi);
+        Mesh->setObjectName(QString::fromUtf8("Mesh"));
 
-    LEBoundaryName = new QLineEdit(CreateBoundaryDi);
-    LEBoundaryName->setObjectName(QString::fromUtf8("LEBoundaryName"));
-    LEBoundaryName->setMinimumSize(QSize(382, 21));
-    LEBoundaryName->setMaxLength(32);
+        gridLayout->addWidget(Mesh, 1, 0, 1, 1);
 
-    gridLayout->addWidget(LEBoundaryName, 0, 1, 1, 2);
+        LEName = new QLineEdit(CreateBoundaryDi);
+        LEName->setObjectName(QString::fromUtf8("LEName"));
+        LEName->setMinimumSize(QSize(382, 21));
+        LEName->setMaxLength(32);
 
-    Name = new QLabel(CreateBoundaryDi);
-    Name->setObjectName(QString::fromUtf8("Name"));
+        gridLayout->addWidget(LEName, 0, 1, 1, 2);
 
-    gridLayout->addWidget(Name, 0, 0, 1, 1);
+        Name = new QLabel(CreateBoundaryDi);
+        Name->setObjectName(QString::fromUtf8("Name"));
 
+        gridLayout->addWidget(Name, 0, 0, 1, 1);
 
-    retranslateUi(CreateBoundaryDi);
 
-    QSize size(566, 169);
-    size = size.expandedTo(CreateBoundaryDi->minimumSizeHint());
-    CreateBoundaryDi->resize(size);
+        retranslateUi(CreateBoundaryDi);
 
-
-    QMetaObject::connectSlotsByName(CreateBoundaryDi);
+        QMetaObject::connectSlotsByName(CreateBoundaryDi);
     } // setupUi
 
     void retranslateUi(QDialog *CreateBoundaryDi)
     {
-    CreateBoundaryDi->setWindowTitle(QApplication::translate("CreateBoundaryDi", "Create a discrete boundary", 0, QApplication::UnicodeUTF8));
-    GBButtons->setTitle(QString());
-    buttonHelp->setText(QApplication::translate("CreateBoundaryDi", "Help", 0, QApplication::UnicodeUTF8));
-    buttonCancel->setText(QApplication::translate("CreateBoundaryDi", "Cancel", 0, QApplication::UnicodeUTF8));
-    buttonApply->setText(QApplication::translate("CreateBoundaryDi", "Apply", 0, QApplication::UnicodeUTF8));
-    buttonOk->setText(QApplication::translate("CreateBoundaryDi", "OK", 0, QApplication::UnicodeUTF8));
-    CBGroupe->setText(QApplication::translate("CreateBoundaryDi", "Filtering with groups", 0, QApplication::UnicodeUTF8));
-    PushFichier->setText(QString());
-    Mesh->setText(QApplication::translate("CreateBoundaryDi", "Mesh", 0, QApplication::UnicodeUTF8));
-    Name->setText(QApplication::translate("CreateBoundaryDi", "Name", 0, QApplication::UnicodeUTF8));
-    Q_UNUSED(CreateBoundaryDi);
+        CreateBoundaryDi->setWindowTitle(QApplication::translate("CreateBoundaryDi", "Create a discrete boundary", 0, QApplication::UnicodeUTF8));
+        GBButtons->setTitle(QString());
+        buttonHelp->setText(QApplication::translate("CreateBoundaryDi", "Help", 0, QApplication::UnicodeUTF8));
+        buttonCancel->setText(QApplication::translate("CreateBoundaryDi", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonApply->setText(QApplication::translate("CreateBoundaryDi", "Apply", 0, QApplication::UnicodeUTF8));
+        buttonOk->setText(QApplication::translate("CreateBoundaryDi", "OK", 0, QApplication::UnicodeUTF8));
+        CBGroupe->setText(QApplication::translate("CreateBoundaryDi", "Filtering with groups", 0, QApplication::UnicodeUTF8));
+        PushFichier->setText(QString());
+        Mesh->setText(QApplication::translate("CreateBoundaryDi", "Mesh", 0, QApplication::UnicodeUTF8));
+        Name->setText(QApplication::translate("CreateBoundaryDi", "Name", 0, QApplication::UnicodeUTF8));
     } // retranslateUi
 
 };
@@ -147,4 +154,6 @@ namespace Ui {
     class CreateBoundaryDi: public Ui_CreateBoundaryDi {};
 } // namespace Ui
 
+QT_END_NAMESPACE
+
 #endif // CREATEBOUNDARYDI_H
diff --git a/src/HOMARDGUI/CreateBoundaryDi.ui b/src/HOMARDGUI/CreateBoundaryDi.ui
index 3cc0ec09..b505ff86 100644
--- a/src/HOMARDGUI/CreateBoundaryDi.ui
+++ b/src/HOMARDGUI/CreateBoundaryDi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>CreateBoundaryDi</class>
- <widget class="QDialog" name="CreateBoundaryDi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="CreateBoundaryDi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,66 +10,64 @@
     <height>169</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Create a discrete boundary</string>
   </property>
-  <property name="autoFillBackground" >
+  <property name="autoFillBackground">
    <bool>true</bool>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="3" column="0" colspan="3" >
-    <widget class="QGroupBox" name="GBButtons" >
-     <property name="title" >
+   <item row="3" column="0" colspan="3">
+    <widget class="QGroupBox" name="GBButtons">
+     <property name="title">
       <string/>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="3" >
-       <widget class="QPushButton" name="buttonHelp" >
-        <property name="text" >
+      <item row="0" column="3">
+       <widget class="QPushButton" name="buttonHelp">
+        <property name="text">
          <string>Help</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QPushButton" name="buttonCancel" >
-        <property name="text" >
+      <item row="0" column="2">
+       <widget class="QPushButton" name="buttonCancel">
+        <property name="text">
          <string>Cancel</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="buttonApply" >
-        <property name="text" >
+      <item row="0" column="1">
+       <widget class="QPushButton" name="buttonApply">
+        <property name="text">
          <string>Apply</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QPushButton" name="buttonOk" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QPushButton" name="buttonOk">
+        <property name="text">
          <string>OK</string>
         </property>
        </widget>
@@ -76,16 +75,16 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3" >
-    <widget class="QCheckBox" name="CBGroupe" >
-     <property name="text" >
+   <item row="2" column="0" colspan="3">
+    <widget class="QCheckBox" name="CBGroupe">
+     <property name="text">
       <string>Filtering with groups</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="2" >
-    <widget class="QLineEdit" name="LEFileName" >
-     <property name="minimumSize" >
+   <item row="1" column="2">
+    <widget class="QLineEdit" name="LEFileName">
+     <property name="minimumSize">
       <size>
        <width>370</width>
        <height>21</height>
@@ -93,36 +92,36 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="PushFichier" >
-     <property name="text" >
+   <item row="1" column="1">
+    <widget class="QPushButton" name="PushFichier">
+     <property name="text">
       <string/>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="Mesh" >
-     <property name="text" >
+   <item row="1" column="0">
+    <widget class="QLabel" name="Mesh">
+     <property name="text">
       <string>Mesh</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2" >
-    <widget class="QLineEdit" name="LEBoundaryName" >
-     <property name="minimumSize" >
+   <item row="0" column="1" colspan="2">
+    <widget class="QLineEdit" name="LEName">
+     <property name="minimumSize">
       <size>
        <width>382</width>
        <height>21</height>
       </size>
      </property>
-     <property name="maxLength" >
+     <property name="maxLength">
       <number>32</number>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="Name" >
-     <property name="text" >
+   <item row="0" column="0">
+    <widget class="QLabel" name="Name">
+     <property name="text">
       <string>Name</string>
      </property>
     </widget>
diff --git a/src/HOMARDGUI/CreateCase.h b/src/HOMARDGUI/CreateCase.h
index 94fc0a2b..c5c6c4c0 100644
--- a/src/HOMARDGUI/CreateCase.h
+++ b/src/HOMARDGUI/CreateCase.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CreateCase.ui'
 **
-** Created: Wed Apr 3 11:25:34 2013
+** Created: Tue Sep 17 14:09:06 2013
 **      by: Qt User Interface Compiler version 4.6.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -37,7 +37,7 @@ public:
     QGridLayout *gridLayout_2;
     QHBoxLayout *hboxLayout;
     QLabel *Name;
-    QLineEdit *LECaseName;
+    QLineEdit *LEName;
     QHBoxLayout *hboxLayout1;
     QLabel *Directory;
     QPushButton *PushDir;
@@ -120,11 +120,11 @@ public:
 
         hboxLayout->addWidget(Name);
 
-        LECaseName = new QLineEdit(CreateCase);
-        LECaseName->setObjectName(QString::fromUtf8("LECaseName"));
-        LECaseName->setMinimumSize(QSize(382, 21));
+        LEName = new QLineEdit(CreateCase);
+        LEName->setObjectName(QString::fromUtf8("LEName"));
+        LEName->setMinimumSize(QSize(382, 21));
 
-        hboxLayout->addWidget(LECaseName);
+        hboxLayout->addWidget(LEName);
 
 
         gridLayout_2->addLayout(hboxLayout, 0, 0, 1, 3);
diff --git a/src/HOMARDGUI/CreateCase.ui b/src/HOMARDGUI/CreateCase.ui
index 3a9568b8..2c140a72 100644
--- a/src/HOMARDGUI/CreateCase.ui
+++ b/src/HOMARDGUI/CreateCase.ui
@@ -39,7 +39,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="LECaseName">
+      <widget class="QLineEdit" name="LEName">
        <property name="minimumSize">
         <size>
          <width>382</width>
diff --git a/src/HOMARDGUI/CreateHypothesis.h b/src/HOMARDGUI/CreateHypothesis.h
index ef9c6164..e46f4442 100644
--- a/src/HOMARDGUI/CreateHypothesis.h
+++ b/src/HOMARDGUI/CreateHypothesis.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CreateHypothesis.ui'
 **
-** Created: Thu Feb 28 13:29:51 2013
+** Created: Tue Sep 17 14:10:20 2013
 **      by: Qt User Interface Compiler version 4.6.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -37,7 +37,7 @@ class Ui_CreateHypothesis
 {
 public:
     QGridLayout *gridLayout_3;
-    QLineEdit *LEHypothesisName;
+    QLineEdit *LEName;
     QGroupBox *GBTypeAdaptation;
     QHBoxLayout *hboxLayout;
     QRadioButton *RBUniforme;
@@ -141,12 +141,12 @@ public:
         CreateHypothesis->setSizeGripEnabled(true);
         gridLayout_3 = new QGridLayout(CreateHypothesis);
         gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
-        LEHypothesisName = new QLineEdit(CreateHypothesis);
-        LEHypothesisName->setObjectName(QString::fromUtf8("LEHypothesisName"));
-        LEHypothesisName->setMinimumSize(QSize(382, 31));
-        LEHypothesisName->setMaxLength(32);
+        LEName = new QLineEdit(CreateHypothesis);
+        LEName->setObjectName(QString::fromUtf8("LEName"));
+        LEName->setMinimumSize(QSize(382, 31));
+        LEName->setMaxLength(32);
 
-        gridLayout_3->addWidget(LEHypothesisName, 0, 1, 1, 1);
+        gridLayout_3->addWidget(LEName, 0, 1, 1, 1);
 
         GBTypeAdaptation = new QGroupBox(CreateHypothesis);
         GBTypeAdaptation->setObjectName(QString::fromUtf8("GBTypeAdaptation"));
@@ -738,7 +738,7 @@ public:
 
         gridLayout_3->addWidget(Name, 0, 0, 1, 1);
 
-        LEHypothesisName->raise();
+        LEName->raise();
         GBTypeAdaptation->raise();
         GBUniform->raise();
         GBFieldFile->raise();
diff --git a/src/HOMARDGUI/CreateHypothesis.ui b/src/HOMARDGUI/CreateHypothesis.ui
index e7ac9dae..db00adef 100644
--- a/src/HOMARDGUI/CreateHypothesis.ui
+++ b/src/HOMARDGUI/CreateHypothesis.ui
@@ -27,7 +27,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="1">
-    <widget class="QLineEdit" name="LEHypothesisName">
+    <widget class="QLineEdit" name="LEName">
      <property name="minimumSize">
       <size>
        <width>382</width>
@@ -942,7 +942,7 @@
     </widget>
    </item>
   </layout>
-  <zorder>LEHypothesisName</zorder>
+  <zorder>LEName</zorder>
   <zorder>GBTypeAdaptation</zorder>
   <zorder>GBUniform</zorder>
   <zorder>GBFieldFile</zorder>
diff --git a/src/HOMARDGUI/CreateIteration.h b/src/HOMARDGUI/CreateIteration.h
index ec6ef614..6674ed94 100644
--- a/src/HOMARDGUI/CreateIteration.h
+++ b/src/HOMARDGUI/CreateIteration.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CreateIteration.ui'
 **
-** Created: Wed Nov 14 11:09:41 2012
+** Created: Tue Sep 17 14:09:30 2013
 **      by: Qt User Interface Compiler version 4.6.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -49,7 +49,7 @@ public:
     QPushButton *PushFieldFile;
     QLabel *FieldFile;
     QLabel *Iteration_Name;
-    QLineEdit *LEIterationName;
+    QLineEdit *LEName;
     QLabel *Iter_Parent;
     QSpacerItem *spacerItem4;
     QPushButton *PBIterParent;
@@ -182,12 +182,12 @@ public:
 
         gridLayout->addWidget(Iteration_Name, 0, 0, 1, 2);
 
-        LEIterationName = new QLineEdit(CreateIteration);
-        LEIterationName->setObjectName(QString::fromUtf8("LEIterationName"));
-        LEIterationName->setMinimumSize(QSize(290, 21));
-        LEIterationName->setMaxLength(200);
+        LEName = new QLineEdit(CreateIteration);
+        LEName->setObjectName(QString::fromUtf8("LEName"));
+        LEName->setMinimumSize(QSize(290, 21));
+        LEName->setMaxLength(200);
 
-        gridLayout->addWidget(LEIterationName, 0, 2, 1, 2);
+        gridLayout->addWidget(LEName, 0, 2, 1, 2);
 
         Iter_Parent = new QLabel(CreateIteration);
         Iter_Parent->setObjectName(QString::fromUtf8("Iter_Parent"));
diff --git a/src/HOMARDGUI/CreateIteration.ui b/src/HOMARDGUI/CreateIteration.ui
index 95205de9..d355e1d3 100644
--- a/src/HOMARDGUI/CreateIteration.ui
+++ b/src/HOMARDGUI/CreateIteration.ui
@@ -192,7 +192,7 @@
     </widget>
    </item>
    <item row="0" column="2" colspan="2">
-    <widget class="QLineEdit" name="LEIterationName">
+    <widget class="QLineEdit" name="LEName">
      <property name="minimumSize">
       <size>
        <width>290</width>
diff --git a/src/HOMARDGUI/CreateYACS.h b/src/HOMARDGUI/CreateYACS.h
index 0b9f45e9..67f17a21 100644
--- a/src/HOMARDGUI/CreateYACS.h
+++ b/src/HOMARDGUI/CreateYACS.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CreateYACS.ui'
 **
-** Created: Wed Sep 11 16:01:30 2013
+** Created: Tue Sep 17 15:43:52 2013
 **      by: Qt User Interface Compiler version 4.6.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -31,6 +31,8 @@ class Ui_CreateYACS
 {
 public:
     QGridLayout *gridLayout_2;
+    QLabel *Name;
+    QLineEdit *LEName;
     QGridLayout *gridLayout;
     QLabel *Case;
     QPushButton *PBCaseName;
@@ -38,7 +40,7 @@ public:
     QHBoxLayout *_2;
     QLabel *Script;
     QPushButton *PushFile;
-    QLineEdit *LEFileNameScript;
+    QLineEdit *LEScriptFile;
     QHBoxLayout *hboxLayout;
     QLabel *DirectoryStart;
     QPushButton *PushDir;
@@ -46,7 +48,7 @@ public:
     QHBoxLayout *_3;
     QLabel *MeshFile;
     QPushButton *PushFile_2;
-    QLineEdit *LEFileNameMesh;
+    QLineEdit *LEMeshFile;
     QRadioButton *RBStatic;
     QRadioButton *RBTransient;
     QGroupBox *GroupButtons;
@@ -61,7 +63,7 @@ public:
     {
         if (CreateYACS->objectName().isEmpty())
             CreateYACS->setObjectName(QString::fromUtf8("CreateYACS"));
-        CreateYACS->resize(601, 300);
+        CreateYACS->resize(537, 304);
         QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -70,6 +72,17 @@ public:
         CreateYACS->setAutoFillBackground(true);
         gridLayout_2 = new QGridLayout(CreateYACS);
         gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+        Name = new QLabel(CreateYACS);
+        Name->setObjectName(QString::fromUtf8("Name"));
+
+        gridLayout_2->addWidget(Name, 0, 0, 1, 1);
+
+        LEName = new QLineEdit(CreateYACS);
+        LEName->setObjectName(QString::fromUtf8("LEName"));
+        LEName->setMaxLength(32);
+
+        gridLayout_2->addWidget(LEName, 0, 1, 1, 3);
+
         gridLayout = new QGridLayout();
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         Case = new QLabel(CreateYACS);
@@ -91,7 +104,7 @@ public:
         gridLayout->addWidget(LECaseName, 0, 2, 1, 1);
 
 
-        gridLayout_2->addLayout(gridLayout, 0, 0, 1, 3);
+        gridLayout_2->addLayout(gridLayout, 1, 0, 1, 4);
 
         _2 = new QHBoxLayout();
 #ifndef Q_OS_MAC
@@ -110,14 +123,14 @@ public:
 
         _2->addWidget(PushFile);
 
-        LEFileNameScript = new QLineEdit(CreateYACS);
-        LEFileNameScript->setObjectName(QString::fromUtf8("LEFileNameScript"));
-        LEFileNameScript->setMinimumSize(QSize(382, 21));
+        LEScriptFile = new QLineEdit(CreateYACS);
+        LEScriptFile->setObjectName(QString::fromUtf8("LEScriptFile"));
+        LEScriptFile->setMinimumSize(QSize(382, 21));
 
-        _2->addWidget(LEFileNameScript);
+        _2->addWidget(LEScriptFile);
 
 
-        gridLayout_2->addLayout(_2, 1, 0, 1, 3);
+        gridLayout_2->addLayout(_2, 2, 0, 1, 4);
 
         hboxLayout = new QHBoxLayout();
 #ifndef Q_OS_MAC
@@ -143,7 +156,7 @@ public:
         hboxLayout->addWidget(LEDirName);
 
 
-        gridLayout_2->addLayout(hboxLayout, 2, 0, 1, 3);
+        gridLayout_2->addLayout(hboxLayout, 3, 0, 1, 4);
 
         _3 = new QHBoxLayout();
 #ifndef Q_OS_MAC
@@ -162,25 +175,25 @@ public:
 
         _3->addWidget(PushFile_2);
 
-        LEFileNameMesh = new QLineEdit(CreateYACS);
-        LEFileNameMesh->setObjectName(QString::fromUtf8("LEFileNameMesh"));
-        LEFileNameMesh->setMinimumSize(QSize(382, 21));
+        LEMeshFile = new QLineEdit(CreateYACS);
+        LEMeshFile->setObjectName(QString::fromUtf8("LEMeshFile"));
+        LEMeshFile->setMinimumSize(QSize(382, 21));
 
-        _3->addWidget(LEFileNameMesh);
+        _3->addWidget(LEMeshFile);
 
 
-        gridLayout_2->addLayout(_3, 3, 0, 1, 3);
+        gridLayout_2->addLayout(_3, 4, 0, 1, 4);
 
         RBStatic = new QRadioButton(CreateYACS);
         RBStatic->setObjectName(QString::fromUtf8("RBStatic"));
         RBStatic->setChecked(true);
 
-        gridLayout_2->addWidget(RBStatic, 4, 0, 1, 1);
+        gridLayout_2->addWidget(RBStatic, 5, 0, 1, 2);
 
         RBTransient = new QRadioButton(CreateYACS);
         RBTransient->setObjectName(QString::fromUtf8("RBTransient"));
 
-        gridLayout_2->addWidget(RBTransient, 4, 1, 1, 1);
+        gridLayout_2->addWidget(RBTransient, 5, 2, 1, 1);
 
         GroupButtons = new QGroupBox(CreateYACS);
         GroupButtons->setObjectName(QString::fromUtf8("GroupButtons"));
@@ -217,11 +230,11 @@ public:
         gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1);
 
 
-        gridLayout_2->addWidget(GroupButtons, 5, 0, 1, 2);
+        gridLayout_2->addWidget(GroupButtons, 6, 0, 1, 3);
 
         spacer_2 = new QSpacerItem(128, 25, QSizePolicy::Fixed, QSizePolicy::Minimum);
 
-        gridLayout_2->addItem(spacer_2, 5, 2, 1, 1);
+        gridLayout_2->addItem(spacer_2, 6, 3, 1, 1);
 
 
         retranslateUi(CreateYACS);
@@ -232,6 +245,7 @@ public:
     void retranslateUi(QDialog *CreateYACS)
     {
         CreateYACS->setWindowTitle(QApplication::translate("CreateYACS", "Create YACS", 0, QApplication::UnicodeUTF8));
+        Name->setText(QApplication::translate("CreateYACS", "Name", 0, QApplication::UnicodeUTF8));
         Case->setText(QApplication::translate("CreateYACS", "Case", 0, QApplication::UnicodeUTF8));
         PBCaseName->setText(QString());
         Script->setText(QApplication::translate("CreateYACS", "Script", 0, QApplication::UnicodeUTF8));
diff --git a/src/HOMARDGUI/CreateYACS.ui b/src/HOMARDGUI/CreateYACS.ui
index 8e55a8a1..53a1f363 100644
--- a/src/HOMARDGUI/CreateYACS.ui
+++ b/src/HOMARDGUI/CreateYACS.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>601</width>
-    <height>300</height>
+    <width>537</width>
+    <height>304</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,7 +23,21 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0" colspan="3">
+   <item row="0" column="0">
+    <widget class="QLabel" name="Name">
+     <property name="text">
+      <string>Name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="3">
+    <widget class="QLineEdit" name="LEName">
+     <property name="maxLength">
+      <number>32</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="4">
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="Case">
@@ -60,7 +74,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="3">
+   <item row="2" column="0" colspan="4">
     <layout class="QHBoxLayout" name="_2">
      <property name="spacing">
       <number>6</number>
@@ -86,7 +100,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="LEFileNameScript">
+      <widget class="QLineEdit" name="LEScriptFile">
        <property name="minimumSize">
         <size>
          <width>382</width>
@@ -97,7 +111,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="3">
+   <item row="3" column="0" colspan="4">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
@@ -134,7 +148,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="3">
+   <item row="4" column="0" colspan="4">
     <layout class="QHBoxLayout" name="_3">
      <property name="spacing">
       <number>6</number>
@@ -160,7 +174,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="LEFileNameMesh">
+      <widget class="QLineEdit" name="LEMeshFile">
        <property name="minimumSize">
         <size>
          <width>382</width>
@@ -171,7 +185,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0" colspan="2">
     <widget class="QRadioButton" name="RBStatic">
      <property name="text">
       <string>Static</string>
@@ -181,14 +195,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="5" column="2">
     <widget class="QRadioButton" name="RBTransient">
      <property name="text">
       <string>Transient</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="6" column="0" colspan="3">
     <widget class="QGroupBox" name="GroupButtons">
      <property name="title">
       <string/>
@@ -243,7 +257,7 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="2">
+   <item row="6" column="3">
     <spacer name="spacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
diff --git a/src/HOMARDGUI/CreateZone.h b/src/HOMARDGUI/CreateZone.h
index 70b1d125..77893ea9 100644
--- a/src/HOMARDGUI/CreateZone.h
+++ b/src/HOMARDGUI/CreateZone.h
@@ -1,10 +1,10 @@
 /********************************************************************************
-** Form generated from reading ui file 'CreateZone.ui'
+** Form generated from reading UI file 'CreateZone.ui'
 **
-** Created: Thu Sep 1 13:03:50 2011
-**      by: Qt User Interface Compiler version 4.2.1
+** Created: Tue Sep 17 14:09:38 2013
+**      by: Qt User Interface Compiler version 4.6.3
 **
-** WARNING! All changes made in this file will be lost when recompiling ui file!
+** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
 #ifndef CREATEZONE_H
@@ -18,11 +18,14 @@
 #include <QtGui/QDoubleSpinBox>
 #include <QtGui/QGridLayout>
 #include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>
 #include <QtGui/QPushButton>
 #include <QtGui/QRadioButton>
 
+QT_BEGIN_NAMESPACE
+
 class Ui_CreateZone
 {
 public:
@@ -81,7 +84,7 @@ public:
     QLabel *TLYmaxi;
     QDoubleSpinBox *SpinBox_Xmaxi;
     QDoubleSpinBox *SpinBox_Ymaxi;
-    QLineEdit *LEZoneName;
+    QLineEdit *LEName;
     QLabel *Name;
     QGroupBox *gBPipe;
     QGridLayout *gridLayout6;
@@ -106,743 +109,675 @@ public:
 
     void setupUi(QDialog *CreateZone)
     {
-    CreateZone->setObjectName(QString::fromUtf8("CreateZone"));
-    CreateZone->setAutoFillBackground(true);
-    CreateZone->setSizeGripEnabled(true);
-    gridLayout = new QGridLayout(CreateZone);
-    gridLayout->setSpacing(6);
-    gridLayout->setMargin(9);
-    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
-    GBButtons = new QGroupBox(CreateZone);
-    GBButtons->setObjectName(QString::fromUtf8("GBButtons"));
-    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy.setHorizontalStretch(0);
-    sizePolicy.setVerticalStretch(0);
-    sizePolicy.setHeightForWidth(GBButtons->sizePolicy().hasHeightForWidth());
-    GBButtons->setSizePolicy(sizePolicy);
-    gridLayout1 = new QGridLayout(GBButtons);
-    gridLayout1->setSpacing(6);
-    gridLayout1->setMargin(9);
-    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
-    buttonHelp = new QPushButton(GBButtons);
-    buttonHelp->setObjectName(QString::fromUtf8("buttonHelp"));
-
-    gridLayout1->addWidget(buttonHelp, 0, 3, 1, 1);
-
-    buttonCancel = new QPushButton(GBButtons);
-    buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
-
-    gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1);
-
-    buttonApply = new QPushButton(GBButtons);
-    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
-
-    gridLayout1->addWidget(buttonApply, 0, 1, 1, 1);
-
-    buttonOk = new QPushButton(GBButtons);
-    buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
-
-    gridLayout1->addWidget(buttonOk, 0, 0, 1, 1);
-
-
-    gridLayout->addWidget(GBButtons, 6, 0, 1, 2);
-
-    TypeZone = new QGroupBox(CreateZone);
-    TypeZone->setObjectName(QString::fromUtf8("TypeZone"));
-    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy1.setHorizontalStretch(0);
-    sizePolicy1.setVerticalStretch(0);
-    sizePolicy1.setHeightForWidth(TypeZone->sizePolicy().hasHeightForWidth());
-    TypeZone->setSizePolicy(sizePolicy1);
-    TypeZone->setMinimumSize(QSize(340, 0));
-    gridLayout2 = new QGridLayout(TypeZone);
-    gridLayout2->setSpacing(6);
-    gridLayout2->setMargin(9);
-    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
-    RBSphere = new QRadioButton(TypeZone);
-    RBSphere->setObjectName(QString::fromUtf8("RBSphere"));
-    RBSphere->setIcon(QIcon(QString::fromUtf8("../../resources/zone_spherepoint.png")));
-
-    gridLayout2->addWidget(RBSphere, 0, 3, 1, 1);
-
-    RBPipe = new QRadioButton(TypeZone);
-    RBPipe->setObjectName(QString::fromUtf8("RBPipe"));
-    RBPipe->setIcon(QIcon(QString::fromUtf8("../../resources/pipe.png")));
-
-    gridLayout2->addWidget(RBPipe, 0, 2, 1, 1);
-
-    RBCylinder = new QRadioButton(TypeZone);
-    RBCylinder->setObjectName(QString::fromUtf8("RBCylinder"));
-    RBCylinder->setIcon(QIcon(QString::fromUtf8("../../resources/cylinderpointvector.png")));
-
-    gridLayout2->addWidget(RBCylinder, 0, 1, 1, 1);
-
-    RBBox = new QRadioButton(TypeZone);
-    RBBox->setObjectName(QString::fromUtf8("RBBox"));
-    RBBox->setIcon(QIcon(QString::fromUtf8("../../resources/zone_boxdxyz.png")));
-    RBBox->setCheckable(true);
-    RBBox->setChecked(true);
-
-    gridLayout2->addWidget(RBBox, 0, 0, 1, 1);
-
-
-    gridLayout->addWidget(TypeZone, 1, 0, 1, 2);
-
-    gBCylindre = new QGroupBox(CreateZone);
-    gBCylindre->setObjectName(QString::fromUtf8("gBCylindre"));
-    QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy2.setHorizontalStretch(0);
-    sizePolicy2.setVerticalStretch(0);
-    sizePolicy2.setHeightForWidth(gBCylindre->sizePolicy().hasHeightForWidth());
-    gBCylindre->setSizePolicy(sizePolicy2);
-    gBCylindre->setFocusPolicy(Qt::TabFocus);
-    gridLayout3 = new QGridLayout(gBCylindre);
-    gridLayout3->setSpacing(6);
-    gridLayout3->setMargin(9);
-    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
-    SpinBox_Haut = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Haut->setObjectName(QString::fromUtf8("SpinBox_Haut"));
-    SpinBox_Haut->setDecimals(5);
-    SpinBox_Haut->setMaximum(1e+09);
-
-    gridLayout3->addWidget(SpinBox_Haut, 4, 1, 1, 1);
-
-    TLHaut = new QLabel(gBCylindre);
-    TLHaut->setObjectName(QString::fromUtf8("TLHaut"));
-    QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy3.setHorizontalStretch(0);
-    sizePolicy3.setVerticalStretch(0);
-    sizePolicy3.setHeightForWidth(TLHaut->sizePolicy().hasHeightForWidth());
-    TLHaut->setSizePolicy(sizePolicy3);
-    TLHaut->setWordWrap(false);
-
-    gridLayout3->addWidget(TLHaut, 4, 0, 1, 1);
-
-    TLRadius = new QLabel(gBCylindre);
-    TLRadius->setObjectName(QString::fromUtf8("TLRadius"));
-    QSizePolicy sizePolicy4(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy4.setHorizontalStretch(0);
-    sizePolicy4.setVerticalStretch(0);
-    sizePolicy4.setHeightForWidth(TLRadius->sizePolicy().hasHeightForWidth());
-    TLRadius->setSizePolicy(sizePolicy4);
-    TLRadius->setWordWrap(false);
-
-    gridLayout3->addWidget(TLRadius, 3, 0, 1, 1);
-
-    SpinBox_Xaxis = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Xaxis->setObjectName(QString::fromUtf8("SpinBox_Xaxis"));
-    SpinBox_Xaxis->setDecimals(5);
-    SpinBox_Xaxis->setMaximum(1e+09);
-    SpinBox_Xaxis->setMinimum(-1e+09);
-    SpinBox_Xaxis->setValue(0);
-
-    gridLayout3->addWidget(SpinBox_Xaxis, 0, 3, 1, 1);
-
-    SpinBox_Yaxis = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Yaxis->setObjectName(QString::fromUtf8("SpinBox_Yaxis"));
-    SpinBox_Yaxis->setDecimals(5);
-    SpinBox_Yaxis->setMaximum(1e+09);
-    SpinBox_Yaxis->setMinimum(-1e+09);
-    SpinBox_Yaxis->setValue(0);
-
-    gridLayout3->addWidget(SpinBox_Yaxis, 1, 3, 1, 1);
-
-    SpinBox_Zaxis = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Zaxis->setObjectName(QString::fromUtf8("SpinBox_Zaxis"));
-    SpinBox_Zaxis->setDecimals(5);
-    SpinBox_Zaxis->setMaximum(1e+09);
-    SpinBox_Zaxis->setMinimum(-1e+09);
-    SpinBox_Zaxis->setValue(0);
-
-    gridLayout3->addWidget(SpinBox_Zaxis, 2, 3, 1, 1);
-
-    TLZaxis = new QLabel(gBCylindre);
-    TLZaxis->setObjectName(QString::fromUtf8("TLZaxis"));
-    QSizePolicy sizePolicy5(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy5.setHorizontalStretch(0);
-    sizePolicy5.setVerticalStretch(0);
-    sizePolicy5.setHeightForWidth(TLZaxis->sizePolicy().hasHeightForWidth());
-    TLZaxis->setSizePolicy(sizePolicy5);
-    TLZaxis->setWordWrap(false);
-
-    gridLayout3->addWidget(TLZaxis, 2, 2, 1, 1);
-
-    TLYaxis = new QLabel(gBCylindre);
-    TLYaxis->setObjectName(QString::fromUtf8("TLYaxis"));
-    QSizePolicy sizePolicy6(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy6.setHorizontalStretch(0);
-    sizePolicy6.setVerticalStretch(0);
-    sizePolicy6.setHeightForWidth(TLYaxis->sizePolicy().hasHeightForWidth());
-    TLYaxis->setSizePolicy(sizePolicy6);
-    TLYaxis->setWordWrap(false);
-
-    gridLayout3->addWidget(TLYaxis, 1, 2, 1, 1);
-
-    TLXaxis = new QLabel(gBCylindre);
-    TLXaxis->setObjectName(QString::fromUtf8("TLXaxis"));
-    QSizePolicy sizePolicy7(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy7.setHorizontalStretch(0);
-    sizePolicy7.setVerticalStretch(0);
-    sizePolicy7.setHeightForWidth(TLXaxis->sizePolicy().hasHeightForWidth());
-    TLXaxis->setSizePolicy(sizePolicy7);
-    TLXaxis->setWordWrap(false);
-
-    gridLayout3->addWidget(TLXaxis, 0, 2, 1, 1);
-
-    SpinBox_Ybase = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Ybase->setObjectName(QString::fromUtf8("SpinBox_Ybase"));
-    SpinBox_Ybase->setDecimals(5);
-    SpinBox_Ybase->setMaximum(1e+09);
-    SpinBox_Ybase->setMinimum(-1e+09);
-    SpinBox_Ybase->setValue(0);
-
-    gridLayout3->addWidget(SpinBox_Ybase, 1, 1, 1, 1);
-
-    TLYbase = new QLabel(gBCylindre);
-    TLYbase->setObjectName(QString::fromUtf8("TLYbase"));
-    QSizePolicy sizePolicy8(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy8.setHorizontalStretch(0);
-    sizePolicy8.setVerticalStretch(0);
-    sizePolicy8.setHeightForWidth(TLYbase->sizePolicy().hasHeightForWidth());
-    TLYbase->setSizePolicy(sizePolicy8);
-    TLYbase->setWordWrap(false);
-
-    gridLayout3->addWidget(TLYbase, 1, 0, 1, 1);
-
-    TLZbase = new QLabel(gBCylindre);
-    TLZbase->setObjectName(QString::fromUtf8("TLZbase"));
-    QSizePolicy sizePolicy9(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy9.setHorizontalStretch(0);
-    sizePolicy9.setVerticalStretch(0);
-    sizePolicy9.setHeightForWidth(TLZbase->sizePolicy().hasHeightForWidth());
-    TLZbase->setSizePolicy(sizePolicy9);
-    TLZbase->setWordWrap(false);
-
-    gridLayout3->addWidget(TLZbase, 2, 0, 1, 1);
-
-    SpinBox_Zbase = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Zbase->setObjectName(QString::fromUtf8("SpinBox_Zbase"));
-    SpinBox_Zbase->setDecimals(5);
-    SpinBox_Zbase->setMaximum(1e+09);
-    SpinBox_Zbase->setMinimum(-1e+09);
-    SpinBox_Zbase->setValue(0);
-
-    gridLayout3->addWidget(SpinBox_Zbase, 2, 1, 1, 1);
-
-    SpinBox_Radius = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Radius->setObjectName(QString::fromUtf8("SpinBox_Radius"));
-    SpinBox_Radius->setDecimals(5);
-    SpinBox_Radius->setMaximum(1e+09);
-
-    gridLayout3->addWidget(SpinBox_Radius, 3, 1, 1, 1);
-
-    TLXbase = new QLabel(gBCylindre);
-    TLXbase->setObjectName(QString::fromUtf8("TLXbase"));
-    QSizePolicy sizePolicy10(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy10.setHorizontalStretch(0);
-    sizePolicy10.setVerticalStretch(0);
-    sizePolicy10.setHeightForWidth(TLXbase->sizePolicy().hasHeightForWidth());
-    TLXbase->setSizePolicy(sizePolicy10);
-    TLXbase->setWordWrap(false);
-
-    gridLayout3->addWidget(TLXbase, 0, 0, 1, 1);
-
-    SpinBox_Xbase = new QDoubleSpinBox(gBCylindre);
-    SpinBox_Xbase->setObjectName(QString::fromUtf8("SpinBox_Xbase"));
-    SpinBox_Xbase->setDecimals(5);
-    SpinBox_Xbase->setMaximum(1e+09);
-    SpinBox_Xbase->setMinimum(-1e+09);
-    SpinBox_Xbase->setValue(0);
-
-    gridLayout3->addWidget(SpinBox_Xbase, 0, 1, 1, 1);
-
-
-    gridLayout->addWidget(gBCylindre, 4, 0, 1, 2);
-
-    gBSphere = new QGroupBox(CreateZone);
-    gBSphere->setObjectName(QString::fromUtf8("gBSphere"));
-    QSizePolicy sizePolicy11(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy11.setHorizontalStretch(0);
-    sizePolicy11.setVerticalStretch(0);
-    sizePolicy11.setHeightForWidth(gBSphere->sizePolicy().hasHeightForWidth());
-    gBSphere->setSizePolicy(sizePolicy11);
-    gridLayout4 = new QGridLayout(gBSphere);
-    gridLayout4->setSpacing(6);
-    gridLayout4->setMargin(9);
-    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
-    TLXcentre = new QLabel(gBSphere);
-    TLXcentre->setObjectName(QString::fromUtf8("TLXcentre"));
-    QSizePolicy sizePolicy12(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy12.setHorizontalStretch(0);
-    sizePolicy12.setVerticalStretch(0);
-    sizePolicy12.setHeightForWidth(TLXcentre->sizePolicy().hasHeightForWidth());
-    TLXcentre->setSizePolicy(sizePolicy12);
-    TLXcentre->setWordWrap(false);
-
-    gridLayout4->addWidget(TLXcentre, 0, 0, 1, 1);
-
-    SpinBox_Xcentre = new QDoubleSpinBox(gBSphere);
-    SpinBox_Xcentre->setObjectName(QString::fromUtf8("SpinBox_Xcentre"));
-    SpinBox_Xcentre->setDecimals(5);
-    SpinBox_Xcentre->setMaximum(1e+09);
-    SpinBox_Xcentre->setMinimum(-1e+09);
-    SpinBox_Xcentre->setValue(0);
-
-    gridLayout4->addWidget(SpinBox_Xcentre, 0, 1, 1, 1);
-
-    TLYcentre = new QLabel(gBSphere);
-    TLYcentre->setObjectName(QString::fromUtf8("TLYcentre"));
-    QSizePolicy sizePolicy13(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy13.setHorizontalStretch(0);
-    sizePolicy13.setVerticalStretch(0);
-    sizePolicy13.setHeightForWidth(TLYcentre->sizePolicy().hasHeightForWidth());
-    TLYcentre->setSizePolicy(sizePolicy13);
-    TLYcentre->setWordWrap(false);
-
-    gridLayout4->addWidget(TLYcentre, 1, 0, 1, 1);
-
-    SpinBox_Ycentre = new QDoubleSpinBox(gBSphere);
-    SpinBox_Ycentre->setObjectName(QString::fromUtf8("SpinBox_Ycentre"));
-    SpinBox_Ycentre->setDecimals(5);
-    SpinBox_Ycentre->setMaximum(1e+09);
-    SpinBox_Ycentre->setMinimum(-1e+09);
-    SpinBox_Ycentre->setValue(0);
-
-    gridLayout4->addWidget(SpinBox_Ycentre, 1, 1, 1, 1);
-
-    TLRayon = new QLabel(gBSphere);
-    TLRayon->setObjectName(QString::fromUtf8("TLRayon"));
-    QSizePolicy sizePolicy14(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy14.setHorizontalStretch(0);
-    sizePolicy14.setVerticalStretch(0);
-    sizePolicy14.setHeightForWidth(TLRayon->sizePolicy().hasHeightForWidth());
-    TLRayon->setSizePolicy(sizePolicy14);
-    TLRayon->setWordWrap(false);
-
-    gridLayout4->addWidget(TLRayon, 1, 2, 1, 1);
-
-    SpinBox_Rayon = new QDoubleSpinBox(gBSphere);
-    SpinBox_Rayon->setObjectName(QString::fromUtf8("SpinBox_Rayon"));
-    SpinBox_Rayon->setDecimals(5);
-    SpinBox_Rayon->setMaximum(1e+09);
-    SpinBox_Rayon->setMinimum(-1e+09);
-    SpinBox_Rayon->setValue(0);
-
-    gridLayout4->addWidget(SpinBox_Rayon, 1, 3, 1, 1);
-
-    TLZcentre = new QLabel(gBSphere);
-    TLZcentre->setObjectName(QString::fromUtf8("TLZcentre"));
-    QSizePolicy sizePolicy15(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy15.setHorizontalStretch(0);
-    sizePolicy15.setVerticalStretch(0);
-    sizePolicy15.setHeightForWidth(TLZcentre->sizePolicy().hasHeightForWidth());
-    TLZcentre->setSizePolicy(sizePolicy15);
-    TLZcentre->setWordWrap(false);
-
-    gridLayout4->addWidget(TLZcentre, 2, 0, 1, 1);
-
-    SpinBox_Zcentre = new QDoubleSpinBox(gBSphere);
-    SpinBox_Zcentre->setObjectName(QString::fromUtf8("SpinBox_Zcentre"));
-    SpinBox_Zcentre->setDecimals(5);
-    SpinBox_Zcentre->setMaximum(1e+09);
-    SpinBox_Zcentre->setMinimum(-1e+09);
-    SpinBox_Zcentre->setValue(0);
-
-    gridLayout4->addWidget(SpinBox_Zcentre, 2, 1, 1, 1);
-
-
-    gridLayout->addWidget(gBSphere, 3, 0, 1, 2);
-
-    gBBox = new QGroupBox(CreateZone);
-    gBBox->setObjectName(QString::fromUtf8("gBBox"));
-    QSizePolicy sizePolicy16(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy16.setHorizontalStretch(0);
-    sizePolicy16.setVerticalStretch(0);
-    sizePolicy16.setHeightForWidth(gBBox->sizePolicy().hasHeightForWidth());
-    gBBox->setSizePolicy(sizePolicy16);
-    gridLayout5 = new QGridLayout(gBBox);
-    gridLayout5->setSpacing(6);
-    gridLayout5->setMargin(9);
-    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
-    TLXmini = new QLabel(gBBox);
-    TLXmini->setObjectName(QString::fromUtf8("TLXmini"));
-    QSizePolicy sizePolicy17(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy17.setHorizontalStretch(0);
-    sizePolicy17.setVerticalStretch(0);
-    sizePolicy17.setHeightForWidth(TLXmini->sizePolicy().hasHeightForWidth());
-    TLXmini->setSizePolicy(sizePolicy17);
-    TLXmini->setWordWrap(false);
-
-    gridLayout5->addWidget(TLXmini, 0, 0, 1, 1);
-
-    SpinBox_Xmini = new QDoubleSpinBox(gBBox);
-    SpinBox_Xmini->setObjectName(QString::fromUtf8("SpinBox_Xmini"));
-    SpinBox_Xmini->setDecimals(5);
-    SpinBox_Xmini->setMaximum(1e+09);
-    SpinBox_Xmini->setMinimum(-1e+09);
-    SpinBox_Xmini->setValue(0);
-
-    gridLayout5->addWidget(SpinBox_Xmini, 0, 1, 1, 1);
-
-    TLYmini = new QLabel(gBBox);
-    TLYmini->setObjectName(QString::fromUtf8("TLYmini"));
-    QSizePolicy sizePolicy18(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy18.setHorizontalStretch(0);
-    sizePolicy18.setVerticalStretch(0);
-    sizePolicy18.setHeightForWidth(TLYmini->sizePolicy().hasHeightForWidth());
-    TLYmini->setSizePolicy(sizePolicy18);
-    TLYmini->setWordWrap(false);
-
-    gridLayout5->addWidget(TLYmini, 1, 0, 1, 1);
-
-    SpinBox_Ymini = new QDoubleSpinBox(gBBox);
-    SpinBox_Ymini->setObjectName(QString::fromUtf8("SpinBox_Ymini"));
-    SpinBox_Ymini->setDecimals(5);
-    SpinBox_Ymini->setMaximum(1e+09);
-    SpinBox_Ymini->setMinimum(-1e+09);
-    SpinBox_Ymini->setValue(0);
-
-    gridLayout5->addWidget(SpinBox_Ymini, 1, 1, 1, 1);
-
-    TLZmini = new QLabel(gBBox);
-    TLZmini->setObjectName(QString::fromUtf8("TLZmini"));
-    QSizePolicy sizePolicy19(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy19.setHorizontalStretch(0);
-    sizePolicy19.setVerticalStretch(0);
-    sizePolicy19.setHeightForWidth(TLZmini->sizePolicy().hasHeightForWidth());
-    TLZmini->setSizePolicy(sizePolicy19);
-    TLZmini->setWordWrap(false);
-
-    gridLayout5->addWidget(TLZmini, 2, 0, 1, 1);
-
-    SpinBox_Zmini = new QDoubleSpinBox(gBBox);
-    SpinBox_Zmini->setObjectName(QString::fromUtf8("SpinBox_Zmini"));
-    SpinBox_Zmini->setDecimals(5);
-    SpinBox_Zmini->setMaximum(1e+09);
-    SpinBox_Zmini->setMinimum(-1e+09);
-    SpinBox_Zmini->setValue(0);
-
-    gridLayout5->addWidget(SpinBox_Zmini, 2, 1, 1, 1);
-
-    TLXmaxi = new QLabel(gBBox);
-    TLXmaxi->setObjectName(QString::fromUtf8("TLXmaxi"));
-    QSizePolicy sizePolicy20(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy20.setHorizontalStretch(0);
-    sizePolicy20.setVerticalStretch(0);
-    sizePolicy20.setHeightForWidth(TLXmaxi->sizePolicy().hasHeightForWidth());
-    TLXmaxi->setSizePolicy(sizePolicy20);
-    TLXmaxi->setWordWrap(false);
-
-    gridLayout5->addWidget(TLXmaxi, 0, 2, 1, 1);
-
-    TLZmaxi = new QLabel(gBBox);
-    TLZmaxi->setObjectName(QString::fromUtf8("TLZmaxi"));
-    QSizePolicy sizePolicy21(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy21.setHorizontalStretch(0);
-    sizePolicy21.setVerticalStretch(0);
-    sizePolicy21.setHeightForWidth(TLZmaxi->sizePolicy().hasHeightForWidth());
-    TLZmaxi->setSizePolicy(sizePolicy21);
-    TLZmaxi->setWordWrap(false);
-
-    gridLayout5->addWidget(TLZmaxi, 2, 2, 1, 1);
-
-    SpinBox_Zmaxi = new QDoubleSpinBox(gBBox);
-    SpinBox_Zmaxi->setObjectName(QString::fromUtf8("SpinBox_Zmaxi"));
-    SpinBox_Zmaxi->setDecimals(5);
-    SpinBox_Zmaxi->setMaximum(1e+09);
-    SpinBox_Zmaxi->setMinimum(-1e+09);
-    SpinBox_Zmaxi->setValue(0);
-
-    gridLayout5->addWidget(SpinBox_Zmaxi, 2, 3, 1, 1);
-
-    TLYmaxi = new QLabel(gBBox);
-    TLYmaxi->setObjectName(QString::fromUtf8("TLYmaxi"));
-    QSizePolicy sizePolicy22(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy22.setHorizontalStretch(0);
-    sizePolicy22.setVerticalStretch(0);
-    sizePolicy22.setHeightForWidth(TLYmaxi->sizePolicy().hasHeightForWidth());
-    TLYmaxi->setSizePolicy(sizePolicy22);
-    TLYmaxi->setWordWrap(false);
-
-    gridLayout5->addWidget(TLYmaxi, 1, 2, 1, 1);
-
-    SpinBox_Xmaxi = new QDoubleSpinBox(gBBox);
-    SpinBox_Xmaxi->setObjectName(QString::fromUtf8("SpinBox_Xmaxi"));
-    SpinBox_Xmaxi->setDecimals(5);
-    SpinBox_Xmaxi->setMaximum(1e+09);
-    SpinBox_Xmaxi->setMinimum(-1e+09);
-    SpinBox_Xmaxi->setValue(0);
-
-    gridLayout5->addWidget(SpinBox_Xmaxi, 0, 3, 1, 1);
-
-    SpinBox_Ymaxi = new QDoubleSpinBox(gBBox);
-    SpinBox_Ymaxi->setObjectName(QString::fromUtf8("SpinBox_Ymaxi"));
-    SpinBox_Ymaxi->setDecimals(5);
-    SpinBox_Ymaxi->setMaximum(1e+09);
-    SpinBox_Ymaxi->setMinimum(-1e+09);
-    SpinBox_Ymaxi->setValue(0);
-
-    gridLayout5->addWidget(SpinBox_Ymaxi, 1, 3, 1, 1);
-
-
-    gridLayout->addWidget(gBBox, 2, 0, 1, 2);
-
-    LEZoneName = new QLineEdit(CreateZone);
-    LEZoneName->setObjectName(QString::fromUtf8("LEZoneName"));
-    LEZoneName->setMaxLength(32);
-
-    gridLayout->addWidget(LEZoneName, 0, 1, 1, 1);
-
-    Name = new QLabel(CreateZone);
-    Name->setObjectName(QString::fromUtf8("Name"));
-
-    gridLayout->addWidget(Name, 0, 0, 1, 1);
-
-    gBPipe = new QGroupBox(CreateZone);
-    gBPipe->setObjectName(QString::fromUtf8("gBPipe"));
-    QSizePolicy sizePolicy23(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy23.setHorizontalStretch(0);
-    sizePolicy23.setVerticalStretch(0);
-    sizePolicy23.setHeightForWidth(gBPipe->sizePolicy().hasHeightForWidth());
-    gBPipe->setSizePolicy(sizePolicy23);
-    gridLayout6 = new QGridLayout(gBPipe);
-    gridLayout6->setSpacing(6);
-    gridLayout6->setMargin(9);
-    gridLayout6->setObjectName(QString::fromUtf8("gridLayout6"));
-    TLHaut_p = new QLabel(gBPipe);
-    TLHaut_p->setObjectName(QString::fromUtf8("TLHaut_p"));
-    QSizePolicy sizePolicy24(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy24.setHorizontalStretch(0);
-    sizePolicy24.setVerticalStretch(0);
-    sizePolicy24.setHeightForWidth(TLHaut_p->sizePolicy().hasHeightForWidth());
-    TLHaut_p->setSizePolicy(sizePolicy24);
-    TLHaut_p->setWordWrap(false);
-
-    gridLayout6->addWidget(TLHaut_p, 4, 0, 1, 1);
-
-    SpinBox_Xbase_p = new QDoubleSpinBox(gBPipe);
-    SpinBox_Xbase_p->setObjectName(QString::fromUtf8("SpinBox_Xbase_p"));
-    SpinBox_Xbase_p->setDecimals(5);
-    SpinBox_Xbase_p->setMaximum(1e+09);
-    SpinBox_Xbase_p->setMinimum(-1e+09);
-    SpinBox_Xbase_p->setValue(0);
-
-    gridLayout6->addWidget(SpinBox_Xbase_p, 0, 1, 1, 1);
-
-    TLXbase_p = new QLabel(gBPipe);
-    TLXbase_p->setObjectName(QString::fromUtf8("TLXbase_p"));
-    QSizePolicy sizePolicy25(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy25.setHorizontalStretch(0);
-    sizePolicy25.setVerticalStretch(0);
-    sizePolicy25.setHeightForWidth(TLXbase_p->sizePolicy().hasHeightForWidth());
-    TLXbase_p->setSizePolicy(sizePolicy25);
-    TLXbase_p->setWordWrap(false);
-
-    gridLayout6->addWidget(TLXbase_p, 0, 0, 1, 1);
-
-    SpinBox_Radius_int = new QDoubleSpinBox(gBPipe);
-    SpinBox_Radius_int->setObjectName(QString::fromUtf8("SpinBox_Radius_int"));
-    SpinBox_Radius_int->setDecimals(5);
-    SpinBox_Radius_int->setMaximum(1e+09);
-
-    gridLayout6->addWidget(SpinBox_Radius_int, 3, 1, 1, 1);
-
-    SpinBox_Zbase_p = new QDoubleSpinBox(gBPipe);
-    SpinBox_Zbase_p->setObjectName(QString::fromUtf8("SpinBox_Zbase_p"));
-    SpinBox_Zbase_p->setDecimals(5);
-    SpinBox_Zbase_p->setMaximum(1e+09);
-    SpinBox_Zbase_p->setMinimum(-1e+09);
-    SpinBox_Zbase_p->setValue(0);
-
-    gridLayout6->addWidget(SpinBox_Zbase_p, 2, 1, 1, 1);
-
-    TLRadius_int = new QLabel(gBPipe);
-    TLRadius_int->setObjectName(QString::fromUtf8("TLRadius_int"));
-    QSizePolicy sizePolicy26(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy26.setHorizontalStretch(0);
-    sizePolicy26.setVerticalStretch(0);
-    sizePolicy26.setHeightForWidth(TLRadius_int->sizePolicy().hasHeightForWidth());
-    TLRadius_int->setSizePolicy(sizePolicy26);
-    TLRadius_int->setWordWrap(false);
-
-    gridLayout6->addWidget(TLRadius_int, 3, 0, 1, 1);
-
-    TLZbase_p = new QLabel(gBPipe);
-    TLZbase_p->setObjectName(QString::fromUtf8("TLZbase_p"));
-    QSizePolicy sizePolicy27(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy27.setHorizontalStretch(0);
-    sizePolicy27.setVerticalStretch(0);
-    sizePolicy27.setHeightForWidth(TLZbase_p->sizePolicy().hasHeightForWidth());
-    TLZbase_p->setSizePolicy(sizePolicy27);
-    TLZbase_p->setWordWrap(false);
-
-    gridLayout6->addWidget(TLZbase_p, 2, 0, 1, 1);
-
-    TLYbase_p = new QLabel(gBPipe);
-    TLYbase_p->setObjectName(QString::fromUtf8("TLYbase_p"));
-    QSizePolicy sizePolicy28(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy28.setHorizontalStretch(0);
-    sizePolicy28.setVerticalStretch(0);
-    sizePolicy28.setHeightForWidth(TLYbase_p->sizePolicy().hasHeightForWidth());
-    TLYbase_p->setSizePolicy(sizePolicy28);
-    TLYbase_p->setWordWrap(false);
-
-    gridLayout6->addWidget(TLYbase_p, 1, 0, 1, 1);
-
-    SpinBox_Ybase_p = new QDoubleSpinBox(gBPipe);
-    SpinBox_Ybase_p->setObjectName(QString::fromUtf8("SpinBox_Ybase_p"));
-    SpinBox_Ybase_p->setDecimals(5);
-    SpinBox_Ybase_p->setMaximum(1e+09);
-    SpinBox_Ybase_p->setMinimum(-1e+09);
-    SpinBox_Ybase_p->setValue(0);
-
-    gridLayout6->addWidget(SpinBox_Ybase_p, 1, 1, 1, 1);
-
-    TLXaxis_p = new QLabel(gBPipe);
-    TLXaxis_p->setObjectName(QString::fromUtf8("TLXaxis_p"));
-    QSizePolicy sizePolicy29(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy29.setHorizontalStretch(0);
-    sizePolicy29.setVerticalStretch(0);
-    sizePolicy29.setHeightForWidth(TLXaxis_p->sizePolicy().hasHeightForWidth());
-    TLXaxis_p->setSizePolicy(sizePolicy29);
-    TLXaxis_p->setWordWrap(false);
-
-    gridLayout6->addWidget(TLXaxis_p, 0, 2, 1, 1);
-
-    TLYaxis_p = new QLabel(gBPipe);
-    TLYaxis_p->setObjectName(QString::fromUtf8("TLYaxis_p"));
-    QSizePolicy sizePolicy30(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy30.setHorizontalStretch(0);
-    sizePolicy30.setVerticalStretch(0);
-    sizePolicy30.setHeightForWidth(TLYaxis_p->sizePolicy().hasHeightForWidth());
-    TLYaxis_p->setSizePolicy(sizePolicy30);
-    TLYaxis_p->setWordWrap(false);
-
-    gridLayout6->addWidget(TLYaxis_p, 1, 2, 1, 1);
-
-    TLZaxis_p = new QLabel(gBPipe);
-    TLZaxis_p->setObjectName(QString::fromUtf8("TLZaxis_p"));
-    QSizePolicy sizePolicy31(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy31.setHorizontalStretch(0);
-    sizePolicy31.setVerticalStretch(0);
-    sizePolicy31.setHeightForWidth(TLZaxis_p->sizePolicy().hasHeightForWidth());
-    TLZaxis_p->setSizePolicy(sizePolicy31);
-    TLZaxis_p->setWordWrap(false);
-
-    gridLayout6->addWidget(TLZaxis_p, 2, 2, 1, 1);
-
-    SpinBox_Zaxis_p = new QDoubleSpinBox(gBPipe);
-    SpinBox_Zaxis_p->setObjectName(QString::fromUtf8("SpinBox_Zaxis_p"));
-    SpinBox_Zaxis_p->setDecimals(5);
-    SpinBox_Zaxis_p->setMaximum(1e+09);
-    SpinBox_Zaxis_p->setMinimum(-1e+09);
-    SpinBox_Zaxis_p->setValue(0);
-
-    gridLayout6->addWidget(SpinBox_Zaxis_p, 2, 3, 1, 1);
-
-    SpinBox_Yaxis_p = new QDoubleSpinBox(gBPipe);
-    SpinBox_Yaxis_p->setObjectName(QString::fromUtf8("SpinBox_Yaxis_p"));
-    SpinBox_Yaxis_p->setDecimals(5);
-    SpinBox_Yaxis_p->setMaximum(1e+09);
-    SpinBox_Yaxis_p->setMinimum(-1e+09);
-    SpinBox_Yaxis_p->setValue(0);
-
-    gridLayout6->addWidget(SpinBox_Yaxis_p, 1, 3, 1, 1);
-
-    SpinBox_Xaxis_p = new QDoubleSpinBox(gBPipe);
-    SpinBox_Xaxis_p->setObjectName(QString::fromUtf8("SpinBox_Xaxis_p"));
-    SpinBox_Xaxis_p->setDecimals(5);
-    SpinBox_Xaxis_p->setMaximum(1e+09);
-    SpinBox_Xaxis_p->setMinimum(-1e+09);
-    SpinBox_Xaxis_p->setValue(0);
-
-    gridLayout6->addWidget(SpinBox_Xaxis_p, 0, 3, 1, 1);
-
-    SpinBox_Radius_ext = new QDoubleSpinBox(gBPipe);
-    SpinBox_Radius_ext->setObjectName(QString::fromUtf8("SpinBox_Radius_ext"));
-    SpinBox_Radius_ext->setDecimals(5);
-    SpinBox_Radius_ext->setMaximum(1e+09);
-
-    gridLayout6->addWidget(SpinBox_Radius_ext, 3, 3, 1, 1);
+        if (CreateZone->objectName().isEmpty())
+            CreateZone->setObjectName(QString::fromUtf8("CreateZone"));
+        CreateZone->resize(551, 880);
+        CreateZone->setAutoFillBackground(true);
+        CreateZone->setSizeGripEnabled(true);
+        gridLayout = new QGridLayout(CreateZone);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        GBButtons = new QGroupBox(CreateZone);
+        GBButtons->setObjectName(QString::fromUtf8("GBButtons"));
+        QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(GBButtons->sizePolicy().hasHeightForWidth());
+        GBButtons->setSizePolicy(sizePolicy);
+        gridLayout1 = new QGridLayout(GBButtons);
+#ifndef Q_OS_MAC
+        gridLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout1->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        buttonHelp = new QPushButton(GBButtons);
+        buttonHelp->setObjectName(QString::fromUtf8("buttonHelp"));
+
+        gridLayout1->addWidget(buttonHelp, 0, 3, 1, 1);
+
+        buttonCancel = new QPushButton(GBButtons);
+        buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+
+        gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1);
+
+        buttonApply = new QPushButton(GBButtons);
+        buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+
+        gridLayout1->addWidget(buttonApply, 0, 1, 1, 1);
+
+        buttonOk = new QPushButton(GBButtons);
+        buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
+
+        gridLayout1->addWidget(buttonOk, 0, 0, 1, 1);
+
+
+        gridLayout->addWidget(GBButtons, 6, 0, 1, 2);
+
+        TypeZone = new QGroupBox(CreateZone);
+        TypeZone->setObjectName(QString::fromUtf8("TypeZone"));
+        sizePolicy.setHeightForWidth(TypeZone->sizePolicy().hasHeightForWidth());
+        TypeZone->setSizePolicy(sizePolicy);
+        TypeZone->setMinimumSize(QSize(340, 0));
+        gridLayout2 = new QGridLayout(TypeZone);
+#ifndef Q_OS_MAC
+        gridLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout2->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+        RBSphere = new QRadioButton(TypeZone);
+        RBSphere->setObjectName(QString::fromUtf8("RBSphere"));
+        const QIcon icon = QIcon(QString::fromUtf8("../../resources/zone_spherepoint.png"));
+        RBSphere->setIcon(icon);
+
+        gridLayout2->addWidget(RBSphere, 0, 3, 1, 1);
+
+        RBPipe = new QRadioButton(TypeZone);
+        RBPipe->setObjectName(QString::fromUtf8("RBPipe"));
+        const QIcon icon1 = QIcon(QString::fromUtf8("../../resources/pipe.png"));
+        RBPipe->setIcon(icon1);
+
+        gridLayout2->addWidget(RBPipe, 0, 2, 1, 1);
+
+        RBCylinder = new QRadioButton(TypeZone);
+        RBCylinder->setObjectName(QString::fromUtf8("RBCylinder"));
+        const QIcon icon2 = QIcon(QString::fromUtf8("../../resources/cylinderpointvector.png"));
+        RBCylinder->setIcon(icon2);
+
+        gridLayout2->addWidget(RBCylinder, 0, 1, 1, 1);
+
+        RBBox = new QRadioButton(TypeZone);
+        RBBox->setObjectName(QString::fromUtf8("RBBox"));
+        const QIcon icon3 = QIcon(QString::fromUtf8("../../resources/zone_boxdxyz.png"));
+        RBBox->setIcon(icon3);
+        RBBox->setCheckable(true);
+        RBBox->setChecked(true);
+
+        gridLayout2->addWidget(RBBox, 0, 0, 1, 1);
+
+
+        gridLayout->addWidget(TypeZone, 1, 0, 1, 2);
+
+        gBCylindre = new QGroupBox(CreateZone);
+        gBCylindre->setObjectName(QString::fromUtf8("gBCylindre"));
+        sizePolicy.setHeightForWidth(gBCylindre->sizePolicy().hasHeightForWidth());
+        gBCylindre->setSizePolicy(sizePolicy);
+        gBCylindre->setFocusPolicy(Qt::TabFocus);
+        gridLayout3 = new QGridLayout(gBCylindre);
+#ifndef Q_OS_MAC
+        gridLayout3->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout3->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+        SpinBox_Haut = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Haut->setObjectName(QString::fromUtf8("SpinBox_Haut"));
+        SpinBox_Haut->setDecimals(5);
+        SpinBox_Haut->setMaximum(1e+09);
+
+        gridLayout3->addWidget(SpinBox_Haut, 4, 1, 1, 1);
+
+        TLHaut = new QLabel(gBCylindre);
+        TLHaut->setObjectName(QString::fromUtf8("TLHaut"));
+        sizePolicy.setHeightForWidth(TLHaut->sizePolicy().hasHeightForWidth());
+        TLHaut->setSizePolicy(sizePolicy);
+        TLHaut->setWordWrap(false);
+
+        gridLayout3->addWidget(TLHaut, 4, 0, 1, 1);
+
+        TLRadius = new QLabel(gBCylindre);
+        TLRadius->setObjectName(QString::fromUtf8("TLRadius"));
+        sizePolicy.setHeightForWidth(TLRadius->sizePolicy().hasHeightForWidth());
+        TLRadius->setSizePolicy(sizePolicy);
+        TLRadius->setWordWrap(false);
+
+        gridLayout3->addWidget(TLRadius, 3, 0, 1, 1);
+
+        SpinBox_Xaxis = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Xaxis->setObjectName(QString::fromUtf8("SpinBox_Xaxis"));
+        SpinBox_Xaxis->setDecimals(5);
+        SpinBox_Xaxis->setMaximum(1e+09);
+        SpinBox_Xaxis->setMinimum(-1e+09);
+        SpinBox_Xaxis->setValue(0);
+
+        gridLayout3->addWidget(SpinBox_Xaxis, 0, 3, 1, 1);
+
+        SpinBox_Yaxis = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Yaxis->setObjectName(QString::fromUtf8("SpinBox_Yaxis"));
+        SpinBox_Yaxis->setDecimals(5);
+        SpinBox_Yaxis->setMaximum(1e+09);
+        SpinBox_Yaxis->setMinimum(-1e+09);
+        SpinBox_Yaxis->setValue(0);
+
+        gridLayout3->addWidget(SpinBox_Yaxis, 1, 3, 1, 1);
+
+        SpinBox_Zaxis = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Zaxis->setObjectName(QString::fromUtf8("SpinBox_Zaxis"));
+        SpinBox_Zaxis->setDecimals(5);
+        SpinBox_Zaxis->setMaximum(1e+09);
+        SpinBox_Zaxis->setMinimum(-1e+09);
+        SpinBox_Zaxis->setValue(0);
+
+        gridLayout3->addWidget(SpinBox_Zaxis, 2, 3, 1, 1);
+
+        TLZaxis = new QLabel(gBCylindre);
+        TLZaxis->setObjectName(QString::fromUtf8("TLZaxis"));
+        sizePolicy.setHeightForWidth(TLZaxis->sizePolicy().hasHeightForWidth());
+        TLZaxis->setSizePolicy(sizePolicy);
+        TLZaxis->setWordWrap(false);
+
+        gridLayout3->addWidget(TLZaxis, 2, 2, 1, 1);
+
+        TLYaxis = new QLabel(gBCylindre);
+        TLYaxis->setObjectName(QString::fromUtf8("TLYaxis"));
+        sizePolicy.setHeightForWidth(TLYaxis->sizePolicy().hasHeightForWidth());
+        TLYaxis->setSizePolicy(sizePolicy);
+        TLYaxis->setWordWrap(false);
+
+        gridLayout3->addWidget(TLYaxis, 1, 2, 1, 1);
+
+        TLXaxis = new QLabel(gBCylindre);
+        TLXaxis->setObjectName(QString::fromUtf8("TLXaxis"));
+        sizePolicy.setHeightForWidth(TLXaxis->sizePolicy().hasHeightForWidth());
+        TLXaxis->setSizePolicy(sizePolicy);
+        TLXaxis->setWordWrap(false);
+
+        gridLayout3->addWidget(TLXaxis, 0, 2, 1, 1);
+
+        SpinBox_Ybase = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Ybase->setObjectName(QString::fromUtf8("SpinBox_Ybase"));
+        SpinBox_Ybase->setDecimals(5);
+        SpinBox_Ybase->setMaximum(1e+09);
+        SpinBox_Ybase->setMinimum(-1e+09);
+        SpinBox_Ybase->setValue(0);
+
+        gridLayout3->addWidget(SpinBox_Ybase, 1, 1, 1, 1);
+
+        TLYbase = new QLabel(gBCylindre);
+        TLYbase->setObjectName(QString::fromUtf8("TLYbase"));
+        sizePolicy.setHeightForWidth(TLYbase->sizePolicy().hasHeightForWidth());
+        TLYbase->setSizePolicy(sizePolicy);
+        TLYbase->setWordWrap(false);
+
+        gridLayout3->addWidget(TLYbase, 1, 0, 1, 1);
+
+        TLZbase = new QLabel(gBCylindre);
+        TLZbase->setObjectName(QString::fromUtf8("TLZbase"));
+        sizePolicy.setHeightForWidth(TLZbase->sizePolicy().hasHeightForWidth());
+        TLZbase->setSizePolicy(sizePolicy);
+        TLZbase->setWordWrap(false);
+
+        gridLayout3->addWidget(TLZbase, 2, 0, 1, 1);
+
+        SpinBox_Zbase = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Zbase->setObjectName(QString::fromUtf8("SpinBox_Zbase"));
+        SpinBox_Zbase->setDecimals(5);
+        SpinBox_Zbase->setMaximum(1e+09);
+        SpinBox_Zbase->setMinimum(-1e+09);
+        SpinBox_Zbase->setValue(0);
+
+        gridLayout3->addWidget(SpinBox_Zbase, 2, 1, 1, 1);
+
+        SpinBox_Radius = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Radius->setObjectName(QString::fromUtf8("SpinBox_Radius"));
+        SpinBox_Radius->setDecimals(5);
+        SpinBox_Radius->setMaximum(1e+09);
+
+        gridLayout3->addWidget(SpinBox_Radius, 3, 1, 1, 1);
+
+        TLXbase = new QLabel(gBCylindre);
+        TLXbase->setObjectName(QString::fromUtf8("TLXbase"));
+        sizePolicy.setHeightForWidth(TLXbase->sizePolicy().hasHeightForWidth());
+        TLXbase->setSizePolicy(sizePolicy);
+        TLXbase->setWordWrap(false);
+
+        gridLayout3->addWidget(TLXbase, 0, 0, 1, 1);
+
+        SpinBox_Xbase = new QDoubleSpinBox(gBCylindre);
+        SpinBox_Xbase->setObjectName(QString::fromUtf8("SpinBox_Xbase"));
+        SpinBox_Xbase->setDecimals(5);
+        SpinBox_Xbase->setMaximum(1e+09);
+        SpinBox_Xbase->setMinimum(-1e+09);
+        SpinBox_Xbase->setValue(0);
+
+        gridLayout3->addWidget(SpinBox_Xbase, 0, 1, 1, 1);
+
+
+        gridLayout->addWidget(gBCylindre, 4, 0, 1, 2);
+
+        gBSphere = new QGroupBox(CreateZone);
+        gBSphere->setObjectName(QString::fromUtf8("gBSphere"));
+        sizePolicy.setHeightForWidth(gBSphere->sizePolicy().hasHeightForWidth());
+        gBSphere->setSizePolicy(sizePolicy);
+        gridLayout4 = new QGridLayout(gBSphere);
+#ifndef Q_OS_MAC
+        gridLayout4->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout4->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+        TLXcentre = new QLabel(gBSphere);
+        TLXcentre->setObjectName(QString::fromUtf8("TLXcentre"));
+        sizePolicy.setHeightForWidth(TLXcentre->sizePolicy().hasHeightForWidth());
+        TLXcentre->setSizePolicy(sizePolicy);
+        TLXcentre->setWordWrap(false);
+
+        gridLayout4->addWidget(TLXcentre, 0, 0, 1, 1);
+
+        SpinBox_Xcentre = new QDoubleSpinBox(gBSphere);
+        SpinBox_Xcentre->setObjectName(QString::fromUtf8("SpinBox_Xcentre"));
+        SpinBox_Xcentre->setDecimals(5);
+        SpinBox_Xcentre->setMaximum(1e+09);
+        SpinBox_Xcentre->setMinimum(-1e+09);
+        SpinBox_Xcentre->setValue(0);
+
+        gridLayout4->addWidget(SpinBox_Xcentre, 0, 1, 1, 1);
+
+        TLYcentre = new QLabel(gBSphere);
+        TLYcentre->setObjectName(QString::fromUtf8("TLYcentre"));
+        sizePolicy.setHeightForWidth(TLYcentre->sizePolicy().hasHeightForWidth());
+        TLYcentre->setSizePolicy(sizePolicy);
+        TLYcentre->setWordWrap(false);
+
+        gridLayout4->addWidget(TLYcentre, 1, 0, 1, 1);
+
+        SpinBox_Ycentre = new QDoubleSpinBox(gBSphere);
+        SpinBox_Ycentre->setObjectName(QString::fromUtf8("SpinBox_Ycentre"));
+        SpinBox_Ycentre->setDecimals(5);
+        SpinBox_Ycentre->setMaximum(1e+09);
+        SpinBox_Ycentre->setMinimum(-1e+09);
+        SpinBox_Ycentre->setValue(0);
+
+        gridLayout4->addWidget(SpinBox_Ycentre, 1, 1, 1, 1);
+
+        TLRayon = new QLabel(gBSphere);
+        TLRayon->setObjectName(QString::fromUtf8("TLRayon"));
+        sizePolicy.setHeightForWidth(TLRayon->sizePolicy().hasHeightForWidth());
+        TLRayon->setSizePolicy(sizePolicy);
+        TLRayon->setWordWrap(false);
+
+        gridLayout4->addWidget(TLRayon, 1, 2, 1, 1);
+
+        SpinBox_Rayon = new QDoubleSpinBox(gBSphere);
+        SpinBox_Rayon->setObjectName(QString::fromUtf8("SpinBox_Rayon"));
+        SpinBox_Rayon->setDecimals(5);
+        SpinBox_Rayon->setMaximum(1e+09);
+        SpinBox_Rayon->setMinimum(-1e+09);
+        SpinBox_Rayon->setValue(0);
+
+        gridLayout4->addWidget(SpinBox_Rayon, 1, 3, 1, 1);
+
+        TLZcentre = new QLabel(gBSphere);
+        TLZcentre->setObjectName(QString::fromUtf8("TLZcentre"));
+        sizePolicy.setHeightForWidth(TLZcentre->sizePolicy().hasHeightForWidth());
+        TLZcentre->setSizePolicy(sizePolicy);
+        TLZcentre->setWordWrap(false);
+
+        gridLayout4->addWidget(TLZcentre, 2, 0, 1, 1);
+
+        SpinBox_Zcentre = new QDoubleSpinBox(gBSphere);
+        SpinBox_Zcentre->setObjectName(QString::fromUtf8("SpinBox_Zcentre"));
+        SpinBox_Zcentre->setDecimals(5);
+        SpinBox_Zcentre->setMaximum(1e+09);
+        SpinBox_Zcentre->setMinimum(-1e+09);
+        SpinBox_Zcentre->setValue(0);
+
+        gridLayout4->addWidget(SpinBox_Zcentre, 2, 1, 1, 1);
+
+
+        gridLayout->addWidget(gBSphere, 3, 0, 1, 2);
+
+        gBBox = new QGroupBox(CreateZone);
+        gBBox->setObjectName(QString::fromUtf8("gBBox"));
+        sizePolicy.setHeightForWidth(gBBox->sizePolicy().hasHeightForWidth());
+        gBBox->setSizePolicy(sizePolicy);
+        gridLayout5 = new QGridLayout(gBBox);
+#ifndef Q_OS_MAC
+        gridLayout5->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout5->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+        TLXmini = new QLabel(gBBox);
+        TLXmini->setObjectName(QString::fromUtf8("TLXmini"));
+        sizePolicy.setHeightForWidth(TLXmini->sizePolicy().hasHeightForWidth());
+        TLXmini->setSizePolicy(sizePolicy);
+        TLXmini->setWordWrap(false);
+
+        gridLayout5->addWidget(TLXmini, 0, 0, 1, 1);
+
+        SpinBox_Xmini = new QDoubleSpinBox(gBBox);
+        SpinBox_Xmini->setObjectName(QString::fromUtf8("SpinBox_Xmini"));
+        SpinBox_Xmini->setDecimals(5);
+        SpinBox_Xmini->setMaximum(1e+09);
+        SpinBox_Xmini->setMinimum(-1e+09);
+        SpinBox_Xmini->setValue(0);
+
+        gridLayout5->addWidget(SpinBox_Xmini, 0, 1, 1, 1);
+
+        TLYmini = new QLabel(gBBox);
+        TLYmini->setObjectName(QString::fromUtf8("TLYmini"));
+        sizePolicy.setHeightForWidth(TLYmini->sizePolicy().hasHeightForWidth());
+        TLYmini->setSizePolicy(sizePolicy);
+        TLYmini->setWordWrap(false);
+
+        gridLayout5->addWidget(TLYmini, 1, 0, 1, 1);
+
+        SpinBox_Ymini = new QDoubleSpinBox(gBBox);
+        SpinBox_Ymini->setObjectName(QString::fromUtf8("SpinBox_Ymini"));
+        SpinBox_Ymini->setDecimals(5);
+        SpinBox_Ymini->setMaximum(1e+09);
+        SpinBox_Ymini->setMinimum(-1e+09);
+        SpinBox_Ymini->setValue(0);
+
+        gridLayout5->addWidget(SpinBox_Ymini, 1, 1, 1, 1);
+
+        TLZmini = new QLabel(gBBox);
+        TLZmini->setObjectName(QString::fromUtf8("TLZmini"));
+        sizePolicy.setHeightForWidth(TLZmini->sizePolicy().hasHeightForWidth());
+        TLZmini->setSizePolicy(sizePolicy);
+        TLZmini->setWordWrap(false);
+
+        gridLayout5->addWidget(TLZmini, 2, 0, 1, 1);
+
+        SpinBox_Zmini = new QDoubleSpinBox(gBBox);
+        SpinBox_Zmini->setObjectName(QString::fromUtf8("SpinBox_Zmini"));
+        SpinBox_Zmini->setDecimals(5);
+        SpinBox_Zmini->setMaximum(1e+09);
+        SpinBox_Zmini->setMinimum(-1e+09);
+        SpinBox_Zmini->setValue(0);
+
+        gridLayout5->addWidget(SpinBox_Zmini, 2, 1, 1, 1);
+
+        TLXmaxi = new QLabel(gBBox);
+        TLXmaxi->setObjectName(QString::fromUtf8("TLXmaxi"));
+        sizePolicy.setHeightForWidth(TLXmaxi->sizePolicy().hasHeightForWidth());
+        TLXmaxi->setSizePolicy(sizePolicy);
+        TLXmaxi->setWordWrap(false);
+
+        gridLayout5->addWidget(TLXmaxi, 0, 2, 1, 1);
+
+        TLZmaxi = new QLabel(gBBox);
+        TLZmaxi->setObjectName(QString::fromUtf8("TLZmaxi"));
+        sizePolicy.setHeightForWidth(TLZmaxi->sizePolicy().hasHeightForWidth());
+        TLZmaxi->setSizePolicy(sizePolicy);
+        TLZmaxi->setWordWrap(false);
+
+        gridLayout5->addWidget(TLZmaxi, 2, 2, 1, 1);
+
+        SpinBox_Zmaxi = new QDoubleSpinBox(gBBox);
+        SpinBox_Zmaxi->setObjectName(QString::fromUtf8("SpinBox_Zmaxi"));
+        SpinBox_Zmaxi->setDecimals(5);
+        SpinBox_Zmaxi->setMaximum(1e+09);
+        SpinBox_Zmaxi->setMinimum(-1e+09);
+        SpinBox_Zmaxi->setValue(0);
+
+        gridLayout5->addWidget(SpinBox_Zmaxi, 2, 3, 1, 1);
+
+        TLYmaxi = new QLabel(gBBox);
+        TLYmaxi->setObjectName(QString::fromUtf8("TLYmaxi"));
+        sizePolicy.setHeightForWidth(TLYmaxi->sizePolicy().hasHeightForWidth());
+        TLYmaxi->setSizePolicy(sizePolicy);
+        TLYmaxi->setWordWrap(false);
+
+        gridLayout5->addWidget(TLYmaxi, 1, 2, 1, 1);
+
+        SpinBox_Xmaxi = new QDoubleSpinBox(gBBox);
+        SpinBox_Xmaxi->setObjectName(QString::fromUtf8("SpinBox_Xmaxi"));
+        SpinBox_Xmaxi->setDecimals(5);
+        SpinBox_Xmaxi->setMaximum(1e+09);
+        SpinBox_Xmaxi->setMinimum(-1e+09);
+        SpinBox_Xmaxi->setValue(0);
+
+        gridLayout5->addWidget(SpinBox_Xmaxi, 0, 3, 1, 1);
+
+        SpinBox_Ymaxi = new QDoubleSpinBox(gBBox);
+        SpinBox_Ymaxi->setObjectName(QString::fromUtf8("SpinBox_Ymaxi"));
+        SpinBox_Ymaxi->setDecimals(5);
+        SpinBox_Ymaxi->setMaximum(1e+09);
+        SpinBox_Ymaxi->setMinimum(-1e+09);
+        SpinBox_Ymaxi->setValue(0);
+
+        gridLayout5->addWidget(SpinBox_Ymaxi, 1, 3, 1, 1);
+
+
+        gridLayout->addWidget(gBBox, 2, 0, 1, 2);
+
+        LEName = new QLineEdit(CreateZone);
+        LEName->setObjectName(QString::fromUtf8("LEName"));
+        LEName->setMaxLength(32);
+
+        gridLayout->addWidget(LEName, 0, 1, 1, 1);
+
+        Name = new QLabel(CreateZone);
+        Name->setObjectName(QString::fromUtf8("Name"));
+
+        gridLayout->addWidget(Name, 0, 0, 1, 1);
+
+        gBPipe = new QGroupBox(CreateZone);
+        gBPipe->setObjectName(QString::fromUtf8("gBPipe"));
+        sizePolicy.setHeightForWidth(gBPipe->sizePolicy().hasHeightForWidth());
+        gBPipe->setSizePolicy(sizePolicy);
+        gridLayout6 = new QGridLayout(gBPipe);
+#ifndef Q_OS_MAC
+        gridLayout6->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout6->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout6->setObjectName(QString::fromUtf8("gridLayout6"));
+        TLHaut_p = new QLabel(gBPipe);
+        TLHaut_p->setObjectName(QString::fromUtf8("TLHaut_p"));
+        sizePolicy.setHeightForWidth(TLHaut_p->sizePolicy().hasHeightForWidth());
+        TLHaut_p->setSizePolicy(sizePolicy);
+        TLHaut_p->setWordWrap(false);
+
+        gridLayout6->addWidget(TLHaut_p, 4, 0, 1, 1);
+
+        SpinBox_Xbase_p = new QDoubleSpinBox(gBPipe);
+        SpinBox_Xbase_p->setObjectName(QString::fromUtf8("SpinBox_Xbase_p"));
+        SpinBox_Xbase_p->setDecimals(5);
+        SpinBox_Xbase_p->setMaximum(1e+09);
+        SpinBox_Xbase_p->setMinimum(-1e+09);
+        SpinBox_Xbase_p->setValue(0);
+
+        gridLayout6->addWidget(SpinBox_Xbase_p, 0, 1, 1, 1);
+
+        TLXbase_p = new QLabel(gBPipe);
+        TLXbase_p->setObjectName(QString::fromUtf8("TLXbase_p"));
+        sizePolicy.setHeightForWidth(TLXbase_p->sizePolicy().hasHeightForWidth());
+        TLXbase_p->setSizePolicy(sizePolicy);
+        TLXbase_p->setWordWrap(false);
+
+        gridLayout6->addWidget(TLXbase_p, 0, 0, 1, 1);
+
+        SpinBox_Radius_int = new QDoubleSpinBox(gBPipe);
+        SpinBox_Radius_int->setObjectName(QString::fromUtf8("SpinBox_Radius_int"));
+        SpinBox_Radius_int->setDecimals(5);
+        SpinBox_Radius_int->setMaximum(1e+09);
+
+        gridLayout6->addWidget(SpinBox_Radius_int, 3, 1, 1, 1);
+
+        SpinBox_Zbase_p = new QDoubleSpinBox(gBPipe);
+        SpinBox_Zbase_p->setObjectName(QString::fromUtf8("SpinBox_Zbase_p"));
+        SpinBox_Zbase_p->setDecimals(5);
+        SpinBox_Zbase_p->setMaximum(1e+09);
+        SpinBox_Zbase_p->setMinimum(-1e+09);
+        SpinBox_Zbase_p->setValue(0);
+
+        gridLayout6->addWidget(SpinBox_Zbase_p, 2, 1, 1, 1);
+
+        TLRadius_int = new QLabel(gBPipe);
+        TLRadius_int->setObjectName(QString::fromUtf8("TLRadius_int"));
+        sizePolicy.setHeightForWidth(TLRadius_int->sizePolicy().hasHeightForWidth());
+        TLRadius_int->setSizePolicy(sizePolicy);
+        TLRadius_int->setWordWrap(false);
+
+        gridLayout6->addWidget(TLRadius_int, 3, 0, 1, 1);
+
+        TLZbase_p = new QLabel(gBPipe);
+        TLZbase_p->setObjectName(QString::fromUtf8("TLZbase_p"));
+        sizePolicy.setHeightForWidth(TLZbase_p->sizePolicy().hasHeightForWidth());
+        TLZbase_p->setSizePolicy(sizePolicy);
+        TLZbase_p->setWordWrap(false);
+
+        gridLayout6->addWidget(TLZbase_p, 2, 0, 1, 1);
+
+        TLYbase_p = new QLabel(gBPipe);
+        TLYbase_p->setObjectName(QString::fromUtf8("TLYbase_p"));
+        sizePolicy.setHeightForWidth(TLYbase_p->sizePolicy().hasHeightForWidth());
+        TLYbase_p->setSizePolicy(sizePolicy);
+        TLYbase_p->setWordWrap(false);
+
+        gridLayout6->addWidget(TLYbase_p, 1, 0, 1, 1);
+
+        SpinBox_Ybase_p = new QDoubleSpinBox(gBPipe);
+        SpinBox_Ybase_p->setObjectName(QString::fromUtf8("SpinBox_Ybase_p"));
+        SpinBox_Ybase_p->setDecimals(5);
+        SpinBox_Ybase_p->setMaximum(1e+09);
+        SpinBox_Ybase_p->setMinimum(-1e+09);
+        SpinBox_Ybase_p->setValue(0);
+
+        gridLayout6->addWidget(SpinBox_Ybase_p, 1, 1, 1, 1);
+
+        TLXaxis_p = new QLabel(gBPipe);
+        TLXaxis_p->setObjectName(QString::fromUtf8("TLXaxis_p"));
+        sizePolicy.setHeightForWidth(TLXaxis_p->sizePolicy().hasHeightForWidth());
+        TLXaxis_p->setSizePolicy(sizePolicy);
+        TLXaxis_p->setWordWrap(false);
+
+        gridLayout6->addWidget(TLXaxis_p, 0, 2, 1, 1);
+
+        TLYaxis_p = new QLabel(gBPipe);
+        TLYaxis_p->setObjectName(QString::fromUtf8("TLYaxis_p"));
+        sizePolicy.setHeightForWidth(TLYaxis_p->sizePolicy().hasHeightForWidth());
+        TLYaxis_p->setSizePolicy(sizePolicy);
+        TLYaxis_p->setWordWrap(false);
 
-    TLRadius_ext = new QLabel(gBPipe);
-    TLRadius_ext->setObjectName(QString::fromUtf8("TLRadius_ext"));
-    QSizePolicy sizePolicy32(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy32.setHorizontalStretch(0);
-    sizePolicy32.setVerticalStretch(0);
-    sizePolicy32.setHeightForWidth(TLRadius_ext->sizePolicy().hasHeightForWidth());
-    TLRadius_ext->setSizePolicy(sizePolicy32);
-    TLRadius_ext->setWordWrap(false);
+        gridLayout6->addWidget(TLYaxis_p, 1, 2, 1, 1);
+
+        TLZaxis_p = new QLabel(gBPipe);
+        TLZaxis_p->setObjectName(QString::fromUtf8("TLZaxis_p"));
+        sizePolicy.setHeightForWidth(TLZaxis_p->sizePolicy().hasHeightForWidth());
+        TLZaxis_p->setSizePolicy(sizePolicy);
+        TLZaxis_p->setWordWrap(false);
 
-    gridLayout6->addWidget(TLRadius_ext, 3, 2, 1, 1);
+        gridLayout6->addWidget(TLZaxis_p, 2, 2, 1, 1);
 
-    SpinBox_Haut_p = new QDoubleSpinBox(gBPipe);
-    SpinBox_Haut_p->setObjectName(QString::fromUtf8("SpinBox_Haut_p"));
-    SpinBox_Haut_p->setDecimals(5);
-    SpinBox_Haut_p->setMaximum(1e+09);
+        SpinBox_Zaxis_p = new QDoubleSpinBox(gBPipe);
+        SpinBox_Zaxis_p->setObjectName(QString::fromUtf8("SpinBox_Zaxis_p"));
+        SpinBox_Zaxis_p->setDecimals(5);
+        SpinBox_Zaxis_p->setMaximum(1e+09);
+        SpinBox_Zaxis_p->setMinimum(-1e+09);
+        SpinBox_Zaxis_p->setValue(0);
 
-    gridLayout6->addWidget(SpinBox_Haut_p, 4, 1, 1, 1);
+        gridLayout6->addWidget(SpinBox_Zaxis_p, 2, 3, 1, 1);
 
+        SpinBox_Yaxis_p = new QDoubleSpinBox(gBPipe);
+        SpinBox_Yaxis_p->setObjectName(QString::fromUtf8("SpinBox_Yaxis_p"));
+        SpinBox_Yaxis_p->setDecimals(5);
+        SpinBox_Yaxis_p->setMaximum(1e+09);
+        SpinBox_Yaxis_p->setMinimum(-1e+09);
+        SpinBox_Yaxis_p->setValue(0);
 
-    gridLayout->addWidget(gBPipe, 5, 0, 1, 2);
+        gridLayout6->addWidget(SpinBox_Yaxis_p, 1, 3, 1, 1);
 
+        SpinBox_Xaxis_p = new QDoubleSpinBox(gBPipe);
+        SpinBox_Xaxis_p->setObjectName(QString::fromUtf8("SpinBox_Xaxis_p"));
+        SpinBox_Xaxis_p->setDecimals(5);
+        SpinBox_Xaxis_p->setMaximum(1e+09);
+        SpinBox_Xaxis_p->setMinimum(-1e+09);
+        SpinBox_Xaxis_p->setValue(0);
 
-    retranslateUi(CreateZone);
+        gridLayout6->addWidget(SpinBox_Xaxis_p, 0, 3, 1, 1);
 
-    QSize size(551, 880);
-    size = size.expandedTo(CreateZone->minimumSizeHint());
-    CreateZone->resize(size);
+        SpinBox_Radius_ext = new QDoubleSpinBox(gBPipe);
+        SpinBox_Radius_ext->setObjectName(QString::fromUtf8("SpinBox_Radius_ext"));
+        SpinBox_Radius_ext->setDecimals(5);
+        SpinBox_Radius_ext->setMaximum(1e+09);
 
+        gridLayout6->addWidget(SpinBox_Radius_ext, 3, 3, 1, 1);
 
-    QMetaObject::connectSlotsByName(CreateZone);
+        TLRadius_ext = new QLabel(gBPipe);
+        TLRadius_ext->setObjectName(QString::fromUtf8("TLRadius_ext"));
+        sizePolicy.setHeightForWidth(TLRadius_ext->sizePolicy().hasHeightForWidth());
+        TLRadius_ext->setSizePolicy(sizePolicy);
+        TLRadius_ext->setWordWrap(false);
+
+        gridLayout6->addWidget(TLRadius_ext, 3, 2, 1, 1);
+
+        SpinBox_Haut_p = new QDoubleSpinBox(gBPipe);
+        SpinBox_Haut_p->setObjectName(QString::fromUtf8("SpinBox_Haut_p"));
+        SpinBox_Haut_p->setDecimals(5);
+        SpinBox_Haut_p->setMaximum(1e+09);
+
+        gridLayout6->addWidget(SpinBox_Haut_p, 4, 1, 1, 1);
+
+
+        gridLayout->addWidget(gBPipe, 5, 0, 1, 2);
+
+
+        retranslateUi(CreateZone);
+
+        QMetaObject::connectSlotsByName(CreateZone);
     } // setupUi
 
     void retranslateUi(QDialog *CreateZone)
     {
-    CreateZone->setWindowTitle(QApplication::translate("CreateZone", "Create a zone", 0, QApplication::UnicodeUTF8));
-    GBButtons->setTitle(QString());
-    buttonHelp->setText(QApplication::translate("CreateZone", "Help", 0, QApplication::UnicodeUTF8));
-    buttonCancel->setText(QApplication::translate("CreateZone", "Cancel", 0, QApplication::UnicodeUTF8));
-    buttonApply->setText(QApplication::translate("CreateZone", "Apply", 0, QApplication::UnicodeUTF8));
-    buttonOk->setText(QApplication::translate("CreateZone", "OK", 0, QApplication::UnicodeUTF8));
-    TypeZone->setTitle(QApplication::translate("CreateZone", "Type of zone", 0, QApplication::UnicodeUTF8));
-    RBSphere->setText(QApplication::translate("CreateZone", "Sphere", 0, QApplication::UnicodeUTF8));
-    RBPipe->setText(QApplication::translate("CreateZone", "Pipe", 0, QApplication::UnicodeUTF8));
-    RBCylinder->setText(QApplication::translate("CreateZone", "Cylinder", 0, QApplication::UnicodeUTF8));
-    RBBox->setText(QApplication::translate("CreateZone", "Box", 0, QApplication::UnicodeUTF8));
-    gBCylindre->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-    TLHaut->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8));
-    TLRadius->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8));
-    TLZaxis->setText(QApplication::translate("CreateZone", "Z axis", 0, QApplication::UnicodeUTF8));
-    TLYaxis->setText(QApplication::translate("CreateZone", "Y axis", 0, QApplication::UnicodeUTF8));
-    TLXaxis->setText(QApplication::translate("CreateZone", "X axis", 0, QApplication::UnicodeUTF8));
-    TLYbase->setText(QApplication::translate("CreateZone", "Y base", 0, QApplication::UnicodeUTF8));
-    TLZbase->setText(QApplication::translate("CreateZone", "Z base", 0, QApplication::UnicodeUTF8));
-    TLXbase->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8));
-    gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-    TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8));
-    TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8));
-    TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8));
-    TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8));
-    gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-    TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0, QApplication::UnicodeUTF8));
-    TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0, QApplication::UnicodeUTF8));
-    TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0, QApplication::UnicodeUTF8));
-    TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0, QApplication::UnicodeUTF8));
-    TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0, QApplication::UnicodeUTF8));
-    TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0, QApplication::UnicodeUTF8));
-    Name->setText(QApplication::translate("CreateZone", "Name", 0, QApplication::UnicodeUTF8));
-    gBPipe->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-    TLHaut_p->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8));
-    TLXbase_p->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8));
-    TLRadius_int->setText(QApplication::translate("CreateZone", "Internal radius", 0, QApplication::UnicodeUTF8));
-    TLZbase_p->setText(QApplication::translate("CreateZone", "Z base", 0, QApplication::UnicodeUTF8));
-    TLYbase_p->setText(QApplication::translate("CreateZone", "Y base", 0, QApplication::UnicodeUTF8));
-    TLXaxis_p->setText(QApplication::translate("CreateZone", "X axis", 0, QApplication::UnicodeUTF8));
-    TLYaxis_p->setText(QApplication::translate("CreateZone", "Y axis", 0, QApplication::UnicodeUTF8));
-    TLZaxis_p->setText(QApplication::translate("CreateZone", "Z axis", 0, QApplication::UnicodeUTF8));
-    TLRadius_ext->setText(QApplication::translate("CreateZone", "External radius", 0, QApplication::UnicodeUTF8));
-    Q_UNUSED(CreateZone);
+        CreateZone->setWindowTitle(QApplication::translate("CreateZone", "Create a zone", 0, QApplication::UnicodeUTF8));
+        GBButtons->setTitle(QString());
+        buttonHelp->setText(QApplication::translate("CreateZone", "Help", 0, QApplication::UnicodeUTF8));
+        buttonCancel->setText(QApplication::translate("CreateZone", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonApply->setText(QApplication::translate("CreateZone", "Apply", 0, QApplication::UnicodeUTF8));
+        buttonOk->setText(QApplication::translate("CreateZone", "OK", 0, QApplication::UnicodeUTF8));
+        TypeZone->setTitle(QApplication::translate("CreateZone", "Type of zone", 0, QApplication::UnicodeUTF8));
+        RBSphere->setText(QApplication::translate("CreateZone", "Sphere", 0, QApplication::UnicodeUTF8));
+        RBPipe->setText(QApplication::translate("CreateZone", "Pipe", 0, QApplication::UnicodeUTF8));
+        RBCylinder->setText(QApplication::translate("CreateZone", "Cylinder", 0, QApplication::UnicodeUTF8));
+        RBBox->setText(QApplication::translate("CreateZone", "Box", 0, QApplication::UnicodeUTF8));
+        gBCylindre->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
+        TLHaut->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8));
+        TLRadius->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8));
+        TLZaxis->setText(QApplication::translate("CreateZone", "Z axis", 0, QApplication::UnicodeUTF8));
+        TLYaxis->setText(QApplication::translate("CreateZone", "Y axis", 0, QApplication::UnicodeUTF8));
+        TLXaxis->setText(QApplication::translate("CreateZone", "X axis", 0, QApplication::UnicodeUTF8));
+        TLYbase->setText(QApplication::translate("CreateZone", "Y base", 0, QApplication::UnicodeUTF8));
+        TLZbase->setText(QApplication::translate("CreateZone", "Z base", 0, QApplication::UnicodeUTF8));
+        TLXbase->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8));
+        gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
+        TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8));
+        TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8));
+        TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8));
+        TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8));
+        gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
+        TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0, QApplication::UnicodeUTF8));
+        TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0, QApplication::UnicodeUTF8));
+        TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0, QApplication::UnicodeUTF8));
+        TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0, QApplication::UnicodeUTF8));
+        TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0, QApplication::UnicodeUTF8));
+        TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0, QApplication::UnicodeUTF8));
+        Name->setText(QApplication::translate("CreateZone", "Name", 0, QApplication::UnicodeUTF8));
+        gBPipe->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
+        TLHaut_p->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8));
+        TLXbase_p->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8));
+        TLRadius_int->setText(QApplication::translate("CreateZone", "Internal radius", 0, QApplication::UnicodeUTF8));
+        TLZbase_p->setText(QApplication::translate("CreateZone", "Z base", 0, QApplication::UnicodeUTF8));
+        TLYbase_p->setText(QApplication::translate("CreateZone", "Y base", 0, QApplication::UnicodeUTF8));
+        TLXaxis_p->setText(QApplication::translate("CreateZone", "X axis", 0, QApplication::UnicodeUTF8));
+        TLYaxis_p->setText(QApplication::translate("CreateZone", "Y axis", 0, QApplication::UnicodeUTF8));
+        TLZaxis_p->setText(QApplication::translate("CreateZone", "Z axis", 0, QApplication::UnicodeUTF8));
+        TLRadius_ext->setText(QApplication::translate("CreateZone", "External radius", 0, QApplication::UnicodeUTF8));
     } // retranslateUi
 
 };
@@ -851,4 +786,6 @@ namespace Ui {
     class CreateZone: public Ui_CreateZone {};
 } // namespace Ui
 
+QT_END_NAMESPACE
+
 #endif // CREATEZONE_H
diff --git a/src/HOMARDGUI/CreateZone.ui b/src/HOMARDGUI/CreateZone.ui
index aef1b45f..112e4f6c 100644
--- a/src/HOMARDGUI/CreateZone.ui
+++ b/src/HOMARDGUI/CreateZone.ui
@@ -824,7 +824,7 @@
     </widget>
    </item>
    <item row="0" column="1" >
-    <widget class="QLineEdit" name="LEZoneName" >
+    <widget class="QLineEdit" name="LEName" >
      <property name="maxLength" >
       <number>32</number>
      </property>
diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx
index 58f7111a..eaa72df3 100644
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -161,13 +161,13 @@ void HOMARDGUI::createActions(){
   createHOMARDAction( 1111, "COMPUTE",          "mesh_compute.png"       );
   createHOMARDAction( 1121, "MESH_INFO",        "advanced_mesh_info.png" );
 //
-  createHOMARDAction( 1201, "EDIT",             "whatis.png"       );
+  createHOMARDAction( 1201, "EDIT",             "loop.png"         );
   createHOMARDAction( 1211, "DELETE",           "delete.png"       );
 //
   createHOMARDAction( 1301, "MESH_INFO",        "advanced_mesh_info.png" );
   createHOMARDAction( 1302, "EDIT_MESS_FILE",   "texte.png"              );
 //
-  createHOMARDAction( 1401, "YACS",             "yacs.png" );
+  createHOMARDAction( 1401, "YACS",             "table_view.png" );
 //
 }
 
@@ -479,9 +479,20 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID)
     {
       MESSAGE("etape 1401")
       MESSAGE("command " << theCommandID << " activated");
-      QString CaseName=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("CasHomard"), 1);
-      MESSAGE("CaseName " << CaseName.toStdString().c_str() << " choisi dans arbre");
-      MonCreateYACS *aDlg = new MonCreateYACS( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), CaseName ) ;
+      QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("CasHomard"), 1);
+      MESSAGE("Name " << Name.toStdString().c_str() << " choisi dans arbre");
+      MonCreateYACS *aDlg = new MonCreateYACS( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), Name ) ;
+      aDlg->show();
+      break;
+    }
+
+    case 1402: // Ecriture d'un schéma YACS
+    {
+      MESSAGE("etape 1402")
+      MESSAGE("command " << theCommandID << " activated");
+      QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("YACSHomard"), 1);
+      MESSAGE("YACSHomard " << Name.toStdString().c_str() << " choisi dans arbre");
+      MonCreateYACS *aDlg = new MonCreateYACS( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), Name ) ;
       aDlg->show();
       break;
     }
@@ -602,8 +613,10 @@ void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& t
       EditObject = true ;
       DeleteObject = true ;
     }
-    else if ( HOMARD_UTILS::isZone(obj) )
+    else if ( HOMARD_UTILS::isCase(obj) )
     {
+      pix = resMgr->loadPixmap( "HOMARD", "table_view.png" );
+      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_YACS").toLatin1().data()), this, SLOT(YACSCreate()));
       EditObject = true ;
       DeleteObject = true ;
     }
@@ -615,7 +628,7 @@ void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& t
     else if ( HOMARD_UTILS::isIter(obj) )
     {
       pix = resMgr->loadPixmap( "HOMARD", "iter_next.png" );
-      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_NEW_ITERATION").toLatin1().data()), this,SLOT(NextIter()));
+      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_NEW_ITERATION").toLatin1().data()), this, SLOT(NextIter()));
       QPixmap pix2 = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" );
       menu->addAction(QIcon(pix2), tr(QString("HOM_MEN_COMPUTE").toLatin1().data()), this, SLOT(LanceCalcul()));
       pix2 = resMgr->loadPixmap( "HOMARD", "advanced_mesh_info.png" );
@@ -623,29 +636,34 @@ void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& t
       EditObject = true ;
       DeleteObject = true ;
     }
-    else if ( HOMARD_UTILS::isCase(obj) )
+    else if ( HOMARD_UTILS::isYACS(obj) )
+    {
+      pix = resMgr->loadPixmap( "HOMARD", "save.png" );
+      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_YACS").toLatin1().data()), this, SLOT(YACSWrite()));
+      EditObject = true ;
+      DeleteObject = true ;
+    }
+    else if ( HOMARD_UTILS::isZone(obj) )
     {
-      pix = resMgr->loadPixmap( "HOMARD", "yacs.png" );
-      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_YACS").toLatin1().data()), this, SLOT(YACS()));
       EditObject = true ;
       DeleteObject = true ;
     }
     else if ( HOMARD_UTILS::isFilelog(obj) or HOMARD_UTILS::isFileSummary(obj) )
     {
       pix = resMgr->loadPixmap( "HOMARD", "texte.png" );
-      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_MESS_FILE").toLatin1().data()), this,SLOT(EditAsciiFile()));
+      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_MESS_FILE").toLatin1().data()), this, SLOT(EditAsciiFile()));
     }
 //  Ajout d'un menu d'edition pour les objets qui le proposent
     if ( EditObject )
     {
-      pix = resMgr->loadPixmap( "HOMARD", "whatis.png" );
-      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT").toLatin1().data()), this,SLOT(Edit()));
+      pix = resMgr->loadPixmap( "HOMARD", "loop.png" );
+      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT").toLatin1().data()), this, SLOT(Edit()));
     }
 //  Ajout d'un menu de destruction pour les objets qui le proposent
     if ( DeleteObject )
     {
       pix = resMgr->loadPixmap( "HOMARD", "delete.png" );
-      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_DELETE").toLatin1().data()), this,SLOT(Delete()));
+      menu->addAction(QIcon(pix), tr(QString("HOM_MEN_DELETE").toLatin1().data()), this, SLOT(Delete()));
     }
   }
 }
@@ -685,10 +703,14 @@ void HOMARDGUI::EditAsciiFile()
   this->OnGUIEvent(1302);
 }
 
-void HOMARDGUI::YACS()
+void HOMARDGUI::YACSCreate()
 {
   this->OnGUIEvent(1401);
 }
+void HOMARDGUI::YACSWrite()
+{
+  this->OnGUIEvent(1402);
+}
 
 
 //
diff --git a/src/HOMARDGUI/HOMARDGUI.h b/src/HOMARDGUI/HOMARDGUI.h
index ee3e64ab..1f2e909b 100644
--- a/src/HOMARDGUI/HOMARDGUI.h
+++ b/src/HOMARDGUI/HOMARDGUI.h
@@ -65,7 +65,8 @@ private slots:
     void LanceCalcul();
     void IterInfo();
     void NextIter();
-    void YACS();
+    void YACSCreate();
+    void YACSWrite();
     void Edit();
     void Delete();
     void XmGraceFichier();
diff --git a/src/HOMARDGUI/HOMARDGUI_Utils.cxx b/src/HOMARDGUI/HOMARDGUI_Utils.cxx
index c3b253d4..a5072978 100644
--- a/src/HOMARDGUI/HOMARDGUI_Utils.cxx
+++ b/src/HOMARDGUI/HOMARDGUI_Utils.cxx
@@ -224,11 +224,11 @@ bool HOMARD_UTILS::isBoundaryDi(_PTR(SObject) MonObj)
    return isObject( MonObj, QString("BoundaryDiHomard"), -1 ) ;
 }
 //================================================================
-// Retourne vrai si l objet est une zone
+// Retourne vrai si l objet est un cas
 //================================================================
-bool HOMARD_UTILS::isZone(_PTR(SObject) MonObj)
+bool HOMARD_UTILS::isCase(_PTR(SObject) MonObj)
 {
-   return isObject( MonObj, QString("ZoneHomard"), -1 ) ;
+   return isObject( MonObj, QString("CasHomard"), -1 ) ;
 }
 //================================================================
 // Retourne vrai si l objet est une Hypothese
@@ -245,11 +245,18 @@ bool HOMARD_UTILS::isIter(_PTR(SObject) MonObj)
    return isObject( MonObj, QString("IterationHomard"), 0 ) ;
 }
 //================================================================
-// Retourne vrai si l objet est un cas
+// Retourne vrai si l objet est un schema YACS
 //================================================================
-bool HOMARD_UTILS::isCase(_PTR(SObject) MonObj)
+bool HOMARD_UTILS::isYACS(_PTR(SObject) MonObj)
 {
-   return isObject( MonObj, QString("CasHomard"), -1 ) ;
+   return isObject( MonObj, QString("YACSHomard"), -1 ) ;
+}
+//================================================================
+// Retourne vrai si l objet est une zone
+//================================================================
+bool HOMARD_UTILS::isZone(_PTR(SObject) MonObj)
+{
+   return isObject( MonObj, QString("ZoneHomard"), -1 ) ;
 }
 //================================================================
 // Retourne vrai si l objet est un fichier de messages
diff --git a/src/HOMARDGUI/HOMARDGUI_Utils.h b/src/HOMARDGUI/HOMARDGUI_Utils.h
index 291c7c98..c538aa78 100644
--- a/src/HOMARDGUI/HOMARDGUI_Utils.h
+++ b/src/HOMARDGUI/HOMARDGUI_Utils.h
@@ -75,10 +75,11 @@ namespace HOMARD_UTILS {
   bool isXmgrace(_PTR(SObject)  MonObj);
   bool isBoundaryAn(_PTR(SObject)  MonObj);
   bool isBoundaryDi(_PTR(SObject)  MonObj);
-  bool isZone(_PTR(SObject)  MonObj);
+  bool isCase(_PTR(SObject)  MonObj);
   bool isHypo(_PTR(SObject)  MonObj);
   bool isIter(_PTR(SObject)  MonObj);
-  bool isCase(_PTR(SObject)  MonObj);
+  bool isYACS(_PTR(SObject)  MonObj);
+  bool isZone(_PTR(SObject)  MonObj);
   bool isFilelog(_PTR(SObject)  MonObj);
   bool isFileSummary(_PTR(SObject)  MonObj);
   bool isObject(_PTR(SObject)  MonObj, QString TypeObject, int option );
diff --git a/src/HOMARDGUI/HOMARD_msg_en.ts b/src/HOMARDGUI/HOMARD_msg_en.ts
index 59ea6a10..ef7d0bb9 100644
--- a/src/HOMARDGUI/HOMARD_msg_en.ts
+++ b/src/HOMARDGUI/HOMARD_msg_en.ts
@@ -363,5 +363,9 @@
         <source>HOM_MESH_INFO_2</source>
         <translation>Analysis in the object browser, file </translation>
     </message>
+    <message>
+        <source>HOM_YACS_EDIT_WINDOW_TITLE</source>
+        <translation>Edition of a schema YACS</translation>
+    </message>
 </context>
 </TS>
diff --git a/src/HOMARDGUI/HOMARD_msg_fr.ts b/src/HOMARDGUI/HOMARD_msg_fr.ts
index 1309e5a5..41887385 100644
--- a/src/HOMARDGUI/HOMARD_msg_fr.ts
+++ b/src/HOMARDGUI/HOMARD_msg_fr.ts
@@ -1003,5 +1003,9 @@
         <source>Invalid study context</source>
         <translation>Etude contextuelle non valable</translation>
     </message>
+    <message>
+        <source>HOM_YACS_EDIT_WINDOW_TITLE</source>
+        <translation>Edition d'un schéma YACS</translation>
+    </message>
 </context>
 </TS>
diff --git a/src/HOMARDGUI/HOMARD_msg_ja.ts b/src/HOMARDGUI/HOMARD_msg_ja.ts
index 8aa05da1..a2b415db 100644
--- a/src/HOMARDGUI/HOMARD_msg_ja.ts
+++ b/src/HOMARDGUI/HOMARD_msg_ja.ts
@@ -1003,5 +1003,9 @@
         <source>Invalid study context</source>
         <translation>Invalid study context</translation>
     </message>
+    <message>
+        <source>HOM_CASE_EDIT_WINDOW_TITLE</source>
+        <translation>Edition of a schema YACS</translation>
+    </message>
 </context>
 </TS>
diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am
index 0ba0c29d..a4212b35 100644
--- a/src/HOMARDGUI/Makefile.am
+++ b/src/HOMARDGUI/Makefile.am
@@ -53,6 +53,7 @@ salomeinclude_HEADERS =       \
 	IterInfo.h            \
 	MonCreateYACS.h       \
 	CreateYACS.h          \
+	MonEditYACS.h         \
 	HOMARDGUI.h           \
 	HOMARDGUI_Utils.h     \
 	EditFile.h            \
@@ -84,6 +85,7 @@ dist_libHOMARD_la_SOURCES =     \
 	MonMeshInfo.cxx         \
 	MonIterInfo.cxx         \
 	MonCreateYACS.cxx       \
+	MonEditYACS.cxx         \
 	MonEditFile.cxx         \
 	HomardQtCommun.cxx
 
@@ -108,6 +110,7 @@ MOC_FILES =                         \
 	MonMeshInfo_moc.cxx         \
 	MonIterInfo_moc.cxx         \
 	MonCreateYACS_moc.cxx       \
+	MonEditYACS_moc.cxx         \
 	MonEditFile_moc.cxx
 
 nodist_libHOMARD_la_SOURCES = $(MOC_FILES)
diff --git a/src/HOMARDGUI/MonCreateBoundaryAn.cxx b/src/HOMARDGUI/MonCreateBoundaryAn.cxx
index 03165481..701e8100 100644
--- a/src/HOMARDGUI/MonCreateBoundaryAn.cxx
+++ b/src/HOMARDGUI/MonCreateBoundaryAn.cxx
@@ -63,7 +63,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
     Chgt (false)
     {
       MESSAGE("Constructeur") ;
-      _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
       setupUi(this);
       setModal(modal);
 
@@ -87,7 +87,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
 
       InitConnect( );
 
-      SetNewBoundaryAnName() ;
+      SetNewName() ;
       InitValBoundaryAn();          // Cherche les valeurs de la boite englobante le maillage
       InitMinMax();                 // Initialise les bornes des boutons
       SetCylinder();                // Propose un cylindre en premier choix
@@ -100,7 +100,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent,
 // Constructeur appele par MonEditBoundaryAn
 //
     QDialog(0), Ui_CreateBoundaryAn(),
-     _myHomardGen(myHomardGen),
+     myHomardGen(myHomardGen),
     _parent(parent),
     _aName (""),
     _aCaseName(caseName),
@@ -163,7 +163,7 @@ void MonCreateBoundaryAn::InitValBoundaryAn()
 //
     if (_aCaseName == QString("")) { return; }
 
-    HOMARD::HOMARD_Cas_var aCas = _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+    HOMARD::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
     HOMARD::extrema_var  MesExtremes = aCas->GetBoundingBox();
     int num = MesExtremes->length() ;
     ASSERT(num == 10);
@@ -269,8 +269,7 @@ bool MonCreateBoundaryAn::PushOnApply()
 // Appele lorsque l'un des boutons Ok ou Apply est presse
 //
 {
-  std::cerr << LEBoundaryName->text().trimmed().toStdString() << std::endl;
-  if (LEBoundaryName->text().trimmed()=="")
+  if (LEName->text().trimmed()=="")
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_BOUN_NAME") );
@@ -376,14 +375,14 @@ bool MonCreateBoundaryAn:: CreateOrUpdateBoundaryAn()
 //----------------------------------------------------
 //  Creation de l'objet boundary
 {
-  _aName = LEBoundaryName->text().trimmed();
+  _aName = LEName->text().trimmed();
   switch (_Type)
   {
     case 1 : // il s agit d un cylindre
     {
       try
       {
-        aBoundaryAn = _myHomardGen->CreateBoundaryCylinder(CORBA::string_dup(_aName.toStdString().c_str()), \
+        aBoundaryAn = myHomardGen->CreateBoundaryCylinder(CORBA::string_dup(_aName.toStdString().c_str()), \
         _BoundaryAnXcentre, _BoundaryAnYcentre, _BoundaryAnZcentre, _BoundaryAnXaxis, _BoundaryAnYaxis, _BoundaryAnZaxis, _BoundaryAnRayon );
       }
       catch( SALOME::SALOME_Exception& S_ex )
@@ -398,7 +397,7 @@ bool MonCreateBoundaryAn:: CreateOrUpdateBoundaryAn()
     {
       try
       {
-        aBoundaryAn = _myHomardGen->CreateBoundarySphere(CORBA::string_dup(_aName.toStdString().c_str()), \
+        aBoundaryAn = myHomardGen->CreateBoundarySphere(CORBA::string_dup(_aName.toStdString().c_str()), \
         _BoundaryAnXcentre, _BoundaryAnYcentre, _BoundaryAnZcentre, _BoundaryAnRayon);
       }
       catch( SALOME::SALOME_Exception& S_ex )
@@ -413,7 +412,7 @@ bool MonCreateBoundaryAn:: CreateOrUpdateBoundaryAn()
     {
       try
       {
-        aBoundaryAn = _myHomardGen->CreateBoundaryConeA(CORBA::string_dup(_aName.toStdString().c_str()), \
+        aBoundaryAn = myHomardGen->CreateBoundaryConeA(CORBA::string_dup(_aName.toStdString().c_str()), \
         _BoundaryAnXaxisCone, _BoundaryAnYaxisCone, _BoundaryAnZaxisCone, _BoundaryAngle, \
         _BoundaryAnXorigCone, _BoundaryAnYorigCone, _BoundaryAnYorigCone);
       }
@@ -429,7 +428,7 @@ bool MonCreateBoundaryAn:: CreateOrUpdateBoundaryAn()
     {
       try
       {
-        aBoundaryAn = _myHomardGen->CreateBoundaryConeR(CORBA::string_dup(_aName.toStdString().c_str()), \
+        aBoundaryAn = myHomardGen->CreateBoundaryConeR(CORBA::string_dup(_aName.toStdString().c_str()), \
         _BoundaryAnXcone1, _BoundaryAnYcone1, _BoundaryAnZcone1, _BoundaryAnRayon1, \
         _BoundaryAnXcone2, _BoundaryAnYcone2, _BoundaryAnZcone2, _BoundaryAnRayon2);
       }
@@ -460,29 +459,28 @@ void MonCreateBoundaryAn::PushOnHelp()
 }
 
 // -----------------------------------
-void MonCreateBoundaryAn::SetNewBoundaryAnName()
+void MonCreateBoundaryAn::SetNewName()
 // -----------------------------------
 {
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  HOMARD::listeBoundarys_var  MyBoundaryAns = _myHomardGen->GetAllBoundarysName();
-  int num = 0; QString aBoundaryAnName="";
-  while (aBoundaryAnName=="" )
+  HOMARD::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName();
+  int num = 0; QString aName="";
+  while (aName=="" )
   {
-    aBoundaryAnName.setNum(num+1) ;
-    aBoundaryAnName.insert(0, QString("Boun_")) ;
-    for ( int i=0; i<MyBoundaryAns->length(); i++)
+    aName.setNum(num+1) ;
+    aName.insert(0, QString("Boun_")) ;
+    for ( int i=0; i<MyObjects->length(); i++)
     {
-      if ( aBoundaryAnName ==  QString(MyBoundaryAns[i]))
+      if ( aName ==  QString(MyObjects[i]))
       {
           num=num+1;
-          aBoundaryAnName="";
+          aName="";
           break;
       }
    }
   }
-  LEBoundaryName->clear() ;
-  LEBoundaryName->insert(aBoundaryAnName);
+  LEName->setText(aName);
 }
 // ------------------------------------------------------------------------
 void MonCreateBoundaryAn::SetCylinder()
diff --git a/src/HOMARDGUI/MonCreateBoundaryAn.h b/src/HOMARDGUI/MonCreateBoundaryAn.h
index e5eb147b..b1bb77a0 100644
--- a/src/HOMARDGUI/MonCreateBoundaryAn.h
+++ b/src/HOMARDGUI/MonCreateBoundaryAn.h
@@ -67,12 +67,12 @@ protected :
     bool Chgt;
 
     HOMARD::HOMARD_Boundary_var aBoundaryAn ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void InitValBoundaryAn();
     virtual void InitMinMax();
-    virtual void SetNewBoundaryAnName();
+    virtual void SetNewName();
     virtual void convertRayonAngle(int option);
     virtual bool CreateOrUpdateBoundaryAn();
 
diff --git a/src/HOMARDGUI/MonCreateBoundaryDi.cxx b/src/HOMARDGUI/MonCreateBoundaryDi.cxx
index 02da2e3f..7ba67548 100644
--- a/src/HOMARDGUI/MonCreateBoundaryDi.cxx
+++ b/src/HOMARDGUI/MonCreateBoundaryDi.cxx
@@ -34,13 +34,13 @@ using namespace std;
 // -------------------------------------------------------------------------------
 MonCreateBoundaryDi::MonCreateBoundaryDi(MonCreateCase* parent, bool modal,
                                          HOMARD::HOMARD_Gen_var myHomardGen,
-                                         QString caseName, QString aBoundaryName)
+                                         QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryDi */
     :
     QDialog(0), Ui_CreateBoundaryDi(),
-    _parent(parent), _aBoundaryName(aBoundaryName),
-    _myHomardGen(HOMARD::HOMARD_Gen::_duplicate(myHomardGen)),
+    _parent(parent), _aName(aName),
+    myHomardGen(HOMARD::HOMARD_Gen::_duplicate(myHomardGen)),
     _aCaseName(caseName)
     {
       MESSAGE("Constructeur") ;
@@ -48,7 +48,7 @@ MonCreateBoundaryDi::MonCreateBoundaryDi(MonCreateCase* parent, bool modal,
       setModal(modal);
       InitConnect();
 
-     if ( _aBoundaryName == QString("") ) {SetNewBoundaryName();};
+     if ( _aName == QString("") ) {SetNewName();};
     }
 
 // ------------------------------------------------------------------------
@@ -77,8 +77,8 @@ bool MonCreateBoundaryDi::PushOnApply()
 {
 // Verifications
 
-  QString aBoundaryName=LEBoundaryName->text().trimmed();
-  if (aBoundaryName=="") {
+  QString aName=LEName->text().trimmed();
+  if (aName=="") {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_BOUN_NAME") );
     return false;
@@ -103,14 +103,14 @@ bool MonCreateBoundaryDi::PushOnApply()
   }
 
 // Creation de l'objet CORBA si ce n'est pas deja fait sous le meme nom
-  if ( _aBoundaryName != aBoundaryName )
+  if ( _aName != aName )
   {
    try
    {
-     _aBoundaryName=aBoundaryName;
-     _aBoundary=_myHomardGen->CreateBoundaryDi(CORBA::string_dup(_aBoundaryName.toStdString().c_str()), aMeshName.toStdString().c_str(), aMeshFile.toStdString().c_str());
-     _parent->AddBoundaryDi(_aBoundaryName);
-     _aBoundary->SetCaseCreation(_aCaseName.toStdString().c_str());
+     _aName=aName;
+     aBoundary=myHomardGen->CreateBoundaryDi(CORBA::string_dup(_aName.toStdString().c_str()), aMeshName.toStdString().c_str(), aMeshFile.toStdString().c_str());
+     _parent->AddBoundaryDi(_aName);
+     aBoundary->SetCaseCreation(_aCaseName.toStdString().c_str());
    }
    catch( SALOME::SALOME_Exception& S_ex )
    {
@@ -151,32 +151,32 @@ void MonCreateBoundaryDi::AssocieLesGroupes()
   int i=0;
   for (it = _listeGroupesBoundary.constBegin(); it != _listeGroupesBoundary.constEnd(); it++)
      aSeqGroupe[i++]=(*it).toStdString().c_str();
-  _aBoundary->SetGroups(aSeqGroupe);
+  aBoundary->SetGroups(aSeqGroupe);
 
 }
 
 // -------------------------------------------------
-void MonCreateBoundaryDi::SetNewBoundaryName()
+void MonCreateBoundaryDi::SetNewName()
 // --------------------------------------------------
 {
 
-  HOMARD::listeBoundarys_var  MyBoundarys = _myHomardGen->GetAllBoundarysName();
-  int num = 0; QString aBoundaryName="";
-  while (aBoundaryName == QString("") )
+  HOMARD::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
+  int num = 0; QString aName="";
+  while (aName == QString("") )
   {
-    aBoundaryName.setNum(num+1) ;
-    aBoundaryName.insert(0, QString("Boun_")) ;
-    for ( int i=0; i<MyBoundarys->length(); i++)
+    aName.setNum(num+1) ;
+    aName.insert(0, QString("Boun_")) ;
+    for ( int i=0; i<MyObjects->length(); i++)
     {
-      if ( aBoundaryName ==  QString(MyBoundarys[i]))
+      if ( aName ==  QString(MyObjects[i]))
       {
           num=num+1;
-          aBoundaryName="";
+          aName="";
           break;
       }
    }
   }
-  LEBoundaryName->setText(aBoundaryName);
+  LEName->setText(aName);
 }
 // ------------------------------------------------------------------------
 void MonCreateBoundaryDi::SetMeshFile()
@@ -203,7 +203,7 @@ void MonCreateBoundaryDi::SetFiltrage()
     return;
   }
 
-  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL,this,  TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),
+  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL,this,  TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }
diff --git a/src/HOMARDGUI/MonCreateBoundaryDi.h b/src/HOMARDGUI/MonCreateBoundaryDi.h
index 2b950109..a2e5f316 100644
--- a/src/HOMARDGUI/MonCreateBoundaryDi.h
+++ b/src/HOMARDGUI/MonCreateBoundaryDi.h
@@ -47,18 +47,18 @@ protected :
 
     MonCreateCase *_parent;
 
-    QString _aBoundaryName;
+    QString _aName;
     QString _aCaseName;
 
 
-    HOMARD::HOMARD_Boundary_var _aBoundary;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Boundary_var aBoundary;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     QStringList  _listeGroupesBoundary;
 
     virtual void AssocieLesGroupes();
     virtual void InitConnect();
-    virtual void SetNewBoundaryName();
+    virtual void SetNewName();
 
 public slots:
 
diff --git a/src/HOMARDGUI/MonCreateCase.cxx b/src/HOMARDGUI/MonCreateCase.cxx
index 58c5dd67..af10a230 100644
--- a/src/HOMARDGUI/MonCreateCase.cxx
+++ b/src/HOMARDGUI/MonCreateCase.cxx
@@ -48,12 +48,12 @@ MonCreateCase::MonCreateCase(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var
     _Pyram(0)
 {
   MESSAGE("Debut du constructeur de MonCreateCase");
-  _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
   setupUi(this);
   setModal(modal);
   InitConnect();
 
-  SetNewCaseName() ;
+  SetNewName() ;
   GBBoundaryA->setVisible(0);
   GBBoundaryD->setVisible(0);
   GBTypeNoConf->setVisible(0);
@@ -74,7 +74,7 @@ MonCreateCase::~MonCreateCase()
 void MonCreateCase::InitConnect()
 // ------------------------------------------------------------------------
 {
-    connect( LECaseName,     SIGNAL(textChanged(QString)), this, SLOT(CaseNameChanged()));
+    connect( LEName,     SIGNAL(textChanged(QString)), this, SLOT(CaseNameChanged()));
     connect( PushDir,        SIGNAL(pressed()), this, SLOT(SetDirName()));
     connect( PushFichier,    SIGNAL(pressed()), this, SLOT(SetFileName()));
 
@@ -120,11 +120,11 @@ void MonCreateCase::InitBoundarys()
 // Pour les frontieres discretes : la liste a saisir
 // Pour les frontieres analytiques : les colonnes de chaque frontiere
   HOMARD::HOMARD_Boundary_var myBoundary ;
-  HOMARD::listeBoundarys_var  mesBoundarys = _myHomardGen->GetAllBoundarysName();
+  HOMARD::listeBoundarys_var  mesBoundarys = myHomardGen->GetAllBoundarysName();
 //   MESSAGE("Nombre de frontieres enregistrees : "<<mesBoundarys->length());
   for (int i=0; i<mesBoundarys->length(); i++)
   {
-    myBoundary = _myHomardGen->GetBoundary(mesBoundarys[i]);
+    myBoundary = myHomardGen->GetBoundary(mesBoundarys[i]);
     int type_obj = myBoundary->GetType() ;
     if ( type_obj==0 ) { CBBoundaryDi->addItem(QString(mesBoundarys[i])); }
     else               { AddBoundaryAn(QString(mesBoundarys[i])); }
@@ -139,7 +139,7 @@ bool MonCreateCase::PushOnApply()
 // --------------------------------
 {
   MESSAGE("PushOnApply");
-  QString aCaseName=LECaseName->text().trimmed();
+  QString aCaseName=LEName->text().trimmed();
   if ( aCaseName == "" )
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
@@ -154,7 +154,7 @@ bool MonCreateCase::PushOnApply()
                               QObject::tr("HOM_CASE_DIRECTORY_1") );
     return false;
   }
-  if ((aDirName != _aDirName) and (_myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
+  if ((aDirName != _aDirName) and (myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_CASE_DIRECTORY_2") );
@@ -219,7 +219,7 @@ bool MonCreateCase::PushOnApply()
     _aCaseName = aCaseName;
     try
     {
-    aCase = _myHomardGen->CreateCase( \
+    aCase = myHomardGen->CreateCase( \
             CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
             CORBA::string_dup(aMeshName.toStdString().c_str()),  \
             CORBA::string_dup(aFileName.toStdString().c_str()) );
@@ -230,9 +230,9 @@ bool MonCreateCase::PushOnApply()
                                 QObject::tr(CORBA::string_dup(S_ex.details.text)) );
       try
       {
-          aCase = _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+          aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
           string iter0 = aCase->GetIter0Name();
-          HOMARD::HOMARD_Iteration_var aIter =  _myHomardGen->GetIteration(iter0.c_str());
+          HOMARD::HOMARD_Iteration_var aIter =  myHomardGen->GetIteration(iter0.c_str());
           QString aFileName = aIter->GetMeshFile();
           LEFileName->setText(aFileName);
           LEFileName->setReadOnly(true);
@@ -308,10 +308,10 @@ void MonCreateCase::PushOnHelp()
   HOMARD_UTILS::PushOnHelp(QString("gui_create_case.html"), QString(""));
 }
 // ---------------------------------
-void MonCreateCase::SetNewCaseName()
+void MonCreateCase::SetNewName()
 // ------------------------------
 {
-  HOMARD::listeCases_var  MyCases = _myHomardGen->GetAllCasesName();
+  HOMARD::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {
@@ -327,8 +327,8 @@ void MonCreateCase::SetNewCaseName()
       }
    }
   }
-  LECaseName->clear() ;
-  LECaseName->insert(aCaseName);
+  LEName->clear() ;
+  LEName->insert(aCaseName);
 }
 
 // ------------------------------------------------------------------------
@@ -410,7 +410,7 @@ void MonCreateCase::PushBoundaryDiNew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryDi *BoundaryDlg = new MonCreateBoundaryDi(this, true,
-                HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), _aCaseName, "") ;
+                HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, "") ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -419,7 +419,7 @@ void MonCreateCase::PushBoundaryDiEdit()
 {
   if (CBBoundaryDi->currentText() == QString(""))  return;
   MonEditBoundaryDi *BoundaryDlg = new MonEditBoundaryDi(this, true,
-       HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), _aCaseName, CBBoundaryDi->currentText() ) ;
+       HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryDi->currentText() ) ;
   BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -479,7 +479,7 @@ void MonCreateCase::PushBoundaryAnNew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryAn *BoundaryDlg = new MonCreateBoundaryAn(this, true,
-                HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), _aCaseName) ;
+                HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -496,7 +496,7 @@ void MonCreateCase::PushBoundaryAnEdit()
     MESSAGE("nom "<<nom.toStdString().c_str());
     if (nom != QString(""))
     { MonEditBoundaryAn *BoundaryDlg = new MonEditBoundaryAn(this, true,
-        HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), _aCaseName, nom ) ;
+        HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, nom ) ;
       BoundaryDlg->show(); }
   }
 }
@@ -510,7 +510,7 @@ void MonCreateCase::PushBoundaryAnHelp()
 void MonCreateCase::CaseNameChanged()
 // ------------------------------------------------------------------------
 {
-    if (_aCaseName != LECaseName->text().trimmed())
+    if (_aCaseName != LEName->text().trimmed())
     {
        LEFileName->setReadOnly(false);
        PushFichier->show();
diff --git a/src/HOMARDGUI/MonCreateCase.h b/src/HOMARDGUI/MonCreateCase.h
index 4603fbbf..00fa925f 100644
--- a/src/HOMARDGUI/MonCreateCase.h
+++ b/src/HOMARDGUI/MonCreateCase.h
@@ -50,11 +50,11 @@ protected :
     int _Pyram;
 
     HOMARD::HOMARD_Cas_var aCase ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void InitBoundarys();
-    virtual void SetNewCaseName();
+    virtual void SetNewName();
 
 public slots:
     virtual void SetDirName();
diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx
index f5236ccd..a29acebf 100644
--- a/src/HOMARDGUI/MonCreateHypothesis.cxx
+++ b/src/HOMARDGUI/MonCreateHypothesis.cxx
@@ -36,13 +36,13 @@ using namespace std;
 // -------------------------------------------------------------------------------
 MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
                                          HOMARD::HOMARD_Gen_var myHomardGen,
-                                         QString aHypothesisName,
+                                         QString Name,
                                          QString caseName, QString aFieldFile)
 // ---------------------------------------------------------------------------------
 /* Constructs a MonCreateHypothesis */
     :
     QDialog(0), Ui_CreateHypothesis(),
-    _parent(parent), _aHypothesisName(aHypothesisName),
+    _parent(parent), _Name(Name),
     _aCaseName(caseName), _aFieldFile(aFieldFile),
     _aFieldName(""),
     _aTypeAdap(-2), _aTypeRaff(1), _aTypeDera(0),
@@ -56,12 +56,12 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
 
 {
       MESSAGE("Constructeur") ;
-      _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
       setupUi(this);
       setModal(modal);
       InitConnect();
 
-      SetNewHypothesisName();
+      SetNewName();
       if (_aFieldFile != QString(""))
       { RBChamp->setChecked(1);
         SetChamp();
@@ -134,7 +134,7 @@ bool MonCreateHypothesis::PushOnApply()
 // Verifications
 
 
-  if (LEHypothesisName->text().trimmed()=="") {
+  if (LEName->text().trimmed()=="") {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_HYPO_NAME") );
     return false;
@@ -144,13 +144,13 @@ bool MonCreateHypothesis::PushOnApply()
   if (VerifieComposant() == false)  return false;
 
 // Creation de l'objet CORBA si ce n'est pas deja fait sous le meme nom
-  if (LEHypothesisName->text().trimmed() != _aHypothesisName)
+  if (LEName->text().trimmed() != _Name)
   {
-    _aHypothesisName=LEHypothesisName->text().trimmed();
+    _Name=LEName->text().trimmed();
     try
     {
-     _aHypothesis=_myHomardGen->CreateHypothesis(CORBA::string_dup(_aHypothesisName.toStdString().c_str()) );
-     _parent->addHypothese(_aHypothesisName);
+     aHypothesis=myHomardGen->CreateHypothesis(CORBA::string_dup(_Name.toStdString().c_str()) );
+     _parent->addHypothese(_Name);
     }
     catch( SALOME::SALOME_Exception& S_ex )
     {
@@ -161,9 +161,9 @@ bool MonCreateHypothesis::PushOnApply()
   }
 
 // Mise en place des attributs
-  _aHypothesis->SetAdapRefinUnRef(_aTypeAdap,_aTypeRaff,_aTypeDera);
-  _aHypothesis->SetTypeFieldInterp(_TypeFieldInterp);
-  _aHypothesis->SetCaseCreation(_aCaseName.toStdString().c_str());
+  aHypothesis->SetAdapRefinUnRef(_aTypeAdap,_aTypeRaff,_aTypeDera);
+  aHypothesis->SetTypeFieldInterp(_TypeFieldInterp);
+  aHypothesis->SetCaseCreation(_aCaseName.toStdString().c_str());
 
   AssocieLesZones();
   AssocieComposants();
@@ -175,15 +175,15 @@ bool MonCreateHypothesis::PushOnApply()
   {
 // Enregistrement du niveau maximal
     _NivMax = spinBoxNivMax->value() ;
-    _aHypothesis->SetNivMax(_NivMax);
+    aHypothesis->SetNivMax(_NivMax);
 // Enregistrement du diametre minimal
     _DiamMin = doubleSpinBoxDiamMin->value() ;
-    _aHypothesis->SetDiamMin(_DiamMin);
+    aHypothesis->SetDiamMin(_DiamMin);
 // Enregistrement de l'intialisation de l'adaptation
-    _aHypothesis->SetAdapInit(_AdapInit);
+    aHypothesis->SetAdapInit(_AdapInit);
 // Sortie des niveaux de raffinement
     if (CBLevelOutput->isChecked()) { _LevelOutput = 1 ; }
-    _aHypothesis->SetLevelOutput(_LevelOutput);
+    aHypothesis->SetLevelOutput(_LevelOutput);
   }
 
   HOMARD_UTILS::updateObjBrowser() ;
@@ -206,28 +206,28 @@ void MonCreateHypothesis::PushOnHelp()
   HOMARD_UTILS::PushOnHelp(QString("gui_create_hypothese.html"), QString(""));
 }
 // -------------------------------------------------
-void MonCreateHypothesis::SetNewHypothesisName()
+void MonCreateHypothesis::SetNewName()
 // --------------------------------------------------
 {
 
-  HOMARD::listeHypotheses_var  MyHypos = _myHomardGen->GetAllHypothesesName();
+  HOMARD::listeHypotheses_var  MyObjects = myHomardGen->GetAllHypothesesName();
   int num = 0;//
-  QString aHypothesisName="";
-  while (aHypothesisName=="" )
+  QString aName="";
+  while (aName=="" )
   {
-    aHypothesisName.setNum(num+1) ;
-    aHypothesisName.insert(0, QString("Hypo_")) ;
-    for ( int i=0; i<MyHypos->length(); i++)
+    aName.setNum(num+1) ;
+    aName.insert(0, QString("Hypo_")) ;
+    for ( int i=0; i<MyObjects->length(); i++)
     {
-      if ( aHypothesisName ==  QString(MyHypos[i]))
+      if ( aName ==  QString(MyObjects[i]))
       {
           num=num+1;
-          aHypothesisName="";
+          aName="";
           break;
       }
     }
   }
-  LEHypothesisName->setText(aHypothesisName);
+  LEName->setText(aName);
 }
 
 //
@@ -292,7 +292,7 @@ void MonCreateHypothesis::PushZoneNew()
 // ------------------------------------------------------------------------
 {
   MESSAGE("Debut de MonCreateHypothesis::PushZoneNew")
-  MonCreateZone *aDlg = new MonCreateZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), _aCaseName) ;
+  MonCreateZone *aDlg = new MonCreateZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
   aDlg->show();
 }
 
@@ -310,7 +310,7 @@ void MonCreateHypothesis::PushZoneEdit()
     return;
   }
   QString zoneName = monItem->text().trimmed();
-  MonEditZone *aDlg = new MonEditZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), _aCaseName, zoneName) ;
+  MonEditZone *aDlg = new MonEditZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
   aDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -331,7 +331,7 @@ void MonCreateHypothesis::GetAllZones()
 // Par defaut, aucune n'est selectionnee
 {
   MESSAGE("Debut de GetAllZones") ;
-  HOMARD::listeZones_var mesZones = _myHomardGen->GetAllZonesName();
+  HOMARD::listeZones_var mesZones = myHomardGen->GetAllZonesName();
   int nbrow=TWZone->rowCount();
   for ( int row=0; row< nbrow; row++)
   {
@@ -460,7 +460,7 @@ void MonCreateHypothesis::AssocieFieldInterp()
   if ( _TypeFieldInterp != 2 ) return;
   for ( int row=0; row< TWField->rowCount(); row++)
       if ( TWField->item( row, 0 )->checkState() == Qt::Checked )
-      { _aHypothesis->AddFieldInterp(TWField->item(row, 1)->text().toStdString().c_str()); }
+      { aHypothesis->AddFieldInterp(TWField->item(row, 1)->text().toStdString().c_str()); }
 }
 // ------------------------------------------------------------------------
 void MonCreateHypothesis::SetUniRaff()
@@ -680,7 +680,7 @@ void MonCreateHypothesis::SetFiltrage()
 // ------------------------------------------------------------------------
 {
   if (!CBGroupe->isChecked()) return;
-  MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),_aCaseName, _aListeGroupes) ;
+  MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
   aDlg->show();
 }
 
@@ -735,7 +735,7 @@ void MonCreateHypothesis::AssocieLesZones()
   for ( int i=0 ; i< _aListeZone.count() ; i++ )
   { if ( _aListeZone[i+1] == Raff ) { TypeUse =  1 ; }
     else                            { TypeUse = -1 ; }
-    _aHypothesis->AddZone(_aListeZone[i].toStdString().c_str(), TypeUse);
+    aHypothesis->AddZone(_aListeZone[i].toStdString().c_str(), TypeUse);
     i += 1 ;
   }
   MESSAGE( "Fin de AssocieLesZones" );
@@ -761,14 +761,14 @@ void MonCreateHypothesis::AssocieComposants()
   if ( _TypeThC == 4 ) { _ThreshC = SpinBox_CMuSigma->value(); }
 
   _aFieldName=CBFieldName->currentText();
-  _aHypothesis->SetField(CORBA::string_dup(_aFieldName.toStdString().c_str()) ) ;
-  _aHypothesis->SetRefinThr( _TypeThR, _ThreshR ) ;
-  _aHypothesis->SetUnRefThr( _TypeThC, _ThreshC ) ;
-  _aHypothesis->SetUseField( _UsField ) ;
-  _aHypothesis->SetUseComp( _UsCmpI ) ;
+  aHypothesis->SetField(CORBA::string_dup(_aFieldName.toStdString().c_str()) ) ;
+  aHypothesis->SetRefinThr( _TypeThR, _ThreshR ) ;
+  aHypothesis->SetUnRefThr( _TypeThC, _ThreshC ) ;
+  aHypothesis->SetUseField( _UsField ) ;
+  aHypothesis->SetUseComp( _UsCmpI ) ;
   _aListeComposant = GetListCompChecked() ;
   for ( int i=0 ; i< _aListeComposant.count() ; i++ )
-      { _aHypothesis->AddComp(_aListeComposant[i].toStdString().c_str()); }
+      { aHypothesis->AddComp(_aListeComposant[i].toStdString().c_str()); }
 };
 // ------------------------------------------------------------------------
 void MonCreateHypothesis::AssocieLesGroupes()
@@ -780,7 +780,7 @@ void MonCreateHypothesis::AssocieLesGroupes()
   int i=0;
   for (it = _aListeGroupes.constBegin(); it != _aListeGroupes.constEnd(); it++)
      aSeqGroupe[i++]=(*it).toStdString().c_str();
-  _aHypothesis->SetGroups(aSeqGroupe);
+  aHypothesis->SetGroups(aSeqGroupe);
 
 }
 // ------------------------------------------------------------------------
diff --git a/src/HOMARDGUI/MonCreateHypothesis.h b/src/HOMARDGUI/MonCreateHypothesis.h
index 7145e6a5..f9acdeb0 100644
--- a/src/HOMARDGUI/MonCreateHypothesis.h
+++ b/src/HOMARDGUI/MonCreateHypothesis.h
@@ -50,7 +50,7 @@ protected :
 
     MonCreateIteration *_parent;
 
-    QString _aHypothesisName;
+    QString _Name;
     QString _aFieldFile ;
     QString _aFieldName;
     QString _aCaseName;
@@ -73,8 +73,8 @@ protected :
     int _AdapInit;
     int _LevelOutput;
 
-    HOMARD::HOMARD_Gen_var _myHomardGen;
-    HOMARD::HOMARD_Hypothesis_var _aHypothesis;
+    HOMARD::HOMARD_Hypothesis_var aHypothesis;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     QStringList _aListeZone;
     QStringList _aListeComposant;
@@ -83,7 +83,7 @@ protected :
     virtual void InitConnect();
     virtual void InitFields();
     virtual void GetAllZones();
-    virtual void SetNewHypothesisName();
+    virtual void SetNewName();
 
     virtual void AssocieFieldInterp();
     virtual void AssocieLesZones();
diff --git a/src/HOMARDGUI/MonCreateIteration.cxx b/src/HOMARDGUI/MonCreateIteration.cxx
index 0ac39fd6..5325bf05 100644
--- a/src/HOMARDGUI/MonCreateIteration.cxx
+++ b/src/HOMARDGUI/MonCreateIteration.cxx
@@ -41,17 +41,17 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal,
  */
     QDialog(0),
     Ui_CreateIteration(),
-    _IterationName(""),
+    _Name(""),
     _IterParentName(IterParentName),
     _CaseName("")
     {
       MESSAGE("Constructeur");
-      _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
       setupUi(this);
       setModal(modal);
       InitConnect();
 
-      SetNewIterationName();
+      SetNewName();
       GetHypotheses();
       if (_IterParentName != QString(""))
          { SetIterParentName(); }
@@ -86,7 +86,7 @@ void MonCreateIteration::InitConnect()
 void MonCreateIteration::GetHypotheses()
 // ------------------------------------------------------------------------
 {
-     HOMARD::listeHypotheses_var  mesHypotheses = _myHomardGen->GetAllHypothesesName();
+     HOMARD::listeHypotheses_var  mesHypotheses = myHomardGen->GetAllHypothesesName();
      for (int i=0; i<mesHypotheses->length(); i++)
      {
          CBHypothese->addItem(QString(mesHypotheses[i]));
@@ -99,8 +99,8 @@ bool MonCreateIteration::PushOnApply()
 {
   MESSAGE("MonCreateIteration::PushOnApply");
 //
-  QString aIterationName = LEIterationName->text().trimmed();
-  if ( aIterationName == QString (""))
+  QString aName = LEName->text().trimmed();
+  if ( aName == QString (""))
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_ITER_NAME") );
@@ -127,7 +127,7 @@ bool MonCreateIteration::PushOnApply()
                               QObject::tr("HOM_ITER_HYPO") );
     return false;
   }
-  HOMARD::HOMARD_Hypothesis_var _myHypothesis = _myHomardGen->GetHypothesis(monHypoName.toStdString().c_str());
+  HOMARD::HOMARD_Hypothesis_var _myHypothesis = myHomardGen->GetHypothesis(monHypoName.toStdString().c_str());
   HOMARD::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef());
   int TypeAdap = ListTypes[0];
   if ( TypeAdap == 1 and LEFieldFile->text().trimmed() == QString("") )
@@ -142,14 +142,14 @@ bool MonCreateIteration::PushOnApply()
   MESSAGE ("_IterParentName.toStdString " << _IterParentName.toStdString() );
 
 // Creation de l'objet CORBA si ce n'est pas deja fait sous le meme nom
-  if (_IterationName != aIterationName)
+  if (_Name != aName)
   {
     try
     {
-      _IterationName = aIterationName;
-      std::cerr << _IterationName.toStdString() << std::endl;
-      aIter = _myHomardGen->CreateIteration( \
-               CORBA::string_dup(_IterationName.toStdString().c_str()),
+      _Name = aName;
+      std::cerr << _Name.toStdString() << std::endl;
+      aIter = myHomardGen->CreateIteration( \
+               CORBA::string_dup(_Name.toStdString().c_str()),
                CORBA::string_dup(_IterParentName.toStdString().c_str()));
     }
     catch( SALOME::SALOME_Exception& S_ex )
@@ -171,7 +171,7 @@ bool MonCreateIteration::PushOnApply()
     if ( step == -2 ) { aIter->SetTimeStepRankLast(); }
     else              { aIter->SetTimeStepRank(step,rank); }
   }
-  _myHomardGen->AssociateIterHypo (IterName.c_str(), monHypoName.toStdString().c_str());
+  myHomardGen->AssociateIterHypo (IterName.c_str(), monHypoName.toStdString().c_str());
   aIter->SetMeshName(CORBA::string_dup(aMeshName_np1.toStdString().c_str()));
 
   HOMARD_UTILS::updateObjBrowser() ;
@@ -200,7 +200,7 @@ void MonCreateIteration::SetIterParentName()
     if (_IterParentName == QString("")) { raise();return;};
   }
   _CaseName=HOMARD_QT_COMMUN::SelectionCasEtude();
-  HOMARD::HOMARD_Iteration_var aIterParent = _myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
+  HOMARD::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
   QString MeshName = aIterParent->GetMeshName();
 
   LEMeshName_n->setText(MeshName);
@@ -210,29 +210,29 @@ void MonCreateIteration::SetIterParentName()
   LEIterationParentName->setText(_IterParentName);
 }
 // -------------------------------------------------
-void MonCreateIteration::SetNewIterationName()
+void MonCreateIteration::SetNewName()
 // --------------------------------------------------
 {
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  HOMARD::listeIterations_var  myIters=_myHomardGen->GetAllIterationsName();
+  HOMARD::listeIterations_var  MyObjects=myHomardGen->GetAllIterationsName();
   int num = 0;//
-  QString aIterationName="";
-  while (aIterationName=="" )
+  QString aName="";
+  while (aName=="" )
   {
-    aIterationName.setNum(num+1) ;
-    aIterationName.insert(0, QString("Iter_"));
-    for ( int i=0; i< myIters->length(); i++)
+    aName.setNum(num+1) ;
+    aName.insert(0, QString("Iter_"));
+    for ( int i=0; i< MyObjects->length(); i++)
     {
-      if ( aIterationName ==  QString((myIters)[i]))
+      if ( aName ==  QString((MyObjects)[i]))
       {
           num=num+1;
-          aIterationName="";
+          aName="";
           break;
       }
    }
   }
-  LEIterationName->setText(aIterationName);
+  LEName->setText(aName);
 }
 // ------------------------------------------------------------------------
 void MonCreateIteration::PushHypoEdit()
@@ -247,7 +247,7 @@ void MonCreateIteration::PushHypoEdit()
     return;
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this,TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
+  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this,TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 
@@ -271,11 +271,11 @@ void MonCreateIteration::PushHypoNew()
   }
   if ( _CaseName == QString(""))
   {
-    HOMARD::HOMARD_Iteration_var aIterParent = _myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
+    HOMARD::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
     _CaseName = aIterParent->GetCaseName();
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this,TRUE,HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),QString(""),_CaseName, aFieldFile) ;
+  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this,TRUE,HOMARD::HOMARD_Gen::_duplicate(myHomardGen),QString(""),_CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 // ------------------------------------------------------------------------
diff --git a/src/HOMARDGUI/MonCreateIteration.h b/src/HOMARDGUI/MonCreateIteration.h
index 6ad30418..ce4238f8 100644
--- a/src/HOMARDGUI/MonCreateIteration.h
+++ b/src/HOMARDGUI/MonCreateIteration.h
@@ -33,7 +33,7 @@
 #include <QWidget>
 
 class MonCreateIteration : public QDialog, public Ui_CreateIteration
-{ 
+{
     Q_OBJECT
 
 public:
@@ -46,7 +46,7 @@ public:
 protected :
     MonCreateIteration( QWidget* parent, HOMARD::HOMARD_Gen_var myHomardGen, QString IterParentName );
 
-    QString _IterationName;
+    QString _Name;
     QString _IterParentName;
     QString _CaseName;
 
@@ -54,12 +54,12 @@ protected :
     HOMARD::HOMARD_Iteration_var aIter ;
     HOMARD::HOMARD_Iteration_var aIterParent ;
     HOMARD::HOMARD_Cas_var aCas ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
 
     virtual void InitConnect();
     virtual void GetHypotheses();
-    virtual void SetNewIterationName();
+    virtual void SetNewName();
 
 public slots:
     virtual void SetIterParentName();
diff --git a/src/HOMARDGUI/MonCreateListGroup.cxx b/src/HOMARDGUI/MonCreateListGroup.cxx
index b960589e..75e86992 100644
--- a/src/HOMARDGUI/MonCreateListGroup.cxx
+++ b/src/HOMARDGUI/MonCreateListGroup.cxx
@@ -48,7 +48,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
     _parentBound(parentBound)
 {
     MESSAGE("Debut de  MonCreateListGroup")
-     _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+     myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
     setupUi(this);
     setModal(modal);
     InitConnect();
@@ -65,7 +65,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
     _parentHyp(parentHyp),
     _parentBound(parentBound)
 {
-    _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+    myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
     setupUi(this);
     InitConnect();
 }
@@ -126,7 +126,7 @@ void MonCreateListGroup::InitGroupes()
       TWGroupe->removeRow(row);
   TWGroupe->setRowCount(0);
   if (_aCaseName == QString("")) { return; };
-  HOMARD::HOMARD_Cas_var monCas= _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
   HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
   for ( int i = 0; i < _listeGroupesCas->length(); i++ )
   {
diff --git a/src/HOMARDGUI/MonCreateListGroup.h b/src/HOMARDGUI/MonCreateListGroup.h
index 4b4a3547..dd5bb3ab 100644
--- a/src/HOMARDGUI/MonCreateListGroup.h
+++ b/src/HOMARDGUI/MonCreateListGroup.h
@@ -43,7 +43,7 @@ public:
 
 protected :
 
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     MonCreateHypothesis * _parentHyp;
     MonCreateBoundaryDi * _parentBound;
diff --git a/src/HOMARDGUI/MonCreateYACS.cxx b/src/HOMARDGUI/MonCreateYACS.cxx
index 6612fba4..3c94b5c0 100644
--- a/src/HOMARDGUI/MonCreateYACS.cxx
+++ b/src/HOMARDGUI/MonCreateYACS.cxx
@@ -39,17 +39,19 @@ MonCreateYACS::MonCreateYACS (QWidget* parent, bool modal, HOMARD::HOMARD_Gen_va
     :
     Ui_CreateYACS(),
     _aCaseName(CaseName),
-    _aFileNameScript(""),
+    _aScriptFile(""),
     _aDirName(""),
-    _aFileNameMesh("")
+    _aMeshFile("")
 {
   MESSAGE("Debut du constructeur de MonCreateYACS");
-  _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
   setupUi(this);
   setModal(modal);
 
   InitConnect();
 
+  SetNewName() ;
+
   if (_aCaseName != QString(""))
     { SetCaseName(); }
   else
@@ -71,11 +73,11 @@ void MonCreateYACS::InitConnect()
 {
     connect( PBCaseName,     SIGNAL(pressed()), this, SLOT(SetCaseName()));
     connect( PushDir,        SIGNAL(pressed()), this, SLOT(SetDirName()));
-    connect( PushFile,       SIGNAL(pressed()), this, SLOT(SetFileNameScript()));
-    connect( PushFile_2,     SIGNAL(pressed()), this, SLOT(SetFileNameMesh()));
+    connect( PushFile,       SIGNAL(pressed()), this, SLOT(SetScriptFile()));
+    connect( PushFile_2,     SIGNAL(pressed()), this, SLOT(SetMeshFile()));
 
-    connect( RBStatic,       SIGNAL(clicked()), this, SLOT(FromIteration()));
-    connect( RBTransient,    SIGNAL(clicked()), this, SLOT(FromCase()));
+    connect( RBStatic,       SIGNAL(clicked()), this, SLOT(SetType(1)));
+    connect( RBTransient,    SIGNAL(clicked()), this, SLOT(SetType(2)));
 
     connect( buttonOk,       SIGNAL(pressed()), this, SLOT(PushOnOK()));
     connect( buttonApply,    SIGNAL(pressed()), this, SLOT(PushOnApply()));
@@ -95,7 +97,7 @@ bool MonCreateYACS::PushOnApply()
     return false;
   }
 // Le fichier du script
-  QString aFileName=LEFileNameScript->text().trimmed();
+  QString aFileName=LEScriptFile->text().trimmed();
   if (aFileName ==QString(""))
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
@@ -111,7 +113,7 @@ bool MonCreateYACS::PushOnApply()
                               QObject::tr("HOM_CASE_DIRECTORY_4") );
     return false;
   }
-  if ((aDirName != _aDirName) and (_myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
+  if ((aDirName != _aDirName) and (myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_CASE_DIRECTORY_2") );
@@ -125,7 +127,7 @@ bool MonCreateYACS::PushOnApply()
   }
 
 // Le fichier du tout premier maillage
-  aFileName=LEFileNameMesh->text().trimmed();
+  aFileName=LEMeshFile->text().trimmed();
   if (aFileName ==QString(""))
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
@@ -143,7 +145,21 @@ bool MonCreateYACS::PushOnApply()
   HOMARD_UTILS::updateObjBrowser();
   MESSAGE ("_aCaseName.toStdString " << _aCaseName.toStdString() );
 
-  return true;
+// Creation de l'objet CORBA
+  try
+  {
+    _Name=LEName->text().trimmed();
+    aYACS=myHomardGen->CreateYACSSchema(CORBA::string_dup(_Name.toStdString().c_str()), _aCaseName.toStdString().c_str(), _aScriptFile.toStdString().c_str(), _aDirName.toStdString().c_str(), _aMeshFile.toStdString().c_str());
+//     _parent->AddYACS(_Name);
+  }
+  catch( SALOME::SALOME_Exception& S_ex )
+  {
+    QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+                              QObject::tr(CORBA::string_dup(S_ex.details.text)) );
+    return false;
+  }
+
+return true;
 }
 // ---------------------------
 void MonCreateYACS::PushOnOK()
@@ -158,6 +174,29 @@ void MonCreateYACS::PushOnHelp()
 {
   HOMARD_UTILS::PushOnHelp(QString("gui_create_case.html"), QString(""));
 }
+// -------------------------------------------------
+void MonCreateYACS::SetNewName()
+// --------------------------------------------------
+{
+
+  HOMARD::listeYACSs_var MyObjects = myHomardGen->GetAllYACSsName();
+  int num = 0; QString aName="";
+  while (aName == QString("") )
+  {
+    aName.setNum(num+1) ;
+    aName.insert(0, QString("YACS_")) ;
+    for ( int i=0; i<MyObjects->length(); i++)
+    {
+      if ( aName ==  QString(MyObjects[i]))
+      {
+          num=num+1;
+          aName="";
+          break;
+      }
+   }
+  }
+  LEName->setText(aName);
+}
 // ------------------------------------------------------------------------
 void MonCreateYACS::SetCaseName()
 // ------------------------------------------------------------------------
@@ -169,7 +208,7 @@ void MonCreateYACS::SetCaseName()
     if (_aCaseName == QString("")) { raise();return;};
   }
 /*  MESSAGE ("appel de GetCase avec _aCaseName = " << _aCaseName.toStdString() );*/
-  aCase = _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
   LECaseName->setText(_aCaseName);
 }
 // ------------------------------------------------------------------------
@@ -180,20 +219,26 @@ void MonCreateYACS::SetDirName()
   if (!(aDirName.isEmpty()))LEDirName->setText(aDirName);
 }
 // ------------------------------------------------------------------------
-void MonCreateYACS::SetFileNameScript()
+void MonCreateYACS::SetScriptFile()
 // ------------------------------------------------------------------------
 {
-  QString fileName0 = LEFileNameScript->text().trimmed();
+  QString fileName0 = LEScriptFile->text().trimmed();
   QString fileName = HOMARD_QT_COMMUN::PushNomFichier(false);
   if (fileName.isEmpty()) fileName = fileName0 ;
-  LEFileNameScript->setText(fileName);
+  LEScriptFile->setText(fileName);
 }
 // ------------------------------------------------------------------------
-void MonCreateYACS::SetFileNameMesh()
+void MonCreateYACS::SetMeshFile()
 // ------------------------------------------------------------------------
 {
-  QString fileName0 = LEFileNameMesh->text().trimmed();
+  QString fileName0 = LEMeshFile->text().trimmed();
   QString fileName = HOMARD_QT_COMMUN::PushNomFichier(false);
   if (fileName.isEmpty()) fileName = fileName0 ;
-  LEFileNameMesh->setText(fileName);
+  LEMeshFile->setText(fileName);
+}
+// ------------------------------------------------------------------------
+void MonCreateYACS::SetType(int Type)
+// ------------------------------------------------------------------------
+{
+  _Type=Type;
 }
diff --git a/src/HOMARDGUI/MonCreateYACS.h b/src/HOMARDGUI/MonCreateYACS.h
index 2f8d5e2b..c7cf5bdd 100644
--- a/src/HOMARDGUI/MonCreateYACS.h
+++ b/src/HOMARDGUI/MonCreateYACS.h
@@ -39,23 +39,30 @@ class MonCreateYACS : public QDialog, public Ui_CreateYACS
     virtual ~MonCreateYACS();
 
   protected :
+    QString _Name;
     QString _aCaseName;
-    QString _aFileNameScript;
+    QString _aScriptFile;
     QString _aDirName;
-    QString _aFileNameMesh;
+    QString _aMeshFile;
 
+    int _Type;
 
+    HOMARD::HOMARD_YACS_var aYACS;
     HOMARD::HOMARD_Cas_var aCase ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
 
   public slots:
+    virtual void SetNewName();
+
     virtual void SetCaseName();
     virtual void SetDirName();
 
-    virtual void SetFileNameScript();
-    virtual void SetFileNameMesh();
+    virtual void SetScriptFile();
+    virtual void SetMeshFile();
+
+    virtual void SetType(int Type);
 
     virtual void PushOnOK();
     virtual bool PushOnApply();
diff --git a/src/HOMARDGUI/MonCreateZone.cxx b/src/HOMARDGUI/MonCreateZone.cxx
index 093b884a..c279af1e 100644
--- a/src/HOMARDGUI/MonCreateZone.cxx
+++ b/src/HOMARDGUI/MonCreateZone.cxx
@@ -47,7 +47,7 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
 */
     QDialog(0), Ui_CreateZone(),
     _parent(parent),
-    _aZoneName (""),
+    _Name (""),
     _aCaseName(caseName),
     _Orient(0),
     _Type(2),
@@ -61,12 +61,12 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
     Chgt (false)
     {
       MESSAGE("Constructeur") ;
-      _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen) ;
+      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen) ;
       setupUi(this) ;
       setModal(modal) ;
       InitConnect( ) ;
 
-      SetNewZoneName() ;
+      SetNewName() ;
       InitValZone() ;           // Cherche les valeurs de la boite englobante le maillage
       InitMinMax() ;            // Initialise les bornes des boutons
       SetBox() ;                // Propose une boite en premier choix
@@ -80,9 +80,9 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent,
 // Constructeur appele par MonEditZone
 //
     QDialog(0), Ui_CreateZone(),
-     _myHomardGen(myHomardGen),
+     myHomardGen(myHomardGen),
     _parent(parent),
-    _aZoneName (""),
+    _Name (""),
     _aCaseName(caseName),
     _Orient(0),
     _Type(2),
@@ -131,7 +131,7 @@ void MonCreateZone::InitValZone()
 //
   if (_aCaseName == QString("")) { return; }
 
-  HOMARD::HOMARD_Cas_var aCas = _myHomardGen->GetCase(_aCaseName.toStdString().c_str()) ;
+  HOMARD::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()) ;
   HOMARD::extrema_var  MesExtremes = aCas->GetBoundingBox() ;
   int num = MesExtremes->length() ;
   ASSERT(num == 10) ;
@@ -327,8 +327,7 @@ bool MonCreateZone::PushOnApply()
 // Appele lorsque l'un des boutons Ok ou Apply est presse
 //
 {
-  std::cerr << LEZoneName->text().trimmed().toStdString() << std::endl;
-  if (LEZoneName->text().trimmed()=="")
+  if (LEName->text().trimmed()=="")
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_ZONE_NAME") ) ;
@@ -489,75 +488,75 @@ bool MonCreateZone:: CreateOrUpdateZone()
 //  Creation de la zone
 {
   MESSAGE("CreateOrUpdateZone _Type ="<<_Type);
-  if (_aZoneName != LEZoneName->text().trimmed())
+  if (_Name != LEName->text().trimmed())
   {
-    _aZoneName = LEZoneName->text().trimmed() ;
+    _Name = LEName->text().trimmed() ;
     try
     {
       switch (_Type)
       {
         case 11 : // il s agit d un rectangle
-        { aZone = _myHomardGen->CreateZoneBox2D(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXmin, _ZoneXmax, _ZoneYmin, _ZoneYmax, _Orient );
           break;
         }
         case 12 : // il s agit d un rectangle
-        { aZone = _myHomardGen->CreateZoneBox2D(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneYmin, _ZoneYmax, _ZoneZmin, _ZoneZmax, _Orient );
           break;
         }
         case 13 : // il s agit d un rectangle
-        { aZone = _myHomardGen->CreateZoneBox2D(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneZmin, _ZoneZmax, _ZoneXmin, _ZoneXmax, _Orient );
           break;
         }
         case 2 : // il s agit d un parallelepipede
-        { aZone = _myHomardGen->CreateZoneBox(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneBox(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXmin, _ZoneXmax, _ZoneYmin, _ZoneYmax, _ZoneZmin, _ZoneZmax );
           break;
         }
         case 4 : // il s agit d une sphere
-        { aZone = _myHomardGen->CreateZoneSphere(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneSphere(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneRayon );
           break;
         }
         case 31 : // il s agit d un disque issu d'un cylindre
-        { aZone = _myHomardGen->CreateZoneDisk(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneRayon, _Orient );
           break;
           }
         case 32 : // il s agit d un disque issu d'un cylindre
-        { aZone = _myHomardGen->CreateZoneDisk(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneYcentre, _ZoneZcentre, _ZoneRayon, _Orient );
           break;
         }
         case 33 : // il s agit d un disque issu d'un cylindre
-        { aZone = _myHomardGen->CreateZoneDisk(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneZcentre, _ZoneXcentre, _ZoneRayon, _Orient );
           break;
         }
         case 5 : // il s agit d un cylindre
-        { aZone = _myHomardGen->CreateZoneCylinder(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneCylinder(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneXaxis, _ZoneYaxis, _ZoneZaxis, _ZoneRayon, _ZoneHaut );
           break;
         }
         case 61 : // il s agit d un disque avec trou
-        { aZone = _myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneRayon, _ZoneRayonInt, _Orient );
           break;
           }
         case 62 : // il s agit d un disque avec trou
-        { aZone = _myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneYcentre, _ZoneZcentre, _ZoneRayon, _ZoneRayonInt, _Orient );
           break;
           }
         case 63 : // il s agit d un disque avec trou
-        { aZone = _myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneZcentre, _ZoneXcentre, _ZoneRayon, _ZoneRayonInt, _Orient );
           break;
           }
         case 7 : // il s agit d un tuyau
-        { aZone = _myHomardGen->CreateZonePipe(CORBA::string_dup(_aZoneName.toStdString().c_str()), \
+        { aZone = myHomardGen->CreateZonePipe(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneXaxis, _ZoneYaxis, _ZoneZaxis, _ZoneRayon, _ZoneHaut, _ZoneRayonInt );
           break;
           }
@@ -569,7 +568,7 @@ bool MonCreateZone:: CreateOrUpdateZone()
                                 QObject::tr(CORBA::string_dup(S_ex.details.text)) );
       return false ;
     }
-    _parent->addZoneinTWZone(_aZoneName) ;
+    _parent->addZoneinTWZone(_Name) ;
 // Mise en place des attributs
     aZone->SetLimit(_Xincr, _Yincr, _Zincr) ;
 
@@ -591,29 +590,28 @@ void MonCreateZone::PushOnHelp()
 }
 
 // -----------------------------------
-void MonCreateZone::SetNewZoneName()
+void MonCreateZone::SetNewName()
 // -----------------------------------
 {
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  HOMARD::listeZones_var  MyZones = _myHomardGen->GetAllZonesName() ;
-  int num = 0; QString aZoneName="";
-  while (aZoneName=="" )
+  HOMARD::listeZones_var  MyObjects = myHomardGen->GetAllZonesName() ;
+  int num = 0; QString aName="";
+  while (aName=="" )
   {
-    aZoneName.setNum(num+1) ;
-    aZoneName.insert(0, QString("Zone_")) ;
-    for ( int i=0; i<MyZones->length() ; i++)
+    aName.setNum(num+1) ;
+    aName.insert(0, QString("Zone_")) ;
+    for ( int i=0; i<MyObjects->length() ; i++)
     {
-      if ( aZoneName ==  QString(MyZones[i]))
+      if ( aName ==  QString(MyObjects[i]))
       {
           num=num+1;
-          aZoneName="";
+          aName="";
           break;
       }
    }
   }
-  LEZoneName->clear() ;
-  LEZoneName->insert(aZoneName) ;
+  LEName->setText(aName);
 }
 // ------------------------------------------------------------------------
 void MonCreateZone::SetBox()
diff --git a/src/HOMARDGUI/MonCreateZone.h b/src/HOMARDGUI/MonCreateZone.h
index b9764af2..a7c4f49d 100644
--- a/src/HOMARDGUI/MonCreateZone.h
+++ b/src/HOMARDGUI/MonCreateZone.h
@@ -48,7 +48,7 @@ protected :
 
     MonCreateHypothesis * _parent;
 
-    QString _aZoneName;
+    QString _Name;
     QString _aCaseName;
 
     int _Orient;
@@ -65,12 +65,12 @@ protected :
     bool Chgt;
 
     HOMARD::HOMARD_Zone_var aZone ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void InitValZone();
     virtual void InitMinMax();
-    virtual void SetNewZoneName();
+    virtual void SetNewName();
     virtual bool CreateOrUpdateZone();
 
 public slots:
diff --git a/src/HOMARDGUI/MonEditBoundaryAn.cxx b/src/HOMARDGUI/MonEditBoundaryAn.cxx
index 42110252..12450634 100644
--- a/src/HOMARDGUI/MonEditBoundaryAn.cxx
+++ b/src/HOMARDGUI/MonEditBoundaryAn.cxx
@@ -29,17 +29,17 @@ using namespace std;
 // ------------------------------------------------------------------------
 MonEditBoundaryAn::MonEditBoundaryAn( MonCreateCase* parent, bool modal,
                           HOMARD::HOMARD_Gen_var myHomardGen,
-                          QString caseName, QString boundaryName ):
+                          QString caseName, QString Name ):
 // ------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryAn
     herite de MonCreateBoundaryAn
 */
     MonCreateBoundaryAn(parent, myHomardGen, caseName)
 {
-    MESSAGE("Debut de MonEditBoundaryAn pour " << boundaryName.toStdString().c_str());
+    MESSAGE("Debut de MonEditBoundaryAn pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_A_EDIT_WINDOW_TITLE"));
-    _aName=boundaryName;
-    aBoundaryAn = _myHomardGen->GetBoundary(_aName.toStdString().c_str());
+    _aName=Name;
+    aBoundaryAn = myHomardGen->GetBoundary(_aName.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------------------------------------------------
@@ -52,8 +52,8 @@ MonEditBoundaryAn::~MonEditBoundaryAn()
 void MonEditBoundaryAn::InitValEdit()
 // ------------------------------------------------------------------------
 {
-  LEBoundaryName->setText(_aName);
-  LEBoundaryName->setReadOnly(true);
+  LEName->setText(_aName);
+  LEName->setReadOnly(true);
   _Type = aBoundaryAn->GetType();
   MESSAGE("_Type : "<<_Type);
   InitValBoundaryAnLimit();
@@ -307,20 +307,20 @@ bool MonEditBoundaryAn::CreateOrUpdateBoundaryAn()
     }
     case 3 : // il s agit d un cone defini par un axe et un angle
     {
-      aBoundaryAn = _myHomardGen->CreateBoundaryConeA(CORBA::string_dup(_aName.toStdString().c_str()), \
+      aBoundaryAn = myHomardGen->CreateBoundaryConeA(CORBA::string_dup(_aName.toStdString().c_str()), \
       _BoundaryAnXaxisCone, _BoundaryAnYaxisCone, _BoundaryAnZaxisCone, _BoundaryAngle, \
       _BoundaryAnXorigCone, _BoundaryAnYorigCone, _BoundaryAnYorigCone);
       break;
     }
     case 4 : // il s agit d un cone defini par les 2 rayons
       {
-      aBoundaryAn = _myHomardGen->CreateBoundaryConeR(CORBA::string_dup(_aName.toStdString().c_str()), \
+      aBoundaryAn = myHomardGen->CreateBoundaryConeR(CORBA::string_dup(_aName.toStdString().c_str()), \
         _BoundaryAnXcone1, _BoundaryAnYcone1, _BoundaryAnZcone1, _BoundaryAnRayon1, \
         _BoundaryAnXcone2, _BoundaryAnYcone2, _BoundaryAnZcone2, _BoundaryAnRayon2);
       break;
     }
   }
-  if (Chgt) _myHomardGen->InvalideBoundary(_aName.toStdString().c_str());
+  if (Chgt) myHomardGen->InvalideBoundary(_aName.toStdString().c_str());
   HOMARD_UTILS::updateObjBrowser();
   return true;
 }
diff --git a/src/HOMARDGUI/MonEditBoundaryAn.h b/src/HOMARDGUI/MonEditBoundaryAn.h
index 4ebe0360..1dfe0251 100644
--- a/src/HOMARDGUI/MonEditBoundaryAn.h
+++ b/src/HOMARDGUI/MonEditBoundaryAn.h
@@ -34,7 +34,7 @@ class MonEditBoundaryAn : public MonCreateBoundaryAn
 public:
     MonEditBoundaryAn( MonCreateCase* parent, bool modal,
                  HOMARD::HOMARD_Gen_var myHomardGen,
-                 QString caseName, QString zoneName);
+                 QString caseName, QString Name);
     virtual ~MonEditBoundaryAn();
 
 protected :
diff --git a/src/HOMARDGUI/MonEditBoundaryDi.cxx b/src/HOMARDGUI/MonEditBoundaryDi.cxx
index ea4f65a7..7f0c3451 100644
--- a/src/HOMARDGUI/MonEditBoundaryDi.cxx
+++ b/src/HOMARDGUI/MonEditBoundaryDi.cxx
@@ -33,19 +33,19 @@ using namespace std;
 // -------------------------------------------------------------------------------------------------------------------------------------
 MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal,
                                       HOMARD::HOMARD_Gen_var myHomardGen,
-                                      QString caseName, QString BoundaryName):
+                                      QString caseName, QString Name):
 // -------------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryDi
     herite de MonCreateBoundaryDi
 */
-    MonCreateBoundaryDi(parent, modal, myHomardGen, caseName, BoundaryName)
+    MonCreateBoundaryDi(parent, modal, myHomardGen, caseName, Name)
 {
-    MESSAGE("Debut de Boundary pour " << BoundaryName.toStdString().c_str());
+    MESSAGE("Debut de Boundary pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_D_EDIT_WINDOW_TITLE"));
     try
     {
-     _aBoundary=_myHomardGen->GetBoundary(CORBA::string_dup(_aBoundaryName.toStdString().c_str()));
-     if (caseName==QString("")) { _aCaseName=_aBoundary->GetCaseCreation();}
+     aBoundary=myHomardGen->GetBoundary(CORBA::string_dup(_aName.toStdString().c_str()));
+     if (caseName==QString("")) { _aCaseName=aBoundary->GetCaseCreation();}
      InitValEdit();
     }
     catch( SALOME::SALOME_Exception& S_ex )
@@ -55,7 +55,7 @@ MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal,
       return;
     }
 
-    HOMARD::ListGroupType_var maListe = _aBoundary->GetGroups();
+    HOMARD::ListGroupType_var maListe = aBoundary->GetGroups();
     for ( int i = 0; i < maListe->length(); i++ )
        _listeGroupesBoundary << QString(maListe[i]);
 
@@ -70,10 +70,10 @@ MonEditBoundaryDi::~MonEditBoundaryDi()
 void MonEditBoundaryDi::InitValEdit()
 // ------------------------------
 {
-      LEBoundaryName->setText(_aBoundaryName);
-      LEBoundaryName->setReadOnly(true);
+      LEName->setText(_aName);
+      LEName->setReadOnly(true);
 
-      QString aMeshFile = _aBoundary->GetMeshFile();
+      QString aMeshFile = aBoundary->GetMeshFile();
       LEFileName->setText(aMeshFile);
       LEFileName->setReadOnly(1);
       PushFichier->setVisible(0);
@@ -96,10 +96,10 @@ void MonEditBoundaryDi::SetFiltrage()
                               QObject::tr("HOM_BOUN_CASE") );
     return;
   }
-  HOMARD::HOMARD_Cas_var monCas= _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
   HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
-  MonEditListGroup *aDlg = new MonEditListGroup(NULL,this,  TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),
+  MonEditListGroup *aDlg = new MonEditListGroup(NULL,this,  TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }
diff --git a/src/HOMARDGUI/MonEditBoundaryDi.h b/src/HOMARDGUI/MonEditBoundaryDi.h
index 34afaf9e..6069b556 100644
--- a/src/HOMARDGUI/MonEditBoundaryDi.h
+++ b/src/HOMARDGUI/MonEditBoundaryDi.h
@@ -34,7 +34,7 @@ class MonEditBoundaryDi : public MonCreateBoundaryDi
 public:
     MonEditBoundaryDi( MonCreateCase* parent, bool modal,
                        HOMARD::HOMARD_Gen_var myHomardGen,
-                       QString caseName, QString BoundaryName );
+                       QString caseName, QString Name );
     virtual ~MonEditBoundaryDi();
 
 protected :
diff --git a/src/HOMARDGUI/MonEditCase.cxx b/src/HOMARDGUI/MonEditCase.cxx
index 20f55c41..7017bbf7 100644
--- a/src/HOMARDGUI/MonEditCase.cxx
+++ b/src/HOMARDGUI/MonEditCase.cxx
@@ -40,7 +40,7 @@ MonEditCase::MonEditCase ( QWidget* parent, bool modal,
     MESSAGE("Debut de MonEditCase" << CaseName.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_CASE_EDIT_WINDOW_TITLE"));
     _aCaseName = CaseName;
-    aCase = _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+    aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------
@@ -53,8 +53,8 @@ void MonEditCase::InitValEdit()
 // ------------------------------
 {
   MESSAGE("InitValEdit");
-  LECaseName->setText(_aCaseName);
-  LECaseName->setReadOnly(true);
+  LEName->setText(_aCaseName);
+  LEName->setReadOnly(true);
 
   QString aDirName = aCase->GetDirName();
   LEDirName->setText(aDirName);
@@ -62,7 +62,7 @@ void MonEditCase::InitValEdit()
   PushDir->setVisible(0);
 
   QString _aitername=aCase->GetIter0Name();
-  HOMARD::HOMARD_Iteration_var aIter = _myHomardGen->GetIteration(_aitername.toStdString().c_str());
+  HOMARD::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(_aitername.toStdString().c_str());
   QString aFileName = aIter->GetMeshFile();
   LEFileName->setText(aFileName);
   LEFileName->setReadOnly(true);
@@ -110,7 +110,7 @@ void MonEditCase::InitValEdit()
       NomFron = mesBoundarys[i++];
       MESSAGE("NomFron "<<NomFron.toStdString().c_str());
 //        L'objet associe pour en deduire le type
-      HOMARD::HOMARD_Boundary_var myBoundary = _myHomardGen->GetBoundary(NomFron.toStdString().c_str());
+      HOMARD::HOMARD_Boundary_var myBoundary = myHomardGen->GetBoundary(NomFron.toStdString().c_str());
       int type_obj = myBoundary->GetType() ;
 //        C'est une frontiere discrete
 //        Rermarque : on ne gere pas les groupes
diff --git a/src/HOMARDGUI/MonEditCase.h b/src/HOMARDGUI/MonEditCase.h
index 2902ab02..2e7692ff 100644
--- a/src/HOMARDGUI/MonEditCase.h
+++ b/src/HOMARDGUI/MonEditCase.h
@@ -34,7 +34,7 @@ class MonEditCase : public MonCreateCase
 public:
     MonEditCase( QWidget* parent, bool modal,
                  HOMARD::HOMARD_Gen_var myHomardGen,
-                 QString CaseName );
+                 QString Name );
     virtual ~MonEditCase();
 
 protected :
diff --git a/src/HOMARDGUI/MonEditFile.h b/src/HOMARDGUI/MonEditFile.h
index db6f284b..5533a6b7 100644
--- a/src/HOMARDGUI/MonEditFile.h
+++ b/src/HOMARDGUI/MonEditFile.h
@@ -48,7 +48,7 @@ public:
 
 protected :
 
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
     QString _aFileName ;
 
     virtual void InitConnect();
diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx
index cef6f6ca..c3a27b7d 100644
--- a/src/HOMARDGUI/MonEditHypothesis.cxx
+++ b/src/HOMARDGUI/MonEditHypothesis.cxx
@@ -29,18 +29,18 @@ using namespace std;
 // ----------------------------------------------------------------------------
 MonEditHypothesis::MonEditHypothesis( MonCreateIteration* parent, bool modal,
                                       HOMARD::HOMARD_Gen_var myHomardGen,
-                                      QString aHypothesisName,
+                                      QString Name,
                                       QString caseName,  QString aFieldFile ):
 // ----------------------------------------------------------------------------
 /* Constructs a MonEditHypothesis
     herite de MonCreateHypothesis
 */
-    MonCreateHypothesis(parent, modal,myHomardGen, aHypothesisName, caseName, aFieldFile)
+    MonCreateHypothesis(parent, modal,myHomardGen, Name, caseName, aFieldFile)
 {
-    MESSAGE("Hypothese " << aHypothesisName.toStdString().c_str());
+    MESSAGE("Hypothese " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_HYPO_EDIT_WINDOW_TITLE"));
-    _aHypothesis    = _myHomardGen->GetHypothesis(_aHypothesisName.toStdString().c_str());
-    if (caseName == QString("") ){ _aCaseName = _aHypothesis->GetCaseCreation();}
+    aHypothesis    = myHomardGen->GetHypothesis(_Name.toStdString().c_str());
+    if (caseName == QString("") ){ _aCaseName = aHypothesis->GetCaseCreation();}
     InitValEdit();
     InitGroupes();
 }
@@ -53,7 +53,7 @@ MonEditHypothesis::~MonEditHypothesis()
 void MonEditHypothesis::InitGroupes()
 // ------------------------------
 {
-    HOMARD::ListGroupType_var maListe = _aHypothesis->GetGroups();
+    HOMARD::ListGroupType_var maListe = aHypothesis->GetGroups();
     for ( int i = 0; i < maListe->length(); i++ )
        _aListeGroupes << QString(maListe[i]);
 
@@ -65,9 +65,9 @@ void MonEditHypothesis::InitValEdit()
 // ------------------------------
 {
   MESSAGE("Debut de InitValEdit");
-  LEHypothesisName->setText(_aHypothesisName);
-  LEHypothesisName->setReadOnly(true);
-  HOMARD::listeTypes_var ListTypes (_aHypothesis->GetAdapRefinUnRef());
+  LEName->setText(_Name);
+  LEName->setReadOnly(true);
+  HOMARD::listeTypes_var ListTypes (aHypothesis->GetAdapRefinUnRef());
   ASSERT( ListTypes->length()==3) ;
   _aTypeAdap = ListTypes[0];
   _aTypeRaff = ListTypes[1];
@@ -98,10 +98,10 @@ void MonEditHypothesis::InitValEdit()
   }
 // Les options avancees (non modifiables)
   CBAdvanced->setVisible(0) ;
-  int NivMax = _aHypothesis->GetNivMax();
-  double DiamMin = _aHypothesis->GetDiamMin();
-  int AdapInit = _aHypothesis->GetAdapInit();
-  int LevelOutput = _aHypothesis->GetLevelOutput();
+  int NivMax = aHypothesis->GetNivMax();
+  double DiamMin = aHypothesis->GetDiamMin();
+  int AdapInit = aHypothesis->GetAdapInit();
+  int LevelOutput = aHypothesis->GetLevelOutput();
   if ( NivMax > 0 or DiamMin > 0 or AdapInit != 0 or LevelOutput != 0 )
   { GBAdvancedOptions->setVisible(1);
     if ( NivMax > 0 )
@@ -191,7 +191,7 @@ void MonEditHypothesis::InitAdaptZone()
 
 //  Recuperation de toutes les zones decrites et notation de celles retenues
     GetAllZones();
-    HOMARD::listeZonesHypo_var mesZonesAvant = _aHypothesis->GetZones();
+    HOMARD::listeZonesHypo_var mesZonesAvant = aHypothesis->GetZones();
     for (int i=0; i<mesZonesAvant->length(); i++)
     {
       MESSAGE ("i"<<i<<", zone :"<<string(mesZonesAvant[i])<<", type :"<<string(mesZonesAvant[i+1]));
@@ -246,7 +246,7 @@ void MonEditHypothesis::InitAdaptChamps()
     RBChamp->setEnabled(false);
     RBZone->setEnabled(false);
 
-    HOMARD::InfosHypo_var  aInfosHypo = _aHypothesis->GetField();
+    HOMARD::InfosHypo_var  aInfosHypo = aHypothesis->GetField();
     _aFieldName =  aInfosHypo->FieldName;
     _TypeThR = aInfosHypo->TypeThR;
     _ThreshR = aInfosHypo->ThreshR;
@@ -260,7 +260,7 @@ void MonEditHypothesis::InitAdaptChamps()
     CBFieldName->setEnabled(false);
     //SetFieldName(Qt::Unchecked);
 
-    HOMARD::listeComposantsHypo_var mesComposantsAvant = _aHypothesis->GetListComp();
+    HOMARD::listeComposantsHypo_var mesComposantsAvant = aHypothesis->GetListComp();
     TWCMP->clear();
     TWCMP->setRowCount(0);
     TWCMP->resizeRowsToContents();
@@ -350,7 +350,7 @@ void MonEditHypothesis::InitFieldInterp()
 {
     MESSAGE ("Debut de InitFieldInterp");
 //  Choix des options generales
-    _TypeFieldInterp = _aHypothesis->GetTypeFieldInterp();
+    _TypeFieldInterp = aHypothesis->GetTypeFieldInterp();
     MESSAGE ("_TypeFieldInterp = " << _TypeFieldInterp);
 //
 //  Aucune interpolation
@@ -371,7 +371,7 @@ void MonEditHypothesis::InitFieldInterp()
       RBFieldChosen->setChecked(true);
 //
       TWField->setVisible(1);
-      HOMARD::listFieldInterpHypo_var mesChampsAvant = _aHypothesis->GetListFieldInterp();
+      HOMARD::listFieldInterpHypo_var mesChampsAvant = aHypothesis->GetListFieldInterp();
       TWField->clear();
       TWField->setRowCount(0);
       TWField->resizeRowsToContents();
@@ -407,7 +407,7 @@ bool MonEditHypothesis::PushOnApply()
       if (_TypeThR == 2) { _ThreshR = SpinBox_RRel->value(); }
       if (_TypeThR == 3) { _ThreshR = SpinBox_RPE->value();  }
       if (_TypeThR == 4) { _ThreshR = SpinBox_RMuSigma->value();  }
-      _aHypothesis->SetRefinThr(_TypeThR, _ThreshR) ;
+      aHypothesis->SetRefinThr(_TypeThR, _ThreshR) ;
     }
     if (_aTypeDera!= 0 )
     {
@@ -415,10 +415,10 @@ bool MonEditHypothesis::PushOnApply()
       if (_TypeThC == 2) { _ThreshC = SpinBox_CRel->value() ; }
       if (_TypeThC == 3) { _ThreshC = SpinBox_CPE->value() ; }
       if (_TypeThC == 4) { _ThreshC = SpinBox_CMuSigma->value() ; }
-      _aHypothesis->SetUnRefThr(_TypeThC, _ThreshC) ;
+      aHypothesis->SetUnRefThr(_TypeThC, _ThreshC) ;
     }
 
-    _myHomardGen->InvalideHypo(_aHypothesisName.toStdString().c_str());
+    myHomardGen->InvalideHypo(_Name.toStdString().c_str());
     HOMARD_UTILS::updateObjBrowser();
   }
   return true;
@@ -429,7 +429,7 @@ void MonEditHypothesis::SetFiltrage()
 {
   if (CBGroupe->isChecked())
   {
-    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),_aCaseName, _aListeGroupes) ;
+    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
     aDlg->show();
   }
 }
diff --git a/src/HOMARDGUI/MonEditHypothesis.h b/src/HOMARDGUI/MonEditHypothesis.h
index 501e9b73..ffde02b9 100644
--- a/src/HOMARDGUI/MonEditHypothesis.h
+++ b/src/HOMARDGUI/MonEditHypothesis.h
@@ -34,7 +34,7 @@ class MonEditHypothesis : public MonCreateHypothesis
 public:
     MonEditHypothesis( MonCreateIteration* parent, bool modal,
                        HOMARD::HOMARD_Gen_var myHomardGen,
-                       QString caseName, QString HypothesisName, QString aFieldFile );
+                       QString caseName, QString Name, QString aFieldFile );
     virtual ~MonEditHypothesis();
 
 protected :
diff --git a/src/HOMARDGUI/MonEditIteration.cxx b/src/HOMARDGUI/MonEditIteration.cxx
index 0261e809..d8f1a99b 100644
--- a/src/HOMARDGUI/MonEditIteration.cxx
+++ b/src/HOMARDGUI/MonEditIteration.cxx
@@ -41,7 +41,7 @@ MonEditIteration::MonEditIteration ( QWidget* parent, bool modal,
     MESSAGE("Debut de  MonEditIteration" << IterName.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_ITER_EDIT_WINDOW_TITLE"));
     _IterationName = IterName;
-    aIter = _myHomardGen->GetIteration(_IterationName.toStdString().c_str());
+    aIter = myHomardGen->GetIteration(_IterationName.toStdString().c_str());
 
 //  Attention au cas ou c'est une iteration initiale : il faut inhiber l'essentiel
     int etat = aIter->GetState() ;
@@ -60,8 +60,8 @@ void MonEditIteration::InitValEdit0(int etat)
 //    Cas d'une iteration initiale d'un cas (initial ou poursuite)
 {
 //
-      LEIterationName->setText(_IterationName);
-      LEIterationName->setReadOnly(true);
+      LEName->setText(_IterationName);
+      LEName->setReadOnly(true);
 
 //    Invisibilite de l'iteration parent
       Iter_Parent->setVisible(0);
@@ -91,8 +91,8 @@ void MonEditIteration::InitValEdit()
 //    Cas d'une iteration courante
 {
 //    Affichage bloque du nom de l'iteration
-  LEIterationName->setText(_IterationName);
-  LEIterationName->setReadOnly(true);
+  LEName->setText(_IterationName);
+  LEName->setReadOnly(true);
 
 //    Affichage bloque du nom de l'iteration parent
   _IterParentName = aIter->GetIterParentName();
@@ -102,7 +102,7 @@ void MonEditIteration::InitValEdit()
   PBIterParent->setVisible(0);
 
 //    Affichage bloque du nom du maillage de l'iteration parent
-  aIterParent = _myHomardGen->GetIteration(_IterParentName.toStdString().c_str());
+  aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str());
   QString MeshNameParent = aIterParent->GetMeshName();
   LEMeshName_n->setText(MeshNameParent);
   LEMeshName_n->setReadOnly(1);
@@ -120,7 +120,7 @@ void MonEditIteration::InitValEdit()
   PBHypoNew->setVisible(0);
 
 //    Pour une adaptation selon un champ
-  HOMARD::HOMARD_Hypothesis_var myHypo = _myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ;
+  HOMARD::HOMARD_Hypothesis_var myHypo = myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ;
   _aTypeAdap = myHypo->GetAdapType() ;
   if ( _aTypeAdap == 1 )
   {
@@ -178,7 +178,7 @@ bool MonEditIteration::PushOnApply()
       _step = SpinBox_TimeStep->value();
       if ( _step == -2 ) { aIter->SetTimeStepRankLast(); }
       else               { aIter->SetTimeStepRank(_step, _rank); }
-      _myHomardGen->InvalideIter(_IterationName.toStdString().c_str());
+      myHomardGen->InvalideIter(_IterationName.toStdString().c_str());
       HOMARD_UTILS::updateObjBrowser();
     }
   }
diff --git a/src/HOMARDGUI/MonEditIteration.h b/src/HOMARDGUI/MonEditIteration.h
index 63d49072..2b9137ac 100644
--- a/src/HOMARDGUI/MonEditIteration.h
+++ b/src/HOMARDGUI/MonEditIteration.h
@@ -34,7 +34,7 @@ class MonEditIteration : public MonCreateIteration
 public:
     MonEditIteration( QWidget* parent, bool modal,
                       HOMARD::HOMARD_Gen_var myHomardGen,
-                      QString IterParentName, QString IterName );
+                      QString IterParentName, QString Name );
     virtual ~MonEditIteration();
 
 protected :
diff --git a/src/HOMARDGUI/MonEditZone.cxx b/src/HOMARDGUI/MonEditZone.cxx
index 1ade5d60..d40ca5f3 100644
--- a/src/HOMARDGUI/MonEditZone.cxx
+++ b/src/HOMARDGUI/MonEditZone.cxx
@@ -34,17 +34,17 @@ using namespace std;
 // ------------------------------------------------------------------------
 MonEditZone::MonEditZone( MonCreateHypothesis* parent, bool modal,
                           HOMARD::HOMARD_Gen_var myHomardGen,
-                          QString caseName, QString zoneName ):
+                          QString caseName, QString Name ):
 // ------------------------------------------------------------------------
 /* Constructs a MonEditZone
     herite de MonCreateZone
 */
     MonCreateZone(parent, myHomardGen, caseName)
 {
-    MESSAGE("Debut de MonEditZone pour " << zoneName.toStdString().c_str());
+    MESSAGE("Debut de MonEditZone pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_ZONE_EDIT_WINDOW_TITLE"));
-    _aZoneName=zoneName;
-    aZone = _myHomardGen->GetZone(_aZoneName.toStdString().c_str());
+    _Name=Name;
+    aZone = myHomardGen->GetZone(_Name.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------------------------------------------------
@@ -58,8 +58,8 @@ void MonEditZone::InitValEdit()
 // ------------------------------------------------------------------------
 {
   MESSAGE("InitValEdit ");
-  LEZoneName->setText(_aZoneName);
-  LEZoneName->setReadOnly(true);
+  LEName->setText(_Name);
+  LEName->setReadOnly(true);
   _Type = aZone->GetType();
   MESSAGE("InitValEdit _Type ="<<_Type);
   InitValZoneLimit();
@@ -425,7 +425,7 @@ bool MonEditZone::CreateOrUpdateZone()
         break;
       }
     }
-    if (Chgt) _myHomardGen->InvalideZone(_aZoneName.toStdString().c_str());
+    if (Chgt) myHomardGen->InvalideZone(_Name.toStdString().c_str());
     HOMARD_UTILS::updateObjBrowser();
   }
   catch( const SALOME::SALOME_Exception& S_ex ) {
diff --git a/src/HOMARDGUI/MonEditZone.h b/src/HOMARDGUI/MonEditZone.h
index 7bc06d44..90ef39ee 100644
--- a/src/HOMARDGUI/MonEditZone.h
+++ b/src/HOMARDGUI/MonEditZone.h
@@ -34,7 +34,7 @@ class MonEditZone : public MonCreateZone
 public:
     MonEditZone( MonCreateHypothesis* parent, bool modal,
                  HOMARD::HOMARD_Gen_var myHomardGen,
-                 QString caseName, QString zoneName);
+                 QString caseName, QString Name);
     virtual ~MonEditZone();
 
 protected :
diff --git a/src/HOMARDGUI/MonIterInfo.cxx b/src/HOMARDGUI/MonIterInfo.cxx
index f8d248fe..2f0a3e90 100644
--- a/src/HOMARDGUI/MonIterInfo.cxx
+++ b/src/HOMARDGUI/MonIterInfo.cxx
@@ -52,7 +52,7 @@ MonIterInfo::MonIterInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myH
     _Option(-1)
 {
     MESSAGE("appel de _duplicate");
-      _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
       setupUi(this);
       setModal(modal);
       InitConnect();
@@ -97,7 +97,7 @@ bool MonIterInfo::PushOnApply()
   }
 
   // Recuperation de l'iteration
-  aIter = _myHomardGen->GetIteration(_IterName.toStdString().c_str()) ;
+  aIter = myHomardGen->GetIteration(_IterName.toStdString().c_str()) ;
 
   // Lancement de l'analyse
   try
@@ -113,7 +113,7 @@ bool MonIterInfo::PushOnApply()
 
   // Le bilan de l'analyse a afficher
   QString aFileName = aIter->GetFileInfo() ;
-  MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), aFileName ) ;
+  MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), aFileName ) ;
   if ( aDlg->_codret == 0 ) { aDlg->show(); }
 
 
diff --git a/src/HOMARDGUI/MonIterInfo.h b/src/HOMARDGUI/MonIterInfo.h
index 3c6ca4ae..a86ed50d 100644
--- a/src/HOMARDGUI/MonIterInfo.h
+++ b/src/HOMARDGUI/MonIterInfo.h
@@ -56,7 +56,7 @@ protected :
     int _Option;
 
     HOMARD::HOMARD_Iteration_var aIter ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
 
diff --git a/src/HOMARDGUI/MonMeshInfo.cxx b/src/HOMARDGUI/MonMeshInfo.cxx
index 915d51a4..7d136774 100644
--- a/src/HOMARDGUI/MonMeshInfo.cxx
+++ b/src/HOMARDGUI/MonMeshInfo.cxx
@@ -47,7 +47,7 @@ MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myH
     _Entanglement(0),
     _Quality(0)
 {
-      _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
       setupUi(this);
       setModal(modal);
       InitConnect();
@@ -101,7 +101,7 @@ bool MonMeshInfo::PushOnApply()
                               QObject::tr("HOM_CASE_DIRECTORY_1") );
     return false;
   }
-  if ((aDirName != _aDirName) and (_myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
+  if ((aDirName != _aDirName) and (myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_CASE_DIRECTORY_2") );
@@ -141,7 +141,7 @@ bool MonMeshInfo::PushOnApply()
     _aCaseName = aCaseName;
     try
     {
-      _myHomardGen->MeshInfo( \
+      myHomardGen->MeshInfo( \
             CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
             CORBA::string_dup(aMeshName.toStdString().c_str()),  \
             CORBA::string_dup(aFileName.toStdString().c_str()),  \
@@ -157,11 +157,11 @@ bool MonMeshInfo::PushOnApply()
   }
 
   // Le bilan de l'analyse a afficher
-  aCase = _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
   string iter0 = aCase->GetIter0Name();
-  HOMARD::HOMARD_Iteration_var aIter =  _myHomardGen->GetIteration(iter0.c_str());
+  HOMARD::HOMARD_Iteration_var aIter =  myHomardGen->GetIteration(iter0.c_str());
   aFileName = aIter->GetFileInfo() ;
-  MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), aFileName ) ;
+  MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), aFileName ) ;
   if ( aDlg->_codret == 0 ) { aDlg->show(); }
 
 HOMARD_UTILS::updateObjBrowser();
@@ -184,7 +184,7 @@ void MonMeshInfo::PushOnHelp()
 void MonMeshInfo::SetNewCaseName()
 // ------------------------------
 {
-  HOMARD::listeCases_var  MyCases = _myHomardGen->GetAllCasesName();
+  HOMARD::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {
diff --git a/src/HOMARDGUI/MonMeshInfo.h b/src/HOMARDGUI/MonMeshInfo.h
index 6db6b184..36db9be0 100644
--- a/src/HOMARDGUI/MonMeshInfo.h
+++ b/src/HOMARDGUI/MonMeshInfo.h
@@ -49,7 +49,7 @@ protected :
     int _Quality;
 
     HOMARD::HOMARD_Cas_var aCase ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void SetNewCaseName();
diff --git a/src/HOMARDGUI/MonPursueIteration.cxx b/src/HOMARDGUI/MonPursueIteration.cxx
index 599b04ac..9fc20fb8 100644
--- a/src/HOMARDGUI/MonPursueIteration.cxx
+++ b/src/HOMARDGUI/MonPursueIteration.cxx
@@ -41,7 +41,7 @@ MonPursueIteration::MonPursueIteration (QWidget* parent, bool modal, HOMARD::HOM
     _aCaseName(""), _aDirName(""), _aDirNameStart("")
 {
   MESSAGE("Debut du constructeur de MonPursueIteration");
-  _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
   setupUi(this);
   setModal(modal);
 
@@ -94,7 +94,7 @@ bool MonPursueIteration::PushOnApply()
                               QObject::tr("HOM_CASE_DIRECTORY_1") );
     return false;
   }
-  if ((aDirName != _aDirName) and (_myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
+  if ((aDirName != _aDirName) and (myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_CASE_DIRECTORY_2") );
@@ -122,7 +122,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir d'une iteration");
-        aCase = _myHomardGen->CreateCaseFromIteration( \
+        aCase = myHomardGen->CreateCaseFromIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()) );
       }
@@ -139,7 +139,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir de la derniere iteration dans un cas");
-        aCase = _myHomardGen->CreateCaseFromCaseLastIteration( \
+        aCase = myHomardGen->CreateCaseFromCaseLastIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()) );
       }
@@ -156,7 +156,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir d'une iteration dans un cas");
-        aCase = _myHomardGen->CreateCaseFromCaseIteration( \
+        aCase = myHomardGen->CreateCaseFromCaseIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()),  \
                   Number );
@@ -192,7 +192,7 @@ void MonPursueIteration::PushOnHelp()
 void MonPursueIteration::SetNewCaseName()
 // ------------------------------
 {
-  HOMARD::listeCases_var  MyCases = _myHomardGen->GetAllCasesName();
+  HOMARD::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {
diff --git a/src/HOMARDGUI/MonPursueIteration.h b/src/HOMARDGUI/MonPursueIteration.h
index cb73e948..03c126c3 100644
--- a/src/HOMARDGUI/MonPursueIteration.h
+++ b/src/HOMARDGUI/MonPursueIteration.h
@@ -46,7 +46,7 @@ class MonPursueIteration : public QDialog, public Ui_PursueIteration
     int _Type ;
 
     HOMARD::HOMARD_Cas_var aCase ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void SetNewCaseName();
diff --git a/src/HOMARD_I/HOMARD_Cas_i.cxx b/src/HOMARD_I/HOMARD_Cas_i.cxx
index 3a0a2a28..b44f36b7 100755
--- a/src/HOMARD_I/HOMARD_Cas_i.cxx
+++ b/src/HOMARD_I/HOMARD_Cas_i.cxx
@@ -422,20 +422,20 @@ void HOMARD_Cas_i::AddIteration( const char* NomIteration )
 //=============================================================================
 //=============================================================================
 //=============================================================================
-// Ecriture d'un schema YACS
+// Creation d'un schema YACS
+// YACSName : nom du schema
 // ScriptFile : nom du fichier contenant le script de lancement du calcul
 // DirName : le repertoire de lancement des calculs du schéma
 // MeshFile : nom du fichier contenant le maillage pour le premier calcul
 //=============================================================================
-CORBA::Long HOMARD_Cas_i::WriteYACSSchema( const char* ScriptFile, const char* DirName, const char* MeshFile )
+HOMARD::HOMARD_YACS_ptr HOMARD_Cas_i::CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile )
 {
-//
-  ASSERT( myHomardCas );
 // Nom du cas
   const char* CaseName = GetName() ;
-  MESSAGE ( "WriteYACSSchema : Schema YACS pour le cas " << CaseName);
+  MESSAGE ( "CreateYACSSchema : Schema YACS pour le cas " << YACSName);
+  MESSAGE ( "nomCas     : " << CaseName);
   MESSAGE ( "ScriptFile : " << ScriptFile);
   MESSAGE ( "DirName    : " << DirName);
   MESSAGE ( "MeshFile   : " << MeshFile);
-  return _gen_i->WriteYACSSchema(CaseName, ScriptFile, DirName, MeshFile) ;
+  return _gen_i->CreateYACSSchema(YACSName, CaseName, ScriptFile, DirName, MeshFile) ;
 }
diff --git a/src/HOMARD_I/HOMARD_Cas_i.hxx b/src/HOMARD_I/HOMARD_Cas_i.hxx
index 86afbdbc..7da9eba2 100644
--- a/src/HOMARD_I/HOMARD_Cas_i.hxx
+++ b/src/HOMARD_I/HOMARD_Cas_i.hxx
@@ -100,7 +100,7 @@ public:
   void                   AddIteration( const char* NomIteration );
 
 // YACS
-  CORBA::Long            WriteYACSSchema( const char* ScriptFile, const char* DirName, const char* MeshFile );
+  HOMARD::HOMARD_YACS_ptr CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile );
 
 private:
   ::HOMARD_Cas*          myHomardCas;
diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx
index 6fd182d8..39673c01 100755
--- a/src/HOMARD_I/HOMARD_Gen_i.cxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.cxx
@@ -23,6 +23,7 @@
 #include "HOMARD_Iteration_i.hxx"
 #include "HOMARD_Boundary_i.hxx"
 #include "HOMARD_Zone_i.hxx"
+#include "HOMARD_YACS_i.hxx"
 #include "HomardDriver.hxx"
 #include "HOMARD_DriverTools.hxx"
 #include "HomardMedCommun.h"
@@ -442,6 +443,32 @@ CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long
   return 0 ;
 }
 //=============================================================================
+CORBA::Long HOMARD_Gen_i::DeleteYACS(const char* nomYACS, CORBA::Long Option)
+{
+  //  Option = 0 : On ne supprime pas le fichier du schema associe
+  //  Option = 1 : On supprime le fichier du schema associe
+  // Pour detruire une iteration courante
+  MESSAGE ( "DeleteYACS : nomYACS = " << nomYACS << ", avec option = " << Option );
+  HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+  if (CORBA::is_nil(myYACS))
+  {
+    SALOME::ExceptionStruct es;
+    es.type = SALOME::BAD_PARAM;
+    es.text = "Invalid schema YACS";
+    throw SALOME::SALOME_Exception(es);
+    return 1 ;
+  };
+  ASSERT("Programmer le menage du fichier"!=0);
+  // comme on a un _var comme pointeur CORBA, on ne se preoccupe pas du delete
+  myContextMap[GetCurrentStudyID()]._mesYACSs.erase(nomYACS);
+  SALOMEDS::Study::ListOfSObject_var listSO = myCurrentStudy->FindObjectByName(nomYACS, ComponentDataType());
+  SALOMEDS::SObject_var aSO =listSO[0];
+  SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+  myCurrentStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
+
+  return 0 ;
+}
+//=============================================================================
 CORBA::Long HOMARD_Gen_i::DeleteZone(const char* nomZone)
 {
   MESSAGE ( "DeleteZone : nomZone = " << nomZone );
@@ -847,6 +874,24 @@ void HOMARD_Gen_i::DissociateHypoZone(const char* nomHypothesis, const char* Zon
 // Recuperation des listes
 //=============================================================================
 //=============================================================================
+HOMARD::listeBoundarys* HOMARD_Gen_i::GetAllBoundarysName()
+{
+  MESSAGE("GetAllBoundarysName");
+  IsValidStudy () ;
+
+  HOMARD::listeBoundarys_var ret = new HOMARD::listeBoundarys;
+  ret->length(myContextMap[GetCurrentStudyID()]._mesBoundarys.size());
+  std::map<std::string, HOMARD::HOMARD_Boundary_var>::const_iterator it;
+  int i = 0;
+  for (it = myContextMap[GetCurrentStudyID()]._mesBoundarys.begin();
+  it != myContextMap[GetCurrentStudyID()]._mesBoundarys.end(); it++)
+  {
+    ret[i++] = CORBA::string_dup((*it).first.c_str());
+  }
+
+  return ret._retn();
+}
+//=============================================================================
 HOMARD::listeCases* HOMARD_Gen_i::GetAllCasesName()
 {
   MESSAGE("GetAllCasesName");
@@ -883,17 +928,17 @@ HOMARD::listeHypotheses* HOMARD_Gen_i::GetAllHypothesesName()
   return ret._retn();
 }
 //=============================================================================
-HOMARD::listeZones* HOMARD_Gen_i::GetAllZonesName()
+HOMARD::listeIterations* HOMARD_Gen_i::GetAllIterationsName()
 {
-  MESSAGE("GetAllZonesName");
+  MESSAGE("GetAllIterationsName");
   IsValidStudy () ;
 
-  HOMARD::listeZones_var ret = new HOMARD::listeZones;
-  ret->length(myContextMap[GetCurrentStudyID()]._mesZones.size());
-  std::map<std::string, HOMARD::HOMARD_Zone_var>::const_iterator it;
+  HOMARD::listeIterations_var ret = new HOMARD::listeIterations;
+  ret->length(myContextMap[GetCurrentStudyID()]._mesIterations.size());
+  std::map<std::string, HOMARD::HOMARD_Iteration_var>::const_iterator it;
   int i = 0;
-  for (it = myContextMap[GetCurrentStudyID()]._mesZones.begin();
-  it != myContextMap[GetCurrentStudyID()]._mesZones.end(); it++)
+  for (it = myContextMap[GetCurrentStudyID()]._mesIterations.begin();
+  it != myContextMap[GetCurrentStudyID()]._mesIterations.end(); it++)
   {
     ret[i++] = CORBA::string_dup((*it).first.c_str());
   }
@@ -901,17 +946,17 @@ HOMARD::listeZones* HOMARD_Gen_i::GetAllZonesName()
   return ret._retn();
 }
 //=============================================================================
-HOMARD::listeIterations* HOMARD_Gen_i::GetAllIterationsName()
+HOMARD::listeYACSs* HOMARD_Gen_i::GetAllYACSsName()
 {
-  MESSAGE("GetAllIterationsName");
+  MESSAGE("GetAllYACSsName");
   IsValidStudy () ;
 
-  HOMARD::listeIterations_var ret = new HOMARD::listeIterations;
-  ret->length(myContextMap[GetCurrentStudyID()]._mesIterations.size());
-  std::map<std::string, HOMARD::HOMARD_Iteration_var>::const_iterator it;
+  HOMARD::listeYACSs_var ret = new HOMARD::listeYACSs;
+  ret->length(myContextMap[GetCurrentStudyID()]._mesYACSs.size());
+  std::map<std::string, HOMARD::HOMARD_YACS_var>::const_iterator it;
   int i = 0;
-  for (it = myContextMap[GetCurrentStudyID()]._mesIterations.begin();
-  it != myContextMap[GetCurrentStudyID()]._mesIterations.end(); it++)
+  for (it = myContextMap[GetCurrentStudyID()]._mesYACSs.begin();
+  it != myContextMap[GetCurrentStudyID()]._mesYACSs.end(); it++)
   {
     ret[i++] = CORBA::string_dup((*it).first.c_str());
   }
@@ -919,17 +964,17 @@ HOMARD::listeIterations* HOMARD_Gen_i::GetAllIterationsName()
   return ret._retn();
 }
 //=============================================================================
-HOMARD::listeBoundarys* HOMARD_Gen_i::GetAllBoundarysName()
+HOMARD::listeZones* HOMARD_Gen_i::GetAllZonesName()
 {
-  MESSAGE("GetAllBoundarysName");
+  MESSAGE("GetAllZonesName");
   IsValidStudy () ;
 
-  HOMARD::listeBoundarys_var ret = new HOMARD::listeBoundarys;
-  ret->length(myContextMap[GetCurrentStudyID()]._mesBoundarys.size());
-  std::map<std::string, HOMARD::HOMARD_Boundary_var>::const_iterator it;
+  HOMARD::listeZones_var ret = new HOMARD::listeZones;
+  ret->length(myContextMap[GetCurrentStudyID()]._mesZones.size());
+  std::map<std::string, HOMARD::HOMARD_Zone_var>::const_iterator it;
   int i = 0;
-  for (it = myContextMap[GetCurrentStudyID()]._mesBoundarys.begin();
-  it != myContextMap[GetCurrentStudyID()]._mesBoundarys.end(); it++)
+  for (it = myContextMap[GetCurrentStudyID()]._mesZones.begin();
+  it != myContextMap[GetCurrentStudyID()]._mesZones.end(); it++)
   {
     ret[i++] = CORBA::string_dup((*it).first.c_str());
   }
@@ -944,6 +989,13 @@ HOMARD::listeBoundarys* HOMARD_Gen_i::GetAllBoundarysName()
 // Recuperation des structures identifiees par leurs noms
 //=============================================================================
 //=============================================================================
+HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::GetBoundary(const char* nomBoundary)
+{
+  HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[nomBoundary];
+  ASSERT(!CORBA::is_nil(myBoundary));
+  return HOMARD::HOMARD_Boundary::_duplicate(myBoundary);
+}
+//=============================================================================
 HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::GetCase(const char* nomCas)
 {
   HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
@@ -951,13 +1003,6 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::GetCase(const char* nomCas)
   return HOMARD::HOMARD_Cas::_duplicate(myCase);
 }
 //=============================================================================
-HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::GetZone(const char* ZoneName)
-{
-  HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
-  ASSERT(!CORBA::is_nil(myZone));
-  return HOMARD::HOMARD_Zone::_duplicate(myZone);
-}
-//=============================================================================
 HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::GetHypothesis(const char* nomHypothesis)
 {
   HOMARD::HOMARD_Hypothesis_var myHypothesis = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis];
@@ -972,11 +1017,18 @@ HOMARD::HOMARD_Iteration_ptr  HOMARD_Gen_i::GetIteration(const char* NomIteratio
   return HOMARD::HOMARD_Iteration::_duplicate(myIteration);
 }
 //=============================================================================
-HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::GetBoundary(const char* nomBoundary)
+HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::GetYACS(const char* YACSName)
 {
-  HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[nomBoundary];
-  ASSERT(!CORBA::is_nil(myBoundary));
-  return HOMARD::HOMARD_Boundary::_duplicate(myBoundary);
+  HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[YACSName];
+  ASSERT(!CORBA::is_nil(myYACS));
+  return HOMARD::HOMARD_YACS::_duplicate(myYACS);
+}
+//=============================================================================
+HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::GetZone(const char* ZoneName)
+{
+  HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
+  ASSERT(!CORBA::is_nil(myZone));
+  return HOMARD::HOMARD_Zone::_duplicate(myZone);
 }
 //=============================================================================
 //=============================================================================
@@ -1066,6 +1118,14 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::newZone()
   return aZone._retn();
 }
 //=============================================================================
+HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::newYACS()
+{
+  HOMARD::HOMARD_Gen_var engine = POA_HOMARD::HOMARD_Gen::_this();
+  HOMARD_YACS_i* aServant = new HOMARD_YACS_i(_orb, engine);
+  HOMARD::HOMARD_YACS_var aYACS = HOMARD::HOMARD_YACS::_narrow(aServant->_this());
+  return aYACS._retn();
+}
+//=============================================================================
 //=============================================================================
 
 //=============================================================================
@@ -1496,7 +1556,7 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char*
   HOMARD::HOMARD_Cas_var myCase = newCase();
   myCase->SetName(nomCas);
   SALOMEDS::SObject_var aSO;
-  PublishInStudy(myCurrentStudy, aSO, myCase, nomCas);
+  SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myCase, nomCas);
   myContextMap[GetCurrentStudyID()]._mesCas[nomCas] = myCase;
 
   // C. Caracteristiques du maillage
@@ -1564,10 +1624,10 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char*
 //=============================================================================
 HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypothesis)
 {
-  INFOS ( "CreateHypothesis : nomHypothesis  = " << nomHypothesis );
+  INFOS ( "CreateHypothesis : nomHypothesis = " << nomHypothesis );
   IsValidStudy () ;
 
-  // Controle du nom :
+  // A. Controle du nom :
   if ((myContextMap[GetCurrentStudyID()]._mesHypotheses).find(nomHypothesis) != (myContextMap[GetCurrentStudyID()]._mesHypotheses).end())
   {
     SALOME::ExceptionStruct es;
@@ -1577,13 +1637,25 @@ HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypo
     return 0;
   }
 
+  // B. Creation de l'objet
   HOMARD::HOMARD_Hypothesis_var myHypothesis = newHypothesis();
+  if (CORBA::is_nil(myHypothesis))
+  {
+    SALOME::ExceptionStruct es;
+    es.type = SALOME::BAD_PARAM;
+    es.text = "Unable to create the hypothesis";
+    throw SALOME::SALOME_Exception(es);
+    return 0;
+  };
   myHypothesis->SetName(nomHypothesis);
+
+  // C. Enregistrement
   myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis] = myHypothesis;
+
   SALOMEDS::SObject_var aSO;
-  PublishInStudy(myCurrentStudy, aSO, myHypothesis, nomHypothesis);
+  SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myHypothesis, nomHypothesis);
 
-// Valeurs par defaut des options avancees
+  // D. Valeurs par defaut des options avancees
   myHypothesis->SetNivMax(-1);
   myHypothesis->SetDiamMin(-1.0);
   myHypothesis->SetAdapInit(0);
@@ -2921,21 +2993,21 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
 
 // Recuperation de l'objet correspondant, en essayant chacun des types possibles
 // Rq : Iteration est publiee ailleurs
+  HOMARD::HOMARD_Boundary_var   aBoundary = HOMARD::HOMARD_Boundary::_narrow(theObject);
   HOMARD::HOMARD_Cas_var        aCase  = HOMARD::HOMARD_Cas::_narrow(theObject);
   HOMARD::HOMARD_Hypothesis_var aHypo = HOMARD::HOMARD_Hypothesis::_narrow(theObject);
+  HOMARD::HOMARD_YACS_var       aYACS = HOMARD::HOMARD_YACS::_narrow(theObject);
   HOMARD::HOMARD_Zone_var       aZone = HOMARD::HOMARD_Zone::_narrow(theObject);
-  HOMARD::HOMARD_Boundary_var   aBoundary = HOMARD::HOMARD_Boundary::_narrow(theObject);
 
    addInStudy(theStudy);
 
 // Controle de la non publication d'un objet de meme nom
-   if ((!aHypo->_is_nil()) or (!aZone->_is_nil()) or (!aBoundary->_is_nil()))
+   if ( (!aBoundary->_is_nil()) or (!aHypo->_is_nil()) or (!aYACS->_is_nil()) or (!aZone->_is_nil()) )
   {
     SALOMEDS::Study::ListOfSObject_var listSO = theStudy->FindObjectByName(theName, ComponentDataType());
     if (listSO->length() >= 1)
     {
       MESSAGE("This name "<<theName<<" is already used "<<listSO->length()<<" time(s)");
-      std::cerr <<"This name "<<theName<<" is already used "<<listSO->length()<<" time(s)" << std::endl;
       aResultSO = listSO[0];
       return aResultSO._retn();
     }
@@ -2944,19 +3016,88 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
   // Caracteristiques de l'etude
   SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
   aStudyBuilder->NewCommand();
-  if(!aCase->_is_nil())
+  if(!aBoundary->_is_nil())
+    aResultSO = PublishBoundaryInStudy(theStudy, aStudyBuilder, aBoundary, theName);
+  else if(!aCase->_is_nil())
     aResultSO = PublishCaseInStudy(theStudy, aStudyBuilder, aCase, theName);
   else if(!aHypo->_is_nil())
     aResultSO = PublishHypotheseInStudy(theStudy, aStudyBuilder, aHypo, theName);
   else if(!aZone->_is_nil())
     aResultSO = PublishZoneInStudy(theStudy, aStudyBuilder, aZone, theName);
-  else if(!aBoundary->_is_nil())
-    aResultSO = PublishBoundaryInStudy(theStudy, aStudyBuilder, aBoundary, theName);
+  else if(!aYACS->_is_nil())
+    aResultSO = PublishYACSInStudy(theStudy, aStudyBuilder, aYACS, theName);
+
+  aStudyBuilder->CommitCommand();
 
-    aStudyBuilder->CommitCommand();
   return aResultSO._retn();
 };
 //=============================================================================
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishBoundaryInStudy(SALOMEDS::Study_ptr theStudy,
+                   SALOMEDS::StudyBuilder_var aStudyBuilder,
+                   HOMARD::HOMARD_Boundary_ptr theObject, const char* theName)
+{
+  MESSAGE("PublishBoundaryStudy pour "<<theName);
+  SALOMEDS::SObject_var aResultSO;
+  SALOMEDS::GenericAttribute_var anAttr;
+
+  // Caracteristique de la Boundary
+  HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[theName];
+
+  // On recupere le module pere dans l etude
+  SALOMEDS::SComponent_var       theFatherHomard = theStudy->FindComponent(ComponentDataType());
+  if (theFatherHomard->_is_nil())
+  {
+    MESSAGE("theFatherHomard->_is_nil()");
+    return aResultSO._retn();
+  }
+
+  // On ajoute la categorie des boundarys dans l etude si necessaire
+  SALOMEDS::SObject_var aSObject;
+  if (!theFatherHomard->FindSubObject(101, aSObject))
+  {
+    MESSAGE("Ajout de la categorie des boundarys");
+    aSObject = aStudyBuilder->NewObjectToTag(theFatherHomard, 101);
+    PublishInStudyAttr(aStudyBuilder, aSObject, "Boundaries", "BoundList", "zone_icone_2.png", NULL ) ;
+  }
+  else { MESSAGE("La categorie des boundarys existe deja."); }
+
+  CORBA::Long BoundaryType = myBoundary->GetType();
+//   MESSAGE("BoundaryType : "<<BoundaryType);
+  std::string icone ;
+  std::string value ;
+  switch (BoundaryType)
+  {
+    case 0 :
+    { value = "BoundaryDiHomard" ;
+      icone = "mesh_tree_mesh.png" ;
+      break;
+    }
+    case 1 :
+    { value = "BoundaryAnHomard" ;
+      icone = "cylinderpointvector_2.png" ;
+      break;
+    }
+    case 2 :
+    { value = "BoundaryAnHomard" ;
+      icone = "spherepoint_2.png" ;
+      break;
+    }
+    case 3 :
+    { value = "BoundaryAnHomard" ;
+      icone = "conepointvector.png" ;
+      break;
+    }
+    case 4 :
+    { value = "BoundaryAnHomard" ;
+      icone = "conedxyz.png" ;
+      break;
+    }
+  }
+  aResultSO = aStudyBuilder->NewObject(aSObject);
+  PublishInStudyAttr(aStudyBuilder, aResultSO, theName, value.c_str(), icone.c_str(), _orb->object_to_string(theObject));
+  return aResultSO._retn();
+}
+//=============================================================================
 SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishCaseInStudy(SALOMEDS::Study_ptr theStudy,
                                                        SALOMEDS::StudyBuilder_var aStudyBuilder,
                                                        HOMARD::HOMARD_Cas_ptr theObject, const char* theName)
@@ -2986,10 +3127,74 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishCaseInStudy(SALOMEDS::Study_ptr theSt
                      _orb->object_to_string(theObject) ) ;
   return aResultSO._retn();
 }
+//=============================================================================
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishHypotheseInStudy(SALOMEDS::Study_ptr theStudy,
+                   SALOMEDS::StudyBuilder_var aStudyBuilder,
+                   HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName)
+{
+  MESSAGE("PublishHypotheseInStudy pour "<<theName);
+  SALOMEDS::SObject_var aResultSO;
+  SALOMEDS::GenericAttribute_var anAttr;
+
+  // On recupere le module pere dans l etude
+  // On ajoute la categorie des hypotheses dans l etude si necessaire
+  SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
+  if (theFatherHomard->_is_nil())
+  {
+    MESSAGE("theFatherHomard->_is_nil()");
+    return aResultSO._retn();
+  }
+  SALOMEDS::SObject_var aSObject;
+  if (!theFatherHomard->FindSubObject(0, aSObject))
+  {
+    MESSAGE("Ajout de la categorie des hypotheses");
+    aSObject = aStudyBuilder->NewObjectToTag(theFatherHomard, 0);
+    PublishInStudyAttr(aStudyBuilder, aSObject, "Hypothesis", "HypoList", "hypotheses.png", NULL);
+  }
+  else { MESSAGE("La categorie des hypotheses existe deja."); }
+
+// Creation du resultat dans l'etude
+  aResultSO = aStudyBuilder->NewObject(aSObject);
+  PublishInStudyAttr(aStudyBuilder, aResultSO, theName, "HypoHomard", NULL, _orb->object_to_string(theObject) ) ;
+
+  return aResultSO._retn();
+}
+//=============================================================================
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishYACSInStudy(SALOMEDS::Study_ptr theStudy,
+                   SALOMEDS::StudyBuilder_var aStudyBuilder,
+                   HOMARD::HOMARD_YACS_ptr theObject, const char* theName)
+{
+  MESSAGE("PublishYACSInStudy pour "<<theName);
+  SALOMEDS::SObject_var aResultSO;
+  SALOMEDS::GenericAttribute_var anAttr;
+
+  // On recupere le module pere dans l etude
+  // On ajoute la categorie des schemas YACS dans l etude si necessaire
+  SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
+  if (theFatherHomard->_is_nil())
+  {
+    MESSAGE("theFatherHomard->_is_nil()");
+    return aResultSO._retn();
+  }
+  SALOMEDS::SObject_var aSObject;
+  if (!theFatherHomard->FindSubObject(102, aSObject))
+  {
+    MESSAGE("Ajout de la categorie des schemas YACS");
+    aSObject = aStudyBuilder->NewObjectToTag(theFatherHomard, 102);
+    PublishInStudyAttr(aStudyBuilder, aSObject, "YACS", "YACSList", "full_view.png", NULL);
+  }
+  else { MESSAGE("La categorie des schemas YACS existe deja."); }
+
+// Creation du resultat dans l'etude
+  aResultSO = aStudyBuilder->NewObject(aSObject);
+  PublishInStudyAttr(aStudyBuilder, aResultSO, theName, "YACSHomard", "schema.png", _orb->object_to_string(theObject) ) ;
+
+  return aResultSO._retn();
+}
 
 //=============================================================================
 SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishZoneInStudy(SALOMEDS::Study_ptr theStudy,
-                    SALOMEDS::StudyBuilder_var aStudyBuilder,
+                   SALOMEDS::StudyBuilder_var aStudyBuilder,
                    HOMARD::HOMARD_Zone_ptr theObject, const char* theName)
 {
   MESSAGE("PublishZoneStudy pour "<<theName);
@@ -3018,16 +3223,16 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishZoneInStudy(SALOMEDS::Study_ptr theSt
   CORBA::Long ZoneType = myZone->GetType();
 
   // On ajoute la categorie des zones dans l etude si necessaire
-  SALOMEDS::SObject_var aSOZone;
-  if (!theFatherHomard->FindSubObject(100, aSOZone))
+  SALOMEDS::SObject_var aSObject;
+  if (!theFatherHomard->FindSubObject(100, aSObject))
   {
     MESSAGE("Ajout de la categorie des zones");
-    aSOZone = aStudyBuilder->NewObjectToTag(theFatherHomard, 100);
-    PublishInStudyAttr(aStudyBuilder, aSOZone, "Zones", "ZoneList", "zone_icone_2.png", NULL ) ;
+    aSObject = aStudyBuilder->NewObjectToTag(theFatherHomard, 100);
+    PublishInStudyAttr(aStudyBuilder, aSObject, "Zones", "ZoneList", "zone_icone_2.png", NULL ) ;
   }
   else { MESSAGE("La categorie des zones existe deja."); }
 
-  aResultSO = aStudyBuilder->NewObject(aSOZone);
+  aResultSO = aStudyBuilder->NewObject(aSObject);
   std::string icone ;
   switch (ZoneType)
   {
@@ -3076,110 +3281,15 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishZoneInStudy(SALOMEDS::Study_ptr theSt
 
   return aResultSO._retn();
 }
-//=============================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishBoundaryInStudy(SALOMEDS::Study_ptr theStudy,
-                   SALOMEDS::StudyBuilder_var aStudyBuilder,
-                   HOMARD::HOMARD_Boundary_ptr theObject, const char* theName)
-{
-  MESSAGE("PublishBoundaryStudy pour "<<theName);
-  SALOMEDS::SObject_var aResultSO;
-  SALOMEDS::GenericAttribute_var anAttr;
-
-  // Caracteristique de la Boundary
-  HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[theName];
-
-  // On recupere le module pere dans l etude
-  SALOMEDS::SComponent_var       theFatherHomard = theStudy->FindComponent(ComponentDataType());
-  if (theFatherHomard->_is_nil())
-  {
-    MESSAGE("theFatherHomard->_is_nil()");
-    return aResultSO._retn();
-  }
-
-  // On ajoute la categorie des boundarys dans l etude si necessaire
-  SALOMEDS::SObject_var aSOBoundary;
-  if (!theFatherHomard->FindSubObject(101, aSOBoundary))
-  {
-    MESSAGE("Ajout de la categorie des boundarys");
-    aSOBoundary = aStudyBuilder->NewObjectToTag(theFatherHomard, 101);
-    PublishInStudyAttr(aStudyBuilder, aSOBoundary, "Boundaries", "BoundList", "zone_icone_2.png", NULL ) ;
-  }
-  else { MESSAGE("La categorie des boundarys existe deja."); }
-
-  aResultSO = aStudyBuilder->NewObject(aSOBoundary);
-  CORBA::Long BoundaryType = myBoundary->GetType();
-//   MESSAGE("BoundaryType : "<<BoundaryType);
-  std::string icone ;
-  std::string value ;
-  switch (BoundaryType)
-  {
-    case 0 :
-    { value = "BoundaryDiHomard" ;
-      icone = "mesh_tree_mesh.png" ;
-      break;
-    }
-    case 1 :
-    { value = "BoundaryAnHomard" ;
-      icone = "cylinderpointvector_2.png" ;
-      break;
-    }
-    case 2 :
-    { value = "BoundaryAnHomard" ;
-      icone = "spherepoint_2.png" ;
-      break;
-    }
-    case 3 :
-    { value = "BoundaryAnHomard" ;
-      icone = "conepointvector.png" ;
-      break;
-    }
-    case 4 :
-    { value = "BoundaryAnHomard" ;
-      icone = "conedxyz.png" ;
-      break;
-    }
-  }
-  PublishInStudyAttr(aStudyBuilder, aResultSO, theName, value.c_str(), icone.c_str(), _orb->object_to_string(theObject));
-  return aResultSO._retn();
-}
-
-//=============================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishHypotheseInStudy(SALOMEDS::Study_ptr theStudy,
-                   SALOMEDS::StudyBuilder_var aStudyBuilder,
-                   HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName)
-{
-  MESSAGE("PublishHypotheseInStudy pour "<<theName);
-  SALOMEDS::SObject_var aResultSO;
-  SALOMEDS::GenericAttribute_var anAttr;
-
-  // On recupere le module pere dans l etude
-  // On ajoute la categorie des hypotheses dans l etude si necessaire
-  SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
-  if (theFatherHomard->_is_nil())
-  {
-    MESSAGE("theFatherHomard->_is_nil()");
-    return aResultSO._retn();
-  }
-  SALOMEDS::SObject_var aSOHypothese;
-  if (!theFatherHomard->FindSubObject(0, aSOHypothese))
-  {
-    MESSAGE("Ajout de la categorie des hypotheses");
-    aSOHypothese = aStudyBuilder->NewObjectToTag(theFatherHomard, 0);
-    PublishInStudyAttr(aStudyBuilder, aSOHypothese, "Hypothesis", "HypoList","hypotheses.png", NULL);
-  }
-  else { MESSAGE("La categorie des hypotheses existe deja."); }
-
-// Creation du resultat dans l'etude
-  aResultSO = aStudyBuilder->NewObject(aSOHypothese);
-  PublishInStudyAttr(aStudyBuilder, aResultSO, theName, "HypoHomard", NULL, _orb->object_to_string(theObject) ) ;
-
-  return aResultSO._retn();
-}
 //===========================================================================
 void HOMARD_Gen_i::PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder,
                                       SALOMEDS::SObject_var aResultSO,
                                       const char* name, const char* value, const char* icone, const char* ior)
 {
+  MESSAGE("PublishInStudyAttr pour name = "<<name);
+  MESSAGE("value = "<<value);
+//   MESSAGE("icone = "<<icone);
+//   MESSAGE("ior   = "<<ior);
   SALOMEDS::GenericAttribute_var anAttr ;
 //  Ajout du nom
   if ( name != NULL )
@@ -3200,7 +3310,7 @@ void HOMARD_Gen_i::PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder,
 //  Ajout de l'icone
   if ( icone != NULL  )
   {
-    anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO,"AttributePixMap");
+    anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributePixMap");
     SALOMEDS::AttributePixMap_var aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
     aPixmap->SetPixMap(icone);
   }
@@ -3425,28 +3535,81 @@ void HOMARD_Gen_i::PublishFileUnderIteration(const char* NomIter, const char* No
 //=============================================================================
 //=============================================================================
 //=============================================================================
-// Ecriture d'un schema YACS
+// Creation d'un schema YACS
 // nomCas : nom du cas a traiter
 // FileName : nom du fichier contenant le script de lancement du calcul
 // DirName : le repertoire de lancement des calculs du schéma
 //=============================================================================
-CORBA::Long HOMARD_Gen_i::WriteYACSSchema (const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile)
+HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile)
+{
+  INFOS ( "CreateYACSSchema : Schema YACS " << YACSName );
+  INFOS ( ". nomCas     : " << nomCas);
+  INFOS ( ". ScriptFile : " << ScriptFile);
+  INFOS ( ". DirName    : " << DirName);
+  INFOS ( ". MeshFile   : " << MeshFile);
+
+  // A. Controle du nom :
+  if ((myContextMap[GetCurrentStudyID()]._mesYACSs).find(YACSName) != (myContextMap[GetCurrentStudyID()]._mesYACSs).end())
+  {
+    SALOME::ExceptionStruct es;
+    es.type = SALOME::BAD_PARAM;
+    es.text = "This schema YACS has already been defined.";
+    throw SALOME::SALOME_Exception(es);
+    return 0;
+  }
+
+  // B. Creation de l'objet
+  HOMARD::HOMARD_YACS_var myYACS = newYACS();
+  if (CORBA::is_nil(myYACS))
+  {
+    SALOME::ExceptionStruct es;
+    es.type = SALOME::BAD_PARAM;
+    es.text = "Unable to create the schema YACS";
+    throw SALOME::SALOME_Exception(es);
+    return 0;
+  };
+  myYACS->SetName( YACSName ) ;
+
+  // C. Enregistrement
+  myContextMap[GetCurrentStudyID()]._mesYACSs[YACSName] = myYACS;
+
+  SALOMEDS::SObject_var aSO;
+  SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myYACS, YACSName);
+
+  // D. Caracterisation
+  myYACS->SetDirName( DirName ) ;
+  myYACS->SetMeshFile( MeshFile ) ;
+  myYACS->SetScriptFile( ScriptFile ) ;
+  myYACS->SetCaseName( nomCas ) ;
+  myYACS->SetType( 1 ) ;
+
+  return HOMARD::HOMARD_YACS::_duplicate(myYACS);
+}
+//=============================================================================
+// Ecriture d'un schema YACS
+//=============================================================================
+CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* YACSFile)
 {
-  INFOS ( "WriteYACSSchema : Schema YACS pour le cas " << nomCas);
-  INFOS ( "ScriptFile : " << ScriptFile);
-  INFOS ( "DirName    : " << DirName);
-  INFOS ( "MeshFile   : " << MeshFile);
+  INFOS ( "YACSWriteOnFile : Ecriture de " << nomYACS << " sur " << YACSFile );
 
+  // A. Prealable
   int codret = 0;
 
-  // A. Le cas
-  // A.1. L'objet cas
+  // B. L'objet YACS
+  // B.1. L'objet
+  HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+  ASSERT(!CORBA::is_nil(myYACS));
+  // B.2. Les caracteristiques
+  std::string DirName = myYACS->GetDirName() ;
+  std::string MeshFile = myYACS->GetMeshFile() ;
+  std::string ScriptFile = myYACS->GetScriptFile() ;
+
+  // C. Le cas
+  // C.1. L'objet cas
+  const char* nomCas = myYACS->GetCaseName();
   HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
   ASSERT(!CORBA::is_nil(myCase));
-  // A.2. Le repertoire du cas
-  std::string nomDirCase = myCase->GetDirName();
-  MESSAGE ( ". nomDirCase = " << nomDirCase );
-  // A.3. Les instructions python associees au cas
+  // C.2. Les instructions python associees au cas
   CORBA::String_var dumpCorbaCase = myCase->GetDumpPython();
   std::string pythonCas = dumpCorbaCase.in();
   MESSAGE ("pythonCas :\n"<<pythonCas<<"\n");
@@ -3474,75 +3637,70 @@ CORBA::Long HOMARD_Gen_i::WriteYACSSchema (const char* nomCas, const char* Scrip
   HOMARD::HOMARD_Iteration_var Iter1 = GetIteration(Iter1Name.c_str()) ;
   MESSAGE (". Iter1 = " << Iter1);
 
-  // C. L'hypothese
-  // C.1. La structure
+  // E. L'hypothese pour passer de l'iteration initiale a la suivante
+  // E.1. La structure
   std::string nomHypo = Iter1->GetHypoName();
   MESSAGE (". nomHypo = " << nomHypo);
   HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo];
   ASSERT(!CORBA::is_nil(myHypo));
-  // C.2. Les caracteristiques de l'adaptation
+  // E.2. Les caracteristiques de l'adaptation
   HOMARD::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef();
   ASSERT(ListTypes->length() == 3);
   int TypeAdap = (*ListTypes)[0];
 //   int TypeRaff = (*ListTypes)[1];
 //   int TypeDera = (*ListTypes)[2];
-  // C.3. Les instructions python associees a l'hypothese
+  // E.3. Les instructions python associees a l'hypothese
   CORBA::String_var dumpCorbaHypo = myHypo->GetDumpPython();
   std::string pythonHypo = dumpCorbaHypo.in();
   MESSAGE ("pythonHypo :\n"<<pythonHypo<<"\n");
 
-  // E. Les fichiers du schema
-  // E.1. Le fichier du schema de reference
-  // Le repertoire ou se trouve l'executable HOMARD
+  // F. Le fichier du schema de reference
+  // HOMARD_ROOT_DIR : repertoire ou se trouve le module HOMARD
   std::string YACSFile_base ;
   if ( getenv("HOMARD_ROOT_DIR") != NULL ) { YACSFile_base = getenv("HOMARD_ROOT_DIR") ; }
   else                                     { ASSERT("HOMARD_ROOT_DIR est inconnu." == 0) ; }
   YACSFile_base += "/share/salome/resources/homard/yacs_01.xml" ;
   MESSAGE("YACSFile_base ="<<YACSFile_base);
-  // E.2. Le fichier du schema a creer
-  std::string YACSFile = nomDirCase ;
-  YACSFile += "/schema.xml" ;
-  MESSAGE (". YACSFile = " << YACSFile);
-  YACSDriver* myDriver = new YACSDriver(YACSFile, DirName);
 
-  // F. Lecture du schema de reference et insertion des donnees propres au fil de la rencontre des mots-cles
+  // G. Lecture du schema de reference et insertion des donnees propres au fil de la rencontre des mots-cles
+  YACSDriver* myDriver = new YACSDriver(YACSFile, DirName);
   std::ifstream fichier( YACSFile_base.c_str() );
   if ( fichier ) // ce test échoue si le fichier n'est pas ouvert
   {
-    // F.1. Lecture du schema de reference et insertion des donnees propres au fil de la rencontre des mots-cles
+    // G.1. Lecture du schema de reference et insertion des donnees propres au fil de la rencontre des mots-cles
     std::string ligne; // variable contenant chaque ligne lue
     std::string mot_cle;
     while ( std::getline( fichier, ligne ) )
     {
-      // F.1.1. Pour la ligne courante, on identifie le premier mot : le mot-cle eventuel
+      // G.1.1. Pour la ligne courante, on identifie le premier mot : le mot-cle eventuel
       std::istringstream ligne_bis(ligne); // variable contenant chaque ligne sous forme de flux
       ligne_bis >> mot_cle ;
-      // F.1.2. Le maillage initial
+      // G.1.2. Le maillage initial
       if ( mot_cle == "DataInit_MeshFile" )
       {
         myDriver->Texte_DataInit_MeshFile(MeshFile);
       }
-      // F.1.3. Le script de lancement
+      // G.1.3. Le script de lancement
       else if ( mot_cle == "Alternance_Calcul_HOMARD_Calcul" )
       {
         myDriver->Texte_Alternance_Calcul_HOMARD_Calcul(ScriptFile);
       }
-      // F.1.4. Les options du cas
+      // G.1.4. Les options du cas
       else if ( mot_cle == "HOMARD_Init_au_debut_Case_Options" )
       {
         myDriver->Texte_HOMARD_Init_au_debut_Case_Options(pythonCas);
       }
-      // F.1.5. Execution de HOMARD : le repertoire du cas
+      // G.1.5. Execution de HOMARD : le repertoire du cas
       else if ( mot_cle == "HOMARD_Exec_DirName" )
       {
         myDriver->Texte_HOMARD_Exec_DirName();
       }
-      // F.1.6. Execution de HOMARD : les options de l'hypothese
+      // G.1.6. Execution de HOMARD : les options de l'hypothese
       else if ( mot_cle == "HOMARD_Exec_Hypo_Options" )
       {
         myDriver->Texte_python( pythonHypo, 3, "Hypo" ) ;
       }
-      // F.1.7. Zones et frontieres : les creations
+      // G.1.7. Zones et frontieres : les creations
       else if ( mot_cle == "HOMARD_Init_au_debut" )
       {
         std::string texte_control = myDriver->Texte_HOMARD_Init_au_debut_control() ;
@@ -3550,19 +3708,19 @@ CORBA::Long HOMARD_Gen_i::WriteYACSSchema (const char* nomCas, const char* Scrip
         texte_control += YACSDriverTexteBoundary( myCase, myDriver ) ;
         myDriver->TexteAdd(texte_control);
       }
-      // F.1.8. Zones : les parametres
+      // G.1.8. Zones : les parametres
       else if ( mot_cle == "PARAMETRES" )
       {
         if ( TypeAdap == 0 )
         { myDriver->TexteAddParametres(); }
       }
-      // F.1.n. La ligne est recopiee telle quelle
+      // G.1.n. La ligne est recopiee telle quelle
       else
       {
         myDriver->TexteAdd(ligne);
       }
     }
-    // F.2. Ecriture du texte dans le fichier
+    // G.2. Ecriture du texte dans le fichier
     if ( codret == 0 )
     { myDriver->CreeFichier(); }
   }
@@ -3854,12 +4012,24 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
 
   while (f) {
     std::getline(f, line);
+    std::string bounSignature = HOMARD::GetSignature(HOMARD::Boundary);
     std::string caseSignature = HOMARD::GetSignature(HOMARD::Case);
-    std::string zoneSignature = HOMARD::GetSignature(HOMARD::Zone);
-    std::string iterSignature = HOMARD::GetSignature(HOMARD::Iteration);
     std::string hypoSignature = HOMARD::GetSignature(HOMARD::Hypothesis);
-    std::string bounSignature = HOMARD::GetSignature(HOMARD::Boundary);
-    if (line.substr(0, caseSignature.size()) == caseSignature) {
+    std::string iterSignature = HOMARD::GetSignature(HOMARD::Iteration);
+    std::string zoneSignature = HOMARD::GetSignature(HOMARD::Zone);
+    std::string yacsSignature = HOMARD::GetSignature(HOMARD::YACS);
+    if (line.substr(0, bounSignature.size()) == bounSignature) {
+      // re-create boundary
+      MESSAGE (" Recreation de la frontiere" );
+      HOMARD::HOMARD_Boundary_var aBoundary = newBoundary();
+      PortableServer::ServantBase_var aServant = GetServant(aBoundary);
+      HOMARD_Boundary_i* aBoundaryServant = dynamic_cast<HOMARD_Boundary_i*>(aServant.in());
+      if (aBoundaryServant && aBoundaryServant->Restore(line.substr(bounSignature.size()))) {
+        context._mesBoundarys[aBoundary->GetName()] = aBoundary;
+        context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aBoundaryServant);
+      }
+    }
+    else if (line.substr(0, caseSignature.size()) == caseSignature) {
       // re-create case
       MESSAGE (" Recreation du cas" );
       HOMARD::HOMARD_Cas_var aCase = newCase();
@@ -3870,15 +4040,15 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
         context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aCaseServant);
       }
     }
-    else if (line.substr(0, zoneSignature.size()) == zoneSignature) {
-      MESSAGE (" Recreation de la zone" );
-      // re-create zone
-      HOMARD::HOMARD_Zone_var aZone = newZone();
-      PortableServer::ServantBase_var aServant = GetServant(aZone);
-      HOMARD_Zone_i* aZoneServant = dynamic_cast<HOMARD_Zone_i*>(aServant.in());
-      if (aZoneServant && aZoneServant->Restore(line.substr(zoneSignature.size()))) {
-        context._mesZones[aZone->GetName()] = aZone;
-        context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aZoneServant);
+    else if (line.substr(0, hypoSignature.size()) == hypoSignature) {
+      // re-create hypothesis
+      MESSAGE (" Recreation de l hypothese" );
+      HOMARD::HOMARD_Hypothesis_var aHypo = newHypothesis();
+      PortableServer::ServantBase_var aServant = GetServant(aHypo);
+      HOMARD_Hypothesis_i* aHypoServant = dynamic_cast<HOMARD_Hypothesis_i*>(aServant.in());
+      if (aHypoServant && aHypoServant->Restore(line.substr(hypoSignature.size()))) {
+        context._mesHypotheses[aHypo->GetName()] = aHypo;
+        context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aHypoServant);
       }
     }
     else if (line.substr(0, iterSignature.size()) == iterSignature) {
@@ -3892,26 +4062,26 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
         context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aIterServant);
       }
     }
-    else if (line.substr(0, hypoSignature.size()) == hypoSignature) {
-      // re-create hypothesis
-      MESSAGE (" Recreation de l hypothese" );
-      HOMARD::HOMARD_Hypothesis_var aHypo = newHypothesis();
-      PortableServer::ServantBase_var aServant = GetServant(aHypo);
-      HOMARD_Hypothesis_i* aHypoServant = dynamic_cast<HOMARD_Hypothesis_i*>(aServant.in());
-      if (aHypoServant && aHypoServant->Restore(line.substr(hypoSignature.size()))) {
-        context._mesHypotheses[aHypo->GetName()] = aHypo;
-        context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aHypoServant);
+    else if (line.substr(0, zoneSignature.size()) == zoneSignature) {
+      MESSAGE (" Recreation de la zone" );
+      // re-create zone
+      HOMARD::HOMARD_Zone_var aZone = newZone();
+      PortableServer::ServantBase_var aServant = GetServant(aZone);
+      HOMARD_Zone_i* aZoneServant = dynamic_cast<HOMARD_Zone_i*>(aServant.in());
+      if (aZoneServant && aZoneServant->Restore(line.substr(zoneSignature.size()))) {
+        context._mesZones[aZone->GetName()] = aZone;
+        context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aZoneServant);
       }
     }
-    else if (line.substr(0, bounSignature.size()) == bounSignature) {
-      // re-create boundary
-      MESSAGE (" Recreation de la frontiere" );
-      HOMARD::HOMARD_Boundary_var aBoundary = newBoundary();
-      PortableServer::ServantBase_var aServant = GetServant(aBoundary);
-      HOMARD_Boundary_i* aBoundaryServant = dynamic_cast<HOMARD_Boundary_i*>(aServant.in());
-      if (aBoundaryServant && aBoundaryServant->Restore(line.substr(bounSignature.size()))) {
-        context._mesBoundarys[aBoundary->GetName()] = aBoundary;
-        context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aBoundaryServant);
+    else if (line.substr(0, zoneSignature.size()) == yacsSignature) {
+      MESSAGE (" Recreation du schema YACS" );
+      // re-create YACS
+      HOMARD::HOMARD_YACS_var aYACS = newYACS();
+      PortableServer::ServantBase_var aServant = GetServant(aYACS);
+      HOMARD_YACS_i* aYACSServant = dynamic_cast<HOMARD_YACS_i*>(aServant.in());
+      if (aYACSServant && aYACSServant->Restore(line.substr(yacsSignature.size()))) {
+        context._mesYACSs[aYACS->GetName()] = aYACS;
+        context._idmap[id] = dynamic_cast<PortableServer::ServantBase*>(aYACSServant);
       }
     }
     id++;
diff --git a/src/HOMARD_I/HOMARD_Gen_i.hxx b/src/HOMARD_I/HOMARD_Gen_i.hxx
index f0606137..3eff7e8b 100644
--- a/src/HOMARD_I/HOMARD_Gen_i.hxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2013  CEA/DEN, EDF R&D
+// // Copyright (C) 2011-2013  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -27,6 +27,7 @@
 #include CORBA_SERVER_HEADER(HOMARD_Iteration)
 #include CORBA_SERVER_HEADER(HOMARD_Zone)
 #include CORBA_SERVER_HEADER(HOMARD_Boundary)
+#include CORBA_SERVER_HEADER(HOMARD_YACS)
 #include CORBA_CLIENT_HEADER(SALOMEDS)
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
@@ -118,12 +119,14 @@ public:
   HOMARD::HOMARD_Cas_ptr          GetCase       (const char* nomCas);
   HOMARD::HOMARD_Hypothesis_ptr   GetHypothesis (const char* nomHypothesis);
   HOMARD::HOMARD_Iteration_ptr    GetIteration  (const char* nomIteration);
+  HOMARD::HOMARD_YACS_ptr         GetYACS       (const char* nomYACS);
   HOMARD::HOMARD_Zone_ptr         GetZone       (const char* nomZone);
 
   HOMARD::listeBoundarys*         GetAllBoundarysName();
   HOMARD::listeCases*             GetAllCasesName();
   HOMARD::listeHypotheses*        GetAllHypothesesName();
   HOMARD::listeIterations*        GetAllIterationsName();
+  HOMARD::listeYACSs*             GetAllYACSsName();
   HOMARD::listeZones*             GetAllZonesName();
 
   void                            MeshInfo      (const char* nomCas,
@@ -150,6 +153,7 @@ public:
   CORBA::Long                     DeleteHypo(const char* nomHypothesis);
   CORBA::Long                     DeleteIteration(const char* nomIter, CORBA::Long Option);
   CORBA::Long                     DeleteIterationOption(const char* nomIter, CORBA::Long Option1, CORBA::Long Option2);
+  CORBA::Long                     DeleteYACS(const char* nomYACS, CORBA::Long Option);
   CORBA::Long                     DeleteZone(const char* nomZone);
 
   void                            AssociateIterHypo(const char* nomIter, const char* nomHypothesis);
@@ -182,7 +186,8 @@ public:
   void                            DeleteResultInSmesh(std::string NomFich, std::string MeshName);
 
 // YACS
-  CORBA::Long                     WriteYACSSchema (const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile);
+  HOMARD::HOMARD_YACS_ptr         CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile);
+  CORBA::Long                     YACSWriteOnFile(const char* nomYACS, const char* YACSFile);
   std::string                     YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver);
   std::string                     YACSDriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, YACSDriver* myDriver);
 
@@ -249,27 +254,28 @@ public:
 
 private:
   void                            addInStudy(SALOMEDS::Study_ptr theStudy);
+  SALOMEDS::SObject_ptr           PublishBoundaryInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
+                                                     HOMARD::HOMARD_Boundary_ptr theObject, const char* theName);
   SALOMEDS::SObject_ptr           PublishCaseInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
                                                      HOMARD::HOMARD_Cas_ptr theObject, const char* theName);
-
   SALOMEDS::SObject_ptr           PublishHypotheseInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
                                                      HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName);
-
+  SALOMEDS::SObject_ptr           PublishYACSInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
+                                                     HOMARD::HOMARD_YACS_ptr theObject, const char* theName);
   SALOMEDS::SObject_ptr           PublishZoneInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
                                                      HOMARD::HOMARD_Zone_ptr theObject, const char* theName);
-  SALOMEDS::SObject_ptr           PublishBoundaryInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
-                                                     HOMARD::HOMARD_Boundary_ptr theObject, const char* theName);
   virtual void                    PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder,
                                                      SALOMEDS::SObject_var aResultSO,
                                                      const char* theName, const char* value, const char* icone, const char* ior);
 
-PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject);
+  PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject);
 
+  HOMARD::HOMARD_Boundary_ptr     newBoundary();
   HOMARD::HOMARD_Cas_ptr          newCase();
   HOMARD::HOMARD_Hypothesis_ptr   newHypothesis();
   HOMARD::HOMARD_Iteration_ptr    newIteration();
+  HOMARD::HOMARD_YACS_ptr         newYACS();
   HOMARD::HOMARD_Zone_ptr         newZone();
-  HOMARD::HOMARD_Boundary_ptr     newBoundary();
 
 
   virtual Engines::TMPFile*       DumpPython(CORBA::Object_ptr theStudy,
@@ -283,11 +289,12 @@ PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject);
 private:
   struct StudyContext
   {
+    std::map<std::string, HOMARD::HOMARD_Boundary_var>   _mesBoundarys;
     std::map<std::string, HOMARD::HOMARD_Cas_var>        _mesCas;
     std::map<std::string, HOMARD::HOMARD_Hypothesis_var> _mesHypotheses;
     std::map<std::string, HOMARD::HOMARD_Iteration_var>  _mesIterations;
+    std::map<std::string, HOMARD::HOMARD_YACS_var>       _mesYACSs;
     std::map<std::string, HOMARD::HOMARD_Zone_var>       _mesZones;
-    std::map<std::string, HOMARD::HOMARD_Boundary_var>   _mesBoundarys;
     std::map<int, PortableServer::ServantBase*>          _idmap;
   };
   typedef std::map<int, StudyContext> ContextMap;
diff --git a/src/HOMARD_I/HOMARD_Iteration_i.cxx b/src/HOMARD_I/HOMARD_Iteration_i.cxx
index 3779a729..3a99dab3 100644
--- a/src/HOMARD_I/HOMARD_Iteration_i.cxx
+++ b/src/HOMARD_I/HOMARD_Iteration_i.cxx
@@ -232,7 +232,7 @@ char* HOMARD_Iteration_i::GetLogFile()
 //=============================================================================
 CORBA::Long HOMARD_Iteration_i::Compute(CORBA::Long etatMenage, CORBA::Long Option)
 {
-  MESSAGE ( "Compute : calcul d'une iteration"<<", Option = "<<Option );
+  MESSAGE ( "Compute : calcul d'une iteration, etatMenage = "<<etatMenage<<", Option = "<<Option );
   ASSERT( myHomardIteration );
 //
 // Nom de l'iteration
diff --git a/src/HOMARD_I/HOMARD_Zone_i.cxx b/src/HOMARD_I/HOMARD_Zone_i.cxx
index ea574b9d..f832d743 100644
--- a/src/HOMARD_I/HOMARD_Zone_i.cxx
+++ b/src/HOMARD_I/HOMARD_Zone_i.cxx
@@ -84,11 +84,11 @@ char* HOMARD_Zone_i::GetName()
   return CORBA::string_dup( myHomardZone->GetName().c_str() );
 }
 //=============================================================================
-CORBA::Long  HOMARD_Zone_i::Delete()
+CORBA::Long HOMARD_Zone_i::Delete()
 {
   ASSERT( myHomardZone );
   char* ZoneName = GetName() ;
-  MESSAGE ( "Delete : destruction de la zonee " << ZoneName );
+  MESSAGE ( "Delete : destruction de la zone " << ZoneName );
   return _gen_i->DeleteZone(ZoneName) ;
 }
 //=============================================================================
diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am
index 48612cd0..79bce682 100644
--- a/src/HOMARD_I/Makefile.am
+++ b/src/HOMARD_I/Makefile.am
@@ -32,6 +32,7 @@ salomeinclude_HEADERS =         \
 	HOMARD_Zone_i.hxx       \
 	HOMARD_Gen_i.hxx        \
 	HOMARD_Boundary_i.hxx   \
+	HOMARD_YACS_i.hxx  \
   HomardMedCommun.h
 
 # Libraries targets
@@ -45,6 +46,7 @@ dist_libHOMARDEngine_la_SOURCES = \
 	HOMARD_Gen_i.cxx          \
 	HOMARD_Zone_i.cxx         \
 	HOMARD_Boundary_i.cxx     \
+	HOMARD_YACS_i.cxx    \
   HomardMedCommun.cxx
 
 
-- 
2.30.2