Merge branch 'bugfix/accsend'

diff --git a/Client/Graphics/sf_2.png b/Client/Graphics/sf_2.png
new file mode 100644 (file)
index 0000000..d3359c5
Binary files /dev/null and b/Client/Graphics/sf_2.png differ

diff --git a/Client/accelerationstart.cpp b/Client/accelerationstart.cpp
index 11dbf85..ab9198f 100644 (file)
--- a/Client/accelerationstart.cpp
+++ b/Client/accelerationstart.cpp
@@ -15,7 +15,9 @@ accelerationstart::accelerationstart(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->buttonStart->setDisabled(true);
+
     accRealTimeDialog = NULL;
+
     stopMeasureSpeed = 0;
 
     ui->categorComboBox->addItem("Select category");
@@ -55,6 +57,8 @@ void accelerationstart::on_buttonCalib_clicked()
     if(accRealTimeDialog == NULL)
         accRealTimeDialog = new AccRealTimeDialog(this);
 
+    connect(accRealTimeDialog, SIGNAL(sendresult(double)), this, SLOT(sendResult(double)));
+
     accRealTimeDialog->Calibrate();
 
     ui->buttonStart->setEnabled(true);
@@ -99,3 +103,11 @@ QString accelerationstart::getMeasureCategory()
     return measureCategory;
 }
 
+/**
+  *This slot function emit mainwindow sendresult.
+  *
+  **/
+void accelerationstart::sendResult(double result)
+{
+    emit sendresult(measureCategory, result);
+}

diff --git a/Client/accelerationstart.h b/Client/accelerationstart.h
index 6502e1d..d403df7 100644 (file)
--- a/Client/accelerationstart.h
+++ b/Client/accelerationstart.h
@@ -28,6 +28,7 @@ protected:
 private:
     Ui::accelerationstart *ui;
     AccRealTimeDialog* accRealTimeDialog;
+
     double stopMeasureSpeed;
     QString measureCategory;
 
@@ -35,6 +36,10 @@ private slots:
     void on_categorComboBox_currentIndexChanged(int index);
     void on_buttonStart_clicked();
     void on_buttonCalib_clicked();
+    void sendResult(double);
+
+signals:
+    void sendresult(QString, double);
 };
 
 #endif // ACCELERATIONSTART_H

diff --git a/Client/accelerationstartdialog.ui b/Client/accelerationstartdialog.ui
index 4e17e91..80ea11a 100644 (file)
--- a/Client/accelerationstartdialog.ui
+++ b/Client/accelerationstartdialog.ui
@@ -36,10 +36,10 @@
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf_2.png</pixmap>
    </property>
   </widget>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>590</x>

diff --git a/Client/accrealtimedialog.cpp b/Client/accrealtimedialog.cpp
index 9b5bc3f..be150c2 100644 (file)
--- a/Client/accrealtimedialog.cpp
+++ b/Client/accrealtimedialog.cpp
@@ -143,6 +143,7 @@ void AccRealTimeDialog::readAccelerometerData()
         {
             resultDialog = new ResultDialog(this);
         }
+        connect(resultDialog, SIGNAL(sendresult(double)), this, SLOT(sendResult(double)));
         resultDialog->setEnd(stopMeasureSpeed);
 
         //Put all times from all speeds
@@ -174,6 +175,7 @@ void AccRealTimeDialog::resetAccelerometerMeasurements()
     vehicleStartedMoving = false;
     stopMeasureSpeed = 0;
 }
+
 void AccRealTimeDialog::Calibrate()
 {
     accelerometer->calibrate();
@@ -185,6 +187,7 @@ void AccRealTimeDialog::on_buttonAbort_clicked()
     resetAccelerometerMeasurements();
     this->close();
 }
+
 void AccRealTimeDialog::startAccelerationMeasure()
 {
     double temp = stopMeasureSpeed;
@@ -192,7 +195,17 @@ void AccRealTimeDialog::startAccelerationMeasure()
     stopMeasureSpeed = temp;
     accelerometerTimer->start(40);
 }
+
 void AccRealTimeDialog::SetStopMeasureSpeed(double speed)
 {
     stopMeasureSpeed = speed;
 }
+
+/**
+  *This slot function emit accelerationstart sendresult.
+  *
+  **/
+void AccRealTimeDialog::sendResult(double result)
+{
+    emit sendresult(result);
+}

diff --git a/Client/accrealtimedialog.h b/Client/accrealtimedialog.h
index 4545c9c..ec9a0d5 100644 (file)
--- a/Client/accrealtimedialog.h
+++ b/Client/accrealtimedialog.h
@@ -34,17 +34,21 @@ protected:
 private slots:
     void on_buttonAbort_clicked();
     void readAccelerometerData();
+    void sendResult(double);
+
+signals:
+    void sendresult(double);
 
 private:
     Ui::AccRealTimeDialog *ui;
     void resetAccelerometerMeasurements();
+    ResultDialog* resultDialog;
 
     QTimer *accelerometerTimer;
     QTime elapsedTime;
     Accelerometer* accelerometer;
     Calculate *calculate;
     MovingAverage* movingAverageZ;
