From: Gérald NICOLAS <gerald.nicolas@edf.fr>
Date: Wed, 27 May 2020 10:13:20 +0000 (+0200)
Subject: Recherche de l'étude sous-jacente
X-Git-Tag: V9_7_0a1~18^2~89
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4434b7437bbd2ffea0152bd450974149519d7ea7;p=modules%2Fsmesh.git

Recherche de l'étude sous-jacente
---

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index ecae8b802..53c94d6ec 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1970,12 +1970,12 @@ void SMESHGUI::OnEditDelete()
   int objectCount = 0;
   QString aNameList;
   QString aParentComponent = QString::null;
-  
+
   for( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() )
   {
     Handle(SALOME_InteractiveObject) anIO = anIt.Value();
     if ( anIO.IsNull() ) continue;
-    
+
     QString father = "unknown", name;
 
     _PTR(SObject) aSO = aStudy->FindObjectID( anIO->getEntry() );
@@ -3048,7 +3048,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
     {
       SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil();
       SMESHGUI_AdaptDlg *aDlg = new SMESHGUI_AdaptDlg( this, theCommandID, aMesh);
-      aDlg->show();
+//       aDlg->show();
     }
   // Adaptation - end
 
@@ -5368,7 +5368,7 @@ void SMESHGUI::createPreferences()
   setPreferenceProperty( dispgroup, "columns", 2 );
 
   addPreference( tr( "PREF_FITALL_ON_DISPLAYONLY" ), dispgroup, LightApp_Preferences::Bool, "SMESH", "fitall_on_displayonly" );
-  
+
   int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" );
   QStringList modes;
   modes.append( tr("MEN_WIRE") );
diff --git a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
index 1aa14fd38..78eb57775 100644
--- a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
@@ -134,16 +134,20 @@ SMESHGUI_AdaptDlg::SMESHGUI_AdaptDlg( SMESHGUI* theModule,
     myIsApplyAndClose( false )
 {
   std::cout  << "SMESHGUI_AdaptDlg avec theCommandID : " << theCommandID << std::endl;
-  initDialog( true );
-  if ( !theMesh->_is_nil() )
-    init( theMesh );
-  else
+  if ( ! OnGUIEvent (theCommandID) )
   {
-    mySelectSubMesh->setEnabled( false );
-    mySelectGroup->setEnabled( false );
-    myGeomGroupBtn->setEnabled( false );
-    myGeomGroupLine->setEnabled( false );
+    INFOS("Erreur");
   }
+//   initDialog( true );
+//   if ( !theMesh->_is_nil() )
+//     init( theMesh );
+//   else
+//   {
+//     mySelectSubMesh->setEnabled( false );
+//     mySelectGroup->setEnabled( false );
+//     myGeomGroupBtn->setEnabled( false );
+//     myGeomGroupLine->setEnabled( false );
+//   }
 }
 //=======================================================================
 // OnGUIEvent for the adaptations
@@ -152,24 +156,25 @@ bool SMESHGUI_AdaptDlg::OnGUIEvent (int theCommandID)
 {
   std::cout  << "OnGUIEvent avec theCommandID : " << theCommandID << std::endl;
 // A. Controles
-//   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() );
-//   if ( !app ) return false;
-//
-//   SalomeApp_Study* stud = dynamic_cast<SalomeApp_Study*> ( app->activeStudy() );
-//   if ( !stud )
-//   {
-//     MESSAGE ( "FAILED to cast active study to SalomeApp_Study" );
-//     return false;
-//   }
-//
-//   SUIT_Desktop* parent = application()->desktop();
-//
+  SalomeApp_Application* app =
+      dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+  if ( !app ) return false;
+
+  SalomeApp_Study* stud = dynamic_cast<SalomeApp_Study*> ( app->activeStudy() );
+  if ( !stud )
+  {
+    MESSAGE ( "FAILED to cast active study to SalomeApp_Study" );
+    return false;
+  }
+
+  SUIT_Desktop* parent = SUIT_Session::session()->activeApplication()->desktop();
+
 //   ADAPT::ADAPT_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app);
 //
 //   if (!CORBA::is_nil(homardGen))
 //     homardGen->UpdateStudy();
 //
-//   getApp()->updateObjectBrowser();
+  SMESHGUI::GetSMESHGUI()->getApp()->updateObjectBrowser();
 //
 // B. Choix selon les commandes
   SCRUTE(theCommandID);
@@ -177,7 +182,7 @@ bool SMESHGUI_AdaptDlg::OnGUIEvent (int theCommandID)
   {
     case 8011: // Creation d un Cas
     {
-      MESSAGE("command " << theCommandID << " activated");
+      INFOS("Creation d'un Cas");
 //       MonCreateCase *aDlg = new MonCreateCase( true,
 //                             ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ;
 //       aDlg->show();