X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_HomardAdaptDlg.cxx;h=66cb3936610432adc466f0fc6d1299f802cbc00c;hb=090d533f339d886d08177706ed5e4a03aea99511;hp=c215ac0c895fea5b6ee91106faf22f11bc9c17ce;hpb=541b20a433ff6970d3eab0cdbe064b3786c3ca82;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_HomardAdaptDlg.cxx b/src/SMESHGUI/SMESHGUI_HomardAdaptDlg.cxx
index c215ac0c8..66cb39366 100644
--- a/src/SMESHGUI/SMESHGUI_HomardAdaptDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_HomardAdaptDlg.cxx
@@ -72,6 +72,7 @@ SMESHGUI_HomardAdaptDlg::SMESHGUI_HomardAdaptDlg(SMESHHOMARD::HOMARD_Gen_ptr myH
 {
   MESSAGE("Debut du constructeur de SMESHGUI_HomardAdaptDlg");
   myHomardGen = SMESHHOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+  //myHomardGen = SMESHGUI::GetSMESHGen()->CreateHOMARD_ADAPT();
   myHomardGen->Register();
 
   setModal(false);
@@ -181,6 +182,7 @@ SMESHGUI_HomardAdaptDlg::SMESHGUI_HomardAdaptDlg(SMESHHOMARD::HOMARD_Gen_ptr myH
 SMESHGUI_HomardAdaptDlg::~SMESHGUI_HomardAdaptDlg()
 {
   // no need to delete child widgets, Qt does it all for us
+  myHomardGen->DeleteCase();
 }
 
 //=================================================================================
@@ -358,9 +360,6 @@ bool SMESHGUI_HomardAdaptDlg::CheckCase(bool fixCase)
     InitBoundarys();
   }
 
-  // Repertoire et type
-  myCase->SetConfType(myArgs->RBConforme->isChecked() ? 0 : 1);
-
   // Menage des eventuelles frontieres deja enregistrees
   myCase->SupprBoundaryGroup();
 
@@ -423,7 +422,7 @@ bool SMESHGUI_HomardAdaptDlg::PushOnApply()
     if (anOutMed.isEmpty()) {
       // store in working directory and with default name
       QString aWorkingDir = myAdvOpt->workingDirectoryLineEdit->text().trimmed();
-      QFileInfo aFileInfo (QDir(aWorkingDir), "Uniform_01_R.med");
+      QFileInfo aFileInfo (QDir(aWorkingDir), "Uniform_R.med");
       anOutMed = aFileInfo.absoluteFilePath();
       // show it
       myArgs->mySelectOutMedFileLineEdit->setText(anOutMed);
@@ -437,10 +436,13 @@ bool SMESHGUI_HomardAdaptDlg::PushOnApply()
   else {
     // Set file name without path for it to be created in current directory
     // (it will be iteration's dir, and it will be destroyed after)
-    aMeshFileOUT = "Uniform_01_R.med";
+    aMeshFileOUT = "Uniform_R.med";
   }
   myHomardGen->SetMeshFileOUT(aMeshFileOUT.c_str());
 
+  // Conformity type
+  myHomardGen->SetConfType(myArgs->RBConforme->isChecked() ? 0 : 1);
+
   // Advanced options
   myHomardGen->SetVerboseLevel(myAdvOpt->verboseLevelSpin->value());
   myHomardGen->SetKeepWorkingFiles(myAdvOpt->keepWorkingFilesCheck->isChecked());
@@ -561,8 +563,7 @@ void SMESHGUI_HomardAdaptDlg::selectionChanged()
   myArgs->myInBrowserObject->setText(aMeshName);
 
   // Out mesh name default value
-  // TODO: add some suffix? "_R" or "_UnifRefin", or "_Uniform_01_R"
-  myArgs->myOutMeshNameLineEdit->setText(aMeshName);
+  myArgs->myOutMeshNameLineEdit->setText(aMeshName + "_Uniform_R");
 
   // Output med file default value
   // Construct it from Input mesh name and working directory
@@ -572,9 +573,9 @@ void SMESHGUI_HomardAdaptDlg::selectionChanged()
   }
   else {
     QString aWorkingDir = myAdvOpt->workingDirectoryLineEdit->text().trimmed();
-    QFileInfo aFileInfo (QDir(aWorkingDir), aMeshName + QString("_Uniform_01_R.med"));
+    QFileInfo aFileInfo (QDir(aWorkingDir), aMeshName + QString("_Uniform_R.med"));
     for (int ii = 1; aFileInfo.exists(); ii++) {
-      QString anUniqueName = QString("%1_Uniform_01_R_%2.med").arg(aMeshName).arg(ii);
+      QString anUniqueName = QString("%1_Uniform_R_%2.med").arg(aMeshName).arg(ii);
       aFileInfo.setFile(QDir(aWorkingDir), anUniqueName);
     }
     myArgs->mySelectOutMedFileLineEdit->setText(aFileInfo.absoluteFilePath());
@@ -601,9 +602,8 @@ void SMESHGUI_HomardAdaptDlg::SetFileName()
   myArgs->mySelectInMedFileLineEdit->setText(fileName);
 
   // Out mesh name default value
-  // TODO: add some suffix? "_R" or "_UnifRefin", or "_Uniform_01_R"
   QString aMeshName = SMESH_HOMARD_QT_COMMUN::LireNomMaillage(fileName);
-  myArgs->myOutMeshNameLineEdit->setText(aMeshName);
+  myArgs->myOutMeshNameLineEdit->setText(aMeshName + "_Uniform_R");
 
   // Output med file default value
   // Construct it from Input med file name and path
@@ -613,9 +613,9 @@ void SMESHGUI_HomardAdaptDlg::SetFileName()
   if (lastdot != std::string::npos)
     fname = fname.substr(0, lastdot);
   QString fileNameOut = fname.c_str();
-  QFileInfo aFileInfo (fileNameOut + QString("_Uniform_01_R.med"));
+  QFileInfo aFileInfo (fileNameOut + QString("_Uniform_R.med"));
   for (int ii = 1; aFileInfo.exists(); ii++) {
-    QString anUniqueName = QString("%1_Uniform_01_R_%2.med").arg(fileNameOut).arg(ii);
+    QString anUniqueName = QString("%1_Uniform_R_%2.med").arg(fileNameOut).arg(ii);
     aFileInfo.setFile(anUniqueName);
   }
   myArgs->mySelectOutMedFileLineEdit->setText(aFileInfo.absoluteFilePath());