Modifications to project structure, bug fixes etc.

diff --git a/Client/accelerometer.cpp b/Client/accelerometer.cpp
index ed904f6..fc67b2f 100644 (file)
--- a/Client/accelerometer.cpp
+++ b/Client/accelerometer.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "accelerometer.h"
+
 #include "math.h"
 
 #include <QFile>
@@ -18,11 +19,9 @@
 #include <QDBusInterface>
 #include <QDBusPendingReply>
 
-#define kFilteringFactor    0.1
-#define kGravity            9.81
-#define kFileName           "/sys/class/i2c-adapter/i2c-3/3-001d/coord"
+#define kFilteringFactor    0.2
 
-static int sampleIndex=0;
+static int sampleIndex = 0;
 
 /**
  * Default constructor for Accelerometer class
@@ -47,6 +46,7 @@ Accelerometer::Accelerometer(int p_SampleRate)
 {
     calculate = new Calculate();
 
+
     timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(processData()));
     sampleRate = p_SampleRate;
@@ -68,7 +68,7 @@ Accelerometer::~Accelerometer()
 void Accelerometer::start()
 {
     initValues();
-    calibrate();
+    //calibrate();
     timer->start(sampleRate);
     now.restart();
 }
@@ -131,6 +131,7 @@ void Accelerometer::calibrate(void)
     calibrationX = calibrationX/1024;  // division by 1024
     calibrationY = calibrationY/1024;
     calibrationZ = calibrationZ/1024;
+
 }
 
 /**
@@ -149,6 +150,7 @@ void Accelerometer::stop()
  * Forwards data to Calculate class for processing
  *
  */
+/*
 void Accelerometer::processData()
 {
     getAcceleration(accelerationX, accelerationY, accelerationZ);
@@ -195,7 +197,7 @@ void Accelerometer::processData()
     currentSpeed = calculate->getCurrentSpeed();
     distanceTraveled = calculate->getDistanceTraveled();
 }
-
+*/
 /**
  * Smooths Accelerometer data
  *
@@ -203,41 +205,23 @@ void Accelerometer::processData()
  * @param y accelerometer's y-axis input
  * @param z accelerometer's z-axis input
  */
