Move point displacement renderer from plugin to main application

Author: mhugent

src/core/CMakeLists.txt

@@ -39,6 +39,7 @@ SET(QGIS_CORE_SRCS
   symbology-ng/qgssymbologyv2conversion.cpp
   symbology-ng/qgssvgcache.cpp
   symbology-ng/qgsellipsesymbollayerv2.cpp
+  symbology-ng/qgspointdisplacementrenderer.cpp
 
   qgis.cpp
   qgsapplication.cpp

src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp renamed to src/core/symbology-ng/qgspointdisplacementrenderer.cpp

@@ -5,6 +5,7 @@
 #include "qgscategorizedsymbolrendererv2.h"
 #include "qgsgraduatedsymbolrendererv2.h"
 #include "qgsrulebasedrendererv2.h"
+#include "qgspointdisplacementrenderer.h"
 
 QgsRendererV2Registry* QgsRendererV2Registry::mInstance = NULL;
 
@@ -24,6 +25,9 @@ QgsRendererV2Registry::QgsRendererV2Registry()
   addRenderer( new QgsRendererV2Metadata( "RuleRenderer",
                                           QObject::tr( "Rule-based" ),
                                           QgsRuleBasedRendererV2::create ) );
+  addRenderer( new QgsRendererV2Metadata( "pointDisplacement",
+                                          QObject::tr( "Point displacement" ),
+                                          QgsPointDisplacementRenderer::create ) );
 }
 
 QgsRendererV2Registry::~QgsRendererV2Registry()

src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h renamed to src/core/symbology-ng/qgspointdisplacementrenderer.h

@@ -22,6 +22,7 @@ symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
 symbology-ng/characterwidget.cpp
 symbology-ng/qgsstylev2exportimportdialog.cpp
 symbology-ng/qgsellipsesymbollayerv2widget.cpp
+symbology-ng/qgspointdisplacementrendererwidget.cpp
 
 attributetable/qgsattributetablemodel.cpp
 attributetable/qgsattributetablememorymodel.cpp
@@ -98,6 +99,7 @@ symbology-ng/qgspenstylecombobox.h
 symbology-ng/qgsbrushstylecombobox.h
 symbology-ng/qgsstylev2exportimportdialog.h
 symbology-ng/qgsellipsesymbollayerv2widget.h
+symbology-ng/qgspointdisplacementrendererwidget.h
 
 attributetable/qgsattributetableview.h
 attributetable/qgsattributetablemodel.h

src/core/symbology-ng/qgsrendererv2registry.cpp

@@ -9,6 +9,7 @@
 #include "qgscategorizedsymbolrendererv2widget.h"
 #include "qgsgraduatedsymbolrendererv2widget.h"
 #include "qgsrulebasedrendererv2widget.h"
+#include "qgspointdisplacementrendererwidget.h"
 
 #include "qgssymbollevelsv2dialog.h"
 
@@ -53,6 +54,7 @@ static void _initRendererWidgetFunctions()
   _initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.png" );
   _initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.png" );
   _initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create );
+  _initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create );
   initialized = true;
 }
 

src/gui/CMakeLists.txt

@@ -10,7 +10,6 @@ ADD_SUBDIRECTORY(raster_terrain_analysis)
 ADD_SUBDIRECTORY(coordinate_capture)
 ADD_SUBDIRECTORY(dxf2shp_converter)
 ADD_SUBDIRECTORY(evis)
-ADD_SUBDIRECTORY(point_displacement_renderer)
 ADD_SUBDIRECTORY(spatialquery)
 ADD_SUBDIRECTORY(sqlanywhere)
 ADD_SUBDIRECTORY(roadgraph)