projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added new tab "Measure" in main window
[speedfreak]
/
Client
/
measuredialog.cpp
diff --git
a/Client/measuredialog.cpp
b/Client/measuredialog.cpp
index
038116a
..
02c9ea7
100644
(file)
--- a/
Client/measuredialog.cpp
+++ b/
Client/measuredialog.cpp
@@
-1,10
+1,11
@@
#include "measuredialog.h"
#include "ui_measuredialog.h"
#include "measuredialog.h"
#include "ui_measuredialog.h"
+#include "math.h"
/**
/**
- *Constructor of this class.
- *@param QWidget pointer to parent object. By default the value is NULL.
+ * Constructor of this class.
+ * @param QWidget pointer to parent object. By default the value is NULL.
*/
MeasureDialog::MeasureDialog(QWidget *parent) :
QDialog(parent),
*/
MeasureDialog::MeasureDialog(QWidget *parent) :
QDialog(parent),
@@
-49,7
+50,8
@@
void MeasureDialog::changeEvent(QEvent *e)
}
/**
}
/**
- *This slot function is called when timer gives timeout signal.
+ * This slot function is called when timer gives timeout signal. Checks current speed
+ * and stores times in measure class.
*/
void MeasureDialog::after_timeout()
{
*/
void MeasureDialog::after_timeout()
{
@@
-59,52
+61,52
@@
void MeasureDialog::after_timeout()
speed = accelerometer->getCurrentSpeed();
//speed = speed +10;
speed = accelerometer->getCurrentSpeed();
//speed = speed +10;
- if(speed > 9.7 && speed < 10.3)
+ if (floor(speed) == 10)
{
measures->setTime10kmh(time);
}
{
measures->setTime10kmh(time);
}
- else if (speed > 19.7 && speed < 20.3)
+ else if (floor(speed) == 20)
{
measures->setTime20kmh(time);
}
{
measures->setTime20kmh(time);
}
- else if (speed > 29.7 && speed < 30.3)
+ else if (floor(speed) == 30)
{
measures->setTime30kmh(time);
}
{
measures->setTime30kmh(time);
}
- else if (speed > 39.7 && speed < 40.3)
+ else if (floor(speed) == 40)
{
measures->setTime40kmh(time);
}
{
measures->setTime40kmh(time);
}
- else if (speed > 49.7 && speed < 50.3)
+ else if (floor(speed) == 50)
{
measures->setTime50kmh(time);
}
{
measures->setTime50kmh(time);
}
- else if (speed > 59.7 && speed < 60.3)
+ else if (floor(speed) == 60)
{
measures->setTime60kmh(time);
}
{
measures->setTime60kmh(time);
}
- else if (speed > 69.7 && speed < 70.3)
+ else if (floor(speed) == 70)
{
measures->setTime70kmh(time);
}
{
measures->setTime70kmh(time);
}
- else if (speed > 79.7 && speed < 80.3)
+ else if (floor(speed) == 80)
{
measures->setTime80kmh(time);
}
{
measures->setTime80kmh(time);
}
- else if (speed > 89.7 && speed < 90.3)
+ else if (floor(speed) == 90)
{
measures->setTime90kmh(time);
}
{
measures->setTime90kmh(time);
}
- else if (speed > 99.7 && speed < 100.3)
+ else if (floor(speed) == 100)
{
measures->setTime100kmh(time);
}
{
measures->setTime100kmh(time);
}
@@
-139,7
+141,7
@@
void MeasureDialog::after_timeout()
}
/**
}
/**
- *This slot function is called when Abort button is clicked.
+ * This slot function is called when Abort button is clicked.
*/
void MeasureDialog::on_pushButtonAbort_clicked()
{
*/
void MeasureDialog::on_pushButtonAbort_clicked()
{
@@
-160,6
+162,9
@@
void MeasureDialog::on_pushButtonAbort_clicked()
this->close();
}
this->close();
}
+/**
+ * Initializes measures class's member variables.
+ */
void MeasureDialog::initializeMeasures()
{
measures->setTime10kmh(0);
void MeasureDialog::initializeMeasures()
{
measures->setTime10kmh(0);