Some changes made in measures class for more reasonable code.

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index ca0cb8e..e7345f3 100644 (file)
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -83,7 +83,7 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
     resetAccelerometerMeasurements();
 
     measures = new Measures();
     resetAccelerometerMeasurements();
 
     measures = new Measures();

-    this->initializeMeasures();
+    measures->initializeMembers();

 
     this->timer->setInterval(100);
 
 
     this->timer->setInterval(100);
 

@@ -162,7 +162,7 @@ void CarMainWindow::on_listViewStartTabAccelerationCategories_clicked(QModelInde
   */
 void CarMainWindow::on_autoStartButton_clicked()
 {
   */
 void CarMainWindow::on_autoStartButton_clicked()
 {

-    initializeMeasures();
+    measures->initializeMembers();

     resetAccelerometerMeasurements();
     ui->pushButtonSendResult->setEnabled(false);
     ui->pushButtonShowResultDialog->setEnabled(false);
     resetAccelerometerMeasurements();
     ui->pushButtonSendResult->setEnabled(false);
     ui->pushButtonShowResultDialog->setEnabled(false);

@@ -354,27 +354,20 @@ void CarMainWindow::on_manualStartButton_clicked()
   */
 void CarMainWindow::after_timeout()
 {
   */
 void CarMainWindow::after_timeout()
 {

-    if ( gpsSpeed > 1.0 )
+    //IF GPS checkbox is ON
+    if (ui->gpsOnCheckBox->isChecked())

     {
     {

-        timeFromGps += 0.1;
+        if ( gpsSpeed > 1.0 )
+        {
+            timeFromGps += 0.1;
+        }

     }
     }

-}

 
 

-/**
-  * Initializes measures class's member variables.
-  */
-void CarMainWindow::initializeMeasures()
-{
-    measures->setTime10kmh(0);
-    measures->setTime20kmh(0);
-    measures->setTime30kmh(0);
-    measures->setTime40kmh(0);
-    measures->setTime50kmh(0);
-    measures->setTime60kmh(0);
-    measures->setTime70kmh(0);
-    measures->setTime80kmh(0);
-    measures->setTime90kmh(0);
-    measures->setTime100kmh(0);
+    else
+    {
+        ui->labelMeasureTabSpeed->setText(QString::number(this->speed)); //Set speed. //Measure-tab view.
+        ui->labelMeasureTabTime->setText(QString::number(this->time)); //Set time. //Measure-tab view.
+    }

 }
 
 /**
 }
 
 /**

@@ -387,16 +380,7 @@ void CarMainWindow::on_pushButtonMeasureTabAbort_clicked()
     ui->labelMeasureTabResult->hide();
     ui->labelMeasureTabTime->setText("");
     ui->labelMeasureTabSpeed->setText("");
     ui->labelMeasureTabResult->hide();
     ui->labelMeasureTabTime->setText("");
     ui->labelMeasureTabSpeed->setText("");

-    measures->setTime10kmh(0);
-    measures->setTime20kmh(0);
-    measures->setTime30kmh(0);
-    measures->setTime40kmh(0);
-    measures->setTime50kmh(0);
-    measures->setTime60kmh(0);
-    measures->setTime70kmh(0);
-    measures->setTime80kmh(0);
-    measures->setTime90kmh(0);
-    measures->setTime100kmh(0);
+    measures->initializeMembers();

     this->accelerometerTimer->stop();
     this->timer->stop();
     this->time = 0;
     this->accelerometerTimer->stop();
     this->timer->stop();
     this->time = 0;

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index b85b062..384a4ae 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -78,7 +78,6 @@ private:
     //void initCategoryCompoBox();
     void initComboBoxStartTabUnits();                   //Start-tab view
     void initListViewStartTabAccelerationCategories();  //Start-tab view
     //void initCategoryCompoBox();
     void initComboBoxStartTabUnits();                   //Start-tab view
     void initListViewStartTabAccelerationCategories();  //Start-tab view

-    void initializeMeasures();

     void setListViewTopList(QString category, int size);    //Top-tab view
     void resetAccelerometerMeasurements();
     void calibrateAccelerometer();
     void setListViewTopList(QString category, int size);    //Top-tab view
     void resetAccelerometerMeasurements();
     void calibrateAccelerometer();

diff --git a/Client/measures.cpp b/Client/measures.cpp
index 5439826..724e926 100644 (file)
--- a/Client/measures.cpp
+++ b/Client/measures.cpp
@@ -13,6 +13,23 @@ Measures::Measures()
 }
 
 /**
 }
 
 /**

+  * Initializes measures class's member variables.
+  */
+void Measures::initializeMembers()
+{
+    this->setTime10kmh(0);
+    this->setTime20kmh(0);
+    this->setTime30kmh(0);
+    this->setTime40kmh(0);
+    this->setTime50kmh(0);
+    this->setTime60kmh(0);
+    this->setTime70kmh(0);
+    this->setTime80kmh(0);
+    this->setTime90kmh(0);
+    this->setTime100kmh(0);
+}
+
+/**

  * Get the value of time10kmh
  * @return time10kmh the time in qreal when speed has been 10 km/h
  */
  * Get the value of time10kmh
  * @return time10kmh the time in qreal when speed has been 10 km/h
  */

diff --git a/Client/measures.h b/Client/measures.h
index 89f63fa..897e78e 100644 (file)
--- a/Client/measures.h
+++ b/Client/measures.h
@@ -37,6 +37,8 @@ public:
     void setTime90kmh(qreal pTime);
     void setTime100kmh(qreal pTime);
 
     void setTime90kmh(qreal pTime);
     void setTime100kmh(qreal pTime);
 

+    void initializeMembers();
+

 
 private:
     qreal time10kmh;
 
 private:
     qreal time10kmh;