X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Displayer.h;h=b4a574ed450bbb01763e3d3c578aeb7a2e6c3fd6;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=17e23c9ab520fecbeb6ad22cb3f9ecac9d361e4a;hpb=026402739f8239caa8c470c19402ce379d17b9d7;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Displayer.h b/src/HYDROGUI/HYDROGUI_Displayer.h
index 17e23c9a..b4a574ed 100644
--- a/src/HYDROGUI/HYDROGUI_Displayer.h
+++ b/src/HYDROGUI/HYDROGUI_Displayer.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  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.
+// 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
@@ -20,20 +16,23 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_DISPLAYER_H
 #define HYDROGUI_DISPLAYER_H
 
 #include "HYDROGUI_AbstractDisplayer.h"
 
 #include <QMap>
+#include <QPoint>
+#include <vtkNew.h>
 
 class HYDROGUI_PrsDriver;
-
-class GraphicsView_Viewer;
+class SUIT_ViewWindow;
+class vtkWorldPointPicker;
 
 /**
- * \class HYDROGUI_DataModel
- * \brief Class intended to create, display and update the presentations.
+ * \class HYDROGUI_Displayer
+ * \brief Class intended to create, display and update the presentations in 2D graphics viewer.
  */
 class HYDROGUI_Displayer : public HYDROGUI_AbstractDisplayer
 {
@@ -55,39 +54,66 @@ public:
    * \param theObjs sequence of objects to update
    * \param theViewerId viewer identifier
    */
-  void                            SetToUpdate( const HYDROData_SequenceOfObjects& theObjs,
-                                               const int theViewerId );
+  void             SetToUpdate( const HYDROData_SequenceOfObjects& theObjs,
+                                const int theViewerId );
 
+  /**
+   * \brief Get the applicable viewer type.
+   */
+  virtual QString  GetType() const;
+
+  /*
+   * Get the current cursor view position and save it in the displayer
+   * to be used in the obtaining the view coordinates of the cursor.
+   * \param theViewWindow a view window. If a view window is null, an active view is used
+   * only OCC and VTK views are processed
+   */
+  void             SaveCursorViewPosition( SUIT_ViewWindow* theViewWindow = 0 );
+  /**
+   * \brief Get the coodinates from the view window, projected on XOY plane
+   * \param theViewWindow a view window
+   * \param theXCoordinate a X coordinate
+   * \param theXCoordinate an Y coordinate
+   * \param theXCoordinate a Z coordinate, has a zero value because of the plane
+   * \return true if the coordinates are got
+   */
+  bool             GetCursorViewCoordinates( SUIT_ViewWindow* theViewWindow,
+                                             double& theXCoordinate,
+                                             double& theYCoordinate,
+                                             double& theZCoordinate );
 protected:
   /**
    * \brief Erase all viewer objects.
    * \param theViewerId viewer identifier
    */
-  void                            EraseAll( const int theViewerId );
+  void             EraseAll( const int theViewerId );
 
   /**
    * \brief Erase the specified viewer objects.
    * \param theObjs sequence of objects to erase
    * \param theViewerId viewer identifier
    */
-  void                            Erase( const HYDROData_SequenceOfObjects& theObjs,
-                                         const int theViewerId );
+  void             Erase( const HYDROData_SequenceOfObjects& theObjs,
+                          const int theViewerId );
 
   /**
    * \brief Display the specified viewer objects.
    * \param theObjs sequence of objects to display
    * \param theViewerId viewer identifier
    * \param theIsForced flag used to update all objects, including the unchanged ones
+   * \param theDoFitAll flag used to fit the view to all visible objects; do not fit by default
    */
-  void                            Display( const HYDROData_SequenceOfObjects& theObjs,
-                                           const int theViewerId,
-                                           const bool theIsForced );
+  void             Display( const HYDROData_SequenceOfObjects& theObjs,
+                            const int theViewerId,
+                            const bool theIsForced,
+                            const bool theDoFitAll );
 
+protected:
   /**
    * \brief Purge all invalid objects in the viewer.
    * \param theViewerId viewer identifier
    */
-  void                            purgeObjects( const int theViewerId );
+  void             purgeObjects( const int theViewerId );
 
 private:
   /**
@@ -99,6 +125,10 @@ private:
 private:
   typedef QMap< ObjectKind, HYDROGUI_PrsDriver* > PrsDriversMap;
   PrsDriversMap                   myPrsDriversMap;
+  vtkNew<vtkWorldPointPicker>     myPicker;
+  int                             myXPosition;
+  int                             myYPosition;
+  bool                            myIsPositionSaved;
 };
 
 #endif