97107 2005-01-15 23:49:58 +0000 weather info not shown for stations needing maintenance 2006-12-25 23:26:58 +0000 1 1 10 Unmaintained kweather-kde3 general unspecified Gentoo Packages Linux RESOLVED FIXED NOR wishlist --- 0 sokann geiseri kde 0 oldest_to_newest 303370 0 sokann 2005-01-15 23:49:58 +0000 Version: (using KDE KDE 3.3.91) Installed from: Gentoo Packages This wishlist is in regard to the following commit: ( http://webcvs.kde.org/kdetoys/kweather/weatherservice.h?rev=1.28&view=markup ) "For stations needing maintenance I added a new DCOP function: bool stationNeedsMaintenance(const QString &StationID), which returns true if the station needs maintenance. The dockwidget then uses this new DCOP function to check and display a somewhat informative tool tip. Also the icon will be "dunno" for stations that need maintenance. I added this support because for some reason the station near me started going into this "needs maintenance" state. I noticed that weather.com has switched my area report to a different station, which is something we could think about doing in the future." Unfortunately, my nearest station, KLNK, seems to be having this $ maintenance flag all the time, so kweather can only show me the "dunno" icon plus all the ???. If you go to http://weather.noaa.gov/weather/current/KLNK.html , things seem to be fine. Also, quoting from the FAQ at http://shadow.agry.purdue.edu/sc.hly-faq.html#q7 , "$ flag indicates only that maintenance is needed, not necessarily that the data are erroneous. Often observers at the ASOS site can catch errors in an observation and change suspect values before the observation is transmitted to users". So, I suggest to change the code such that it will still calculate the weather information regardless of the maintenance flag. 303372 1 9110 sokann 2005-01-15 23:55:57 +0000 Created attachment 9110 Patch to disregard the maintenance flag After applying the patch, kweather finally shows me the weather infos. Compared to the results from websites such as weather.com and weather.yahoo.com, I can say that they are accurate. 303381 2 9112 sokann 2005-01-16 00:29:07 +0000 Created attachment 9112 Complete patch Ahh... I forgot to update the frontend in the previous patch. Please see this one. 344542 3 christian.loose 2005-05-23 15:17:52 +0000 *** Bug 95870 has been marked as a duplicate of this bug. *** 495994 4 martin 2006-12-25 23:26:56 +0000 SVN commit 616506 by mkoller: BUG: 97107 BUG: 134426 BUG: 108427 Display weather data even if station needs maintenance Patch included from Sok Ann Yap sokann@gmail.com Make the tooltip more informative by showing station name and more data M +56 -31 dockwidget.cpp M +3 -6 metar_parser.cpp M +6 -10 reportview.cpp M +1 -4 weatherlib.cpp --- branches/KDE/3.5/kdetoys/kweather/dockwidget.cpp #616505:616506 @@ -41,7 +41,8 @@ setBackgroundOrigin( AncestorOrigin ); } -dockwidget::~dockwidget(){ +dockwidget::~dockwidget() +{ delete m_weatherService; } @@ -77,51 +78,74 @@ void dockwidget::showWeather() { - QString tip; + QString tip = "<qt>"; QString temp = "?"; QString wind = "?"; QString pressure = "?"; - if ( !m_locationCode.isEmpty() && m_weatherService->stationNeedsMaintenance( m_locationCode ) ) + if ( !m_locationCode.isEmpty() ) { - tip = i18n("Station reports that it needs maintenance\n" - "Please try again later"); - } - else - { - if ( !m_locationCode.isEmpty() ) - { - temp = m_weatherService->temperature( m_locationCode ); - wind = m_weatherService->wind( m_locationCode ); - pressure = m_weatherService->pressure( m_locationCode ); - } + temp = m_weatherService->temperature( m_locationCode ); + wind = m_weatherService->wind( m_locationCode ); + pressure = m_weatherService->pressure( m_locationCode ); - if (m_mode != ShowAll) - { - tip = i18n("Temperature: ") + temp; - tip += i18n("\nWind: ") + wind; - tip += i18n("\nAir pressure: ") + pressure; - } + QString dewPoint = m_weatherService->dewPoint( m_locationCode); + QString relHumidity = m_weatherService->relativeHumidity( m_locationCode ); + QString heatIndex = m_weatherService->heatIndex( m_locationCode ); + QString windChill = m_weatherService->windChill( m_locationCode ); + QString sunRiseTime = m_weatherService->sunRiseTime( m_locationCode ); + QString sunSetTime = m_weatherService->sunSetTime( m_locationCode ); + + tip += "<h3><center>" + + m_weatherService->stationName( m_locationCode ) + " (" + + m_weatherService->stationCountry( m_locationCode ) + ")</center></h3> "; + + tip += QString("<table>" + "<tr><th>" + i18n( "Temperature:" ) + "</th><td>%1</td>" + "<th>" + i18n( "Dew Point:" ) + "</th><td>%2</td></tr>" + + "<tr><th>" + i18n( "Air Pressure:" ) + "</th><td>%3</td>" + "<th>" + i18n( "Rel. Humidity:" ) + "</th><td>%4</td></tr>" + + "<tr><th>" + i18n( "Wind Speed:" ) + "</th><td>%5</td>") + .arg(temp).arg(dewPoint).arg(pressure).arg(relHumidity).arg(wind); + + if ( !heatIndex.isEmpty() ) + tip += QString("<th>" + i18n( "Heat Index:" ) + "</th><td>%1</td>").arg(heatIndex); + else if ( !windChill.isEmpty() ) + tip += QString("<th>" + i18n( "Wind Chill:" ) + "</th><td>%1</td>").arg(windChill); else + tip += "<td> </td><td> </td>"; + tip += "</tr>"; + + tip += QString("<tr><th>" + i18n( "Sunrise:" ) + "</th><td>%1</td>" + + "<th>" + i18n( "Sunset:" ) + "</th><td>%2</td>") + .arg(sunRiseTime).arg(sunSetTime); + + tip += "</tr></table>"; + + if ( m_weatherService->stationNeedsMaintenance( m_locationCode ) ) { - tip = i18n("Click here to see\nthe detailed weather report..."); + tip += " " + i18n("Station reports that it needs maintenance\n" + "Please try again later"); } } + else + { + tip += i18n("Temperature: ") + temp + " "; + tip += i18n("\nWind: ") + wind + " "; + tip += i18n("\nAir pressure: ") + pressure + " "; + } + tip += "</qt>"; + // On null or empty location code, or if the station needs maintenance, this will return the dunno icon. QPixmap icon = m_weatherService->icon( m_locationCode ); - if ( ! m_locationCode.isEmpty() ) - { - tip = m_weatherService->stationName( m_locationCode ) + "\n" + - m_weatherService->stationCountry( m_locationCode ) + "\n" + - tip; - } + QToolTip::remove(this); + QToolTip::add(this, tip); - QToolTip::remove(m_button); - QToolTip::add(m_button, tip); - kdDebug(12004) << "show weather: " << endl; kdDebug(12004) << "location: " << m_locationCode << endl; kdDebug(12004) << "temp,wind,pressure: " << temp << " " << wind << " " << pressure << endl; @@ -134,7 +158,8 @@ m_button->setPixmap( icon ); } -void dockwidget::initDock(){ +void dockwidget::initDock() +{ kdDebug(12004) << "Init dockwidget " << endl; m_button= new WeatherButton(this,"m_button"); --- branches/KDE/3.5/kdetoys/kweather/metar_parser.cpp #616505:616506 @@ -135,12 +135,9 @@ } } - if (!weatherInfo.stationNeedsMaintenance) - { - calcTemperatureVariables(); - calcWindChill(); - calcCurrentIcon(); - } + calcTemperatureVariables(); + calcWindChill(); + calcCurrentIcon(); return weatherInfo; } --- branches/KDE/3.5/kdetoys/kweather/reportview.cpp #616505:616506 @@ -100,18 +100,14 @@ if ( m_weatherService->stationNeedsMaintenance( m_locationCode ) ) { weatherText += "<li>" + i18n( "Station reports that it needs maintenance" ) + " \n"; - weatherText += "<li>" + i18n( "Please try a different one" ) + " \n"; } - else - { - for (QStringList::const_iterator it = cover.begin(); - it != cover.end(); ++it) - weatherText += "<li>" + *it + "\n"; + for (QStringList::const_iterator it = cover.begin(); + it != cover.end(); ++it) + weatherText += "<li>" + *it + "\n"; - for (QStringList::const_iterator it = weather.begin(); - it != weather.end(); ++it) - weatherText += "<li>" + *it + "\n"; - } + for (QStringList::const_iterator it = weather.begin(); + it != weather.end(); ++it) + weatherText += "<li>" + *it + "\n"; weatherText += "</ul>\n"; --- branches/KDE/3.5/kdetoys/kweather/weatherlib.cpp #616505:616506 @@ -276,10 +276,7 @@ if ( !stationID.isEmpty() ) { Data *d = findData(stationID); - if (!d->wi.stationNeedsMaintenance) - { - result = d->wi.theWeather; - } + result = d->wi.theWeather; } return result; 9110 2005-01-15 23:55:57 +0000 2005-01-16 00:27:13 +0000 Patch to disregard the maintenance flag nomaint.diff text/plain 433 sokann LS0tIGt3ZWF0aGVyL21ldGFyX3BhcnNlci5jcHAub3JpZwkyMDA1LTAxLTE1IDE2OjQwOjAwLjAw ODg1MTY0MCAtMDYwMAorKysga3dlYXRoZXIvbWV0YXJfcGFyc2VyLmNwcAkyMDA1LTAxLTE1IDE2 OjQwOjI5LjE4NDQxNjI4MCAtMDYwMApAQCAtMTM1LDEyICsxMzUsOSBAQCBzdHJ1Y3QgV2VhdGhl ckluZm8gTWV0YXJQYXJzZXI6OnByb2Nlc3NECiAJCX0KIAl9CiAKLQlpZiAoIXdlYXRoZXJJbmZv LnN0YXRpb25OZWVkc01haW50ZW5hbmNlKQotCXsKLQkJY2FsY1RlbXBlcmF0dXJlVmFyaWFibGVz KCk7Ci0JCWNhbGNXaW5kQ2hpbGwoKTsKLQkJY2FsY0N1cnJlbnRJY29uKCk7Ci0JfQorCWNhbGNU ZW1wZXJhdHVyZVZhcmlhYmxlcygpOworCWNhbGNXaW5kQ2hpbGwoKTsKKwljYWxjQ3VycmVudElj b24oKTsKIAkKIAlyZXR1cm4gd2VhdGhlckluZm87CiB9Cg== 9112 2005-01-16 00:29:07 +0000 2005-01-16 00:29:07 +0000 Complete patch nomaint.diff text/plain 3746 sokann LS0tIGt3ZWF0aGVyL2RvY2t3aWRnZXQuY3BwLm9yaWcJMjAwNS0wMS0xNSAxNzowOToyMC41MTE0 NDIyOTYgLTA2MDAKKysrIGt3ZWF0aGVyL2RvY2t3aWRnZXQuY3BwCTIwMDUtMDEtMTUgMTc6MTA6 MjkuNzU2OTE1Mzg0IC0wNjAwCkBAIC04MiwzMCArODIsMjcgQEAgdm9pZCBkb2Nrd2lkZ2V0Ojpz aG93V2VhdGhlcigpCiAgICAgUVN0cmluZyB3aW5kICAgICA9ICI/IjsKICAgICBRU3RyaW5nIHBy ZXNzdXJlID0gIj8iOwogCi0gICAgaWYgKCBtX3dlYXRoZXJTZXJ2aWNlLT5zdGF0aW9uTmVlZHNN YWludGVuYW5jZSggbV9sb2NhdGlvbkNvZGUgKSApCisgICAgaWYgKCAhbV9sb2NhdGlvbkNvZGUu aXNFbXB0eSgpICkKKyAgICB7CisgICAgICAgIHRlbXAgICAgID0gbV93ZWF0aGVyU2VydmljZS0+ dGVtcGVyYXR1cmUoIG1fbG9jYXRpb25Db2RlICk7CisgICAgICAgIHdpbmQgICAgID0gbV93ZWF0 aGVyU2VydmljZS0+d2luZCggbV9sb2NhdGlvbkNvZGUgKTsKKyAgICAgICAgcHJlc3N1cmUgPSBt X3dlYXRoZXJTZXJ2aWNlLT5wcmVzc3VyZSggbV9sb2NhdGlvbkNvZGUgKTsKKyAgICB9CisKKyAg ICBpZiAobV9tb2RlICE9IFNob3dBbGwpCiAgICAgewotICAgICAgICB0aXAgPSBpMThuKCJTdGF0 aW9uIHJlcG9ydHMgdGhhdCBpdCBuZWVkcyBtYWludGVuYW5jZVxuIgotICAgICAgICAgICAgICAg ICAgICJQbGVhc2UgdHJ5IGFnYWluIGxhdGVyIik7CisgICAgICAgIHRpcCA9IGkxOG4oIlRlbXBl cmF0dXJlOiAiKSArIHRlbXA7CisgICAgICAgIHRpcCArPSBpMThuKCJcbldpbmQ6ICIpICsgd2lu ZDsKKyAgICAgICAgdGlwICs9IGkxOG4oIlxuQWlyIHByZXNzdXJlOiAiKSArIHByZXNzdXJlOwog ICAgIH0KICAgICBlbHNlCiAgICAgewotICAgICAgICBpZiAoICFtX2xvY2F0aW9uQ29kZS5pc0Vt cHR5KCkgKQotICAgICAgICB7Ci0gICAgICAgICAgICB0ZW1wICAgICA9IG1fd2VhdGhlclNlcnZp Y2UtPnRlbXBlcmF0dXJlKCBtX2xvY2F0aW9uQ29kZSApOwotICAgICAgICAgICAgd2luZCAgICAg PSBtX3dlYXRoZXJTZXJ2aWNlLT53aW5kKCBtX2xvY2F0aW9uQ29kZSApOwotICAgICAgICAgICAg cHJlc3N1cmUgPSBtX3dlYXRoZXJTZXJ2aWNlLT5wcmVzc3VyZSggbV9sb2NhdGlvbkNvZGUgKTsK LSAgICAgICAgfQorICAgICAgICB0aXAgPSBpMThuKCJDbGljayBoZXJlIHRvIHNlZVxudGhlIGRl dGFpbGVkIHdlYXRoZXIgcmVwb3J0Li4uIik7CisgICAgfQogCi0gICAgICAgIGlmIChtX21vZGUg IT0gU2hvd0FsbCkKLSAgICAgICAgewotICAgICAgICAgICAgdGlwID0gaTE4bigiVGVtcGVyYXR1 cmU6ICIpICsgdGVtcDsKLSAgICAgICAgICAgIHRpcCArPSBpMThuKCJcbldpbmQ6ICIpICsgd2lu ZDsKLSAgICAgICAgICAgIHRpcCArPSBpMThuKCJcbkFpciBwcmVzc3VyZTogIikgKyBwcmVzc3Vy ZTsKLSAgICAgICAgfQotICAgICAgICBlbHNlCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRpcCA9 IGkxOG4oIkNsaWNrIGhlcmUgdG8gc2VlXG50aGUgZGV0YWlsZWQgd2VhdGhlciByZXBvcnQuLi4i KTsKLSAgICAgICAgfQorICAgIGlmICggbV93ZWF0aGVyU2VydmljZS0+c3RhdGlvbk5lZWRzTWFp bnRlbmFuY2UoIG1fbG9jYXRpb25Db2RlICkgKQorICAgIHsKKyAgICAgICAgdGlwICs9IGkxOG4o IlN0YXRpb24gcmVwb3J0cyB0aGF0IGl0IG5lZWRzIG1haW50ZW5hbmNlIik7CiAgICAgfQogCiAg ICAgLy8gT24gbnVsbCBvciBlbXB0eSBsb2NhdGlvbiBjb2RlLCBvciBpZiB0aGUgc3RhdGlvbiBu ZWVkcyBtYWludGVuYW5jZSwgdGhpcyB3aWxsIHJldHVybiB0aGUgZHVubm8gaWNvbi4KLS0tIGt3 ZWF0aGVyL21ldGFyX3BhcnNlci5jcHAub3JpZwkyMDA1LTAxLTE1IDE2OjQwOjAwLjAwODg1MTY0 MCAtMDYwMAorKysga3dlYXRoZXIvbWV0YXJfcGFyc2VyLmNwcAkyMDA1LTAxLTE1IDE2OjQwOjI5 LjE4NDQxNjI4MCAtMDYwMApAQCAtMTM1LDEyICsxMzUsOSBAQCBzdHJ1Y3QgV2VhdGhlckluZm8g TWV0YXJQYXJzZXI6OnByb2Nlc3NECiAJCX0KIAl9CiAKLQlpZiAoIXdlYXRoZXJJbmZvLnN0YXRp b25OZWVkc01haW50ZW5hbmNlKQotCXsKLQkJY2FsY1RlbXBlcmF0dXJlVmFyaWFibGVzKCk7Ci0J CWNhbGNXaW5kQ2hpbGwoKTsKLQkJY2FsY0N1cnJlbnRJY29uKCk7Ci0JfQorCWNhbGNUZW1wZXJh dHVyZVZhcmlhYmxlcygpOworCWNhbGNXaW5kQ2hpbGwoKTsKKwljYWxjQ3VycmVudEljb24oKTsK IAkKIAlyZXR1cm4gd2VhdGhlckluZm87CiB9Ci0tLSBrd2VhdGhlci9yZXBvcnR2aWV3LmNwcC5v cmlnCTIwMDUtMDEtMTUgMTc6MTU6MDQuMDM1NTA0NzY4IC0wNjAwCisrKyBrd2VhdGhlci9yZXBv cnR2aWV3LmNwcAkyMDA1LTAxLTE1IDE3OjE2OjA1LjM3MjE4MDE3NiAtMDYwMApAQCAtOTksMTgg Kzk5LDE0IEBAIHZvaWQgcmVwb3J0Vmlldzo6cmVuZGVyKCl7CiAgICAgaWYgKCBtX3dlYXRoZXJT ZXJ2aWNlLT5zdGF0aW9uTmVlZHNNYWludGVuYW5jZSggbV9sb2NhdGlvbkNvZGUgKSApCiAgICAg ewogICAgICAgICB3ZWF0aGVyVGV4dCArPSAiPGxpPiIgKyBpMThuKCAiU3RhdGlvbiByZXBvcnRz IHRoYXQgaXQgbmVlZHMgbWFpbnRlbmFuY2UiICkgKyAiIFxuIjsKLSAgICAgICAgd2VhdGhlclRl eHQgKz0gIjxsaT4iICsgaTE4biggIlBsZWFzZSB0cnkgYSBkaWZmZXJlbnQgb25lIiApICsgIiBc biI7Ci0gICAgfQotICAgIGVsc2UKLSAgICB7Ci0gICAgICAgIGZvciAoUVN0cmluZ0xpc3Q6OmNv bnN0X2l0ZXJhdG9yIGl0ID0gY292ZXIuYmVnaW4oKTsKLSAgICAgICAgICAgICAgICBpdCAhPSBj b3Zlci5lbmQoKTsgKytpdCkKLSAgICAgICAgICAgIHdlYXRoZXJUZXh0ICs9ICI8bGk+IiArICpp dCArICJcbiI7Ci0KLSAgICAgICAgZm9yIChRU3RyaW5nTGlzdDo6Y29uc3RfaXRlcmF0b3IgaXQg PSB3ZWF0aGVyLmJlZ2luKCk7Ci0gICAgICAgICAgICAgICAgaXQgIT0gd2VhdGhlci5lbmQoKTsg KytpdCkKLSAgICAgICAgICAgIHdlYXRoZXJUZXh0ICs9ICI8bGk+IiArICppdCArICJcbiI7CiAg ICAgfQorICAgIGZvciAoUVN0cmluZ0xpc3Q6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY292ZXIuYmVn aW4oKTsKKyAgICAgICAgICAgIGl0ICE9IGNvdmVyLmVuZCgpOyArK2l0KQorICAgICAgICB3ZWF0 aGVyVGV4dCArPSAiPGxpPiIgKyAqaXQgKyAiXG4iOworCisgICAgZm9yIChRU3RyaW5nTGlzdDo6 Y29uc3RfaXRlcmF0b3IgaXQgPSB3ZWF0aGVyLmJlZ2luKCk7CisgICAgICAgICAgICBpdCAhPSB3 ZWF0aGVyLmVuZCgpOyArK2l0KQorICAgICAgICB3ZWF0aGVyVGV4dCArPSAiPGxpPiIgKyAqaXQg KyAiXG4iOwogCiAgICAgd2VhdGhlclRleHQgKz0gIjwvdWw+XG4iOwogCi0tLSBrd2VhdGhlci93 ZWF0aGVybGliLmNwcC5vcmlnCTIwMDUtMDEtMTUgMTc6MTg6MDkuOTg4MjM1NjU2IC0wNjAwCisr KyBrd2VhdGhlci93ZWF0aGVybGliLmNwcAkyMDA1LTAxLTE1IDE3OjE4OjMxLjk2Mjg5NTAwMCAt MDYwMApAQCAtMjc2LDEwICsyNzYsNyBAQCBRU3RyaW5nIFdlYXRoZXJMaWI6Omljb25OYW1lKGNv bnN0IFFTdHJpCiAJaWYgKCAhc3RhdGlvbklELmlzRW1wdHkoKSApCiAJewogCQlEYXRhICpkID0g ZmluZERhdGEoc3RhdGlvbklEKTsKLQkJaWYgKCFkLT53aS5zdGF0aW9uTmVlZHNNYWludGVuYW5j ZSkKLQkJewotCQkJcmVzdWx0ID0gZC0+d2kudGhlV2VhdGhlcjsKLQkJfQorCQlyZXN1bHQgPSBk LT53aS50aGVXZWF0aGVyOwogCX0KIAkKIAlyZXR1cm4gcmVzdWx0Owo=