Fixed VideoPlayerPage.qml failure to set cameraConfig

[harmattan/cameraplus] / qml / FocusReticle.qml

diff --git a/qml/FocusReticle.qml b/qml/FocusReticle.qml
index 82d267b..39fba6b 100644 (file)
--- a/qml/FocusReticle.qml
+++ b/qml/FocusReticle.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 
@@ -29,15 +29,18 @@ import CameraPlus 1.0
 
 MouseArea {
     id: mouse
-    x: cam ? cam.renderArea.x : 0
-    y: cam ? cam.renderArea.y : 0
-    width: cam ? cam.renderArea.width : 0
-    height: cam ? cam.renderArea.height : 0
+    x: renderArea.x
+    y: renderArea.y
+    width: renderArea.width
+    height: renderArea.height
     drag.minimumX: 0
     drag.minimumY: 0
     drag.maximumX: width - reticle.width
     drag.maximumY: height - reticle.height
 
+    property variant videoResolution
+    property variant renderArea
+
     property bool locked: false
 
     property int cafStatus: AutoFocus.None
@@ -94,22 +97,25 @@ MouseArea {
             return
         } else if (!touchMode && !roiMode) {
             // console.log("resetting ROI")
-            cam.roi.resetRegionOfInterest()
+            if (cam.roi) {
+                cam.roi.resetRegionOfInterest()
+            }
+
             return
         }
 
         // TODO: rework this and move to unnormalized coordinates
         // in terms of video resolution:
-        var rx = (cam.videoResolution.width * reticle.x) / mouse.width
-        var rwidth = (cam.videoResolution.width * reticle.width) / mouse.width
-        var ry = (cam.videoResolution.height * reticle.y) / mouse.height
-        var rheight = (cam.videoResolution.height * reticle.height) / mouse.height
+        var rx = (videoResolution.width * reticle.x) / mouse.width
+        var rwidth = (videoResolution.width * reticle.width) / mouse.width
+        var ry = (videoResolution.height * reticle.y) / mouse.height
+        var rheight = (videoResolution.height * reticle.height) / mouse.height
 
         // Translate to normalized coordinates (1x1 square) as expected by our C++ backend
-        rx = rx / cam.videoResolution.width
-        rwidth = rwidth / cam.videoResolution.width
-        ry = ry / cam.videoResolution.height
-        rheight = rheight / cam.videoResolution.height
+        rx = rx / videoResolution.width
+        rwidth = rwidth / videoResolution.width
+        ry = ry / videoResolution.height
+        rheight = rheight / videoResolution.height
 
         // console.log("Setting ROI to: " + rx + "x" + ry)
         cam.roi.setRegionOfInterest(Qt.rect(rx, ry, rwidth, rheight))