From 5728fa7e539c5d826c1708bdfffb5daf0b23bdfd Mon Sep 17 00:00:00 2001 From: eshe Date: Thu, 12 Aug 2010 11:01:45 +0100 Subject: [PATCH] Changed default and white themes to show a speed camera warning image. Small fix to speed camera distance printing. --- src/data/themes/white.jspeed | Bin 50825 -> 52253 bytes src/poialerts.cpp | 11 ++++---- src/poialerts.h | 3 +- src/resources.qrc | 1 + src/resources/themes/default/speedcamera.png | Bin 0 -> 1190 bytes src/resources/themes/default/theme.xml | 38 ++++++++++++++++++++++++++ src/textelement.cpp | 2 +- 7 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 src/resources/themes/default/speedcamera.png diff --git a/src/data/themes/white.jspeed b/src/data/themes/white.jspeed index 171f5278284c853e5e11e525607e9017ce325e84..5a2cf6e5547343c856f77cb6aa22eb6bce300130 100644 GIT binary patch delta 2130 zcmZ`)cR1U77yn6&N>Zg%sq(r=%~~~TRk>D(tt6BtNJ8y4c8L|Ui`2NuMQg^6*v?1ONd5;Ejdp zjMkKQz=nw$%v3nV&aCK6 zS1=O}aVdtO7pQUB}PT z7?U@fu}jXFW#4?8X#BJ?aVIJjBQHRL%Ey4X7crI@vAYH|##cMRE|Taw?`qhq@U8ky*EQqI51{garI3g#)qU zPdmT;X_F3*HpA$1vt~s3vEW-y`JaAMB%9iET|H$(L4?`{66b+|_K0p1F{HpiC1q7CT_4SxzgUGSr*3()t69$)`DfB!YXoMlG1Qg_@x-@b zG298GdZ4VlIyF8RduWM5Rjy=Gy)X)7M3%Yqii$kA^%NO=B$>#b`gSeN{xJ45hNTRl zUB;n9zp>x}aYR(OYAqY0NjHSp_WyOVy0#I6kAe+O_G^2#FU897cN#CF(f1ucXc_gs z42Nl1j&Nx34YNtal4rTk;rx4l6|saPJj}G zg12H$@BbB$mT)U3juEb&c>n#P%d2%x31$7do`xXg=$Tnnho%BKQgvRdd8m(0D2=V* z2{r;%)Y+fq?d8j9wRqJcpLGxLPiqeXIY~=@fMh`v6t}c&79!0#l&lVd+FV{whA>3z z3cTcL>yW~vd*F=i10)2Aqe&o|z_gk9`++OM>RRRtdYgy?wW@0SohF;Cve}*NIqqD% z!IFn&Z0!X`!3Pp;K;wb1`1@S<`U?WG*+#P06iU2Ot*Zo_ZezUvz~9v2&7B*HI1rg~ zlL#O7gb7E?A9WX-pi$d(v&bUsSGTZhR3-1Wh4`811cR*#wve9ia}|p>hmp@;ATxe< zP#H}_1745lT%Lz*9mR)kS58FCiaC|%0uv_D!tKGVK ze%SR`u>iYSn2Sxz?M9T7 zY<|*JSC~$5u%CDt^QeV#0{|!UC=oqyJ~;UhAMZufR2o&0uaQxR`Lyz?{FIr3D}JK% z{Pb9Mzz={2ue@PUu$>+*5>ok2 z0plR;2hTuvLkH5OzSrkP7Lry4AzcMg^hwhvs}MPT6E?4PQa$_`e%^ZCsl)!tYJLiS zT;dUaFh31HD4J0{b4Q12E;O$qo=v(OS*iMY^FwEbNDtZfW5f`?<3rewY=+O1Wfk8! zM4=BfRE0)0HSUw9aFNXl_0f-$FU~7UfmTuagI zx{9}yBInc|hXqFe_}PQ|PjJmEWk!_>l!#8}ko;>t`WINZf2HKhVq>xu_VcuBOcPrgd}M);=<6@8XwWo1r@8bKzk}xiz+^cFZaO delta 689 zcmbO`gSoSpc|-N#dJzUD1`dXaZC`9UJ0FT@FflL$aWgP*GB7ZdWTfV%>Q&_C+zmU} zcUwWkMm;{U@@n=6tB=o|EJE%&>#z2@U3Z}SAYYWUj?b3aVSm3%y*ak#;7za4Rol)f zewZ<#(!kj08heRK?Y2U50|5M`vDGuv27rh5lE?zM@Fat@YjclT&l-nsoooBXVI$j+6# zt0uQR_t}I^$G!4i+^aEowLFcnUMr4kQAOniiLb)JbMIR>wf2?R&ImPCHOT@jZ z2URvc9))rzuE#IP4{cU^AJ+NyhF{HvY02D3dkjf2-v5w76rHJ(qSr*{+56kq$Cdg+<=by=ttmIVr}S%blatitude, currentPoi_->longitude, + fix->latitude, fix->longitude); } QString PoiAlerts::getCurrentPoi() const @@ -232,7 +235,7 @@ void PoiAlerts::onDataUpdated() double travelled = Odometer::instance().getTotal(); - if(absValue(travelled - travelled_) > 0.02) + if(absValue(travelled - travelled_) > 0.015) { double distance; double inRouteMargin = IN_ROUTE_MARGIN + (fix->eph / 1000.0); @@ -268,7 +271,7 @@ void PoiAlerts::onDataUpdated() } else { - trackLimit = 90.0 - radToDeg(acos((inRouteMargin + (distance * 0.16)) / distance)); + trackLimit = 90.0 - radToDeg(acos((inRouteMargin + (distance * 0.17)) / distance)); } qDebug() << "Tracklimit: " << trackLimit; @@ -277,7 +280,6 @@ void PoiAlerts::onDataUpdated() { found = true; currentPoi_ = &pois_[i]; - currentDistance_ = distance; emit visibilityChanged(true); playSound(i); } @@ -292,7 +294,6 @@ void PoiAlerts::onDataUpdated() { found = true; currentPoi_ = &pois_[i]; - currentDistance_ = distance; emit visibilityChanged(true); playSound(i); } diff --git a/src/poialerts.h b/src/poialerts.h index a8ba9fe..828bda1 100644 --- a/src/poialerts.h +++ b/src/poialerts.h @@ -32,7 +32,7 @@ class PoiAlerts : public QObject public: static int const POI_ALERT_INTERVAL = 120; - static int const IN_ROUTE_MARGIN = 20; + static int const IN_ROUTE_MARGIN = 22; static PoiAlerts& instance(); static QString getPoiDir(); ~PoiAlerts(); @@ -69,7 +69,6 @@ private: double distance_; double travelled_; PoiReader::Poi* currentPoi_; - double currentDistance_; bool loaded_; QString error_; diff --git a/src/resources.qrc b/src/resources.qrc index 24f58d4..314f1eb 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -15,5 +15,6 @@ resources/themes/default/theme.xml resources/themes/default/digital7.ttf resources/themes/default/background.png + resources/themes/default/speedcamera.png diff --git a/src/resources/themes/default/speedcamera.png b/src/resources/themes/default/speedcamera.png new file mode 100644 index 0000000000000000000000000000000000000000..fd6b4120f5d98d68203d76b98e1ad8dc11a16844 GIT binary patch literal 1190 zcmV;X1X=ruP)wA3_mz-H9F<5A4H6=eY6#+}IEo5w>0x}I z{f_*)+3xOicDB3YC7(`rJ3H-n-uu1ZdvEH}bzO71dE`r;=BkCm7BCIeae%Hua2Tvk z(ezRe-`orqgCBo2$G$ZM%YcMwhD*W~o-DwNa?lq%cYw%t;EsrdC+i!YlyH3oavib^ zMaNgrSYEjK=5Kyq!yzJTQqS*yi6;b01T9URAI!?Y8{X~6WY+*DnRY#x2vQW!TQ#}E z@4;!X4t%dJk+s1^FvN!6D>thdSOmI*G-h^NERbiGgh5~_*bfGQeqbl~=5x*fu*yzP zRwhys&~%H}{sqQ@x!@^y4VHr8;ET_>GeNybi%eoTS+RZK5?I5%SJ(^gvbs{OfsyVb zDKa4pne-%Y)Fu$m=$Hq3gH!ahnutn3S1DuZ1j_zOSw0Hb%ID)>zS4O?6g0TZp}I7Z|@C@C*`8~ObiWJ zDMg)C)sxZ-ZUx;y8_*WC2UEaJCy2}fJ=q>Tq8B~v^iP0+EClpe6?qGc=3bQw&Vy&* z1-K8=dER!gFj_>KS(7rNn8gJyMe{MO;^35Jcf~BL|>Y8*Zdt)%umGfLC zen*_o(c|YD#`fh~pvx@xqg9a|!9(ys^Uh%d*(?4r3G`^FH&K$C47rSno)j8&*=iX= zKQpP>60YNTl&tzL$hlitF!yHYhGO;DOgB}wqEx=lQoL*WafTUBjsRU)07&zD7Buv8 z-Y#&2->)z0w>RWJkOXx<06zE+cAx58vnll6OsBRZX_$ovWT?S@(+rD)Gc@(Anh8E@gJSN+MF$$-|f1V0?g(Nhjaw`9up{O}3r; zX`nwUQw!~pnq9$2}RW4wbzma#yIQ^Qr(hdentr?gbDY#l%o zjYBo#KeD7IJ+67DZXSntQi_xbDVm<+`XByF@{a%m08V-I1OpvsBme*a07*qoM6N<$ Ef=@UueE#a5efff + + speedcamera.png + 14 + 418 + + 500 + + poivisible + + + {POIDISTANCE} {DISTANCEUNIT} + 77 + 420 + Nokia Sans Bold + 20 + #e4ff00 + true + poivisible + @@ -105,5 +124,24 @@ #a5efff + + speedcamera.png + 14 + 738 + + 500 + + poivisible + + + {POIDISTANCE} {DISTANCEUNIT} + 77 + 740 + Nokia Sans Bold + 20 + #e4ff00 + true + poivisible + diff --git a/src/textelement.cpp b/src/textelement.cpp index d42b423..f1af21e 100644 --- a/src/textelement.cpp +++ b/src/textelement.cpp @@ -322,7 +322,7 @@ QString TextElement::formatString(double val) if(format.isEmpty()) { - format = "%.1lf"; + format = "%.0lf"; } QString result; -- 1.7.9.5