Merge lp:~seb128/ubuntu-system-settings/battery-correct-init-height into lp:ubuntu-system-settings

[Sebastien Bacher]

[battery] use the correct height value for the first point of the graph,
that fixes the initial point often starting to high and the curve starting
with an almost vertical line

[battery] use the correct height value for the first point of the graph,
that fixes the initial point often starting to high and the curve starting
with an almost vertical line

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1382
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2053/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/323
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2214
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2214/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19596

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2053/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

the CI failed on a tz selection issue, not likely related to this changeset

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2015-03-16 13:51:36 +0000
+++ plugins/battery/PageComponent.qml	2015-04-14 09:26:07 +0000
@@ -243,7 +243,7 @@
                     /* time is the offset in seconds compared to the current time (negative value)
                        we display the charge on a day, which is 86400 seconds, the value is the % */
                     ctx.moveTo((86400 - chargeDatas[0].time) / 86400 * width,
-                               (chargeDatas[0].value / 100) * width)
+                               (chargeDatas[0].value / 100) * height)
                     for (var i = 1; i < chargeDatas.length; i++) {
                         ctx.lineTo((86400-chargeDatas[i].time) / 86400 * width,
                                    (chargeDatas[i].value / 100) * height)