ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-22 22:45:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to BR-D5-38-2003 branch

Browse Source
This commit is contained in:
apo 2005-09-19 11:54:23 +00:00
parent a220de08b5
commit 369e0bc8cb
4 changed files with 97 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/DisplayGUI/DisplayGUI.cxx
View File

@ -30,29 +30,28 @@
#include "GeometryGUI.h" #include "GeometryGUI.h"
#include "GEOM_Displayer.h" #include "GEOM_Displayer.h"
#include <SUIT_Desktop.h> #include "SUIT_Desktop.h"
#include <SUIT_Session.h> #include "SUIT_Session.h"
#include <SUIT_ViewWindow.h> #include "SUIT_ViewWindow.h"
#include <SUIT_OverrideCursor.h> #include "SUIT_OverrideCursor.h"
#include <VTKViewer_ViewWindow.h> #include "VTKViewer_ViewWindow.h"
#include <VTKViewer_RenderWindowInteractor.h> #include "OCCViewer_ViewManager.h"
#include <OCCViewer_ViewManager.h> #include "OCCViewer_ViewModel.h"
#include <OCCViewer_ViewModel.h> #include "OCCViewer_ViewWindow.h"
#include <OCCViewer_ViewWindow.h>
#include <SALOME_ListIteratorOfListIO.hxx> #include "SALOME_ListIteratorOfListIO.hxx"
#include <SVTK_ViewWindow.h> #include "SVTK_ViewWindow.h"
#include <SVTK_RenderWindowInteractor.h> #include "SVTK_View.h"
#include <SVTK_ViewModel.h> #include "SVTK_ViewModel.h"
#include <SOCC_ViewModel.h> #include "SOCC_ViewModel.h"
#include <SVTK_Prs.h> #include "SVTK_Prs.h"
#include <SOCC_Prs.h> #include "SOCC_Prs.h"
#include <SalomeApp_Application.h> #include "SalomeApp_Application.h"
#include <SalomeApp_SelectionMgr.h> #include "SalomeApp_SelectionMgr.h"
#include <SalomeApp_Study.h> #include "SalomeApp_Study.h"
#include <AIS_ListIteratorOfListOfInteractive.hxx> #include <AIS_ListIteratorOfListOfInteractive.hxx>
@ -339,8 +338,8 @@ void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow )
if ( !viewWindow ) if ( !viewWindow )
viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) { if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) {
VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewWindow*)viewWindow)->getRWInteractor(); SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView();
myRenderInter->SetDisplayMode( mode ); aView->SetDisplayMode( mode );
} }
else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer(); OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer();
@ -375,8 +374,8 @@ int DisplayGUI::GetDisplayMode( SUIT_ViewWindow* viewWindow )
if ( !viewWindow ) if ( !viewWindow )
viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); viewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) { if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) {
VTKViewer_RenderWindowInteractor* myRenderInter= ((VTKViewer_ViewWindow*)viewWindow)->getRWInteractor(); SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView();
dispMode = myRenderInter->GetDisplayMode(); dispMode = aView->GetDisplayMode();
} }
else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer(); OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer();
@ -419,7 +418,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) { if ( viewWindow->getViewManager()->getType() == VTKViewer_Viewer::Type() ) {
SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( viewWindow ); SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( viewWindow );
SVTK_RenderWindowInteractor* rwi = vw->getRWInteractor(); SVTK_View* aView = vw->getView();
aSelMgr->selectedObjects( aList ); aSelMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO It( aList ); SALOME_ListIteratorOfListIO It( aList );
@ -429,12 +428,12 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( It.Value()->getEntry() ) ); SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( It.Value()->getEntry() ) );
if ( vtkPrs && !vtkPrs->IsNull() ) { if ( vtkPrs && !vtkPrs->IsNull() ) {
if ( mode == 0 ) if ( mode == 0 )
rwi->ChangeRepresentationToWireframe( vtkPrs->GetObjects() ); aView->ChangeRepresentationToWireframe( vtkPrs->GetObjects() );
else if ( mode == 1 ) else if ( mode == 1 )
rwi->ChangeRepresentationToSurface( vtkPrs->GetObjects() ); aView->ChangeRepresentationToSurface( vtkPrs->GetObjects() );
} }
} }
rwi->Render(); aView->Repaint();
} }
else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { else if ( viewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer(); OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(viewWindow->getViewManager()))->getOCCViewer();

64
src/GEOMGUI/GeometryGUI_Swig.cxx
View File

@ -31,22 +31,22 @@
#include "GeometryGUI.h" #include "GeometryGUI.h"
#include <SUIT_Session.h> #include "SUIT_Session.h"
#include <SalomeApp_Application.h> #include "SalomeApp_Application.h"
#include <SalomeApp_Study.h> #include "SalomeApp_Study.h"
#include <SalomeApp_ImportOperation.h> #include "SalomeApp_ImportOperation.h"
#include <OB_Browser.h> #include "OB_Browser.h"
#include <OCCViewer_ViewWindow.h> #include "OCCViewer_ViewWindow.h"
#include <OCCViewer_ViewManager.h> #include "OCCViewer_ViewManager.h"
#include <SOCC_ViewModel.h> #include "SOCC_ViewModel.h"
#include <VTKViewer_ViewWindow.h> #include "VTKViewer_ViewWindow.h"
#include <VTKViewer_ViewModel.h> #include "VTKViewer_ViewModel.h"
#include <VTKViewer_RenderWindowInteractor.h> #include "VTKViewer_RenderWindowInteractor.h"
#include <SVTK_ViewWindow.h> #include "SVTK_ViewWindow.h"
#include <SVTK_RenderWindowInteractor.h> #include "SVTK_View.h"
#include "GEOM_Actor.h" #include "GEOM_Actor.h"
#include "GEOM_Client.hxx" #include "GEOM_Client.hxx"
@ -54,7 +54,7 @@
#include "GEOM_AssemblyBuilder.h" #include "GEOM_AssemblyBuilder.h"
#include "GEOM_InteractiveObject.hxx" #include "GEOM_InteractiveObject.hxx"
#include <SALOME_Event.hxx> #include "SALOME_Event.hxx"
#include "utilities.h" #include "utilities.h"
@ -173,10 +173,9 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry)
"GEOM", "GEOM",
const_cast<char*>( obj->GetID().c_str())); const_cast<char*>( obj->GetID().c_str()));
if (SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(app)) { if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) {
SVTK_View* aView = aViewWindow->getView();
SVTK_RenderWindowInteractor* aRenderInter= svtkViewWindow->getRWInteractor(); int aMode = aView->GetDisplayMode();
int aMode = aRenderInter->GetDisplayMode();
vtkActorCollection* theActors = vtkActorCollection* theActors =
GEOM_AssemblyBuilder::BuildActors(Shape,0,aMode,true); GEOM_AssemblyBuilder::BuildActors(Shape,0,aMode,true);
@ -185,10 +184,9 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry)
GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor); GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor);
GActor->setName(const_cast<char*>(aNameValue.c_str())); GActor->setName(const_cast<char*>(aNameValue.c_str()));
GActor->setIO(anIO); GActor->setIO(anIO);
aRenderInter->Display(GActor); aView->Display(GActor);
} }
aRenderInter->Update(); aView->Repaint();
cout << 8.2 << endl;
} else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app)) { } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app)) {
Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape) aSh =
@ -399,10 +397,10 @@ void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode)
myApp(theApp), myIO(theIO), myParam(theParam) myApp(theApp), myIO(theIO), myParam(theParam)
{} {}
virtual void Execute(){ virtual void Execute(){
if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){
SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); SVTK_View* aView = aViewWindow->getView();
myRenderInter->SetDisplayMode(myIO,myParam); aView->SetDisplayMode(myIO,myParam);
myRenderInter->Update(); aView->Repaint();
} }
else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) {
SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer ); SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer );
@ -433,10 +431,10 @@ void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue)
myApp(theApp), myIO(theIO), myParam(theParam) myApp(theApp), myIO(theIO), myParam(theParam)
{} {}
virtual void Execute(){ virtual void Execute(){
if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){
SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); SVTK_View* aView = aViewWindow->getView();
myRenderInter->SetColor(myIO,myParam); aView->SetColor(myIO,myParam);
myRenderInter->Update(); aView->Repaint();
}else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){ }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){
Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); Handle(AIS_InteractiveContext) ic = occViewer->getAISContext();
AIS_ListOfInteractive List; AIS_ListOfInteractive List;
@ -480,10 +478,10 @@ void GEOM_Swig::setTransparency(const char* theEntry, float transp)
myApp(theApp), myIO(theIO), myParam(theParam) myApp(theApp), myIO(theIO), myParam(theParam)
{} {}
virtual void Execute(){ virtual void Execute(){
if(SVTK_ViewWindow* svtkViewWindow = GetSVTKViewWindow(myApp)){ if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){
SVTK_RenderWindowInteractor* myRenderInter= svtkViewWindow->getRWInteractor(); SVTK_View* aView = aViewWindow->getView();
myRenderInter->SetTransparency(myIO,myParam); aView->SetTransparency(myIO,myParam);
myRenderInter->Update(); aView->Repaint();
}else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) {
SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer ); SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>( occViewer );
if (soccViewer) if (soccViewer)

42
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -38,28 +38,28 @@
#include "GEOM_Actor.h" #include "GEOM_Actor.h"
#include "GEOMBase.h" #include "GEOMBase.h"
#include <SALOME_ListIO.hxx> #include "SALOME_ListIO.hxx"
#include <SALOME_ListIteratorOfListIO.hxx> #include "SALOME_ListIteratorOfListIO.hxx"
#include <VTKViewer_ViewModel.h> #include "VTKViewer_ViewModel.h"
#include <OCCViewer_ViewModel.h> #include "OCCViewer_ViewModel.h"
#include <OCCViewer_ViewWindow.h> #include "OCCViewer_ViewWindow.h"
#include <SVTK_ViewWindow.h> #include "SVTK_ViewWindow.h"
#include <SVTK_RenderWindowInteractor.h> #include "SVTK_View.h"
#include <SUIT_ViewManager.h> #include "SUIT_ViewManager.h"
#include <SUIT_Application.h> #include "SUIT_Application.h"
#include <SUIT_Desktop.h> #include "SUIT_Desktop.h"
#include <SUIT_ResourceMgr.h> #include "SUIT_ResourceMgr.h"
#include <SUIT_Session.h> #include "SUIT_Session.h"
#include <SUIT_OverrideCursor.h> #include "SUIT_OverrideCursor.h"
#include <SUIT_MessageBox.h> #include "SUIT_MessageBox.h"
#include <SalomeApp_Application.h> #include "SalomeApp_Application.h"
#include <SalomeApp_SelectionMgr.h> #include "SalomeApp_SelectionMgr.h"
#include <SalomeApp_Study.h> #include "SalomeApp_Study.h"
#include <SalomeApp_Module.h> #include "SalomeApp_Module.h"
#include "SALOMEDSClient.hxx" #include "SALOMEDSClient.hxx"
@ -236,13 +236,13 @@ void GEOMToolsGUI::OnColor()
SVTK_ViewWindow* vtkVW = dynamic_cast<SVTK_ViewWindow*>( window ); SVTK_ViewWindow* vtkVW = dynamic_cast<SVTK_ViewWindow*>( window );
if ( !vtkVW ) if ( !vtkVW )
return; return;
SVTK_RenderWindowInteractor* rwi = vtkVW->getRWInteractor(); SVTK_View* aView = vtkVW->getView();
QColor initcolor = rwi->GetColor( selected.First() ); QColor initcolor = aView->GetColor( selected.First() );
QColor c = QColorDialog::getColor( QColor(), app->desktop() ); QColor c = QColorDialog::getColor( QColor(), app->desktop() );
if ( c.isValid() ) { if ( c.isValid() ) {
SUIT_OverrideCursor(); SUIT_OverrideCursor();
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
rwi->SetColor( It.Value(), c ); aView->SetColor( It.Value(), c );
} }
} }
} // if ( isVTK ) } // if ( isVTK )

