Revision 3352d56...

Go back to digest for 10th June 2012

Other in Educational

Bernhard Beschow committed changes in [marble] /lib:

PlacemarkPainter: turn into layer and rename to PlacemarkLayer; reverse composition with PlacemarkLayout

PlacemarkLayout used to be both responsible for laying out placemarks and painting them.
After having determined the layout, it realized painting by delegating the acutal work to PlacemarkPainter.

By reversing composition, PlacemarkPainter would ask PlacemarkLayout to update the layout before it would paint the placemarks itself.
That way, PlacemarkPainter becomes a layer and PlacemarkLayout would be the layer's model, which is a common pattern in Marble.

REVIEW: 105152

File Changes

Added 1 files
  • src/lib/layers/PlacemarkLayer.h
Deleted 1 files
  • src/lib/PlacemarkPainter.h
Modified 3 files
  • /lib
  •   src/CMakeLists.txt
  •   src/MarbleMap.cpp
  •   src/layers/CMakeLists.txt
5 files changed in total