Initial changes for sailfish port

[quandoparte] / application / stationlistproxymodel.cpp

diff --git a/application/stationlistproxymodel.cpp b/application/stationlistproxymodel.cpp
index 10a608b..fe613c2 100644 (file)
--- a/application/stationlistproxymodel.cpp
+++ b/application/stationlistproxymodel.cpp
@@ -25,33 +25,40 @@ Boston, MA 02110-1301, USA.
 #include "stationlistmodel.h"
 
 #include <QDebug>
+#ifndef TARGET_PLATFORM_SAILFISH
 #include <QGeoCoordinate>
 
 QTM_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoCoordinate)
+#endif
 
 StationListProxyModel::StationListProxyModel(QObject *parent) :
     QSortFilterProxyModel(parent),
+#ifndef TARGET_PLATFORM_SAILFISH
     positionInfoSource(QGeoPositionInfoSource::createDefaultSource(this)),
     m_here(44.5, 9.0),
+#endif
     m_filterRecentOnly(false)
 {
-    QHash<int, QByteArray> roles;
-    roles[StationListModel::PositionRole] = "position";
-    setRoleNames(roles);
-
     Settings *settings = Settings::instance();
-    m_sortingMode = settings->stationListSortingMode();
+    forceSortingMode(settings->stationListSortingMode());
     setFilterCaseSensitivity(Qt::CaseInsensitive);
     setSortCaseSensitivity(Qt::CaseInsensitive);
+    setDynamicSortFilter(true);
+#ifndef TARGET_PLATFORM_SAILFISH
     if (positionInfoSource) {
         qDebug() << "position info source available";
         connect(positionInfoSource, SIGNAL(positionUpdated(QGeoPositionInfo)),
                 SLOT(updatePosition(QGeoPositionInfo)));
+        positionInfoSource->setUpdateInterval(5000);
     } else {
         qDebug() << "No position info source available";
     }
+#endif
+    connect(settings, SIGNAL(recentStationsChanged()),
+            this, SLOT(updateRecentStations()));
+    updateRecentStations();
 }
 
 bool StationListProxyModel::lessThan(const QModelIndex &left,
@@ -60,9 +67,13 @@ bool StationListProxyModel::lessThan(const QModelIndex &left,
     int role = sortRole();
 
     if (role == StationListModel::PositionRole) {
+#ifdef TARGET_PLATFORM_SAILFISH
+        return 0;
+#else
         QGeoCoordinate first = left.data(role).value<QGeoCoordinate>();
         QGeoCoordinate second = right.data(role).value<QGeoCoordinate>();
        return first.distanceTo(m_here) < second.distanceTo(m_here);
+#endif
     } else {
         return QString::compare(left.data(role).toString(),
                                 right.data(role).toString(),
@@ -70,14 +81,31 @@ bool StationListProxyModel::lessThan(const QModelIndex &left,
     }
 }
 
+
+#ifndef TARGET_PLATFORM_SAILFISH
 void StationListProxyModel::setUserPosition(const QtMobility::QGeoCoordinate &pos)
 {
+    qDebug() << "Position is now" << pos;
     m_here = pos;
+    if (sortingMode() == StationListProxyModel::DistanceSorting) {
+        invalidate();
+    }
 }
+#endif
 
 void StationListProxyModel::setRecentStations(const QStringList &stations)
 {
+    qDebug() << "Recent stations are now" << stations;
     m_stations = stations;
+    if (sortingMode() == StationListProxyModel::RecentUsageSorting) {
+        invalidate();
+    }
+}
+
+void StationListProxyModel::updateRecentStations(void)
+{
+    Settings *settings = Settings::instance();
+    setRecentStations(settings->recentStations());
 }
 
 bool StationListProxyModel::filterAcceptsRow(int sourceRow,
@@ -119,42 +147,56 @@ StationListProxyModel::SortingMode StationListProxyModel::sortingMode()
 void StationListProxyModel::setSortingMode(SortingMode mode)
 {
     if (mode != m_sortingMode) {
-        qDebug() << "setSorting Mode" << mode << m_sortingMode << "called";
-        m_sortingMode = mode;
-        setRecentOnlyFilter(false);
-
-        switch (mode) {
-        case StationListProxyModel::AlphaSorting:
-            setSortRole(Qt::DisplayRole);
-            break;
-        case StationListProxyModel::DistanceSorting:
-            setSortRole(StationListModel::PositionRole);
-            break;
-        case StationListProxyModel::RecentUsageSorting:
-            setRecentOnlyFilter(true);
-            break;
-        default:
-            break;
-        }
-        if (mode == StationListProxyModel::DistanceSorting) {
-            positionInfoSource->startUpdates();
-        } else {
-            positionInfoSource->stopUpdates();
-        }
-        invalidate();
-        sort(0);
+        beginResetModel();
+        forceSortingMode(mode);
+        endResetModel();
+    }
+    Settings *settings = Settings::instance();
+    settings->setStationListSortingMode(m_sortingMode);
 
-        Settings *settings = Settings::instance();
-        settings->setStationListSortingMode(m_sortingMode);
+    emit sortingModeChanged(mode);
+}
 
-        emit sortingModeChanged(mode);
+void StationListProxyModel::forceSortingMode(SortingMode mode)
+{
+    m_sortingMode = mode;
+    setRecentOnlyFilter(false);
+
+    switch (mode) {
+    case StationListProxyModel::AlphaSorting:
+        setSortRole(Qt::DisplayRole);
+        break;
+    case StationListProxyModel::DistanceSorting:
+        setSortRole(StationListModel::PositionRole);
+        break;
+    case StationListProxyModel::RecentUsageSorting:
+        setRecentOnlyFilter(true);
+        break;
+    default:
+        break;
+    }
+#ifndef TARGET_PLATFORM_SAILFISH
+    if (mode == StationListProxyModel::DistanceSorting) {
+        positionInfoSource->startUpdates();
+    } else {
+        positionInfoSource->stopUpdates();
     }
+#endif
+    invalidate();
+    sort(0);
 }
 
+#ifndef TARGET_PLATFORM_SAILFISH
 void StationListProxyModel::updatePosition(const QtMobility::QGeoPositionInfo &update)
 {
     qDebug() << "Position update received" << update;
-    setUserPosition(update.coordinate());
-    invalidate();
-    sort(0);
+    if (update.isValid()) {
+        QGeoCoordinate newPosition = update.coordinate();
+        if (newPosition.distanceTo(m_here) > 50.0) {
+            setUserPosition(update.coordinate());
+            invalidate();
+            sort(0);
+        }
+    }
 }
+#endif