X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDisplayGUI%2FDisplayGUI.cxx;h=e35c95e41b434e9067acf8bf24e31139ee183b46;hb=6c057505a6e4bcff162cfb8b86deeda0eefff60a;hp=1f496edb079d5f8d9e6be859cffae6f72bc51b6c;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index 1f496edb0..e35c95e41 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -1,74 +1,68 @@ -// GEOM GEOMGUI : GUI for Geometry component +// GEOM GEOMGUI : GUI for Geometry component // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// 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 // +// File : DisplayGUI.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // -// -// File : DisplayGUI.cxx -// Author : Vadim SANDLER -// Module : GEOM -// $Header$ #include "DisplayGUI.h" -#include "GeometryGUI.h" -#include "GEOM_Displayer.h" - -#include "QAD_RightFrame.h" -#include "QAD_WaitCursor.h" -#include "QAD_Desktop.h" -#include "VTKViewer_ViewFrame.h" -#include "VTKViewer_RenderWindowInteractor.h" -#include "OCCViewer_ViewFrame.h" -#include "OCCViewer_Viewer3d.h" -#include "SALOME_ListIteratorOfListIO.hxx" -#include "VTKViewer_Prs.h" -#include "OCCViewer_Prs.h" +#include +#include +#include -#include +#include +#include +#include -using namespace std; +#include +#include -DisplayGUI* DisplayGUI::myGUIObject = 0; +#include +#include -//======================================================================= -// function : DisplayGUI::GetDisplayGUI() -// purpose : Get the only DisplayGUI object [ static ] -//======================================================================= -DisplayGUI* DisplayGUI::GetDisplayGUI() -{ - if ( myGUIObject == 0 ) { - // init DisplayGUI only once - myGUIObject = new DisplayGUI(); - } - return myGUIObject; -} +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include + +#include //======================================================================= // function : DisplayGUI::DisplayGUI() // purpose : Constructor //======================================================================= -DisplayGUI::DisplayGUI() : GEOMGUI() +DisplayGUI::DisplayGUI( GeometryGUI* parent ) : GEOMGUI( parent ) { } - //======================================================================= // function : DisplayGUI::~DisplayGUI() // purpose : Destructor @@ -82,59 +76,70 @@ DisplayGUI::~DisplayGUI() // function : DisplayGUI::OnGUIEvent() // purpose : Dispatch menu command //======================================================================= -bool DisplayGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) +bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) { - DisplayGUI* myDisplayGUI = GetDisplayGUI(); + SalomeApp_Application* app = getGeometryGUI()->getApp(); + if (!app) return false; + + LightApp_SelectionMgr *Sel = app->selectionMgr(); + SALOME_ListIO selected; + Sel->selectedObjects( selected ); switch (theCommandID) { case 211: // MENU VIEW - WIREFRAME/SHADING { - myDisplayGUI->InvertDisplayMode(); - int newMode = myDisplayGUI->GetDisplayMode(); - QAD_Application::getDesktop()->menuBar()->changeItem( 211, newMode == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") ); + InvertDisplayMode(); + int newMode = GetDisplayMode(); + getGeometryGUI()->action( 211 )->setText + ( newMode == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") ); + getGeometryGUI()->menuMgr()->update(); break; } case 212: // MENU VIEW - DISPLAY ALL { - myDisplayGUI->DisplayAll(); + getGeometryGUI()->EmitSignalDeactivateDialog(); + DisplayAll(); break; } case 213: // MENU VIEW - DISPLAY ONLY { - myDisplayGUI->DisplayOnly(); + getGeometryGUI()->EmitSignalDeactivateDialog(); + DisplayOnly(); break; } case 214: // MENU VIEW - ERASE ALL { - myDisplayGUI->EraseAll(); + EraseAll(); break; } case 215: // MENU VIEW - ERASE { - myDisplayGUI->Erase(); + Erase(); break; } case 216: // MENU VIEW - DISPLAY { - myDisplayGUI->Display(); + getGeometryGUI()->EmitSignalDeactivateDialog(); + Display(); break; } case 80311: // POPUP VIEWER - WIREFRAME { - myDisplayGUI->ChangeDisplayMode( 0 ); + ChangeDisplayMode( 0 ); break; } case 80312: // POPUP VIEWER - SHADING { - myDisplayGUI->ChangeDisplayMode( 1 ); + ChangeDisplayMode( 1 ); break; } default: { - parent->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); + app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); break; } } + Sel->setSelectedObjects( selected ); return true; } @@ -144,24 +149,34 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) //===================================================================================== void DisplayGUI::DisplayAll() { - QAD_WaitCursor wc; - SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument(); - SALOMEDS::SComponent_var SC = aStudy->FindComponent( "GEOM" ); - if ( SC->_is_nil() ) + SalomeApp_Application* app = getGeometryGUI()->getApp(); + if ( !app ) return; + + SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ); + if ( !appStudy ) return; + _PTR(Study) aStudy = appStudy->studyDS(); + if ( !aStudy ) return; + _PTR(SComponent) SC ( aStudy->FindComponent( "GEOM" ) ); + if ( !SC ) return; SALOME_ListIO listIO; - SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator( SC ); + _PTR(ChildIterator) anIter ( aStudy->NewChildIterator( SC ) ); anIter->InitEx( true ); + + SUIT_OverrideCursor(); + while( anIter->More() ) { - SALOMEDS::SObject_var valSO = anIter->Value(); - SALOMEDS::SObject_var refSO; + _PTR(SObject) valSO ( anIter->Value() ); + _PTR(SObject) refSO; if ( !valSO->ReferencedObject( refSO ) ) { - listIO.Append( new SALOME_InteractiveObject( valSO->GetID(), SC->ComponentDataType() ,valSO->GetName()) ); + listIO.Append( new SALOME_InteractiveObject(valSO->GetID().c_str(), + SC->ComponentDataType().c_str(), + valSO->GetName().c_str()) ); } anIter->Next(); } - GEOM_Displayer().Display( listIO, true ); + GEOM_Displayer( appStudy ).Display( listIO, true ); } //===================================================================================== @@ -170,10 +185,20 @@ void DisplayGUI::DisplayAll() //===================================================================================== void DisplayGUI::EraseAll() { - QAD_WaitCursor wc; - QAD_ViewFrame* vf = QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame(); - if ( vf->getTypeView() == VIEW_OCC || vf->getTypeView() == VIEW_VTK ) - vf->EraseAll(); + SUIT_OverrideCursor(); + + SUIT_Application* app = getGeometryGUI()->getApp(); + if ( app ) { + SUIT_ViewWindow* vw = app->desktop()->activeWindow(); + if ( vw ) { + SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ); + SUIT_ViewManager* vman = vw->getViewManager(); + if ( vman->getType() == OCCViewer_Viewer::Type() || + vman->getType() == SVTK_Viewer::Type() ) { + GEOM_Displayer( appStudy ).EraseAll(); + } + } + } } //===================================================================================== @@ -192,28 +217,42 @@ void DisplayGUI::DisplayOnly() //===================================================================================== void DisplayGUI::Display() { - QAD_WaitCursor wc; SALOME_ListIO listIO; - QAD_Study* anActiveStudy = QAD_Application::getDesktop()->getActiveStudy(); - SALOME_Selection* Sel = SALOME_Selection::Selection( anActiveStudy->getSelection() ); - SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() ); + SalomeApp_Application* app = getGeometryGUI()->getApp(); + if ( !app ) return; + + SalomeApp_Study* anActiveStudy = dynamic_cast( app->activeStudy() ); + if ( !anActiveStudy ) return; + + //get SalomeApp selection manager + LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); + if ( !aSelMgr ) return; + + SALOME_ListIO aList; + aSelMgr->selectedObjects( aList ); + SALOME_ListIteratorOfListIO It( aList ); + + SUIT_OverrideCursor(); + for( ;It.More();It.Next() ) { Handle(SALOME_InteractiveObject) anIObject = It.Value(); if ( anIObject->hasEntry() ) { - SALOMEDS::SObject_var SO = anActiveStudy->getStudyDocument()->FindObjectID( anIObject->getEntry() ); - if ( !SO->_is_nil() && QString( SO->GetID() ) == QString( SO->GetFatherComponent()->GetID() ) ) { - SALOMEDS::SComponent_var SC = SO->GetFatherComponent(); + _PTR(SObject) SO ( anActiveStudy->studyDS()->FindObjectID( anIObject->getEntry() ) ); + if ( SO && QString(SO->GetID().c_str()) == QString(SO->GetFatherComponent()->GetID().c_str()) ) { + _PTR(SComponent) SC ( SO->GetFatherComponent() ); // if component is selected listIO.Clear(); - SALOMEDS::ChildIterator_var anIter = anActiveStudy->getStudyDocument()->NewChildIterator( SO ); + _PTR(ChildIterator) anIter ( anActiveStudy->studyDS()->NewChildIterator( SO ) ); anIter->InitEx( true ); while( anIter->More() ) { - SALOMEDS::SObject_var valSO = anIter->Value(); - SALOMEDS::SObject_var refSO; + _PTR(SObject) valSO ( anIter->Value() ); + _PTR(SObject) refSO; if ( !valSO->ReferencedObject( refSO ) ) { - listIO.Append( new SALOME_InteractiveObject( valSO->GetID(), SC->ComponentDataType() ,valSO->GetName()) ); - } + listIO.Append( new SALOME_InteractiveObject(valSO->GetID().c_str(), + SC->ComponentDataType().c_str(), + valSO->GetName().c_str()) ); + } anIter->Next(); } break; @@ -226,7 +265,7 @@ void DisplayGUI::Display() listIO.Append( anIObject ); } } - GEOM_Displayer().Display( listIO, true ); + GEOM_Displayer( anActiveStudy ).Display( listIO, true ); } @@ -236,28 +275,42 @@ void DisplayGUI::Display() //===================================================================================== void DisplayGUI::Erase() { - QAD_WaitCursor wc; SALOME_ListIO listIO; - QAD_Study* anActiveStudy = QAD_Application::getDesktop()->getActiveStudy(); - SALOME_Selection* Sel = SALOME_Selection::Selection( anActiveStudy->getSelection() ); - SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() ); - for( ;It.More();It.Next() ) { + SalomeApp_Application* app = getGeometryGUI()->getApp(); + if ( !app ) return; + + SalomeApp_Study* anActiveStudy = dynamic_cast( app->activeStudy() ); + if ( !anActiveStudy ) return; + + //get SalomeApp selection manager + LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); + if ( !aSelMgr ) return; + + SALOME_ListIO aList; + aSelMgr->selectedObjects( aList ); + SALOME_ListIteratorOfListIO It( aList ); + + SUIT_OverrideCursor(); + + for( ; It.More(); It.Next() ) { Handle(SALOME_InteractiveObject) anIObject = It.Value(); if ( anIObject->hasEntry() ) { - SALOMEDS::SObject_var SO = anActiveStudy->getStudyDocument()->FindObjectID( anIObject->getEntry() ); - if ( !SO->_is_nil() && QString( SO->GetID() ) == QString( SO->GetFatherComponent()->GetID() ) ) { - SALOMEDS::SComponent_var SC = SO->GetFatherComponent(); + _PTR(SObject) SO ( anActiveStudy->studyDS()->FindObjectID( anIObject->getEntry() ) ); + if ( SO && QString(SO->GetID().c_str()) == QString(SO->GetFatherComponent()->GetID().c_str()) ) { + _PTR(SComponent) SC ( SO->GetFatherComponent() ); // if component is selected listIO.Clear(); - SALOMEDS::ChildIterator_var anIter = anActiveStudy->getStudyDocument()->NewChildIterator( SO ); + _PTR(ChildIterator) anIter ( anActiveStudy->studyDS()->NewChildIterator( SO ) ); anIter->InitEx( true ); while( anIter->More() ) { - SALOMEDS::SObject_var valSO = anIter->Value(); - SALOMEDS::SObject_var refSO; + _PTR(SObject) valSO ( anIter->Value() ); + _PTR(SObject) refSO; if ( !valSO->ReferencedObject( refSO ) ) { - listIO.Append( new SALOME_InteractiveObject( valSO->GetID(), SC->ComponentDataType() ,valSO->GetName()) ); - } + listIO.Append( new SALOME_InteractiveObject(valSO->GetID().c_str(), + SC->ComponentDataType().c_str(), + valSO->GetName().c_str()) ); + } anIter->Next(); } break; @@ -270,25 +323,32 @@ void DisplayGUI::Erase() listIO.Append( anIObject ); } } - GEOM_Displayer().Erase( listIO, true ); - Sel->ClearIObjects(); + + SUIT_ViewWindow* viewWindow = app->desktop()->activeWindow(); + bool aIsForced = true; + if(viewWindow->getViewManager()->getType() == SVTK_Viewer::Type()) + aIsForced = false; + + GEOM_Displayer(anActiveStudy).Erase( listIO, aIsForced); + getGeometryGUI()->getApp()->selectionMgr()->clearSelected(); } //===================================================================================== // function : DisplayGUI::SetDisplayMode() -// purpose : Set display mode for the viewer (current viewer if - 0 ) +// purpose : Set display mode for the viewer (current viewer if - 0 ) //===================================================================================== -void DisplayGUI::SetDisplayMode( const int mode, QAD_ViewFrame* viewFrame ) +void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow ) { - QAD_WaitCursor wc; - if ( !viewFrame ) - viewFrame = QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame(); - if( viewFrame->getTypeView() == VIEW_VTK ) { - VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)viewFrame)->getRWInteractor(); - myRenderInter->SetDisplayMode( mode ); + SUIT_OverrideCursor(); + + if ( !viewWindow ) + viewWindow = getGeometryGUI()->getApp()->desktop()->activeWindow(); + if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) { + SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView(); + aView->SetDisplayMode( mode ); } - else if( viewFrame->getTypeView() == VIEW_OCC ) { - OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)viewFrame)->getViewer(); + else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { + OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); AIS_DisplayMode newmode = (mode == 1 ? AIS_Shaded : AIS_WireFrame); AIS_ListOfInteractive List; @@ -296,7 +356,7 @@ void DisplayGUI::SetDisplayMode( const int mode, QAD_ViewFrame* viewFrame ) AIS_ListOfInteractive List1; ic->ObjectsInCollector( List1 ); List.Append( List1 ); - + AIS_ListIteratorOfListOfInteractive ite( List ); while( ite.More() ) { if( ite.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) { @@ -305,26 +365,26 @@ void DisplayGUI::SetDisplayMode( const int mode, QAD_ViewFrame* viewFrame ) } ite.Next(); } - + ic->SetDisplayMode( newmode, Standard_False ); } } //===================================================================================== // function : DisplayGUI::GetDisplayMode() -// purpose : Get display mode of the viewer (current viewer if - 0 ) +// purpose : Get display mode of the viewer (current viewer if - 0 ) //===================================================================================== -int DisplayGUI::GetDisplayMode( QAD_ViewFrame* viewFrame ) +int DisplayGUI::GetDisplayMode( SUIT_ViewWindow* viewWindow ) { int dispMode = 0; - if ( !viewFrame ) - viewFrame = QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame(); - if( viewFrame->getTypeView() == VIEW_VTK) { - VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewFrame*)viewFrame)->getRWInteractor(); - dispMode = myRenderInter->GetDisplayMode(); + if ( !viewWindow ) + viewWindow = getGeometryGUI()->getApp()->desktop()->activeWindow(); + if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) { + SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView(); + dispMode = aView->GetDisplayMode(); } - else if( viewFrame->getTypeView() == VIEW_OCC) { - OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)viewFrame)->getViewer(); + else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { + OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); AIS_DisplayMode mode = (AIS_DisplayMode)ic->DisplayMode(); dispMode = (mode == AIS_WireFrame ? 0 : 1 ); @@ -335,44 +395,63 @@ int DisplayGUI::GetDisplayMode( QAD_ViewFrame* viewFrame ) //===================================================================================== // function : DisplayGUI::InvertDisplayMode() // purpose : Invert display mode ( shadin <-> wireframe ) for the viewer -// (current viewer if = 0 ) +// (current viewer if = 0 ) //===================================================================================== -void DisplayGUI::InvertDisplayMode( QAD_ViewFrame* viewFrame ) +void DisplayGUI::InvertDisplayMode( SUIT_ViewWindow* viewWindow ) { - SetDisplayMode( 1 - GetDisplayMode( viewFrame ) ); + SetDisplayMode( 1 - GetDisplayMode( viewWindow ) ); } //===================================================================================== // function : DisplayGUI::ChangeDisplayMode() // purpose : Set display mode for selected objects in the viewer given -// (current viewer if = 0 ) +// (current viewer if = 0 ) //===================================================================================== -void DisplayGUI::ChangeDisplayMode( const int mode, QAD_ViewFrame* viewFrame ) +void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow ) { - QAD_WaitCursor wc; - if ( !viewFrame ) - viewFrame = QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame(); - SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection()); - if ( viewFrame->getTypeView() == VIEW_VTK ) { - VTKViewer_RenderWindowInteractor* myRenderInter = ((VTKViewer_ViewFrame*)viewFrame)->getRWInteractor(); - SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() ); + SalomeApp_Application* app = getGeometryGUI()->getApp(); + if ( !app ) return; + + if ( !viewWindow ) + viewWindow = app->desktop()->activeWindow(); + + LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); + if ( !aSelMgr ) return; + + SUIT_OverrideCursor(); + + SALOME_ListIO aList; + + if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) { + SVTK_ViewWindow* vw = dynamic_cast( viewWindow ); + SVTK_View* aView = vw->getView(); + + aSelMgr->selectedObjects( aList ); + SALOME_ListIteratorOfListIO It( aList ); + for( ;It.More(); It.Next() ) { - VTKViewer_Prs* vtkPrs = dynamic_cast( viewFrame->CreatePrs( It.Value()->getEntry() ) ); + SVTK_Viewer* stvkViewer = dynamic_cast(vw->getViewManager()->getViewModel()); + SVTK_Prs* vtkPrs = + stvkViewer ? dynamic_cast( stvkViewer->CreatePrs( It.Value()->getEntry() ) ) : 0; if ( vtkPrs && !vtkPrs->IsNull() ) { if ( mode == 0 ) - myRenderInter->ChangeRepresentationToWireframe( vtkPrs->GetObjects() ); + aView->ChangeRepresentationToWireframe( vtkPrs->GetObjects() ); else if ( mode == 1 ) - myRenderInter->ChangeRepresentationToSurface( vtkPrs->GetObjects() ); + aView->ChangeRepresentationToSurface( vtkPrs->GetObjects() ); } } - myRenderInter->Render(); + aView->Repaint(); } - else if ( viewFrame->getTypeView() == VIEW_OCC ) { - OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)viewFrame)->getViewer(); + else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { + OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); - SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() ); + + aSelMgr->selectedObjects( aList ); + SALOME_ListIteratorOfListIO It( aList ); + for( ;It.More(); It.Next() ) { - OCCViewer_Prs* occPrs = dynamic_cast( viewFrame->CreatePrs( It.Value()->getEntry() ) ); + SOCC_Viewer* soccViewer = (SOCC_Viewer*)(viewWindow->getViewManager()->getViewModel()); + SOCC_Prs* occPrs = dynamic_cast( soccViewer->CreatePrs( It.Value()->getEntry() ) ); if ( occPrs && !occPrs->IsNull() ) { AIS_ListOfInteractive shapes; occPrs->GetObjects( shapes ); AIS_ListIteratorOfListOfInteractive interIter( shapes ); @@ -393,8 +472,11 @@ void DisplayGUI::ChangeDisplayMode( const int mode, QAD_ViewFrame* viewFrame ) //===================================================================================== extern "C" { - GEOMGUI* GetLibGUI() +#ifdef WIN32 + __declspec( dllexport ) +#endif + GEOMGUI* GetLibGUI( GeometryGUI* parent ) { - return DisplayGUI::GetDisplayGUI(); + return new DisplayGUI( parent ); } }