Couple of new fields added to text element. Small fix to web page.

[jspeed] / src / textelement.cpp

diff --git a/src/textelement.cpp b/src/textelement.cpp
index 98b2fb8..d42b423 100644 (file)
--- a/src/textelement.cpp
+++ b/src/textelement.cpp
@@ -18,13 +18,14 @@
 
 #include <QtCore/QString>
 #include <QtCore/QDebug>
+#include <QtCore/QTime>
 #include <QtGui/QGraphicsScene>
 #include <QtGui/QGraphicsTextItem>
-#include "reader.h"
 #include "textelement.h"
+#include "reader.h"
 #include "odometer.h"
 #include "graphicsscene.h"
-#include "location.h"
+#include "poialerts.h"
 
 namespace
 {
@@ -32,22 +33,34 @@ namespace
     {
      {"xpos", true},
      {"ypos", true},
+     {"zpos", true},
+     {"visiblewhen", false},
      {"data", false},
      {"format", false},
      {"width", true},
      {"align", false},
      {"color", false},
      {"size", true},
-     {"font", false}
+     {"font", false},
+     {"bold", false},
+     {"italic", false},
+     {"uppercase", false},
+     {"letterspacing", true},
+     {"timeformat", false},
+     {"dateformat", false}
     };
 
     const QString FIELDS[TextElement::FIELD_COUNT] =  {"TRIP", "TOTAL", "SPEED",
                                                        "MAXSPEED", "AVGSPEED",
-                                                       "UNIT", "SPEEDUNIT"};
+                                                       "UNIT", "SPEEDUNIT", "TIME", "DATE",
+                                                       "POIDISTANCE", "ANGLE", "LATITUDE",
+                                                       "LONGITUDE", "ALTITUDE", "DISTANCEUNIT"};
 }
 
 TextElement::TextElement(Reader* reader): GraphicsElement(reader),
-data_(""), format_(""), align_("left"), fontSize_(16)
+data_(""), format_(""), align_("left"), timeFormat_("hh:mm"),
+dateFormat_("dd.MM.yyyy"), fontSize_(16), bold_(false), italic_(false),
+uppercase_(false), letterSpacing_(0)
 {
     element_ = new QGraphicsTextItem();
 }
@@ -71,6 +84,12 @@ bool TextElement::setAttribute(QString const& name, QString const& value)
         case YPOS:
             element_->setY(intVal);
             break;
+        case ZPOS:
+            element_->setZValue(intVal);
+            break;
+        case VISIBLEWHEN:
+            setVisibleWhen(strToVisibleWhen(value));
+            break;
         case DATA:
             data_ = value;
             break;
@@ -94,6 +113,36 @@ bool TextElement::setAttribute(QString const& name, QString const& value)
             fontFile_ = value;
             fontChanged = true;
             break;
+        case BOLD:
+            if(value != "false" && value != "0")
+            {
+                bold_ = true;
+                fontChanged = true;
+            }
+            break;
+        case ITALIC:
+            if(value != "false" && value != "0")
+            {
+                italic_ = true;
+                fontChanged = true;
+            }
+            break;
+        case UPPERCASE:
+            if(value != "false" && value != "0")
+            {
+                uppercase_ = true;
+            }
+            break;
+        case LETTERSPACING:
+            letterSpacing_ = intVal;
+            fontChanged = true;
+            break;
+        case TIMEFORMAT:
+            timeFormat_ = value;
+            break;
+        case DATEFORMAT:
+            dateFormat_ = value;
+            break;
         default:
             qDebug() << "Unknown attribute: " << attr;
             return false;
@@ -101,24 +150,7 @@ bool TextElement::setAttribute(QString const& name, QString const& value)
 
         if(fontChanged)
         {
-            if(!fontFile_.isEmpty())
-            {
-                QFont font;
-
-                if(getFont(fontFile_, font))
-                {
-                    font.setPointSize(fontSize_);
-                    element_->setFont(font);
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                element_->setFont(QFont("Default", fontSize_));
-            }
+            return applyFont();
         }
 
         return true;
@@ -130,10 +162,42 @@ bool TextElement::setAttribute(QString const& name, QString const& value)
     }
 }
 
-void TextElement::addToScene(GraphicsScene* scene)
+bool TextElement::applyFont()
 {
-    Location::Fix fix;
+    QFont font;
+
+    if(!fontFile_.isEmpty())
+    {
+        if(!getFont(fontFile_, font))
+        {
+            return false;
+        }
+    }
+
+    font.setPointSize(fontSize_);
 
+    if(bold_)
+    {
+        font.setBold(true);
+    }
+
+    if(italic_)
+    {
+        font.setItalic(true);
+    }
+
+    if(letterSpacing_)
+    {
+        font.setLetterSpacing(QFont::PercentageSpacing, letterSpacing_);
+    }
+
+    element_->setFont(font);
+
+    return true;
+}
+
+void TextElement::addToScene(GraphicsScene* scene)
+{
     specialFields_.clear();
 
     for(int i = 0; i < FIELD_COUNT; i++)
@@ -142,6 +206,7 @@ void TextElement::addToScene(GraphicsScene* scene)
         {
             specialFields_.push_back(static_cast<Field>(i));
         }
+
     }
 
     QString replaced = data_;
@@ -164,8 +229,13 @@ void TextElement::update()
     updateHtml(replaced);
 }
 
-void TextElement::updateHtml(QString const& data)
+void TextElement::updateHtml(QString data)
 {
+    if(uppercase_)
+    {
+        data = data.toUpper();
+    }
+
     element_->setHtml("<div align='"+align_+"'>"+data+"</div>");
 }
 
@@ -199,12 +269,46 @@ void TextElement::replaceSpecialFields(QString& value)
         case SPEEDUNIT:
             replaceValue(value, f, o->getSpeedUnit());
             break;
+        case TIME:
+            replaceValue(value, f, QTime::currentTime().toString(timeFormat_));
+            break;
+        case DATE:
+            replaceValue(value, f, QDate::currentDate().toString(dateFormat_));
+            break;
+        case POIDISTANCE:
+            replaceValue(value, f, handleEmpty(PoiAlerts::instance().getCurrentDistance()));
+            break;
+        case ANGLE:
+            replaceValue(value, f, formatString(o->getLatestFix().track));
+            break;
+        case LATITUDE:
+            replaceValue(value, f, handleEmpty(o->getLatestFix().latitude));
+            break;
+        case LONGITUDE:
+            replaceValue(value, f, handleEmpty(o->getLatestFix().longitude));
+            break;
+        case ALTITUDE:
+            replaceValue(value, f, handleEmpty(o->getLatestFix().altitude));
+            break;
+        case DISTANCEUNIT:
+            replaceValue(value, f, o->getMeterUnit());
+            break;
         default:
             qDebug() << "Unknown field: " << f;
         }
     }
 }
 
+QString TextElement::handleEmpty(double value)
+{
+    if(value < 0.01)
+    {
+        return "";
+    }
+
+    return formatString(value);
+}
+
 void TextElement::replaceValue(QString& value,
                                TextElement::Field field,
                                QString const& replace)
@@ -226,3 +330,9 @@ QString TextElement::formatString(double val)
 
     return result;
 }
+
+
+QGraphicsItem* TextElement::getElement() const
+{
+    return element_;
+}