Merge branch 'bugfix/categorylist'

[speedfreak] / Client / accelerationstart.cpp

diff --git a/Client/accelerationstart.cpp b/Client/accelerationstart.cpp
index 11dbf85..6214897 100644 (file)
--- a/Client/accelerationstart.cpp
+++ b/Client/accelerationstart.cpp
@@ -2,6 +2,7 @@
  * Acceleration start dialog
  *
  * @author      Jukka Kurttila <jukka.kurttila@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
  */
@@ -15,7 +16,9 @@ accelerationstart::accelerationstart(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->buttonStart->setDisabled(true);
+
     accRealTimeDialog = NULL;
+
     stopMeasureSpeed = 0;
 
     ui->categorComboBox->addItem("Select category");
@@ -55,6 +58,8 @@ void accelerationstart::on_buttonCalib_clicked()
     if(accRealTimeDialog == NULL)
         accRealTimeDialog = new AccRealTimeDialog(this);
 
+    connect(accRealTimeDialog, SIGNAL(sendresult(double)), this, SLOT(sendResult(double)));
+
     accRealTimeDialog->Calibrate();
 
     ui->buttonStart->setEnabled(true);
@@ -99,3 +104,11 @@ QString accelerationstart::getMeasureCategory()
     return measureCategory;
 }
 
+/**
+  *This slot function emit mainwindow sendresult.
+  *
+  **/
+void accelerationstart::sendResult(double result)
+{
+    emit sendresult(measureCategory, result);
+}