X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=Client%2Fresultdialog.cpp;h=37cf348f2f3fe1ea03817cb595493a7232e2f762;hb=aa40ce55230787b7a57cc0588cd7e56d30a89dd2;hp=7327b4cf9f9b9fbcf700cff92e2367f1dddd32cf;hpb=a59cf5da56374b33e497a9f23a8985d74eb73212;p=speedfreak

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index 7327b4c..37cf348 100644
--- 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
  */
@@ -68,6 +69,9 @@ ResultDialog::ResultDialog(QWidget *parent) :
         timeArray[i] = 0;
     }
 
+    //Clear info label
+    ui->labelInfoToUser->setText("");
+
     if (loginSaved())
     {
         ui->pushButtonSend->setEnabled(true);
@@ -75,6 +79,7 @@ ResultDialog::ResultDialog(QWidget *parent) :
     else
     {
         ui->pushButtonSend->setEnabled(false);
+        ui->labelInfoToUser->setText("You're not logged! Please register or log in and accelerate again.");
     }
 }
 
@@ -278,19 +283,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
@@ -310,17 +315,25 @@ void ResultDialog::on_pushButtonNew_clicked()
     }
     resultString = "";
     this->close();
+    emit rejected();
 }
 
 /**
   * 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()
 {
+    ui->pushButtonSend->setEnabled(false);
     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 +407,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 +755,16 @@ int ResultDialog::getTargetChoice()
     }
     return targetChoice;
 }
+
+void ResultDialog::setLabelInfoToUser(QString infoText)
+{
+    this->ui->labelInfoToUser->setText(infoText);
+}
+
+/**
+  * This function enable send server button.
+  */
+void ResultDialog::setSendServerButtonEnabled()
+{
+    ui->pushButtonSend->setEnabled(true);
+}