diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-04-26 08:53:53 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-04-25 13:07:14 +0200 |
| commit | 79ca9908ca0c5c1818142b73ca8644282f5907dc (patch) | |
| tree | b7cd3dd67053cb5ab25801c9c105f7b0e959cb76 | |
| parent | 3de69e47160268f9d3eaba1ba07d6f6f99dee86b (diff) | |
Fix in zoom item - displayed values need to change at the same time
When using the slider, the temperature and other forecast info should
match the forecast icon. Using the rounded value of the slider current value
to retrieve each weather data to display.
Change-Id: I61b898ba947572409d5bae0be0006c1251fa1e3a
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| -rw-r--r-- | qml/pages/OneDayZoomItem.qml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/qml/pages/OneDayZoomItem.qml b/qml/pages/OneDayZoomItem.qml index 3b5d853..af6dcf3 100644 --- a/qml/pages/OneDayZoomItem.qml +++ b/qml/pages/OneDayZoomItem.qml @@ -52,6 +52,8 @@ GridLayout { property bool singleItem property string singleTimeString: "(" + Utils.getFromTime(0, dayModel) + " - " + Utils.getToTime(0, dayModel) + ")" + readonly property int sliderValue: Math.round(root.slider.value) + Separator { Layout.fillHeight: true Layout.fillWidth: ApplicationInfo.isPortraitMode ? true : false @@ -63,7 +65,7 @@ GridLayout { columns: 3 TouchLabel { id: longDay - text : Utils.getDay(root.slider.value, root.model) + text : Utils.getDay(root.sliderValue, root.model) font.weight: Font.Bold Layout.alignment: Qt.AlignBaseline font.capitalization: Font.Capitalize @@ -84,7 +86,7 @@ GridLayout { Item { Image { id: mainIcon - source: Utils.getWeatherUrl(Math.round(root.slider.value), root.model, "large") + source: Utils.getWeatherUrl(root.sliderValue, root.model, "large") onStatusChanged: if (status === Image.Error) updateStatusBar(ApplicationInfo.constants.errorLoadingImage + ": " + source) anchors.centerIn: parent width: parent.width @@ -121,7 +123,7 @@ GridLayout { TouchLabel { Layout.preferredWidth: expectedTextWidth(Utils.getTempFormat(Utils.getMaxTempLenght(ApplicationInfo.currentCityModel))) + 4 * ApplicationInfo.ratio - property int temp: Utils.getTemperature(root.slider.value, root.model) + property int temp: Utils.getTemperature(root.sliderValue, root.model) text : Utils.getTempFormat(temp) color: temp < 0 ? ApplicationInfo.colors.blue : ApplicationInfo.colors.doubleDarkGray pixelSize: 72 @@ -132,7 +134,7 @@ GridLayout { Layout.columnSpan: 3 TouchLabel { id: rainLabel - text : qsTr("Precipitation: ") + Utils.getRain(root.slider.value, root.model) + text : qsTr("Precipitation: ") + Utils.getRain(root.sliderValue, root.model) Layout.alignment: Qt.AlignLeft | Qt.AlignBaseline pixelSize: 30 } @@ -146,7 +148,7 @@ GridLayout { Layout.columnSpan: 3 TouchLabel { id: windLabel - text : qsTr("Wind: ") + Utils.getWindSpeed(root.slider.value, root.model) + text : qsTr("Wind: ") + Utils.getWindSpeed(root.sliderValue, root.model) Layout.alignment: Qt.AlignLeft | Qt.AlignBaseline pixelSize: 30 } @@ -156,7 +158,7 @@ GridLayout { Layout.alignment: Qt.AlignLeft | Qt.AlignBaseline } Image { - source: Utils.getWindUrl(root.slider.value, root.model) + source: Utils.getWindUrl(root.sliderValue, root.model) property int windIconSize: 45 * ApplicationInfo.ratio Layout.preferredHeight: windIconSize Layout.preferredWidth: windIconSize |