[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 0:00:58
Message-ID: 1249603258.832449.28010.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1008149 by spstarr:

Implement Percent unit for all the ions

 M  +13 -5     ion_bbcukmet.cpp  
 M  +1 -1      ion_bbcukmet.h  
 M  +13 -5     ion_envcan.cpp  
 M  +1 -1      ion_envcan.h  
 M  +13 -5     ion_noaa.cpp  
 M  +1 -1      ion_noaa.h  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.cpp \
#1008148:1008149 @@ -837,7 +837,10 @@
         data.insert("Condition Icon", getWeatherIcon(dayIcons(), \
condition(source)));  }
 
-    data.insert("Humidity", humidity(source));
+    dataFields = humidity(source);
+    data.insert("Humidity", dataFields["humidity"]);
+    data.insert("Humidity Field", dataFields["humidityUnit"]);
+
     data.insert("Visibility", visibility(source));
 
     dataFields = temperature(source);
@@ -951,13 +954,18 @@
     return windInfo;
 }
 
-QString UKMETIon::humidity(const QString& source) const
+QMap<QString, QString> UKMETIon::humidity(const QString& source) const
 {
-    if (d->m_weatherData[source].humidity == "N/A") {
-        return d->m_weatherData[source].humidity;
+    QMap<QString, QString> humidityInfo;
+    if (d->m_weatherData[source].humidity != "N/A") {
+        humidityInfo.insert("humidity", d->m_weatherData[source].humidity);
+        humidityInfo.insert("humidityUnit", QString::number(WeatherUtils::Percent));
+    } else {
+        humidityInfo.insert("humidity", "N/A");
+        humidityInfo.insert("humidityUnit", QString::number(WeatherUtils::NoUnit));
     }
 
-    return i18nc("Humidity in percent", "%1%", d->m_weatherData[source].humidity); \
// FIXME: Turn '%' into a unit field +    return humidityInfo;
 }
 
 QString UKMETIon::visibility(const QString& source) const
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_bbcukmet.h \
#1008148:1008149 @@ -95,7 +95,7 @@
     QString condition(const QString& source) const;
     QMap<QString, QString> temperature(const QString& source) const;
     QMap<QString, QString> wind(const QString& source) const;
-    QString humidity(const QString& source) const;
+    QMap<QString, QString> humidity(const QString& source) const;
     QString visibility(const QString& source) const;
     QMap<QString, QString> pressure(const QString& source) const;
     QVector<QString> forecasts(const QString& source);
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp \
#1008148:1008149 @@ -1468,8 +1468,10 @@
         data.insert("Visibility Unit", dataFields["visibilityUnit"]);
     }
 
-    if (humidity(source) != "N/A") {
-        data.insert("Humidity", humidity(source));
+    dataFields = humidity(source);
+    data.insert("Humidity", dataFields["humidity"]);
+    if (dataFields["humidity"] != "N/A") {
+        data.insert("Humidity Unit", dataFields["humidityUnit"]);
     }
 
     dataFields = wind(source);
@@ -1642,12 +1644,17 @@
     return "N/A";
 }
 
-QString EnvCanadaIon::humidity(const QString& source) const
+QMap<QString, QString> EnvCanadaIon::humidity(const QString& source) const
 {
+    QMap<QString, QString> humidityInfo;
     if (!d->m_weatherData[source].humidity.isEmpty()) {
-        return i18nc("Humidity in percent", "%1%", \
d->m_weatherData[source].humidity); +        humidityInfo.insert("humidity", \
d->m_weatherData[source].humidity); +        humidityInfo.insert("humidityUnit", \
QString::number(WeatherUtils::Percent)); +    } else {
+        humidityInfo.insert("humidity", "N/A");
+        humidityInfo.insert("humidityUnit", QString::number(WeatherUtils::NoUnit));
     }
-    return "N/A";
+    return humidityInfo;
 }
 
 QMap<QString, QString> EnvCanadaIon::visibility(const QString& source) const
@@ -1659,6 +1666,7 @@
         visibilityInfo.insert("visibilityUnit", \
QString::number(WeatherUtils::Kilometers));  } else {
         visibilityInfo.insert("visibility", "N/A");
+        visibilityInfo.insert("visibilityUnit", \
QString::number(WeatherUtils::NoUnit));  }
     return visibilityInfo;
 }
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.h \
#1008148:1008149 @@ -185,7 +185,7 @@
     QString condition(const QString& source) const;
     QMap<QString, QString> temperature(const QString& source) const;
     QString dewpoint(const QString& source) const;
-    QString humidity(const QString& source) const;
+    QMap<QString, QString> humidity(const QString& source) const;
     QMap<QString, QString> visibility(const QString& source) const;
     QMap<QString, QString> pressure(const QString& source) const;
     QMap<QString, QString> wind(const QString& source) const;
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.cpp \
#1008148:1008149 @@ -540,8 +540,10 @@
         data.insert("Visibility Unit", dataFields["visibilityUnit"]);
     }
 
-    if (humidity(source) != "N/A") {
-        data.insert("Humidity", i18nc("Humidity in percent", "%1%", \
humidity(source))); // FIXME: Turn '%' into a unit field +    dataFields = \
humidity(source); +    data.insert("Humidity", dataFields["humidity"]);
+    if (dataFields["humidity"] != "N/A") {
+        data.insert("Humidity Unit", dataFields["humidityUnit"]);
     }
 
     // Set number of forecasts per day/night supported, none for this ion right now
@@ -621,13 +623,19 @@
     return d->m_weatherData[source].dewpoint_F;
 }
 
-QString NOAAIon::humidity(const QString& source) const
+QMap<QString, QString> NOAAIon::humidity(const QString& source) const
 {
+    QMap<QString, QString> humidityInfo;
     if (d->m_weatherData[source].humidity == "NA") {
-        return QString("N/A");
+        humidityInfo.insert("humidity", QString("N/A"));
+        humidityInfo.insert("humidityUnit", QString::number(WeatherUtils::NoUnit));
+        return humidityInfo;
     } else {
-        return (d->m_weatherData[source].humidity);
+        humidityInfo.insert("humidity", d->m_weatherData[source].humidity);
+        humidityInfo.insert("humidityUnit", QString::number(WeatherUtils::Percent));
     }
+    
+    return humidityInfo;
 }
 
 QMap<QString, QString> NOAAIon::visibility(const QString& source) const
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_noaa.h \
#1008148:1008149 @@ -110,7 +110,7 @@
     QString condition(const QString& source) const;
     QMap<QString, QString> temperature(const QString& source) const;
     QString dewpoint(const QString& source) const;
-    QString humidity(const QString& source) const;
+    QMap<QString, QString> humidity(const QString& source) const;
     QMap<QString, QString> visibility(const QString& source) const;
     QMap<QString, QString> pressure(const QString& source) const;
     QMap<QString, QString> wind(const QString& source) const;


[prev in list] [next in list] [prev in thread] [next in thread]