Generate sensible stats when no journeys are logged

Previouosly it was producing empty or "%NaN" results due to zero
or division-by-zero calculations. Now it should show sensible
text.

There are also some changes made to allow the cover to work better
on Jolla One and Jolla C devices.

diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index a4a911b..67d6a83 100644 (file)
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@@ -11,6 +11,13 @@ CoverBackground {
         stopwatchtrigger.restart()
     }
 
         stopwatchtrigger.restart()
     }
 

+    allowResize: true
+
+    property int _maximumItems: height >= Theme.coverSizeLarge.height
+                                ? 2
+                                : height >= Theme.coverSizeSmall.height ? 1 : 0
+
+

     Item {
         id: stopwatch
         property int seconds: 0
     Item {
         id: stopwatch
         property int seconds: 0

@@ -45,46 +52,47 @@ CoverBackground {
             yScale: root.height / contents.height
         }
 
             yScale: root.height / contents.height
         }
 

-    ClockView {
-        id: clockView
-
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            margins: Theme.paddingLarge
-        }
-        height: width
-    }
+        ClockView {
+            id: clockView

 
 

-    LargeItem {
-        id: stopwatchView
-
-        anchors {
-            top: clockView.bottom
-            topMargin: Theme.paddingMedium
-            leftMargin: Theme.paddingLarge
-            rightMargin: Theme.paddingLarge
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+                margins: Theme.paddingLarge
+            }
+            height: width

         }
 
         }
 

-        textVisible: root.update
+        LargeItem {
+            id: stopwatchView

 
 

-        title: qsTr("Pedalo")
+            anchors {
+                top: clockView.bottom
+                topMargin: Theme.paddingMedium
+                leftMargin: Theme.paddingLarge
+                rightMargin: Theme.paddingLarge
+            }

 
 

-        text: {
-            if (stopwatch.seconds < 60) {
-                return qsTr("%n seconds", "", stopwatch.seconds)
-            } else if (stopwatch.seconds < 60*60) {
-                return qsTr("%1 minutes").arg(Math.floor(stopwatch.seconds/60))
-            } else {
-                var minutes = Math.floor(stopwatch.seconds/60)
-                var hours = Math.floor(minutes/60)
-                minutes = minutes % 60
-                return qsTrId("%1h %2min").arg(hours).arg(minutes)
+            titleVisible: ((!root.update) && _maximumItems > 0) || (_maximumItems > 1)
+            textVisible: (root.update && (_maximumItems > 0))
+
+            title: qsTr("Pedalo")
+
+            text: {
+                if (stopwatch.seconds < 60) {
+                    return qsTr("%n seconds", "", stopwatch.seconds)
+                } else if (stopwatch.seconds < 60*60) {
+                    return qsTr("%1 minutes").arg(Math.floor(stopwatch.seconds/60))
+                } else {
+                    var minutes = Math.floor(stopwatch.seconds/60)
+                    var hours = Math.floor(minutes/60)
+                    minutes = minutes % 60
+                    return qsTrId("%1h %2min").arg(hours).arg(minutes)
+                }

             }
         }
     }
             }
         }
     }

-    }

 
     CoverActionList {
         id: coverAction
 
     CoverActionList {
         id: coverAction

diff --git a/qml/pages/About.qml b/qml/pages/About.qml
index f732dd2..e526861 100644 (file)
--- a/qml/pages/About.qml
+++ b/qml/pages/About.qml
@@ -34,7 +34,7 @@ Page {
             }
 
             Label {
             }
 
             Label {

-                text: qsTr("Compare your pedalo performance with others")
+                text: qsTr("Compare your relative pedalo performance with others in a privacy-preserving way")

                 wrapMode: Text.WordWrap
                 font.pixelSize: Theme.fontSizeSmall
                 anchors {
                 wrapMode: Text.WordWrap
                 font.pixelSize: Theme.fontSizeSmall
                 anchors {

diff --git a/src/status.cpp b/src/status.cpp
index b4bb630..4a46cdf 100644 (file)
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -57,8 +57,16 @@ quint64 Status::getTimeSpentCycling() const {
 double Status::getAverageDuration() const {
     quint64 time = getTimeSpentCycling();
     quint64 count = Status::getJourneyCount();
 double Status::getAverageDuration() const {
     quint64 time = getTimeSpentCycling();
     quint64 count = Status::getJourneyCount();

+    double average = 0.0;

 
 

-    return ((double)time / (double)count);
+    if (count > 0) {
+        average = ((double)time / (double)count);
+    }
+    else {
+        average = 0.0;
+    }
+
+    return average;

 }
 
 double Status::getSpeedPercentile() const {
 }
 
 double Status::getSpeedPercentile() const {

@@ -74,7 +82,12 @@ double Status::getSpeedPercentile() const {
         overtakenby += journey.getOvertakenBy();
     }
 
         overtakenby += journey.getOvertakenBy();
     }
 

-    percentile = (double)overtook / (double)(overtook + overtakenby);
+    if (overtook + overtakenby > 0.0) {
+        percentile = (double)overtook / (double)(overtook + overtakenby);
+    }
+    else {
+        percentile = 0.0;
+    }

 
     return percentile;
 }
 
     return percentile;
 }

@@ -111,6 +124,10 @@ QString Status::getFormattedTime(quint64 seconds, int min, int max) {
         }
     }
 
         }
     }
 

+    if (formatted == "") {
+        formatted = "None";
+    }
+

     return formatted;
 }
 
     return formatted;
 }
 

diff --git a/translations/harbour-pedalo-de.ts b/translations/harbour-pedalo-de.ts
index 801b26d..c974b69 100644 (file)
--- a/translations/harbour-pedalo-de.ts
+++ b/translations/harbour-pedalo-de.ts
@@ -14,10 +14,6 @@
         <source>About Pedalo</source>
         <translation type="unfinished"></translation>
     </message>
         <source>About Pedalo</source>
         <translation type="unfinished"></translation>
     </message>

-    <message>
-        <source>Compare your pedalo performance with others</source>
-        <translation type="unfinished"></translation>
-    </message>

     <message>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     <message>
         <source>Version:</source>
         <translation type="unfinished"></translation>

@@ -42,6 +38,10 @@
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>

+    <message>
+        <source>Compare your relative pedalo performance with others in a privacy-preserving way</source>
+        <translation type="unfinished"></translation>
+    </message>

 </context>
 <context>
     <name>CoverPage</name>
 </context>
 <context>
     <name>CoverPage</name>

diff --git a/translations/harbour-pedalo.ts b/translations/harbour-pedalo.ts
index 801b26d..c974b69 100644 (file)
--- a/translations/harbour-pedalo.ts
+++ b/translations/harbour-pedalo.ts
@@ -14,10 +14,6 @@
         <source>About Pedalo</source>
         <translation type="unfinished"></translation>
     </message>
         <source>About Pedalo</source>
         <translation type="unfinished"></translation>
     </message>

-    <message>
-        <source>Compare your pedalo performance with others</source>
-        <translation type="unfinished"></translation>
-    </message>

     <message>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     <message>
         <source>Version:</source>
         <translation type="unfinished"></translation>

@@ -42,6 +38,10 @@
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>

+    <message>
+        <source>Compare your relative pedalo performance with others in a privacy-preserving way</source>
+        <translation type="unfinished"></translation>
+    </message>

 </context>
 <context>
     <name>CoverPage</name>
 </context>
 <context>
     <name>CoverPage</name>