projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conflict
[speedfreak]
/
Client
/
accrealtimedialog.h
diff --git
a/Client/accrealtimedialog.h
b/Client/accrealtimedialog.h
index
ec9a0d5
..
c4dff1f
100644
(file)
--- a/
Client/accrealtimedialog.h
+++ b/
Client/accrealtimedialog.h
@@
-1,7
+1,8
@@
/*
* Acceleration info in real time dialog
*
/*
* Acceleration info in real time 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
*/
* @copyright (c) 2010 Speed Freak team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*/
@@
-24,6
+25,7
@@
class AccRealTimeDialog : public QDialog {
public:
AccRealTimeDialog(QWidget *parent = 0);
~AccRealTimeDialog();
public:
AccRealTimeDialog(QWidget *parent = 0);
~AccRealTimeDialog();
+ ResultDialog* resultDialog;
void Calibrate();
void startAccelerationMeasure();
void SetStopMeasureSpeed(double speed);
void Calibrate();
void startAccelerationMeasure();
void SetStopMeasureSpeed(double speed);
@@
-31,18
+33,9
@@
public:
protected:
void changeEvent(QEvent *e);
protected:
void changeEvent(QEvent *e);
-private slots:
- void on_buttonAbort_clicked();
- void readAccelerometerData();
- void sendResult(double);
-
-signals:
- void sendresult(double);
-
private:
Ui::AccRealTimeDialog *ui;
void resetAccelerometerMeasurements();
private:
Ui::AccRealTimeDialog *ui;
void resetAccelerometerMeasurements();
- ResultDialog* resultDialog;
QTimer *accelerometerTimer;
QTime elapsedTime;
QTimer *accelerometerTimer;
QTime elapsedTime;
@@
-63,6
+56,14
@@
private:
QString currentSpeed;
QString totalTime;
QString currentSpeed;
QString totalTime;
+
+private slots:
+ void on_buttonAbort_clicked();
+ void readAccelerometerData();
+ void sendResult(double);
+
+signals:
+ void sendresult(double);
};
#endif // ACCREALTIMEDIALOG_H
};
#endif // ACCREALTIMEDIALOG_H