Oubli dans la sélection du répertoire pour la poursuite

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 17159b89dd7c954c0117b5506ab61df8077f7325..a4b35d578febf0621ab04bf74bd3c73747c86cfe 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -32,9 +32,11 @@
 <!--     <parameter name="def_precision"                value="3"  /> -->
   </section>
   <section name="homard_help" >
-    <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="Mode d'emploi"     value="%HOMARD_ROOT_DIR%/share/doc/salome/gui/HOMARD/fr/index.html"/>
-    <parameter name="User's Guide"      value="%HOMARD_ROOT_DIR%/share/doc/salome/gui/HOMARD/en/index.html"/>
+    <parameter name="sub_menu"      value="%1 module"/>
+    <parameter name="Mode d'emploi" value="%HOMARD_ROOT_DIR%/share/doc/salome/gui/HOMARD/fr/index.html"/>
+<!--     <parameter name="Mode d'emploi" value="%HOMARD_ROOT_DIR%/share/doc/salome/gui/HOMARD/fr/index.html" icon="drapeau_fr.gif"/> -->
+    <parameter name="User's Guide"  value="%HOMARD_ROOT_DIR%/share/doc/salome/gui/HOMARD/en/index.html"/>
+<!--     <parameter name="User's Guide"  value="%HOMARD_ROOT_DIR%/share/doc/salome/gui/HOMARD/en/index.html" icon="drapeau_en.gif"/> -->
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx
index ca1d082ef4bd3ee5ea6e6fef0a7b550d4d9afaea..4ea5c5b65a997853e798f92141f15dca37172aeb 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -286,7 +286,7 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID)
     case 1102: // Poursuite d une iteration
     {
       MESSAGE("command " << theCommandID << " activated");
-      MonPursueIteration *aDlg = new MonPursueIteration( parent, true,
+      MonPursueIteration *aDlg = new MonPursueIteration( true,
                                 HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
       aDlg->show();
       break;

diff --git a/src/HOMARDGUI/HOMARD_msg_en.ts b/src/HOMARDGUI/HOMARD_msg_en.ts
index 77a85cf7ceb6480601a81cd4ce5c2c6ac3e3c0d2..8386a7211f8d1279e09c2be433787d5e94f8cea6 100644 (file)
--- a/src/HOMARDGUI/HOMARD_msg_en.ts
+++ b/src/HOMARDGUI/HOMARD_msg_en.ts
@@ -207,6 +207,14 @@
         <source>HOM_CASE_DIRECTORY_4</source>
         <translation>A directory for the computation must be selected.</translation>
     </message>
+    <message>
+        <source>HOM_START_DIRECTORY_1</source>
+        <translation>A starting directory for the pursuit must be selected.</translation>
+    </message>
+    <message>
+        <source>HOM_START_DIRECTORY_3</source>
+        <translation>A valid directory for the pursuit must be selected.</translation>
+    </message>
     <message>
         <source>HOM_CASE_MESH</source>
         <translation>The file of the initial mesh must be selected.</translation>

diff --git a/src/HOMARDGUI/HOMARD_msg_fr.ts b/src/HOMARDGUI/HOMARD_msg_fr.ts
index bc77a0830af5cb68ab951009fcd6428abace911d..db8348bca9202df5c97d60724a1f57d4286b1ef5 100644 (file)
--- a/src/HOMARDGUI/HOMARD_msg_fr.ts
+++ b/src/HOMARDGUI/HOMARD_msg_fr.ts
@@ -263,6 +263,14 @@
         <source>HOM_CASE_DIRECTORY_4</source>
         <translation>Il faut choisir un répertoire de travail pour le calcul.</translation>
     </message>
+    <message>
+        <source>HOM_START_DIRECTORY_1</source>
+        <translation>Il faut choisir un répertoire contenant l'itération à poursuivre.</translation>
+    </message>
+    <message>
+        <source>HOM_START_DIRECTORY_3</source>
+        <translation>Un répertoire valide contenant l'itération à poursuivre doit être choisi.</translation>
+    </message>
     <message>
         <source>HOM_CASE_MESH</source>
         <translation>Il faut choisir le maillage initial.</translation>

diff --git a/src/HOMARDGUI/HOMARD_msg_ja.ts b/src/HOMARDGUI/HOMARD_msg_ja.ts
index 5a713968b0dc898b73889d903d4458aa5d139638..e6cd5f21a89df8c94b95704fd5858be7f85180e7 100644 (file)
--- a/src/HOMARDGUI/HOMARD_msg_ja.ts
+++ b/src/HOMARDGUI/HOMARD_msg_ja.ts
@@ -207,6 +207,14 @@
       <source>HOM_CASE_DIRECTORY_4</source>
       <translation>HOM_CASE_DIRECTORY_4</translation>
     </message>
+    <message>
+        <source>HOM_START_DIRECTORY_1</source>
+        <translation>A starting directory for the pursuit must be selected.</translation>
+    </message>
+    <message>
+        <source>HOM_START_DIRECTORY_3</source>
+        <translation>A valid directory for the pursuit must be selected.</translation>
+    </message>
     <message>
       <source>HOM_CASE_MESH</source>
       <translation>1 つは、初期のメッシュを選択する必要があります。</translation>

diff --git a/src/HOMARDGUI/MonCreateCase.cxx b/src/HOMARDGUI/MonCreateCase.cxx
index a38e9d8507b2306e5a0418aa3fe54501f61cc6d6..4738ba342efbf2cc8872cdab3a7ba874636fbdf8 100644 (file)
--- a/src/HOMARDGUI/MonCreateCase.cxx
+++ b/src/HOMARDGUI/MonCreateCase.cxx
@@ -43,7 +43,7 @@ using namespace std;
  * Sets attributes to default values
  */
 // -----------------------------------------------------------------------------------------
-MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0)
+MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 )
     :
     Ui_CreateCase(),
     _aCaseName(""),_aDirName(""),
@@ -171,7 +171,7 @@ bool MonCreateCase::PushOnApply()
   }
 #ifndef WIN32
   if (chdir(aDirName.toStdString().c_str()) != 0)
