Skip to content
Permalink
Browse files
renamed misnamed QgsMapRender (verb) to QgsMapRenderer (noun) as part…
… of cleanups for 1.0.0 release. Updated all related dependencies. Also removed some spurious debug messages

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8997 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Aug 5, 2008
1 parent 94c2017 commit fd41d31316f68a81f3788bac924126c2b9ce7d65
Showing with 484 additions and 755 deletions.
  1. +1 −1 python/core/core.sip
  2. +14 −0 python/core/qgsapplication.sip
  3. +5 −5 python/core/{qgsmaprender.sip → qgsmaprenderer.sip}
  4. +1 −1 python/core/qgssnapper.sip
  5. +1 −1 python/gui/qgsmapcanvas.sip
  6. +11 −11 src/app/composer/qgscomposermap.cpp
  7. +1 −1 src/app/legend/qgslegend.cpp
  8. +90 −370 src/app/qgisapp.cpp
  9. +6 −6 src/app/qgisapp.h
  10. +3 −3 src/app/qgsattributetabledisplay.cpp
  11. +1 −1 src/app/qgsmaptoolcapture.cpp
  12. +1 −1 src/app/qgsmaptoolvertexedit.cpp
  13. +1 −1 src/app/qgsmeasuredialog.cpp
  14. +2 −2 src/app/qgsmeasuretool.cpp
  15. +4 −4 src/app/qgsprojectproperties.cpp
  16. +3 −3 src/core/CMakeLists.txt
  17. +19 −14 src/core/qgsapplication.cpp
  18. +3 −3 src/core/qgsapplication.h
  19. +3 −0 src/core/qgsgeometry.cpp
  20. +1 −11 src/core/qgsmaplayerregistry.cpp
  21. +41 −44 src/core/{qgsmaprender.cpp → qgsmaprenderer.cpp}
  22. +4 −4 src/core/{qgsmaprender.h → qgsmaprenderer.h}
  23. +2 −2 src/core/qgsproject.cpp
  24. +33 −31 src/core/qgsproviderregistry.cpp
  25. +7 −7 src/core/qgssnapper.cpp
  26. +3 −3 src/core/qgssnapper.h
  27. +4 −5 src/core/qgsspatialrefsys.cpp
  28. +101 −104 src/gui/qgsmapcanvas.cpp
  29. +3 −3 src/gui/qgsmapcanvas.h
  30. +1 −1 src/gui/qgsmapcanvasmap.cpp
  31. +3 −3 src/gui/qgsmapcanvasmap.h
  32. +1 −1 src/gui/qgsmapcanvassnapper.cpp
  33. +13 −13 src/gui/qgsmapoverviewcanvas.cpp
  34. +2 −2 src/gui/qgsmapoverviewcanvas.h
  35. +1 −1 src/gui/qgsmaptool.cpp
  36. +17 −17 src/gui/qgsquickprint.cpp
  37. +4 −4 src/gui/qgsquickprint.h
  38. +2 −2 src/gui/qgsrubberband.cpp
  39. +1 −1 src/plugins/copyright_label/plugin.cpp
  40. +1 −1 src/plugins/grass/qgsgrassedit.cpp
  41. +28 −26 src/plugins/grass/qgsgrassplugin.cpp
  42. +1 −1 src/plugins/north_arrow/plugin.cpp
  43. +1 −1 src/plugins/quick_print/quickprintplugin.h
  44. +13 −13 tests/src/core/CMakeLists.txt
  45. +3 −3 tests/src/core/qgsrenderchecker.h
  46. +3 −3 tests/src/core/regression992.cpp
  47. +10 −10 tests/src/core/{testqgsmaprender.cpp → testqgsmaprenderer.cpp}
  48. +3 −3 tests/src/core/testqgsrasterlayer.cpp
  49. +3 −3 tests/src/core/testqgsrenderers.cpp
  50. +4 −4 tests/src/gui/testqgsquickprint.cpp
@@ -29,7 +29,7 @@
%Include qgslogger.sip
%Include qgsmaplayer.sip
%Include qgsmaplayerregistry.sip
%Include qgsmaprender.sip
%Include qgsmaprenderer.sip
%Include qgsmaptopixel.sip
%Include qgsmarkercatalogue.sip
%Include qgsmessageoutput.sip
@@ -177,5 +177,19 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
//! Returns whether this machine uses big or little endian
static endian_t endian();

