X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Displayer.h;h=f99815ae0511ddeec48ac7a15e9846e3845e7a43;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=bc01eb9017ca8a7593da0964df54945c01345136;hpb=84f8b4a57d3cdad820bc1333a5066699cd1c8ae3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Displayer.h b/src/HYDROGUI/HYDROGUI_Displayer.h
index bc01eb90..f99815ae 100644
--- a/src/HYDROGUI/HYDROGUI_Displayer.h
+++ b/src/HYDROGUI/HYDROGUI_Displayer.h
@@ -23,20 +23,21 @@
 #ifndef HYDROGUI_DISPLAYER_H
 #define HYDROGUI_DISPLAYER_H
 
-#include <HYDROData_Entity.h>
+#include "HYDROGUI_AbstractDisplayer.h"
 
 #include <QMap>
+#include <QPoint>
+#include <vtkNew.h>
 
-class HYDROGUI_Module;
 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
+class HYDROGUI_Displayer : public HYDROGUI_AbstractDisplayer
 {
 public:
   /**
@@ -56,69 +57,68 @@ 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 Update all objects in the viewer.
-   * \param theViewerId viewer identifier
-   * \param theIsInit flag used for initial update
-   * \param theIsForced flag used to update all objects, including the unchanged ones
+   * \brief Get the applicable viewer type.
    */
-  void                            UpdateAll( const int theViewerId,
-                                             const bool theIsInit,
-                                             const bool theIsForced );
+  virtual QString  GetType() const;
 
-protected:
-  /**
-   * \brief Erase all viewer objects.
-   * \param theViewerId viewer identifier
+  /*
+   * 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                            EraseAll( const int theViewerId );
-
+  void             SaveCursorViewPosition( SUIT_ViewWindow* theViewWindow = 0 );
   /**
-   * \brief Update and display all objects in the viewer.
-   * \param theViewerId viewer identifier
-   * \param theIsForced flag used to update all objects, including the unchanged ones
+   * \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
    */
-  void                            DisplayAll( const int theViewerId,
-                                              const bool theIsForced );
-
+  bool             GetCursorViewCoordinates( SUIT_ViewWindow* theViewWindow,
+                                             double& theXCoordinate,
+                                             double& theYCoordinate,
+                                             double& theZCoordinate );
+protected:
   /**
-   * \brief Update the specified viewer objects.
-   * \param theObjs sequence of objects to update
+   * \brief Erase all viewer objects.
    * \param theViewerId viewer identifier
-   * \param theIsForced flag used to update all objects, including the unchanged ones
    */
-  void                            Update( const HYDROData_SequenceOfObjects& theObjs,
-                                          const int theViewerId,
-                                          const bool theIsForced );
+  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 );
 
-private:
+protected:
   /**
    * \brief Purge all invalid objects in the viewer.
    * \param theViewerId viewer identifier
    */
-  void                            purgeObjects( const int theViewerId );
+  void             purgeObjects( const int theViewerId );
 
+private:
   /**
    * \brief Get the presentation driver for the specified data object.
    * \param theObj data object
@@ -126,10 +126,12 @@ private:
   HYDROGUI_PrsDriver*             getDriver( const Handle(HYDROData_Entity)& theObj );
 
 private:
-  HYDROGUI_Module*                myModule;
-
   typedef QMap< ObjectKind, HYDROGUI_PrsDriver* > PrsDriversMap;
   PrsDriversMap                   myPrsDriversMap;
+  vtkNew<vtkWorldPointPicker>     myPicker;
+  int                             myXPosition;
+  int                             myYPosition;
+  bool                            myIsPositionSaved;
 };
 
 #endif