SVN commit 840372 by rytilahti: convert wind degrees to cardinal format M +13 -2 weatherstation.cpp --- trunk/playground/base/plasma/applets/weather_station/weatherstation.cpp #840371:840372 @@ -211,13 +211,24 @@ m_lcd->setNumber("humidity", humidity); } -void WeatherStation::setWind(const QString& speed, int fromUnit, const QString& direction) +void WeatherStation::setWind(const QString& speed, int fromUnit, const QString& dir) { + QString direction(dir); + bool dirInDegrees = false; + int dirDegrees = direction.toInt(&dirInDegrees); + if (direction == "N/A") { m_lcd->setGroup("wind", m_lcd->groupItems("wind")); + } else if(dirInDegrees) { + kDebug() << "dir in degrees:" << dirDegrees; + direction = WeatherFormula::windDegreesToCardinal(dirDegrees); + if(!direction.isEmpty()) { + kDebug() << "got direction:" << direction; + m_lcd->setGroup("wind", QStringList() << direction); + } } else { m_lcd->setGroup("wind", QStringList() << direction); - } + } int toUnit; switch (c.weatherWindFormat) {