Merge remote-tracking branch 'origin/master' into gni/evolution

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2ecf0b7a3192aa8ee508eb173209051cb6b1f23..e812072e341d1f866ac8966aec36f2bc6e18b14d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Common CMake macros
 # ===================

diff --git a/doc/en/intro.rst b/doc/en/intro.rst
index 9364bf259647d564f25e73ace2cc842d5e741478..34d41c1a4f7c5d8c8e732a514ba897c8e1d7aba2 100644 (file)
--- a/doc/en/intro.rst
+++ b/doc/en/intro.rst
@@ -125,14 +125,14 @@ This, in turn, creates 4 new tetrahedrons. It should be noted that they are simi
    :width: 229
    :height: 116
 
-Hexaedrons are split in eight. Each of the quadrangular faces is split into 4 quadrangular faces. Edges are created connecting each centre of opposite faces. This generates a new point located at the centre of the hexahedron.
+Hexahedrons are split in eight. Each of the quadrangular faces is split into 4 quadrangular faces. Edges are created connecting each centre of opposite faces. This generates a new point located at the centre of the hexahedron.
 
 .. image:: ../images/dec_hex.png
    :align: center
    :alt: Découpage standard d'un hexaèdre
    :width: 600
 
-Pentaedrons are split in eight. Each of the quadrangular faces is split into 4 quadrangular faces and the two triangles are split into 4. Edges are created connecting each centre of quadrangular faces. Those 3 edges create 4 triangles at the centre of the pentaedron. Six quandrangular faces are created to complete the construction of the height pentaedrons.
+Pentahedrons are split in eight. Each of the quadrangular faces is split into 4 quadrangular faces and the two triangles are split into 4. Edges are created connecting each centre of quadrangular faces. Those 3 edges create 4 triangles at the centre of the pentahedron. Six quandrangular faces are created to complete the construction of the height pentahedrons.
 
 .. image:: ../images/dec.pent.png
    :align: center
