Added POI text field. Some tuning to detail screen item position.

diff --git a/src/detailscreen.cpp b/src/detailscreen.cpp
index fa7e788..7ef6f10 100644 (file)
--- a/src/detailscreen.cpp
+++ b/src/detailscreen.cpp
@@ -33,7 +33,7 @@ namespace
     QString const DEFAULT_BACKGROUND_COLOR = "#000";
     QString const DEFAULT_COLOR = "#fff";
     int const FONT_SIZE = 20;
     QString const DEFAULT_BACKGROUND_COLOR = "#000";
     QString const DEFAULT_COLOR = "#fff";
     int const FONT_SIZE = 20;

-    int const START_HEIGHT = 61;
+    int const START_HEIGHT = 74;

     int const ITEM_WIDTH = 130;
 
 }
     int const ITEM_WIDTH = 130;
 
 }

@@ -142,7 +142,7 @@ void DetailScreen::reArrange()
 
     int lineHeight = (height - START_HEIGHT) / 8;
 
 
     int lineHeight = (height - START_HEIGHT) / 8;
 

-    int padding = width / 22;
+    int padding = width / 27;

     int area1 = (width / 3) + ITEM_WIDTH / 2 + 20;
     int area2 = area1 + ITEM_WIDTH;
 
     int area1 = (width / 3) + ITEM_WIDTH / 2 + 20;
     int area2 = area1 + ITEM_WIDTH;
 

diff --git a/src/textelement.cpp b/src/textelement.cpp
index f1af21e..fc3b79e 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", "ANGLE", "LATITUDE",
+                                                       "POIDISTANCE", "POI", "ANGLE", "LATITUDE",

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

@@ -278,6 +278,9 @@ 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:
+            replaceValue(value, f, PoiAlerts::instance().getCurrentPoi());
+            break;

         case ANGLE:
             replaceValue(value, f, formatString(o->getLatestFix().track));
             break;
         case ANGLE:
             replaceValue(value, f, formatString(o->getLatestFix().track));
             break;

diff --git a/src/textelement.h b/src/textelement.h
index 95fb221..325be0e 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, ANGLE, LATITUDE, LONGITUDE, ALTITUDE, DISTANCEUNIT, FIELD_COUNT};
+    enum Field {TRIP, TOTAL, SPEED, MAXSPEED, AVGSPEED, UNIT, SPEEDUNIT, TIME, DATE, POIDISTANCE, POI, 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);