X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Faccelerationstart.cpp;h=621489788cffae91256d3d2510b88592a1f16942;hp=259200938fad520b1ff451dd72213790206fae43;hb=469014c551522b73afea7af43e73fa7194657b05;hpb=9de94ffc9dac2ad13fda5703e58553737e1a0d42 diff --git a/Client/accelerationstart.cpp b/Client/accelerationstart.cpp index 2592009..6214897 100644 --- a/Client/accelerationstart.cpp +++ b/Client/accelerationstart.cpp @@ -1,3 +1,11 @@ +/* + * Acceleration start dialog + * + * @author Jukka Kurttila + * @author Toni Jussila + * @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 @@ -8,7 +16,9 @@ accelerationstart::accelerationstart(QWidget *parent) : { ui->setupUi(this); ui->buttonStart->setDisabled(true); + accRealTimeDialog = NULL; + stopMeasureSpeed = 0; ui->categorComboBox->addItem("Select category"); @@ -16,6 +26,12 @@ accelerationstart::accelerationstart(QWidget *parent) : ui->categorComboBox->addItem("0 - 20 km/h",20); ui->categorComboBox->addItem("0 - 40 km/h"); ui->categorComboBox->addItem("0 - 100 km/h"); + + //Button settings + ui->buttonCalib->setAutoFillBackground(true); + 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)"); } accelerationstart::~accelerationstart() @@ -42,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); @@ -67,8 +85,8 @@ void accelerationstart::on_categorComboBox_currentIndexChanged( int index ) { stopMeasureSpeed = 0; if( index == 1 ) { - stopMeasureSpeed = 10; - measureCategory = "acceleration-0-10"; + stopMeasureSpeed = 20; + measureCategory = "acceleration-0-20"; } else if( index == 2 ) { stopMeasureSpeed = 40; @@ -86,3 +104,11 @@ QString accelerationstart::getMeasureCategory() return measureCategory; } +/** + *This slot function emit mainwindow sendresult. + * + **/ +void accelerationstart::sendResult(double result) +{ + emit sendresult(measureCategory, result); +}