Added route load button to route save dialog.

diff --git a/Client/routedialog.cpp b/Client/routedialog.cpp
index 85a848e..8a77167 100644 (file)
--- a/Client/routedialog.cpp
+++ b/Client/routedialog.cpp
@@ -430,12 +430,12 @@ void RouteDialog::paintEvent(QPaintEvent *)
   */
 bool RouteDialog::readRouteFromFile( QString &routeFile )
 {
   */
 bool RouteDialog::readRouteFromFile( QString &routeFile )
 {

-    QString rFile = routeFile; //Not used
+    QString rFile = routeFile;

     Vector temp;
     QString rivi;
     QFile file;
 
     Vector temp;
     QString rivi;
     QFile file;
 

-    file.setFileName( "routetemp.xml");
+    file.setFileName( rFile);//"routetemp.xml");

     if (!file.open(QIODevice::ReadOnly))
     {
         QMessageBox::about(0, "Error", "File not found");
     if (!file.open(QIODevice::ReadOnly))
     {
         QMessageBox::about(0, "Error", "File not found");

@@ -446,8 +446,6 @@ emit progressbar(5);
     emit progressbar(50);
     while(!file.atEnd())
     {
     emit progressbar(50);
     while(!file.atEnd())
     {

-        //qDebug() << "__jee ";
-

         int count;
         bool allRead;
         QString astr1, astr2, astr3, astr4;
         int count;
         bool allRead;
         QString astr1, astr2, astr3, astr4;

diff --git a/Client/routesavedialog.cpp b/Client/routesavedialog.cpp
index ed66bee..0813f56 100644 (file)
--- a/Client/routesavedialog.cpp
+++ b/Client/routesavedialog.cpp
@@ -10,6 +10,7 @@
 #include "ui_routesavedialog.h"
 #include <QDebug>
 #include <QPainter>
 #include "ui_routesavedialog.h"
 #include <QDebug>
 #include <QPainter>

+#include <QFileDialog>

 
 const QPoint arrowStartEast(100, 100);
 const QPoint arrowEndEast(140, 100);
 
 const QPoint arrowStartEast(100, 100);
 const QPoint arrowEndEast(140, 100);

@@ -263,41 +264,6 @@ void RouteSaveDialog::on_buttonRouteStartStop_clicked()
         timerRoutePicture->stop();
         location->stopPollingGPS();
 
         timerRoutePicture->stop();
         location->stopPollingGPS();
 

-        // Progress bar
-        if(!calibrateDialog)
-        {
-            calibrateDialog = new CalibrateDialog();
-        }
-
-        progressbarPoints = 100;
-        progressbarIteration = 0;
-        calibrateDialog->resetProgressValue();
-        calibrateDialog->setMaxValue( progressbarPoints );
-        calibrateDialog->setTitle("Calculating route...");
-        calibrateDialog->show();
-
-
-        if(!routeDialog)
-        {
-            routeDialog = new RouteDialog(this);
-        }
-
-        connect(routeDialog, SIGNAL(sendroute()),      this, SLOT(sendRoute()));
-        connect(routeDialog, SIGNAL(progressbar(int)), this, SLOT(setProgressbar(int)));
-        connect(routeDialog, SIGNAL(rejected()),       this, SLOT(killRouteDialog()));
-        //connect(routeDialog, SIGNAL(killRoute()),      this, SLOT(killRouteDialog()));
-
-        QString routeFile = QString("routetemp.xml");
-        if (routeDialog->readRouteFromFile( routeFile ) == true)
-        {
-            //calibrateDialog->close();
-            routeDialog->show();
-        }
-        else
-        {
-            //calibrateDialog->close();
-        }
-calibrateDialog->close();

         //Set GPS speed labels in visible
         ui->labelGpsSpeed->setVisible(0);
         ui->labelGpsAvgSpeed->setVisible(0);
         //Set GPS speed labels in visible
         ui->labelGpsSpeed->setVisible(0);
         ui->labelGpsAvgSpeed->setVisible(0);

@@ -310,6 +276,8 @@ calibrateDialog->close();
 
         //User info label
         ui->labelUserInfo->setText("Push start button");
 
         //User info label
         ui->labelUserInfo->setText("Push start button");

+
+        openRouteDialog("routetemp.xml");

     }
 }
 
     }
 }
 

@@ -485,7 +453,7 @@ void RouteSaveDialog::killHelpDialog()
 }
 
 /**
 }
 
 /**

-  * This slot function called when ever dialog rejected.
+  * This slot function called when ever route dialog rejected.

   */
 void RouteSaveDialog::killRouteDialog()
 {
   */
 void RouteSaveDialog::killRouteDialog()
 {

@@ -526,8 +494,57 @@ QString RouteSaveDialog::getDistanceTraveled()
   */
 void RouteSaveDialog::setProgressbar(int i)
 {
   */
 void RouteSaveDialog::setProgressbar(int i)
 {

-    qDebug() << "__setProgressbar " ;//+ i;
+    qDebug() << "__setProgressbar " ;

     qDebug() << i;
     qDebug() << i;

-    calibrateDialog->setProgressValue(i);//progressbarIteration);
+    calibrateDialog->setProgressValue(i);

     progressbarIteration++;
 }
     progressbarIteration++;
 }

+
+/**
+  * This slot function called when ever load route button clicked.
+  */
+void RouteSaveDialog::on_buttonLoadRoute_clicked()
+{
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open route"), QDir::currentPath());
+    qDebug() << "__Opening: " + fileName;
+    openRouteDialog(fileName);
+}
+
+/**
+  * This function open route.
+  * @param QString file name
+  */
+void RouteSaveDialog::openRouteDialog(QString fileName)
+{
+    // Progress bar
+    if(!calibrateDialog)
+    {
+        calibrateDialog = new CalibrateDialog();
+    }
+
+    progressbarPoints = 100;
+    progressbarIteration = 0;
+    calibrateDialog->resetProgressValue();
+    calibrateDialog->setMaxValue( progressbarPoints );
+    calibrateDialog->setTitle("Calculating route...");
+    calibrateDialog->show();
+
+    if(!routeDialog)
+    {
+        routeDialog = new RouteDialog(this);
+    }
+
+    connect(routeDialog, SIGNAL(sendroute()),      this, SLOT(sendRoute()));
+    connect(routeDialog, SIGNAL(progressbar(int)), this, SLOT(setProgressbar(int)));
+    connect(routeDialog, SIGNAL(rejected()),       this, SLOT(killRouteDialog()));
+
+    if (routeDialog->readRouteFromFile( fileName ) == true)
+    {
+        calibrateDialog->close();
+        routeDialog->show();
+    }
+    else
+    {
+        calibrateDialog->close();
+    }
+}

diff --git a/Client/routesavedialog.h b/Client/routesavedialog.h
index 4c257a9..7fe157e 100644 (file)
--- a/Client/routesavedialog.h
+++ b/Client/routesavedialog.h
@@ -59,8 +59,10 @@ private:
     double direction;
     int progressbarIteration;
     int progressbarPoints;
     double direction;
     int progressbarIteration;
     int progressbarPoints;

+    void openRouteDialog(QString fileName);

 
 private slots:
 
 private slots:

+    void on_buttonLoadRoute_clicked();

     void on_pushButtonInfo_clicked();
     void on_buttonRouteStartStop_clicked();
     void timerSatellitePictureTimeout();
     void on_pushButtonInfo_clicked();
     void on_buttonRouteStartStop_clicked();
     void timerSatellitePictureTimeout();

diff --git a/Client/routesavedialog.ui b/Client/routesavedialog.ui
index c3f8a0f..9d5d500 100644 (file)
--- a/Client/routesavedialog.ui
+++ b/Client/routesavedialog.ui
@@ -273,6 +273,19 @@
     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
   </widget>
     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
   </widget>

+  <widget class="QPushButton" name="buttonLoadRoute">
+   <property name="geometry">
+    <rect>
+     <x>670</x>
+     <y>320</y>
+     <width>96</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Load</string>
+   </property>
+  </widget>

  </widget>
  <resources>
   <include location="graphics.qrc"/>
  </widget>
  <resources>
   <include location="graphics.qrc"/>