-    ResultDialog* resultDialog;
 
     int updateScreenCounter;
     double accelerationStartThreshold;

diff --git a/Client/accrealtimedialog.ui b/Client/accrealtimedialog.ui
index 895392f..0e74161 100644 (file)
--- a/Client/accrealtimedialog.ui
+++ b/Client/accrealtimedialog.ui
@@ -136,7 +136,7 @@
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf_2.png</pixmap>
    </property>
   </widget>
   <zorder>label</zorder>

diff --git a/Client/creditsdialog.ui b/Client/creditsdialog.ui
index c8f684b..6c4e306 100644 (file)
--- a/Client/creditsdialog.ui
+++ b/Client/creditsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index 19ed929..8bb1603 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -19,5 +19,6 @@
         <file>Graphics/route_start.png</file>
         <file>Graphics/route_stop.png</file>
         <file>Graphics/trophy_gold_refresh.png</file>
+        <file>Graphics/sf_2.png</file>
     </qresource>
 </RCC>

diff --git a/Client/instructionsdialog.ui b/Client/instructionsdialog.ui
index 6bdaaa3..d716367 100644 (file)
--- a/Client/instructionsdialog.ui
+++ b/Client/instructionsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index 8dbfc79..0b78399 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -43,7 +43,6 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));
 
     resultDialog = new ResultDialog;
-    connect(resultDialog, SIGNAL(sendresult()), this, SLOT(clientSendResult()));
 
     accstart = NULL;
 
@@ -128,6 +127,7 @@ void MainWindow::on_pushButtonAccelerate_clicked()
 {
     if(!accstart)
         accstart = new accelerationstart(this);
+    connect(accstart, SIGNAL(sendresult(QString, double)), this, SLOT(clientSendResult(QString, double)));
     accstart->show();
 }
 
@@ -211,11 +211,18 @@ void MainWindow::clientSendRoute()
 /**
   * This function send acceleration data to server
   */
-void MainWindow::clientSendResult()
+void MainWindow::clientSendResult(QString category, double result)
 {
-    qDebug() << "_clientSendResult";
+    /*QMessageBox msgBox;
+    msgBox.setWindowTitle("client send result!");
+    msgBox.setText("client send result!");
+    msgBox.setDefaultButton(QMessageBox::Ok);
+    msgBox.exec();*/
+
+    qDebug() << "__clientSendResult";
     if(accstart) {
         qDebug() << "_clientSendResult, calling server";
-        httpClient->sendResultXml(accstart->getMeasureCategory(), resultDialog->getResult());
+        httpClient->sendResultXml(category, result);
+        //httpClient->sendResultXml(accstart->getMeasureCategory(), resultDialog->getResult());
     }
 }

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index 23a6c17..b9924d1 100644 (file)
--- a/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@ -65,7 +65,7 @@ private slots:
     void clientSendRoute();
     void clientRegUserToServer();
     void clientUserLogin();
-    void clientSendResult();
+    void clientSendResult(QString, double);
     void setCategoryCompoBox();
     void showTop10();
 

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index 659f037..c7a8f10 100644 (file)
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -315,11 +315,12 @@ void ResultDialog::on_pushButtonNew_clicked()
 /**
   * This slot function emits sendresult signal for sending results to server when
   * send results -button has been clicked.
+  * Emit accrealtimedialog sendresult.
   */
 void ResultDialog::on_pushButtonSend_clicked()
 {
-    emit sendresult();
-    //emit sendresult(timeArray[this->getTargetChoice()]);
+    //emit sendresult();
+    emit sendresult(timeArray[this->getTargetChoice()]);
 }
 
 double ResultDialog::getResult()

diff --git a/Client/resultdialog.h b/Client/resultdialog.h
index 9126822..3dacc82 100644 (file)
--- a/Client/resultdialog.h
+++ b/Client/resultdialog.h
@@ -28,7 +28,7 @@ public:
     double getResult();
 
 signals:
-    void sendresult();
+    void sendresult(double);
 
 protected:
     void changeEvent(QEvent *e);

diff --git a/Client/routesavedialog.ui b/Client/routesavedialog.ui
index 960bd15..25d18ed 100644 (file)
--- a/Client/routesavedialog.ui
+++ b/Client/routesavedialog.ui
@@ -179,7 +179,7 @@
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf_2.png</pixmap>
    </property>
   </widget>
  </widget>

diff --git a/Client/settingsdialog.ui b/Client/settingsdialog.ui
index bb0f326..d4d8732 100644 (file)
--- a/Client/settingsdialog.ui
+++ b/Client/settingsdialog.ui
@@ -244,7 +244,7 @@
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf_2.png</pixmap>
    </property>
   </widget>
   <zorder>label</zorder>

diff --git a/Client/topresultdialog.ui b/Client/topresultdialog.ui
index dfbd2db..01d976c 100644 (file)
--- a/Client/topresultdialog.ui
+++ b/Client/topresultdialog.ui
@@ -120,7 +120,7 @@
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf.png</pixmap>
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf_2.png</pixmap>
    </property>
   </widget>
   <zorder>label</zorder>