camera-app

Merge lp://staging/~uriboni/camera-app/reset-zoom-ui into lp://staging/camera-app

reset-zoom-ui
Merge into trunk

Proposed by Ugo Riboni on 2015-11-18

Status:

Superseded

Proposed branch:

lp://staging/~uriboni/camera-app/reset-zoom-ui

Merge into:

lp://staging/camera-app

Diff against target:

212 lines (+81/-29)

4 files modified

ViewFinderOverlay.qml (+8/-1)
tests/autopilot/camera_app/emulators/main_window.py (+20/-1)
tests/autopilot/camera_app/tests/test_capture.py (+6/-27)
tests/autopilot/camera_app/tests/test_zoom.py (+47/-0)

To merge this branch:

bzr merge lp://staging/~uriboni/camera-app/reset-zoom-ui

Related bugs:

Bug #1514099: Zoom level and reported zoom level mismatch when restore from suspend	High	Fix Released
Bug #1517029: Real zoom level and reported zoom level mismatch when switching recording mode or camera	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-25
Florian Boucault (community)		2015-11-18	Needs Information on 2015-11-19
Review via email: mp+277869@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-11-25.

Commit message

Correctly reset the zoom UI when the actual zoom level of the camera resets due to switching cameras or recording modes

Description of the change

Correctly reset the zoom UI when the actual zoom level of the camera resets due to switching cameras or recording modes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-18:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/455/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2015-11-19:

We have a binding one way.

Binding { target: camera; property: "currentZoom"; value: zoomControl.value }

We ideally would want one the other way no? This could probably be achieved without binding loop issues with something like:

Connections {
target: camera
onCurrentZoomChanged: zoomControl.value = camera.currentZoom
}

review: Needs Information

lp://staging/~uriboni/camera-app/reset-zoom-ui updated on 2015-11-19

601. By Ugo Riboni on 2015-11-19: Implement the two-way binding in a more general way

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-19:

FAILED: Continuous integration, rev:600
http://jenkins.qa.ubuntu.com/job/camera-app-ci/458/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/154
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/312
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/973
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/814
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25260

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/458/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-19:

FAILED: Continuous integration, rev:600
http://jenkins.qa.ubuntu.com/job/camera-app-ci/461/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/157
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/315
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/817
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25277

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/461/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-20:

FAILED: Continuous integration, rev:601
http://jenkins.qa.ubuntu.com/job/camera-app-ci/464/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/160
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/160
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/318
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/979
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/820
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25299

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/464/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-23:

FAILED: Continuous integration, rev:601
http://jenkins.qa.ubuntu.com/job/camera-app-ci/469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/165
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/165
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/324
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/828
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25394

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/469/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ugo Riboni (uriboni) wrote on 2015-11-24:

> We have a binding one way.
>
> Binding { target: camera; property: "currentZoom"; value:
> zoomControl.value }
>
> We ideally would want one the other way no? This could probably be achieved
> without binding loop issues with something like:
>
> Connections {
> target: camera
> onCurrentZoomChanged: zoomControl.value = camera.currentZoom
> }

This actually causes lots of binding loop warnings when zooming, as the value changes:

ViewFinderOverlay.qml:743:13: QML Binding: Binding loop detected for property "value"

I don't think they are a problem, but it still not nice to have them. Should I revert to my previous implementation ?

lp://staging/~uriboni/camera-app/reset-zoom-ui updated on 2015-11-24

602. By Ugo Riboni on 2015-11-24: Revert previous commit as it was causing binding loop warnings when zooming
603. By Ugo Riboni on 2015-11-24: Reset the zoom UI to the actual level when coming back from suspend