Added measures.h and measures.cpp files. Changed resultdialog.h, .cpp and measuredial...

[speedfreak] / Client / carmainwindow.cpp

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index b8af9fe..10affda 100644 (file)
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -66,15 +66,12 @@ void CarMainWindow::on_listView_clicked(QModelIndex index)
   */
 void CarMainWindow::on_autoStartButton_clicked()
 {
   */
 void CarMainWindow::on_autoStartButton_clicked()
 {

-    if(measure)
-    {
-        delete measure;
-        measure = NULL;
-        measure = new MeasureDialog();
-    }

 
 

-    connect(measure, SIGNAL(speedAchieved()), this, SLOT(openResultView()));
+    delete measure;
+    measure = NULL;
+    measure = new MeasureDialog();

 
 

+    connect(measure, SIGNAL(speedAchieved()), this, SLOT(openResultView()));

     // Show measure dialog.
     measure->show();
 }
     // Show measure dialog.
     measure->show();
 }

@@ -165,6 +162,7 @@ void CarMainWindow::on_comboBoxTopCategory_activated(QString category)
   */
 void CarMainWindow::openResultView()
 {
   */
 void CarMainWindow::openResultView()
 {

+    result->saveMeasuresToArray(measure->measures);

     // Show result dialog.
     result->show();
 }
     // Show result dialog.
     result->show();
 }