@@ -265,14 +265,14 @@ Some examples of use cases can be found on the site of `HOMARD <http://www.code-
 +---------------------------------------------------------------+
 | .. image:: ../images/intro_5.png                              |
 |    :align: center                                             |
-|    :alt: Hexaedron and non conformal adaptation               |
+|    :alt: Hexahedron and non conformal adaptation              |
 +---------------------------------------------------------------+
 | .. image:: ../images/intro_6.png                              |
 |    :alt: Tetrahedron                                          |
 |    :align: center                                             |
 +---------------------------------------------------------------+
 | .. image:: ../images/intro_7.png                              |
-|    :alt: Hexaedron and conformal adaptation                   |
+|    :alt: Hexahedron and conformal adaptation                  |
 |    :align: center                                             |
 +---------------------------------------------------------------+
 | .. image:: ../images/intro_8.gif                              |

diff --git a/src/HOMARDGUI/CreateHypothesis.ui b/src/HOMARDGUI/CreateHypothesis.ui
index 53698b5486795b662e1997a920cb69f03ef16498..1928c238925ff1ffa2c5f7268462f4a1a24cb799 100644 (file)
--- a/src/HOMARDGUI/CreateHypothesis.ui
+++ b/src/HOMARDGUI/CreateHypothesis.ui
@@ -45,8 +45,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>844</width>
-     <height>1646</height>
+     <width>846</width>
+     <height>1648</height>
     </rect>
    </property>
    <property name="sizeGripEnabled" stdset="0">
@@ -782,13 +782,6 @@
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="QPushButton" name="PBZoneDelete">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
           </layout>
          </item>
          <item>

diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx
index 8a726faac2ca8a2eae0c1d0bf3755b8279df6e86..0ef4406d1f1f2f000f40aaf0cb37b769eb085d10 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -268,7 +268,7 @@ void HOMARDGUI::createMenus()
 //================================================
 void HOMARDGUI::recupPreferences()
 {
-  MESSAGE("recupPreferences")
+  INFOS("recupPreferences")
 //
 // A. Declarations
 //
@@ -281,9 +281,14 @@ void HOMARDGUI::recupPreferences()
 // B. Les valeurs
 // B.1. La langue
 //
+  SUIT_ResourceMgr* resMgr0 = getApp()->resourceMgr();
+  QString lang = resMgr0->stringValue( resMgr0->langSection(), "language", "en" );
+  INFOS ("Récupération de lang = " << lang.toStdString().c_str() );
   defaut_s = homardGen->GetLanguageShort();
+  INFOS ("Récupération de defaut_s = " << defaut_s.c_str() );
   SUIT_ResourceMgr* resMgr = getApp()->resourceMgr();
   _LanguageShort = resMgr->stringValue("language", "language", QString(defaut_s.c_str()) );
+  INFOS ("Récupération de LanguageShort = " << _LanguageShort.toStdString().c_str() );
 //
 // B.2. Les publications
   bool publish_mesh ;
@@ -326,10 +331,10 @@ void HOMARDGUI::recupPreferences()
 //
 // C. Enregistrement dans l'objet general
 //
-  MESSAGE ("Enregistrement de LanguageShort = " << _LanguageShort.toStdString().c_str() );
-  MESSAGE ("Enregistrement de PublisMeshIN = " << _PublisMeshIN<<", PublisMeshOUT = "<< _PublisMeshOUT);
-  MESSAGE ("Enregistrement de YACSMaxIter = " << _YACSMaxIter<<", YACSMaxNode = "<< _YACSMaxNode<<", YACSMaxElem = "<< _YACSMaxElem);
-  MESSAGE ("Enregistrement de YACSTypeTest = " << _YACSTypeTest);
+  INFOS ("Enregistrement de LanguageShort = " << _LanguageShort.toStdString().c_str() );
+  INFOS ("Enregistrement de PublisMeshIN = " << _PublisMeshIN<<", PublisMeshOUT = "<< _PublisMeshOUT);
+  INFOS ("Enregistrement de YACSMaxIter = " << _YACSMaxIter<<", YACSMaxNode = "<< _YACSMaxNode<<", YACSMaxElem = "<< _YACSMaxElem);
+  INFOS ("Enregistrement de YACSTypeTest = " << _YACSTypeTest);
 //
   homardGen->SetLanguageShort(_LanguageShort.toStdString().c_str());
   homardGen->SetPublisMesh(_PublisMeshIN, _PublisMeshOUT);

diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx
index 6b03def0eef912411ea6d1ba133ac962688f41a0..1e30fc359288bd0d7831d819b1d612174e6f47ac 100644 (file)
--- a/src/HOMARDGUI/MonCreateHypothesis.cxx
+++ b/src/HOMARDGUI/MonCreateHypothesis.cxx
@@ -116,7 +116,6 @@ void MonCreateHypothesis::InitConnect()
     connect( CBJump,       SIGNAL(stateChanged(int)), this, SLOT(SetUseField()));
     connect( PBZoneNew,    SIGNAL(pressed()), this, SLOT(PushZoneNew()));
     connect( PBZoneEdit,   SIGNAL(pressed()), this, SLOT(PushZoneEdit()) );
-    connect( PBZoneDelete, SIGNAL(pressed()), this, SLOT(PushZoneDelete()) );
     connect( CBGroupe,     SIGNAL(stateChanged(int)), this, SLOT(SetFiltrage()));
 
     connect( RBFieldNo,    SIGNAL(clicked()), this, SLOT(SetFieldNo()));
@@ -339,15 +338,6 @@ void MonCreateHypothesis::PushZoneEdit()
   MonEditZone *aDlg = new MonEditZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
   aDlg->show();
 }
-// ------------------------------------------------------------------------
-void MonCreateHypothesis::PushZoneDelete()
-// ------------------------------------------------------------------------
-{
-  MESSAGE("Debut de MonCreateHypothesis::PushZoneDelete")
-  QMessageBox::warning( 0, QObject::tr("HOM_WARNING"),
-                          QObject::tr("HOM_INACTIVE_BUTTON") );
-  return;
-}
 
 // ------------------------------------------------------------------------
 void MonCreateHypothesis::GetAllZones()

diff --git a/src/HOMARDGUI/MonCreateHypothesis.h b/src/HOMARDGUI/MonCreateHypothesis.h
index 929ee30aabb425d7d3ccf0a95811bd9ecdb76ecd..56a569623c472b7bfc10e0dd45ce0b7ce221e180 100644 (file)
--- a/src/HOMARDGUI/MonCreateHypothesis.h
+++ b/src/HOMARDGUI/MonCreateHypothesis.h
@@ -119,7 +119,6 @@ public slots:
     virtual void SetUseField();
     virtual void PushZoneNew();
     virtual void PushZoneEdit();
-    virtual void PushZoneDelete();
     virtual void SetFiltrage();
     virtual void SetFieldNo();
     virtual void SetFieldAll();

diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx
index dde42a69114992bc9c061c8e5bf65d8d0ccff431..e4e4fb1c0acae60566d163b12210532548baa570 100644 (file)
--- a/src/HOMARD_I/HOMARD_Gen_i.cxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.cxx
@@ -95,6 +95,7 @@ HOMARD_Gen_i::HOMARD_Gen_i( CORBA::ORB_ptr orb,
                             const char *interfaceName) :
 Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
 {
+  INFOS("constructor de HOMARD_Gen_i");
   MESSAGE("constructor");
   _thisObj = this;
   _id = _poa->activate_object(_thisObj);

diff --git a/src/tests/samples/test_4.en.odt b/src/tests/samples/test_4.en.odt
index a5ade741ec6051e15fce80bb563320b056a03f22..c4061358bded02b131efa934e3221ee6a8ae2f4d 100644 (file)
Binary files a/src/tests/samples/test_4.en.odt and b/src/tests/samples/test_4.en.odt differ

diff --git a/src/tests/samples/test_4.en.pdf b/src/tests/samples/test_4.en.pdf
index f45e2c5698a55f58485fe328e5678c551d18ad33..8af1506f0bf8049a927690d1b39b25bbaf60a054 100644 (file)
Binary files a/src/tests/samples/test_4.en.pdf and b/src/tests/samples/test_4.en.pdf differ

diff --git a/src/tests/samples/test_4.odt b/src/tests/samples/test_4.odt
index f9c6a4cbf8afa398fcd3017b512c2a038dae3b2b..3320060fcfeae28ad33b86ff49a032f89f8b495a 100644 (file)
Binary files a/src/tests/samples/test_4.odt and b/src/tests/samples/test_4.odt differ

diff --git a/src/tests/samples/test_4.pdf b/src/tests/samples/test_4.pdf
index 0dd4f4522659c76d9491514c6f0f02964b58b361..025eab88e04fcc90515e8c5e4d16f9cd770ad8f9 100644 (file)
Binary files a/src/tests/samples/test_4.pdf and b/src/tests/samples/test_4.pdf differ