Merge branch 'crosshair2'

[situare] / src / ui / mapviewscreen.h

diff --git a/src/ui/mapviewscreen.h b/src/ui/mapviewscreen.h
index c9e2433..bde9443 100644 (file)
--- a/src/ui/mapviewscreen.h
+++ b/src/ui/mapviewscreen.h
@@ -48,6 +48,14 @@ public:
 /*******************************************************************************
  * MEMBER FUNCTIONS AND SLOTS
  ******************************************************************************/
+public slots:    
+    /**
+    * @brief Slot for setting own location crosshair visibility
+    *
+    * @param visibility false <-> show, true <-> hide
+    */
+    void setOwnLocationCrosshairVisibility(bool visibility);
+
 private slots:
     /**
     * @brief Slot for drawing the Open Street Map license text
@@ -57,6 +65,27 @@ private slots:
     */
     void drawOsmLicense(int width, int height);
 
+    /**
+    * @brief Slot for drawing the own location crosshair
+    *
+    * @param width Width of the viewport
+    * @param height Height of the viewport
+    */
+    void drawOwnLocationCrosshair(int width, int height);
+
+//    /**
+//    * @brief Slot for map location change.
+//    */
+//    void locationChanged();
+
+    /**
+    * @brief Set correnct view port size to datamembers
+    *
+    * @param width Width of the viewport
+    * @param height Height of the viewport
+    */
+    void setViewPortSize(const int width, const int height);
+
 /*******************************************************************************
  * SIGNALS
  ******************************************************************************/
@@ -98,6 +127,16 @@ signals:
     void positionReceived(QPointF position, qreal accuracy);
 
     /**
+    * @brief Signal from MapEngine to SituareEngine is travelling here
+    */
+    void ownLocation(QPointF ownLatitudeLongitudeLocation);
+
+    /**
+    * @brief Signal from SituareEngine to MapEngine is travelling here
+    */
+    void requestOwnLocation();
+
+    /**
     * @brief Signal when user location is fetched
     *
     * @param user User data
@@ -118,11 +157,15 @@ signals:
  * DATA MEMBERS
  ******************************************************************************/
 private:
-    FriendListPanel *m_friendsListPanel; ///< Instance of friends list panel
-    MapEngine *m_mapEngine;              ///< MapEngine
-    QLabel *m_osmLicense;                ///< Label for Open Street Map license
-    UserInfoPanel *m_userPanel;          ///< Instance of the user information panel
-    ZoomButtonPanel *m_zoomButtonPanel;  ///< Instance of zoom button panel
+       bool m_drawOwnLocationCrosshair;        ///< Flag for making ownLocationCrosshair visible or not
+       FriendListPanel *m_friendsListPanel; ///< Instance of friends list panel
+       MapEngine *m_mapEngine;              ///< MapEngine
+       QLabel *m_osmLicense;                ///< Label for Open Street Map license
+       QLabel *m_ownLocationCrosshair;         ///< Label that show ownLocationCrosshair    
+       UserInfoPanel *m_userPanel;          ///< Instance of the user information panel
+       int m_viewPortHeight;   ///< Height of view port
+       int m_viewPortWidth;                    ///< Width of view port
+       ZoomButtonPanel *m_zoomButtonPanel;  ///< Instance of zoom button panel
 };
 
 #endif // MAPVIEWTAB_H