Ticket #8356: new-grabber-if.patch

mythweather/weatherScreen.cpp

@@ -9 +9 @@
 #include "weather.h"
 #include "weatherScreen.h"
 
+static const QString kDegrees         = QString::fromUtf8("°");
+static const float   MILES_PER_KM     = 0.62137;
+static const float   IN_HG_PER_MBAR   = 0.02953;
+
 /** Parse and format time according to current locale. */
 static QString formatTime(const QString& value)
 {
@@ -42 +46 @@
     return QString(buff);
 }
 
+
+/** Private class converting grabber values to UI format. */
+class Converter
+{
+    public:
+        Converter(float factor,
+                  const QString& metricUnit,
+                  const QString& engUnit);
+        virtual QString convert(const QString& value, units_t units);
+
+    protected:
+        virtual float engValue(float value)
+                           { return m_factor * value; };
+        virtual float siValue(float value)
+                           { return value / m_factor; };
+        virtual QString format(float f)
+                           { return QString().setNum(f, 'f',  1); };
+        int round(float f)
+                { return static_cast<int>(f + (f > 0.0 ? +0.5 : -0.5)); };
+        virtual QString  parseValues( const QString& input, units_t unit);
+        QString m_metricUnit;
+        QString m_engUnit;
+        float   m_factor;
+        QString m_value;
+        QString m_otherValue;
+
+};
+
+
+Converter::Converter(float factor,
+                     const QString& metricUnit,
+                     const QString& engUnit)
+{
+    m_metricUnit = metricUnit;
+    m_factor = factor;
+    m_engUnit = engUnit;
+}
+
+
+class DistanceConverter: public Converter
+{
+    public:
+        DistanceConverter(): Converter( MILES_PER_KM, " km", " mi") {};
+};
+
+
+class PressureConverter: public Converter
+{
+    public:
+        PressureConverter(): Converter( IN_HG_PER_MBAR, " mb", " in") {};
+};
+
+
+class VisibilityConverter: public Converter
+{
+    public:
+        VisibilityConverter():Converter( MILES_PER_KM, " km", " mi") {};
+        QString convert(const QString& value, units_t units);
+};
+
+
+class TempConverter: public Converter
+{
+    public:
+        TempConverter():
+                Converter( 0, kDegrees + "C" , kDegrees + "F") {};
+        float engValue(float f) { return f * 9.0/5.0 + 32; };
+        float siValue(float f)  { return (f - 32) * 5.0/9.0; };
+        QString format(float f) {return QString().setNum(f, 'f', 0); };
+};
+
+
+class PrecipConverter: public Converter
+{
+    public:
+        PrecipConverter(): Converter( 1, " mm" , " mm") {};
+        QString format( float f) {return QString().setNum(f, 'f', 0); };
+};
+
+
+class WindConverter: public Converter
+{
+    public:
+        WindConverter(): Converter( MILES_PER_KM, " km/h", " mph") {};
+};
+
+QString Converter::parseValues( const QString& input, units_t units)
+{
+    QString siValue = "";
+    QString engValue = "";
+
+    QStringList parts = input.split(";");
+    if (parts.size() > 2)
+    {
+        return QString("NA ( ") + input + ")";
+    }
+    else if (parts.size() == 2)
+    {
+        siValue =  parts[0];
+        engValue = parts[1];
+    }
+    else if (input.startsWith(";"))
+    {
+        engValue = input;
+        engValue.replace(";", "");
+    }
+    else
+    {
+        // Trailing ';' or old style without ';'
+        siValue = input;
+        siValue.replace(";", "");
+    }
+    m_value = (units == ENG_UNITS ? engValue : siValue);
+    m_otherValue = (units == ENG_UNITS ? siValue : engValue);
+
+    if (m_value == "NA" || m_value == "N/A")
+    {
+        return "NA";
+    }
+    if( m_value == "" && (m_otherValue == "NA" || m_otherValue == "N/A"))
+    {
+        return "NA";
+    }
+
+    return 0;
+}
+
+
+QString Converter::convert(const QString& input, units_t units)
+{
+
+    VERBOSE(VB_MOST, QString( "Converting: ") + input);
+    QString na = parseValues( input, units);
+    if ( na != 0)
+    {
+        return( na );
+    }
+
+    bool otherHasNumber;
+    QRegExp number("([-+]?[0-9][0-9.]*)");
+
+    if (m_value.contains( number))
+    {
+       otherHasNumber = false;
+    }
+    else if (m_otherValue.contains( number))
+    {
+       otherHasNumber = true;
+    }
+    else
+    {
+       return QString("NA (") + input + ")";
+    }
+
+    bool ok;
+    float f = number.cap().toFloat(&ok);
+    if (!ok)
+    {
+        return QString("NA (") + input + ")";
+    }
+
+    if (units == ENG_UNITS && otherHasNumber)
+    {
+        f = engValue(f);
+    }
+    else if ( units == SI_UNITS && otherHasNumber)
+    {
+        f = siValue(f);
+    }
+
+    QString  unit = (units == ENG_UNITS ? m_engUnit: m_metricUnit);
+    VERBOSE(VB_MOST, QString( "Returning: ") +  format(round(f)) + unit);
+    return format( round(f)) +  unit;
+};
+
+
+QString
+VisibilityConverter::convert(const QString& input, units_t units)
+{
+
+    QString na = parseValues( input, units);
+    if (na != 0)
+    {
+        return( na);
+    }
+
+    QRegExp range = QRegExp( "([0-9]+)[ -]+([0-9]+)");
+    bool otherHasRange;
+    if (m_value.contains(range))
+    {
+        otherHasRange = false;
+    }
+    else if (m_otherValue.contains(range))
+    {
+        otherHasRange = true;
+    }
+    else
+    {
+        return DistanceConverter().convert( input, units);
+    }
+
+    bool     ok;
+    int      from, to;
+    from = range.cap(1).toInt( &ok);
+    if (ok)
+    {
+        to = range.cap(2).toInt( &ok);
+    }
+    if (!ok)
+    {
+        return QString("NA (") + m_value + ")";
+    }
+
+    if (units == ENG_UNITS && otherHasRange)
+    {
+        from *= m_factor;
+        to   *= m_factor;
+    }
+    else if (units == SI_UNITS && otherHasRange)
+    {
+        from /= m_factor;
+        to   /= m_factor;
+    }
+
+    QString  unit = (units == ENG_UNITS ? m_engUnit: m_metricUnit);
+    return QString( "%1 - %2 %3").arg( from).arg( to).arg( unit);
+};
+
+
 WeatherScreen *WeatherScreen::loadScreen(MythScreenStack *parent,
                                          ScreenListInfo *screenDefn, int id)
 {
@@ -139 +372 @@
     emit screenReady(this);
 }
 
-QString WeatherScreen::getTemperatureUnit()
-{
-    if (m_units == ENG_UNITS)
-        return QString::fromUtf8("°") + "F";
-    else
-        return QString::fromUtf8("°") + "C";
-}
-
 void WeatherScreen::prepareScreen()
 {
     QMap<QString, QString>::iterator itr = m_dataValueMap.begin();
@@ -202 +427 @@
         return value + " %";
 
     if (key == "pressure")
-        return value + (m_units == ENG_UNITS ? " in" : " mb");
+        return PressureConverter().convert( value, m_units);
 
     if (key == "visibility")
-        return value + (m_units == ENG_UNITS ? " mi" : " km");
+        return VisibilityConverter().convert( value, m_units);
 
-    if (key == "temp" || key == "appt" || key.contains("low",Qt::CaseInsensitive) ||
-        key.contains("high",Qt::CaseInsensitive))
+    if (key.contains("temp",Qt::CaseInsensitive)  ||
+        key.contains("low",Qt::CaseInsensitive)   ||
+        key.contains("high",Qt::CaseInsensitive) ||
+        key == "appt")
     {
-       if ( (value == "NA") || (value == "N/A") )
-          return value;
-       else
-          return value + getTemperatureUnit();
+        return TempConverter().convert( value, m_units);
     }
 
     if (key == "wind_gust" || key == "wind_spdgst" || key == "wind_speed")
-        return value + (m_units == ENG_UNITS ? " mph" : " kph");
+        return WindConverter().convert( value, m_units);
 
     /*The days of the week will be translated if the script sends elements from
      the enum DaysOfWeek.*/
@@ -260 +484 @@
     if (key.startsWith("pop-"))
     {
         if (formatHint == "precipitation")
-            return value + " mm";
+            return PrecipConverter().convert( value, m_units);
         else
             return value + " %";
     }
@@ -383 +607 @@
     }
     return;
 }
+

mythweather/weatherScreen.h

@@ -67 +67 @@
                                     const QString &formatHint = 0);
     virtual void prepareWidget(MythUIType *widget);
     virtual void prepareScreen();
-    virtual QString getTemperatureUnit();
     QString formatDataItem(const QString &key,
                            const QString &value,
                            const QString &formatHint = 0);

mythweather/weatherSource.cpp

@@ -535 +535 @@
     QStringList args;
     args.push_back(m_info->fileInfo.absoluteFilePath());
     args.push_back("-u");
-    args.push_back(m_units == SI_UNITS ? "SI" : "ENG");
+    args.push_back("SI");
 
     if (!m_dir.isEmpty())
     {