Conflict

[speedfreak] / Client / accrealtimedialog.h

diff --git a/Client/accrealtimedialog.h b/Client/accrealtimedialog.h
index b389818..c4dff1f 100644 (file)
--- a/Client/accrealtimedialog.h
+++ b/Client/accrealtimedialog.h
@@ -1,3 +1,11 @@
+/*
+ * Acceleration info in real time dialog
+ *
+ * @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
+ */
 #ifndef ACCREALTIMEDIALOG_H
 #define ACCREALTIMEDIALOG_H
 
@@ -5,6 +13,8 @@
 #include <QTimer>
 #include "accelerometer.h"
 #include "movingaverage.h"
+#include "resultdialog.h"
+
 
 namespace Ui {
     class AccRealTimeDialog;
@@ -15,6 +25,7 @@ class AccRealTimeDialog : public QDialog {
 public:
     AccRealTimeDialog(QWidget *parent = 0);
     ~AccRealTimeDialog();
+    ResultDialog* resultDialog;
     void Calibrate();
     void startAccelerationMeasure();
     void SetStopMeasureSpeed(double speed);
@@ -22,10 +33,6 @@ public:
 protected:
     void changeEvent(QEvent *e);
 
-private slots:
-    void on_buttonAbort_clicked();
-    void readAccelerometerData();
-
 private:
     Ui::AccRealTimeDialog *ui;
     void resetAccelerometerMeasurements();
@@ -49,6 +56,14 @@ private:
 
     QString currentSpeed;
     QString totalTime;
+
+private slots:
+    void on_buttonAbort_clicked();
+    void readAccelerometerData();
+    void sendResult(double);
+
+signals:
+    void sendresult(double);
 };
 
 #endif // ACCREALTIMEDIALOG_H