X-Git-Url: http://git.maemo.org/git/?p=gpssportsniffer;a=blobdiff_plain;f=track.h;fp=track.h;h=530059ccf4b775fdd864dbf0554004fa303bd820;hp=4c0b61a376cc55427d3299ed5ebe3f6f8b11c640;hb=07ffd2adcb93c3dbe4a201312ba15cb14f86ec06;hpb=d83d54cbe39ffa872c360c017fccfafc3520e392;ds=sidebyside

diff --git a/track.h b/track.h
index 4c0b61a..530059c 100755
--- a/track.h
+++ b/track.h
@@ -44,14 +44,16 @@ protected:
     QDateTime endTime;
     double duration;
     double distance;
-    qreal avgSpeed;
-    qreal maxSpeed;
-    qreal elevationGain;
-    qreal elevationLoss;
-    qreal minElevation;
-    qreal maxElevation;
-    qreal avgPace;
-    qreal bestPace;
+    double avgSpeed;
+    double maxSpeed;
+    double elevationGain;
+    double elevationLoss;
+    double minElevation;
+    double maxElevation;
+    double lastElevation;
+    double lastElevationAccuracy;
+    double avgPace;
+    double bestPace;
 
 public:
 
@@ -61,14 +63,14 @@ public:
     /*
     inline double getDuration(){return duration;}
     inline double getDistance(){return distance;}
-    inline qreal getAvgSpeed(){return avgSpeed;}
-    inline qreal getMaxSpeed(){return maxSpeed;}
-    inline qreal getElevationGain(){return elevationGain;}
-    inline qreal getElevationLoss(){return elevationLoss;}
-    inline qreal getMinElevation(){return minElevation;}
-    inline qreal getMaxElevation(){return maxelevation;}
-    inline qreal getAvgPace(){return avgPace;}
-    inline qreal getBestPace(){return bestPace;}
+    inline double getAvgSpeed(){return avgSpeed;}
+    inline double getMaxSpeed(){return maxSpeed;}
+    inline double getElevationGain(){return elevationGain;}
+    inline double getElevationLoss(){return elevationLoss;}
+    inline double getMinElevation(){return minElevation;}
+    inline double getMaxElevation(){return maxelevation;}
+    inline double getAvgPace(){return avgPace;}
+    inline double getBestPace(){return bestPace;}
     */
 
     void addSummary(Summarized summary);
@@ -111,17 +113,23 @@ public:
     inline int getMaxSpeed(){return maxSpeed;}
     inline void setMaxSpeed(int speed){maxSpeed=speed;}
 
-    inline int getElevationGain(){return elevationGain;}
-    inline void setElevationGain(int elevation){elevationGain=elevation;}
+    inline double getElevationGain(){return elevationGain;}
+    inline void setElevationGain(double elevation){elevationGain=elevation;}
 
-    inline int getElevationLoss(){return elevationLoss;}
-    inline void setElevationLoss(int elevation){elevationLoss=elevation;}
+    inline double getElevationLoss(){return elevationLoss;}
+    inline void setElevationLoss(double elevation){elevationLoss=elevation;}
 
-    inline int getMinElevation(){return minElevation;}
-    inline void setMinElevation(int elevation){minElevation=elevation;}
+    inline double getMinElevation(){return minElevation;}
+    inline void setMinElevation(double elevation){minElevation=elevation;}
 
-    inline int getMaxElevation(){return maxElevation;}
-    inline void setMaxElevation(int elevation){maxElevation=elevation;}
+    inline double getMaxElevation(){return maxElevation;}
+    inline void setMaxElevation(double elevation){maxElevation=elevation;}
+
+    inline double getLastElevation(){return lastElevation;}
+    inline void setLastElevation(double elevation){lastElevation=elevation;}
+
+    inline double getLastElevationAccuracy(){return lastElevationAccuracy;}
+    inline void setLastElevationAccuracy(double elevation){lastElevationAccuracy=elevation;}
 
     inline int getAvgPace(){return avgPace;}
     inline void setAvgPace(int time){avgPace=time;}
@@ -140,19 +148,19 @@ private:
     double elevation;
 
     QDateTime time;
-    qreal speed;
-    qreal direction;
-    qreal magneticVariation;
-    qreal horizontalAccuracy;
-    qreal verticalAccuracy;
-    qreal distancePrev;
+    double speed;
+    double direction;
+    double magneticVariation;
+    double horizontalAccuracy;
+    double verticalAccuracy;
+    double distancePrev;
     QTime timeToPrev;
 public:
-    explicit GpsPoint(double latitude, double longitude, int elevation);
-    explicit GpsPoint(double latitude, double longitude, int elevation,QDateTime time, qreal speed,
-                      qreal direction, qreal magneticVariation,qreal horizontalAccuracy, qreal verticalAccuracy);
-    explicit GpsPoint(double latitude, double longitude, int elevation,QDateTime time, qreal speed,
-                      qreal direction, qreal magneticVariation,qreal horizontalAccuracy, qreal verticalAccuracy, qreal distancePrev, QTime timeToPrev);
+    explicit GpsPoint(double latitude, double longitude, double elevation);
+    explicit GpsPoint(double latitude, double longitude, double elevation,QDateTime time, double speed,
+                      double direction, double magneticVariation,double horizontalAccuracy, double verticalAccuracy);
+    explicit GpsPoint(double latitude, double longitude, double elevation,QDateTime time, double speed,
+                      double direction, double magneticVariation,double horizontalAccuracy, double verticalAccuracy, double distancePrev, QTime timeToPrev);
 
     //virtual ~GpsPoint();
 
@@ -168,20 +176,20 @@ public:
     inline QDateTime getTime(){return time;}
     inline void setTime(QDateTime time_p){time=time_p;}
 
-    inline qreal getSpeed(){return speed;}
-    inline void setSpeed(qreal speed_p){speed=speed_p;}
+    inline double getSpeed(){return speed;}
+    inline void setSpeed(double speed_p){speed=speed_p;}
 
-    inline qreal getDirection(){return direction;}
-    inline void setDirection(qreal direction_p){direction=direction_p;}
+    inline double getDirection(){return direction;}
+    inline void setDirection(double direction_p){direction=direction_p;}
 
-    inline qreal getMagneticVariation(){return magneticVariation;}
-    inline void setMagneticVariation(qreal magneticVariation_p){magneticVariation=magneticVariation_p;}
+    inline double getMagneticVariation(){return magneticVariation;}
+    inline void setMagneticVariation(double magneticVariation_p){magneticVariation=magneticVariation_p;}
 
-    inline qreal getHorizontalAccuracy(){return horizontalAccuracy;}
-    inline void setHorizontalAccuracy(qreal horizontalAccuracy_p){horizontalAccuracy=horizontalAccuracy_p;}
+    inline double getHorizontalAccuracy(){return horizontalAccuracy;}
+    inline void setHorizontalAccuracy(double horizontalAccuracy_p){horizontalAccuracy=horizontalAccuracy_p;}
 
-    inline qreal getVerticalAccuracy(){return verticalAccuracy;}
-    inline void setVerticalAccuracy(qreal verticalAccuracy_p){verticalAccuracy=verticalAccuracy_p;}
+    inline double getVerticalAccuracy(){return verticalAccuracy;}
+    inline void setVerticalAccuracy(double verticalAccuracy_p){verticalAccuracy=verticalAccuracy_p;}
 
     inline double getDistancePrev(){return distancePrev;}
     inline void setDistancePrev(double distance){distancePrev=distance;}