projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added measures.h and measures.cpp files. Changed resultdialog.h, .cpp and measuredial...
[speedfreak]
/
Client
/
measuredialog.h
diff --git
a/Client/measuredialog.h
b/Client/measuredialog.h
index
abddf06
..
893d61e
100644
(file)
--- a/
Client/measuredialog.h
+++ b/
Client/measuredialog.h
@@
-2,6
+2,7
@@
#define MEASUREDIALOG_H
#include "accelerometer.h"
#define MEASUREDIALOG_H
#include "accelerometer.h"
+#include "measures.h"
#include <QDialog>
#include <QTimer>
#include <QDialog>
#include <QTimer>
@@
-14,7
+15,8
@@
class MeasureDialog : public QDialog {
public:
MeasureDialog(QWidget *parent = 0);
~MeasureDialog();
public:
MeasureDialog(QWidget *parent = 0);
~MeasureDialog();
-
+ Measures *measures;
+ void initializeMeasures();
protected:
void changeEvent(QEvent *e);
protected:
void changeEvent(QEvent *e);
@@
-24,9
+26,8
@@
private:
QTimer *timer;
Accelerometer *accelerometer;
QTimer *timer;
Accelerometer *accelerometer;
-
- qreal time;
- qreal speed;
+ double time;
+ double speed;
signals:
void speedAchieved();
signals:
void speedAchieved();