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

List:       kde-commits
Subject:    playground/base/plasma/applets/weather_station
From:       Teemu Rytilahti <tpr () d5k ! net>
Date:       2008-07-31 19:38:54
Message-ID: 1217533134.846259.4947.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 840275 by rytilahti:

use WeatherFormula::getUnitString() instead of own implementation.


 M  +9 -47     weatherstation.cpp  
 M  +4 -4      weatherstation.h  


--- trunk/playground/base/plasma/applets/weather_station/weatherstation.cpp \
#840274:840275 @@ -101,11 +101,11 @@
 {
     Q_UNUSED(source);
     kDebug() << data;
-    setPressure(data["Pressure"].toString(), (WeatherFormula::Unit)data["Pressure \
Unit"].toInt(),  +    setPressure(data["Pressure"].toString(), data["Pressure \
Unit"].toInt(),   data["Pressure Tendency"].toString());
-    setTemperature(data["Temperature"].toString(), \
(WeatherFormula::Unit)data["Temperature Unit"].toInt()); +    \
setTemperature(data["Temperature"].toString(), data["Temperature Unit"].toInt());  \
                setHumidity(data["Humidity"].toString());
-    setWind(data["Wind Speed"].toString(), (WeatherFormula::Unit)data["Wind Speed \
Unit"].toInt(), +    setWind(data["Wind Speed"].toString(), data["Wind Speed \
Unit"].toInt(),  data["Wind Direction"].toString());
 }
 
@@ -164,7 +164,7 @@
     connectToEngine();
 }
 
-void WeatherStation::setPressure(const QString& pressure, WeatherFormula::Unit unit,
+void WeatherStation::setPressure(const QString& pressure, int unit,
                                  const QString& tendency)
 {
     // TODO Convert "Current Conditions" to picture instead of using pressure
@@ -196,12 +196,12 @@
     }
     m_lcd->setGroup("weather", current);
     m_lcd->setNumber("pressure", pressure);
-    m_lcd->setGroup("pressure_unit", QStringList() << getUnitString(unit));
+    m_lcd->setGroup("pressure_unit", QStringList() << \
WeatherFormula::getUnitString(unit, true));  }
 
-void WeatherStation::setTemperature(const QString& temperature, WeatherFormula::Unit \
unit) +void WeatherStation::setTemperature(const QString& temperature, int unit)
 {
-    m_lcd->setGroup("temp_unit", QStringList() << getUnitString(unit));
+    m_lcd->setGroup("temp_unit", QStringList() << \
WeatherFormula::getUnitString(unit, true));  m_lcd->setNumber("temperature", \
temperature);  }
 
@@ -211,7 +211,7 @@
     m_lcd->setNumber("humidity", humidity);
 }
 
-void WeatherStation::setWind(const QString& speed, WeatherFormula::Unit fromUnit, \
const QString& direction) +void WeatherStation::setWind(const QString& speed, int \
fromUnit, const QString& direction)  {
     if (direction == "N/A") {
         m_lcd->setGroup("wind", m_lcd->groupItems("wind"));
@@ -244,48 +244,10 @@
     else
         windSpeed = speed.toDouble();
 
-    QString unit(getUnitString((WeatherFormula::Unit)toUnit));
+    QString unit(WeatherFormula::getUnitString(toUnit, true));
     kDebug() << "windspeed:" << windSpeed << "windunit: " << unit;
     m_lcd->setNumber("wind_speed", QString::number(windSpeed, 'f', 1));
     m_lcd->setGroup("wind_unit", QStringList() << unit);
 }
 
-QString WeatherStation::getUnitString(WeatherFormula::Unit unit)
-{
-    switch (unit) {
-        case WeatherFormula::Celsius:
-            return QString("C");
-        case WeatherFormula::Fahrenheit:
-            return QString("F");
-        case WeatherFormula::Kelvin:
-            return QString("K");
-        case WeatherFormula::Kilometers:
-            return QString("kmh");
-        case WeatherFormula::MetersPerSecond:
-            return QString("ms");
-        case WeatherFormula::Miles:
-            return QString("mph");
-        case WeatherFormula::Kilopascals:
-            return QString("kPa");
-        case WeatherFormula::InchesHG:
-            return QString("in"); // not implemented
-        case WeatherFormula::Millibars:
-            return QString("mbar");
-        case WeatherFormula::Hectopascals:
-            return QString("hPa");
-        case WeatherFormula::Centimeters:
-            return QString("cm");
-        case WeatherFormula::Millimeters:
-            return QString("mm");
-        case WeatherFormula::Inches:
-            return QString("in");
-        case WeatherFormula::Knots:
-            return QString("kt");
-        case WeatherFormula::Beaufort:
-            return QString("bft");
-        default:
-            return QString();
-    }
-}
-
 #include "weatherstation.moc"
--- trunk/playground/base/plasma/applets/weather_station/weatherstation.h \
#840274:840275 @@ -45,12 +45,12 @@
     protected:
         void connectToEngine();
 
-        void setWind(const QString& speed, WeatherFormula::Unit unit, const QString& \
                direction);
-        void setPressure(const QString& pressure, WeatherFormula::Unit unit, const \
                QString& tendency);
-        void setTemperature(const QString& temperature, WeatherFormula::Unit unit);
+        void setWind(const QString& speed, int unit, const QString& direction);
+        void setPressure(const QString& pressure, int unit, const QString& \
tendency); +        void setTemperature(const QString& temperature, int unit);
         void setHumidity(QString humidity);
 
-        QString getUnitString(WeatherFormula::Unit unit);
+        QString getUnitString(int unit);
 
     private:
         QGraphicsLinearLayout *m_layout;


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