ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-26 09:07:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

Join BR-D5-38-2003

Browse Source
This commit is contained in:
apo 2006-01-20 06:56:23 +00:00
parent a74ed19770
commit c427016e04
6 changed files with 57 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/DisplayGUI/DisplayGUI.cxx
View File

@ -42,7 +42,7 @@
#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>
@ -348,10 +348,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() == SVTK_Viewer::Type() ) { if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
SVTK_ViewWindow* wnd = dynamic_cast<SVTK_ViewWindow*>( viewWindow ); SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView();
SVTK_RenderWindowInteractor* myRenderInter = wnd ? wnd->getRWInteractor() : 0; aView->SetDisplayMode( mode );
if( myRenderInter )
myRenderInter->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();
@ -386,10 +384,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() == SVTK_Viewer::Type() ) { if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
SVTK_ViewWindow* wnd = dynamic_cast<SVTK_ViewWindow*>( viewWindow ); SVTK_View* aView = ((SVTK_ViewWindow*)viewWindow)->getView();
SVTK_RenderWindowInteractor* myRenderInter = wnd ? wnd->getRWInteractor() : 0; dispMode = aView->GetDisplayMode();
if( myRenderInter )
dispMode = myRenderInter->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();
@ -432,10 +428,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) { if ( viewWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( viewWindow ); SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( viewWindow );
SVTK_RenderWindowInteractor* rwi = vw ? vw->getRWInteractor() : 0; SVTK_View* aView = vw->getView();
if( !rwi )
return;
aSelMgr->selectedObjects( aList ); aSelMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO It( aList ); SALOME_ListIteratorOfListIO It( aList );
@ -445,12 +438,12 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
SVTK_Prs* vtkPrs = stvkViewer ? dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( It.Value()->getEntry() ) ) : 0; SVTK_Prs* vtkPrs = stvkViewer ? dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( It.Value()->getEntry() ) ) : 0;
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();

59
src/GEOMGUI/GeometryGUI_Swig.cxx
View File

@ -31,20 +31,20 @@
#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 <SVTK_ViewModel.h> #include "SVTK_ViewModel.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"
@ -52,7 +52,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"
@ -180,10 +180,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);
@ -192,9 +191,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();
} 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 =
@ -405,10 +404,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 );
@ -439,10 +438,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;
@ -486,10 +485,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)

12
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -38,12 +38,12 @@
#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 <SVTK_ViewModel.h> #include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <SVTK_ViewWindow.h>
#include <SVTK_RenderWindowInteractor.h> #include <SVTK_View.h>
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewWindow.h> #include <OCCViewer_ViewWindow.h>
@ -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 )

14
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
View File

@ -30,12 +30,12 @@
#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 <SVTK_ViewModel.h> #include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <SVTK_ViewWindow.h>
#include <SVTK_RenderWindowInteractor.h> #include <SVTK_View.h>
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewWindow.h> #include <OCCViewer_ViewWindow.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 ) {

12
src/OBJECT/GEOM_VTKTrihedron.cxx
View File

@ -207,7 +207,6 @@ GEOM_VTKTrihedron::GEOM_VTKTrihedron()
{ {
myMapper = vtkPolyDataMapper::New(); myMapper = vtkPolyDataMapper::New();
myAxis[ 0 ] = myAxis[ 1 ] = myAxis[ 2 ] = 0; myAxis[ 0 ] = myAxis[ 1 ] = myAxis[ 2 ] = 0;
myPresent = vtkActorCollection::New();
mySize = 100; mySize = 100;
SetInfinitive( true ); SetInfinitive( true );
myColor[ 0 ] = myColor[ 1 ] = myColor[ 1 ] = -1; myColor[ 0 ] = myColor[ 1 ] = myColor[ 1 ] = -1;
@ -216,8 +215,6 @@ GEOM_VTKTrihedron::GEOM_VTKTrihedron()
GEOM_VTKTrihedron::~GEOM_VTKTrihedron() GEOM_VTKTrihedron::~GEOM_VTKTrihedron()
{ {
myPresent->RemoveAllItems();
myPresent->Delete();
for ( int i = 0; i < 3; i++ ) for ( int i = 0; i < 3; i++ )
myAxis[i]->Delete(); myAxis[i]->Delete();
@ -285,9 +282,12 @@ void GEOM_VTKTrihedron::AddToRender( vtkRenderer* theRenderer )
void GEOM_VTKTrihedron::RemoveFromRender( vtkRenderer* theRenderer ) void GEOM_VTKTrihedron::RemoveFromRender( vtkRenderer* theRenderer )
{ {
myPresent->InitTraversal(); for(int i = 0; i < 3; i++)
while(vtkActor* anActor = myPresent->GetNextActor()) {
theRenderer->RemoveActor(anActor); myAxis[i]->RemoveFromRender(theRenderer);
}
theRenderer->RemoveActor( this );
} }
int GEOM_VTKTrihedron::GetVisibleActorCount(vtkRenderer* theRenderer) int GEOM_VTKTrihedron::GetVisibleActorCount(vtkRenderer* theRenderer)

1
src/OBJECT/GEOM_VTKTrihedron.hxx
View File

@ -89,7 +89,6 @@ public:
virtual bool hasHighlight() { return false; } virtual bool hasHighlight() { return false; }
protected: protected:
vtkActorCollection* myPresent;
VTKViewer_Axis* myAxis[3]; VTKViewer_Axis* myAxis[3];
vtkPolyDataMapper* myMapper; vtkPolyDataMapper* myMapper;
float mySize; float mySize;