Revision 1217541

Go back to digest for 30th January 2011

Bug Fixes in Educational

Dennis Nienhüser committed changes in /trunk/KDE/kdeedu/marble:

Allow using absolute source directories in texture layers in .dgml files.
Extend .dgml by a tileSize tag (width and height attribute), usable inside textureLayer tags. Such .dgml files are backwards compatible.

Handle 'base tile missing' case more gracefully and return an empty image instead of triggering an assertion.
Move the default tile size (675) to global.h and replace hardcoded default tile sizes with it.

REVIEW: 6334

File Changes

Added 2 files
  • /trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml
  •   /DgmlTileSizeTagHandler.cpp
  •   /DgmlTileSizeTagHandler.h
Modified 14 files
  • /trunk/KDE/kdeedu/marble
  •   /src/lib/FileStoragePolicy.cpp
  •   /src/lib/global.h
  •   /src/lib/ImageLoadThread.cpp
  •   /src/lib/MapWizard.cpp
  •   /src/lib/TileCreator.cpp
  •   /src/lib/TileLoader.cpp
  •   /data/maps/earth/bluemarble/bluemarble.dgml
  •   /data/maps/earth/openstreetmap/openstreetmap.dgml
  •   /src/lib/geodata/scene/GeoSceneTexture.cpp
  •   /src/lib/geodata/scene/GeoSceneTexture.h
  •   /src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.cpp
  •   /src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.h
  •   /src/lib/geodata/handlers/dgml/DgmlElementDictionary.cpp
  •   /src/lib/geodata/handlers/dgml/DgmlElementDictionary.h
16 files changed in total