X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Selection.h;h=5e4b672bc7b09a5419251749045322611eb28f6e;hb=1be01557bbce2ce45f8f7e1cfce412005aa8e349;hp=f766841d6edea79f9134a863816e55bd52b400ad;hpb=a2686c838648dcf05659df3c31d9b90aca42b792;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Selection.h b/src/XGUI/XGUI_Selection.h
index f766841d6..5e4b672bc 100644
--- a/src/XGUI/XGUI_Selection.h
+++ b/src/XGUI/XGUI_Selection.h
@@ -21,6 +21,7 @@
 #include <SelectMgr_IndexedMapOfOwner.hxx>
 
 class XGUI_Workshop;
+class Handle_SelectMgr_EntityOwner;
 
 /**
 * \ingroup GUI
@@ -34,20 +35,26 @@ class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
   XGUI_Selection(XGUI_Workshop* theWorkshop);
 
   /// Returns a list of viewer selected presentations
-  /// \param theShapeTypeToSkip the shapes with this type will be skipped during the result list build
   /// \return list of presentations
-  virtual QList<ModuleBase_ViewerPrs> getSelected(int theShapeTypeToSkip = -1) const;
+  virtual QList<ModuleBase_ViewerPrs> getSelected(const SelectionPlace& thePlace = Browser) const;
+
+  /// Fills the viewer presentation parameters by the parameters from the owner
+  /// \param thePrs a container for selection
+  /// \param theOwner a selection owner
+  virtual void fillPresentation(ModuleBase_ViewerPrs& thePrs,
+                                const Handle_SelectMgr_EntityOwner& theOwner) const;
 
   /// Returns a list of viewer highlited presentations
-  /// \param theShapeTypeToSkip the shapes with this type will be skipped during the result list build
   /// \return list of presentations
-  virtual QList<ModuleBase_ViewerPrs> getHighlighted(int theShapeTypeToSkip = -1) const;
+  virtual QList<ModuleBase_ViewerPrs> getHighlighted() const;
 
   /**
    * Returns list of currently selected objects in object browser
    */
   virtual QObjectPtrList selectedObjects() const;
 
+  virtual void setSelectedObjects( const QObjectPtrList& ) const;
+
   /**
    * Returns list of currently selected results
    */
@@ -56,9 +63,18 @@ class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
   //! Returns list of currently selected QModelIndexes
   virtual QModelIndexList selectedIndexes() const;
 
+  //! Returns list of currently selected QModelIndexes
+  ObjectPtr getSelectableObject(const Handle(SelectMgr_EntityOwner)& theOwner);
+
   //! Returns list of currently selected AIS objects
   virtual void selectedAISObjects(AIS_ListOfInteractive& theList) const;
 
+  //! Return a selectable object by the entity owner. It founds AIS object in the viewer
+  //! and returns the corresponded object
+  /// \param theOwner an entity owner
+  /// \return a found object or NULL
+  ObjectPtr getSelectableObject(const Handle(SelectMgr_EntityOwner)& theOwner) const;
+
   //! Returns list of currently selected shapes
   virtual void selectedShapes(NCollection_List<TopoDS_Shape>& theShapes, 
     std::list<ObjectPtr>& theOwners) const;
@@ -74,7 +90,23 @@ class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
   void entityOwners(const Handle_AIS_InteractiveObject& theObject,
                     SelectMgr_IndexedMapOfOwner& theOwners) const;
 
- private:
+  //! Return the IO from the viewer presentation.
+  //! \param thePrs a selected object
+  //! \return an interactive object
+  virtual Handle(AIS_InteractiveObject) getIO(const ModuleBase_ViewerPrs& thePrs);
+
+protected:
+  /// Fills the list of presentations by objects selected in the viewer.
+  /// \param thePresentations an output list of presentation
+  void getSelectedInViewer(QList<ModuleBase_ViewerPrs>& thePresentations) const;
+  /// Fills the list of presentations by objects selected in the object browser.
+  /// ViewerPrs contains only object parameter not empty.
+  /// If the given list of presentations already has a viewer presentation with the same object
+  /// as selected in the browser, a new item is not appended to the list of presentations.
+  /// \param thePresentations an output list of presentation
+  void getSelectedInBrowser(QList<ModuleBase_ViewerPrs>& thePresentations) const;
+
+private:
   XGUI_Workshop* myWorkshop;
 };