Changes: changed UI, walking speed, time format

[ptas] / zouba / uicontroller.cpp

diff --git a/zouba/uicontroller.cpp b/zouba/uicontroller.cpp
index 3a0fd65..9df97b2 100644 (file)
--- a/zouba/uicontroller.cpp
+++ b/zouba/uicontroller.cpp
@@ -1,48 +1,32 @@
 #include "uicontroller.h"
 #include "route.h"
-#include "ui_zouba.h"
+#include "ui.h"
 
-UiController::UiController( Ui::MainWindow *ui ) :
-  ui(ui),
-  route( HomeToWork )
-{
-  connect( ui->sethomeaddress, SIGNAL( pressed() ), this, SLOT( setHomeAddress() ) );
-  connect( ui->setworkaddress, SIGNAL( pressed() ), this, SLOT( setWorkAddress() ) );
-  connect( ui->route, SIGNAL( pressed() ), this, SLOT( toggleRoute() ) );
-}
-
-UiController::~UiController()
-{
-}
+#include <QObject>
+#include <QTableWidgetItem>
+#include <QPushButton>
+#include <QDebug>
 
-void UiController::setHomeAddress()
+UiController::UiController( Ui *ui ) :
+  ui(ui)
 {
-  emit homeAddressChanged( ui->homeaddress->text() );
+  connect( ui->trigger, SIGNAL( pressed() ), this, SIGNAL( homePressed() ) );
 }
 
-void UiController::setWorkAddress()
+UiController::~UiController()
 {
-  emit workAddressChanged( ui->workaddress->text() );
 }
 
-void UiController::toggleRoute()
+void UiController::displayRoute( const RouteData &routeData )
 {
-  if ( route == HomeToWork ) {
-    route = WorkToHome;
-    ui->route->setText( "Home<-Work" );
-  } else {
-    route = HomeToWork;
-    ui->route->setText( "Home->Work" );
-  }
+  qDebug() << __PRETTY_FUNCTION__;
+  qDebug() << "routeData.arrivalTime" << routeData.arrivalTime;
+  qDebug() << "routeData.lineCode" << routeData.lineCode;
 
-  ui->busnodisplay->setText( "working" );
-  ui->timedisplay->setText( "working" );
+  QTableWidgetItem *timeItem = new QTableWidgetItem( routeData.arrivalTime );
+  ui->table->setItem( 0, 0, timeItem );
 
-  emit directionChanged();
-}
+  QTableWidgetItem *lineItem = new QTableWidgetItem( routeData.lineCode );
+  ui->table->setItem( 0, 1, lineItem );
 
-void UiController::displayRoute( const RouteData &routeData )
-{
-  ui->busnodisplay->setText( routeData.lineCode );
-  ui->timedisplay->setText( routeData.arrivalTime );
 }