Small change to text element.

diff --git a/src/textelement.cpp b/src/textelement.cpp
index fc3b79e..9097700 100644 (file)
--- a/src/textelement.cpp
+++ b/src/textelement.cpp
@@ -53,7 +53,7 @@ namespace
     const QString FIELDS[TextElement::FIELD_COUNT] =  {"TRIP", "TOTAL", "SPEED",
                                                        "MAXSPEED", "AVGSPEED",
                                                        "UNIT", "SPEEDUNIT", "TIME", "DATE",
     const QString FIELDS[TextElement::FIELD_COUNT] =  {"TRIP", "TOTAL", "SPEED",
                                                        "MAXSPEED", "AVGSPEED",
                                                        "UNIT", "SPEEDUNIT", "TIME", "DATE",

-                                                       "POIDISTANCE", "POI", "ANGLE", "LATITUDE",
+                                                       "POIDISTANCE", "POITEXT", "ANGLE", "LATITUDE",

                                                        "LONGITUDE", "ALTITUDE", "DISTANCEUNIT"};
 }
 
                                                        "LONGITUDE", "ALTITUDE", "DISTANCEUNIT"};
 }
 

@@ -278,7 +278,7 @@ void TextElement::replaceSpecialFields(QString& value)
         case POIDISTANCE:
             replaceValue(value, f, handleEmpty(PoiAlerts::instance().getCurrentDistance()));
             break;
         case POIDISTANCE:
             replaceValue(value, f, handleEmpty(PoiAlerts::instance().getCurrentDistance()));
             break;

-        case POI:
+        case POITEXT:

             replaceValue(value, f, PoiAlerts::instance().getCurrentPoi());
             break;
         case ANGLE:
             replaceValue(value, f, PoiAlerts::instance().getCurrentPoi());
             break;
         case ANGLE:

diff --git a/src/textelement.h b/src/textelement.h
index 325be0e..021db88 100644 (file)
--- a/src/textelement.h
+++ b/src/textelement.h
@@ -31,7 +31,7 @@ class TextElement : public GraphicsElement
 {
 public:
     enum Attribute {XPOS, YPOS, ZPOS, VISIBLEWHEN, DATA, FORMAT, WIDTH, ALIGN, COLOR, SIZE, FONT, BOLD, ITALIC, UPPERCASE, LETTERSPACING, TIMEFORMAT, DATEFORMAT, ATTRIBUTE_COUNT};
 {
 public:
     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, POI, ANGLE, LATITUDE, LONGITUDE, ALTITUDE, DISTANCEUNIT, FIELD_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);
     TextElement(Reader* reader);
     virtual bool setAttribute(QString const& name, QString const& value);
     virtual void addToScene(GraphicsScene* scene);