ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug: "rename" can be called even when there is no active viewer.

Browse Source
This commit is contained in:
asv 2005-06-17 06:05:05 +00:00
parent 987a247e12
commit 650baae06d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GEOMGUI/GeometryGUI.cxx
View File

@ -287,12 +287,15 @@ void GeometryGUI::OnGUIEvent()
void GeometryGUI::OnGUIEvent( int id ) void GeometryGUI::OnGUIEvent( int id )
{ {
SUIT_Desktop* desk = application()->desktop(); SUIT_Desktop* desk = application()->desktop();
// check if current viewframe is of OCC type
// check type of the active viewframe
SUIT_ViewWindow* window = desk->activeWindow(); SUIT_ViewWindow* window = desk->activeWindow();
bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
bool ViewVTK = ( window && window->getViewManager()->getType() == VTKViewer_Viewer::Type() ); bool ViewVTK = ( window && window->getViewManager()->getType() == VTKViewer_Viewer::Type() );
// if current viewframe is not of OCC and not of VTK type - return immediately // if current viewframe is not of OCC and not of VTK type - return immediately
if( !ViewOCC && !ViewVTK ) // fix for IPAL8958 - allow some commands to execute even when NO viewer is active (rename for example)
bool NotViewerDependentCommand = ( id == 901 );
if ( !ViewOCC && !ViewVTK && !NotViewerDependentCommand )
return; return;
// fix for IPAL9103, point 2 // fix for IPAL9103, point 2