Bug fixed in resultdialog.cpp

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index 3313f73..0e2af1a 100644 (file)
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -321,8 +321,3 @@ void ResultDialog::setTimesIntoLabels()
         ui->labelResult100kmh->show();
     }
 }
         ui->labelResult100kmh->show();
     }
 }

-
-void ResultDialog::on_pushButtonSend_clicked()
-{
-    emit sendresult();
-}

diff --git a/Client/ui_carmainwindow.h b/Client/ui_carmainwindow.h
index 2e19b43..0921db9 100644 (file)
--- a/Client/ui_carmainwindow.h
+++ b/Client/ui_carmainwindow.h
@@ -1,10 +1,10 @@
 /********************************************************************************
 /********************************************************************************

-** Form generated from reading UI file 'carmainwindow.ui'
+** Form generated from reading ui file 'carmainwindow.ui'

 **
 **

-** Created: Wed Mar 17 11:45:21 2010
-**      by: Qt User Interface Compiler version 4.6.1
+** Created: Thu Mar 18 09:17:23 2010
+**      by: Qt User Interface Compiler version 4.5.3

 **
 **

-** WARNING! All changes made in this file will be lost when recompiling UI file!
+** WARNING! All changes made in this file will be lost when recompiling ui file!

 ********************************************************************************/
 
 #ifndef UI_CARMAINWINDOW_H
 ********************************************************************************/
 
 #ifndef UI_CARMAINWINDOW_H

@@ -70,6 +70,7 @@ public:
     QLabel *labelMeasureTabSpeed;
     QLabel *labelMeasureTabResultHeader_2;
     QLabel *labelMeasureTabResult;
     QLabel *labelMeasureTabSpeed;
     QLabel *labelMeasureTabResultHeader_2;
     QLabel *labelMeasureTabResult;

+    QPushButton *pushButtonShowResultDialog;

     QWidget *tab;
     QCheckBox *gpsOnCheckBox;
     QPushButton *startRecPushButton;
     QWidget *tab;
     QCheckBox *gpsOnCheckBox;
     QPushButton *startRecPushButton;

@@ -114,7 +115,7 @@ public:
         layoutWidget->setGeometry(QRect(10, 10, 341, 141));
         verticalLayout_3 = new QVBoxLayout(layoutWidget);
         verticalLayout_3->setSpacing(6);
         layoutWidget->setGeometry(QRect(10, 10, 341, 141));
         verticalLayout_3 = new QVBoxLayout(layoutWidget);
         verticalLayout_3->setSpacing(6);

-        verticalLayout_3->setContentsMargins(11, 11, 11, 11);
+        verticalLayout_3->setMargin(11);

         verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
         verticalLayout_3->setContentsMargins(0, 0, 0, 0);
         labelCategory = new QLabel(layoutWidget);
         verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
         verticalLayout_3->setContentsMargins(0, 0, 0, 0);
         labelCategory = new QLabel(layoutWidget);

@@ -149,7 +150,7 @@ public:
         layoutWidget1->setGeometry(QRect(160, 10, 311, 301));
         verticalLayout_2 = new QVBoxLayout(layoutWidget1);
         verticalLayout_2->setSpacing(6);
         layoutWidget1->setGeometry(QRect(160, 10, 311, 301));
         verticalLayout_2 = new QVBoxLayout(layoutWidget1);
         verticalLayout_2->setSpacing(6);

-        verticalLayout_2->setContentsMargins(11, 11, 11, 11);
+        verticalLayout_2->setMargin(11);

         verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
         verticalLayout_2->setContentsMargins(0, 0, 0, 0);
         startLabel = new QLabel(layoutWidget1);
         verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
         verticalLayout_2->setContentsMargins(0, 0, 0, 0);
         startLabel = new QLabel(layoutWidget1);

@@ -254,6 +255,9 @@ public:
         labelMeasureTabResult->setObjectName(QString::fromUtf8("labelMeasureTabResult"));
         labelMeasureTabResult->setGeometry(QRect(570, 60, 61, 61));
         labelMeasureTabResult->setFont(font6);
         labelMeasureTabResult->setObjectName(QString::fromUtf8("labelMeasureTabResult"));
         labelMeasureTabResult->setGeometry(QRect(570, 60, 61, 61));
         labelMeasureTabResult->setFont(font6);

