From: Janne Änäkkälä <janne.anakkala@fudeco.com>
Date: Thu, 18 Mar 2010 07:16:22 +0000 (+0200)
Subject: Added feature which scales result diagrams speed axel right way concerning the choice... 
X-Git-Tag: v0.1~35
X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=ceaaf5439cc6d92466365b40e68f28744b0421a3

Added feature which scales result diagrams speed axel right way concerning the choice which user has been selected
in start tab. Also Show diagram -button added in measure tab which opens result diagram.
---

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index 1e3b7c7..3cdaac1 100644
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -20,7 +20,7 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
 {
     ui->setupUi(this);
     ui->tabWidget->setCurrentWidget(this->ui->StartTab);
-    //result = new ResultDialog();
+    result = new ResultDialog();
     //measure = new MeasureDialog();
     welcomeDialog = new WelcomeDialog();
     welcomeDialog->show();
@@ -105,7 +105,27 @@ void CarMainWindow::on_listViewStartTabAccelerationCategories_clicked(QModelInde
   */
 void CarMainWindow::on_autoStartButton_clicked()
 {
+    choice = ui->listViewStartTabAccelerationCategories->currentIndex();
+    choiceInt = choice.row();
+    qDebug() << choiceInt;
+    if (choiceInt == 0)
+    {
+        ui->labelMeasureTabHeader->setText("Accelerate to 40 km/h");
+        result->setDiagramGapStem(75);
+    }
 
+    else if (choiceInt == 1)
+    {
+        ui->labelMeasureTabHeader->setText("Accelerate to 100 km/h");
+        result->setDiagramGapStem(30);
+    }
+
+    else
+    {
+        ui->labelMeasureTabHeader->setText("Accelerate to 80 km/h");
+        result->setDiagramGapStem(37.5);
+    }
+    ui->labelMeasureTabResult->setText("");
     //delete measure;
     //measure = NULL;
     //measure = new MeasureDialog();
@@ -114,6 +134,45 @@ void CarMainWindow::on_autoStartButton_clicked()
     timer->start();
     // Show measure dialog.
     //measure->show();
+
+    // TODO: Move next if else to the function which is called when target speed
+    // has reached.
+    if (choiceInt == 0)
+    {
+        if (floor(this->measures->getTime40kmh()) <= 5)
+        {
+            result->setDiagramGapHorizontal(80);
+        }
+
+        else if (floor(this->measures->getTime40kmh()) <= 10)
+        {
+            result->setDiagramGapHorizontal(40);
+        }
+
+        else
+        {
+            result->setDiagramGapHorizontal(20);
+        }
+    }
+
+    else
+    {
+        if (floor(this->measures->getTime40kmh()) <= 5)
+        {
+            result->setDiagramGapHorizontal(80);
+        }
+
+        else if (floor(this->measures->getTime40kmh()) <= 10)
+        {
+            result->setDiagramGapHorizontal(40);
+        }
+
+        else
+        {
+            result->setDiagramGapHorizontal(20);
+        }
+    }
+
     ui->tabWidget->setCurrentWidget(this->ui->tabMeasureResult);
 }
 
@@ -194,6 +253,41 @@ void CarMainWindow::openResultView()
     //result->show();
     ui->pushButtonSendResult->setEnabled(true);
     QString timeInteger;
+    if (choiceInt == 0)
+    {
+        if (floor(this->measures->getTime40kmh()) <= 5)
+        {
+            result->setDiagramGapHorizontal(80);
+        }
+
+        else if (floor(this->measures->getTime40kmh()) <= 10)
+        {
+            result->setDiagramGapHorizontal(40);
+        }
+
+        else
+        {
+            result->setDiagramGapHorizontal(20);
+        }
+    }
+
+    else
+    {
+        if (floor(this->measures->getTime40kmh()) <= 5)
+        {
+            result->setDiagramGapHorizontal(80);
+        }
+
+        else if (floor(this->measures->getTime40kmh()) <= 10)
+        {
+            result->setDiagramGapHorizontal(40);
+        }
+
+        else
+        {
+            result->setDiagramGapHorizontal(20);
+        }
+    }
     timeInteger.setNum(this->measures->getTime40kmh());
     //time = "0 - 40 km/h: ";
     //time.append(timeInteger);
@@ -430,6 +524,28 @@ void CarMainWindow::on_drawRoutePushButton_clicked()
     myRoute->show();
 }
 
+/**
+  * Opens result dialog when show result button is clicked.
+  * Sends measures as parameter to the resultdialogs saveMeasuresToArray-function.
+  */
+void CarMainWindow::on_pushButtonShowResultDialog_clicked()
+{
+    Measures meas;
+    meas.setTime10kmh(1.3);
+    meas.setTime20kmh(2.5);
+    meas.setTime30kmh(3.6);
+    meas.setTime40kmh(6.7);
+    meas.setTime50kmh(7.3);
+    meas.setTime60kmh(7.5);
+    meas.setTime70kmh(8.6);
+    meas.setTime80kmh(8.7);
+    meas.setTime90kmh(9.6);
+    meas.setTime100kmh(9.9);
+    result->setDiagramGapHorizontal(40);
+    result->saveMeasuresToArray(&meas);
+    this->result->show();
+}
+
 void CarMainWindow::userLogin()
 {
     myHttpClient->checkLogin();
diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index a65818f..90cdc61 100644
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -25,7 +25,7 @@
 #include <QBuffer>
 #include <QByteArray>
 #include <QDebug>
-//#include "resultdialog.h"
+#include "resultdialog.h"
 //#include "measuredialog.h"
 #include "welcomedialog.h"
 #include "loginwindow.h"
@@ -62,7 +62,7 @@ protected:
 
 private:
     Ui::CarMainWindow *ui;
-    //ResultDialog *result;
+    ResultDialog *result;
     //MeasureDialog *measure;
     WelcomeDialog *welcomeDialog;
     CategoryList *categorylist;
@@ -85,11 +85,15 @@ private:
     double speed;
     Measures *measures;
 
+    QModelIndex choice;
+    int choiceInt;
+
 signals:
     void speedAchieved();
     void userNameChanged();
 
 private slots:
+    void on_pushButtonShowResultDialog_clicked();
     void on_drawRoutePushButton_clicked();
     void on_pushButtonSendResult_clicked();
     void on_pushButtonMeasureTabAbort_clicked();
diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui
index f619f55..6a10e33 100644
--- a/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@ -446,6 +446,19 @@
        <string>0</string>
       </property>
      </widget>
+     <widget class="QPushButton" name="pushButtonShowResultDialog">
+      <property name="geometry">
+       <rect>
+        <x>470</x>
+        <y>140</y>
+        <width>161</width>
+        <height>71</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Show diagram</string>
+      </property>
+     </widget>
     </widget>
     <widget class="QWidget" name="tab">
      <attribute name="title">
diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index 679afce..3313f73 100644
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -10,20 +10,29 @@
 #include "ui_resultdialog.h"
 #include <QPainter>
 
-const QPoint diagramStemStart(50, 350);
-const QPoint diagramStemEnd(50, 30);
+const int DIAGRAM_WIDTH = 400;
+const int DIAGRAM_HEIGHT = 300;
 
-const QPoint diagramHorizontalStart(50, 350);
-const QPoint diagramHorizontalEnd(450, 350);
+const int DIAGRAMGAP100KMH = 30;
+const int DIAGRAMGAP40KMH = 75;
+const int DIAGRAMGAP60KMH = 50;
+const int DIAGRAMGAP50KMH = 60;
+const double DIAGRAMGAP80KMH = 37.5;
+
+const QPoint diagramStemStart(70, 330);
+const QPoint diagramStemEnd(70, 30);
+
+const QPoint diagramHorizontalStart(70, 330);
+const QPoint diagramHorizontalEnd(470, 330);
 
 const int diagramGap = 30;
 
 // Test arrays for changing speeds and times to the points in diagram
-static const int speedArray[10] = {10, 20, 30, 40, 50, 60, 70, 80, 90, 100};
+static const int speedArray[11] = {0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100};
 //static const int timeArray[10] = {1, 2, 3, 4, 5, 6, 7, 8, 10, 12};
 
 // Test point array for the diagram.
-QPoint points[10];
+QPoint points[11];
 
 /**
   * Constructor of this class.
@@ -34,11 +43,9 @@ ResultDialog::ResultDialog(QWidget *parent) :
     ui(new Ui::ResultDialog)
 {
     ui->setupUi(this);
-
-
-
-   // ui->labelXLine->setText(ui->labelXLine->text().append(": time/ s"));
-   // ui->labelYLine->setText(ui->labelYLine->text().append(": speed/ km/h"));
+    speedList << "0" << "10" << "20" << "30" << "40" << "50" << "60" << "70" << "80" << "90" << "100" ;
+    timeList << "0" << "1" << "2" << "3" << "4" << "5" << "6" << "7" << "8" << "9" << "10" << "11"
+            << "12" << "13" << "14" << "15" << "16" << "17" << "18" << "19" << "20";
 }
 
 /**
@@ -69,34 +76,69 @@ void ResultDialog::paintEvent(QPaintEvent *)
 {
         QPainter painter(this);
 
-        painter.setRenderHint(QPainter::Antialiasing, true);
-        painter.setPen(QPen((Qt::white),2));
-        painter.setBrush(QBrush((Qt::yellow), Qt::SolidPattern));
-        painter.drawLine(diagramStemStart, diagramStemEnd);
-        painter.drawLine(diagramHorizontalStart, diagramHorizontalEnd);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setPen(QPen((Qt::red),2));
+    QFont font;
+    font.setPixelSize(12);
+    painter.setFont(font);
+    painter.setBrush(QBrush((Qt::yellow), Qt::SolidPattern));
+    painter.drawLine(diagramStemStart, diagramStemEnd);
+    painter.drawLine(diagramHorizontalStart, diagramHorizontalEnd);
+
+    int currentX = 0;
+    int currentY = diagramStemStart.y();
+
+    painter.setPen(QPen((Qt::blue),1));
+    // Draws diagram's X-axel
+    int i = 0;
+    while (currentX <= DIAGRAM_WIDTH)
+    {
+        painter.drawLine(currentX + diagramStemStart.x(), currentY, currentX + diagramStemStart.x(), currentY - 300);
+        painter.drawText(currentX + diagramStemStart.x(), currentY + 20, timeList[i]);
+        currentX += this->diagramGapHorizontal;
+        i++;
+    }
 
-        int currentX = diagramStemStart.x();
-        int currentY = diagramStemStart.y();
+    currentX = diagramStemStart.x();
+    currentY = 0;
 
-        // Draws diagram's X-axel
-        for (int i = 0; i < 13; i++)
-        {
-            currentX += diagramGap;
-            painter.drawLine(currentX, currentY, currentX, currentY - 10);
-        }
+    i = 0;
+    // Draws diagram's Y-axel
+    while (currentY >= -(DIAGRAM_HEIGHT))
+    {
+        painter.drawLine(currentX, diagramStemStart.y() + currentY, currentX+400, diagramStemStart.y() + currentY);
+        painter.drawText(currentX - 25, diagramStemStart.y() + currentY, speedList[i]);
+        currentY -= this->diagramGapStem;
+        i++;
+    }
 
-        currentX = diagramStemStart.x();
-        currentY = diagramStemStart.y();
+    painter.setPen(QPen((Qt::white),2));
 
-        // Draws diagram's Y-axel
-        for (int i = 0; i < 10; i++)
-        {
-            currentY -= diagramGap;
-            painter.drawLine(currentX, currentY, currentX+10, currentY);
-        }
+    // Draws result line to the diagram
+    if (this->diagramGapStem == DIAGRAMGAP100KMH)
+    {
+        painter.drawPolyline(points, 11);
+    }
 
-        painter.drawPolyline(points, 4);
+    else if (this->diagramGapStem == DIAGRAMGAP80KMH)
+    {
+        painter.drawPolyline(points, 9);
+    }
+
+    else if (this->diagramGapStem == DIAGRAMGAP60KMH)
+    {
+        painter.drawPolyline(points, 7);
+    }
 
+    else if (this->diagramGapStem == DIAGRAMGAP50KMH)
+    {
+        painter.drawPolyline(points, 6);
+    }
+
+    else
+    {
+        painter.drawPolyline(points, 5);
+    }
 }
 
 /**
@@ -110,8 +152,37 @@ QPoint ResultDialog::changeMeasuresToDiagramPoint(int aSpeed, qreal aTime)
 
     int speedAsPixels;
     int timeAsPixels;
-    speedAsPixels = 300*aSpeed/100;
-    timeAsPixels = 300*aTime/10;
+
+    // Calculate speed and time to the point which can be drawn to the diagram
+    if (this->diagramGapStem == DIAGRAMGAP100KMH)
+    {
+        speedAsPixels = DIAGRAM_HEIGHT*aSpeed/100;
+        timeAsPixels = DIAGRAM_WIDTH*aTime/10;
+    }
+
+    else if (this->diagramGapStem == DIAGRAMGAP80KMH)
+    {
+        speedAsPixels = DIAGRAM_HEIGHT*aSpeed/80;
+        timeAsPixels = DIAGRAM_WIDTH*aTime/10;
+    }
+
+    else if (this->diagramGapStem == DIAGRAMGAP60KMH)
+    {
+        speedAsPixels = DIAGRAM_HEIGHT*aSpeed/60;
+        timeAsPixels = DIAGRAM_WIDTH*aTime/10;
+    }
+
+    else if (this->diagramGapStem == DIAGRAMGAP50KMH)
+    {
+        speedAsPixels = DIAGRAM_HEIGHT*aSpeed/50;
+        timeAsPixels = DIAGRAM_WIDTH*aTime/10;
+    }
+
+    else
+    {
+        speedAsPixels = DIAGRAM_HEIGHT*aSpeed/40;
+        timeAsPixels = DIAGRAM_WIDTH*aTime/10;
+    }
     point.setY(diagramStemStart.y()-speedAsPixels);
     point.setX(diagramStemStart.x()+timeAsPixels);
 
@@ -124,63 +195,130 @@ QPoint ResultDialog::changeMeasuresToDiagramPoint(int aSpeed, qreal aTime)
   */
 void ResultDialog::saveMeasuresToArray(Measures *pMeasures)
 {
-    timeArray[0] = pMeasures->getTime10kmh();
-    timeArray[1] = pMeasures->getTime20kmh();
-    timeArray[2] = pMeasures->getTime30kmh();
-    timeArray[3] = pMeasures->getTime40kmh();
-    timeArray[4] = pMeasures->getTime50kmh();
-    timeArray[5] = pMeasures->getTime60kmh();
-    timeArray[6] = pMeasures->getTime70kmh();
-    timeArray[7] = pMeasures->getTime80kmh();
-    timeArray[8] = pMeasures->getTime90kmh();
-    timeArray[9] = pMeasures->getTime100kmh();
-
-    for (int i = 0; i < 4; i++)
+    timeArray[0] = 0;
+    timeArray[1] = pMeasures->getTime10kmh();
+    timeArray[2] = pMeasures->getTime20kmh();
+    timeArray[3] = pMeasures->getTime30kmh();
+    timeArray[4] = pMeasures->getTime40kmh();
+    timeArray[5] = pMeasures->getTime50kmh();
+    timeArray[6] = pMeasures->getTime60kmh();
+    timeArray[7] = pMeasures->getTime70kmh();
+    timeArray[8] = pMeasures->getTime80kmh();
+    timeArray[9] = pMeasures->getTime90kmh();
+    timeArray[10] = pMeasures->getTime100kmh();
+
+    for (int i = 0; i < 11; i++)
     {
         points[i] = changeMeasuresToDiagramPoint(speedArray[i], timeArray[i]);
     }
 
+    setTimesIntoLabels();
+    this->repaint();
+
+    for (int i = 0; i < 11; i++)
+    {
+        timeArray[i] = 0;
+    }
+}
+
+void ResultDialog::on_pushButtonSend_clicked()
+{
+    emit sendresult();
+}
+
+/**
+  * Saves the given diagram gap to the member variable.
+  * @param pDiagramGapStem has information about the right gap for diagram stem axel.
+  */
+void ResultDialog::setDiagramGapStem(double pDiagramGapStem)
+{
+    this->diagramGapStem = pDiagramGapStem;
+}
+
+/**
+  * Saves the given diagram gap to the member variable.
+  * @param pDiagramGapHorizontal has information about the right gap for diagram horizontal axel.
+  */
+void ResultDialog::setDiagramGapHorizontal(double pDiagramGapHorizontal)
+{
+    this->diagramGapHorizontal = pDiagramGapHorizontal;
+}
+
+/**
+  * Sets result times in to the labels and shows only wanted results and hides
+  * unwanted.
+  */
+void ResultDialog::setTimesIntoLabels()
+{
     QString time, timeInteger;
-    timeInteger.setNum(timeArray[3]);
+    timeInteger.setNum(timeArray[4]);
     time = "0 - 40 km/h: ";
     time.append(timeInteger);
     ui->labelResult40kmh->setText(time);
 
-    timeInteger.setNum(timeArray[2]);
+    timeInteger.setNum(timeArray[3]);
     time = "0 - 30 km/h: ";
     time.append(timeInteger);
     ui->labelResult30kmh->setText(time);
 
-    timeInteger.setNum(timeArray[1]);
+    timeInteger.setNum(timeArray[2]);
     time = "0 - 20 km/h: ";
     time.append(timeInteger);
     ui->labelResult20kmh->setText(time);
 
-    timeInteger.setNum(timeArray[0]);
+    timeInteger.setNum(timeArray[1]);
     time = "0 - 10 km/h: ";
     time.append(timeInteger);
     ui->labelResult10kmh->setText(time);
 
-   /* timeInteger.setNum(timeArray[5]);
+    timeInteger.setNum(timeArray[6]);
     time = "0 - 60 km/h: ";
     time.append(timeInteger);
-    ui->labelResult_5->setText(time);
+    ui->labelResult60kmh->setText(time);
 
-    timeInteger.setNum(timeArray[4]);
+    timeInteger.setNum(timeArray[5]);
     time = "0 - 50 km/h: ";
     time.append(timeInteger);
-    ui->labelResult_6->setText(time);
+    ui->labelResult50kmh->setText(time);
 
-    timeInteger.setNum(timeArray[3]);
-    time = "0 - 40 km/h: ";
+    timeInteger.setNum(timeArray[7]);
+    time = "0 - 70 km/h: ";
     time.append(timeInteger);
-    ui->labelResult_7->setText(time);*/
+    ui->labelResult70kmh->setText(time);
 
-    this->repaint();
+    timeInteger.setNum(timeArray[8]);
+    time = "0 - 80 km/h: ";
+    time.append(timeInteger);
+    ui->labelResult80kmh->setText(time);
+
+    timeInteger.setNum(timeArray[9]);
+    time = "0 - 90 km/h: ";
+    time.append(timeInteger);
+    ui->labelResult90kmh->setText(time);
+
+    timeInteger.setNum(timeArray[10]);
+    time = "0 - 100 km/h: ";
+    time.append(timeInteger);
+    ui->labelResult100kmh->setText(time);
 
-    for (int i = 0; i < 10; i++)
+    if (this->diagramGapStem == DIAGRAMGAP40KMH)
     {
-        timeArray[i] = 0;
+        ui->labelResult50kmh->hide();
+        ui->labelResult60kmh->hide();
+        ui->labelResult70kmh->hide();
+        ui->labelResult80kmh->hide();
+        ui->labelResult90kmh->hide();
+        ui->labelResult100kmh->hide();
+    }
+
+    else
+    {
+        ui->labelResult50kmh->show();
+        ui->labelResult60kmh->show();
+        ui->labelResult70kmh->show();
+        ui->labelResult80kmh->show();
+        ui->labelResult90kmh->show();
+        ui->labelResult100kmh->show();
     }
 }
 
diff --git a/Client/resultdialog.h b/Client/resultdialog.h
index d0184cc..41722ba 100644
--- a/Client/resultdialog.h
+++ b/Client/resultdialog.h
@@ -22,6 +22,8 @@ public:
     ResultDialog(QWidget *parent = 0);
     ~ResultDialog();
     void saveMeasuresToArray(Measures *pMeasures);
+    void setDiagramGapStem(double pDiagramGapStem);
+    void setDiagramGapHorizontal(double pDiagramGapHorizontal);
 
 signals:
     void sendresult();
@@ -32,10 +34,15 @@ protected:
 
 private:
     QPoint changeMeasuresToDiagramPoint(int aSpeed, qreal aTime);
-    qreal timeArray[10];
+    void setTimesIntoLabels();
 
 private:
     Ui::ResultDialog *ui;
+    qreal timeArray[11];
+    double diagramGapStem;
+    double diagramGapHorizontal;
+    QStringList speedList;
+    QStringList timeList;
 
 private slots:
     void on_pushButtonSend_clicked();
diff --git a/Client/resultdialog.ui b/Client/resultdialog.ui
index 81717c3..a1ad0f4 100644
--- a/Client/resultdialog.ui
+++ b/Client/resultdialog.ui
@@ -16,8 +16,8 @@
   <widget class="QLabel" name="labelResult10kmh">
    <property name="geometry">
     <rect>
-     <x>410</x>
-     <y>230</y>
+     <x>550</x>
+     <y>180</y>
      <width>191</width>
      <height>31</height>
     </rect>
@@ -29,8 +29,8 @@
   <widget class="QLabel" name="labelResult40kmh">
    <property name="geometry">
     <rect>
-     <x>410</x>
-     <y>90</y>
+     <x>550</x>
+     <y>120</y>
      <width>191</width>
      <height>31</height>
     </rect>
@@ -42,8 +42,8 @@
   <widget class="QLabel" name="labelResult20kmh">
    <property name="geometry">
     <rect>
-     <x>410</x>
-     <y>180</y>
+     <x>550</x>
+     <y>160</y>
      <width>191</width>
      <height>31</height>
     </rect>
@@ -55,7 +55,7 @@
   <widget class="QLabel" name="labelResult30kmh">
    <property name="geometry">
     <rect>
-     <x>410</x>
+     <x>550</x>
      <y>140</y>
      <width>191</width>
      <height>31</height>
@@ -65,435 +65,95 @@
     <string>0 - 30 km/h: 8,6 s</string>
    </property>
   </widget>
-  <widget class="QLabel" name="labelY2">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>280</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>20</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelY6">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>160</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>60</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelY1">
+  <widget class="QPushButton" name="pushButtonSend">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>310</y>
-     <width>31</width>
-     <height>17</height>
+     <x>550</x>
+     <y>260</y>
+     <width>101</width>
+     <height>27</height>
     </rect>
    </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
    <property name="text">
-    <string>10</string>
+    <string>Send results</string>
    </property>
   </widget>
-  <widget class="QLabel" name="labelY10">
+  <widget class="QLabel" name="labelResult80kmh">
    <property name="geometry">
     <rect>
-     <x>20</x>
+     <x>550</x>
      <y>40</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>100</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelY3">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>250</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>30</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelYLine">
-   <property name="geometry">
-    <rect>
-     <x>5</x>
-     <y>10</y>
-     <width>171</width>
-     <height>17</height>
+     <width>191</width>
+     <height>31</height>
     </rect>
    </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
    <property name="text">
-    <string>Y</string>
+    <string>0 - 80 km/h: 9,8 s</string>
    </property>
   </widget>
-  <widget class="QLabel" name="labelY4">
+  <widget class="QLabel" name="labelResult70kmh">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>220</y>
-     <width>31</width>
-     <height>17</height>
+     <x>550</x>
+     <y>60</y>
+     <width>191</width>
+     <height>31</height>
     </rect>
    </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
    <property name="text">
-    <string>40</string>
+    <string>0 - 70 km/h: 8,6 s</string>
    </property>
   </widget>
-  <widget class="QLabel" name="labelY7">
+  <widget class="QLabel" name="labelResult60kmh">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>130</y>
-     <width>31</width>
-     <height>17</height>
+     <x>550</x>
+     <y>80</y>
+     <width>191</width>
+     <height>31</height>
     </rect>
    </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
    <property name="text">
-    <string>70</string>
+    <string>0 - 60 km/h: 6,9 s</string>
    </property>
   </widget>
-  <widget class="QLabel" name="labelY8">
+  <widget class="QLabel" name="labelResult50kmh">
    <property name="geometry">
     <rect>
-     <x>20</x>
+     <x>550</x>
      <y>100</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>80</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelY5">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>190</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>50</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelY9">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>70</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>90</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX1">
-   <property name="geometry">
-    <rect>
-     <x>70</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>1</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX3">
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>3</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX5">
-   <property name="geometry">
-    <rect>
-     <x>190</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>5</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX9">
-   <property name="geometry">
-    <rect>
-     <x>310</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>9</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX7">
-   <property name="geometry">
-    <rect>
-     <x>250</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>7</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX2">
-   <property name="geometry">
-    <rect>
-     <x>100</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>2</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX6">
-   <property name="geometry">
-    <rect>
-     <x>220</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>6</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX8">
-   <property name="geometry">
-    <rect>
-     <x>280</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>8</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelXLine">
-   <property name="geometry">
-    <rect>
-     <x>50</x>
-     <y>360</y>
-     <width>170</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>X</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="labelX10">
-   <property name="geometry">
-    <rect>
-     <x>340</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
+     <width>191</width>
+     <height>31</height>
     </rect>
    </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
    <property name="text">
-    <string>10</string>
+    <string>0 - 50 km/h: 5,6 s</string>
    </property>
   </widget>
-  <widget class="QLabel" name="labelX4">
+  <widget class="QLabel" name="labelResult90kmh">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>350</y>
-     <width>31</width>
-     <height>17</height>
+     <x>550</x>
+     <y>20</y>
+     <width>191</width>
+     <height>31</height>
     </rect>
    </property>
-   <property name="font">
-    <font>
-     <family>Bitstream Charter</family>
-     <pointsize>8</pointsize>
-    </font>
-   </property>
    <property name="text">
-    <string>4</string>
+    <string>0 - 90 km/h: 8,6 s</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="pushButtonSend">
+  <widget class="QLabel" name="labelResult100kmh">
    <property name="geometry">
     <rect>
-     <x>402</x>
-     <y>330</y>
-     <width>101</width>
-     <height>27</height>
+     <x>550</x>
+     <y>0</y>
+     <width>191</width>
+     <height>31</height>
     </rect>
    </property>
    <property name="text">
-    <string>Send results</string>
+    <string>0 - 100 km/h: 9,8 s</string>
    </property>
   </widget>
  </widget>