Porting HOMARD SALOME module on WIN32 platform.

[modules/homard.git] / src / HOMARDGUI / MonPursueIteration.cxx

diff --git a/src/HOMARDGUI/MonPursueIteration.cxx b/src/HOMARDGUI/MonPursueIteration.cxx
index d89500137534872c38442ebfc39c47e989fd5561..feb96985dab4a605f4a5144b4bfc5331a57d2910 100644 (file)
--- a/src/HOMARDGUI/MonPursueIteration.cxx
+++ b/src/HOMARDGUI/MonPursueIteration.cxx
@@ -17,8 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-using namespace std;
-
 #include "MonPursueIteration.h"
 
 #include <QFileDialog>
@@ -29,10 +27,14 @@ using namespace std;
 #include "HomardQtCommun.h"
 #include <utilities.h>
 
+#ifdef WIN32
+#include <direct.h>
+#endif
+
+using namespace std;
 
 // -----------------------------------------------------------------------------------------
 /* Constructs a MonPursueIteration
- * Inherits from CasHomard
  * Sets attributes to default values
  */
 // -----------------------------------------------------------------------------------------
@@ -42,7 +44,7 @@ MonPursueIteration::MonPursueIteration (QWidget* parent, bool modal, HOMARD::HOM
     _aCaseName(""), _aDirName(""), _aDirNameStart("")
 {
   MESSAGE("Debut du constructeur de MonPursueIteration");
-  _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
   setupUi(this);
   setModal(modal);
 
@@ -95,13 +97,22 @@ bool MonPursueIteration::PushOnApply()
                               QObject::tr("HOM_CASE_DIRECTORY_1") );
     return false;
   }
-  if ((aDirName != _aDirName) and (_myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false))
-  {
-    QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
-                              QObject::tr("HOM_CASE_DIRECTORY_2") );
-    return false;
+  if ( aDirName != _aDirName)
+  { QString CaseNameDir = myHomardGen->VerifieDir( aDirName.toStdString().c_str()) ;
+    if ( CaseNameDir != "" )
+    {
+      QString texte ;
+      texte = QObject::tr("HOM_CASE_DIRECTORY_2") + CaseNameDir ;
+      QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+                                texte );
+      return false;
+    }
   }
+#ifndef WIN32
   if (chdir(aDirName.toStdString().c_str()) != 0)
+#else
+  if (_chdir(aDirName.toStdString().c_str()) != 0)
+#endif
   {
     QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
                               QObject::tr("HOM_CASE_DIRECTORY_3") );
@@ -123,7 +134,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir d'une iteration");
-        aCase = _myHomardGen->CreateCaseFromIteration( \
+        aCase = myHomardGen->CreateCaseFromIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()) );
       }
@@ -140,7 +151,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir de la derniere iteration dans un cas");
-        aCase = _myHomardGen->CreateCaseFromCaseLastIteration( \
+        aCase = myHomardGen->CreateCaseFromCaseLastIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()) );
       }
@@ -157,7 +168,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir d'une iteration dans un cas");
-        aCase = _myHomardGen->CreateCaseFromCaseIteration( \
+        aCase = myHomardGen->CreateCaseFromCaseIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()),  \
                   Number );
@@ -187,13 +198,14 @@ void MonPursueIteration::PushOnOK()
 void MonPursueIteration::PushOnHelp()
 //-------------------------------
 {
-  HOMARD_UTILS::PushOnHelp(QString("gui_create_case.html"), QString(""));
+  char* LanguageShort = myHomardGen->GetLanguageShort();
+  HOMARD_UTILS::PushOnHelp(QString("gui_create_case.html"), QString(""), QString(LanguageShort));
 }
 // ---------------------------------
 void MonPursueIteration::SetNewCaseName()
 // ------------------------------
 {
-  HOMARD::listeCases_var  MyCases = _myHomardGen->GetAllCasesName();
+  HOMARD::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {