-rw-r--r-- | noncore/todayplugins/weather/weatherpluginwidget.cpp | 2 |
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 | |||
@@ -197,129 +197,129 @@ void WeatherPluginWidget::getWind( const QString &data ) | |||
197 | if ( pos > -1 ) | 197 | if ( pos > -1 ) |
198 | { | 198 | { |
199 | if ( data.mid( pos, 3 ) != "VRB" ) | 199 | if ( data.mid( pos, 3 ) != "VRB" ) |
200 | { | 200 | { |
201 | value = data.mid( pos, 3 ).toInt( &ok ); | 201 | value = data.mid( pos, 3 ).toInt( &ok ); |
202 | if ( ( value >= 0 && value < 23 ) || ( value >= 239 && value <= 360 ) ) | 202 | if ( ( value >= 0 && value < 23 ) || ( value >= 239 && value <= 360 ) ) |
203 | dataStr = tr("E " ); | 203 | dataStr = tr("E " ); |
204 | else if ( value >= 23 && value < 69 ) | 204 | else if ( value >= 23 && value < 69 ) |
205 | dataStr = tr( "NE " ); | 205 | dataStr = tr( "NE " ); |
206 | else if ( value >= 69 && value < 113 ) | 206 | else if ( value >= 69 && value < 113 ) |
207 | dataStr = tr( "N " ); | 207 | dataStr = tr( "N " ); |
208 | else if ( value >= 113 && value < 157 ) | 208 | else if ( value >= 113 && value < 157 ) |
209 | dataStr = tr( "NW " ); | 209 | dataStr = tr( "NW " ); |
210 | else if ( value >= 157 && value < 203 ) | 210 | else if ( value >= 157 && value < 203 ) |
211 | dataStr = tr( "W " ); | 211 | dataStr = tr( "W " ); |
212 | else if ( value >= 203 && value < 248 ) | 212 | else if ( value >= 203 && value < 248 ) |
213 | dataStr = tr( "SW " ); | 213 | dataStr = tr( "SW " ); |
214 | else if ( value >= 248 && value < 294 ) | 214 | else if ( value >= 248 && value < 294 ) |
215 | dataStr = tr( "S " ); | 215 | dataStr = tr( "S " ); |
216 | else if ( value >= 294 && value < 238 ) | 216 | else if ( value >= 294 && value < 238 ) |
217 | dataStr = tr( "SE " ); | 217 | dataStr = tr( "SE " ); |
218 | } | 218 | } |
219 | if ( data.mid( pos + 5, 1) == "G" || | 219 | if ( data.mid( pos + 5, 1) == "G" || |
220 | data.mid( pos + 5, 1) == "K" ) | 220 | data.mid( pos + 5, 1) == "K" ) |
221 | { | 221 | { |
222 | value = data.mid( pos + 3, 2 ).toInt( &ok ); | 222 | value = data.mid( pos + 3, 2 ).toInt( &ok ); |
223 | } | 223 | } |
224 | else | 224 | else |
225 | { | 225 | { |
226 | value = data.mid( pos + 3, 3 ).toInt( &ok ); | 226 | value = data.mid( pos + 3, 3 ).toInt( &ok ); |
227 | } | 227 | } |
228 | if ( useMetric ) | 228 | if ( useMetric ) |
229 | { | 229 | { |
230 | value = value * 3.6 / 1.94; | 230 | value = value * 3.6 / 1.94; |
231 | dataStr.append( QString::number( value ) ); | 231 | dataStr.append( QString::number( value ) ); |
232 | dataStr.append( tr( " KPH" ) ); | 232 | dataStr.append( tr( " KPH" ) ); |
233 | } | 233 | } |
234 | else | 234 | else |
235 | { | 235 | { |
236 | value = value * 2.24 / 1.94; | 236 | value = value * 2.24 / 1.94; |
237 | dataStr.append( QString::number( value ) ); | 237 | dataStr.append( QString::number( value ) ); |
238 | dataStr.append( tr( " MPH" ) ); | 238 | dataStr.append( tr( " MPH" ) ); |
239 | } | 239 | } |
240 | } | 240 | } |
241 | else | 241 | else |
242 | { | 242 | { |
243 | dataStr = tr( "n/a" ); | 243 | dataStr = tr( "n/a" ); |
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | void WeatherPluginWidget::getPressure( const QString &data ) | 247 | void WeatherPluginWidget::getPressure( const QString &data ) |
248 | { | 248 | { |
249 | float value; | 249 | float value; |
250 | bool ok; | 250 | bool ok; |
251 | 251 | ||
252 | int pos = data.find( QRegExp( "[AQ][0-9]+" ), 20 ); | 252 | int pos = data.find( QRegExp( "[AQ][0-9]+" ), 20 ); |
253 | if ( pos > -1 ) | 253 | if ( pos > -1 ) |
254 | { | 254 | { |
255 | value = data.mid( pos + 1, 4 ).toFloat( &ok ); | 255 | value = data.mid( pos + 1, 4 ).toFloat( &ok ); |
256 | if ( useMetric ) | 256 | if ( useMetric ) |
257 | { | 257 | { |
258 | if ( data.mid( pos, 1 ) == "A" ) | 258 | if ( data.mid( pos, 1 ) == "A" ) |
259 | value *= 33.8639 / 100; | 259 | value *= 33.8639 / 100; |
260 | dataStr = QString::number( value, 'f', 2 ); | 260 | dataStr = QString::number( value, 'f', 2 ); |
261 | dataStr.append( tr( " hPa" ) ); | 261 | dataStr.append( tr( " kPa" ) ); |
262 | } | 262 | } |
263 | else | 263 | else |
264 | { | 264 | { |
265 | if ( data.mid( pos, 1 ) == "Q" ) | 265 | if ( data.mid( pos, 1 ) == "Q" ) |
266 | value /= 33.8639; | 266 | value /= 33.8639; |
267 | else | 267 | else |
268 | value /= 100; | 268 | value /= 100; |
269 | dataStr = QString::number( value, 'f', 2 ); | 269 | dataStr = QString::number( value, 'f', 2 ); |
270 | dataStr.append( tr( " Hg" ) ); | 270 | dataStr.append( tr( " Hg" ) ); |
271 | } | 271 | } |
272 | } | 272 | } |
273 | else | 273 | else |
274 | { | 274 | { |
275 | dataStr = tr( "n/a" ); | 275 | dataStr = tr( "n/a" ); |
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
279 | void WeatherPluginWidget::getIcon(const QString &data ) | 279 | void WeatherPluginWidget::getIcon(const QString &data ) |
280 | { | 280 | { |
281 | dataStr = "psunny"; | 281 | dataStr = "psunny"; |
282 | if ( data.find( "CLR ", 20 ) > -1 || | 282 | if ( data.find( "CLR ", 20 ) > -1 || |
283 | data.find( "SKC ", 20 ) > -1 || | 283 | data.find( "SKC ", 20 ) > -1 || |
284 | data.find( "CAVOK ", 20 ) > -1 ) | 284 | data.find( "CAVOK ", 20 ) > -1 ) |
285 | { | 285 | { |
286 | dataStr = "sunny"; | 286 | dataStr = "sunny"; |
287 | } | 287 | } |
288 | else if ( data.find( "SH ", 20 ) > -1 || | 288 | else if ( data.find( "SH ", 20 ) > -1 || |
289 | data.find( "DZ ", 20 ) > -1 || | 289 | data.find( "DZ ", 20 ) > -1 || |
290 | data.find( "RA ", 20 ) > -1 || | 290 | data.find( "RA ", 20 ) > -1 || |
291 | data.find( "UP ", 20 ) > -1 || | 291 | data.find( "UP ", 20 ) > -1 || |
292 | data.find( "BR ", 20 ) > -1 ) | 292 | data.find( "BR ", 20 ) > -1 ) |
293 | { | 293 | { |
294 | dataStr = "shower"; | 294 | dataStr = "shower"; |
295 | } | 295 | } |
296 | else if ( data.find( "TS ", 20 ) > -1 ) | 296 | else if ( data.find( "TS ", 20 ) > -1 ) |
297 | { | 297 | { |
298 | dataStr = "tstorm"; | 298 | dataStr = "tstorm"; |
299 | } | 299 | } |
300 | else if ( data.find( "SN ", 20 ) > -1 || | 300 | else if ( data.find( "SN ", 20 ) > -1 || |
301 | data.find( "SG ", 20 ) > -1 ) | 301 | data.find( "SG ", 20 ) > -1 ) |
302 | { | 302 | { |
303 | dataStr = "snow"; | 303 | dataStr = "snow"; |
304 | } | 304 | } |
305 | else if ( data.find( "FZ ", 20 ) > -1 || | 305 | else if ( data.find( "FZ ", 20 ) > -1 || |
306 | data.find( "GR ", 20 ) > -1 || | 306 | data.find( "GR ", 20 ) > -1 || |
307 | data.find( "GS ", 20 ) > -1 || | 307 | data.find( "GS ", 20 ) > -1 || |
308 | data.find( "PE ", 20 ) > -1 || | 308 | data.find( "PE ", 20 ) > -1 || |
309 | data.find( "IC ", 20 ) > -1 ) | 309 | data.find( "IC ", 20 ) > -1 ) |
310 | { | 310 | { |
311 | dataStr = "sleet"; | 311 | dataStr = "sleet"; |
312 | } | 312 | } |
313 | } | 313 | } |
314 | 314 | ||
315 | void WeatherPluginWidget::dataRetrieved( OProcess *process ) | 315 | void WeatherPluginWidget::dataRetrieved( OProcess *process ) |
316 | { | 316 | { |
317 | if ( process->normalExit() ) | 317 | if ( process->normalExit() ) |
318 | { | 318 | { |
319 | displayWeather(); | 319 | displayWeather(); |
320 | } | 320 | } |
321 | else | 321 | else |
322 | { | 322 | { |
323 | weatherLabel->setText( tr( "Current weather data not available." ) ); | 323 | weatherLabel->setText( tr( "Current weather data not available." ) ); |
324 | } | 324 | } |
325 | } | 325 | } |