Merge lp:~fboucault/camera-app/orientation_lock_fix into lp:camera-app

[Florian Boucault]

Fix photos/videos when shooting/recording with orientation lock on by not relying on the app orientation returned by unity8 but instead the device orientation itself.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/camera-app-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/105
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/184/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/712/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/819/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/439
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18700
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/567/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/832
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/832/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

will need some sort of test for this to land

[Florian Boucault (fboucault)]

Will write a manual test because automated testing is not really possible
as of yet for lack of ability to set the device's orientation
programatically. Work is in progress to fill that gap:
https://code.launchpad.net/~canonical/unity8/fake_platform_sensors_module/+merge/247334

On Wed, Mar 11, 2015 at 3:29 PM, Bill Filler <email address hidden>
wrote:

> will need some sort of test for this to land
> --
>
> https://code.launchpad.net/~fboucault/camera-app/orientation_lock_fix/+merge/252428
> You are the owner of lp:~fboucault/camera-app/orientation_lock_fix.
>

[Florian Boucault (fboucault)]

Manual test now added to test plan.

> Will write a manual test because automated testing is not really possible
> as of yet for lack of ability to set the device's orientation
> programatically. Work is in progress to fill that gap:
> https://code.launchpad.net/~canonical/unity8/fake_platform_sensors_module/+mer
> ge/247334
>
> On Wed, Mar 11, 2015 at 3:29 PM, Bill Filler <email address hidden>
> wrote:
>
> > will need some sort of test for this to land
> > --
> >
> > https://code.launchpad.net/~fboucault/camera-
> app/orientation_lock_fix/+merge/252428
> > You are the owner of lp:~fboucault/camera-app/orientation_lock_fix.
> >

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-01-27 17:37:09 +0000
+++ ViewFinderOverlay.qml	2015-03-10 13:17:58 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components.Popups 1.0
 import QtMultimedia 5.0
 import QtPositioning 5.2
+import QtSensors 5.0
 import CameraApp 0.1
 import Qt.labs.settings 1.0
 
@@ -486,6 +487,11 @@
         }
     }
 
+    OrientationSensor {
+        id: orientationSensor
+        active: true
+    }
+
     Item {
         id: controls
 
@@ -513,7 +519,33 @@
         }
 
         function shoot() {
-            var orientation = Screen.angleBetween(Screen.orientation, Screen.primaryOrientation);
+            var orientation;
+            switch (orientationSensor.reading.orientation) {
+                case OrientationReading.TopUp:
+                    orientation = 0;
+                    break;
+                case OrientationReading.TopDown:
+                    orientation = 180;
+                    break;
+                case OrientationReading.LeftUp:
+                    orientation = 90;
+                    break;
+                case OrientationReading.RightUp:
+                    orientation = 270;
+                    break;
+                default:
+                    /* Workaround for OrientationSensor not setting a valid value until
+                       the device is rotated.
+                       Ref.: https://bugs.launchpad.net/qtubuntu-sensors/+bug/1429865
+
+                       Note that the value returned by Screen.angleBetween is valid if
+                       the orientation lock is not engaged.
+                       Ref.: https://bugs.launchpad.net/camera-app/+bug/1422762
+                    */
+                    orientation = Screen.angleBetween(Screen.orientation, Screen.primaryOrientation);
+                    break;
+            }
+
             if (Screen.primaryOrientation == Qt.PortraitOrientation) {
                 orientation += 90;
             }