Using calibration dialog.

diff --git a/Client/accelerometer.cpp b/Client/accelerometer.cpp
index 0495135..ecde13d 100644 (file)
--- a/Client/accelerometer.cpp
+++ b/Client/accelerometer.cpp
@@ -15,6 +15,7 @@
 #include <QDBusPendingReply>
 
 #define kFilteringFactor 0.2
+#define kIterations      1024
 
 /**
  * Default constructor for Accelerometer class
@@ -57,7 +58,12 @@ void Accelerometer::calibrate(void)
     unsigned int iteration = 0;
     qreal sampleX, sampleY, sampleZ;
 
+    calibrateDialog = new CalibrateDialog();
+    calibrateDialog->show();
+    calibrateDialog->resetProgressValue();
+
     do {
+        calibrateDialog->setProgressValue(iteration);
 
         getAcceleration(sampleX, sampleY, sampleZ);
 
@@ -67,11 +73,13 @@ void Accelerometer::calibrate(void)
 
         iteration++;
 
-    } while(iteration != 1024);        // 1024 times
+    } while(iteration != kIterations);        // kIterations times
+
+    calibrationX = calibrationX/kIterations;  // division by kIterations
+    calibrationY = calibrationY/kIterations;
+    calibrationZ = calibrationZ/kIterations;
 
-    calibrationX = calibrationX/1024;  // division by 1024
-    calibrationY = calibrationY/1024;
-    calibrationZ = calibrationZ/1024;
+    calibrateDialog->hide();
 }
 
 /**

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index 24063cd..53e9ca0 100644 (file)
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -14,6 +14,7 @@
 #include <QObject>
 
 #include "calculate.h"
+#include "calibratedialog.h"
 
 class Accelerometer : public QObject
 {
@@ -34,6 +35,8 @@ public:
 private:
     qreal previousAccelerationX, previousAccelerationY, previousAccelerationZ;
     qreal calibrationX, calibrationY, calibrationZ;
+
+    CalibrateDialog *calibrateDialog;
 };
 
 #endif // ACCELEROMETER_H