]> SALOME platform Git repositories - modules/homard.git/commitdiff
Salome HOME
Modifications from Gérald NICOLAS V6_5_0a1
authorgdd <gdd>
Thu, 29 Mar 2012 12:01:06 +0000 (12:01 +0000)
committergdd <gdd>
Thu, 29 Mar 2012 12:01:06 +0000 (12:01 +0000)
30 files changed:
doc/conf.py.in
doc/gui_create_hypothese.rst
doc/images/create_hypothese_av_1.png
doc/images/create_hypothese_zo_1.png
doc/images/create_hypothese_zo_2.png
doc/images/intro_8.gif [new file with mode: 0644]
doc/intro.rst
doc/tui_create_hypothese.rst
idl/HOMARD_Gen.idl
idl/HOMARD_Hypothesis.idl
src/HOMARD/HOMARD_DriverTools.cxx
src/HOMARD/HOMARD_Hypothesis.cxx
src/HOMARD/HOMARD_Hypothesis.hxx
src/HOMARD/HOMARD_Iteration.cxx
src/HOMARD/HOMARD_Zone.cxx
src/HOMARD/HomardDriver.cxx
src/HOMARD/HomardDriver.hxx
src/HOMARDGUI/CreateHypothesis.h
src/HOMARDGUI/CreateHypothesis.ui
src/HOMARDGUI/HOMARD_msg_en.ts
src/HOMARDGUI/HOMARD_msg_fr.ts
src/HOMARDGUI/MonCreateHypothesis.cxx
src/HOMARDGUI/MonCreateHypothesis.h
src/HOMARDGUI/MonCreateZone.cxx
src/HOMARDGUI/MonEditHypothesis.cxx
src/HOMARD_I/HOMARD_Gen_i.cxx
src/HOMARD_I/HOMARD_Gen_i.hxx
src/HOMARD_I/HOMARD_Hypothesis_i.cxx
src/HOMARD_I/HOMARD_Hypothesis_i.hxx
tests/test_1.py

index a42d3eacc12605e6cd159e878539a581b7e301c1..4aa0a92cb8e2b424035a8d2cd15d1a14848ea5ce 100644 (file)
@@ -38,7 +38,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'HOMARD'
-copyright = u'1996, 2011, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret'
+copyright = u'1996, 2011, 2012, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
index 5b4dd604e4b80918459c7cf252ae165a24c23b29..a3bb4b1d69afb9fb524452d44adec212f70b3661 100644 (file)
@@ -66,7 +66,7 @@ Au d
 .. image:: images/create_hypothese_zo_1.png
    :align: center
 
-Lorsque des zones ont déjà été créées, la liste apparaît dans la fenêtre, ce qui permet de sélectionner les zones voulues.
+Lorsque des zones ont déjà été créées, la liste apparaît dans la fenêtre, ce qui permet de sélectionner les zones voulues. On doit alors préciser si une zone est utilisée pour raffiner toutes les mailles dont une arête est contenue dans la zone, ou si la zone est utilisée pour déraffiner les mailles intérieures à la zone. Si aucun choix n'est fait, la zone est ignorée dans cette hypothèse.
 
 .. image:: images/create_hypothese_zo_2.png
    :align: center
@@ -109,12 +109,12 @@ Si on veut choisir les champs 
 Les options avancées
 """"""""""""""""""""
 Si la case "Options avancées" n'est pas cochée, aucune contrainte supplémentaire n'est définie.
+Si la case est cochée, on définira les options avancées.
 
-Si la case est cochée, on définira les options avancées qui portent sur la finesse maximale de maillage que l'on ne veut pas dépasser. Deux directives sont possibles, séparément ou ensemble.
+Une première série d'options portent sur la finesse maximale de maillage que l'on ne veut pas dépasser. Deux directives sont possibles, séparément ou ensemble. On peut imposer une taille de maille minimale : une maille dont le diamètre est inférieur à cette limite ne sera plus découpée. Par défaut, on propose un diamètre minimal nul, ce qui revient à ne rien imposer. On peut imposer un niveau de raffinement maximal. Par défaut, le maximum est à 99, ce qui équivaut en général à ne rien imposer.
 
-On peut imposer une taille de maille minimale : une maille dont le diamètre est inférieur à cette limite ne sera plus découpée. Par défaut, on propose un diamètre minimal nul, ce qui revient à ne rien imposer.
+La seconde série d'options n'a d'intérêt que dans le cas où l'adaptation est piloté par un champ et que ce champ n'est pas défini partout dans le maillage. Cela arrive par exemple quand on construit un champ basé sur une distance dans un plan alors que le domaine est 3D : le champ ne sera pas défini sur les noeuds hors du plan. Pour de tels champs, cette option permet de préciser le comportement que l'on souhaite dans les régions où le champ n'est pas défini. Par défaut, il ne se passe rien : les mailles sont gardées telles quelles. On peut choisir les deux autres variantes : raffiner, toutes les mailles seront a priori coupées, ou déraffiner, toutes les mailles seront candidates au déraffinement.
 
-On peut imposer un niveau de raffinement maximal. Par défaut, le maximum est à 99, ce qui équivaut en général à ne rien imposer.
 
 .. image:: images/create_hypothese_av_1.png
    :align: center
index 1c48bd45cacd559f748bd2b200bb4abca060ccca..d6eae0a539782d74651b3726f6788ba97800897c 100644 (file)
Binary files a/doc/images/create_hypothese_av_1.png and b/doc/images/create_hypothese_av_1.png differ
index e84980304bfa00846a54312b00fdc89923051f73..0b4f0252d7bab114fab471c445d4bdd4641517dd 100644 (file)
Binary files a/doc/images/create_hypothese_zo_1.png and b/doc/images/create_hypothese_zo_1.png differ
index fea54a5aafb5bb270ca2079177dbfd513d2722c1..09353cf0e76b6e2b0508c4e7069734496655984f 100644 (file)
Binary files a/doc/images/create_hypothese_zo_2.png and b/doc/images/create_hypothese_zo_2.png differ
diff --git a/doc/images/intro_8.gif b/doc/images/intro_8.gif
new file mode 100644 (file)
index 0000000..b11d925
Binary files /dev/null and b/doc/images/intro_8.gif differ
index d2a631fd1f608ec213cdbb2591a932692fdbf61d..ec755610afca1040812ebd8d002dce01fa774b00 100644 (file)
@@ -3,6 +3,8 @@ Introduction
 ============
 Le logiciel HOMARD est destiné à adapter les maillages dans le cadre des codes de calculs par éléments ou volumes finis. Ce logiciel, réalisé par EDF R&D, procède par raffinement et déraffinement des maillages bidimensionnels ou tridimensionnels. Il est conçu pour être utilisé indépendamment du code de calcul auquel il est couplé.
 
+Raffiner le maillage signifie découper des mailles désignées selon des indications founies par l'utilisateur. Déraffiner le maillage signifie revenir en arrière sur des découpages précédemment réalisés : ainsi, en aucun cas HOMARD ne peut simplifier un maillage existant qui aura été créé trop fin. Le déraffinement prend toute son importance dans les calculs quand la zone d'intérêt se déplace au cours du calcul pour ne plus tenir compte de raffinements précédemment réalisés et qui deviennent inutiles. On en trouvera une illustration au bas de cette page.
+
 HOMARD sait traiter des maillages en 2 ou 3 dimensions et comportant les mailles suivantes :
    - mailles-points
    - segments
@@ -15,7 +17,7 @@ HOMARD sait traiter des maillages en 2 ou 3 dimensions et comportant les mailles
 Ces mailles peuvent être présentes simultanément. Par exemple, HOMARD saura adapter un maillage comportant des triangles et des quadrangles.
 Les noeuds acceptés sont évidemment les noeuds qui sont les sommets des mailles, ce qui correspond à la description classique « en degré 1 » . Si les éléments sont décrits « en degré 2 », les noeuds complémentaires sont gérés. En revanche, il ne peut pas y avoir cohabitation de mailles décrites en degré 1 et d'autres décrites en degré 2. Enfin, HOMARD sait prendre en compte des noeuds isolés, qui n'appartiendraient à aucune définition de mailles : ils ressortiront tels quels du processus d'adaptation.
 
-Le cas des pyramides est à part. HOMARD produit des pyramides pour assurer la conformité du raffinement de maillages formés d'hexaèdres ou de prismes. En revanche, HOMARD n'adapte pas un maillage qui contiendrait des pyramides au départ, sauf cas particuliers (voir :ref:`gui_create_case`).
+Le cas des pyramides est à part. Pour un maillage comportant des hexaèdres ou des prismes, la mise en conformité du maillage issu du raffinement crée des pyramides pour assurer la liaison entre deux régions de niveaux de raffinement différents. Ces pyramides sont gérées comme toutes les mailles de transition et ne sont pas redécoupées par la suite. En revanche, si le maillage initial contient des pyramides, HOMARD ne saura pas l'adapter et émettra un message d'erreur. Dans certains cas particuliers, on pourra néanmoins traiter un tel maillage, comme il est décrit dans la rubrique 'Options avancées' de :ref:`gui_create_case`).
 
 Plusieurs motivations apparaissent pour adapter un maillage :
 
@@ -43,18 +45,39 @@ Des variantes de ce sch
 Quelques illustrations de maillage adaptés
 ==========================================
 
-.. image:: images/intro_3.png
-   :align: center
++---------------------------------------------------------------+
++---------------------------------------------------------------+
+|                                                               |
+| .. image:: images/intro_3.png                                 |
+|    :align: center                                             |
+|                                                               |
++---------------------------------------------------------------+
+|                                                               |
+| .. image:: images/intro_4.png                                 |
+|    :align: center                                             |
+|                                                               |
++---------------------------------------------------------------+
+|                                                               |
+| .. image:: images/intro_5.png                                 |
+|    :align: center                                             |
+|                                                               |
++---------------------------------------------------------------+
+|                                                               |
+| .. image:: images/intro_6.png                                 |
+|    :align: center                                             |
+|                                                               |
++---------------------------------------------------------------+
+|                                                               |
+| .. image:: images/intro_7.png                                 |
+|    :align: center                                             |
+|                                                               |
++---------------------------------------------------------------+
+|                                                               |
+| .. image:: images/intro_8.gif                                 |
+|    :align: center                                             |
+|                                                               |
++---------------------------------------------------------------+
 
-.. image:: images/intro_4.png
-   :align: center
 
-.. image:: images/intro_5.png
-   :align: center
 
-.. image:: images/intro_6.png
-   :align: center
-
-.. image:: images/intro_7.png
-   :align: center
 
index 24ad8ec232e530a0f71835d012489ec24b4f3a40..b9b7d85f17b1626cf1edb5602842c118c00cf62a 100644 (file)
@@ -23,10 +23,14 @@ M
 +---------------------------------------------------------------+
 | .. module:: AssociateHypoZone                                 |
 |                                                               |
-| **AssociateHypoZone(hypo_name, zone_name)**                   |
+| **AssociateHypoZone(hypo_name, zone_name, type_use)**         |
 |                                                               |
 |     - ``hypo_name`` : le nom de l'hypothèse                   |
 |     - ``zone_name`` : le nom de la zone à associer            |
+|     - ``type_use``  : entier précisant l'usage de la zone     |
+|                                                               |
+|         * 1 : raffinement                                     |
+|         * -1 : déraffinement                                  |
 +---------------------------------------------------------------+
 
 Méthodes de la classe hypothese
index ed79e837326a59922007c4cfae771c51c359442a..cbad6056ca647c0c0c28d08e3bd1ccd1628123f4 100644 (file)
@@ -102,7 +102,7 @@ module HOMARD
 //
     void AssociateIterHypo(in string IterName, in string HypoName)
                                                            raises (SALOME::SALOME_Exception);
-    void AssociateHypoZone(in string ZoneName, in string HypoName)
+    void AssociateHypoZone(in string HypoName, in string ZoneName, in long TypeUse)
                                                            raises (SALOME::SALOME_Exception);
 //
 // A.3. Les informations
index 5679beb80cc37c242b8694aeabddd2949a045ce7..5febc1d5d604300e8b726b468c05bf3aeab7159c 100644 (file)
@@ -77,7 +77,7 @@ module HOMARD
     void       SupprComp()                                 raises (SALOME::SALOME_Exception);
     listeComposantsHypo GetListComp()                      raises (SALOME::SALOME_Exception);
 
-    void       AddZone(in string NomZone)                  raises (SALOME::SALOME_Exception);
+    void       AddZone(in string NomZone, in long TypeUse) raises (SALOME::SALOME_Exception);
     void       SupprZone(in string NomZone)                raises (SALOME::SALOME_Exception);
     listeZonesHypo GetZones()                              raises (SALOME::SALOME_Exception);
 
@@ -100,6 +100,9 @@ module HOMARD
     void     SetDiamMin(in double DiamMin)                 raises (SALOME::SALOME_Exception);
     double   GetDiamMin()                                  raises (SALOME::SALOME_Exception);
 
+    void     SetAdapInit(in long AdapInit)                 raises (SALOME::SALOME_Exception);
+    long     GetAdapInit()                                 raises (SALOME::SALOME_Exception);
+
     string   GetDumpPython()                               raises (SALOME::SALOME_Exception);
 
   };
index b2d476cf7a1988f96749debb4fb0d0754b845114..8b605fde0246f6c1293e3c92bbab87d17c51f3d4 100644 (file)
@@ -473,7 +473,7 @@ namespace HOMARD
   bool Restore( HOMARD_Hypothesis& hypothesis, const std::string& stream )
   {
     std::string::size_type start = 0;
-    std::string chunk;
+    std::string chunk, chunkNext;
     bool ok;
 
     chunk = getNextChunk( stream, start, ok );
@@ -543,7 +543,11 @@ namespace HOMARD
     for ( int i = 0; i < size; i++ ) {
       chunk = getNextChunk( stream, start, ok );
       if ( !ok ) return false;
-      hypothesis.AddZone( chunk.c_str() );
+      i++;
+      chunkNext = getNextChunk( stream, start, ok );
+      int typeuse = atoi( chunkNext.c_str() );
+      if ( !ok ) return false;
+      hypothesis.AddZone( chunk.c_str(), typeuse );
     }
 
     chunk = getNextChunk( stream, start, ok );
index aa4daa4d93d0c51abe92c43865c43bd1c307574a..f263c8b660069729f3e2d01b0282126faf784a19 100644 (file)
@@ -94,9 +94,14 @@ std::string HOMARD_Hypothesis::GetDumpPython() const
 
 // Raffinement selon des zones geometriques
   std::list<std::string>::const_iterator it = _ListZone.begin();
+  int TypeUse ;
   while(it != _ListZone.end())
   {
-      aScript << "\thomard.AssociateHypoZone(\""<< *it << "\", \"" <<_NomHypo << "\")\n";
+      aScript << "\thomard.AssociateHypoZone(\""<< _NomHypo << "\", \"" << *it;
+      it++;
+      if ( *it == "1" ) { TypeUse =  1 ; }
+      else              { TypeUse = -1 ; }
+      aScript << "\", " << TypeUse << ")\n";
       it++;
   }
 
@@ -141,13 +146,18 @@ std::string HOMARD_Hypothesis::GetDumpPython() const
   }
   if ( _NivMax > 0 )
   {
-    aScript << "\t" <<_NomHypo << ".SetNivMax(";
-    aScript << _NivMax << ")\n";
+    aScript << "\tNivMax = " << _NivMax << "\n";
+    aScript << "\t" <<_NomHypo << ".SetNivMax(NivMax)\n";
   }
   if ( _DiamMin > 0 )
   {
-    aScript << "\t" <<_NomHypo << ".SetDiamMin(";
-    aScript << _DiamMin << ")\n";
+    aScript << "\tDiamMin = " << _DiamMin << "\n";
+    aScript << "\t" <<_NomHypo << ".SetDiamMin(DiamMin)\n";
+  }
+  if ( _AdapInit != 0 )
+  {
+    aScript << "\tAdapInit = " << _AdapInit << "\n";
+    aScript << "\t" <<_NomHypo << ".SetAdapInit(AdapInit)\n";
   }
 
   return aScript.str();
@@ -301,9 +311,13 @@ const std::list<std::string>& HOMARD_Hypothesis::GetIterations() const
 /*!
 */
 //=============================================================================
-void HOMARD_Hypothesis::AddZone( const char* NomZone )
+void HOMARD_Hypothesis::AddZone( const char* NomZone, int TypeUse )
 {
   _ListZone.push_back( std::string( NomZone ) );
+  std::stringstream saux1 ;
+  saux1 << TypeUse ;
+  std::string saux2 = saux1.str() ;
+  _ListZone.push_back( saux2 );
 }
 //=============================================================================
 void HOMARD_Hypothesis::SupprZone( const char* NomZone )
@@ -413,14 +427,22 @@ const int HOMARD_Hypothesis::GetNivMax() const
   return _NivMax;
 }
 //=============================================================================
+void HOMARD_Hypothesis::SetAdapInit( int AdapInit )
+//=============================================================================
+{
+  _AdapInit = AdapInit;
+}
+//=============================================================================
+const int HOMARD_Hypothesis::GetAdapInit() const
+//=============================================================================
+{
+  return _AdapInit;
+}
+//=============================================================================
 void HOMARD_Hypothesis::SetDiamMin( double DiamMin )
 //=============================================================================
 {
   _DiamMin = DiamMin;
-/*  if ( _NivMax < 0 )
-  {
-    _NivMax = 99 ;
-  }*/
 }
 //=============================================================================
 const double HOMARD_Hypothesis::GetDiamMin() const
index ca3d785d5e0ae758a244412f40fd2c7c773c4d0e..84893147caa6e7f802297034b53d907bc0e3c764 100644 (file)
@@ -68,7 +68,7 @@ public:
   void                          SupprIterations();
   const std::list<std::string>& GetIterations() const;
 
-  void                          AddZone( const char* NomZone );
+  void                          AddZone( const char* NomZone, int TypeUse );
   void                          SupprZone( const char* NomZone );
   void                          SupprZones();
   const std::list<std::string>& GetZones() const;
@@ -85,9 +85,10 @@ public:
 
   void                          SetNivMax( int NivMax );
   const int                     GetNivMax() const;
-
   void                          SetDiamMin( double DiamMin );
   const double                  GetDiamMin() const;
+  void                          SetAdapInit( int AdapInit );
+  const int                     GetAdapInit() const;
 
 
 private:
@@ -113,6 +114,7 @@ private:
                                                   // 2 pour une liste
   int                           _NivMax;
   double                        _DiamMin;
+  int                           _AdapInit;
 
   std::list<std::string>        _ListIter;
   std::list<std::string>        _ListZone;