+        pushButtonShowResultDialog = new QPushButton(tabMeasureResult);
+        pushButtonShowResultDialog->setObjectName(QString::fromUtf8("pushButtonShowResultDialog"));
+        pushButtonShowResultDialog->setGeometry(QRect(470, 140, 161, 71));

         tabWidget->addTab(tabMeasureResult, QString());
         tab = new QWidget();
         tab->setObjectName(QString::fromUtf8("tab"));
         tabWidget->addTab(tabMeasureResult, QString());
         tab = new QWidget();
         tab->setObjectName(QString::fromUtf8("tab"));

@@ -319,6 +323,7 @@ public:
         labelMeasureTabSpeed->setText(QApplication::translate("CarMainWindow", "0", 0, QApplication::UnicodeUTF8));
         labelMeasureTabResultHeader_2->setText(QApplication::translate("CarMainWindow", "Time:", 0, QApplication::UnicodeUTF8));
         labelMeasureTabResult->setText(QApplication::translate("CarMainWindow", "0", 0, QApplication::UnicodeUTF8));
         labelMeasureTabSpeed->setText(QApplication::translate("CarMainWindow", "0", 0, QApplication::UnicodeUTF8));
         labelMeasureTabResultHeader_2->setText(QApplication::translate("CarMainWindow", "Time:", 0, QApplication::UnicodeUTF8));
         labelMeasureTabResult->setText(QApplication::translate("CarMainWindow", "0", 0, QApplication::UnicodeUTF8));

+        pushButtonShowResultDialog->setText(QApplication::translate("CarMainWindow", "Show diagram", 0, QApplication::UnicodeUTF8));

         tabWidget->setTabText(tabWidget->indexOf(tabMeasureResult), QApplication::translate("CarMainWindow", "Measure", 0, QApplication::UnicodeUTF8));
         gpsOnCheckBox->setText(QApplication::translate("CarMainWindow", "GPS on", 0, QApplication::UnicodeUTF8));
         startRecPushButton->setText(QApplication::translate("CarMainWindow", "Start recording", 0, QApplication::UnicodeUTF8));
         tabWidget->setTabText(tabWidget->indexOf(tabMeasureResult), QApplication::translate("CarMainWindow", "Measure", 0, QApplication::UnicodeUTF8));
         gpsOnCheckBox->setText(QApplication::translate("CarMainWindow", "GPS on", 0, QApplication::UnicodeUTF8));
         startRecPushButton->setText(QApplication::translate("CarMainWindow", "Start recording", 0, QApplication::UnicodeUTF8));

@@ -326,6 +331,7 @@ public:
         drawRoutePushButton->setText(QApplication::translate("CarMainWindow", "Draw route", 0, QApplication::UnicodeUTF8));
         tabWidget->setTabText(tabWidget->indexOf(tab), QApplication::translate("CarMainWindow", "Route", 0, QApplication::UnicodeUTF8));
         registratePushButton->setText(QApplication::translate("CarMainWindow", "Registrate", 0, QApplication::UnicodeUTF8));
         drawRoutePushButton->setText(QApplication::translate("CarMainWindow", "Draw route", 0, QApplication::UnicodeUTF8));
         tabWidget->setTabText(tabWidget->indexOf(tab), QApplication::translate("CarMainWindow", "Route", 0, QApplication::UnicodeUTF8));
         registratePushButton->setText(QApplication::translate("CarMainWindow", "Registrate", 0, QApplication::UnicodeUTF8));

+        Q_UNUSED(CarMainWindow);

     } // retranslateUi
 
 };
     } // retranslateUi
 
 };

