Key_Escape processing in File selector widget. Otherwise, crash happens if file dialo...

[modules/shaper.git] / src / XGUI / XGUI_Selection.h

diff --git a/src/XGUI/XGUI_Selection.h b/src/XGUI/XGUI_Selection.h
index d81ef7edaee93256265560b29a70aafb891a7505..9ff42e6d8cebf6755445d9a43f7e0a031f71e28b 100644 (file)
--- a/src/XGUI/XGUI_Selection.h
+++ b/src/XGUI/XGUI_Selection.h
@@ -1,15 +1,28 @@
-// 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
 
 #include "XGUI.h"
 
-#include <ModuleBase_ViewerPrs.h>
 #include <ModuleBase_Definitions.h>
 #include <ModuleBase_ISelection.h>
 
@@ -21,7 +34,8 @@
 #include <SelectMgr_IndexedMapOfOwner.hxx>
 
 class XGUI_Workshop;
-class Handle_SelectMgr_EntityOwner;
+class SelectMgr_EntityOwner;
+class ModuleBase_ViewerPrs;
 
 /**
 * \ingroup GUI
@@ -36,17 +50,18 @@ class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
 
   /// Returns a list of viewer selected presentations
   /// \return list of presentations
-  virtual QList<ModuleBase_ViewerPrs> getSelected(const SelectionPlace& thePlace = Browser) const;
+  virtual QList<std::shared_ptr<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;
+  virtual void fillPresentation(std::shared_ptr<ModuleBase_ViewerPrs>& thePrs,
+                                const Handle(SelectMgr_EntityOwner)& theOwner) const;
 
   /// Returns a list of viewer highlited presentations
   /// \return list of presentations
-  virtual QList<ModuleBase_ViewerPrs> getHighlighted() const;
+  virtual QList<std::shared_ptr<ModuleBase_ViewerPrs>> getHighlighted() const;
 
   /**
    * Returns list of currently selected objects in object browser
@@ -75,10 +90,6 @@ class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
   /// \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;
-
   //! Returns list of currently selected owners
   /// \return list of owners
   void selectedOwners(SelectMgr_IndexedMapOfOwner& theSelectedOwners) const;
@@ -93,23 +104,25 @@ class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
   //! 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);
+  virtual Handle(AIS_InteractiveObject) getIO(const std::shared_ptr<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;
+  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
   /// 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;
+  void getSelectedInBrowser(QList<std::shared_ptr<ModuleBase_ViewerPrs>>& thePresentations) const;
 
   /// 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;