-void Accelerometer::smoothData(qreal x, qreal y, qreal z)
+void Accelerometer::smoothData(qreal &x, qreal &y, qreal &z)
 {
     accelerationX = x;
     accelerationY = y;
     accelerationZ = z;
+
     if (sampleIndex > 0)
     {
-        accelerationX = previousAccelerationX + (accelerationX-previousAccelerationX) * kFilteringFactor;
-        accelerationY = previousAccelerationY + (accelerationY-previousAccelerationY) * kFilteringFactor;
-        accelerationZ = previousAccelerationZ + (accelerationZ-previousAccelerationZ) * kFilteringFactor;
+        accelerationX = ((previousAccelerationX) * (1-kFilteringFactor)) + (accelerationX * kFilteringFactor);
+        accelerationY = ((previousAccelerationY) * (1-kFilteringFactor)) + (accelerationY * kFilteringFactor);
+        accelerationZ = ((previousAccelerationZ) * (1-kFilteringFactor)) + (accelerationZ * kFilteringFactor);
     }
     sampleIndex++;
 }
 
 void Accelerometer::getAcceleration(qreal &x, qreal &y, qreal &z)
 {
-    /*
-    QFile file(kFileName);
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        return;
-    }
-
-    // Read data, parse with regular expressions and process it
-    QByteArray line = file.readLine();
-    QRegExp rx("([0-9-]+) ([0-9-]+) ([0-9-]+)");
-    rx.indexIn(line);
-
-    x = rx.cap(1).toInt()/1000;
-    y = rx.cap(2).toInt()/1000;
-    z = rx.cap(3).toInt()/1000;
-
-    file.close();
-    */
-
     QDBusConnection connection(QDBusConnection::systemBus());
     if (connection.isConnected()) {
         QDBusInterface interface("com.nokia.mce", "/com/nokia/icd", QString(), connection);

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index 616c2ac..cd0c2ef 100644 (file)
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -25,6 +25,8 @@ public:
     Accelerometer(int p_SampleRate);
     ~Accelerometer();
 
+    void getAcceleration(qreal &x, qreal &y, qreal &z);
+    void smoothData(qreal &x, qreal &y, qreal &z);
     void calibrate();
 
     void start();
@@ -34,11 +36,11 @@ public:
 
     void setSampleRate(int pSampleRate);
     int getSampleRate();
-    void getAcceleration(qreal &x, qreal &y, qreal &z);
 
     qreal getTrueAccelerationX();
     qreal getTrueAccelerationY();
     qreal getTrueAccelerationZ();
+
     qreal getPreviousSpeed();
     qreal getCurrentSpeed();
 
@@ -57,13 +59,13 @@ public:
     qreal getIntervalTime();
     qreal getTotalTime();
 
+    Calculate *calculate;
+
 private slots:
-    void processData();
-    void smoothData(qreal x, qreal y, qreal z);
+    //void processData();
 
-private:
-    Calculate *calculate;
 
+private:
     qreal accelerationX, accelerationY, accelerationZ;
     qreal trueAccelerationX,trueAccelerationY,trueAccelerationZ;
     qreal previousAccelerationX,previousAccelerationY,previousAccelerationZ;
@@ -82,6 +84,7 @@ private:
     double sampleRate;
 
     bool firstRun;
+
 };
 
 #endif // ACCELEROMETER_H

diff --git a/Client/calculate.cpp b/Client/calculate.cpp
index aa579ec..85c22c7 100644 (file)
--- a/Client/calculate.cpp
+++ b/Client/calculate.cpp
@@ -36,6 +36,9 @@ Calculate::~Calculate()
 void Calculate::reset()
 {
     averageSpeed = 0;
+    averagePower = 0;
+    peakPower = 0;
+    currentPower = 0;
     currentSpeed = 0;
     distanceTraveled = 0;
     lastAcceleration = 0;
@@ -43,7 +46,7 @@ void Calculate::reset()
     lastSpeed = 0;
     numOfIterations = 0;
     totalTime = 0;
-    count = 0;
+    //count = 0;
 
     speedCheckPoints.append(10);
     speedCheckPoints.append(20);
@@ -117,16 +120,16 @@ void Calculate::calculateParameters(double currentAcceleration, double seconds)
     {
         foreach (double speed, speedCheckPoints)
         {
-            if ((lastCheckpoint != floor(speed)) && (floor(currentSpeed) == floor(speed)))
+            if ((lastCheckpoint != floor(speed)) && (floor(getCurrentSpeed()) == floor(speed)))
             {
-                emit checkPointReached(totalTime, currentSpeed);
-                lastCheckpoint = floor(currentSpeed);
+                emit checkPointReached(totalTime, getCurrentSpeed());
+                lastCheckpoint = floor(getCurrentSpeed());
             }
         }
     }
 
     // Check for movement
-    accelStoppedCheck(currentAcceleration);
+    //accelStoppedCheck(currentAcceleration);
 
     lastSpeed = currentSpeed;
     lastAcceleration = currentAcceleration;
@@ -138,6 +141,7 @@ void Calculate::calculateParameters(double currentAcceleration, double seconds)
   * a short period of time. Velocity is set to zero to avoid
   * distance errors.
   */
+/*
 void Calculate::accelStoppedCheck(double currentAcceleration)
 {
 
@@ -154,7 +158,7 @@ void Calculate::accelStoppedCheck(double currentAcceleration)
         currentSpeed=0;
     }
 }
-
+*/
 // Getters and setters
 
 double Calculate::getAverageSpeed()

diff --git a/Client/calculate.h b/Client/calculate.h
index 34fcaec..55069d2 100644 (file)
--- a/Client/calculate.h
+++ b/Client/calculate.h
@@ -23,7 +23,7 @@ public:
 
     void reset();
     void calculateParameters(double currentAcceleration, double seconds);
-    void accelStoppedCheck(double currentAcceleration);
+    //void accelStoppedCheck(double currentAcceleration);
 
     double getAverageSpeed();
     void setAverageSpeed(double value);
@@ -71,7 +71,7 @@ private:
     double lastSpeed;
     long numOfIterations;
     double totalTime;
-    int count;
+    //int count;
     double peakPower;
     double currentPower;
     double averagePower;