Changes: fixed buttons and table

[ptas] / zouba / main.cpp

diff --git a/zouba/main.cpp b/zouba/main.cpp
index 65190f9..c65b91d 100644 (file)
--- a/zouba/main.cpp
+++ b/zouba/main.cpp
@@ -1,50 +1,49 @@
 #include "routedata.h"
 #include "route.h"
-#include "ui_zouba.h"
+#include "ui.h"
 #include "uicontroller.h"
 #include "location.h"
+#include "gpscontroller.h"
+
+#include "ytv.h"
 
 #include <QDebug>
 #include <QObject>
-
-namespace {
-  Location home( "2549183", "6672570" );
-  Location work( "2551042", "6672829" );
-  QString homeKey( "taivaanvuohentie%207%2Chelsinki" );
-  QString workKey( "it%E4merenkatu%2011%2Chelsinki" );
-}
+#include <QApplication>
+#include <QMainWindow>
 
 int main(int argc, char *argv[] )
 {
   QApplication app(argc, argv);
-  QMainWindow *widget = new QMainWindow;
-  Ui::MainWindow ui;
-  ui.setupUi(widget);
+  QMainWindow *mainWindow = new QMainWindow;
+  Ui ui;
+  ui.setupUi(mainWindow);
 
-  UiController *uiController = new UiController( &ui );
-
-  Route *route = new Route();
+  UiController  *uiController  = new UiController( &ui );
+  Route         *route         = new Route();
+  GpsController *gpsController = new GpsController();
 
   QObject::connect(
       route, SIGNAL( routeReady( RouteData ) ),
       uiController, SLOT( displayRoute( RouteData ) )
       );
 
-  Location *from = new Location();
-  Location *to   = new Location();
-
   QObject::connect(
-      from, SIGNAL( becomeValid() ),
-      route, SLOT( setFromLocation() )
+      gpsController, SIGNAL( locationChanged( Location ) ),
+      route, SLOT( setFromLocation( Location ) )
       );
+
   QObject::connect(
-      to, SIGNAL( becomeValid() ),
-      route, SLOT( setToLocation() )
-      );
+      uiController, SIGNAL( destinationChanged( Location ) ),
+      route, SLOT( setToLocation( Location ) )
+    );
+
+  QObject::connect(
+      uiController, SIGNAL( buttonClicked() ),
+      gpsController, SLOT( startGps() )
+    );
 
-  from->resolveAddress( homeKey );
-  to->resolveAddress( workKey );
+  mainWindow->show();
 
-  widget->show();
   return app.exec();
 }