summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 8440f20..4491b91 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -165,161 +165,161 @@ void WeatherPluginWidget::getTemp( const QString &data )
{
if ( data.at( pos ) == 'M' )
{
value = -1 * data.mid( pos + 1, 2 ).toInt( &ok );
}
else
{
value = data.mid( pos, 2 ).toInt( &ok );
}
if ( useMetric )
{
dataStr = QString::number( value );
dataStr.append( 'C' );
}
else
{
dataStr = QString::number( ( value * 9 / 5 ) + 32 );
dataStr.append( 'F' );
}
}
else
{
dataStr = tr( "n/a" );
}
}
void WeatherPluginWidget::getWind( const QString &data )
{
int value;
bool ok;
int pos = data.find( QRegExp( "[0-9]*G*[0-9]*KT" ), 20 );
if ( pos > -1 )
{
if ( data.mid( pos, 3 ) != "VRB" )
{
value = data.mid( pos, 3 ).toInt( &ok );
if ( ( value >= 0 && value < 23 ) || ( value >= 239 && value <= 360 ) )
dataStr = tr("E " );
else if ( value >= 23 && value < 69 )
dataStr = tr( "NE " );
else if ( value >= 69 && value < 113 )
dataStr = tr( "N " );
else if ( value >= 113 && value < 157 )
dataStr = tr( "NW " );
else if ( value >= 157 && value < 203 )
dataStr = tr( "W " );
else if ( value >= 203 && value < 248 )
dataStr = tr( "SW " );
else if ( value >= 248 && value < 294 )
dataStr = tr( "S " );
else if ( value >= 294 && value < 238 )
dataStr = tr( "SE " );
}
if ( data.mid( pos + 5, 1) == "G" ||
data.mid( pos + 5, 1) == "K" )
{
value = data.mid( pos + 3, 2 ).toInt( &ok );
}
else
{
value = data.mid( pos + 3, 3 ).toInt( &ok );
}
if ( useMetric )
{
value = value * 3.6 / 1.94;
dataStr.append( QString::number( value ) );
dataStr.append( tr( " KPH" ) );
}
else
{
value = value * 2.24 / 1.94;
dataStr.append( QString::number( value ) );
dataStr.append( tr( " MPH" ) );
}
}
else
{
dataStr = tr( "n/a" );
}
}
void WeatherPluginWidget::getPressure( const QString &data )
{
float value;
bool ok;
int pos = data.find( QRegExp( "[AQ][0-9]+" ), 20 );
if ( pos > -1 )
{
value = data.mid( pos + 1, 4 ).toFloat( &ok );
if ( useMetric )
{
if ( data.mid( pos, 1 ) == "A" )
value *= 33.8639 / 100;
dataStr = QString::number( value, 'f', 2 );
- dataStr.append( tr( " hPa" ) );
+ dataStr.append( tr( " kPa" ) );
}
else
{
if ( data.mid( pos, 1 ) == "Q" )
value /= 33.8639;
else
value /= 100;
dataStr = QString::number( value, 'f', 2 );
dataStr.append( tr( " Hg" ) );
}
}
else
{
dataStr = tr( "n/a" );
}
}
void WeatherPluginWidget::getIcon(const QString &data )
{
dataStr = "psunny";
if ( data.find( "CLR ", 20 ) > -1 ||
data.find( "SKC ", 20 ) > -1 ||
data.find( "CAVOK ", 20 ) > -1 )
{
dataStr = "sunny";
}
else if ( data.find( "SH ", 20 ) > -1 ||
data.find( "DZ ", 20 ) > -1 ||
data.find( "RA ", 20 ) > -1 ||
data.find( "UP ", 20 ) > -1 ||
data.find( "BR ", 20 ) > -1 )
{
dataStr = "shower";
}
else if ( data.find( "TS ", 20 ) > -1 )
{
dataStr = "tstorm";
}
else if ( data.find( "SN ", 20 ) > -1 ||
data.find( "SG ", 20 ) > -1 )
{
dataStr = "snow";
}
else if ( data.find( "FZ ", 20 ) > -1 ||
data.find( "GR ", 20 ) > -1 ||
data.find( "GS ", 20 ) > -1 ||
data.find( "PE ", 20 ) > -1 ||
data.find( "IC ", 20 ) > -1 )
{
dataStr = "sleet";
}
}
void WeatherPluginWidget::dataRetrieved( OProcess *process )
{
if ( process->normalExit() )
{
displayWeather();
}
else
{
weatherLabel->setText( tr( "Current weather data not available." ) );
}
}