index 13adb738beb598fe3801bbf57285568108a6d243..f7bdbd9983718f36e692805a2ec89767e834e347 100644 (file)
@@ -96,7 +96,9 @@ std::string HOMARD_Iteration::GetDumpPython() const
   aScript << "\t" << _NomIter << ".SetMeshFile(\"" << _MeshFile << "\")\n";
   if (_FieldFile != "") {
     aScript << "\t" << _NomIter << ".SetFieldFile(\"" << _FieldFile << "\")\n";
-    aScript << "\t" << _NomIter << ".SetTimeStepRank(" << _TimeStep << ", " << _Rank << ")\n";
+    aScript << "\tTimeStep = " << _TimeStep << "\n";
+    aScript << "\tRank = " << _Rank << "\n";
+    aScript << "\t" << _NomIter << ".SetTimeStepRank( TimeStep, Rank )\n";
   }
 
   aScript << "\thomard.AssociateIterHypo(\"" <<_NomIter << "\", \"" << _NomHypo << "\")\n";
index b26a2c8c7977d062d244a73048127e4a39cb459c..f412cb7e892bfba70984fb00cc33b9cb4db06e60 100644 (file)
@@ -138,7 +138,6 @@ std::string HOMARD_Zone::GetDumpPython() const
   return aScript.str() ;
 }
 
-
 //=============================================================================
 void HOMARD_Zone::SetZoneType( int ZoneType )
 {
index 6fec7958b4786d0858b847c03d33a911f43ccef5..e4d809bc57c7a0f719f8aace363c9c0965551783 100644 (file)
@@ -62,17 +62,17 @@ HomardDriver::~HomardDriver()
 ////=============================================================================
 void HomardDriver::TexteInit( const std::string DirCompute, const std::string DirComputePa, const std::string MessFile )
 {
-  MESSAGE("TexteInit, MessFile ="<<MessFile);
+  MESSAGE("TexteInit, MessFile ="<<MessFile<<", DirCompute ="<<DirCompute<<", DirComputePa ="<<DirComputePa);
 //
   _Texte  = "Action   homa\n" ;
   _Texte += "CCAssoci med\n" ;
   _Texte += "ModeHOMA 1\n" ;
   _Texte += "NumeIter " + _siter + "\n" ;
-  _Texte += "ListeStd " + MessFile + "\n" ;
+  _Texte += "ListeStd \"" + MessFile + "\"\n" ;
   _Texte += "# Maillages HOMARD \n" ;
-  _Texte += "HOMaiN__ Mai" + _siter   + " " + DirComputePa + "/maill." + _siter   + ".hom.med\n" ;
-  _Texte += "HOMaiNP1 Mai" + _siterp1 + " " + DirCompute   + "/maill." + _siterp1 + ".hom.med\n" ;
-  _Texte += "RepeTrav " + DirCompute + "\n" ;
+  _Texte += "HOMaiN__ Mai" + _siter   + " \"" + DirComputePa + "/maill." + _siter   + ".hom.med\"\n" ;
+  _Texte += "HOMaiNP1 Mai" + _siterp1 + " \"" + DirCompute   + "/maill." + _siterp1 + ".hom.med\"\n" ;
+  _Texte += "RepeTrav \"" + DirCompute + "\"\n" ;
 //
 }
 
@@ -86,7 +86,7 @@ void HomardDriver::TexteMaillage( const std::string NomMesh, const std::string M
 
   _Texte += "# Maillages Med " + saux + "\n" ;
   _Texte += "CCNoMN" + saux + " \"" + NomMesh  + "\"\n" ;
-  _Texte += "CCMaiN" + saux + " " + MeshFile + "\n" ;
+  _Texte += "CCMaiN" + saux + " \"" + MeshFile + "\"\n" ;
 }
 
 ////=============================================================================
@@ -175,20 +175,27 @@ void HomardDriver::TexteCompo( int NumeComp, const std::string NompCompo)
 }
 
 ////=============================================================================
