Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PAL10209 - after operation display/erase GEOM objects must be selected in viewer
[modules/geom.git]
/
src
/
DisplayGUI
/
DisplayGUI.cxx
diff --git
a/src/DisplayGUI/DisplayGUI.cxx
b/src/DisplayGUI/DisplayGUI.cxx
index 6f337597d9fb09b029197ae3df0c1339d16c9863..3be30b5e13dc70f8275597417771ad66c7cbea6d 100644
(file)
--- a/
src/DisplayGUI/DisplayGUI.cxx
+++ b/
src/DisplayGUI/DisplayGUI.cxx
@@
-48,8
+48,10
@@
#include <SVTK_Prs.h>
#include <SOCC_Prs.h>
#include <SVTK_Prs.h>
#include <SOCC_Prs.h>
+#include <QtxActionMenuMgr.h>
+
#include <SalomeApp_Application.h>
#include <SalomeApp_Application.h>
-#include <
Salome
App_SelectionMgr.h>
+#include <
Light
App_SelectionMgr.h>
#include <SalomeApp_Study.h>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <SalomeApp_Study.h>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
@@
-97,6
+99,9
@@
DisplayGUI::~DisplayGUI()
bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
{
DisplayGUI* myDisplayGUI = GetDisplayGUI( getGeometryGUI() );
bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
{
DisplayGUI* myDisplayGUI = GetDisplayGUI( getGeometryGUI() );
+ LightApp_SelectionMgr *Sel = getGeometryGUI()->getApp()->selectionMgr();
+ SALOME_ListIO selected;
+ Sel->selectedObjects( selected );
switch (theCommandID) {
case 211: // MENU VIEW - WIREFRAME/SHADING
switch (theCommandID) {
case 211: // MENU VIEW - WIREFRAME/SHADING
@@
-153,6
+158,7
@@
bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
break;
}
}
break;
}
}
+ Sel->setSelectedObjects( selected );
return true;
}
return true;
}
@@
-234,7
+240,7
@@
void DisplayGUI::Display()
if ( !anActiveStudy ) return;
//get SalomeApp selection manager
if ( !anActiveStudy ) return;
//get SalomeApp selection manager
-
Salome
App_SelectionMgr* aSelMgr = app->selectionMgr();
+
Light
App_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return;
SALOME_ListIO aList;
if ( !aSelMgr ) return;
SALOME_ListIO aList;
@@
-290,7
+296,7
@@
void DisplayGUI::Erase()
if ( !anActiveStudy ) return;
//get SalomeApp selection manager
if ( !anActiveStudy ) return;
//get SalomeApp selection manager
-
Salome
App_SelectionMgr* aSelMgr = app->selectionMgr();
+
Light
App_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return;
SALOME_ListIO aList;
if ( !aSelMgr ) return;
SALOME_ListIO aList;
@@
-417,7
+423,7
@@
void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( !app ) return;
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( !app ) return;
-
Salome
App_SelectionMgr* aSelMgr = app->selectionMgr();
+
Light
App_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return;
SUIT_OverrideCursor();
if ( !aSelMgr ) return;
SUIT_OverrideCursor();