38
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
View File

@ -30,25 +30,25 @@
#include "GEOMBase.h" #include "GEOMBase.h"
#include "GEOM_AISShape.hxx" #include "GEOM_AISShape.hxx"
#include <SALOME_ListIO.hxx> #include "SALOME_ListIO.hxx"
#include <SALOME_ListIteratorOfListIO.hxx> #include "SALOME_ListIteratorOfListIO.hxx"
#include <VTKViewer_ViewModel.h> #include "VTKViewer_ViewModel.h"
#include <OCCViewer_ViewModel.h> #include "OCCViewer_ViewModel.h"
#include <OCCViewer_ViewWindow.h> #include "OCCViewer_ViewWindow.h"
#include <SVTK_ViewWindow.h> #include "SVTK_ViewWindow.h"
#include <SVTK_RenderWindowInteractor.h> #include "SVTK_View.h"
#include <SUIT_ViewManager.h> #include "SUIT_ViewManager.h"
#include <SUIT_Application.h> #include "SUIT_Application.h"
#include <SUIT_Desktop.h> #include "SUIT_Desktop.h"
#include <SUIT_ResourceMgr.h> #include "SUIT_ResourceMgr.h"
#include <SUIT_Session.h> #include "SUIT_Session.h"
#include <SUIT_OverrideCursor.h> #include "SUIT_OverrideCursor.h"
#include <SalomeApp_Application.h> #include "SalomeApp_Application.h"
#include <SalomeApp_SelectionMgr.h> #include "SalomeApp_SelectionMgr.h"
#include <qframe.h> #include <qframe.h>
#include <qlabel.h> #include <qlabel.h>
@ -205,19 +205,19 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged( int newValue )
SVTK_ViewWindow* vtkVW = dynamic_cast<SVTK_ViewWindow*>( window ); SVTK_ViewWindow* vtkVW = dynamic_cast<SVTK_ViewWindow*>( window );
if ( !vtkVW ) if ( !vtkVW )
return; return;
SVTK_RenderWindowInteractor* rwi = vtkVW->getRWInteractor(); SVTK_View* aView = vtkVW->getView();
if ( myFirstInit ) { if ( myFirstInit ) {
myFirstInit = false; myFirstInit = false;
float transp = (rwi->GetTransparency(FirstIOS))*10.0; float transp = (aView->GetTransparency(FirstIOS))*10.0;
mySlider->setValue(int(transp)); mySlider->setValue(int(transp));
return; return;
} }
SUIT_OverrideCursor(); SUIT_OverrideCursor();
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { 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 ) } // if ( isVTK )
else if ( isOCC ) { else if ( isOCC ) {