Changes: added GPS class and made app get from location from GPS

[ptas] / zouba / route.cpp

diff --git a/zouba/route.cpp b/zouba/route.cpp
index 5356702..6206492 100644 (file)
--- a/zouba/route.cpp
+++ b/zouba/route.cpp
@@ -54,15 +54,27 @@ void Route::replyFinished( QNetworkReply * reply )
 
 void Route::setFromLocation( const Location &location )
 {
+  qDebug() << __PRETTY_FUNCTION__;
   if ( location.isValid() ) {
+    qDebug() << "from location is valid";
     q->setFromLocation( location );
+    if ( q->toValid() ) {
+        qDebug() << "to is also valid; getting route";
+        getRoute();
+    }
   } else {
+    qDebug() << "location is NOT valid - obtaining from sender";
     Location *locationPtr = qobject_cast<Location*>(sender());
     if ( locationPtr ) {
       q->setFromLocation( *locationPtr );
       if ( q->toValid() ) {
+        qDebug() << "to is also valid; getting route";
         getRoute();
+      } else {
+        qDebug() << "to is NOT valid";
       }
+    } else {
+      qDebug() << "locationPtr is zero - cast didn't work";
     }
   }
 }
@@ -74,15 +86,29 @@ const Location &Route::fromLocation()
 
 void Route::setToLocation( const Location &location )
 {
+  qDebug() << __PRETTY_FUNCTION__;
   if ( location.isValid() ) {
+    qDebug() << "to is valid";
     q->setToLocation( location );
+    if ( q->fromValid() ) {
+      qDebug() << "from is also valid; getting route";
+      getRoute();
+    } else {
+      qDebug() << "from is NOT valid";
+    }
   } else {
+    qDebug() << "to is not valid; getting from sender";
     Location *locationPtr = qobject_cast<Location*>(sender());
     if ( locationPtr ) {
       q->setToLocation( *locationPtr );
       if ( q->fromValid() ) {
+        qDebug() << "from is also valid; getting route";
         getRoute();
+      } else {
+        qDebug() << "from is not valid";
       }
+    } else {
+      qDebug() << "locationPtr is zero; cast failed";
     }
   }
 }