From f155ddf96ed8f2fdefeb1280e6e5381b93d29db1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Janne=20=C3=84n=C3=A4kk=C3=A4l=C3=A4?=
 <janne.anakkala@fudeco.com>
Date: Wed, 31 Mar 2010 14:10:35 +0300
Subject: [PATCH] Some bug fixing in axis scaling.

---
 Client/resultdialog.cpp |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index f505348..68eb7cf 100644
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -278,19 +278,19 @@ void ResultDialog::setTimesIntoLabels()
   */
 void ResultDialog::setTimeAxelLength(int pChoice)
 {
-    if (timeArray[pChoice] <= 5)
+    if (timeArray[pChoice] <= 5.0)
     {
         timeAxelLength = 5;
     }
 
-    else if (timeArray[pChoice] <= 10)
+    else if (timeArray[pChoice] <= 10.0 && timeArray[pChoice] > 5.0)
     {
         timeAxelLength = 10;
     }
 
-    else if (timeArray[pChoice] <= 15)
+    else if (timeArray[pChoice] <= 16.0 && timeArray[pChoice] > 10.0)
     {
-        timeAxelLength = 15;
+        timeAxelLength = 16;
     }
 
     else
@@ -394,12 +394,12 @@ void ResultDialog::setValue(int pSpeed, double pTime)
         this->diagramGapHorizontal = DIAGRAMGAP5S;
     }
 
-    else if (pTime <= 10.0)
+    else if (pTime <= 10.0 && pTime > 5.0)
     {
        this->diagramGapHorizontal = DIAGRAMGAP10S;
     }
 
-    else if (pTime <= 16.0)
+    else if (pTime <= 16.0 && pTime > 10.0)
     {
         this->diagramGapHorizontal = DIAGRAMGAP16S;
     }
@@ -742,9 +742,3 @@ int ResultDialog::getTargetChoice()
     }
     return targetChoice;
 }
-
-void ResultDialog::setLabelInfoToUser(QString infoText)
-{
-    this->ui->labelInfoToUser->setText(infoText);
-}
-
-- 
1.7.9.5