Merge branch 'bugfix/categorylist'

[speedfreak] / Client / resultdialog.cpp

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index 7327b4c..e53db80 100644 (file)
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -2,6 +2,7 @@
  * CarMainWindow main class
  *
  * @author     Janne Änäkkälä <janne.anakkala@fudeco.com>
+ * @author      Toni Jussila   <toni.jussila@fudeco.com>
  * @copyright  (c) 2010 Speed Freak team
  * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
  */
@@ -76,6 +77,9 @@ ResultDialog::ResultDialog(QWidget *parent) :
     {
         ui->pushButtonSend->setEnabled(false);
     }
+
+    //Clear info label
+    ui->labelInfoToUser->setText("");
 }
 
 /**
@@ -278,19 +282,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
@@ -315,12 +319,19 @@ void ResultDialog::on_pushButtonNew_clicked()
 /**
   * This slot function emits sendresult signal for sending results to server when
   * send results -button has been clicked.
+  * Emit accrealtimedialog sendresult.
   */
 void ResultDialog::on_pushButtonSend_clicked()
 {
+    //emit sendresult();
     emit sendresult(timeArray[this->getTargetChoice()]);
 }
 
+double ResultDialog::getResult()
+{
+    return timeArray[this->getTargetChoice()];
+}
+
 /**
   * This public function sets diagram's stem gap
   * @param pValue is the speed value which determines diagram gap's value
@@ -394,12 +405,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,3 +753,8 @@ int ResultDialog::getTargetChoice()
     }
     return targetChoice;
 }
+
+void ResultDialog::setLabelInfoToUser(QString infoText)
+{
+    this->ui->labelInfoToUser->setText(infoText);
+}