Merge branch 'registerdialog'

[speedfreak] / Client / accelerationstart.cpp

diff --git a/Client/accelerationstart.cpp b/Client/accelerationstart.cpp
index 11dbf85..00c3160 100644 (file)
--- a/Client/accelerationstart.cpp
+++ b/Client/accelerationstart.cpp
@@ -1,13 +1,15 @@
 /*
  * Acceleration start dialog
  *
- * @author      Jukka Kurttila <jukka.kurttila@fudeco.com>
+ * @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
  */
 #include "accelerationstart.h"
 #include "ui_accelerationstartdialog.h"
 #include <QMessageBox>
+#include <QDebug>
 
 accelerationstart::accelerationstart(QWidget *parent) :
     QDialog(parent),
@@ -15,7 +17,10 @@ accelerationstart::accelerationstart(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->buttonStart->setDisabled(true);
+
     accRealTimeDialog = NULL;
+    helpAccelerationDialog = NULL;
+
     stopMeasureSpeed = 0;
 
     ui->categorComboBox->addItem("Select category");
@@ -29,6 +34,8 @@ accelerationstart::accelerationstart(QWidget *parent) :
     ui->buttonCalib->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
     ui->buttonStart->setAutoFillBackground(true);
     ui->buttonStart->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+    ui->pushButtonInfo->setAutoFillBackground(true);
+    ui->pushButtonInfo->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 }
 
 accelerationstart::~accelerationstart()
@@ -55,6 +62,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 +108,37 @@ QString accelerationstart::getMeasureCategory()
     return measureCategory;
 }
 
+/**
+  *This slot function emit mainwindow sendresult.
+  *
+  **/
+void accelerationstart::sendResult(double result)
+{
+    emit sendresult(measureCategory, result);
+}
+
+/**
+  * This slot function called when ever info button clicked.
+  */
+void accelerationstart::on_pushButtonInfo_clicked()
+{
+    if(!helpAccelerationDialog)
+    {
+        helpAccelerationDialog = new HelpAccelerationDialog;
+    }
+    connect(helpAccelerationDialog, SIGNAL(rejected()), this, SLOT(killHelpDialog()));
+    helpAccelerationDialog->show();
+}
+
+/**
+  * This slot function called when ever dialog rejected.
+  */
+void accelerationstart::killHelpDialog()
+{
+    if(helpAccelerationDialog)
+    {
+        qDebug() << "__Acc kill: helpAccelerationDialog";
+        delete helpAccelerationDialog;
+        helpAccelerationDialog = NULL;
+    }
+}