From: admin Date: Tue, 18 Oct 2005 14:49:46 +0000 (+0000) Subject: This commit was generated by cvs2git to create tag X-Git-Tag: BR-D5-38-2003_D2005-12-19 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e285bd2ed171e0d04a9ec26bea5ba4554d908359;p=modules%2Fgeom.git This commit was generated by cvs2git to create tag 'BR-D5-38-2003_D2005-12-19'. Sprout from master 2005-10-18 14:49:45 UTC smh 'Preparation of 3.1.0a2: version ID.' Cherrypick from BR-D5-38-2003 2005-09-19 11:54:23 UTC apo 'Porting to BR-D5-38-2003 branch': src/DisplayGUI/DisplayGUI.cxx src/GEOMGUI/GeometryGUI_Swig.cxx src/GEOMToolsGUI/GEOMToolsGUI_1.cxx src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx --- diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index 6f337597d..1d7aa473c 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -30,27 +30,28 @@ #include "GeometryGUI.h" #include "GEOM_Displayer.h" -#include -#include -#include -#include +#include "SUIT_Desktop.h" +#include "SUIT_Session.h" +#include "SUIT_ViewWindow.h" +#include "SUIT_OverrideCursor.h" -#include -#include -#include +#include "VTKViewer_ViewWindow.h" +#include "OCCViewer_ViewManager.h" +#include "OCCViewer_ViewModel.h" +#include "OCCViewer_ViewWindow.h" -#include +#include "SALOME_ListIteratorOfListIO.hxx" -#include -#include -#include -#include -#include -#include +#include "SVTK_ViewWindow.h" +#include "SVTK_View.h" +#include "SVTK_ViewModel.h" +#include "SOCC_ViewModel.h" +#include "SVTK_Prs.h" +#include "SOCC_Prs.h" -#include -#include -#include +#include "SalomeApp_Application.h" +#include "SalomeApp_SelectionMgr.h" +#include "SalomeApp_Study.h" #include @@ -103,21 +104,17 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) { myDisplayGUI->InvertDisplayMode(); int newMode = myDisplayGUI->GetDisplayMode(); - 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") ); + 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; } @@ -133,7 +130,6 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) } case 216: // MENU VIEW - DISPLAY { - getGeometryGUI()->EmitSignalDeactivateDialog(); myDisplayGUI->Display(); break; } @@ -202,7 +198,7 @@ void DisplayGUI::EraseAll() SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ); SUIT_ViewManager* vman = vw->getViewManager(); if ( vman->getType() == OCCViewer_Viewer::Type() || - vman->getType() == SVTK_Viewer::Type() ) { + vman->getType() == VTKViewer_Viewer::Type() ) { GEOM_Displayer( appStudy ).EraseAll(); } } @@ -341,11 +337,9 @@ void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow ) if ( !viewWindow ) viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); - if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) { - SVTK_ViewWindow* wnd = dynamic_cast( viewWindow ); - SVTK_RenderWindowInteractor* myRenderInter = wnd ? wnd->getRWInteractor() : 0; - if( myRenderInter ) - myRenderInter->SetDisplayMode( mode ); + if ( viewWindow->getViewManager()->getType() == VTKViewer_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(); @@ -379,11 +373,9 @@ int DisplayGUI::GetDisplayMode( SUIT_ViewWindow* viewWindow ) int dispMode = 0; if ( !viewWindow ) viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); - if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) { - SVTK_ViewWindow* wnd = dynamic_cast( viewWindow ); - SVTK_RenderWindowInteractor* myRenderInter = wnd ? wnd->getRWInteractor() : 0; - if( myRenderInter ) - dispMode = myRenderInter->GetDisplayMode(); + if ( viewWindow->getViewManager()->getType() == VTKViewer_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(); @@ -424,27 +416,24 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow SALOME_ListIO aList; - if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) { + if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) { SVTK_ViewWindow* vw = dynamic_cast( viewWindow ); - SVTK_RenderWindowInteractor* rwi = vw ? vw->getRWInteractor() : 0; - - if( !rwi ) - return; + SVTK_View* aView = vw->getView(); aSelMgr->selectedObjects( aList ); SALOME_ListIteratorOfListIO It( aList ); for( ;It.More(); It.Next() ) { - SVTK_Viewer* stvkViewer = dynamic_cast(vw->getViewManager()->getViewModel()); - SVTK_Prs* vtkPrs = stvkViewer ? dynamic_cast( stvkViewer->CreatePrs( It.Value()->getEntry() ) ) : 0; + SVTK_Viewer* stvkViewer = (SVTK_Viewer*)(vw->getViewManager()->getViewModel()); + SVTK_Prs* vtkPrs = dynamic_cast( stvkViewer->CreatePrs( It.Value()->getEntry() ) ); 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(); diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx index f5f82f8f2..e257776b2 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.cxx +++ b/src/GEOMGUI/GeometryGUI_Swig.cxx @@ -31,20 +31,22 @@ #include "GeometryGUI.h" -#include -#include -#include -#include +#include "SUIT_Session.h" +#include "SalomeApp_Application.h" +#include "SalomeApp_Study.h" +#include "SalomeApp_ImportOperation.h" -#include +#include "OB_Browser.h" -#include -#include -#include +#include "OCCViewer_ViewWindow.h" +#include "OCCViewer_ViewManager.h" +#include "SOCC_ViewModel.h" -#include -#include -#include +#include "VTKViewer_ViewWindow.h" +#include "VTKViewer_ViewModel.h" +#include "VTKViewer_RenderWindowInteractor.h" +#include "SVTK_ViewWindow.h" +#include "SVTK_View.h" #include "GEOM_Actor.h" #include "GEOM_Client.hxx" @@ -52,7 +54,7 @@ #include "GEOM_AssemblyBuilder.h" #include "GEOM_InteractiveObject.hxx" -#include +#include "SALOME_Event.hxx" #include "utilities.h" @@ -96,7 +98,7 @@ inline OCCViewer_Viewer* GetOCCViewer(SUIT_Application* theApp){ inline SVTK_ViewWindow* GetSVTKViewWindow(SUIT_Application* theApp){ SUIT_ViewWindow* window = theApp->desktop()->activeWindow(); - if(window && window->getViewManager()->getType() == SVTK_Viewer::Type()) + if(window && window->getViewManager()->getType() == VTKViewer_Viewer::Type()) return dynamic_cast( window ); return 0; @@ -171,10 +173,9 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry) "GEOM", const_cast( obj->GetID().c_str())); - if (SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(app)) { - - SVTK_RenderWindowInteractor* aRenderInter= svtkViewWindow->getRWInteractor(); - int aMode = aRenderInter->GetDisplayMode(); + if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) { + SVTK_View* aView = aViewWindow->getView(); + int aMode = aView->GetDisplayMode(); vtkActorCollection* theActors = GEOM_AssemblyBuilder::BuildActors(Shape,0,aMode,true); @@ -183,10 +184,9 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry) GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor); GActor->setName(const_cast(aNameValue.c_str())); GActor->setIO(anIO); - aRenderInter->Display(GActor); + aView->Display(GActor); } - aRenderInter->Update(); - cout << 8.2 << endl; + aView->Repaint(); } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app)) { Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); Handle(GEOM_AISShape) aSh = @@ -397,10 +397,10 @@ void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode) myApp(theApp), myIO(theIO), myParam(theParam) {} virtual void Execute(){ - if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ - SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); - myRenderInter->SetDisplayMode(myIO,myParam); - myRenderInter->Update(); + if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){ + SVTK_View* aView = aViewWindow->getView(); + aView->SetDisplayMode(myIO,myParam); + aView->Repaint(); } else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { SOCC_Viewer* soccViewer = dynamic_cast( occViewer ); @@ -431,10 +431,10 @@ void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue) myApp(theApp), myIO(theIO), myParam(theParam) {} virtual void Execute(){ - if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ - SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); - myRenderInter->SetColor(myIO,myParam); - myRenderInter->Update(); + if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){ + SVTK_View* aView = aViewWindow->getView(); + aView->SetColor(myIO,myParam); + aView->Repaint(); }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){ Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); AIS_ListOfInteractive List; @@ -478,10 +478,10 @@ void GEOM_Swig::setTransparency(const char* theEntry, float transp) myApp(theApp), myIO(theIO), myParam(theParam) {} virtual void Execute(){ - if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ - SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); - myRenderInter->SetTransparency(myIO,myParam); - myRenderInter->Update(); + if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){ + SVTK_View* aView = aViewWindow->getView(); + aView->SetTransparency(myIO,myParam); + aView->Repaint(); }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { SOCC_Viewer* soccViewer = dynamic_cast( occViewer ); if (soccViewer) diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 8c2d26030..6afcf7a4b 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -38,28 +38,28 @@ #include "GEOM_Actor.h" #include "GEOMBase.h" -#include -#include +#include "SALOME_ListIO.hxx" +#include "SALOME_ListIteratorOfListIO.hxx" -#include -#include -#include +#include "VTKViewer_ViewModel.h" +#include "OCCViewer_ViewModel.h" +#include "OCCViewer_ViewWindow.h" -#include -#include +#include "SVTK_ViewWindow.h" +#include "SVTK_View.h" -#include -#include -#include -#include -#include -#include -#include +#include "SUIT_ViewManager.h" +#include "SUIT_Application.h" +#include "SUIT_Desktop.h" +#include "SUIT_ResourceMgr.h" +#include "SUIT_Session.h" +#include "SUIT_OverrideCursor.h" +#include "SUIT_MessageBox.h" -#include -#include -#include -#include +#include "SalomeApp_Application.h" +#include "SalomeApp_SelectionMgr.h" +#include "SalomeApp_Study.h" +#include "SalomeApp_Module.h" #include "SALOMEDSClient.hxx" @@ -100,7 +100,7 @@ void GEOMToolsGUI::OnSettingsColor() if( aDialogColor.isValid() ) { QString type = desk->activeWindow()->getViewManager()->getType(); - if( type != OCCViewer_Viewer::Type() && type != SVTK_Viewer::Type() ) + if( type != OCCViewer_Viewer::Type() && type != VTKViewer_Viewer::Type() ) MESSAGE("Settings Color is not supported for current Viewer"); resMgr->setValue( "Geometry", "SettingsShadingColor", aDialogColor ); @@ -231,18 +231,18 @@ void GEOMToolsGUI::OnColor() if ( !selected.IsEmpty() ) { SUIT_ViewWindow* window = app->desktop()->activeWindow(); bool isOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); - bool isVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() ); + bool isVTK = ( window && window->getViewManager()->getType() == VTKViewer_Viewer::Type() ); if ( isVTK ) { SVTK_ViewWindow* vtkVW = dynamic_cast( window ); if ( !vtkVW ) return; - SVTK_RenderWindowInteractor* rwi = vtkVW->getRWInteractor(); - QColor initcolor = rwi->GetColor( selected.First() ); + SVTK_View* aView = vtkVW->getView(); + QColor initcolor = aView->GetColor( selected.First() ); QColor c = QColorDialog::getColor( QColor(), app->desktop() ); if ( c.isValid() ) { SUIT_OverrideCursor(); for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { - rwi->SetColor( It.Value(), c ); + aView->SetColor( It.Value(), c ); } } } // if ( isVTK ) diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx index eb642a433..e7e255183 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx @@ -30,25 +30,25 @@ #include "GEOMBase.h" #include "GEOM_AISShape.hxx" -#include -#include +#include "SALOME_ListIO.hxx" +#include "SALOME_ListIteratorOfListIO.hxx" -#include -#include -#include +#include "VTKViewer_ViewModel.h" +#include "OCCViewer_ViewModel.h" +#include "OCCViewer_ViewWindow.h" -#include -#include +#include "SVTK_ViewWindow.h" +#include "SVTK_View.h" -#include -#include -#include -#include -#include -#include +#include "SUIT_ViewManager.h" +#include "SUIT_Application.h" +#include "SUIT_Desktop.h" +#include "SUIT_ResourceMgr.h" +#include "SUIT_Session.h" +#include "SUIT_OverrideCursor.h" -#include -#include +#include "SalomeApp_Application.h" +#include "SalomeApp_SelectionMgr.h" #include #include @@ -199,25 +199,25 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged( int newValue ) SUIT_ViewWindow* window = app->desktop()->activeWindow(); bool isOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); - bool isVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() ); + bool isVTK = ( window && window->getViewManager()->getType() == VTKViewer_Viewer::Type() ); if ( isVTK ) { SVTK_ViewWindow* vtkVW = dynamic_cast( window ); if ( !vtkVW ) return; - SVTK_RenderWindowInteractor* rwi = vtkVW->getRWInteractor(); + SVTK_View* aView = vtkVW->getView(); if ( myFirstInit ) { myFirstInit = false; - float transp = (rwi->GetTransparency(FirstIOS))*10.0; + float transp = (aView->GetTransparency(FirstIOS))*10.0; mySlider->setValue(int(transp)); return; } SUIT_OverrideCursor(); for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { - rwi->SetTransparency( It.Value(), newValue/10.0 ); + aView->SetTransparency( It.Value(), newValue/10.0 ); } - rwi->Render(); + aView->Repaint(); } // if ( isVTK ) else if ( isOCC ) {