-void HomardDriver::TexteZone( int NumeZone, int ZoneType, double x0, double x1, double x2, double x3, double x4, double x5, double x6, double x7, double x8 )
+void HomardDriver::TexteZone( int NumeZone, int ZoneType, int TypeUse, double x0, double x1, double x2, double x3, double x4, double x5, double x6, double x7, double x8 )
 {
-  MESSAGE("TexteZone, NumeZone = "<<NumeZone<<", ZoneType = "<<ZoneType);
+  MESSAGE("TexteZone, NumeZone = "<<NumeZone<<", ZoneType = "<<ZoneType<<", TypeUse = "<<TypeUse);
   MESSAGE("TexteZone, coor = "<< x0<<","<<x1<< ","<< x2<< ","<< x3<<","<<x4<<","<<x5<<","<<x6<<","<<x7<<","<<x8);
 //
   std::string saux, saux2 ;
 //
 // Type de zones
+// On convertit le type de zone au sens du module HOMARD dans Salome, ZoneType, dans le
+// type au sens de l'executable HOMARD, ZoneTypeHOMARD
+// Attention a mettre le bon signe a ZoneTypeHOMARD :
+//    >0 signifie que l'on raffinera les mailles contenues dans la zone,
+//    <0 signifie que l'on deraffinera
 //
   int ZoneTypeHOMARD ;
   if ( ZoneType >= 11 and ZoneType <= 13 ) { ZoneTypeHOMARD = 1 ; }
   else if ( ZoneType >= 31 and ZoneType <= 33 ) { ZoneTypeHOMARD = 3 ; }
   else if ( ZoneType >= 61 and ZoneType <= 63 ) { ZoneTypeHOMARD = 6 ; }
   else { ZoneTypeHOMARD = ZoneType ; }
+//
+  if ( TypeUse < 0 ) { ZoneTypeHOMARD = -ZoneTypeHOMARD ; }
 //
   std::stringstream saux1 ;
   saux1 << NumeZone ;
@@ -498,7 +505,7 @@ void HomardDriver::TexteField( const std::string FieldName, const std::string Fi
 //
 //
   _Texte += "# Champ d'indicateurs\n" ;
-  _Texte += "CCIndica " + FieldFile  + "\n" ;
+  _Texte += "CCIndica \"" + FieldFile  + "\"\n" ;
   _Texte += "CCNoChaI \"" + FieldName  + "\"\n" ;
 
 // Cas ou on prend le dernier pas de temps
@@ -579,7 +586,7 @@ void HomardDriver::TexteGroup( const std::string GroupName )
 {
   MESSAGE("TexteGroup, GroupName = "<<GroupName);
 //
-  _Texte += "CCGroAda " + GroupName  + "\n" ;
+  _Texte += "CCGroAda \"" + GroupName  + "\"\n" ;
 //
 }
 ////=============================================================================
@@ -601,8 +608,8 @@ void HomardDriver::TexteBoundaryDi(  const std::string MeshName, const std::stri
   MESSAGE("TexteBoundaryDi, MeshName  = "<<MeshName);
   MESSAGE("TexteBoundaryDi, MeshFile  = "<<MeshFile);
 //
-  _Texte += "CCNoMFro " + MeshName + "\n" ;
-  _Texte += "CCFronti " + MeshFile + "\n" ;
+  _Texte += "CCNoMFro \"" + MeshName + "\"\n" ;
+  _Texte += "CCFronti \"" + MeshFile + "\"\n" ;
 //
 }
 ////=============================================================================
@@ -610,7 +617,7 @@ void HomardDriver::TexteBoundaryDiGr(  const std::string GroupName )
 {
   MESSAGE("TexteBoundaryDiGr, GroupName  = "<<GroupName);
 //
-  _Texte += "CCGroFro " + GroupName + "\n" ;
+  _Texte += "CCGroFro \"" + GroupName + "\"\n" ;
 //
 }
 ////=============================================================================
@@ -751,8 +758,8 @@ void HomardDriver::TexteFieldInterp( int TypeFieldInterp, const std::string Fiel
 // Type d'interpolation
 //
   _Texte += "# Interpolations des champs\n" ;
-  _Texte += "CCSolN__ " + FieldFile  + "\n" ;
-  _Texte += "CCSolNP1 " + MeshFile  + "\n" ;
+  _Texte += "CCSolN__ \"" + FieldFile + "\"\n" ;
+  _Texte += "CCSolNP1 \"" + MeshFile  + "\"\n" ;
   if ( TypeFieldInterp == 1 )
   {
     _Texte += "CCChaTou oui\n" ;
@@ -790,15 +797,15 @@ void HomardDriver::TexteFieldInterpName( int NumeChamp, const std::string FieldN
   }
 }
 ////=============================================================================
-void HomardDriver::TexteAdvanced( int Pyram, int NivMax, double DiamMin )
+void HomardDriver::TexteAdvanced( int Pyram, int NivMax, double DiamMin, int AdapInit )
 {
-  MESSAGE("TexteAdvanced, Pyram ="<<Pyram<<", NivMax ="<<NivMax<<", DiamMin ="<<DiamMin);
+  MESSAGE("TexteAdvanced, Pyram ="<<Pyram<<", NivMax ="<<NivMax<<", DiamMin ="<<DiamMin<<", AdapInit ="<<AdapInit);
   std::string saux ;
 
   if ( Pyram > 0 )
   {
     _Texte += "# Autorisation de pyramides dans le maillage initial\n" ;
-    { _Texte += "TypeElem ignore_pyra\n" ; }
+    _Texte += "TypeElem ignore_pyra\n" ;
   }
   if ( NivMax > 0 )
   {
@@ -818,6 +825,19 @@ void HomardDriver::TexteAdvanced( int Pyram, int NivMax, double DiamMin )
       _Texte += "DiametMi " + saux2  + "\n" ;
     }
   }
+  if ( AdapInit != 0 )
+  {
+    if ( AdapInit > 0 )
+    { _Texte += "# Raffinement" ; }
+    else
+    { _Texte += "# Deraffinement" ; }
+    _Texte += " des regions sans indicateur\n" ;
+    { std::stringstream saux1 ;
+      saux1 << AdapInit ;
+      std::string saux2 = saux1.str() ;
+      _Texte += "AdapInit " + saux2 + "\n" ;
+    }
+  }
 }
 
 ////=============================================================================
index b286ba9d6727e0f260d9c6177c3d1715f67a69de..5eb98f38147804da9622887ffda4e6d1ad834011 100644 (file)
@@ -35,7 +35,7 @@ public:
   void        CreeFichier();
   void        TexteMaillage( const std::string NomMesh, const std::string MeshFile, int apres );
   void        TexteConfRaffDera( int ConfType, int TypeAdap, int TypeRaff, int TypeDera );
-  void        TexteZone( int NumeZone, int ZoneType, double x0, double x1, double x2, double x3, double x4, double x5, double x6, double x7, double x8 );
+  void        TexteZone( int NumeZone, int ZoneType, int TypeUse, double x0, double x1, double x2, double x3, double x4, double x5, double x6, double x7, double x8 );
   void        TexteGroup( const std::string GroupName );
   void        TexteField( const std::string FieldName, const std::string FieldFile,
                           int TimeStep, int Rank,
@@ -52,7 +52,7 @@ public:
   void        TexteFieldInterp( int TypeFieldInterp, const std::string FieldFile, const std::string MeshFile,
                                 int TimeStep, int Rank );
   void        TexteFieldInterpName( int NumeChamp, const std::string FieldName);
-  void        TexteAdvanced( int Pyram, int NivMax, double DiamMin);
+  void        TexteAdvanced( int Pyram, int NivMax, double DiamMin, int AdapInit);
   void        CloseFichier();
   //
   int         ExecuteHomard();
index 1496518a928f44b33098842ee20ff361579baa2e..361e4cfdb18e65aaa5992f4f93cdc8349d4f8f8c 100644 (file)
@@ -1,10 +1,10 @@
 /********************************************************************************
-** Form generated from reading ui file 'CreateHypothesis.ui'
+** Form generated from reading UI file 'CreateHypothesis.ui'
 **
-** Created: Fri Oct 28 11:27:29 2011
-**      by: Qt User Interface Compiler version 4.2.1
+** Created: Thu Mar 22 13:46:51 2012
+**      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 CREATEHYPOTHESIS_H
@@ -21,6 +21,7 @@
 #include <QtGui/QGridLayout>
 #include <QtGui/QGroupBox>
 #include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>
 #include <QtGui/QPushButton>
 #include <QtGui/QTableWidget>
 #include <QtGui/QVBoxLayout>
 
+QT_BEGIN_NAMESPACE
+
 class Ui_CreateHypothesis
 {
 public:
-    QGridLayout *gridLayout;
+    QGridLayout *gridLayout_3;
     QLabel *Name;
     QLineEdit *LEHypothesisName;
     QGroupBox *GBTypeAdaptation;
@@ -42,15 +45,15 @@ public:
     QRadioButton *RBChamp;
     QRadioButton *RBZone;
     QGroupBox *GBUniform;
-    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout;
     QRadioButton *RBUniDera;
     QRadioButton *RBUniRaff;
     QGroupBox *GBFieldFile;
-    QGridLayout *gridLayout2;
+    QGridLayout *gridLayout1;
     QLabel *FieldFile;
     QLineEdit *LEFieldFile;
     QGroupBox *GBFieldManagement;
-    QGridLayout *gridLayout3;
+    QGridLayout *gridLayout2;
     QHBoxLayout *hboxLayout1;
     QLabel *FieldName;
     QComboBox *CBFieldName;
@@ -65,7 +68,7 @@ public:
     QCheckBox *CBJump;
     QHBoxLayout *hboxLayout4;
     QGroupBox *GBRefinementThresholds;
-    QGridLayout *gridLayout4;
+    QGridLayout *gridLayout3;
     QRadioButton *RBRPE;
     QDoubleSpinBox *SpinBox_RPE;
     QRadioButton *RBRRel;
@@ -74,7 +77,7 @@ public:
     QDoubleSpinBox *SpinBox_RAbs;
     QRadioButton *RBRNo;
     QGroupBox *GBCoarseningThresholds;
-    QGridLayout *gridLayout5;
+    QGridLayout *gridLayout4;
     QRadioButton *RBCPE;
     QDoubleSpinBox *SpinBox_CPE;
     QRadioButton *RBCRel;
@@ -83,8 +86,9 @@ public:
     QDoubleSpinBox *SpinBox_CAbs;
     QRadioButton *RBCNo;
     QGroupBox *GBAreaManagement;
-    QGridLayout *gridLayout6;
+    QGridLayout *gridLayout5;
     QTableWidget *TWZone;
+    QSpacerItem *horizontalSpacer;
     QVBoxLayout *vboxLayout1;
     QVBoxLayout *vboxLayout2;
     QPushButton *PBZoneNew;
@@ -92,8 +96,8 @@ public:
     QPushButton *PBZoneDelete;
     QSpacerItem *spacerItem2;
     QGroupBox *GBField;
+    QGridLayout *gridLayout6;
     QGridLayout *gridLayout7;
-    QGridLayout *gridLayout8;
     QRadioButton *RBFieldNo;
     QRadioButton *RBFieldAll;
     QRadioButton *RBFieldChosen;
@@ -101,14 +105,18 @@ public:
     QCheckBox *CBGroupe;
     QCheckBox *CBAdvanced;
     QGroupBox *GBAdvancedOptions;
-    QGridLayout *gridLayout9;
-    QSpacerItem *spacerItem3;
+    QGridLayout *gridLayout_1;
     QLabel *TLMinimalDiameter;
-    QSpinBox *spinBoxNivMax;
     QDoubleSpinBox *doubleSpinBoxDiamMin;
     QLabel *TLMaximalLevel;
+    QSpinBox *spinBoxNivMax;
+    QGroupBox *GBAdapInit;
+    QGridLayout *gridLayout_2;
+    QRadioButton *RBAIN;
+    QRadioButton *RBAIR;
+    QRadioButton *RBAID;
     QGroupBox *GBButtons;
-    QGridLayout *gridLayout10;
+    QGridLayout *gridLayout8;
     QPushButton *buttonOk;
     QPushButton *buttonApply;
     QPushButton *buttonCancel;
@@ -116,592 +124,664 @@ public:
 
     void setupUi(QDialog *CreateHypothesis)
     {
-    CreateHypothesis->setObjectName(QString::fromUtf8("CreateHypothesis"));
-    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy.setHorizontalStretch(0);
-    sizePolicy.setVerticalStretch(0);
-    sizePolicy.setHeightForWidth(CreateHypothesis->sizePolicy().hasHeightForWidth());
-    CreateHypothesis->setSizePolicy(sizePolicy);
-    CreateHypothesis->setAutoFillBackground(true);
-    CreateHypothesis->setSizeGripEnabled(true);
-    gridLayout = new QGridLayout(CreateHypothesis);
-    gridLayout->setSpacing(6);
-    gridLayout->setMargin(9);
-    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
-    Name = new QLabel(CreateHypothesis);
-    Name->setObjectName(QString::fromUtf8("Name"));
-
-    gridLayout->addWidget(Name, 0, 0, 1, 1);
-
-    LEHypothesisName = new QLineEdit(CreateHypothesis);
-    LEHypothesisName->setObjectName(QString::fromUtf8("LEHypothesisName"));
-    LEHypothesisName->setMinimumSize(QSize(382, 31));
-    LEHypothesisName->setMaxLength(32);
-
-    gridLayout->addWidget(LEHypothesisName, 0, 1, 1, 1);
-
-    GBTypeAdaptation = new QGroupBox(CreateHypothesis);
-    GBTypeAdaptation->setObjectName(QString::fromUtf8("GBTypeAdaptation"));
-    hboxLayout = new QHBoxLayout(GBTypeAdaptation);
-    hboxLayout->setSpacing(6);
-    hboxLayout->setMargin(9);
-    hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
-    RBUniforme = new QRadioButton(GBTypeAdaptation);
-    RBUniforme->setObjectName(QString::fromUtf8("RBUniforme"));
-    RBUniforme->setCheckable(true);
-
-    hboxLayout->addWidget(RBUniforme);
-
-    RBChamp = new QRadioButton(GBTypeAdaptation);
-    RBChamp->setObjectName(QString::fromUtf8("RBChamp"));
-
-    hboxLayout->addWidget(RBChamp);
-
-    RBZone = new QRadioButton(GBTypeAdaptation);
-    RBZone->setObjectName(QString::fromUtf8("RBZone"));
-
-    hboxLayout->addWidget(RBZone);
-
-
-    gridLayout->addWidget(GBTypeAdaptation, 1, 0, 1, 2);
-
-    GBUniform = new QGroupBox(CreateHypothesis);
-    GBUniform->setObjectName(QString::fromUtf8("GBUniform"));
-    gridLayout1 = new QGridLayout(GBUniform);
-    gridLayout1->setSpacing(6);
-    gridLayout1->setMargin(9);
-    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
-    RBUniDera = new QRadioButton(GBUniform);
-    RBUniDera->setObjectName(QString::fromUtf8("RBUniDera"));
-
-    gridLayout1->addWidget(RBUniDera, 0, 1, 1, 1);
-
-    RBUniRaff = new QRadioButton(GBUniform);
-    RBUniRaff->setObjectName(QString::fromUtf8("RBUniRaff"));
-    RBUniRaff->setChecked(true);
-
-    gridLayout1->addWidget(RBUniRaff, 0, 0, 1, 1);
-
-
-    gridLayout->addWidget(GBUniform, 2, 0, 1, 2);
-
-    GBFieldFile = new QGroupBox(CreateHypothesis);
-    GBFieldFile->setObjectName(QString::fromUtf8("GBFieldFile"));
-    gridLayout2 = new QGridLayout(GBFieldFile);
-    gridLayout2->setSpacing(6);
-    gridLayout2->setMargin(9);
-    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
-    FieldFile = new QLabel(GBFieldFile);
-    FieldFile->setObjectName(QString::fromUtf8("FieldFile"));
-
-    gridLayout2->addWidget(FieldFile, 0, 0, 1, 1);
-
-    LEFieldFile = new QLineEdit(GBFieldFile);
-    LEFieldFile->setObjectName(QString::fromUtf8("LEFieldFile"));
-    LEFieldFile->setMinimumSize(QSize(282, 31));
-
-    gridLayout2->addWidget(LEFieldFile, 0, 1, 1, 1);
-
-
-    gridLayout->addWidget(GBFieldFile, 3, 0, 1, 2);
-
-    GBFieldManagement = new QGroupBox(CreateHypothesis);
-    GBFieldManagement->setObjectName(QString::fromUtf8("GBFieldManagement"));
-    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy1.setHorizontalStretch(0);
-    sizePolicy1.setVerticalStretch(0);
-    sizePolicy1.setHeightForWidth(GBFieldManagement->sizePolicy().hasHeightForWidth());
-    GBFieldManagement->setSizePolicy(sizePolicy1);
-    gridLayout3 = new QGridLayout(GBFieldManagement);
-    gridLayout3->setSpacing(6);
-    gridLayout3->setMargin(9);
-    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
-    hboxLayout1 = new QHBoxLayout();
-    hboxLayout1->setSpacing(6);
-    hboxLayout1->setMargin(0);
-    hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
-    FieldName = new QLabel(GBFieldManagement);
-    FieldName->setObjectName(QString::fromUtf8("FieldName"));
-
-    hboxLayout1->addWidget(FieldName);
-
-    CBFieldName = new QComboBox(GBFieldManagement);
-    CBFieldName->setObjectName(QString::fromUtf8("CBFieldName"));
-    QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy2.setHorizontalStretch(0);
-    sizePolicy2.setVerticalStretch(0);
-    sizePolicy2.setHeightForWidth(CBFieldName->sizePolicy().hasHeightForWidth());
-    CBFieldName->setSizePolicy(sizePolicy2);
-    CBFieldName->setEditable(false);
-    CBFieldName->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-
-    hboxLayout1->addWidget(CBFieldName);
-
-    spacerItem = new QSpacerItem(48, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-    hboxLayout1->addItem(spacerItem);
-
-
-    gridLayout3->addLayout(hboxLayout1, 0, 0, 1, 1);
-
-    hboxLayout2 = new QHBoxLayout();
-    hboxLayout2->setSpacing(6);
-    hboxLayout2->setMargin(0);
-    hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
-    TWCMP = new QTableWidget(GBFieldManagement);
-    TWCMP->setObjectName(QString::fromUtf8("TWCMP"));
-    TWCMP->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked);
-    TWCMP->setShowGrid(true);
-    TWCMP->setRowCount(0);
-    TWCMP->setColumnCount(2);
-
-    hboxLayout2->addWidget(TWCMP);
-
-    spacerItem1 = new QSpacerItem(60, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        if (CreateHypothesis->objectName().isEmpty())
+            CreateHypothesis->setObjectName(QString::fromUtf8("CreateHypothesis"));
+        CreateHypothesis->resize(770, 1428);
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(CreateHypothesis->sizePolicy().hasHeightForWidth());
+        CreateHypothesis->setSizePolicy(sizePolicy);
+        CreateHypothesis->setAutoFillBackground(true);
+        CreateHypothesis->setSizeGripEnabled(true);
+        gridLayout_3 = new QGridLayout(CreateHypothesis);
+        gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
+        Name = new QLabel(CreateHypothesis);
+        Name->setObjectName(QString::fromUtf8("Name"));
+
+        gridLayout_3->addWidget(Name, 0, 0, 1, 1);
+
+        LEHypothesisName = new QLineEdit(CreateHypothesis);
+        LEHypothesisName->setObjectName(QString::fromUtf8("LEHypothesisName"));
+        LEHypothesisName->setMinimumSize(QSize(382, 31));
+        LEHypothesisName->setMaxLength(32);
+
+        gridLayout_3->addWidget(LEHypothesisName, 0, 1, 1, 1);
+
+        GBTypeAdaptation = new QGroupBox(CreateHypothesis);
+        GBTypeAdaptation->setObjectName(QString::fromUtf8("GBTypeAdaptation"));
+        hboxLayout = new QHBoxLayout(GBTypeAdaptation);
+#ifndef Q_OS_MAC
+        hboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout->setContentsMargins(9, 9, 9, 9);
+#endif
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        RBUniforme = new QRadioButton(GBTypeAdaptation);
+        RBUniforme->setObjectName(QString::fromUtf8("RBUniforme"));
+        RBUniforme->setCheckable(true);
+
+        hboxLayout->addWidget(RBUniforme);
+
+        RBChamp = new QRadioButton(GBTypeAdaptation);
+        RBChamp->setObjectName(QString::fromUtf8("RBChamp"));
+
+        hboxLayout->addWidget(RBChamp);
+
+        RBZone = new QRadioButton(GBTypeAdaptation);
+        RBZone->setObjectName(QString::fromUtf8("RBZone"));
+
+        hboxLayout->addWidget(RBZone);
+
+
+        gridLayout_3->addWidget(GBTypeAdaptation, 1, 0, 1, 2);
+
+        GBUniform = new QGroupBox(CreateHypothesis);
+        GBUniform->setObjectName(QString::fromUtf8("GBUniform"));
+        gridLayout = new QGridLayout(GBUniform);
+#ifndef Q_OS_MAC
+        gridLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        RBUniDera = new QRadioButton(GBUniform);
+        RBUniDera->setObjectName(QString::fromUtf8("RBUniDera"));
+
+        gridLayout->addWidget(RBUniDera, 0, 1, 1, 1);
+
+        RBUniRaff = new QRadioButton(GBUniform);
+        RBUniRaff->setObjectName(QString::fromUtf8("RBUniRaff"));
+        RBUniRaff->setChecked(true);
+
+        gridLayout->addWidget(RBUniRaff, 0, 0, 1, 1);
+
+
+        gridLayout_3->addWidget(GBUniform, 2, 0, 1, 2);
+
+        GBFieldFile = new QGroupBox(CreateHypothesis);
+        GBFieldFile->setObjectName(QString::fromUtf8("GBFieldFile"));
+        gridLayout1 = new QGridLayout(GBFieldFile);
+#ifndef Q_OS_MAC
+        gridLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout1->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        FieldFile = new QLabel(GBFieldFile);
+        FieldFile->setObjectName(QString::fromUtf8("FieldFile"));
+
+        gridLayout1->addWidget(FieldFile, 0, 0, 1, 1);
+
+        LEFieldFile = new QLineEdit(GBFieldFile);
+        LEFieldFile->setObjectName(QString::fromUtf8("LEFieldFile"));
+        LEFieldFile->setMinimumSize(QSize(282, 31));
+
+        gridLayout1->addWidget(LEFieldFile, 0, 1, 1, 1);
+
+
+        gridLayout_3->addWidget(GBFieldFile, 3, 0, 1, 2);
+
+        GBFieldManagement = new QGroupBox(CreateHypothesis);
+        GBFieldManagement->setObjectName(QString::fromUtf8("GBFieldManagement"));
+        sizePolicy.setHeightForWidth(GBFieldManagement->sizePolicy().hasHeightForWidth());
+        GBFieldManagement->setSizePolicy(sizePolicy);
+        gridLayout2 = new QGridLayout(GBFieldManagement);
+#ifndef Q_OS_MAC
+        gridLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout2->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+        hboxLayout1 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout1->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
+#endif
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        FieldName = new QLabel(GBFieldManagement);
+        FieldName->setObjectName(QString::fromUtf8("FieldName"));
+
+        hboxLayout1->addWidget(FieldName);
+
+        CBFieldName = new QComboBox(GBFieldManagement);
+        CBFieldName->setObjectName(QString::fromUtf8("CBFieldName"));
+        sizePolicy.setHeightForWidth(CBFieldName->sizePolicy().hasHeightForWidth());
+        CBFieldName->setSizePolicy(sizePolicy);
+        CBFieldName->setEditable(false);
+        CBFieldName->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+
+        hboxLayout1->addWidget(CBFieldName);
+
+        spacerItem = new QSpacerItem(48, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        hboxLayout1->addItem(spacerItem);
+
+
+        gridLayout2->addLayout(hboxLayout1, 0, 0, 1, 1);
+
+        hboxLayout2 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout2->setSpacing(6);
+#endif
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        TWCMP = new QTableWidget(GBFieldManagement);
+        if (TWCMP->columnCount() < 2)
+            TWCMP->setColumnCount(2);
+        QTableWidgetItem *__qtablewidgetitem = new QTableWidgetItem();
+        TWCMP->setHorizontalHeaderItem(0, __qtablewidgetitem);
+        QTableWidgetItem *__qtablewidgetitem1 = new QTableWidgetItem();
+        TWCMP->setHorizontalHeaderItem(1, __qtablewidgetitem1);
+        TWCMP->setObjectName(QString::fromUtf8("TWCMP"));
+        TWCMP->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked);
+        TWCMP->setShowGrid(true);
+        TWCMP->setRowCount(0);
+        TWCMP->setColumnCount(2);
 
-    hboxLayout2->addItem(spacerItem1);
+        hboxLayout2->addWidget(TWCMP);
 
-    vboxLayout = new QVBoxLayout();
-    vboxLayout->setSpacing(6);
-    vboxLayout->setMargin(0);
-    vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
-    hboxLayout3 = new QHBoxLayout();
-    hboxLayout3->setSpacing(6);
-    hboxLayout3->setMargin(0);
-    hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
-    RBL2 = new QRadioButton(GBFieldManagement);
-    RBL2->setObjectName(QString::fromUtf8("RBL2"));
-    RBL2->setChecked(true);
+        spacerItem1 = new QSpacerItem(60, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-    hboxLayout3->addWidget(RBL2);
+        hboxLayout2->addItem(spacerItem1);
 
-    RBInf = new QRadioButton(GBFieldManagement);
-    RBInf->setObjectName(QString::fromUtf8("RBInf"));
-    RBInf->setChecked(false);
+        vboxLayout = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout->setSpacing(6);
+#endif
+        vboxLayout->setContentsMargins(0, 0, 0, 0);
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        hboxLayout3 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout3->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
+#endif
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        RBL2 = new QRadioButton(GBFieldManagement);
+        RBL2->setObjectName(QString::fromUtf8("RBL2"));
+        RBL2->setChecked(true);
 
-    hboxLayout3->addWidget(RBInf);
+        hboxLayout3->addWidget(RBL2);
 
+        RBInf = new QRadioButton(GBFieldManagement);
+        RBInf->setObjectName(QString::fromUtf8("RBInf"));
+        RBInf->setChecked(false);
 
-    vboxLayout->addLayout(hboxLayout3);
+        hboxLayout3->addWidget(RBInf);
 
-    CBJump = new QCheckBox(GBFieldManagement);
-    CBJump->setObjectName(QString::fromUtf8("CBJump"));
 
-    vboxLayout->addWidget(CBJump);
+        vboxLayout->addLayout(hboxLayout3);
 
+        CBJump = new QCheckBox(GBFieldManagement);
+        CBJump->setObjectName(QString::fromUtf8("CBJump"));
+
+        vboxLayout->addWidget(CBJump);
 
-    hboxLayout2->addLayout(vboxLayout);
 
+        hboxLayout2->addLayout(vboxLayout);
 
-    gridLayout3->addLayout(hboxLayout2, 1, 0, 1, 1);
 
-    hboxLayout4 = new QHBoxLayout();
-    hboxLayout4->setSpacing(6);
-    hboxLayout4->setMargin(0);
-    hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
-    GBRefinementThresholds = new QGroupBox(GBFieldManagement);
-    GBRefinementThresholds->setObjectName(QString::fromUtf8("GBRefinementThresholds"));
-    QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy3.setHorizontalStretch(0);
-    sizePolicy3.setVerticalStretch(0);
-    sizePolicy3.setHeightForWidth(GBRefinementThresholds->sizePolicy().hasHeightForWidth());
-    GBRefinementThresholds->setSizePolicy(sizePolicy3);
-    gridLayout4 = new QGridLayout(GBRefinementThresholds);
-    gridLayout4->setSpacing(6);
-    gridLayout4->setMargin(9);
-    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
-    RBRPE = new QRadioButton(GBRefinementThresholds);
-    RBRPE->setObjectName(QString::fromUtf8("RBRPE"));
-    RBRPE->setCheckable(true);
-    RBRPE->setChecked(true);
+        gridLayout2->addLayout(hboxLayout2, 1, 0, 1, 1);
 
-    gridLayout4->addWidget(RBRPE, 0, 0, 1, 1);
+        hboxLayout4 = new QHBoxLayout();
+#ifndef Q_OS_MAC
+        hboxLayout4->setSpacing(6);
+#endif
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
+        hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
+        GBRefinementThresholds = new QGroupBox(GBFieldManagement);
+        GBRefinementThresholds->setObjectName(QString::fromUtf8("GBRefinementThresholds"));
+        sizePolicy.setHeightForWidth(GBRefinementThresholds->sizePolicy().hasHeightForWidth());
+        GBRefinementThresholds->setSizePolicy(sizePolicy);
+        gridLayout3 = new QGridLayout(GBRefinementThresholds);
+#ifndef Q_OS_MAC
+        gridLayout3->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout3->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+        RBRPE = new QRadioButton(GBRefinementThresholds);
+        RBRPE->setObjectName(QString::fromUtf8("RBRPE"));
+        RBRPE->setCheckable(true);
+        RBRPE->setChecked(true);
 
-    SpinBox_RPE = new QDoubleSpinBox(GBRefinementThresholds);
-    SpinBox_RPE->setObjectName(QString::fromUtf8("SpinBox_RPE"));
-    SpinBox_RPE->setDecimals(3);
-    SpinBox_RPE->setMaximum(100);
-    SpinBox_RPE->setSingleStep(0.1);
-    SpinBox_RPE->setValue(3);
+        gridLayout3->addWidget(RBRPE, 0, 0, 1, 1);
 
-    gridLayout4->addWidget(SpinBox_RPE, 0, 1, 1, 1);
+        SpinBox_RPE = new QDoubleSpinBox(GBRefinementThresholds);
+        SpinBox_RPE->setObjectName(QString::fromUtf8("SpinBox_RPE"));
+        SpinBox_RPE->setDecimals(3);
+        SpinBox_RPE->setMaximum(100);
+        SpinBox_RPE->setSingleStep(0.1);
+        SpinBox_RPE->setValue(2);
 
-    RBRRel = new QRadioButton(GBRefinementThresholds);
-    RBRRel->setObjectName(QString::fromUtf8("RBRRel"));
+        gridLayout3->addWidget(SpinBox_RPE, 0, 1, 1, 1);
 
-    gridLayout4->addWidget(RBRRel, 1, 0, 1, 1);
+        RBRRel = new QRadioButton(GBRefinementThresholds);
+        RBRRel->setObjectName(QString::fromUtf8("RBRRel"));
 
-    SpinBox_RRel = new QDoubleSpinBox(GBRefinementThresholds);
-    SpinBox_RRel->setObjectName(QString::fromUtf8("SpinBox_RRel"));
-    SpinBox_RRel->setEnabled(false);
-    SpinBox_RRel->setDecimals(3);
-    SpinBox_RRel->setMaximum(100);
-    SpinBox_RRel->setSingleStep(0.1);
+        gridLayout3->addWidget(RBRRel, 1, 0, 1, 1);
 
-    gridLayout4->addWidget(SpinBox_RRel, 1, 1, 1, 1);
+        SpinBox_RRel = new QDoubleSpinBox(GBRefinementThresholds);
+        SpinBox_RRel->setObjectName(QString::fromUtf8("SpinBox_RRel"));
+        SpinBox_RRel->setEnabled(false);
+        SpinBox_RRel->setDecimals(3);
+        SpinBox_RRel->setMaximum(100);
+        SpinBox_RRel->setSingleStep(0.1);
 
-    RBRAbs = new QRadioButton(GBRefinementThresholds);
-    RBRAbs->setObjectName(QString::fromUtf8("RBRAbs"));
+        gridLayout3->addWidget(SpinBox_RRel, 1, 1, 1, 1);
 
-    gridLayout4->addWidget(RBRAbs, 2, 0, 1, 1);
+        RBRAbs = new QRadioButton(GBRefinementThresholds);
+        RBRAbs->setObjectName(QString::fromUtf8("RBRAbs"));
 
-    SpinBox_RAbs = new QDoubleSpinBox(GBRefinementThresholds);
-    SpinBox_RAbs->setObjectName(QString::fromUtf8("SpinBox_RAbs"));
-    SpinBox_RAbs->setEnabled(false);
-    SpinBox_RAbs->setDecimals(8);
-    SpinBox_RAbs->setMaximum(1e+12);
-    SpinBox_RAbs->setMinimum(-1e+12);
-    SpinBox_RAbs->setSingleStep(0.1);
+        gridLayout3->addWidget(RBRAbs, 2, 0, 1, 1);
 
-    gridLayout4->addWidget(SpinBox_RAbs, 2, 1, 1, 1);
+        SpinBox_RAbs = new QDoubleSpinBox(GBRefinementThresholds);
+        SpinBox_RAbs->setObjectName(QString::fromUtf8("SpinBox_RAbs"));
+        SpinBox_RAbs->setEnabled(false);
+        SpinBox_RAbs->setDecimals(8);
+        SpinBox_RAbs->setMinimum(-1e+12);
+        SpinBox_RAbs->setMaximum(1e+12);
+        SpinBox_RAbs->setSingleStep(0.1);
+
+        gridLayout3->addWidget(SpinBox_RAbs, 2, 1, 1, 1);
+
+        RBRNo = new QRadioButton(GBRefinementThresholds);
+        RBRNo->setObjectName(QString::fromUtf8("RBRNo"));
 
-    RBRNo = new QRadioButton(GBRefinementThresholds);
-    RBRNo->setObjectName(QString::fromUtf8("RBRNo"));
+        gridLayout3->addWidget(RBRNo, 3, 0, 1, 1);
 
-    gridLayout4->addWidget(RBRNo, 3, 0, 1, 1);
 
+        hboxLayout4->addWidget(GBRefinementThresholds);
 
-    hboxLayout4->addWidget(GBRefinementThresholds);
+        GBCoarseningThresholds = new QGroupBox(GBFieldManagement);
+        GBCoarseningThresholds->setObjectName(QString::fromUtf8("GBCoarseningThresholds"));
+        gridLayout4 = new QGridLayout(GBCoarseningThresholds);
+#ifndef Q_OS_MAC
+        gridLayout4->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout4->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+        RBCPE = new QRadioButton(GBCoarseningThresholds);
+        RBCPE->setObjectName(QString::fromUtf8("RBCPE"));
+        RBCPE->setCheckable(true);
+        RBCPE->setChecked(false);
 
-    GBCoarseningThresholds = new QGroupBox(GBFieldManagement);
-    GBCoarseningThresholds->setObjectName(QString::fromUtf8("GBCoarseningThresholds"));
-    gridLayout5 = new QGridLayout(GBCoarseningThresholds);
-    gridLayout5->setSpacing(6);
-    gridLayout5->setMargin(9);
-    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
-    RBCPE = new QRadioButton(GBCoarseningThresholds);
-    RBCPE->setObjectName(QString::fromUtf8("RBCPE"));
-    RBCPE->setCheckable(true);
-    RBCPE->setChecked(false);
+        gridLayout4->addWidget(RBCPE, 0, 0, 1, 1);
+
+        SpinBox_CPE = new QDoubleSpinBox(GBCoarseningThresholds);
+        SpinBox_CPE->setObjectName(QString::fromUtf8("SpinBox_CPE"));
+        SpinBox_CPE->setEnabled(false);
+        SpinBox_CPE->setDecimals(3);
+        SpinBox_CPE->setMaximum(100);
+        SpinBox_CPE->setSingleStep(0.1);
+
+        gridLayout4->addWidget(SpinBox_CPE, 0, 1, 1, 1);
+
+        RBCRel = new QRadioButton(GBCoarseningThresholds);
+        RBCRel->setObjectName(QString::fromUtf8("RBCRel"));
+
+        gridLayout4->addWidget(RBCRel, 1, 0, 1, 1);
+
+        SpinBox_CRel = new QDoubleSpinBox(GBCoarseningThresholds);
+        SpinBox_CRel->setObjectName(QString::fromUtf8("SpinBox_CRel"));
+        SpinBox_CRel->setEnabled(false);
+        SpinBox_CRel->setDecimals(3);
+        SpinBox_CRel->setMaximum(100);
+        SpinBox_CRel->setSingleStep(0.1);
 
-    gridLayout5->addWidget(RBCPE, 0, 0, 1, 1);
+        gridLayout4->addWidget(SpinBox_CRel, 1, 1, 1, 1);
 
-    SpinBox_CPE = new QDoubleSpinBox(GBCoarseningThresholds);
-    SpinBox_CPE->setObjectName(QString::fromUtf8("SpinBox_CPE"));
-    SpinBox_CPE->setEnabled(false);
-    SpinBox_CPE->setDecimals(3);
-    SpinBox_CPE->setMaximum(100);
-    SpinBox_CPE->setSingleStep(0.1);
+        RBCAbs = new QRadioButton(GBCoarseningThresholds);
+        RBCAbs->setObjectName(QString::fromUtf8("RBCAbs"));
 
-    gridLayout5->addWidget(SpinBox_CPE, 0, 1, 1, 1);
+        gridLayout4->addWidget(RBCAbs, 2, 0, 1, 1);
 
-    RBCRel = new QRadioButton(GBCoarseningThresholds);
-    RBCRel->setObjectName(QString::fromUtf8("RBCRel"));
+        SpinBox_CAbs = new QDoubleSpinBox(GBCoarseningThresholds);
+        SpinBox_CAbs->setObjectName(QString::fromUtf8("SpinBox_CAbs"));
+        SpinBox_CAbs->setEnabled(false);
+        SpinBox_CAbs->setDecimals(8);
+        SpinBox_CAbs->setMinimum(-1e+12);
+        SpinBox_CAbs->setMaximum(1e+12);
+        SpinBox_CAbs->setSingleStep(0.1);
 
-    gridLayout5->addWidget(RBCRel, 1, 0, 1, 1);
+        gridLayout4->addWidget(SpinBox_CAbs, 2, 1, 1, 1);
 
-    SpinBox_CRel = new QDoubleSpinBox(GBCoarseningThresholds);
-    SpinBox_CRel->setObjectName(QString::fromUtf8("SpinBox_CRel"));
-    SpinBox_CRel->setEnabled(false);
-    SpinBox_CRel->setDecimals(3);
-    SpinBox_CRel->setMaximum(100);
-    SpinBox_CRel->setSingleStep(0.1);
+        RBCNo = new QRadioButton(GBCoarseningThresholds);
+        RBCNo->setObjectName(QString::fromUtf8("RBCNo"));
+        RBCNo->setChecked(true);
 
-    gridLayout5->addWidget(SpinBox_CRel, 1, 1, 1, 1);
+        gridLayout4->addWidget(RBCNo, 3, 0, 1, 1);
 
-    RBCAbs = new QRadioButton(GBCoarseningThresholds);
-    RBCAbs->setObjectName(QString::fromUtf8("RBCAbs"));
 
-    gridLayout5->addWidget(RBCAbs, 2, 0, 1, 1);
+        hboxLayout4->addWidget(GBCoarseningThresholds);
 
-    SpinBox_CAbs = new QDoubleSpinBox(GBCoarseningThresholds);
-    SpinBox_CAbs->setObjectName(QString::fromUtf8("SpinBox_CAbs"));
-    SpinBox_CAbs->setEnabled(false);
-    SpinBox_CAbs->setDecimals(8);
-    SpinBox_CAbs->setMaximum(1e+12);
-    SpinBox_CAbs->setMinimum(-1e+12);
-    SpinBox_CAbs->setSingleStep(0.1);
 
-    gridLayout5->addWidget(SpinBox_CAbs, 2, 1, 1, 1);
+        gridLayout2->addLayout(hboxLayout4, 2, 0, 1, 1);
 
-    RBCNo = new QRadioButton(GBCoarseningThresholds);
-    RBCNo->setObjectName(QString::fromUtf8("RBCNo"));
-    RBCNo->setChecked(true);
 
-    gridLayout5->addWidget(RBCNo, 3, 0, 1, 1);
+        gridLayout_3->addWidget(GBFieldManagement, 4, 0, 1, 2);
 
+        GBAreaManagement = new QGroupBox(CreateHypothesis);
+        GBAreaManagement->setObjectName(QString::fromUtf8("GBAreaManagement"));
+        sizePolicy.setHeightForWidth(GBAreaManagement->sizePolicy().hasHeightForWidth());
+        GBAreaManagement->setSizePolicy(sizePolicy);
+        gridLayout5 = new QGridLayout(GBAreaManagement);
+        gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+        TWZone = new QTableWidget(GBAreaManagement);
+        if (TWZone->columnCount() < 3)
+            TWZone->setColumnCount(3);
+        QTableWidgetItem *__qtablewidgetitem2 = new QTableWidgetItem();
+        TWZone->setHorizontalHeaderItem(0, __qtablewidgetitem2);
+        QTableWidgetItem *__qtablewidgetitem3 = new QTableWidgetItem();
+        TWZone->setHorizontalHeaderItem(1, __qtablewidgetitem3);
+        QTableWidgetItem *__qtablewidgetitem4 = new QTableWidgetItem();
+        TWZone->setHorizontalHeaderItem(2, __qtablewidgetitem4);
+        TWZone->setObjectName(QString::fromUtf8("TWZone"));
+        TWZone->setMinimumSize(QSize(400, 0));
+        TWZone->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked);
+        TWZone->setShowGrid(true);
+        TWZone->setRowCount(0);
+        TWZone->setColumnCount(3);
 
-    hboxLayout4->addWidget(GBCoarseningThresholds);
+        gridLayout5->addWidget(TWZone, 0, 0, 1, 1);
 
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-    gridLayout3->addLayout(hboxLayout4, 2, 0, 1, 1);
+        gridLayout5->addItem(horizontalSpacer, 0, 1, 1, 1);
 
+        vboxLayout1 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout1->setSpacing(6);
+#endif
+        vboxLayout1->setContentsMargins(0, 0, 0, 0);
+        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout2 = new QVBoxLayout();
+#ifndef Q_OS_MAC
+        vboxLayout2->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
+#endif
+        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        PBZoneNew = new QPushButton(GBAreaManagement);
+        PBZoneNew->setObjectName(QString::fromUtf8("PBZoneNew"));
 
-    gridLayout->addWidget(GBFieldManagement, 4, 0, 1, 2);
+        vboxLayout2->addWidget(PBZoneNew);
 
-    GBAreaManagement = new QGroupBox(CreateHypothesis);
-    GBAreaManagement->setObjectName(QString::fromUtf8("GBAreaManagement"));
-    QSizePolicy sizePolicy4(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy4.setHorizontalStretch(0);
-    sizePolicy4.setVerticalStretch(0);
-    sizePolicy4.setHeightForWidth(GBAreaManagement->sizePolicy().hasHeightForWidth());
-    GBAreaManagement->setSizePolicy(sizePolicy4);
-    gridLayout6 = new QGridLayout(GBAreaManagement);
-    gridLayout6->setSpacing(6);
-    gridLayout6->setMargin(9);
-    gridLayout6->setObjectName(QString::fromUtf8("gridLayout6"));
-    TWZone = new QTableWidget(GBAreaManagement);
-    TWZone->setObjectName(QString::fromUtf8("TWZone"));
-    TWZone->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked);
-    TWZone->setShowGrid(true);
-    TWZone->setRowCount(0);
-    TWZone->setColumnCount(2);
+        PBZoneEdit = new QPushButton(GBAreaManagement);
+        PBZoneEdit->setObjectName(QString::fromUtf8("PBZoneEdit"));
 
-    gridLayout6->addWidget(TWZone, 0, 0, 1, 1);
+        vboxLayout2->addWidget(PBZoneEdit);
 
-    vboxLayout1 = new QVBoxLayout();
-    vboxLayout1->setSpacing(6);
-    vboxLayout1->setMargin(0);
-    vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
-    vboxLayout2 = new QVBoxLayout();
-    vboxLayout2->setSpacing(6);
-    vboxLayout2->setMargin(0);
-    vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
-    PBZoneNew = new QPushButton(GBAreaManagement);
-    PBZoneNew->setObjectName(QString::fromUtf8("PBZoneNew"));
+        PBZoneDelete = new QPushButton(GBAreaManagement);
+        PBZoneDelete->setObjectName(QString::fromUtf8("PBZoneDelete"));
 
-    vboxLayout2->addWidget(PBZoneNew);
+        vboxLayout2->addWidget(PBZoneDelete);
 
-    PBZoneEdit = new QPushButton(GBAreaManagement);
-    PBZoneEdit->setObjectName(QString::fromUtf8("PBZoneEdit"));
 
-    vboxLayout2->addWidget(PBZoneEdit);
+        vboxLayout1->addLayout(vboxLayout2);
 
-    PBZoneDelete = new QPushButton(GBAreaManagement);
-    PBZoneDelete->setObjectName(QString::fromUtf8("PBZoneDelete"));
+        spacerItem2 = new QSpacerItem(20, 48, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-    vboxLayout2->addWidget(PBZoneDelete);
+        vboxLayout1->addItem(spacerItem2);
 
 
-    vboxLayout1->addLayout(vboxLayout2);
+        gridLayout5->addLayout(vboxLayout1, 0, 2, 1, 1);
 
-    spacerItem2 = new QSpacerItem(20, 48, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-    vboxLayout1->addItem(spacerItem2);
+        gridLayout_3->addWidget(GBAreaManagement, 5, 0, 1, 2);
 
+        GBField = new QGroupBox(CreateHypothesis);
+        GBField->setObjectName(QString::fromUtf8("GBField"));
+        gridLayout6 = new QGridLayout(GBField);
+#ifndef Q_OS_MAC
+        gridLayout6->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout6->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout6->setObjectName(QString::fromUtf8("gridLayout6"));
+        gridLayout7 = new QGridLayout();
+#ifndef Q_OS_MAC
+        gridLayout7->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout7->setContentsMargins(0, 0, 0, 0);
+#endif
+        gridLayout7->setObjectName(QString::fromUtf8("gridLayout7"));
+        RBFieldNo = new QRadioButton(GBField);
+        RBFieldNo->setObjectName(QString::fromUtf8("RBFieldNo"));
+        RBFieldNo->setChecked(true);
 
-    gridLayout6->addLayout(vboxLayout1, 0, 1, 1, 1);
+        gridLayout7->addWidget(RBFieldNo, 0, 0, 1, 1);
 
+        RBFieldAll = new QRadioButton(GBField);
+        RBFieldAll->setObjectName(QString::fromUtf8("RBFieldAll"));
+        RBFieldAll->setChecked(false);
 
-    gridLayout->addWidget(GBAreaManagement, 5, 0, 1, 2);
+        gridLayout7->addWidget(RBFieldAll, 0, 1, 1, 1);
 
-    GBField = new QGroupBox(CreateHypothesis);
-    GBField->setObjectName(QString::fromUtf8("GBField"));
-    gridLayout7 = new QGridLayout(GBField);
-    gridLayout7->setSpacing(6);
-    gridLayout7->setMargin(9);
-    gridLayout7->setObjectName(QString::fromUtf8("gridLayout7"));
-    gridLayout8 = new QGridLayout();
-    gridLayout8->setSpacing(6);
-    gridLayout8->setMargin(0);
-    gridLayout8->setObjectName(QString::fromUtf8("gridLayout8"));
-    RBFieldNo = new QRadioButton(GBField);
-    RBFieldNo->setObjectName(QString::fromUtf8("RBFieldNo"));
-    RBFieldNo->setChecked(true);
+        RBFieldChosen = new QRadioButton(GBField);
+        RBFieldChosen->setObjectName(QString::fromUtf8("RBFieldChosen"));
+        RBFieldChosen->setChecked(false);
 
-    gridLayout8->addWidget(RBFieldNo, 0, 0, 1, 1);
+        gridLayout7->addWidget(RBFieldChosen, 0, 2, 1, 1);
 
-    RBFieldAll = new QRadioButton(GBField);
-    RBFieldAll->setObjectName(QString::fromUtf8("RBFieldAll"));
-    RBFieldAll->setChecked(false);
 
-    gridLayout8->addWidget(RBFieldAll, 0, 1, 1, 1);
+        gridLayout6->addLayout(gridLayout7, 0, 0, 1, 1);
 
-    RBFieldChosen = new QRadioButton(GBField);
-    RBFieldChosen->setObjectName(QString::fromUtf8("RBFieldChosen"));
-    RBFieldChosen->setChecked(false);
+        TWField = new QTableWidget(GBField);
+        if (TWField->columnCount() < 2)
+            TWField->setColumnCount(2);
+        QTableWidgetItem *__qtablewidgetitem5 = new QTableWidgetItem();
+        TWField->setHorizontalHeaderItem(0, __qtablewidgetitem5);
+        QTableWidgetItem *__qtablewidgetitem6 = new QTableWidgetItem();
+        TWField->setHorizontalHeaderItem(1, __qtablewidgetitem6);
+        TWField->setObjectName(QString::fromUtf8("TWField"));
 
-    gridLayout8->addWidget(RBFieldChosen, 0, 2, 1, 1);
+        gridLayout6->addWidget(TWField, 1, 0, 1, 1);
 
 
-    gridLayout7->addLayout(gridLayout8, 0, 0, 1, 1);
+        gridLayout_3->addWidget(GBField, 6, 0, 1, 2);
 
-    TWField = new QTableWidget(GBField);
-    TWField->setObjectName(QString::fromUtf8("TWField"));
+        CBGroupe = new QCheckBox(CreateHypothesis);
+        CBGroupe->setObjectName(QString::fromUtf8("CBGroupe"));
 
-    gridLayout7->addWidget(TWField, 1, 0, 1, 1);
+        gridLayout_3->addWidget(CBGroupe, 7, 0, 1, 2);
 
+        CBAdvanced = new QCheckBox(CreateHypothesis);
+        CBAdvanced->setObjectName(QString::fromUtf8("CBAdvanced"));
 
-    gridLayout->addWidget(GBField, 6, 0, 1, 2);
+        gridLayout_3->addWidget(CBAdvanced, 8, 0, 1, 2);
 
-    CBGroupe = new QCheckBox(CreateHypothesis);
-    CBGroupe->setObjectName(QString::fromUtf8("CBGroupe"));
+        GBAdvancedOptions = new QGroupBox(CreateHypothesis);
+        GBAdvancedOptions->setObjectName(QString::fromUtf8("GBAdvancedOptions"));
+        gridLayout_1 = new QGridLayout(GBAdvancedOptions);
+        gridLayout_1->setObjectName(QString::fromUtf8("gridLayout_1"));
+        TLMinimalDiameter = new QLabel(GBAdvancedOptions);
+        TLMinimalDiameter->setObjectName(QString::fromUtf8("TLMinimalDiameter"));
+        sizePolicy.setHeightForWidth(TLMinimalDiameter->sizePolicy().hasHeightForWidth());
+        TLMinimalDiameter->setSizePolicy(sizePolicy);
+        TLMinimalDiameter->setWordWrap(false);
 
-    gridLayout->addWidget(CBGroupe, 7, 0, 1, 2);
+        gridLayout_1->addWidget(TLMinimalDiameter, 0, 0, 1, 1);
 
-    CBAdvanced = new QCheckBox(CreateHypothesis);
-    CBAdvanced->setObjectName(QString::fromUtf8("CBAdvanced"));
+        doubleSpinBoxDiamMin = new QDoubleSpinBox(GBAdvancedOptions);
+        doubleSpinBoxDiamMin->setObjectName(QString::fromUtf8("doubleSpinBoxDiamMin"));
+        doubleSpinBoxDiamMin->setDecimals(5);
 
-    gridLayout->addWidget(CBAdvanced, 8, 0, 1, 1);
+        gridLayout_1->addWidget(doubleSpinBoxDiamMin, 0, 1, 1, 1);
 
-    GBAdvancedOptions = new QGroupBox(CreateHypothesis);
-    GBAdvancedOptions->setObjectName(QString::fromUtf8("GBAdvancedOptions"));
-    gridLayout9 = new QGridLayout(GBAdvancedOptions);
-    gridLayout9->setSpacing(6);
-    gridLayout9->setMargin(9);
-    gridLayout9->setObjectName(QString::fromUtf8("gridLayout9"));
-    spacerItem3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        TLMaximalLevel = new QLabel(GBAdvancedOptions);
+        TLMaximalLevel->setObjectName(QString::fromUtf8("TLMaximalLevel"));
+        sizePolicy.setHeightForWidth(TLMaximalLevel->sizePolicy().hasHeightForWidth());
+        TLMaximalLevel->setSizePolicy(sizePolicy);
+        TLMaximalLevel->setWordWrap(false);
 
-    gridLayout9->addItem(spacerItem3, 0, 2, 1, 1);
+        gridLayout_1->addWidget(TLMaximalLevel, 1, 0, 1, 1);
 
-    TLMinimalDiameter = new QLabel(GBAdvancedOptions);
-    TLMinimalDiameter->setObjectName(QString::fromUtf8("TLMinimalDiameter"));
-    QSizePolicy sizePolicy5(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy5.setHorizontalStretch(0);
-    sizePolicy5.setVerticalStretch(0);
-    sizePolicy5.setHeightForWidth(TLMinimalDiameter->sizePolicy().hasHeightForWidth());
-    TLMinimalDiameter->setSizePolicy(sizePolicy5);
-    TLMinimalDiameter->setWordWrap(false);
+        spinBoxNivMax = new QSpinBox(GBAdvancedOptions);
+        spinBoxNivMax->setObjectName(QString::fromUtf8("spinBoxNivMax"));
+        spinBoxNivMax->setValue(99);
 
-    gridLayout9->addWidget(TLMinimalDiameter, 0, 0, 1, 1);
+        gridLayout_1->addWidget(spinBoxNivMax, 1, 1, 1, 1);
 
-    spinBoxNivMax = new QSpinBox(GBAdvancedOptions);
-    spinBoxNivMax->setObjectName(QString::fromUtf8("spinBoxNivMax"));
-    spinBoxNivMax->setValue(99);
+        GBAdapInit = new QGroupBox(GBAdvancedOptions);
+        GBAdapInit->setObjectName(QString::fromUtf8("GBAdapInit"));
+        gridLayout_2 = new QGridLayout(GBAdapInit);
+        gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+        RBAIN = new QRadioButton(GBAdapInit);
+        RBAIN->setObjectName(QString::fromUtf8("RBAIN"));
+        RBAIN->setChecked(true);
 
-    gridLayout9->addWidget(spinBoxNivMax, 0, 4, 1, 1);
+        gridLayout_2->addWidget(RBAIN, 0, 0, 1, 1);
 
-    doubleSpinBoxDiamMin = new QDoubleSpinBox(GBAdvancedOptions);
-    doubleSpinBoxDiamMin->setObjectName(QString::fromUtf8("doubleSpinBoxDiamMin"));
-    doubleSpinBoxDiamMin->setDecimals(5);
+        RBAIR = new QRadioButton(GBAdapInit);
+        RBAIR->setObjectName(QString::fromUtf8("RBAIR"));
 
-    gridLayout9->addWidget(doubleSpinBoxDiamMin, 0, 1, 1, 1);
+        gridLayout_2->addWidget(RBAIR, 0, 1, 1, 1);
 
-    TLMaximalLevel = new QLabel(GBAdvancedOptions);
-    TLMaximalLevel->setObjectName(QString::fromUtf8("TLMaximalLevel"));
-    QSizePolicy sizePolicy6(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
-    sizePolicy6.setHorizontalStretch(0);
-    sizePolicy6.setVerticalStretch(0);
-    sizePolicy6.setHeightForWidth(TLMaximalLevel->sizePolicy().hasHeightForWidth());
-    TLMaximalLevel->setSizePolicy(sizePolicy6);
-    TLMaximalLevel->setWordWrap(false);
+        RBAID = new QRadioButton(GBAdapInit);
+        RBAID->setObjectName(QString::fromUtf8("RBAID"));
 
-    gridLayout9->addWidget(TLMaximalLevel, 0, 3, 1, 1);
+        gridLayout_2->addWidget(RBAID, 0, 2, 1, 1);
 
 
-    gridLayout->addWidget(GBAdvancedOptions, 9, 0, 1, 1);
+        gridLayout_1->addWidget(GBAdapInit, 2, 0, 1, 2);
 
-    GBButtons = new QGroupBox(CreateHypothesis);
-    GBButtons->setObjectName(QString::fromUtf8("GBButtons"));
-    gridLayout10 = new QGridLayout(GBButtons);
-    gridLayout10->setSpacing(6);
-    gridLayout10->setMargin(9);
-    gridLayout10->setObjectName(QString::fromUtf8("gridLayout10"));
-    buttonOk = new QPushButton(GBButtons);
-    buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
 
-    gridLayout10->addWidget(buttonOk, 0, 0, 1, 1);
+        gridLayout_3->addWidget(GBAdvancedOptions, 9, 0, 1, 2);
 
-    buttonApply = new QPushButton(GBButtons);
-    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+        GBButtons = new QGroupBox(CreateHypothesis);
+        GBButtons->setObjectName(QString::fromUtf8("GBButtons"));
+        gridLayout8 = new QGridLayout(GBButtons);
+#ifndef Q_OS_MAC
+        gridLayout8->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+        gridLayout8->setContentsMargins(9, 9, 9, 9);
+#endif
+        gridLayout8->setObjectName(QString::fromUtf8("gridLayout8"));
+        buttonOk = new QPushButton(GBButtons);
+        buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
 
-    gridLayout10->addWidget(buttonApply, 0, 1, 1, 1);
+        gridLayout8->addWidget(buttonOk, 0, 0, 1, 1);
 
-    buttonCancel = new QPushButton(GBButtons);
-    buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+        buttonApply = new QPushButton(GBButtons);
+        buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
 
-    gridLayout10->addWidget(buttonCancel, 0, 2, 1, 1);
+        gridLayout8->addWidget(buttonApply, 0, 1, 1, 1);
 
-    buttonHelp = new QPushButton(GBButtons);
-    buttonHelp->setObjectName(QString::fromUtf8("buttonHelp"));
+        buttonCancel = new QPushButton(GBButtons);
+        buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
 
-    gridLayout10->addWidget(buttonHelp, 0, 3, 1, 1);
+        gridLayout8->addWidget(buttonCancel, 0, 2, 1, 1);
 
+        buttonHelp = new QPushButton(GBButtons);
+        buttonHelp->setObjectName(QString::fromUtf8("buttonHelp"));
 
-    gridLayout->addWidget(GBButtons, 10, 0, 1, 2);
+        gridLayout8->addWidget(buttonHelp, 0, 3, 1, 1);
 
 
-    retranslateUi(CreateHypothesis);
+        gridLayout_3->addWidget(GBButtons, 10, 0, 1, 2);
 
-    QSize size(717, 1166);
-    size = size.expandedTo(CreateHypothesis->minimumSizeHint());
-    CreateHypothesis->resize(size);
+        LEHypothesisName->raise();
+        GBTypeAdaptation->raise();
+        GBUniform->raise();
+        GBFieldFile->raise();
+        GBFieldManagement->raise();
+        GBAreaManagement->raise();
+        GBField->raise();
+        CBGroupe->raise();
+        CBAdvanced->raise();
+        GBAdvancedOptions->raise();
+        GBButtons->raise();
+        Name->raise();
 
+        retranslateUi(CreateHypothesis);
 
-    QMetaObject::connectSlotsByName(CreateHypothesis);
+        QMetaObject::connectSlotsByName(CreateHypothesis);
     } // setupUi
 
     void retranslateUi(QDialog *CreateHypothesis)
     {
-    CreateHypothesis->setWindowTitle(QApplication::translate("CreateHypothesis", "Create an hypothesis", 0, QApplication::UnicodeUTF8));
-    Name->setText(QApplication::translate("CreateHypothesis", "Name", 0, QApplication::UnicodeUTF8));
-    GBTypeAdaptation->setTitle(QApplication::translate("CreateHypothesis", "Type of adaptation", 0, QApplication::UnicodeUTF8));
-    RBUniforme->setText(QApplication::translate("CreateHypothesis", "Uniform", 0, QApplication::UnicodeUTF8));
-    RBChamp->setText(QApplication::translate("CreateHypothesis", "Driven by a field", 0, QApplication::UnicodeUTF8));
-    RBZone->setText(QApplication::translate("CreateHypothesis", "With geometrical zones", 0, QApplication::UnicodeUTF8));
-    GBUniform->setTitle(QApplication::translate("CreateHypothesis", "Uniform adaptation", 0, QApplication::UnicodeUTF8));
-    RBUniDera->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8));
-    RBUniRaff->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8));
-    GBFieldFile->setTitle(QString());
-    FieldFile->setText(QApplication::translate("CreateHypothesis", "File of the fields", 0, QApplication::UnicodeUTF8));
-    GBFieldManagement->setTitle(QApplication::translate("CreateHypothesis", "Governing field for the adaptation", 0, QApplication::UnicodeUTF8));
-    FieldName->setText(QApplication::translate("CreateHypothesis", "Field name", 0, QApplication::UnicodeUTF8));
-    if (TWCMP->columnCount() < 2)
-        TWCMP->setColumnCount(2);
-
-    QTableWidgetItem *__colItem = new QTableWidgetItem();
-    __colItem->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8));
-    TWCMP->setHorizontalHeaderItem(0, __colItem);
-
-    QTableWidgetItem *__colItem1 = new QTableWidgetItem();
-    __colItem1->setText(QApplication::translate("CreateHypothesis", "Component", 0, QApplication::UnicodeUTF8));
-    TWCMP->setHorizontalHeaderItem(1, __colItem1);
-    RBL2->setText(QApplication::translate("CreateHypothesis", "L2 norm", 0, QApplication::UnicodeUTF8));
-    RBInf->setText(QApplication::translate("CreateHypothesis", "Infinite norm", 0, QApplication::UnicodeUTF8));
-    CBJump->setText(QApplication::translate("CreateHypothesis", "Jump between elements", 0, QApplication::UnicodeUTF8));
-    GBRefinementThresholds->setTitle(QApplication::translate("CreateHypothesis", "Refinement threshold", 0, QApplication::UnicodeUTF8));
-    RBRPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8));
-    SpinBox_RPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-    RBRRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8));
-    SpinBox_RRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-    RBRAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8));
-    RBRNo->setText(QApplication::translate("CreateHypothesis", "No refinement", 0, QApplication::UnicodeUTF8));
-    GBCoarseningThresholds->setTitle(QApplication::translate("CreateHypothesis", "Coarsening threshold", 0, QApplication::UnicodeUTF8));
-    RBCPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8));
-    SpinBox_CPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-    RBCRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8));
-    SpinBox_CRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-    RBCAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8));
-    RBCNo->setText(QApplication::translate("CreateHypothesis", "No coarsening", 0, QApplication::UnicodeUTF8));
-    GBAreaManagement->setTitle(QApplication::translate("CreateHypothesis", "Zone management", 0, QApplication::UnicodeUTF8));
-    if (TWZone->columnCount() < 2)
-        TWZone->setColumnCount(2);
-
-    QTableWidgetItem *__colItem2 = new QTableWidgetItem();
-    __colItem2->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8));
-    TWZone->setHorizontalHeaderItem(0, __colItem2);
-
-    QTableWidgetItem *__colItem3 = new QTableWidgetItem();
-    __colItem3->setText(QApplication::translate("CreateHypothesis", "Zone name", 0, QApplication::UnicodeUTF8));
-    TWZone->setHorizontalHeaderItem(1, __colItem3);
-    PBZoneNew->setText(QApplication::translate("CreateHypothesis", "New", 0, QApplication::UnicodeUTF8));
-    PBZoneEdit->setText(QApplication::translate("CreateHypothesis", "Edit", 0, QApplication::UnicodeUTF8));
-    PBZoneDelete->setText(QString());
-    GBField->setTitle(QApplication::translate("CreateHypothesis", "Field Interpolation", 0, QApplication::UnicodeUTF8));
-    RBFieldNo->setText(QApplication::translate("CreateHypothesis", "None", 0, QApplication::UnicodeUTF8));
-    RBFieldAll->setText(QApplication::translate("CreateHypothesis", "All", 0, QApplication::UnicodeUTF8));
-    RBFieldChosen->setText(QApplication::translate("CreateHypothesis", "Chosen", 0, QApplication::UnicodeUTF8));
-    if (TWField->columnCount() < 2)
-        TWField->setColumnCount(2);
-
-    QTableWidgetItem *__colItem4 = new QTableWidgetItem();
-    __colItem4->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8));
-    TWField->setHorizontalHeaderItem(0, __colItem4);
-
-    QTableWidgetItem *__colItem5 = new QTableWidgetItem();
-    __colItem5->setText(QApplication::translate("CreateHypothesis", "Field Name", 0, QApplication::UnicodeUTF8));
-    TWField->setHorizontalHeaderItem(1, __colItem5);
-    CBGroupe->setText(QApplication::translate("CreateHypothesis", "Filtering with groups", 0, QApplication::UnicodeUTF8));
-    CBAdvanced->setText(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8));
-    GBAdvancedOptions->setTitle(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8));
-    TLMinimalDiameter->setText(QApplication::translate("CreateHypothesis", "Minimal diameter", 0, QApplication::UnicodeUTF8));
-    TLMaximalLevel->setText(QApplication::translate("CreateHypothesis", "Maximal level", 0, QApplication::UnicodeUTF8));
-    GBButtons->setTitle(QString());
-    buttonOk->setText(QApplication::translate("CreateHypothesis", "OK", 0, QApplication::UnicodeUTF8));
-    buttonApply->setText(QApplication::translate("CreateHypothesis", "Apply", 0, QApplication::UnicodeUTF8));
-    buttonCancel->setText(QApplication::translate("CreateHypothesis", "Cancel", 0, QApplication::UnicodeUTF8));
-    buttonHelp->setText(QApplication::translate("CreateHypothesis", "Help", 0, QApplication::UnicodeUTF8));
-    Q_UNUSED(CreateHypothesis);
+        CreateHypothesis->setWindowTitle(QApplication::translate("CreateHypothesis", "Create an hypothesis", 0, QApplication::UnicodeUTF8));
+        Name->setText(QApplication::translate("CreateHypothesis", "Name", 0, QApplication::UnicodeUTF8));
+        GBTypeAdaptation->setTitle(QApplication::translate("CreateHypothesis", "Type of adaptation", 0, QApplication::UnicodeUTF8));
+        RBUniforme->setText(QApplication::translate("CreateHypothesis", "Uniform", 0, QApplication::UnicodeUTF8));
+        RBChamp->setText(QApplication::translate("CreateHypothesis", "Driven by a field", 0, QApplication::UnicodeUTF8));
+        RBZone->setText(QApplication::translate("CreateHypothesis", "With geometrical zones", 0, QApplication::UnicodeUTF8));
+        GBUniform->setTitle(QApplication::translate("CreateHypothesis", "Uniform adaptation", 0, QApplication::UnicodeUTF8));
+        RBUniDera->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8));
+        RBUniRaff->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8));
+        GBFieldFile->setTitle(QString());
+        FieldFile->setText(QApplication::translate("CreateHypothesis", "File of the fields", 0, QApplication::UnicodeUTF8));
+        GBFieldManagement->setTitle(QApplication::translate("CreateHypothesis", "Governing field for the adaptation", 0, QApplication::UnicodeUTF8));
+        FieldName->setText(QApplication::translate("CreateHypothesis", "Field name", 0, QApplication::UnicodeUTF8));
+        QTableWidgetItem *___qtablewidgetitem = TWCMP->horizontalHeaderItem(0);
+        ___qtablewidgetitem->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8));
+        QTableWidgetItem *___qtablewidgetitem1 = TWCMP->horizontalHeaderItem(1);
+        ___qtablewidgetitem1->setText(QApplication::translate("CreateHypothesis", "Component", 0, QApplication::UnicodeUTF8));
+        RBL2->setText(QApplication::translate("CreateHypothesis", "L2 norm", 0, QApplication::UnicodeUTF8));
+        RBInf->setText(QApplication::translate("CreateHypothesis", "Infinite norm", 0, QApplication::UnicodeUTF8));
+        CBJump->setText(QApplication::translate("CreateHypothesis", "Jump between elements", 0, QApplication::UnicodeUTF8));
+        GBRefinementThresholds->setTitle(QApplication::translate("CreateHypothesis", "Refinement threshold", 0, QApplication::UnicodeUTF8));
+        RBRPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8));
+        SpinBox_RPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
+        RBRRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8));
+        SpinBox_RRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
+        RBRAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8));
+        RBRNo->setText(QApplication::translate("CreateHypothesis", "No refinement", 0, QApplication::UnicodeUTF8));
+        GBCoarseningThresholds->setTitle(QApplication::translate("CreateHypothesis", "Coarsening threshold", 0, QApplication::UnicodeUTF8));
+        RBCPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8));
+        SpinBox_CPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
+        RBCRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8));
+        SpinBox_CRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
+        RBCAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8));
+        RBCNo->setText(QApplication::translate("CreateHypothesis", "No coarsening", 0, QApplication::UnicodeUTF8));
+        GBAreaManagement->setTitle(QApplication::translate("CreateHypothesis", "Zone management", 0, QApplication::UnicodeUTF8));
+        QTableWidgetItem *___qtablewidgetitem2 = TWZone->horizontalHeaderItem(0);
+        ___qtablewidgetitem2->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8));
+        QTableWidgetItem *___qtablewidgetitem3 = TWZone->horizontalHeaderItem(1);
+        ___qtablewidgetitem3->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8));
+        QTableWidgetItem *___qtablewidgetitem4 = TWZone->horizontalHeaderItem(2);
+        ___qtablewidgetitem4->setText(QApplication::translate("CreateHypothesis", "Zone name", 0, QApplication::UnicodeUTF8));
+        PBZoneNew->setText(QApplication::translate("CreateHypothesis", "New", 0, QApplication::UnicodeUTF8));
+        PBZoneEdit->setText(QApplication::translate("CreateHypothesis", "Edit", 0, QApplication::UnicodeUTF8));
+        PBZoneDelete->setText(QString());
+        GBField->setTitle(QApplication::translate("CreateHypothesis", "Field Interpolation", 0, QApplication::UnicodeUTF8));
+        RBFieldNo->setText(QApplication::translate("CreateHypothesis", "None", 0, QApplication::UnicodeUTF8));
+        RBFieldAll->setText(QApplication::translate("CreateHypothesis", "All", 0, QApplication::UnicodeUTF8));
+        RBFieldChosen->setText(QApplication::translate("CreateHypothesis", "Chosen", 0, QApplication::UnicodeUTF8));
+        QTableWidgetItem *___qtablewidgetitem5 = TWField->horizontalHeaderItem(0);
+        ___qtablewidgetitem5->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8));
+        QTableWidgetItem *___qtablewidgetitem6 = TWField->horizontalHeaderItem(1);
+        ___qtablewidgetitem6->setText(QApplication::translate("CreateHypothesis", "Field Name", 0, QApplication::UnicodeUTF8));
+        CBGroupe->setText(QApplication::translate("CreateHypothesis", "Filtering with groups", 0, QApplication::UnicodeUTF8));
+        CBAdvanced->setText(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8));
+        GBAdvancedOptions->setTitle(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8));
+        TLMinimalDiameter->setText(QApplication::translate("CreateHypothesis", "Minimal diameter", 0, QApplication::UnicodeUTF8));
+        TLMaximalLevel->setText(QApplication::translate("CreateHypothesis", "Maximal level", 0, QApplication::UnicodeUTF8));
+        GBAdapInit->setTitle(QApplication::translate("CreateHypothesis", "Intialization of adaptation", 0, QApplication::UnicodeUTF8));
+        RBAIN->setText(QApplication::translate("CreateHypothesis", "Nothing", 0, QApplication::UnicodeUTF8));
+        RBAIR->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8));
+        RBAID->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8));
+        GBButtons->setTitle(QString());
+        buttonOk->setText(QApplication::translate("CreateHypothesis", "OK", 0, QApplication::UnicodeUTF8));
+        buttonApply->setText(QApplication::translate("CreateHypothesis", "Apply", 0, QApplication::UnicodeUTF8));
+        buttonCancel->setText(QApplication::translate("CreateHypothesis", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("CreateHypothesis", "Help", 0, QApplication::UnicodeUTF8));
     } // retranslateUi
 
 };
@@ -710,4 +790,6 @@ namespace Ui {
     class CreateHypothesis: public Ui_CreateHypothesis {};
 } // namespace Ui
 
+QT_END_NAMESPACE
+
 #endif // CREATEHYPOTHESIS_H
index a3937ca44f7beba3c2e1d7859978c1dcfe30d643..8c7ec676681796fd03cf03ec7ee7ba4c1411aec2 100644 (file)
@@ -1,90 +1,83 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>CreateHypothesis</class>
- <widget class="QDialog" name="CreateHypothesis" >
-  <property name="geometry" >
+ <widget class="QDialog" name="CreateHypothesis">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>717</width>
-    <height>1166</height>
+    <width>770</width>
+    <height>1428</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 an hypothesis</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" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="Name" >
-     <property name="text" >
+  <layout class="QGridLayout" name="gridLayout_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" >
-    <widget class="QLineEdit" name="LEHypothesisName" >
-     <property name="minimumSize" >
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="LEHypothesisName">
+     <property name="minimumSize">
       <size>
        <width>382</width>
        <height>31</height>
       </size>
      </property>
-     <property name="maxLength" >
+     <property name="maxLength">
       <number>32</number>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QGroupBox" name="GBTypeAdaptation" >
-     <property name="title" >
+   <item row="1" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBTypeAdaptation">
+     <property name="title">
       <string>Type of adaptation</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
        <number>6</number>
       </property>
+      <property name="margin">
+       <number>9</number>
+      </property>
       <item>
-       <widget class="QRadioButton" name="RBUniforme" >
-        <property name="text" >
+       <widget class="QRadioButton" name="RBUniforme">
+        <property name="text">
          <string>Uniform</string>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RBChamp" >
-        <property name="text" >
+       <widget class="QRadioButton" name="RBChamp">
+        <property name="text">
          <string>Driven by a field</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RBZone" >
-        <property name="text" >
+       <widget class="QRadioButton" name="RBZone">
+        <property name="text">
          <string>With geometrical zones</string>
         </property>
        </widget>
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QGroupBox" name="GBUniform" >
-     <property name="title" >
+   <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBUniform">
+     <property name="title">
       <string>Uniform adaptation</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="1" >
-       <widget class="QRadioButton" name="RBUniDera" >
-        <property name="text" >
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="RBUniDera">
+        <property name="text">
          <string>Coarsening</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="RBUniRaff" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="RBUniRaff">
+        <property name="text">
          <string>Refinement</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QGroupBox" name="GBFieldFile" >
-     <property name="title" >
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBFieldFile">
+     <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="0" >
-       <widget class="QLabel" name="FieldFile" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="FieldFile">
+        <property name="text">
          <string>File of the fields</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="LEFieldFile" >
-        <property name="minimumSize" >
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="LEFieldFile">
+        <property name="minimumSize">
          <size>
           <width>282</width>
           <height>31</height>
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="QGroupBox" name="GBFieldManagement" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
+   <item row="4" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBFieldManagement">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Governing field for the adaptation</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="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
+      <item row="0" column="0">
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
         <item>
-         <widget class="QLabel" name="FieldName" >
-          <property name="text" >
+         <widget class="QLabel" name="FieldName">
+          <property name="text">
            <string>Field name</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="CBFieldName" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+         <widget class="QComboBox" name="CBFieldName">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="editable" >
+          <property name="editable">
            <bool>false</bool>
           </property>
-          <property name="sizeAdjustPolicy" >
+          <property name="sizeAdjustPolicy">
            <enum>QComboBox::AdjustToContents</enum>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>48</width>
             <height>20</height>
         </item>
        </layout>
       </item>
-      <item row="1" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
+      <item row="1" column="0">
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
         <item>
-         <widget class="QTableWidget" name="TWCMP" >
-          <property name="editTriggers" >
-           <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked</set>
+         <widget class="QTableWidget" name="TWCMP">
+          <property name="editTriggers">
+           <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
           </property>
-          <property name="showGrid" >
+          <property name="showGrid">
            <bool>true</bool>
           </property>
-          <property name="rowCount" >
+          <property name="rowCount">
            <number>0</number>
           </property>
-          <property name="columnCount" >
+          <property name="columnCount">
            <number>2</number>
           </property>
           <column>
-           <property name="text" >
+           <property name="text">
             <string>Selection</string>
            </property>
           </column>
           <column>
-           <property name="text" >
+           <property name="text">
             <string>Component</string>
            </property>
           </column>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>60</width>
             <height>20</height>
          </spacer>
         </item>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
             <item>
-             <widget class="QRadioButton" name="RBL2" >
-              <property name="text" >
+             <widget class="QRadioButton" name="RBL2">
+              <property name="text">
                <string>L2 norm</string>
               </property>
-              <property name="checked" >
+              <property name="checked">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QRadioButton" name="RBInf" >
-              <property name="text" >
+             <widget class="QRadioButton" name="RBInf">
+              <property name="text">
                <string>Infinite norm</string>
               </property>
-              <property name="checked" >
+              <property name="checked">
                <bool>false</bool>
               </property>
              </widget>
            </layout>
           </item>
           <item>
-           <widget class="QCheckBox" name="CBJump" >
-            <property name="text" >
+           <widget class="QCheckBox" name="CBJump">
+            <property name="text">
              <string>Jump between elements</string>
             </property>
            </widget>
         </item>
        </layout>
       </item>
-      <item row="2" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
+      <item row="2" column="0">
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
         <item>
-         <widget class="QGroupBox" name="GBRefinementThresholds" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
+         <widget class="QGroupBox" name="GBRefinementThresholds">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="title" >
+          <property name="title">
            <string>Refinement threshold</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="0" >
-            <widget class="QRadioButton" name="RBRPE" >
-             <property name="text" >
+           <item row="0" column="0">
+            <widget class="QRadioButton" name="RBRPE">
+             <property name="text">
               <string>Percentage of meshes</string>
              </property>
-             <property name="checkable" >
+             <property name="checkable">
               <bool>true</bool>
              </property>
-             <property name="checked" >
+             <property name="checked">
               <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item row="0" column="1" >
-            <widget class="QDoubleSpinBox" name="SpinBox_RPE" >
-             <property name="suffix" >
+           <item row="0" column="1">
+            <widget class="QDoubleSpinBox" name="SpinBox_RPE">
+             <property name="suffix">
               <string> %</string>
              </property>
-             <property name="decimals" >
+             <property name="decimals">
               <number>3</number>
              </property>
-             <property name="maximum" >
+             <property name="maximum">
               <double>100.000000000000000</double>
              </property>
-             <property name="singleStep" >
+             <property name="singleStep">
               <double>0.100000000000000</double>
              </property>
-             <property name="value" >
-              <double>3.000000000000000</double>
+             <property name="value">
+              <double>2.000000000000000</double>
              </property>
             </widget>
            </item>
-           <item row="1" column="0" >
-            <widget class="QRadioButton" name="RBRRel" >
-             <property name="text" >
+           <item row="1" column="0">
+            <widget class="QRadioButton" name="RBRRel">
+             <property name="text">
               <string>Relative</string>
              </property>
             </widget>
            </item>
-           <item row="1" column="1" >
-            <widget class="QDoubleSpinBox" name="SpinBox_RRel" >
-             <property name="enabled" >
+           <item row="1" column="1">
+            <widget class="QDoubleSpinBox" name="SpinBox_RRel">
+             <property name="enabled">
               <bool>false</bool>
              </property>
-             <property name="suffix" >
+             <property name="suffix">
               <string> %</string>
              </property>
-             <property name="decimals" >
+             <property name="decimals">
               <number>3</number>
              </property>
-             <property name="maximum" >
+             <property name="maximum">
               <double>100.000000000000000</double>
              </property>
-             <property name="singleStep" >
+             <property name="singleStep">
               <double>0.100000000000000</double>
              </property>
             </widget>
            </item>
-           <item row="2" column="0" >
-            <widget class="QRadioButton" name="RBRAbs" >
-             <property name="text" >
+           <item row="2" column="0">
+            <widget class="QRadioButton" name="RBRAbs">
+             <property name="text">
               <string>Absolute</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
-            <widget class="QDoubleSpinBox" name="SpinBox_RAbs" >
-             <property name="enabled" >
+           <item row="2" column="1">
+            <widget class="QDoubleSpinBox" name="SpinBox_RAbs">
+             <property name="enabled">
               <bool>false</bool>
              </property>
-             <property name="decimals" >
+             <property name="decimals">
               <number>8</number>
              </property>
-             <property name="maximum" >
-              <double>1000000000000.000000000000000</double>
-             </property>
-             <property name="minimum" >
+             <property name="minimum">
               <double>-1000000000000.000000000000000</double>
              </property>
-             <property name="singleStep" >
+             <property name="maximum">
+              <double>1000000000000.000000000000000</double>
+             </property>
+             <property name="singleStep">
               <double>0.100000000000000</double>
              </property>
             </widget>
            </item>
-           <item row="3" column="0" >
-            <widget class="QRadioButton" name="RBRNo" >
-             <property name="text" >
+           <item row="3" column="0">
+            <widget class="QRadioButton" name="RBRNo">
+             <property name="text">
               <string>No refinement</string>
              </property>
             </widget>
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GBCoarseningThresholds" >
-          <property name="title" >
+         <widget class="QGroupBox" name="GBCoarseningThresholds">
+          <property name="title">
            <string>Coarsening threshold</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="0" >
-            <widget class="QRadioButton" name="RBCPE" >
-             <property name="text" >
+           <item row="0" column="0">
+            <widget class="QRadioButton" name="RBCPE">
+             <property name="text">
               <string>Percentage of meshes</string>
              </property>
-             <property name="checkable" >
+             <property name="checkable">
               <bool>true</bool>
              </property>
-             <property name="checked" >
+             <property name="checked">
               <bool>false</bool>
              </property>
             </widget>
            </item>
-           <item row="0" column="1" >
-            <widget class="QDoubleSpinBox" name="SpinBox_CPE" >
-             <property name="enabled" >
+           <item row="0" column="1">
+            <widget class="QDoubleSpinBox" name="SpinBox_CPE">
+             <property name="enabled">
               <bool>false</bool>
              </property>
-             <property name="suffix" >
+             <property name="suffix">
               <string> %</string>
              </property>
-             <property name="decimals" >
+             <property name="decimals">
               <number>3</number>
              </property>
-             <property name="maximum" >
+             <property name="maximum">
               <double>100.000000000000000</double>
              </property>
-             <property name="singleStep" >
+             <property name="singleStep">
               <double>0.100000000000000</double>
              </property>
             </widget>
            </item>
-           <item row="1" column="0" >
-            <widget class="QRadioButton" name="RBCRel" >
-             <property name="text" >
+           <item row="1" column="0">
+            <widget class="QRadioButton" name="RBCRel">
+             <property name="text">
               <string>Relative</string>
              </property>
             </widget>
            </item>
-           <item row="1" column="1" >
-            <widget class="QDoubleSpinBox" name="SpinBox_CRel" >
-             <property name="enabled" >
+           <item row="1" column="1">
+            <widget class="QDoubleSpinBox" name="SpinBox_CRel">
+             <property name="enabled">
               <bool>false</bool>
              </property>
-             <property name="suffix" >
+             <property name="suffix">
               <string> %</string>
              </property>
-             <property name="decimals" >
+             <property name="decimals">
               <number>3</number>
              </property>
-             <property name="maximum" >
+             <property name="maximum">
               <double>100.000000000000000</double>
              </property>
-             <property name="singleStep" >
+             <property name="singleStep">
               <double>0.100000000000000</double>
              </property>
             </widget>
            </item>
-           <item row="2" column="0" >
-            <widget class="QRadioButton" name="RBCAbs" >
-             <property name="text" >
+           <item row="2" column="0">
+            <widget class="QRadioButton" name="RBCAbs">
+             <property name="text">
               <string>Absolute</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
-            <widget class="QDoubleSpinBox" name="SpinBox_CAbs" >
-             <property name="enabled" >
+           <item row="2" column="1">
+            <widget class="QDoubleSpinBox" name="SpinBox_CAbs">
+             <property name="enabled">
               <bool>false</bool>
              </property>
-             <property name="decimals" >
+             <property name="decimals">
               <number>8</number>
              </property>
-             <property name="maximum" >
-              <double>1000000000000.000000000000000</double>
-             </property>
-             <property name="minimum" >
+             <property name="minimum">
               <double>-1000000000000.000000000000000</double>
              </property>
-             <property name="singleStep" >
+             <property name="maximum">
+              <double>1000000000000.000000000000000</double>
+             </property>
+             <property name="singleStep">
               <double>0.100000000000000</double>
              </property>
             </widget>
            </item>
-           <item row="3" column="0" >
-            <widget class="QRadioButton" name="RBCNo" >
-             <property name="text" >
+           <item row="3" column="0">
+            <widget class="QRadioButton" name="RBCNo">
+             <property name="text">
               <string>No coarsening</string>
              </property>
-             <property name="checked" >
+             <property name="checked">
               <bool>true</bool>
              </property>
             </widget>
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2" >
-    <widget class="QGroupBox" name="GBAreaManagement" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
+   <item row="5" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBAreaManagement">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Zone management</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QTableWidget" name="TWZone" >
-        <property name="editTriggers" >
-         <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked</set>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QTableWidget" name="TWZone">
+        <property name="minimumSize">
+         <size>
+          <width>400</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="editTriggers">
+         <set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
         </property>
-        <property name="showGrid" >
+        <property name="showGrid">
          <bool>true</bool>
         </property>
-        <property name="rowCount" >
+        <property name="rowCount">
          <number>0</number>
         </property>
-        <property name="columnCount" >
-         <number>2</number>
+        <property name="columnCount">
+         <number>3</number>
         </property>
         <column>
-         <property name="text" >
-          <string>Selection</string>
+         <property name="text">
+          <string>Refinement</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Coarsening</string>
          </property>
         </column>
         <column>
-         <property name="text" >
+         <property name="text">
           <string>Zone name</string>
          </property>
         </column>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
         </property>
-        <property name="spacing" >
+       </spacer>
+      </item>
+      <item row="0" column="2">
+       <layout class="QVBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
           <item>
-           <widget class="QPushButton" name="PBZoneNew" >
-            <property name="text" >
+           <widget class="QPushButton" name="PBZoneNew">
+            <property name="text">
              <string>New</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="PBZoneEdit" >
-            <property name="text" >
+           <widget class="QPushButton" name="PBZoneEdit">
+            <property name="text">
              <string>Edit</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="PBZoneDelete" >
-            <property name="text" >
+           <widget class="QPushButton" name="PBZoneDelete">
+            <property name="text">
              <string/>
             </property>
            </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
             <height>48</height>
      </layout>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2" >
-    <widget class="QGroupBox" name="GBField" >
-     <property name="title" >
+   <item row="6" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBField">
+     <property name="title">
       <string>Field Interpolation</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="0" >
-       <layout class="QGridLayout" >
-        <property name="margin" >
+      <item row="0" column="0">
+       <layout class="QGridLayout">
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>6</number>
         </property>
-        <item row="0" column="0" >
-         <widget class="QRadioButton" name="RBFieldNo" >
-          <property name="text" >
+        <item row="0" column="0">
+         <widget class="QRadioButton" name="RBFieldNo">
+          <property name="text">
            <string>None</string>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QRadioButton" name="RBFieldAll" >
-          <property name="text" >
+        <item row="0" column="1">
+         <widget class="QRadioButton" name="RBFieldAll">
+          <property name="text">
            <string>All</string>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>false</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="2" >
-         <widget class="QRadioButton" name="RBFieldChosen" >
-          <property name="text" >
+        <item row="0" column="2">
+         <widget class="QRadioButton" name="RBFieldChosen">
+          <property name="text">
            <string>Chosen</string>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>false</bool>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item row="1" column="0" >
-       <widget class="QTableWidget" name="TWField" >
+      <item row="1" column="0">
+       <widget class="QTableWidget" name="TWField">
         <column>
-         <property name="text" >
+         <property name="text">
           <string>Selection</string>
          </property>
         </column>
         <column>
-         <property name="text" >
+         <property name="text">
           <string>Field Name</string>
          </property>
         </column>
      </layout>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2" >
-    <widget class="QCheckBox" name="CBGroupe" >
-     <property name="text" >
+   <item row="7" column="0" colspan="2">
+    <widget class="QCheckBox" name="CBGroupe">
+     <property name="text">
       <string>Filtering with groups</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" >
-     <widget class="QCheckBox" name="CBAdvanced" >
-       <property name="text" >
-         <string>Advanced options</string>
-       </property>
-     </widget>
+   <item row="8" column="0" colspan="2">
+    <widget class="QCheckBox" name="CBAdvanced">
+     <property name="text">
+      <string>Advanced options</string>
+     </property>
+    </widget>
    </item>
-   <item row="9" column="0" >
-     <widget class="QGroupBox" name="GBAdvancedOptions" >
-       <property name="title" >
-         <string>Advanced options</string>
-       </property>
-       <layout class="QGridLayout" >
-         <property name="margin" >
-           <number>9</number>
-         </property>
-         <property name="spacing" >
-           <number>6</number>
-         </property>
-         <item row="0" column="2" >
-           <spacer>
-             <property name="orientation" >
-               <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" >
-               <size>
-                 <width>40</width>
-                 <height>20</height>
-               </size>
-             </property>
-           </spacer>
-         </item>
-         <item row="0" column="0" >
-           <widget class="QLabel" name="TLMinimalDiameter" >
-             <property name="sizePolicy" >
-               <sizepolicy>
-                 <hsizetype>0</hsizetype>
-                 <vsizetype>0</vsizetype>
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-               </sizepolicy>
-             </property>
-             <property name="text" >
-               <string>Minimal diameter</string>
-             </property>
-             <property name="wordWrap" >
-               <bool>false</bool>
-             </property>
-           </widget>
-         </item>
-         <item row="0" column="4" >
-           <widget class="QSpinBox" name="spinBoxNivMax" >
-             <property name="value" >
-               <number>99</number>
-             </property>
-           </widget>
+   <item row="9" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBAdvancedOptions">
+     <property name="title">
+      <string>Advanced options</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_1">
+      <item row="0" column="0">
+       <widget class="QLabel" name="TLMinimalDiameter">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Minimal diameter</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QDoubleSpinBox" name="doubleSpinBoxDiamMin">
+        <property name="decimals">
+         <number>5</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="TLMaximalLevel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Maximal level</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="spinBoxNivMax">
+        <property name="value">
+         <number>99</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="QGroupBox" name="GBAdapInit">
+        <property name="title">
+         <string>Intialization of adaptation</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="0" column="0">
+          <widget class="QRadioButton" name="RBAIN">
+           <property name="text">
+            <string>Nothing</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
          </item>
-         <item row="0" column="1" >
-           <widget class="QDoubleSpinBox" name="doubleSpinBoxDiamMin" >
-             <property name="decimals" >
-               <number>5</number>
-             </property>
-           </widget>
+         <item row="0" column="1">
+          <widget class="QRadioButton" name="RBAIR">
+           <property name="text">
+            <string>Refinement</string>
+           </property>
+          </widget>
          </item>
-         <item row="0" column="3" >
-           <widget class="QLabel" name="TLMaximalLevel" >
-             <property name="sizePolicy" >
-               <sizepolicy>
-                 <hsizetype>0</hsizetype>
-                 <vsizetype>0</vsizetype>
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-               </sizepolicy>
-             </property>
-             <property name="text" >
-               <string>Maximal level</string>
-             </property>
-             <property name="wordWrap" >
-               <bool>false</bool>
-             </property>
-           </widget>
+         <item row="0" column="2">
+          <widget class="QRadioButton" name="RBAID">
+           <property name="text">
+            <string>Coarsening</string>
+           </property>
+          </widget>
          </item>
-       </layout>
-     </widget>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
-   <item row="10" column="0" colspan="2" >
-     <widget class="QGroupBox" name="GBButtons" >
-       <property name="title" >
-         <string/>
-       </property>
-       <layout class="QGridLayout" >
-         <property name="margin" >
-           <number>9</number>
-         </property>
-         <property name="spacing" >
-           <number>6</number>
-         </property>
-         <item row="0" column="0" >
-           <widget class="QPushButton" name="buttonOk" >
-             <property name="text" >
-               <string>OK</string>
-             </property>
-           </widget>
-         </item>
-         <item row="0" column="1" >
-           <widget class="QPushButton" name="buttonApply" >
-             <property name="text" >
-               <string>Apply</string>
-             </property>
-           </widget>
-         </item>
-         <item row="0" column="2" >
-           <widget class="QPushButton" name="buttonCancel" >
-             <property name="text" >
-               <string>Cancel</string>
-             </property>
-           </widget>
-         </item>
-         <item row="0" column="3" >
-           <widget class="QPushButton" name="buttonHelp" >
-             <property name="text" >
-               <string>Help</string>
-             </property>
-           </widget>
-         </item>
-       </layout>
-     </widget>
+   <item row="10" column="0" colspan="2">
+    <widget class="QGroupBox" name="GBButtons">
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QGridLayout">
+      <property name="margin">
+       <number>9</number>
+      </property>
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QPushButton" name="buttonOk">
+        <property name="text">
+         <string>OK</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="buttonApply">
+        <property name="text">
+         <string>Apply</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QPushButton" name="buttonCancel">
+        <property name="text">
+         <string>Cancel</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QPushButton" name="buttonHelp">
+        <property name="text">
+         <string>Help</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
+  <zorder>LEHypothesisName</zorder>
+  <zorder>GBTypeAdaptation</zorder>
+  <zorder>GBUniform</zorder>
+  <zorder>GBFieldFile</zorder>
+  <zorder>GBFieldManagement</zorder>
+  <zorder>GBAreaManagement</zorder>
+  <zorder>GBField</zorder>
+  <zorder>CBGroupe</zorder>
+  <zorder>CBAdvanced</zorder>
+  <zorder>GBAdvancedOptions</zorder>
+  <zorder>GBButtons</zorder>
+  <zorder></zorder>
+  <zorder>Name</zorder>
  </widget>
  <resources/>
  <connections/>
index db4b63abe6f1037d93684a2f6e7ed483f79e8c9d..ab5b65389bb95abf2f3ed9e13d87ee01f548087e 100644 (file)
         <source>HOM_HYPO_ZONE_2</source>
         <translation>At least, one zone must be selected.</translation>
     </message>
+    <message>
+        <source>HOM_HYPO_ZONE_3</source>
+        <translation>Either refinement or coarsening, but not both.</translation>
+    </message>
     <message>
         <source>HOM_HYPO_NORM_L2</source>
         <translation>L2 norm</translation>
index 9d3dce944f0f5e3e9a3a497d7aa0687c266e636b..cbf3d5a5b4b740dc88f78af73f6ffed2c029ab1b 100644 (file)
         <source>Minimal diameter</source>
         <translation>Diamètre minimal</translation>
     </message>
+    <message>
+        <source>Initialization of adaptation</source>
+        <translation>Initialisation de l&apos;adaptation</translation>
+    </message>
     <message>
         <source>Maximal level</source>
         <translation>Niveau maximal</translation>
         <source>HOM_HYPO_ZONE_2</source>
         <translation>Il faut choisir au moins une zone.</translation>
     </message>
+    <message>
+        <source>HOM_HYPO_ZONE_3</source>
+        <translation>Raffinement ou déraffinement, mais pas les deux.</translation>
+    </message>
     <message>
         <source>HOM_HYPO_NORM_L2</source>
         <translation>Norme L2</translation>
         <source>Refinement</source>
         <translation>Raffinement</translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation>Rien</translation>
+    </message>
     <message>
         <source>File of the fields</source>
         <translation>Fichier des champs</translation>
index e425e4a6aed041c76296527566a1cd7ad466fe8a..0d8eb5d0fd855c6e567ceda8b9d5c8d7223b68a3 100644 (file)
@@ -50,7 +50,8 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
     _TypeThC(0), _ThreshC(0),
     _UsField(0), _UsCmpI(0), _TypeFieldInterp(0),
     _NivMax(-1),
-    _DiamMin(-1.)
+    _DiamMin(-1.),
+    _AdapInit(0)
 {
       MESSAGE("Constructeur") ;
       _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
@@ -109,6 +110,9 @@ void MonCreateHypothesis::InitConnect()
     connect( RBFieldChosen,SIGNAL(clicked()), this, SLOT(SetFieldChosen()));
 
     connect( CBAdvanced,   SIGNAL(stateChanged(int)), this, SLOT(SetAdvanced()));
+    connect( RBAIN,        SIGNAL(clicked()), this, SLOT(SetAIN()));
+    connect( RBAIR,        SIGNAL(clicked()), this, SLOT(SetAIR()));
+    connect( RBAID,        SIGNAL(clicked()), this, SLOT(SetAID()));
 
     connect( buttonOk,     SIGNAL(pressed()), this, SLOT( PushOnOK()));
     connect( buttonApply,  SIGNAL(pressed()), this, SLOT( PushOnApply()));
@@ -131,7 +135,7 @@ bool MonCreateHypothesis::PushOnApply()
     return false;
   }
 
-  if (VerifieZone()     == false)  return false;
+  if (VerifieZone()      == false)  return false;
   if (VerifieComposant() == false)  return false;
 
 // Creation de l'objet CORBA si ce n'est pas deja fait sous le meme nom
@@ -170,6 +174,8 @@ bool MonCreateHypothesis::PushOnApply()
 // Enregistrement du diametre minimal
     _DiamMin = doubleSpinBoxDiamMin->value() ;
     _aHypothesis->SetDiamMin(_DiamMin);
+// Enregistrement de l'intialisation de l'adaptation
+    _aHypothesis->SetAdapInit(_AdapInit);
   }
 
   HOMARD_UTILS::updateObjBrowser();
@@ -288,7 +294,7 @@ void MonCreateHypothesis::PushZoneEdit()
   MESSAGE("Debut de MonCreateHypothesis::PushZoneEdit")
   int colonne = TWZone->currentColumn();
   QTableWidgetItem * monItem = TWZone->currentItem();
-  if (colonne !=1  or monItem == NULL)
+  if (colonne !=2  or monItem == NULL)
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_HYPO_ZONE_1") );
@@ -311,10 +317,12 @@ void MonCreateHypothesis::PushZoneDelete()
 // ------------------------------------------------------------------------
 void MonCreateHypothesis::GetAllZones()
 // ------------------------------------------------------------------------
-// Recuperation de toutes les zones enregistrees dans l'arbre d'etude et affichage
+// Recuperation de toutes les zones enregistrees dans l'arbre d'etude
+// et affichage dans le tableau
+// Par defaut, aucune n'est selectionnee
 {
-  MESSAGE("GetAllZones") ;
-  HOMARD::listeZones_var  mesZones = _myHomardGen->GetAllZones();
+  MESSAGE("Debut de GetAllZones") ;
+  HOMARD::listeZones_var mesZones = _myHomardGen->GetAllZones();
   int nbrow=TWZone->rowCount();
   for ( int row=0; row< nbrow; row++)
   {
@@ -325,62 +333,104 @@ void MonCreateHypothesis::GetAllZones()
   for (int i=0; i<mesZones->length(); i++)
   {
     TWZone->insertRow(row);
+//
     TWZone->setItem( row, 0, new QTableWidgetItem( QString ("") ) );
     TWZone->item( row, 0 )->setFlags( 0 );
     TWZone->item( row, 0 )->setFlags( Qt::ItemIsUserCheckable|Qt::ItemIsEnabled  );
     TWZone->item( row, 0 )->setCheckState( Qt::Unchecked );
-    TWZone->setItem( row, 1, new QTableWidgetItem(QString(mesZones[i]).trimmed()));
-    TWZone->item( row, 1 )->setFlags(Qt::ItemIsEnabled |Qt::ItemIsSelectable );
-    row=row+1;
+//
+    TWZone->setItem( row, 1, new QTableWidgetItem( QString ("") ) );
+    TWZone->item( row, 1 )->setFlags( 0 );
+    TWZone->item( row, 1 )->setFlags( Qt::ItemIsUserCheckable|Qt::ItemIsEnabled  );
+    TWZone->item( row, 1 )->setCheckState( Qt::Unchecked );
+//
+    TWZone->setItem( row, 2, new QTableWidgetItem(QString(mesZones[i]).trimmed()));
+    TWZone->item( row, 2 )->setFlags(Qt::ItemIsEnabled |Qt::ItemIsSelectable );
+//
+    row += 1;
   }
   TWZone->resizeColumnsToContents();
   TWZone->resizeRowsToContents();
   TWZone->clearSelection();
 }
-
 // ------------------------------------------------------------------------
-void MonCreateHypothesis::addZone(QString newZone)
+void MonCreateHypothesis::addZoneinTWZone(QString newZone)
 // ------------------------------------------------------------------------
 {
-  MESSAGE("addZone") ;
+  MESSAGE("Debut de addZoneinTWZone") ;
   int row = TWZone->rowCount() ;
+// Par defaut, on suppose qu'une nouvelle zone est destinee au raffinement
   TWZone->setRowCount( row+1 );
-  TWZone->setItem( row, 0, new QTableWidgetItem( 0 ) );
+//
+  TWZone->setItem( row, 0, new QTableWidgetItem( QString ("") ) );
   TWZone->item( row, 0 )->setFlags( Qt::ItemIsEditable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled  );
   TWZone->item( row, 0 )->setCheckState( Qt::Checked );
-  TWZone->setItem( row, 1, new QTableWidgetItem( newZone ) );
-  TWZone->scrollToItem( TWZone->item( row, 1 ) );
+//
+  TWZone->setItem( row, 1, new QTableWidgetItem( QString ("") ) );
+  TWZone->item( row, 1 )->setFlags( Qt::ItemIsEditable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled  );
+  TWZone->item( row, 1 )->setCheckState( Qt::Unchecked );
+//
+  TWZone->setItem( row, 2, new QTableWidgetItem( newZone ) );
+  TWZone->scrollToItem( TWZone->item( row, 2 ) );
+//
   TWZone->resizeRowsToContents();
   TWZone->resizeColumnToContents(1);
   TWZone->clearSelection();
-  TWZone->item( row, 1 )->setFlags( Qt::ItemIsEnabled |Qt::ItemIsSelectable );
+//
+  TWZone->item( row, 2 )->setFlags( Qt::ItemIsEnabled |Qt::ItemIsSelectable );
 }
-
 // ------------------------------------------------------------------------
 QStringList MonCreateHypothesis::GetZonesChecked()
 // ------------------------------------------------------------------------
 // Retourne les zones enregistrees
 {
+  MESSAGE("Debut de GetZonesChecked") ;
   QStringList ListeZone ;
+// On ne peut pas avoir selectionne les deux options
+  int Pbm = 0 ;
   for ( int row=0; row< TWZone->rowCount(); row++)
   {
-      if ( TWZone->item( row, 0 )->checkState() ==  Qt::Checked )
-          ListeZone.insert(0, QString(TWZone->item(row, 1)->text()) ) ;
+    if ( ( TWZone->item( row, 0 )->checkState() == Qt::Checked ) and ( TWZone->item( row, 1 )->checkState() == Qt::Checked ) )
+    {
+      QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+                                QObject::tr("HOM_HYPO_ZONE_3") );
+      Pbm = 1 ;
+    }
+  }
+// Si tout va bien, on affecte
+// Attention, on insere en tete, donc on commence d'inserer le type, psui le nom de la zone
+  if ( Pbm == 0 )
+  {
+    QString Raff =  "1" ;
+    QString Dera = "-1" ;
+    for ( int row=0; row< TWZone->rowCount(); row++)
+    {
+//     MESSAGE ("row "<<row<<", zone : "<<TWZone->item(row, 2)->text().toStdString());
+//  En raffinement :
+      if ( TWZone->item(row,0)->checkState() == Qt::Checked )
+      { ListeZone.insert(0, Raff) ;
+        ListeZone.insert(0, QString(TWZone->item(row, 2)->text()) ) ; }
+//  En deraffinement :
+      if ( TWZone->item(row,1)->checkState() == Qt::Checked )
+      { ListeZone.insert(0, Dera) ;
+        ListeZone.insert(0, QString(TWZone->item(row, 2)->text()) ) ; }
+    }
+  MESSAGE("Fin de GetZonesChecked ; longueur de ListeZone : "<<ListeZone.count()) ;
   }
-  return ListeZone ;
+//
+return ListeZone ;
 }
-
 // ------------------------------------------------------------------------
 QStringList MonCreateHypothesis::GetListCompChecked()
 // ------------------------------------------------------------------------
 // Retourne les composantes retenues
 {
-  MESSAGE( "Dans MonCreateHypothesis::GetListCompChecked" );
+  MESSAGE( "Debut de GetListCompChecked" );
   QStringList ListeComposant ;
 
   ListeComposant.clear();
   for ( int row=0; row< TWCMP->rowCount(); row++)
-      if ( TWCMP->item( row, 0 )->checkState() ==  Qt::Checked )
+      if ( TWCMP->item( row, 0 )->checkState() == Qt::Checked )
           ListeComposant.insert(0, QString(TWCMP->item(row, 1)->text()) ) ;
   // Choix du texte des radio-boutons selon 1 ou plusieurs composantes
   if ( ListeComposant.count() < 2 )
@@ -400,7 +450,7 @@ void MonCreateHypothesis::AssocieFieldInterp()
 {
   if ( _TypeFieldInterp != 2 ) return;
   for ( int row=0; row< TWField->rowCount(); row++)
-      if ( TWField->item( row, 0 )->checkState() ==  Qt::Checked )
+      if ( TWField->item( row, 0 )->checkState() == Qt::Checked )
       { _aHypothesis->AddFieldInterp(TWField->item(row, 1)->text().toStdString().c_str()); }
 }
 // ------------------------------------------------------------------------
@@ -436,7 +486,7 @@ void MonCreateHypothesis::InitFields()
 void MonCreateHypothesis::SetFieldName()
 // -------------------------------------------
 {
-  MESSAGE("MonCreateHypothesis::SetFieldName");
+  MESSAGE("Debut de SetFieldName");
   _aFieldName=CBFieldName->currentText();
   if (QString(_aFieldFile) == QString("") or QString(_aFieldName) == QString("") ) { return; }
 
@@ -604,13 +654,16 @@ bool MonCreateHypothesis::VerifieZone()
 // ------------------------------------------------------------------------
 {
   if ( _aTypeAdap != 0 ) return true;
+  MESSAGE("Debut de VerifieZone") ;
   _aListeZone = GetZonesChecked() ;
+  MESSAGE(". Longueur de _aListeZone : "<<_aListeZone.count()) ;
   if (_aListeZone.count() == 0)
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_HYPO_ZONE_2") );
      return false;
   }
+  MESSAGE("Fin de VerifieZone") ;
   return true;
 }
 // ------------------------------------------------------------------------
@@ -632,10 +685,19 @@ bool MonCreateHypothesis::VerifieComposant()
 void MonCreateHypothesis::AssocieLesZones()
 // ------------------------------------------------------------------------
 {
+  MESSAGE( "Debut de AssocieLesZones" );
   if ( _aTypeAdap != 0 ) return;
   _aListeZone = GetZonesChecked() ;
+  MESSAGE(". Longueur de _aListeZone : "<<_aListeZone.count()) ;
+  QString Raff =  "1" ;
+  int TypeUse ;
   for ( int i=0 ; i< _aListeZone.count() ; i++ )
-      { _myHomardGen->AssociateHypoZone(_aListeZone[i].toStdString().c_str(),_aHypothesisName.toStdString().c_str()); }
+  { if ( _aListeZone[i+1] == Raff ) { TypeUse =  1 ; }
+    else                            { TypeUse = -1 ; }
+   _myHomardGen->AssociateHypoZone(_aHypothesisName.toStdString().c_str(), _aListeZone[i].toStdString().c_str(), TypeUse);
+    i += 1 ;
+  }
+  MESSAGE( "Fin de AssocieLesZones" );
 };
 // ------------------------------------------------------------------------
 void MonCreateHypothesis::AssocieComposants()
@@ -763,10 +825,41 @@ void MonCreateHypothesis::SetAdvanced()
 // ------------------------------------------------------------------------
 {
   MESSAGE("Debut de SetAdvanced ");
-  if (CBAdvanced->isChecked()) { GBAdvancedOptions->setVisible(1); }
+  if (CBAdvanced->isChecked())
+  { GBAdvancedOptions->setVisible(1);
+    if (_aFieldFile != QString(""))
+    { GBAdapInit->setVisible(1) ;
+    }
+    else
+    { GBAdapInit->setVisible(0) ;
+    }
+  }
   else
   { GBAdvancedOptions->setVisible(0);
     _NivMax = -1 ;
-    _DiamMin = -1. ; }
+    _DiamMin = -1. ;
+    _AdapInit = 0 ;
+  }
   adjustSize();
 }
+// ------------------------------------------------------------------------
+void MonCreateHypothesis::SetAIN()
+// ------------------------------------------------------------------------
+{
+  MESSAGE("Debut de SetAIN ");
+  _AdapInit = 0 ;
+}
+// ------------------------------------------------------------------------
+void MonCreateHypothesis::SetAIR()
+// ------------------------------------------------------------------------
+{
+  MESSAGE("Debut de SetAIR ");
+  _AdapInit = 1 ;
+}
+// ------------------------------------------------------------------------
+void MonCreateHypothesis::SetAID()
+// ------------------------------------------------------------------------
+{
+  MESSAGE("Debut de SetAID ");
+  _AdapInit = -1 ;
+}
index a059926591664acf2084e7df56be80994ea9be05..f4f900497630c771be670fd5e6e828060ff8bde7 100644 (file)
@@ -41,7 +41,7 @@ public:
                          QString aHypotheseName, QString caseName, QString aFieldFile);
     ~MonCreateHypothesis();
 
-    virtual void addZone(QString newZone);
+    virtual void addZoneinTWZone(QString newZone);
     virtual void setGroups(QStringList listGroup);
 
 protected :
@@ -70,6 +70,7 @@ protected :
 
     int _NivMax;
     double _DiamMin;
+    int _AdapInit;
 
     HOMARD::HOMARD_Gen_var _myHomardGen;
     HOMARD::HOMARD_Hypothesis_var _aHypothesis;
@@ -121,6 +122,9 @@ public slots:
     virtual void SetFieldChosen();
 
     virtual void SetAdvanced();
+    virtual void SetAIN();
+    virtual void SetAIR();
+    virtual void SetAID();
 
     virtual void PushOnOK();
     virtual bool PushOnApply();
index a8677430851c62feb7e27ffeb131d1682d7563b5..067d31b24a086560812ac56c348aec01b009d56b 100644 (file)
@@ -557,7 +557,7 @@ bool MonCreateZone:: CreateOrUpdateZone()
         break;
         }
     }
-    _parent->addZone(_aZoneName) ;
+    _parent->addZoneinTWZone(_aZoneName) ;
   }
 // Mise en place des attributs
   aZone->SetLimit(_Xincr, _Yincr, _Zincr) ;
index e31e58089919af3727fecac53d5badc58c76547f..872ae12952637673afb98ebd99f7491c1ef88269 100644 (file)
@@ -26,14 +26,12 @@ using namespace std;
 #include "HOMARDGUI_Utils.h"
 #include "HomardQtCommun.h"
 #include <utilities.h>
-
-
-// -------------------------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 MonEditHypothesis::MonEditHypothesis( MonCreateIteration* parent, bool modal,
                                       HOMARD::HOMARD_Gen_var myHomardGen,
                                       QString aHypothesisName,
                                       QString caseName,  QString aFieldFile ):
-// -------------------------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 /* Constructs a MonEditHypothesis
     herite de MonCreateHypothesis
 */
@@ -102,7 +100,8 @@ void MonEditHypothesis::InitValEdit()
   CBAdvanced->setVisible(0) ;
   int NivMax = _aHypothesis->GetNivMax();
   double DiamMin = _aHypothesis->GetDiamMin();
-  if ( NivMax > 0 or DiamMin > 0 )
+  int AdapInit = _aHypothesis->GetAdapInit();
+  if ( NivMax > 0 or DiamMin > 0 or AdapInit != 0 )
   { GBAdvancedOptions->setVisible(1);
     if ( NivMax > 0 )
     { spinBoxNivMax->setValue(NivMax);
@@ -116,6 +115,19 @@ void MonEditHypothesis::InitValEdit()
     else
     { TLMinimalDiameter->setVisible(0);
       doubleSpinBoxDiamMin->setVisible(0); }
+    if ( AdapInit != 0 )
+    {
+      if ( AdapInit > 0 )
+      { RBAIR->setChecked(true); }
+      else
+      { RBAID->setChecked(true); }
+      RBAIN->setEnabled(false);
+      RBAIR->setEnabled(false);
+      RBAID->setEnabled(false);
+    }
+    else
+    { GBAdapInit->setVisible(0) ;
+    }
   }
   else
   { GBAdvancedOptions->setVisible(0); }
@@ -157,8 +169,7 @@ void MonEditHypothesis::InitAdaptZone()
 // -------------------------------------
 // Affichage des informations pour une adaptation selon des zones :
 {
-// . Liste des zones
-
+    MESSAGE ("Debut de InitAdaptZone");
 //  Choix des options generales
     GBUniform->setVisible(0);
     GBFieldManagement->setVisible(0);
@@ -174,25 +185,38 @@ void MonEditHypothesis::InitAdaptZone()
     HOMARD::listeZonesHypo_var mesZonesAvant = _aHypothesis->GetZones();
     for (int i=0; i<mesZonesAvant->length(); i++)
     {
-        for ( int j =0 ; j < TWZone->rowCount(); j++)
+    MESSAGE ("i"<<i<<", zone :"<<string(mesZonesAvant[i])<<", type :"<<string(mesZonesAvant[i+1]));
+      for ( int j =0 ; j < TWZone->rowCount(); j++)
+      {
+    MESSAGE (". j"<<j<<", zone :"<<TWZone->item(j,2)->text().toStdString());
+        if ( TWZone->item(j,2)->text().toStdString() == string(mesZonesAvant[i]) )
         {
-            if (TWZone->item(j,1)->text().toStdString() == string(mesZonesAvant[i]))
-            {
-               TWZone->item( j,0 )->setCheckState( Qt::Checked );
-               break;
-            }
+    MESSAGE ("OK avec "<<string(mesZonesAvant[i]));
+          if ( string(mesZonesAvant[i+1]) == "1" )
+          {
+    MESSAGE ("... RAFF");
+            TWZone->item( j,0 )->setCheckState( Qt::Checked );
+            TWZone->item( j,1 )->setCheckState( Qt::Unchecked ); }
+          else
+          {
+    MESSAGE ("... DERA");
+            TWZone->item( j,0 )->setCheckState( Qt::Unchecked );
+            TWZone->item( j,1 )->setCheckState( Qt::Checked ); }
+          break;
         }
+      }
+      i += 1 ;
     }
 //
 //  Inactivation des choix
     for ( int j =0 ; j < TWZone->rowCount(); j++)
     {
-        TWZone->item( j, 0 )->setFlags(0);
+      TWZone->item( j, 0 )->setFlags(0);
+      TWZone->item( j, 1 )->setFlags(0);
     }
     PBZoneNew->setVisible(0);
 //
 }
-
 // -------------------------------------
 void MonEditHypothesis::InitAdaptChamps()
 // -------------------------------------
index eb4fb142b4e9dc53f794519bd31a42eb4bc17c7c..8e8dee43e8752ec7a5c746c7be6aa027d19cfd18 100755 (executable)
@@ -396,9 +396,9 @@ void HOMARD_Gen_i::InvalideIter(const char* nomIter)
 }
 //
 //=====================================================================================
-void HOMARD_Gen_i::AssociateHypoZone(const char* ZoneName, const char* nomHypothesis)
+void HOMARD_Gen_i::AssociateHypoZone(const char* nomHypothesis, const char* ZoneName, CORBA::Long TypeUse)
 {
-  MESSAGE ( "AssociateHypoZone : ZoneName= " << ZoneName << ", nomHypo = " << nomHypothesis);
+  MESSAGE ( "AssociateHypoZone : nomHypo = " << nomHypothesis << ", ZoneName= " << ZoneName << ", TypeUse = " << TypeUse);
   IsValidStudy () ;
 
   HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis];
@@ -418,7 +418,7 @@ void HOMARD_Gen_i::AssociateHypoZone(const char* ZoneName, const char* nomHypoth
   aStudyBuilder->CommitCommand();
 
   myZone->AddHypo(nomHypothesis);
-  myHypo->AddZone(ZoneName);
+  myHypo->AddZone(ZoneName, TypeUse);
   MESSAGE ( "Fin de AssociateHypoZone");
 };
 
@@ -667,9 +667,10 @@ HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypo
   SALOMEDS::SObject_var aSO;
   PublishInStudy(myCurrentStudy, aSO, myHypothesis, nomHypothesis);
 
-// Valeurs par defaut des filtrages
+// Valeurs par defaut des options avancees
   myHypothesis->SetNivMax(-1);
   myHypothesis->SetDiamMin(-1.0);
+  myHypothesis->SetAdapInit(0);
 
   return HOMARD::HOMARD_Hypothesis::_duplicate(myHypothesis);
 }
@@ -1231,35 +1232,40 @@ CORBA::Long HOMARD_Gen_i::Compute(const char* nomIteration, CORBA::Long etatMena
   if (TypeAdap == 0)
   {
     HOMARD::listeZonesHypo* ListZone = myHypo->GetZones();
-    int numberOfZones = ListZone->length();
+    int numberOfZonesx2 = ListZone->length();
+    int NumZone ;
 
-    for (int NumZone = 0; NumZone< numberOfZones; NumZone++)
+    for (int iaux = 0; iaux< numberOfZonesx2; iaux++)
     {
-      std::string ZoneName = std::string((*ListZone)[NumZone]);
+      std::string ZoneName = std::string((*ListZone)[iaux]);
       MESSAGE ( "... ZoneName = " << ZoneName);
       HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
       ASSERT(!CORBA::is_nil(myZone));
 
       int ZoneType = myZone->GetZoneType();
-      MESSAGE ( "... ZoneType = " << ZoneType);
+      std::string TypeUsestr = std::string((*ListZone)[iaux+1]);
+      int TypeUse = atoi( TypeUsestr.c_str() );
+      MESSAGE ( "... ZoneType = " << ZoneType << ", TypeUse = "<<TypeUse);
+      NumZone = iaux/2 + 1 ;
       HOMARD::double_array* zone = myZone->GetCoords();
       if ( ZoneType == 2 or ( ZoneType>=11 and ZoneType <=13 ) ) // Cas d un parallelepipede ou d'un rectangle
       {
-        myDriver->TexteZone(NumZone+1, ZoneType, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], (*zone)[4], (*zone)[5], 0., 0., 0.);
+        myDriver->TexteZone(NumZone, ZoneType, TypeUse, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], (*zone)[4], (*zone)[5], 0., 0., 0.);
       }
       else if ( ZoneType == 4 ) // Cas d une sphere
       {
-        myDriver->TexteZone(NumZone+1, ZoneType, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], 0., 0., 0., 0., 0.);
+        myDriver->TexteZone(NumZone, ZoneType, TypeUse, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], 0., 0., 0., 0., 0.);
       }
       else if ( ZoneType == 5 or ( ZoneType>=31 and ZoneType <=33 ) ) // Cas d un cylindre ou d'un disque
       {
-        myDriver->TexteZone(NumZone+1, ZoneType, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], (*zone)[4], (*zone)[5], (*zone)[6], (*zone)[7], 0.);
+        myDriver->TexteZone(NumZone, ZoneType, TypeUse, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], (*zone)[4], (*zone)[5], (*zone)[6], (*zone)[7], 0.);
       }
       else if ( ZoneType == 7 or ( ZoneType>=61 and ZoneType <=63 ) ) // Cas d un tuyau ou disque perce
       {
-        myDriver->TexteZone(NumZone+1, ZoneType, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], (*zone)[4], (*zone)[5], (*zone)[6], (*zone)[7], (*zone)[8]);
+        myDriver->TexteZone(NumZone, ZoneType, TypeUse, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], (*zone)[4], (*zone)[5], (*zone)[6], (*zone)[7], (*zone)[8]);
       }
       else { ASSERT("ZoneType est incorrect." == 0) ; }
