From: asl <asl@opencascade.com>
Date: Wed, 14 Dec 2005 06:44:19 +0000 (+0000)
Subject: PAL10810 - "Display", "Erase", "Display only" on root objects
X-Git-Tag: T_Before_Join_BR_3_1_0deb~18
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=bfcd70d78ac79ac98ef25f9ddc5d7a2fb1263321

PAL10810 - "Display", "Erase", "Display only" on root objects
---

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 228689dfe..ae96d893d 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1176,39 +1176,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
       if( theCommandID==302 )
 	startOperation( myEraseAll );
 
-      SALOME_ListIteratorOfListIO anIt( sel_objects );
-      for( ; anIt.More(); anIt.Next() )
-      {
-	Handle( SALOME_InteractiveObject ) obj = anIt.Value();
-	if( obj->hasEntry() )
-	{
-	  _PTR(SObject) SO = activeStudy()->studyDS()->FindObjectID( obj->getEntry() );
-	  if( SO && QString( SO->GetID().c_str() ) == SO->GetFatherComponent()->GetID().c_str() )
-	  { //component is selected
-	    _PTR(SComponent) SC( SO->GetFatherComponent() );
-	    _PTR(ChildIterator) anIter ( activeStudy()->studyDS()->NewChildIterator( SC ) );
-	    anIter->InitEx( true );
-	    while( anIter->More() )
-	    {
-	      _PTR(SObject) valSO ( anIter->Value() );
-	      _PTR(SObject) refSO;
-	      if( !valSO->ReferencedObject( refSO ) )
-	      {
-		QString id = valSO->GetID().c_str(),
-                        comp = SC->ComponentDataType().c_str(),
-		        val = valSO->GetName().c_str();
-
-		Handle( SALOME_InteractiveObject ) new_obj =
-		  new SALOME_InteractiveObject( id.latin1(), comp.latin1(), val.latin1() );
-		to_process.Append( new_obj );
-	      }
-	      anIter->Next();
-	    }
-	    continue;
-	  }
-	}
-	to_process.Append( obj );
-      }
+      extractContainers( sel_objects, to_process );
 
       if (vtkwnd) {
 	SALOME_ListIteratorOfListIO It( to_process );
diff --git a/src/StdMeshersGUI/Makefile.in b/src/StdMeshersGUI/Makefile.in
index d82897944..ebfb745fc 100644
--- a/src/StdMeshersGUI/Makefile.in
+++ b/src/StdMeshersGUI/Makefile.in
@@ -61,6 +61,7 @@ LIB_CLIENT_IDL = \
 ## pb in dependencies search
 LIB_CLIENT_IDL += \
 	SALOME_GenericObj.idl \
+	SALOME_ContainerManager.idl \
 	SALOME_Component.idl \
 	GEOM_Gen.idl