Merge lp:~nik90/ubuntu-clock-app/change-timer-logic into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Fixes potential timer lag by using code logic similar to stopwatch functionality by relying on time delta to keep track of timer.

Fixes potential timer lag by using code logic similar to stopwatch functionality. The time keeping is no longer done by the qml timer which has been found to not be reliable on different hardware.

[Nekhelesh Ramananthan (nik90)]

Note: Approve only after testing on Nexus 7. The test should include suspended state (by switching to other app), running the timer for atleast 10 minutes to ensure it keeps track of timer accurately.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:95
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/68/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-quantal-amd64-ci/33
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-raring-amd64-ci/68

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/68/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

please avoid to create extra ".js" files try to keep everything on QML if is not possible use the commom file, this way we can re-use the code for other pages.

[Nekhelesh Ramananthan (nik90)]

> please avoid to create extra ".js" files try to keep everything on QML if is
> not possible use the commom file, this way we can re-use the code for other
> pages.

I didn't create a new .js file. In fact I made the function function getstringTimer() smaller by utilizing function ssToTime(). The function ssToTime() is required by both analogTimer.qml and TimerPage.qml hence its place in the .js file.

[lp:~nik90/ubuntu-clock-app/change-timer-logic]

96. By Nekhelesh Ramananthan on 2013-06-03

Removed .js files and integrated it into qml files

[Nekhelesh Ramananthan (nik90)]

Removed .js files by moving functions to the appropriate qml file.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:96
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/69/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-quantal-amd64-ci/34
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-raring-amd64-ci/69

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/69/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/change-timer-logic]

97. By Nekhelesh Ramananthan on 2013-06-03

Simplified code

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:97
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/70/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-quantal-amd64-ci/35
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-raring-amd64-ci/70

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/70/rebuild

review: Approve (continuous-integration)

[Michael Hall (mhall119)]

Tested on Nexus 7, works perfectly

review: Approve

=== modified file 'timer/AnalogTimer.qml'
--- timer/AnalogTimer.qml	2013-05-11 22:09:42 +0000
+++ timer/AnalogTimer.qml	2013-06-03 21:41:26 +0000
@@ -25,6 +25,9 @@
 AnalogFaceBase {
     id: clockOuterCircle
 
+    property var startTime: 0;
+    property var remTime: 0;
+
     // Properties to store/set the time variables
     property int seconds: 0;
     property int minutes: 0;
@@ -45,26 +48,23 @@
     property bool hoursFlag
     property bool inProgressFlag
 
-    onTotalTimeChanged: {
-        if (totalTime < 0) {
-            timerOn = false;
-        }
-        else {
-            setTime(totalTime);
-        }
-    }
-
     // Timer function called by the main clock loop
     function onTimerUpdate () {
         if( timerOn ) {
-            totalTime--;
-            timerHand.rotationAngle = seconds * 6;
+            remTime = totalTime - Math.floor((new Date() - startTime)/ 1000);
+
+            if (remTime < 0) {
+                timerOn = false
+                totalTime = -1;
+            } else {
+                ssToTime(remTime);
+                timerHand.rotationAngle = seconds * 6;
+            }
         }
     }
 
-    // Function to calculate the hours, minutes and seconds from the total time
-    function setTime ( sec ) {
-        var time = sec
+    // Function to convert time (in seconds) to hh:mm:ss format
+    function ssToTime(time) {
         seconds = time % 60
         time = Math.floor(time / 60)
         minutes = time % 60
@@ -74,6 +74,7 @@
     // Function to disable timer and reset time
     function reset() {
         timerOn = false;
+        startTime = remTime = 0;
         hours = minutes = seconds = totalTime = timerValue = timerHand.rotationAngle = 0;
     }
 

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-05-25 16:33:33 +0000
+++ timer/TimerPage.qml	2013-06-03 21:41:26 +0000
@@ -23,7 +23,6 @@
 import "../common"
 import "../common/Constants.js" as Constants
 import "../common/ClockUtils.js" as Utils
-import "TimerScript.js" as TScript
 
 Page {
     id: timerPage
@@ -44,6 +43,23 @@
         namePreset.text = "";
     }
 
+    // Function to return total seconds.
+    function totalSeconds(hou, min, sec) {
+        return( (hou * 60 * 60) + (min * 60) + sec );
+    }
+
+    // Function to calculate and print the hours, minutes and seconds from the total time as a string
+    function getstringTimer(time) {
+        var hours, minutes, seconds;
+
+        seconds = time % 60
+        time = Math.floor(time / 60)
+        minutes = time % 60
+        hours = Math.floor(time / 60)
+
+        return Utils.hmsToString(hours, minutes, seconds);
+    }
+
     Component.onCompleted: {
         Utils.log("TimerPage loaded");
     }
@@ -178,7 +194,8 @@
                     break;
 
                 case "START":
-                    totalTime = TScript.totalSeconds(hours, minutes, seconds);
+                    totalTime = totalSeconds(hours, minutes, seconds);
+                    analogTimer.startTime = new Date();
                     timerOn = true;
                     state = "STOP";
 
@@ -224,7 +241,7 @@
 
                     Label {
                         fontSize: "medium"
-                        text: TScript.getstringTimer(seconds)
+                        text: getstringTimer(seconds);
                         anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
                     }
 
@@ -244,7 +261,7 @@
                     onClicked: {
                         if (!timerOn) {
                             buttonTimer.state = "START";
-                            analogTimer.setTime(seconds);
+                            analogTimer.ssToTime(seconds);
                             listTimerPreset.currentIndex = index
                         }
                     }
@@ -278,7 +295,7 @@
                 anchors.fill: parent
                 onClicked: {
                     if (namePreset.text != "" && (hours > 0 || minutes > 0 || seconds > 0)) {
-                        presetModel.appendPreset(namePreset.text, TScript.totalSeconds(hours, minutes, seconds));
+                        presetModel.appendPreset(namePreset.text, totalSeconds(hours, minutes, seconds));
                         reset();
                         timerPage.state = ""
                     }

=== removed file 'timer/TimerScript.js'
--- timer/TimerScript.js	2013-05-25 01:13:27 +0000
+++ timer/TimerScript.js	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alessandro Pozzi <[e-mail]>
- *              Nekhelesh Ramananthan <[e-mail]>
- */
-
-Qt.include("../common/ClockUtils.js")
-
-// Function to return total seconds.
-function totalSeconds ( hou, min, sec ) {
-    return( (hou * 60 * 60) + (min * 60) + sec );
-}
-
-// Function to calculate the hours, minutes and seconds from the total time
-function getstringTimer ( seconds ) {
-    var time = seconds
-    var sec = time % 60
-    time = Math.floor(time / 60)
-    var min = time % 60
-    var hor = Math.floor(time / 60)
-    return Utils.hmsToString(hor, min, sec);
-}