List journeys in descending order of time

diff --git a/src/harbour-pedalo.cpp b/src/harbour-pedalo.cpp
index 6c0094d..e8f123d 100644 (file)
--- a/src/harbour-pedalo.cpp
+++ b/src/harbour-pedalo.cpp
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
     QFile file;
     file.setFileName(Settings::getConfigDir() + "/journeys.csv");
     journeys.importFromFile(file);
+    journeys.sort(JourneyModel::StartRole, Qt::DescendingOrder);
 
     QScopedPointer<QQuickView> view(SailfishApp::createView());
     view->engine()->addImageProvider(QLatin1String("pedalo"), new ImageProvider(Settings::getInstance()));
@@ -54,6 +55,7 @@ int main(int argc, char *argv[])
     qDebug() << "VERSION_MAJOR: " << VERSION_MAJOR;
     qDebug() << "VERSION_MINOR: " << VERSION_MINOR;
     qDebug() << "VERSION_BUILD: " << VERSION_BUILD;
+
     ctxt->setContextProperty("journeymodel", &journeys);
     ctxt->setContextProperty("currentStatus", &currentStatus);
 

diff --git a/src/journey.h b/src/journey.h
index 560937e..cd3df88 100644 (file)
--- a/src/journey.h
+++ b/src/journey.h
@@ -8,6 +8,9 @@
 class Journey
 {
 public:
+    friend class JourneyTimeDescending;
+    friend class JourneyTimeAscending;
+
     Journey();
     Journey(quint64 start, quint32 duration, quint32 overtook, quint32 overtakenby);
 
@@ -34,4 +37,18 @@ private:
     quint32 overtakenby;
 };
 
+class JourneyTimeAscending : std::binary_function<Journey,Journey, bool> {
+public:
+    bool operator() (Journey const &lhs, Journey const &rhs) const {
+        return lhs.start < rhs.start;
+    }
+};
+
+class JourneyTimeDescending : std::binary_function<Journey,Journey, bool> {
+public:
+    bool operator() (Journey const &lhs, Journey const &rhs) const {
+        return lhs.start > rhs.start;
+    }
+};
+
 #endif // JOURNEY_H

diff --git a/src/journeymodel.cpp b/src/journeymodel.cpp
index 1dc7d58..2919d83 100644 (file)
--- a/src/journeymodel.cpp
+++ b/src/journeymodel.cpp
@@ -14,8 +14,17 @@ QHash<int, QByteArray> JourneyModel::roleNames() const {
 
 void JourneyModel::addJourney(const Journey &journey)
 {
-    beginInsertRows(QModelIndex(), rowCount(), rowCount());
-    journeys << journey;
+    // Find position to add it
+    QList<Journey>::const_iterator it = journeys.constBegin();
+
+    unsigned int position = 0;
+    while ((it != journeys.constEnd()) && (journey.getStart() < (*it).getStart())) {
+        position++;
+        it++;
+    }
+
+    beginInsertRows(QModelIndex(), position, position);
+    journeys.insert(position, journey);
     endInsertRows();
 }
 
@@ -126,3 +135,25 @@ QDateTime JourneyModel::epochToDateTime(quint64 epoch) {
 QList<Journey> const & JourneyModel::getData() const {
     return journeys;
 }
+
+void JourneyModel::sort(int column, Qt::SortOrder order) {
+    switch (column) {
+    case JourneyRoles::StartRole:
+        switch (order) {
+        case Qt::SortOrder::AscendingOrder:
+            std::sort(journeys.begin(), journeys.end(), JourneyTimeAscending());
+            break;
+        case Qt::SortOrder::DescendingOrder:
+            std::sort(journeys.begin(), journeys.end(), JourneyTimeDescending());
+            break;
+        default:
+            // Do nothing
+            break;
+        }
+        break;
+    default:
+        // Do nothing
+        break;
+    }
+}
+

diff --git a/src/journeymodel.h b/src/journeymodel.h
index ded0184..ccb4ffc 100644 (file)
--- a/src/journeymodel.h
+++ b/src/journeymodel.h
@@ -41,6 +41,8 @@ public:
     Q_INVOKABLE static QDateTime epochToDateTime(quint64 epoch);
 
     QList<Journey> const & getData() const;
+
+    void sort(int column, Qt::SortOrder order);
 signals:
     // General signals
     void journeysChanged();