add SVTK resources

[modules/gui.git] / src / LightApp / LightApp_ShowHideOp.cxx

diff --git a/src/LightApp/LightApp_ShowHideOp.cxx b/src/LightApp/LightApp_ShowHideOp.cxx
index 6d2ae9d566a0e8b210abbdc53356789340233cdc..525d9f8428845feff9be0447264b704071a6170b 100644 (file)
--- a/src/LightApp/LightApp_ShowHideOp.cxx
+++ b/src/LightApp/LightApp_ShowHideOp.cxx
@@ -3,6 +3,7 @@
 #include "LightApp_Application.h"
 #include "LightApp_DataOwner.h"
 #include "LightApp_Module.h"
+#include "LightApp_Study.h"
 #include "LightApp_Displayer.h"
 #include "CAM_Study.h"
 
@@ -25,7 +26,8 @@ LightApp_ShowHideOp::~LightApp_ShowHideOp()
 void LightApp_ShowHideOp::startOperation()
 {
   LightApp_Application* app = dynamic_cast<LightApp_Application*>( application() );
-  if( !app )
+  LightApp_Study* study = app ? dynamic_cast<LightApp_Study*>( app->activeStudy() ) : 0;
+  if( !app || !study )
   {
     abort();
     return;
@@ -33,48 +35,64 @@ void LightApp_ShowHideOp::startOperation()
 
   LightApp_SelectionMgr* mgr = app->selectionMgr();
   LightApp_Selection sel; sel.init( "", mgr );
-  if( sel.count()==0 )
+  if( sel.count()==0 && myActionType!=ERASE_ALL )
   {
     abort();
     return;
   }
   QString aStr =  sel.param( 0, "component" ).toString();
   QString mod_name = app->moduleTitle( aStr );//sel.param( 0, "component" ).toString() );
-  LightApp_Module* m = dynamic_cast<LightApp_Module*>( app ? app->module( mod_name ) : 0 );
-  if( !m )
-  {
-    m = dynamic_cast<LightApp_Module*>( app->loadModule( mod_name ) );
-    app->addModule( m );
-    m->connectToStudy( dynamic_cast<CAM_Study*>( app->activeStudy() ) );
-    m->setMenuShown( false );
-    m->setToolShown( false );
-  }
-
-  LightApp_Displayer* d = m ? m->displayer(): 0;
+  LightApp_Displayer* d = LightApp_Displayer::FindDisplayer( mod_name, true );
   if( !d )
   {
     abort();
     return;
   }
 
-  if( myActionType==DISPLAY_ONLY )
-    d->EraseAll( false, false, 0 );
+  if( myActionType==DISPLAY_ONLY || myActionType==ERASE_ALL )
+  {
+    //ERASE ALL
+    QStringList comps;
+    study->components( comps );
+    QStringList::const_iterator anIt = comps.begin(), aLast = comps.end();
+    for( ; anIt!=aLast; anIt++ )
+    {
+      LightApp_Displayer* disp = LightApp_Displayer::FindDisplayer( app->moduleTitle( *anIt ), true );
+      if( disp )
+       disp->EraseAll( false, false, 0 );
+    }
+    if( myActionType==ERASE_ALL )
+    {
+      d->UpdateViewer();
+      commit();
+      return;
+    }
+  }
 
   SALOME_ListIO selObjs;
   mgr->selectedObjects( selObjs );
+
+  QStringList entries;
   SALOME_ListIteratorOfListIO anIt( selObjs );
   for( ; anIt.More(); anIt.Next() )
   {
     if( anIt.Value().IsNull() )
-
       continue;
 
+    if( study->isComponent( anIt.Value()->getEntry() ) )
+      study->children( anIt.Value()->getEntry(), entries );
+    else
+      entries.append( anIt.Value()->getEntry() );
+  }
+
+  for( QStringList::const_iterator it = entries.begin(), last = entries.end(); it!=last; it++ )
+  {
+    QString e = study->referencedToEntry( *it );
     if( myActionType==DISPLAY || myActionType==DISPLAY_ONLY )
-      d->Display( anIt.Value()->getEntry(), false, 0 );
+      d->Display( e, false, 0 );
     else if( myActionType==ERASE )
-      d->Erase( anIt.Value()->getEntry(), false, false, 0 );
+      d->Erase( e, false, false, 0 );
   }
   d->UpdateViewer();
   commit();
 }
-