Added functional tests for distance indication button

Reviewed by Sami Rämö

diff --git a/doc/testing/functionality-tests.doc b/doc/testing/functionality-tests.doc
index afb4b71..b74b9b7 100644 (file)
Binary files a/doc/testing/functionality-tests.doc and b/doc/testing/functionality-tests.doc differ

diff --git a/src/ui/indicatorbuttonpanel.cpp b/src/ui/indicatorbuttonpanel.cpp
index 2d2ada4..a34369e 100644 (file)
--- a/src/ui/indicatorbuttonpanel.cpp
+++ b/src/ui/indicatorbuttonpanel.cpp
@@ -35,8 +35,7 @@ const QString DIRECTION_INDICATOR_BUTTON_POSITION = "DIRECTION_INDICATOR_POSITIO
 
 IndicatorButtonPanel::IndicatorButtonPanel(QWidget *parent)
     : QWidget(parent),
-      m_isDraggable(false),
-      m_distanceText("")
+      m_isDraggable(false)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -82,7 +81,7 @@ IndicatorButtonPanel::IndicatorButtonPanel(QWidget *parent)
                                           QPoint(DIRECTION_INDICATOR_POSITION_X,
                                                  DIRECTION_INDICATOR_POSITION_Y)).toPoint();
 
-    if(savedLocation.x() > DEFAULT_SCREEN_WIDTH || savedLocation.y() > DEFAULT_SCREEN_HEIGHT) {
+    if((savedLocation.x() > DEFAULT_SCREEN_WIDTH) || (savedLocation.y() > DEFAULT_SCREEN_HEIGHT)) {
         savedLocation.rx() = DIRECTION_INDICATOR_POSITION_X;
         savedLocation.ry() = DIRECTION_INDICATOR_POSITION_Y;
     }
@@ -207,25 +206,6 @@ void IndicatorButtonPanel::paintEvent(QPaintEvent *event)
     }
 }
 
-void IndicatorButtonPanel::setDraggable(bool mode, QPoint eventPosition)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_isDraggable = mode;
-
-    if(mode) {
-        emit draggingModeTriggered();
-        grabMouse();
-        m_forceReleaseTimer->start();
-        m_dragPosition = eventPosition;
-    } else {
-        releaseMouse();
-        m_forceReleaseTimer->stop();
-        m_indicatorButton->setDown(false);
-    }
-    update();
-}
-
 void IndicatorButtonPanel::screenResized(const QSize &newSize)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -264,6 +244,25 @@ void IndicatorButtonPanel::screenResized(const QSize &newSize)
     move(resizedPosition);
 }
 
+void IndicatorButtonPanel::setDraggable(bool mode, QPoint eventPosition)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_isDraggable = mode;
+
+    if(mode) {
+        emit draggingModeTriggered();
+        grabMouse();
+        m_forceReleaseTimer->start();
+        m_dragPosition = eventPosition;
+    } else {
+        releaseMouse();
+        m_forceReleaseTimer->stop();
+        m_indicatorButton->setDown(false);
+    }
+    update();
+}
+
 void IndicatorButtonPanel::setIndicatorButtonEnabled(bool enabled)
 {
         m_indicatorButton->setChecked(enabled);
@@ -281,10 +280,10 @@ void IndicatorButtonPanel::updateValues(qreal direction, qreal distance, bool dr
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    const int MAX_TO_METERS = 1000 - 0.5;
-    const int MAX_FOR_KM_WITH_DESIMAL = 100000 - 50;
-    const int MIN_TO_METERS = 10.0;
-    const qreal M_TO_KM = 1000.0;                   ///< Meters to kilometers conversion
+    const int MAX_TO_METERS = 999.5;
+    const int MAX_TO_KM_WITH_DESIMAL = 99950;
+    const int MIN_TO_METERS = 10;
+    const int M_TO_KM = 1000;                   ///< Meters to kilometers conversion
 
     QString UNIT_KILOMETER = " km";
     QString UNIT_METER = " m";
@@ -304,7 +303,7 @@ void IndicatorButtonPanel::updateValues(qreal direction, qreal distance, bool dr
         m_distanceText.setNum(m_distance, 0 , 0);
         m_distanceText.append(UNIT_METER);
     }
-    else if(m_distance < MAX_FOR_KM_WITH_DESIMAL)
+    else if(m_distance < MAX_TO_KM_WITH_DESIMAL)
     {
         m_distanceText.setNum(m_distance / M_TO_KM, 1, 1);
         m_distanceText.append(UNIT_KILOMETER);

diff --git a/src/ui/indicatorbuttonpanel.h b/src/ui/indicatorbuttonpanel.h
index d547611..5b29bcf 100644 (file)
--- a/src/ui/indicatorbuttonpanel.h
+++ b/src/ui/indicatorbuttonpanel.h
@@ -107,7 +107,7 @@ public slots:
     void setIndicatorButtonEnabled(bool enabled);
 
     /**
-     * @brief Toggle zoom panel draggability
+     * @brief Toggle indicator button panel draggability
      *
      * @param mode True if draggable, otherwise false
      * @param distance Start value for dragging