X-Git-Url: https://www.flypig.org.uk/git/?p=harbour-pedalo.git;a=blobdiff_plain;f=src%2Fharbour-pedalo.cpp;h=90df54edc25682f04c4d883f2be3fba21a50b853;hp=d7da21f1404ebc3ac3822d73d535b640b60dbd64;hb=336d2255eb501f5c228a80a0fa469844bbc1ee2f;hpb=b22fdac4f96ee5858c4672f1743fd58ad8f6d6f4

diff --git a/src/harbour-pedalo.cpp b/src/harbour-pedalo.cpp
index d7da21f..90df54e 100644
--- a/src/harbour-pedalo.cpp
+++ b/src/harbour-pedalo.cpp
@@ -7,8 +7,17 @@
 
 #include "journey.h"
 #include "journeymodel.h"
+#include "statsmodel.h"
 #include "status.h"
 #include "settings.h"
+#include "imageprovider.h"
+#include "graph.h"
+#include "statsweekdayave.h"
+#include "statshourjourneys.h"
+#include "statsweekdaycongestion.h"
+#include "statshourcongestion.h"
+#include "statsyearjourneys.h"
+#include "statsyearduration.h"
 
 #include "harbour-pedalo.h"
 
@@ -33,22 +42,53 @@ 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;
+
+    StatsYearDuration statsyearduration(&journeys);
+    statsmodel.addStats(statsyearduration);
+
+    StatsYearJourneys statsyearjourneys(&journeys);
+    statsmodel.addStats(statsyearjourneys);
+
+    StatsWeekdayAve statsweekdayave(&journeys);
+    statsmodel.addStats(statsweekdayave);
+
+    StatsHourJourneys statshourjourneys(&journeys);
+    statsmodel.addStats(statshourjourneys);
+
+    StatsWeekdayCongestion statsweekdaycongestion(&journeys);
+    statsmodel.addStats(statsweekdaycongestion);
+
+    StatsHourCongestion statshourcongestion(&journeys);
+    statsmodel.addStats(statshourcongestion);
+
     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()));
     view->setSource(SailfishApp::pathTo("qml/harbour-pedalo.qml"));
 
     QQmlContext *ctxt = view->rootContext();
+    ctxt->setContextProperty("version", VERSION);
+    qDebug() << "harbour-pedalo VERSION string: " << VERSION;
+    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();