diff --git a/Client/ui_resultdialog.h b/Client/ui_resultdialog.h
index bd85efe..92890f3 100644 (file)
--- a/Client/ui_resultdialog.h
+++ b/Client/ui_resultdialog.h
@@ -1,10 +1,10 @@
 /********************************************************************************
 /********************************************************************************

-** Form generated from reading UI file 'resultdialog.ui'
+** Form generated from reading ui file 'resultdialog.ui'

 **
 **

-** Created: Wed Mar 17 11:45:21 2010
-**      by: Qt User Interface Compiler version 4.6.1
+** Created: Thu Mar 18 09:17:23 2010
+**      by: Qt User Interface Compiler version 4.5.3

 **
 **

-** WARNING! All changes made in this file will be lost when recompiling UI file!
+** WARNING! All changes made in this file will be lost when recompiling ui file!

 ********************************************************************************/
 
 #ifndef UI_RESULTDIALOG_H
 ********************************************************************************/
 
 #ifndef UI_RESULTDIALOG_H

@@ -28,29 +28,13 @@ public:
     QLabel *labelResult40kmh;
     QLabel *labelResult20kmh;
     QLabel *labelResult30kmh;
     QLabel *labelResult40kmh;
     QLabel *labelResult20kmh;
     QLabel *labelResult30kmh;

-    QLabel *labelY2;
-    QLabel *labelY6;
-    QLabel *labelY1;
-    QLabel *labelY10;
-    QLabel *labelY3;
-    QLabel *labelYLine;
-    QLabel *labelY4;
-    QLabel *labelY7;
-    QLabel *labelY8;
-    QLabel *labelY5;
-    QLabel *labelY9;
-    QLabel *labelX1;
-    QLabel *labelX3;
-    QLabel *labelX5;
-    QLabel *labelX9;
-    QLabel *labelX7;
-    QLabel *labelX2;
-    QLabel *labelX6;
-    QLabel *labelX8;
-    QLabel *labelXLine;
-    QLabel *labelX10;
-    QLabel *labelX4;

     QPushButton *pushButtonSend;
     QPushButton *pushButtonSend;

