X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=Client%2Fresultdialog.cpp;h=659f037fd8fdcdb9d235c9a9376de3febe1aa2a1;hb=fabb862ed27bd473f0bf9f0217dd30da80ad217c;hp=a9c440c5cef7a7f2db8f0874afb79e4f81916a59;hpb=da859c9f595e92183686c12499f8ee59bff3fd3c;p=speedfreak

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index a9c440c..659f037 100644
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -29,6 +29,7 @@ const int DIAGRAMGAP100KMH = 30;
 
 const int DIAGRAMGAP5S = 80;
 const int DIAGRAMGAP10S = 40;
+const int DIAGRAMGAP16S = 25;
 const int DIAGRAMGAP20S = 20;
 
 const QPoint diagramStemStart(70, 330);
@@ -277,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
@@ -317,7 +318,13 @@ void ResultDialog::on_pushButtonNew_clicked()
   */
 void ResultDialog::on_pushButtonSend_clicked()
 {
-    emit sendresult(timeArray[this->getTargetChoice()]);
+    emit sendresult();
+    //emit sendresult(timeArray[this->getTargetChoice()]);
+}
+
+double ResultDialog::getResult()
+{
+    return timeArray[this->getTargetChoice()];
 }
 
 /**
@@ -388,16 +395,21 @@ void ResultDialog::setEnd(int pValue)
 void ResultDialog::setValue(int pSpeed, double pTime)
 {
     //timeArray[0] = 0;
-    if (floor(pTime) <= 5)
+    if (pTime <= 5.0)
     {
         this->diagramGapHorizontal = DIAGRAMGAP5S;
     }
 
-    else if (floor(pTime) <= 10)
+    else if (pTime <= 10.0 && pTime > 5.0)
     {
        this->diagramGapHorizontal = DIAGRAMGAP10S;
     }
 
+    else if (pTime <= 16.0 && pTime > 10.0)
+    {
+        this->diagramGapHorizontal = DIAGRAMGAP16S;
+    }
+
     else
     {
         this->diagramGapHorizontal = DIAGRAMGAP20S;
@@ -736,3 +748,8 @@ int ResultDialog::getTargetChoice()
     }
     return targetChoice;
 }
+
+void ResultDialog::setLabelInfoToUser(QString infoText)
+{
+    this->ui->labelInfoToUser->setText(infoText);
+}