-#else 
+#else
   if (_chdir(aDirName.toStdString().c_str()) != 0)
 #endif
   {

diff --git a/src/HOMARDGUI/MonCreateCase.h b/src/HOMARDGUI/MonCreateCase.h
index 7f3d173c12c60d5c88c18ab6e62c39bbd40e7019..cf2bb6d9667cc8c1e801783c4a3f5893c852e3b6 100644 (file)
--- a/src/HOMARDGUI/MonCreateCase.h
+++ b/src/HOMARDGUI/MonCreateCase.h
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonCreateCase : public QDialog, public Ui_CreateCase
     Q_OBJECT
 
 public:
-    MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen);
+    MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen );
     ~MonCreateCase();
 
     void AddBoundaryAn(QString newBoundary);

diff --git a/src/HOMARDGUI/MonPursueIteration.cxx b/src/HOMARDGUI/MonPursueIteration.cxx
index feb96985dab4a605f4a5144b4bfc5331a57d2910..6d98b287a08ed44f9d69738daf551492ca129613 100644 (file)
--- a/src/HOMARDGUI/MonPursueIteration.cxx
+++ b/src/HOMARDGUI/MonPursueIteration.cxx
@@ -38,13 +38,13 @@ using namespace std;
  * Sets attributes to default values
  */
 // -----------------------------------------------------------------------------------------
-MonPursueIteration::MonPursueIteration (QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen)
+MonPursueIteration::MonPursueIteration ( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 )
     :
     Ui_PursueIteration(),
     _aCaseName(""), _aDirName(""), _aDirNameStart("")
 {
   MESSAGE("Debut du constructeur de MonPursueIteration");
-  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
   setupUi(this);
   setModal(modal);
 
@@ -69,7 +69,6 @@ MonPursueIteration::~MonPursueIteration()
 void MonPursueIteration::InitConnect()
 // ------------------------------------------------------------------------
 {
-    connect( LECaseName,     SIGNAL(textChanged(QString)), this, SLOT(CaseNameChanged()));
     connect( PushDir,        SIGNAL(pressed()), this, SLOT(SetDirName()));
 
     connect( RBIteration,    SIGNAL(clicked()), this, SLOT(FromIteration()));
@@ -89,7 +88,7 @@ bool MonPursueIteration::PushOnApply()
 // --------------------------------
 {
   MESSAGE("PushOnApply");
-
+// 1. Enregistrement du repertoire du cas
   QString aDirName=LEDirName->text().trimmed();
   if (aDirName == QString(""))
   {
@@ -118,14 +117,35 @@ bool MonPursueIteration::PushOnApply()
                               QObject::tr("HOM_CASE_DIRECTORY_3") );
     return false;
   }
+// 2. Enregistrement du repertoire de depart
+  QString aDirNameStart=LEDirNameStart->text().trimmed();
+  if (aDirNameStart == QString(""))
+  {
+    QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+                              QObject::tr("HOM_START_DIRECTORY_1") );
+    return false;
+  }
+#ifndef WIN32
+  if (chdir(aDirNameStart.toStdString().c_str()) != 0)
+#else
+  if (_chdir(aDirNameStart.toStdString().c_str()) != 0)
+#endif
+  {
+    QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+                              QObject::tr("HOM_START_DIRECTORY_3") );
+    return false;
+  }
 
-// Enregistrement du numero d'iteration
+// 3. Enregistrement du numero d'iteration
   int Number ;
   if ( _Type == 3 ) { Number = spinBoxNumber->value() ; }
 
-// Creation du cas
+// 4. Creation du cas
   QString _aCaseName=LECaseName->text().trimmed();
+  _aDirNameStart=aDirNameStart;
 
+  MESSAGE("_aCaseName = "<<_aCaseName.toStdString().c_str());
+  MESSAGE("_aDirNameStart = "<<_aDirNameStart.toStdString().c_str());
   MESSAGE("_Type = "<<_Type);
   switch (_Type)
   {
@@ -183,6 +203,9 @@ bool MonPursueIteration::PushOnApply()
     }
   }
 
+  aCase->SetDirName(aDirName.toStdString().c_str());
+  _aDirName=aDirName;
+
   HOMARD_UTILS::updateObjBrowser();
 
   return true;

diff --git a/src/HOMARDGUI/MonPursueIteration.h b/src/HOMARDGUI/MonPursueIteration.h
index 37480de23898c60ec70919480376fdb0022d7665..a6c5d7d99b63d5b6dfb805b34a801e67000b2d54 100644 (file)
--- a/src/HOMARDGUI/MonPursueIteration.h
+++ b/src/HOMARDGUI/MonPursueIteration.h
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati
     Q_OBJECT
 
   public:
-    MonPursueIteration( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen);
+    MonPursueIteration( bool modal, HOMARD::HOMARD_Gen_var myHomardGen );
     virtual ~MonPursueIteration();
 
   protected :