+    QLabel *labelResult80kmh;
+    QLabel *labelResult70kmh;
+    QLabel *labelResult60kmh;
+    QLabel *labelResult50kmh;
+    QLabel *labelResult90kmh;
+    QLabel *labelResult100kmh;

 
     void setupUi(QDialog *ResultDialog)
     {
 
     void setupUi(QDialog *ResultDialog)
     {

@@ -59,110 +43,37 @@ public:
         ResultDialog->resize(800, 480);
         labelResult10kmh = new QLabel(ResultDialog);
         labelResult10kmh->setObjectName(QString::fromUtf8("labelResult10kmh"));
         ResultDialog->resize(800, 480);
         labelResult10kmh = new QLabel(ResultDialog);
         labelResult10kmh->setObjectName(QString::fromUtf8("labelResult10kmh"));

-        labelResult10kmh->setGeometry(QRect(410, 230, 191, 31));
+        labelResult10kmh->setGeometry(QRect(550, 180, 191, 31));

         labelResult40kmh = new QLabel(ResultDialog);
         labelResult40kmh->setObjectName(QString::fromUtf8("labelResult40kmh"));
         labelResult40kmh = new QLabel(ResultDialog);
         labelResult40kmh->setObjectName(QString::fromUtf8("labelResult40kmh"));

-        labelResult40kmh->setGeometry(QRect(410, 90, 191, 31));
+        labelResult40kmh->setGeometry(QRect(550, 120, 191, 31));

         labelResult20kmh = new QLabel(ResultDialog);
         labelResult20kmh->setObjectName(QString::fromUtf8("labelResult20kmh"));
         labelResult20kmh = new QLabel(ResultDialog);
         labelResult20kmh->setObjectName(QString::fromUtf8("labelResult20kmh"));

-        labelResult20kmh->setGeometry(QRect(410, 180, 191, 31));
+        labelResult20kmh->setGeometry(QRect(550, 160, 191, 31));

         labelResult30kmh = new QLabel(ResultDialog);
         labelResult30kmh->setObjectName(QString::fromUtf8("labelResult30kmh"));
         labelResult30kmh = new QLabel(ResultDialog);
         labelResult30kmh->setObjectName(QString::fromUtf8("labelResult30kmh"));

-        labelResult30kmh->setGeometry(QRect(410, 140, 191, 31));
-        labelY2 = new QLabel(ResultDialog);
-        labelY2->setObjectName(QString::fromUtf8("labelY2"));
-        labelY2->setGeometry(QRect(20, 280, 31, 17));
-        QFont font;
-        font.setFamily(QString::fromUtf8("Bitstream Charter"));
-        font.setPointSize(8);
-        labelY2->setFont(font);
-        labelY6 = new QLabel(ResultDialog);
-        labelY6->setObjectName(QString::fromUtf8("labelY6"));
-        labelY6->setGeometry(QRect(20, 160, 31, 17));
-        labelY6->setFont(font);
-        labelY1 = new QLabel(ResultDialog);
-        labelY1->setObjectName(QString::fromUtf8("labelY1"));
-        labelY1->setGeometry(QRect(20, 310, 31, 17));
-        labelY1->setFont(font);
-        labelY10 = new QLabel(ResultDialog);
-        labelY10->setObjectName(QString::fromUtf8("labelY10"));
-        labelY10->setGeometry(QRect(20, 40, 31, 17));
-        labelY10->setFont(font);
-        labelY3 = new QLabel(ResultDialog);
-        labelY3->setObjectName(QString::fromUtf8("labelY3"));
-        labelY3->setGeometry(QRect(20, 250, 31, 17));
-        labelY3->setFont(font);
-        labelYLine = new QLabel(ResultDialog);
-        labelYLine->setObjectName(QString::fromUtf8("labelYLine"));
-        labelYLine->setGeometry(QRect(5, 10, 171, 17));
-        labelYLine->setFont(font);
-        labelY4 = new QLabel(ResultDialog);
-        labelY4->setObjectName(QString::fromUtf8("labelY4"));
-        labelY4->setGeometry(QRect(20, 220, 31, 17));
-        labelY4->setFont(font);
-        labelY7 = new QLabel(ResultDialog);
-        labelY7->setObjectName(QString::fromUtf8("labelY7"));
-        labelY7->setGeometry(QRect(20, 130, 31, 17));
-        labelY7->setFont(font);
-        labelY8 = new QLabel(ResultDialog);
-        labelY8->setObjectName(QString::fromUtf8("labelY8"));
-        labelY8->setGeometry(QRect(20, 100, 31, 17));
-        labelY8->setFont(font);
-        labelY5 = new QLabel(ResultDialog);
-        labelY5->setObjectName(QString::fromUtf8("labelY5"));
-        labelY5->setGeometry(QRect(20, 190, 31, 17));
-        labelY5->setFont(font);
-        labelY9 = new QLabel(ResultDialog);
-        labelY9->setObjectName(QString::fromUtf8("labelY9"));
-        labelY9->setGeometry(QRect(20, 70, 31, 17));
-        labelY9->setFont(font);
-        labelX1 = new QLabel(ResultDialog);
-        labelX1->setObjectName(QString::fromUtf8("labelX1"));
-        labelX1->setGeometry(QRect(70, 350, 31, 17));
-        labelX1->setFont(font);
-        labelX3 = new QLabel(ResultDialog);
-        labelX3->setObjectName(QString::fromUtf8("labelX3"));
-        labelX3->setGeometry(QRect(130, 350, 31, 17));
-        labelX3->setFont(font);
-        labelX5 = new QLabel(ResultDialog);
-        labelX5->setObjectName(QString::fromUtf8("labelX5"));
-        labelX5->setGeometry(QRect(190, 350, 31, 17));
-        labelX5->setFont(font);
-        labelX9 = new QLabel(ResultDialog);
-        labelX9->setObjectName(QString::fromUtf8("labelX9"));
-        labelX9->setGeometry(QRect(310, 350, 31, 17));
-        labelX9->setFont(font);
-        labelX7 = new QLabel(ResultDialog);
-        labelX7->setObjectName(QString::fromUtf8("labelX7"));
-        labelX7->setGeometry(QRect(250, 350, 31, 17));
-        labelX7->setFont(font);
-        labelX2 = new QLabel(ResultDialog);
-        labelX2->setObjectName(QString::fromUtf8("labelX2"));
-        labelX2->setGeometry(QRect(100, 350, 31, 17));
-        labelX2->setFont(font);
-        labelX6 = new QLabel(ResultDialog);
-        labelX6->setObjectName(QString::fromUtf8("labelX6"));
-        labelX6->setGeometry(QRect(220, 350, 31, 17));
-        labelX6->setFont(font);
-        labelX8 = new QLabel(ResultDialog);
-        labelX8->setObjectName(QString::fromUtf8("labelX8"));
-        labelX8->setGeometry(QRect(280, 350, 31, 17));
-        labelX8->setFont(font);
-        labelXLine = new QLabel(ResultDialog);
-        labelXLine->setObjectName(QString::fromUtf8("labelXLine"));
-        labelXLine->setGeometry(QRect(50, 360, 170, 17));
-        labelXLine->setFont(font);
-        labelX10 = new QLabel(ResultDialog);
-        labelX10->setObjectName(QString::fromUtf8("labelX10"));
-        labelX10->setGeometry(QRect(340, 350, 31, 17));
-        labelX10->setFont(font);
-        labelX4 = new QLabel(ResultDialog);
-        labelX4->setObjectName(QString::fromUtf8("labelX4"));
-        labelX4->setGeometry(QRect(160, 350, 31, 17));
-        labelX4->setFont(font);
+        labelResult30kmh->setGeometry(QRect(550, 140, 191, 31));

         pushButtonSend = new QPushButton(ResultDialog);
         pushButtonSend->setObjectName(QString::fromUtf8("pushButtonSend"));
         pushButtonSend = new QPushButton(ResultDialog);
         pushButtonSend->setObjectName(QString::fromUtf8("pushButtonSend"));

-        pushButtonSend->setGeometry(QRect(402, 330, 101, 27));
+        pushButtonSend->setGeometry(QRect(550, 260, 101, 27));
+        labelResult80kmh = new QLabel(ResultDialog);
+        labelResult80kmh->setObjectName(QString::fromUtf8("labelResult80kmh"));
+        labelResult80kmh->setGeometry(QRect(550, 40, 191, 31));
+        labelResult70kmh = new QLabel(ResultDialog);
+        labelResult70kmh->setObjectName(QString::fromUtf8("labelResult70kmh"));
+        labelResult70kmh->setGeometry(QRect(550, 60, 191, 31));
+        labelResult60kmh = new QLabel(ResultDialog);
+        labelResult60kmh->setObjectName(QString::fromUtf8("labelResult60kmh"));
+        labelResult60kmh->setGeometry(QRect(550, 80, 191, 31));
+        labelResult50kmh = new QLabel(ResultDialog);
+        labelResult50kmh->setObjectName(QString::fromUtf8("labelResult50kmh"));
+        labelResult50kmh->setGeometry(QRect(550, 100, 191, 31));
+        labelResult90kmh = new QLabel(ResultDialog);
+        labelResult90kmh->setObjectName(QString::fromUtf8("labelResult90kmh"));
+        labelResult90kmh->setGeometry(QRect(550, 20, 191, 31));
+        labelResult100kmh = new QLabel(ResultDialog);
+        labelResult100kmh->setObjectName(QString::fromUtf8("labelResult100kmh"));
+        labelResult100kmh->setGeometry(QRect(550, 0, 191, 31));

 
         retranslateUi(ResultDialog);
 
 
         retranslateUi(ResultDialog);
 

@@ -176,29 +87,14 @@ public:
         labelResult40kmh->setText(QApplication::translate("ResultDialog", "0 - 40 km/h: 9,8 s", 0, QApplication::UnicodeUTF8));
         labelResult20kmh->setText(QApplication::translate("ResultDialog", "0 - 20 km/h: 6,9 s", 0, QApplication::UnicodeUTF8));
         labelResult30kmh->setText(QApplication::translate("ResultDialog", "0 - 30 km/h: 8,6 s", 0, QApplication::UnicodeUTF8));
         labelResult40kmh->setText(QApplication::translate("ResultDialog", "0 - 40 km/h: 9,8 s", 0, QApplication::UnicodeUTF8));
         labelResult20kmh->setText(QApplication::translate("ResultDialog", "0 - 20 km/h: 6,9 s", 0, QApplication::UnicodeUTF8));
         labelResult30kmh->setText(QApplication::translate("ResultDialog", "0 - 30 km/h: 8,6 s", 0, QApplication::UnicodeUTF8));

-        labelY2->setText(QApplication::translate("ResultDialog", "20", 0, QApplication::UnicodeUTF8));
-        labelY6->setText(QApplication::translate("ResultDialog", "60", 0, QApplication::UnicodeUTF8));
-        labelY1->setText(QApplication::translate("ResultDialog", "10", 0, QApplication::UnicodeUTF8));
-        labelY10->setText(QApplication::translate("ResultDialog", "100", 0, QApplication::UnicodeUTF8));
-        labelY3->setText(QApplication::translate("ResultDialog", "30", 0, QApplication::UnicodeUTF8));
-        labelYLine->setText(QApplication::translate("ResultDialog", "Y", 0, QApplication::UnicodeUTF8));
-        labelY4->setText(QApplication::translate("ResultDialog", "40", 0, QApplication::UnicodeUTF8));
-        labelY7->setText(QApplication::translate("ResultDialog", "70", 0, QApplication::UnicodeUTF8));
-        labelY8->setText(QApplication::translate("ResultDialog", "80", 0, QApplication::UnicodeUTF8));
-        labelY5->setText(QApplication::translate("ResultDialog", "50", 0, QApplication::UnicodeUTF8));
-        labelY9->setText(QApplication::translate("ResultDialog", "90", 0, QApplication::UnicodeUTF8));
-        labelX1->setText(QApplication::translate("ResultDialog", "1", 0, QApplication::UnicodeUTF8));
-        labelX3->setText(QApplication::translate("ResultDialog", "3", 0, QApplication::UnicodeUTF8));
-        labelX5->setText(QApplication::translate("ResultDialog", "5", 0, QApplication::UnicodeUTF8));
-        labelX9->setText(QApplication::translate("ResultDialog", "9", 0, QApplication::UnicodeUTF8));
-        labelX7->setText(QApplication::translate("ResultDialog", "7", 0, QApplication::UnicodeUTF8));
-        labelX2->setText(QApplication::translate("ResultDialog", "2", 0, QApplication::UnicodeUTF8));
-        labelX6->setText(QApplication::translate("ResultDialog", "6", 0, QApplication::UnicodeUTF8));
-        labelX8->setText(QApplication::translate("ResultDialog", "8", 0, QApplication::UnicodeUTF8));
-        labelXLine->setText(QApplication::translate("ResultDialog", "X", 0, QApplication::UnicodeUTF8));
-        labelX10->setText(QApplication::translate("ResultDialog", "10", 0, QApplication::UnicodeUTF8));
-        labelX4->setText(QApplication::translate("ResultDialog", "4", 0, QApplication::UnicodeUTF8));

         pushButtonSend->setText(QApplication::translate("ResultDialog", "Send results", 0, QApplication::UnicodeUTF8));
         pushButtonSend->setText(QApplication::translate("ResultDialog", "Send results", 0, QApplication::UnicodeUTF8));

+        labelResult80kmh->setText(QApplication::translate("ResultDialog", "0 - 80 km/h: 9,8 s", 0, QApplication::UnicodeUTF8));
+        labelResult70kmh->setText(QApplication::translate("ResultDialog", "0 - 70 km/h: 8,6 s", 0, QApplication::UnicodeUTF8));
+        labelResult60kmh->setText(QApplication::translate("ResultDialog", "0 - 60 km/h: 6,9 s", 0, QApplication::UnicodeUTF8));
+        labelResult50kmh->setText(QApplication::translate("ResultDialog", "0 - 50 km/h: 5,6 s", 0, QApplication::UnicodeUTF8));
+        labelResult90kmh->setText(QApplication::translate("ResultDialog", "0 - 90 km/h: 8,6 s", 0, QApplication::UnicodeUTF8));
+        labelResult100kmh->setText(QApplication::translate("ResultDialog", "0 - 100 km/h: 9,8 s", 0, QApplication::UnicodeUTF8));
+        Q_UNUSED(ResultDialog);

     } // retranslateUi
 
 };
     } // retranslateUi
 
 };