X-Git-Url: https://www.flypig.org.uk/git/?p=harbour-pedalo.git;a=blobdiff_plain;f=src%2Fharbour-pedalo.cpp;h=abbe2bef00d177350dac6ad105a1f149c7e62217;hp=216240d2444888f86c7faac66cda1e39162f637c;hb=76b5f460f9a5052571d730918b2ee778753f4c59;hpb=7d6ca1150d70c17469e48d71920dfe6083e1a719

diff --git a/src/harbour-pedalo.cpp b/src/harbour-pedalo.cpp
index 216240d..abbe2be 100644
--- a/src/harbour-pedalo.cpp
+++ b/src/harbour-pedalo.cpp
@@ -7,9 +7,11 @@
 
 #include "journey.h"
 #include "journeymodel.h"
+#include "statsmodel.h"
 #include "status.h"
 #include "settings.h"
 #include "imageprovider.h"
+#include "graph.h"
 
 #include "harbour-pedalo.h"
 
@@ -34,15 +36,33 @@ int main(int argc, char *argv[])
 
     Settings::instantiate();
     qmlRegisterSingletonType<Settings>("harbour.pedalo.settings", 1, 0, "Settings", Settings::provider);
+    qmlRegisterType<JourneyModel>("harbour.pedalo.journeymodel", 1, 0, "JourneyModel");
+    qmlRegisterType<Graph>("harbour.pedalo.graph", 1, 0, "Graph");
 
     JourneyModel journeys;
-    Status currentStatus;
+    Status currentStatus(journeys);
     Settings::getInstance().setMainStatus(currentStatus);
     Settings::getInstance().loadSettings();
 
+    StatsModel statsmodel;
+    Stats stats;
+    QList<float> data{0.1, 0.1, 0.2};
+    QStringList labels{"A", "B", "C"};
+    stats.setValues(data);
+    stats.setLabels(labels);
+    statsmodel.addStats(stats);
+
+    data = QList<float>{0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.5};
+    labels = QStringList{"M", "T", "W", "Th", "F", "S", "Su"};
+    stats.setValues(data);
+    stats.setLabels(labels);
+    statsmodel.addStats(stats);
+
+
     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,8 +74,10 @@ 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);
+    ctxt->setContextProperty("statsmodel", &statsmodel);
 
     view->show();
     int result = app->exec();