[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/plasma/dataengines/weather/ions
From: Shawn Starr <shawn.starr () rogers ! com>
Date: 2009-08-07 1:13:40
Message-ID: 1249607620.218822.31163.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1008170 by spstarr:
Strip out N/A checks in NOAA ion also
M +7 -33 ion_noaa.cpp
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp \
#1008169:1008170 @@ -501,11 +501,8 @@
dataFields = temperature(source);
data.insert("Temperature", dataFields["temperature"]);
+ data.insert("Temperature Unit", dataFields["temperatureUnit"]);
- if (dataFields["temperature"] != i18n("N/A")) {
- data.insert("Temperature Unit", dataFields["temperatureUnit"]);
- }
-
// Do we have a comfort temperature? if so display it
if (dataFields["comfortTemperature"] != i18n("N/A")) {
if (d->m_weatherData[source].windchill_F != "NA") {
@@ -522,40 +519,25 @@
}
data.insert("Dewpoint", dewpoint(source));
- if (dewpoint(source) != i18n("N/A")) {
- data.insert("Dewpoint Unit", dataFields["temperatureUnit"]);
- }
-
dataFields = pressure(source);
data.insert("Pressure", dataFields["pressure"]);
+ data.insert("Pressure Unit", dataFields["pressureUnit"]);
- if (dataFields["pressure"] != i18n("N/A")) {
- data.insert("Pressure Unit", dataFields["pressureUnit"]);
- }
-
dataFields = visibility(source);
data.insert("Visibility", dataFields["visibility"]);
+ data.insert("Visibility Unit", dataFields["visibilityUnit"]);
- if (dataFields["visibility"] != i18n("N/A")) {
- data.insert("Visibility Unit", dataFields["visibilityUnit"]);
- }
-
dataFields = humidity(source);
data.insert("Humidity", dataFields["humidity"]);
- if (dataFields["humidity"] != i18n("N/A")) {
- data.insert("Humidity Unit", dataFields["humidityUnit"]);
- }
+ data.insert("Humidity Unit", dataFields["humidityUnit"]);
// Set number of forecasts per day/night supported, none for this ion right now
data.insert(QString("Total Weather Days"), 0);
dataFields = wind(source);
data.insert("Wind Speed", dataFields["windSpeed"]);
+ data.insert("Wind Speed Unit", dataFields["windUnit"]);
- if (dataFields["windSpeed"] != "Calm") {
- data.insert("Wind Speed Unit", dataFields["windUnit"]);
- }
-
data.insert("Wind Gust", dataFields["windGust"]);
data.insert("Wind Gust Unit", dataFields["windGustUnit"]);
data.insert("Wind Direction", getWindDirectionIcon(windIcons(), \
dataFields["windDirection"].toLower())); @@ -595,16 +577,6 @@
return d->m_weatherData[source].observationTime;
}
-/*
-bool NOAAIon::night(const QString& source) const
-{
- if (d->m_weatherData[source].iconPeriodAP == "pm") {
- return true;
- }
- return false;
-}
-*/
-
int NOAAIon::periodHour(const QString& source) const
{
return d->m_weatherData[source].iconPeriodHour.toInt();
@@ -643,6 +615,7 @@
QMap<QString, QString> visibilityInfo;
if (d->m_weatherData[source].visibility.isEmpty()) {
visibilityInfo.insert("visibility", QString(i18n("N/A")));
+ visibilityInfo.insert("visibilityUnit", \
QString::number(WeatherUtils::NoUnit)); return visibilityInfo;
}
if (d->m_weatherData[source].visibility == "NA") {
@@ -678,6 +651,7 @@
QMap<QString, QString> pressureInfo;
if (d->m_weatherData[source].pressure.isEmpty()) {
pressureInfo.insert("pressure", i18n("N/A"));
+ pressureInfo.insert("pressureUnit", QString::number(WeatherUtils::NoUnit));
return pressureInfo;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic