X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ftextelement.h;h=021db883cbb3dc2693b092543e682b5ad6ea6b8a;hb=HEAD;hp=b53158091f8f5373d785c72ad41caeb8040866ad;hpb=758f7d4613278140d903394e147c4b95d8b11cd2;p=jspeed

diff --git a/src/textelement.h b/src/textelement.h
index b531580..021db88 100644
--- a/src/textelement.h
+++ b/src/textelement.h
@@ -30,8 +30,8 @@ class GraphicsScene;
 class TextElement : public GraphicsElement
 {
 public:
-    enum Attribute {XPOS, YPOS, DATA, FORMAT, WIDTH, ALIGN, COLOR, SIZE, FONT, BOLD, ITALIC, UPPERCASE, LETTERSPACING, ATTRIBUTE_COUNT};
-    enum Field {TRIP, TOTAL, SPEED, MAXSPEED, AVGSPEED, UNIT, SPEEDUNIT, TIME, FIELD_COUNT};
+    enum Attribute {XPOS, YPOS, ZPOS, VISIBLEWHEN, DATA, FORMAT, WIDTH, ALIGN, COLOR, SIZE, FONT, BOLD, ITALIC, UPPERCASE, LETTERSPACING, TIMEFORMAT, DATEFORMAT, ATTRIBUTE_COUNT};
+    enum Field {TRIP, TOTAL, SPEED, MAXSPEED, AVGSPEED, UNIT, SPEEDUNIT, TIME, DATE, POIDISTANCE, POITEXT, ANGLE, LATITUDE, LONGITUDE, ALTITUDE, DISTANCEUNIT, FIELD_COUNT};
     TextElement(Reader* reader);
     virtual bool setAttribute(QString const& name, QString const& value);
     virtual void addToScene(GraphicsScene* scene);
@@ -39,6 +39,7 @@ public:
     virtual QGraphicsItem* getElement() const;
 
 private:
+    QString handleEmpty(double value);
     void updateHtml(QString data);
     void replaceSpecialFields(QString& value);
     void replaceValue(QString& value, Field field, QString const& replace);
@@ -48,6 +49,8 @@ private:
     QString data_;
     QString format_;
     QString align_;
+    QString timeFormat_;
+    QString dateFormat_;
     int fontSize_;
     bool bold_;
     bool italic_;