The default methods of selection management are moved to SMESHGUI

diff --git a/src/SalomeApp/SalomeApp_Operation.cxx b/src/SalomeApp/SalomeApp_Operation.cxx
index 87be9e7866b8d09a13df47cbbc1eecbd6ec56bb7..7592d37167916776decb00ea63e92a443c1232fc 100755 (executable)
--- a/src/SalomeApp/SalomeApp_Operation.cxx
+++ b/src/SalomeApp/SalomeApp_Operation.cxx
@@ -12,13 +12,10 @@
 #include <SalomeApp_Module.h>
 #include <SalomeApp_Application.h>
 #include <SalomeApp_Operation.h>
-#include <SalomeApp_DataOwner.h>
-#include <SalomeApp_DataSubOwner.h>
 #include <SalomeApp_SelectionMgr.h>
 
 #include <SUIT_Desktop.h>
 
-
 /*
   Class       : SalomeApp_Operation
   Description : Base class for all operations
@@ -208,46 +205,6 @@ bool SalomeApp_Operation::eventFilter( QObject* obj, QEvent* e )
   return SUIT_Operation::eventFilter( obj, e );
 }
 
-//=======================================================================
-// name    : type
-// Purpose : Find type by entry
-//=======================================================================
-int SalomeApp_Operation::type( const QString& ) const
-{
-  return -1;
-}
-
-//=======================================================================
-// name    : selected
-// Purpose : Get names, types and entries of selected objects
-//=======================================================================
-void SalomeApp_Operation::selected( QStringList& names, SalomeApp_Dialog::TypesList& types, QStringList& entries ) const
-{
-  SUIT_DataOwnerPtrList list; selectionMgr()->selected( list );
-  SUIT_DataOwnerPtrList::const_iterator anIt = list.begin(),
-                                        aLast = list.end();
-  for( ; anIt!=aLast; anIt++ )
-  {
-    SalomeApp_DataOwner* owner = dynamic_cast<SalomeApp_DataOwner*>( (*anIt).operator->() );
-    SalomeApp_DataSubOwner* subowner = dynamic_cast<SalomeApp_DataSubOwner*>( (*anIt).operator->() );
-    
-    if( subowner )
-    {
-      QString entry = QString( "%1#%2" ).arg( subowner->entry() ).arg( subowner->index() );
-      entries.append( entry );
-      types.append( type( entry ) );
-      names.append( QString( "%1" ).arg( subowner->index() ) );
-    }
-    
-    if( owner )
-    {
-      QString entry = owner->entry();
-      entries.append( entry );
-      types.append( type( entry ) );
-      names.append( owner->IO()->getName() );
-    }
-  }
-}
 //=======================================================================
 // name    : eventFilter
 // Purpose : Block mouse and key events if operator is not active one
@@ -257,3 +214,4 @@ void SalomeApp_Operation::update( const int flags )
   if ( myModule != 0 )
     myModule->update( flags );
 }
+

diff --git a/src/SalomeApp/SalomeApp_Operation.h b/src/SalomeApp/SalomeApp_Operation.h
index fbc2e74564c510cfb908cb7fe7bf81aa9ee879cb..82b8176b2b403899229728c908776f9f654737b9 100755 (executable)
--- a/src/SalomeApp/SalomeApp_Operation.h
+++ b/src/SalomeApp/SalomeApp_Operation.h
@@ -91,17 +91,7 @@ protected:
 
   void                      update( const int );
   // Call update() method of module ( see SalomeApp_Module for description )
-  
-
-  
- 
-  virtual void              selected( QStringList&, SalomeApp_Dialog::TypesList&, QStringList& ) const;
-  // Get names, types and entries of selected objects
-
-  virtual int               type( const QString& ) const;
-  // Find type by entry: default implementation is to return -1
-  // Please redefine it if you want function "selected" to work correctly
-    
+      
 private slots:
 
   virtual void              onSelectionDone();