X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AdaptDlg.cxx;h=90dff1ad325d09f9686426c673981824fd5836c1;hb=624e57e97d4aaea94f4318200b82f7756f27453a;hp=2e48cc2aaff2c4f5562811b6677757e89c53ac71;hpb=cadf63ae2c25a6df4bf13be1ee5157ffc4896fd8;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
index 2e48cc2aa..90dff1ad3 100644
--- a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
@@ -24,6 +24,8 @@
 //  SMESH includes
 #include "SMESHGUI.h"
 #include "SMESHGUI_AdaptDlg.h"
+#include "SMESHGUI_MG_ADAPTDRIVER.h"
+#include "MG_ADAPT.hxx"
 
 // SALOME GUI includes
 #include <SUIT_Desktop.h>
@@ -111,32 +113,32 @@ void SMESHGUI_AdaptDlg::action (int theCommandID)
 //   INFOS ("Enregistrement de LanguageShort = " << _LanguageShort.toStdString().c_str() );
 // //   adaptGen->SetLanguageShort(_LanguageShort.toStdString().c_str());
 //
-// // B.2. Les publications
+// // B.2. Les publications avec HOMARD
 //   bool publish_mesh ;
 //
-//   publish_mesh = resMgr->booleanValue("HOMARD", "publish_mesh_in", false );
+//   publish_mesh = resMgr->booleanValue("HOMARD", "homard_publish_mesh_in", false );
 //   if ( publish_mesh ) { _PublisMeshIN = 1 ; }
 //   else                { _PublisMeshIN = 0 ; }
 //
-//   publish_mesh = resMgr->booleanValue("HOMARD", "publish_mesh_out", false );
+//   publish_mesh = resMgr->booleanValue("HOMARD", "homard_publish_mesh_out", false );
 //   if ( publish_mesh ) { _PublisMeshOUT = 1 ; }
 //   else                { _PublisMeshOUT = 0 ; }
 //
 //   INFOS ("Enregistrement de PublisMeshIN = " << _PublisMeshIN<<", PublisMeshOUT = "<< _PublisMeshOUT);
 // //   adaptGen->SetPublisMesh(_PublisMeshIN, _PublisMeshOUT);
 //
-// // B.3. Les maximum pour YACS
+// // B.3. Les maximum pour YACS avec HOMARD
 //
-//   _YACSMaxIter = resMgr->integerValue("HOMARD", "yacs_max_iter", 0 );
-//   _YACSMaxNode = resMgr->integerValue("HOMARD", "yacs_max_node", 0 );
-//   _YACSMaxElem = resMgr->integerValue("HOMARD", "yacs_max_elem", 0 );
+//   _YACSMaxIter = resMgr->integerValue("HOMARD", "homard_yacs_max_iter", 0 );
+//   _YACSMaxNode = resMgr->integerValue("HOMARD", "homard_yacs_max_node", 0 );
+//   _YACSMaxElem = resMgr->integerValue("HOMARD", "homard_yacs_max_elem", 0 );
 //
 //   INFOS ("Enregistrement de YACSMaxIter = " << _YACSMaxIter<<", YACSMaxNode = "<< _YACSMaxNode<<", YACSMaxElem = "<< _YACSMaxElem);
 // //   adaptGen->SetYACSMaximum(_YACSMaxIter, _YACSMaxNode, _YACSMaxElem);
 //
-// // B.4. La convergence pour YACS
+// // B.4. La convergence pour YACS avec HOMARD
 //
-//   QString QString_v = resMgr->stringValue ( "HOMARD", "yacs_type_test", "None" );
+//   QString QString_v = resMgr->stringValue ( "HOMARD", "homard_yacs_type_test", "None" );
 //   if ( ( QString_v == "VTest > VRef" ) || ( QString_v == "VTest &gt; VRef" ) )      { _YACSTypeTest = 1 ; }
 //   else if ( ( QString_v == "VTest < VRef" ) || ( QString_v == "VTest &lt; VRef" ) ) { _YACSTypeTest = 2 ; }
 //   else                                                                              { _YACSTypeTest = 0 ; }
@@ -222,6 +224,14 @@ bool SMESHGUI_AdaptDlg::OnGUIEvent (int theCommandID)
     {
       INFOS("Interface avec MG-Adapt" );
 //       A faire
+
+      MgAdapt* model = new MgAdapt();
+      bool isCreation = false;
+	  if (mySMESHGUI->isStudyLocked()) break;
+      mySMESHGUI->EmitSignalDeactivateDialog();
+      SMESHGUI_MG_ADAPTDRIVER *mgAdapt = new SMESHGUI_MG_ADAPTDRIVER(mySMESHGUI, model, isCreation);
+      mgAdapt->show();
+      delete model;
       break;
     }