diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-06 15:21:38 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 07:26:59 +0100 |
| commit | 6b67a11032779ff3a7a78a57e8d2bb2cd8b7e525 (patch) | |
| tree | a40f277b1df310f2a83223d24f0e1f11b69da7f7 /tests/auto/unit/qcamera/tst_qcamera.cpp | |
| parent | c97f5f8c2e91c1b76d42583efaf232487d490060 (diff) | |
Add the spot for spot metering mode.
Not yet fully documented in QML - needs a bit of an overhaul first.
Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'tests/auto/unit/qcamera/tst_qcamera.cpp')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 8f52e9fa3..5334c5244 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -235,6 +235,10 @@ void tst_QCamera::testSimpleCameraExposure() cameraExposure->setMeteringMode(QCameraExposure::MeteringSpot); QCOMPARE(cameraExposure->meteringMode(), QCameraExposure::MeteringMatrix); + QCOMPARE(cameraExposure->spotMeteringPoint(), QPointF()); + cameraExposure->setSpotMeteringPoint(QPointF(0.5f, 0.5f)); + QCOMPARE(cameraExposure->spotMeteringPoint(), QPointF()); + QCOMPARE(cameraExposure->exposureCompensation(), 0.0); cameraExposure->setExposureCompensation(2.0); QCOMPARE(cameraExposure->exposureCompensation(), 0.0); @@ -626,6 +630,15 @@ void tst_QCamera::testCameraExposure() cameraExposure->setMeteringMode(QCameraExposure::MeteringSpot); QCOMPARE(cameraExposure->meteringMode(), QCameraExposure::MeteringSpot); + cameraExposure->setSpotMeteringPoint(QPointF(0.5f, 0.25f)); + QCOMPARE(cameraExposure->spotMeteringPoint(), QPointF(0.5f, 0.25f)); + cameraExposure->setSpotMeteringPoint(QPointF(0.25f, 56.3f)); + QCOMPARE(cameraExposure->spotMeteringPoint(), QPointF(0.5f, 0.25f)); + cameraExposure->setSpotMeteringPoint(QPointF(0, 0)); + QCOMPARE(cameraExposure->spotMeteringPoint(), QPointF(0, 0)); + cameraExposure->setSpotMeteringPoint(QPointF(1, 1)); + QCOMPARE(cameraExposure->spotMeteringPoint(), QPointF(1, 1)); + QCOMPARE(cameraExposure->exposureCompensation(), 0.0); cameraExposure->setExposureCompensation(2.0); QCOMPARE(cameraExposure->exposureCompensation(), 2.0); |