X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Selection.h;h=8d9a0a24f82c5e99087e69e60dd9b4acffe1001e;hb=4830a0f80bd3b0ec58bc43cdbba0418f169952a9;hp=cf9fec382307e3618a69c7151bff4f499c3a253c;hpb=0a909334d2b82cfcf3f9cb60d0719b81db86c005;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Selection.h b/src/XGUI/XGUI_Selection.h
index cf9fec382..8d9a0a24f 100644
--- a/src/XGUI/XGUI_Selection.h
+++ b/src/XGUI/XGUI_Selection.h
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
-// File:        XGUI_Selection.h
-// Created:     8 July 2014
-// Author:      Vitaly SMETANNIKOV
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef XGUI_Selection_H
 #define XGUI_Selection_H
@@ -23,10 +37,8 @@ class XGUI_Workshop;
 class SelectMgr_EntityOwner;
 class ModuleBase_ViewerPrs;
 
-/**
-* \ingroup GUI
-* Implementation of \ref ModuleBase_ISelection interface.
-*/
+/// \ingroup GUI
+/// Implementation of \ref ModuleBase_ISelection interface.
 class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
 {
  public:
@@ -49,53 +61,42 @@ class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
   /// \return list of presentations
   virtual QList<std::shared_ptr<ModuleBase_ViewerPrs>> getHighlighted() const;
 
-  /**
-   * Returns list of currently selected objects in object browser
-   */
+  /// 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
-   */
+  /// Returns list of currently selected results
   virtual QObjectPtrList selectedPresentations() const;
 
-  //! Returns list of currently selected QModelIndexes
+  /// 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 owners
+  /// Returns list of currently selected owners
   /// \return list of owners
   void selectedOwners(SelectMgr_IndexedMapOfOwner& theSelectedOwners) const;
 
-  //! Returns a list of selection entity owners of the interactive object
+  /// Returns a list of selection entity owners of the interactive object
   /// It depends on the modes, in which the object is activated in the context
   /// \param theObject an object
   /// \param theOwners a map of entity owners
-  void entityOwners(const Handle_AIS_InteractiveObject& theObject,
+  void entityOwners(const Handle(AIS_InteractiveObject)& theObject,
                     SelectMgr_IndexedMapOfOwner& theOwners) const;
 
-  //! Return the IO from the viewer presentation.
-  //! \param thePrs a selected object
-  //! \return an interactive object
+  /// Return the IO from the viewer presentation.
+  /// \param thePrs a selected object
+  /// \return an interactive object
   virtual Handle(AIS_InteractiveObject) getIO(const std::shared_ptr<ModuleBase_ViewerPrs>& thePrs);
 
 protected:
+  /// 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;
+
   /// Fills the list of presentations by objects selected in the viewer.
   /// \param thePresentations an output list of presentation
   void getSelectedInViewer(QList<std::shared_ptr<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
@@ -106,10 +107,12 @@ protected:
   /// Generates a vertex or edge by the give IO if it is an AIS created on trihedron
   /// \param theIO a selected object
   /// \return created shape or empty shape
+#ifdef BEFORE_TRIHEDRON_PATCH
   TopoDS_Shape findAxisShape(Handle(AIS_InteractiveObject) theIO) const;
+#endif
 
 private:
-  XGUI_Workshop* myWorkshop;
+  XGUI_Workshop* myWorkshop; ///< current workshop
 };
 
 #endif