diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-15 14:16:17 +0100 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-28 11:10:19 +0000 |
commit | 4e96893901c39fd7a65751549ec82bd18475006f (patch) | |
tree | 61a788a46deffd4f9fe7471a444a554bb1432ad8 /tests/auto/declarative_ui/tst_map.qml | |
parent | ba2a82b7db86d96fc1f110b4bbc88408f47a5774 (diff) |
Make min/max Tilt/FieldOfView Read/Write
This change makes the currently read only properties minimumTilt,
maximumTilt, minimumFieldOfView and maximumFieldOfView user-settable
as well, like minimum and maximum zoom level.
Autotests are included.
Task-number: QTBUG-58931
Change-Id: I784be7bd0d960061e94bc40cd8a45e466754526f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests/auto/declarative_ui/tst_map.qml')
-rw-r--r-- | tests/auto/declarative_ui/tst_map.qml | 86 |
1 files changed, 72 insertions, 14 deletions
diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml index 004e3b10..6691580e 100644 --- a/tests/auto/declarative_ui/tst_map.qml +++ b/tests/auto/declarative_ui/tst_map.qml @@ -262,42 +262,100 @@ Item { function test_tilt_limits() { - // Tilt limits are read only map.tilt = 0 //initial plugin values compare(map.minimumTilt, 0) compare(map.maximumTilt, 60) - map.tilt = 18 - compare(map.tilt, 18) + //Higher min level than curr tilt, should change curr tilt + map.minimumTilt = 5 + map.maximumTilt = 18 + compare(map.tilt, 5) + compare(map.minimumTilt, 5) + compare(map.maximumTilt, 18) - map.tilt = -2 - compare(map.tilt, 0) + //Trying to set higher than max, max should be set. + map.maximumTilt = 61 + compare(map.minimumTilt, 5) + compare(map.maximumTilt, 60) - map.tilt = 2 - compare(map.tilt, 2) + //Negative values should be ignored + map.minimumTilt = -1 + map.maximumTilt = -2 + compare(map.minimumTilt, 5) + compare(map.maximumTilt, 60) - map.tilt = 62 - compare(map.tilt, 60) + //Max limit lower than curr zoom, should change curr zoom + map.tilt = 18 + map.maximumTilt = 16 + compare(map.tilt, 16) + //resetting default + map.minimumTilt = 0 + map.maximumTilt = 60 map.tilt = 0 + compare(map.minimumTilt, 0) + compare(map.maximumTilt, 60) compare(map.tilt, 0) } function test_fov_limits() { - // Tilt limits are read only map.fieldOfView = 45 //initial plugin values - compare(map.fieldOfView, 45) - compare(map.fieldOfView, 45) + compare(map.minimumFieldOfView, 45) + compare(map.maximumFieldOfView, 45) - map.fieldOfView = 18 + map.minimumFieldOfView = 5 + map.maximumFieldOfView = 18 + map.fieldOfView = 4 compare(map.fieldOfView, 45) + compare(map.minimumFieldOfView, 45) + compare(map.maximumFieldOfView, 45) + + map.activeMapType = map.supportedMapTypes[3] + // camera caps are [1-179], user previously asked for [5-18] + compare(map.minimumFieldOfView, 5) + compare(map.maximumFieldOfView, 18) - map.fieldOfView = 62 + map.fieldOfView = 4 + compare(map.fieldOfView, 5) + + //Higher min level than curr fieldOfView, should change curr fieldOfView + map.minimumFieldOfView = 6 + compare(map.fieldOfView, 6) + compare(map.minimumFieldOfView, 6) + compare(map.maximumFieldOfView, 18) + + //Trying to set higher than max, max should be set. + map.maximumFieldOfView = 179.5 + compare(map.minimumFieldOfView, 6) + compare(map.maximumFieldOfView, 179) + + //Negative values should be ignored + map.minimumFieldOfView = -1 + map.maximumFieldOfView = -2 + compare(map.minimumFieldOfView, 6) + compare(map.maximumFieldOfView, 179) + + //Max limit lower than curr zoom, should change curr zoom + map.fieldOfView = 18 + compare(map.fieldOfView, 18) + map.maximumFieldOfView = 16 + compare(map.maximumFieldOfView, 16) + compare(map.fieldOfView, 16) + + //resetting default + map.minimumFieldOfView = 1 + map.maximumFieldOfView = 179 + compare(map.minimumFieldOfView, 1) + compare(map.maximumFieldOfView, 179) + + map.activeMapType = map.supportedMapTypes[0] + compare(map.minimumFieldOfView, 45) + compare(map.maximumFieldOfView, 45) compare(map.fieldOfView, 45) } |