Bugfix: Route dialog draws start and finish texts out of the screen.

[speedfreak] / Client / routedialog.cpp

diff --git a/Client/routedialog.cpp b/Client/routedialog.cpp
index 7ad0e70..e51d8d0 100644 (file)
--- a/Client/routedialog.cpp
+++ b/Client/routedialog.cpp
@@ -170,35 +170,25 @@ qreal countDistance(Vector *p1, Vector *p2)
   * Constructor of this class.
   */
 RouteDialog::RouteDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::RouteDialog)
+    QDialog(parent), ui(new Ui::RouteDialog)
 {
     qDebug() << "__RouteDialog";
     ui->setupUi(this);
     this->setWindowTitle("Route");
     left = 5; top = 5; right = 495; bottom = 295; // Limits in screen coordinates
 
-    //Button settings
+    // Button settings
     ui->sendPushButton->setAutoFillBackground(true);
     ui->sendPushButton->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
     ui->newPushButton->setAutoFillBackground(true);
     ui->newPushButton->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 
-    //Clear labels
+    // Clear labels
     ui->labelInfoToUser->setText("");
-    ui->maxSpeedLabel->setText("");
     ui->speedValueLabel->setText("");
 
-    // Send rout to server button disable/enable.
-    ui->sendPushButton->setEnabled(false);
-    if (loginSaved())
-    {
-        ui->sendPushButton->setEnabled(true);
-    }
-    else
-    {
-        ui->labelInfoToUser->setText("You're not logged! Please register or log in.");
-    }
+    // Check login
+    checkLogin();
 }
 
 /**
@@ -261,7 +251,7 @@ int RouteDialog::getBottom()
 /**
   *
   */
-void drawFlag( RouteDialog *rD, QPainter *p, int x, int y)
+void drawFlag( RouteDialog *rD, QPainter *p, int x, int y, QString startFinish)
 {
     /*QPolygon pg;
 
@@ -279,6 +269,9 @@ void drawFlag( RouteDialog *rD, QPainter *p, int x, int y)
             p->drawLine( x,    y-25, x+10, y-20);
             p->drawLine( x+10, y-20, x,    y-15);
             p->drawLine( x,    y-15, x,    y-25);
+
+            // Draw start or finish
+            p->drawText(x+10, y, startFinish);
         }
         else
         {
@@ -286,8 +279,10 @@ void drawFlag( RouteDialog *rD, QPainter *p, int x, int y)
             p->drawLine( x,    y-25, x-10, y-20);
             p->drawLine( x-10, y-20, x,    y-15);
             p->drawLine( x,    y-15, x,    y-25);
-        }
 
+            // Draw start or finish
+            p->drawText(x+10, y, startFinish);
+        }    
     }
     else if (y <= (rD->getTop() + 25))
     {
@@ -299,6 +294,9 @@ void drawFlag( RouteDialog *rD, QPainter *p, int x, int y)
             p->drawLine( x,    y+25, x+10, y+20);
             p->drawLine( x+10, y+20, x,    y+15);
             p->drawLine( x,    y+15, x,    y+25);
+
+            // Draw start or finish
+            p->drawText(x+10, y+15, startFinish);
         }
         else
         {
@@ -306,6 +304,9 @@ void drawFlag( RouteDialog *rD, QPainter *p, int x, int y)
             p->drawLine( x,    y+25, x-10, y+20);
             p->drawLine( x-10, y+20, x,    y+15);
             p->drawLine( x,    y+15, x,    y+25);
+
+            // Draw start or finish
+            p->drawText(x+10, y+15, startFinish);
         }
     }
     //p->drawPolygon();
@@ -322,6 +323,9 @@ void drawFlag( RouteDialog *rD, QPainter *p, int x, int y)
 /* */
 void RouteDialog::paintEvent(QPaintEvent *)
 {
+    // Check login
+    checkLogin();
+
     int type = 0; //  0 for 2d, 1 for 3d
     int startx, starty; // Starting point of the route
     int i, maxi;
@@ -329,6 +333,7 @@ void RouteDialog::paintEvent(QPaintEvent *)
     int x1Screen, y1Screen, x2Screen, y2Screen;
     Vector v1, v2;
     QPainter painter(this);
+    int startStop = 0;
 
     painter.setRenderHint(QPainter::Antialiasing, true);
     painter.setPen(QPen((Qt::white),2));
@@ -370,7 +375,7 @@ void RouteDialog::paintEvent(QPaintEvent *)
             // Starting point
             startx = x1Screen; starty = y1Screen;
            // painter.drawEllipse( x1Screen-5, y1Screen-5, 10, 10);
-           drawFlag( this, &painter,  x1Screen ,  y1Screen);
+           drawFlag( this, &painter,  x1Screen,  y1Screen, "Start" );
         }
         painter.drawLine( x1Screen, y1Screen, x2Screen, y2Screen);
     }
@@ -378,7 +383,7 @@ void RouteDialog::paintEvent(QPaintEvent *)
     if (x2Screen != startx || y2Screen != starty)
     {
         //painter.drawEllipse( x2Screen-5, y2Screen-5, 10, 10);
-        drawFlag( this, &painter,x2Screen, y2Screen );
+        drawFlag( this, &painter, x2Screen, y2Screen, "Finish" );
     }
 
     {
@@ -403,10 +408,11 @@ void RouteDialog::paintEvent(QPaintEvent *)
 
         // Show max velocity point by yellow circle
         painter.drawEllipse( x1Screen-5, y1Screen-5, 10, 10);
+        painter.drawEllipse( 650, 225, 10, 10);
 
         QString jono;
         //jono = QString("%1 km/h").arg(maxv);
-        jono.sprintf("%.1f km/h", maxv);
+        jono.sprintf("%.1f km/h", maxv); // Show only 1 decimal
         ui->speedValueLabel->setText(jono);
     }
 }
@@ -817,3 +823,20 @@ void RouteDialog::setSendServerButtonEnabled()
 {
     ui->sendPushButton->setEnabled(true);
 }
+
+/**
+  * This function check login and set send route to server button disabled/enabled.
+  */
+void RouteDialog::checkLogin()
+{
+    if (loginSaved())
+    {
+        ui->sendPushButton->setEnabled(true);
+        ui->labelInfoToUser->setText("");
+    }
+    else
+    {
+        ui->sendPushButton->setEnabled(false);
+        ui->labelInfoToUser->setText("You're not logged! Please register or log in.");
+    }
+}