/** \brief get a standard css style sheet for reports.
* Typically you will use this method by doing:
* QString myStyle = QgsApplication::reportStyleSheet();
* textBrowserReport->document()->setDefaultStyleSheet(myStyle);
* @return QString containing the CSS 2.1 compliant stylesheet.
* @note you can use the special Qt extensions too, for example
* the gradient fills for backgrounds.
*/
static QString reportStyleSheet();

/** Convenience function to get a summary of the paths used in this
* application instance useful for debugging mainly.*/
static QString showSettings();

};

@@ -1,23 +1,23 @@

/**
* \class QgsMapRender
* \class QgsMapRenderer
* \brief Class for rendering map layer set
*
*/

class QgsMapRender : QObject
class QgsMapRenderer : QObject
{
%TypeHeaderCode
#include <qgsmaprender.h>
#include <qgsmaprenderer.h>
%End

public:

//! constructor
QgsMapRender();
QgsMapRenderer();

//! destructor
~QgsMapRender();
~QgsMapRenderer();

//! starts rendering
void render(QPainter* painter);
@@ -57,7 +57,7 @@ public:
ALL_RESULTS_WITHIN_GIVEN_TOLERANCES
};

QgsSnapper(QgsMapRender* mapRender);
QgsSnapper(QgsMapRenderer* mapRender);
~QgsSnapper();
/**Does the snapping operation
@param startPoint the start point for snapping (in pixel coordinates)
@@ -62,7 +62,7 @@ class QgsMapCanvas : QGraphicsView

QgsMapCanvasMap* map();

QgsMapRender* mapRender();
QgsMapRenderer* mapRender();

//! Accessor for the canvas pixmap
QPixmap& canvasPixmap();
@@ -23,7 +23,7 @@
#include "qgsmaplayer.h"
#include "qgsmaptopixel.h"
#include "qgsproject.h"
#include "qgsmaprender.h"
#include "qgsmaprenderer.h"
#include "qgsrendercontext.h"
#include "qgsvectorlayer.h"

@@ -138,27 +138,27 @@ void QgsComposerMap::draw ( QPainter *painter, const QgsRect& extent, const QSiz
return;
}

QgsMapRender* canvasMapRender = mMapCanvas->mapRender();
if(!canvasMapRender)
QgsMapRenderer* canvasMapRenderer = mMapCanvas->mapRender();
if(!canvasMapRenderer)
{
return;
}

QgsMapRender theMapRender;
theMapRender.setExtent(extent);
theMapRender.setOutputSize(size, dpi);
theMapRender.setLayerSet(canvasMapRender->layerSet());
theMapRender.setProjectionsEnabled(canvasMapRender->projectionsEnabled());
theMapRender.setDestinationSrs(canvasMapRender->destinationSrs());
QgsMapRenderer theMapRenderer;
theMapRenderer.setExtent(extent);
theMapRenderer.setOutputSize(size, dpi);
theMapRenderer.setLayerSet(canvasMapRenderer->layerSet());
theMapRenderer.setProjectionsEnabled(canvasMapRenderer->projectionsEnabled());
theMapRenderer.setDestinationSrs(canvasMapRenderer->destinationSrs());

QgsRenderContext* theRenderContext = theMapRender.renderContext();
QgsRenderContext* theRenderContext = theMapRenderer.renderContext();
if(theRenderContext)
{
theRenderContext->setDrawEditingInformation(false);
theRenderContext->setRenderingStopped(false);
}

theMapRender.render(painter);
theMapRenderer.render(painter);

mMapCanvas->freeze(false);
}
@@ -32,7 +32,7 @@
#include "qgsmapcanvasmap.h"
#include "qgsmaplayer.h"
#include "qgsmaplayerregistry.h"
#include "qgsmaprender.h"
#include "qgsmaprenderer.h"
#include "qgsproject.h"
#include "qgsrasterlayer.h"
#include "qgsrasterlayerproperties.h"

0 comments on commit fd41d31

Please sign in to comment.