+      iaux += 1 ;
     }
   }
   // E.3. Ajout des informations liees aux champs eventuels
@@ -1442,7 +1448,9 @@ CORBA::Long HOMARD_Gen_i::Compute(const char* nomIteration, CORBA::Long etatMena
   MESSAGE ( ". NivMax = " << NivMax );
   double DiamMin = myHypo->GetDiamMin() ;
   MESSAGE ( ". DiamMin = " << DiamMin );
-  myDriver->TexteAdvanced(Pyram, NivMax, DiamMin);
+  int AdapInit = myHypo->GetAdapInit();
+  MESSAGE ( ". AdapInit = " << AdapInit );
+  myDriver->TexteAdvanced(Pyram, NivMax, DiamMin, AdapInit);
 
   // F. Ecriture du texte dans le fichier
   if (codret == 0)
index 8c8fb943893fb9f511f49a03befc73287570052e..c52783f2307849e075145e75eb22d0ab4b930c50 100644 (file)
@@ -110,7 +110,7 @@ public:
                                                     const char* labelIter);
   void                            AssociateIterIter(const char* nomIterParent, const char* nomIter);
   void                            AssociateIterHypo(const char* nomIter, const char* nomHypothesis);
-  void                            AssociateHypoZone(const char* nomZone, const char* nomHypothesis);
+  void                            AssociateHypoZone(const char* nomHypothesis, const char* nomZone, CORBA::Long TypeUse);
   void                            DissociateHypoZone(const char* nomZone, const char* nomHypothesis);
 
   void                            InvalideBoundary(const char* nomBoundary);
