// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
#include <SUIT_ViewWindow.h>
#include <SUIT_OverrideCursor.h>
-#include <VTKViewer_ViewWindow.h>
-#include <VTKViewer_RenderWindowInteractor.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewWindow.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SVTK_ViewWindow.h>
-#include <SVTK_RenderWindowInteractor.h>
+#include <SVTK_View.h>
#include <SVTK_ViewModel.h>
#include <SOCC_ViewModel.h>
#include <SVTK_Prs.h>
#include <SOCC_Prs.h>
+#include <QtxActionMenuMgr.h>
+
#include <SalomeApp_Application.h>
-#include <SalomeApp_SelectionMgr.h>
+#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Study.h>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
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
{
myDisplayGUI->InvertDisplayMode();
int newMode = myDisplayGUI->GetDisplayMode();
- SUIT_Session::session()->activeApplication()->desktop()->menuBar()->
- changeItem( 211, newMode == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") );
+ getGeometryGUI()->action( 211 )->setMenuText( newMode == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") );
+ getGeometryGUI()->menuMgr()->update();
+// SUIT_Session::session()->activeApplication()->desktop()->menuBar()->
+// changeItem( 211, newMode == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") );
break;
}
case 212: // MENU VIEW - DISPLAY ALL
{
+ getGeometryGUI()->EmitSignalDeactivateDialog();
myDisplayGUI->DisplayAll();
break;
}
case 213: // MENU VIEW - DISPLAY ONLY
{
+ getGeometryGUI()->EmitSignalDeactivateDialog();
myDisplayGUI->DisplayOnly();
break;
}
}
case 216: // MENU VIEW - DISPLAY
{
+ getGeometryGUI()->EmitSignalDeactivateDialog();
myDisplayGUI->Display();
break;
}
break;
}
}
+ Sel->setSelectedObjects( selected );
return true;
}
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
SUIT_ViewManager* vman = vw->getViewManager();
if ( vman->getType() == OCCViewer_Viewer::Type() ||
- vman->getType() == VTKViewer_Viewer::Type() ) {
+ vman->getType() == SVTK_Viewer::Type() ) {
GEOM_Displayer( appStudy ).EraseAll();
}
}
if ( !anActiveStudy ) return;
//get SalomeApp selection manager
- SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+ LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return;
SALOME_ListIO aList;
if ( !anActiveStudy ) return;
//get SalomeApp selection manager
- SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+ LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return;
SALOME_ListIO aList;
if ( !viewWindow )
viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
- if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) {
- VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewWindow*)viewWindow)->getRWInteractor();
- myRenderInter->SetDisplayMode( mode );
+ if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
+ SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView();
+ aView->SetDisplayMode( mode );
}
else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer();
int dispMode = 0;
if ( !viewWindow )
viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
- if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) {
- VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewWindow*)viewWindow)->getRWInteractor();
- dispMode = myRenderInter->GetDisplayMode();
+ if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
+ SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView();
+ dispMode = aView->GetDisplayMode();
}
else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer();
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( !app ) return;
- SalomeApp_SelectionMgr* aSelMgr = app->selectionMgr();
+ LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( !aSelMgr ) return;
SUIT_OverrideCursor();
SALOME_ListIO aList;
- if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) {
+ if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( viewWindow );
- SVTK_RenderWindowInteractor* rwi = vw->getRWInteractor();
+ SVTK_View* aView = vw->getView();
aSelMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO It( aList );
for( ;It.More(); It.Next() ) {
- SVTK_Viewer* stvkViewer = (SVTK_Viewer*)(vw->getViewManager()->getViewModel());
- SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( It.Value()->getEntry() ) );
+ SVTK_Viewer* stvkViewer = dynamic_cast<SVTK_Viewer*>(vw->getViewManager()->getViewModel());
+ SVTK_Prs* vtkPrs = stvkViewer ? dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( It.Value()->getEntry() ) ) : 0;
if ( vtkPrs && !vtkPrs->IsNull() ) {
if ( mode == 0 )
- rwi->ChangeRepresentationToWireframe( vtkPrs->GetObjects() );
+ aView->ChangeRepresentationToWireframe( vtkPrs->GetObjects() );
else if ( mode == 1 )
- rwi->ChangeRepresentationToSurface( vtkPrs->GetObjects() );
+ aView->ChangeRepresentationToSurface( vtkPrs->GetObjects() );
}
}
- rwi->Render();
+ aView->Repaint();
}
else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer();
//=====================================================================================
extern "C"
{
+#ifdef WNT
+ __declspec( dllexport )
+#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return DisplayGUI::GetDisplayGUI( parent );