[Marble-devel] Review Request 124579: Prefer iconPath to QImage instances in GeoDataIconStyle

[Dennis Nienhüser]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124579/
-----------------------------------------------------------

(Updated Aug. 7, 2015, 1:41 p.m.)


Status
------

This change has been marked as submitted.


Review request for Marble.


Changes
-------

Submitted with commit aca7cc243c284b5f75b0a048dd32b57b1fb8c538 by Dennis Nienhüser to branch master.


Repository: marble


Description
-------

Prefers passing a file path to instantiate GeoDataIconStyle instead of passing a QImage directly. This leads to slightly faster startup times (the icons of the static default styles are now lazy-loaded) and allows querying the iconPath in more cases. The latter is beneficial for QML images. Icon paths are also exported in MarblePlacemarkModel.


Diffs
-----

  src/lib/marble/BookmarkManagerDialog.cpp 72f716c 
  src/lib/marble/EditBookmarkDialog.cpp 2f7e80f 
  src/lib/marble/MarblePlacemarkModel.h 1eacbb4 
  src/lib/marble/MarblePlacemarkModel.cpp fd96f35 
  src/lib/marble/TourWidget.cpp 95d6891 
  src/lib/marble/geodata/data/GeoDataFeature.cpp 6f330fb 
  src/lib/marble/geodata/data/GeoDataFeature_p.h 496c356 
  src/lib/marble/geodata/data/GeoDataIconStyle.h 09f8a7c 
  src/lib/marble/geodata/data/GeoDataIconStyle.cpp 349db42 
  src/lib/marble/geodata/data/GeoDataStyle.h 4cef3a9 
  src/lib/marble/geodata/data/GeoDataStyle.cpp 76da532 
  src/plugins/render/annotate/PlacemarkTextAnnotation.cpp 64336da 
  src/plugins/render/satellites/SatellitesModel.cpp 8cdf8de 

Diff: https://git.reviewboard.kde.org/r/124579/diff/


Testing
-------

Icons still show up nicely on the map and in the search list view. Startup is slightly faster (e.g. GeoDataFeaturePrivate::initializeDefaultStyles() is reduced from 15 ms to 5 ms on my laptop. It is called three times during startup. Not sure why it is called more than once, possibly due to different libraries using it, i.e. marblewidget and some plugins).


Thanks,

Dennis Nienhüser

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20150807/f5026aae/attachment.html>