index ca3dc2c270e7decb4f3535f9b319ed870a702bf2..879d30ca85efc7c2d9b837d36bd369c43b24e4f0 100644 (file)
@@ -211,10 +211,10 @@ void HOMARD_Hypothesis_i::AddIteration( const char* NomIteration )
 }
 
 //=============================================================================
-void  HOMARD_Hypothesis_i::AddZone( const char* NomZone )
+void  HOMARD_Hypothesis_i::AddZone( const char* NomZone, CORBA::Long TypeUse )
 {
   ASSERT( myHomardHypothesis );
-  myHomardHypothesis->AddZone( NomZone );
+  myHomardHypothesis->AddZone( NomZone, TypeUse );
 }
 //=============================================================================
 void  HOMARD_Hypothesis_i::SupprZone      (const char * NomZone)
@@ -383,6 +383,18 @@ CORBA::Double HOMARD_Hypothesis_i::GetDiamMin()
   ASSERT( myHomardHypothesis );
   return myHomardHypothesis->GetDiamMin();
 }
+//=============================================================================
+void HOMARD_Hypothesis_i::SetAdapInit( CORBA::Long AdapInit )
+{
+  ASSERT( myHomardHypothesis );
+  myHomardHypothesis->SetAdapInit( AdapInit );
+}
+//=============================================================================
+CORBA::Long HOMARD_Hypothesis_i::GetAdapInit()
+{
+  ASSERT( myHomardHypothesis );
+  return myHomardHypothesis->GetAdapInit();
+}
 
 //=============================================================================
 std::string HOMARD_Hypothesis_i::Dump() const
