From: akl Date: Thu, 2 Apr 2015 09:25:26 +0000 (+0400) Subject: INT PAL 52638: "Hide All" operation doesn't work in the SALOME OCC and VTK viewers... X-Git-Tag: V7_6_0a1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=05e7d19c5e022e02203e944dd4823c044aeb4a8d;p=modules%2Fgui.git INT PAL 52638: "Hide All" operation doesn't work in the SALOME OCC and VTK viewers when PARAVIS module is active. --- diff --git a/src/LightApp/LightApp_ShowHideOp.cxx b/src/LightApp/LightApp_ShowHideOp.cxx index b001bb4a2..2b8ae4ad5 100644 --- a/src/LightApp/LightApp_ShowHideOp.cxx +++ b/src/LightApp/LightApp_ShowHideOp.cxx @@ -78,22 +78,6 @@ void LightApp_ShowHideOp::startOperation() return; } - QString mod_name; - if( sel->count()>0 ) - { - QString aStr = sel->parameter( 0, "displayer" ).toString(); - mod_name = app->moduleTitle( aStr ); - } - else if( app->activeModule() ) - mod_name = app->moduleTitle( app->activeModule()->name() ); - - LightApp_Displayer* d = LightApp_Displayer::FindDisplayer( mod_name, true ); - if( !d ) - { - abort(); - return; - } - if( myActionType==DISPLAY_ONLY || myActionType==ERASE_ALL ) { //ERASE ALL @@ -108,12 +92,30 @@ void LightApp_ShowHideOp::startOperation() } if( myActionType==ERASE_ALL ) { - d->UpdateViewer(); + // Temporary displayer just to update viewer! + LightApp_Displayer ld; + ld.UpdateViewer(); commit(); return; } } + QString mod_name; + if( sel->count()>0 ) + { + QString aStr = sel->parameter( 0, "displayer" ).toString(); + mod_name = app->moduleTitle( aStr ); + } + else if( app->activeModule() ) + mod_name = app->moduleTitle( app->activeModule()->name() ); + + LightApp_Displayer* d = LightApp_Displayer::FindDisplayer( mod_name, true ); + if( !d ) + { + abort(); + return; + } + QStringList entries; #ifndef DISABLE_SALOMEOBJECT