[Marble-devel] Review Request: Move painting methods from MarbleModel to MarbleMap

[Bernhard Beschow]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://svn.reviewboard.kde.org/r/5902/
-----------------------------------------------------------

Review request for marble.


Summary
-------

Motivation
==========

The whole painting should be implemented in the view rather than in the model because it decouples data and its representation. This allows for having different graphics backends (hello OpenGL!) while having a common interface to the data.


Implementation
==============

MarbleMap is now the owner of all painting objects, e.g. the MeasureTool, a new TextureLayer class, the LayerManager, and others. To see all painting objects owned by MarbleMap, see the modified MarbleMap_p.h.

Since the LayerManager object is now owned by MarbleMap, the layer-relevant methods, slots, and signals (such as addLayer(), removeLayer(), renderPluginsInitialized()) are now forwarded by MarbleMap and Marblewidget rather than by MarbleModel.

The DownloadRegionDialog has been modified to take a MarbleWidget instead of a MarbleModel. I wonder if it makes more sense to take a MarbleMap here.

Please test if the patch works for you as well. Since the patch changes some initializaton orders in the constructors and some re-initialization orders on theme change, it is important to test these code paths more extensively.

If you see that the patch violates some assumptions/invariants, please report as well.


Diffs
-----

  /trunk/KDE/kdeedu/marble/src/ControlView.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.h 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/DownloadRegionDialog.h 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/DownloadRegionDialog.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleMap_p.h 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleModel.h 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetInputHandler.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetPopupMenu.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/PlacemarkLayout.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.h 1198738 
  /trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/marble_part.cpp 1198738 
  /trunk/KDE/kdeedu/marble/src/plasmoid/worldclock.cpp 1198738 

Diff: http://svn.reviewboard.kde.org/r/5902/diff


Testing
-------

Works for me using the KDE version in the majority of cases.


Thanks,

Bernhard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/marble-devel/attachments/20101119/66139af2/attachment.htm