index 69d45844b515e8c3ff222a8df4655eb3fe70708b..e0a59602403cb6cd29e7ac0be96ece586e8020a6 100644 (file)
@@ -66,7 +66,7 @@ public:
   HOMARD::InfosHypo*           GetField();
 
   void                         AddIteration( const char* NomIteration );
-  void                         AddZone( const char* NomZone );
+  void                         AddZone( const char* NomZone, CORBA::Long TypeUse );
   void                         SupprZone( const char* NomZone );
   void                         AddComp( const char* NomComposant );
   void                         SupprComp();
@@ -87,9 +87,10 @@ public:
 
   void                         SetNivMax( CORBA::Long NivMax );
   CORBA::Long                  GetNivMax();
-
   void                         SetDiamMin( CORBA::Double DiamMin );
   CORBA::Double                GetDiamMin();
+  void                         SetAdapInit( CORBA::Long AdapInit );
+  CORBA::Long                  GetAdapInit();
 
   std::string                  Dump() const;
   bool                         Restore( const std::string& stream );
index 95297316c76d1fb5eb81e2b38562a839ef0eb8b5..ef208398cc03fc1ee20c75ca6fcd7f4ba3b6f4d6 100644 (file)
@@ -22,7 +22,7 @@ Python script for HOMARD
 Copyright EDF-R&D 2010
 Test test_1
 """
-__revision__ = "V1.4"
+__revision__ = "V1.5"
 
 ######################################################################################
 Test_Name = "test_1"
@@ -75,8 +75,8 @@ Copyright EDF-R&D 2010
 # Creation of the hypothesis Zones_1_et_2
   Zones_1_et_2 = homard.CreateHypothesis('Zones_1_et_2')
   Zones_1_et_2.SetAdapRefinUnRef(0, 1, 0)
-  homard.AssociateHypoZone('Zone_1', 'Zones_1_et_2')
-  homard.AssociateHypoZone('Zone_2', 'Zones_1_et_2')
+  homard.AssociateHypoZone('Zones_1_et_2', 'Zone_1', 1)
+  homard.AssociateHypoZone('Zones_1_et_2', 'Zone_2', 1)
 #
 # Creation of the cases
 # =====================