Skip to content

Commit 63949b5

Browse files
mhugentmhugent
committedOct 27, 2011
Move point displacement renderer from plugin to main application
·
ltr-3_40Before-merge-new_vector_api
1 parent fecb0de commit 63949b5

13 files changed

+9
-183
lines changed
 

‎src/core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ SET(QGIS_CORE_SRCS
3939
symbology-ng/qgssymbologyv2conversion.cpp
4040
symbology-ng/qgssvgcache.cpp
4141
symbology-ng/qgsellipsesymbollayerv2.cpp
42+
symbology-ng/qgspointdisplacementrenderer.cpp
4243

4344
qgis.cpp
4445
qgsapplication.cpp

‎src/core/symbology-ng/qgsrendererv2registry.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "qgscategorizedsymbolrendererv2.h"
66
#include "qgsgraduatedsymbolrendererv2.h"
77
#include "qgsrulebasedrendererv2.h"
8+
#include "qgspointdisplacementrenderer.h"
89

910
QgsRendererV2Registry* QgsRendererV2Registry::mInstance = NULL;
1011

@@ -24,6 +25,9 @@ QgsRendererV2Registry::QgsRendererV2Registry()
2425
addRenderer( new QgsRendererV2Metadata( "RuleRenderer",
2526
QObject::tr( "Rule-based" ),
2627
QgsRuleBasedRendererV2::create ) );
28+
addRenderer( new QgsRendererV2Metadata( "pointDisplacement",
29+
QObject::tr( "Point displacement" ),
30+
QgsPointDisplacementRenderer::create ) );
2731
}
2832

2933
QgsRendererV2Registry::~QgsRendererV2Registry()

‎src/gui/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
2222
symbology-ng/characterwidget.cpp
2323
symbology-ng/qgsstylev2exportimportdialog.cpp
2424
symbology-ng/qgsellipsesymbollayerv2widget.cpp
25+
symbology-ng/qgspointdisplacementrendererwidget.cpp
2526

2627
attributetable/qgsattributetablemodel.cpp
2728
attributetable/qgsattributetablememorymodel.cpp
@@ -98,6 +99,7 @@ symbology-ng/qgspenstylecombobox.h
9899
symbology-ng/qgsbrushstylecombobox.h
99100
symbology-ng/qgsstylev2exportimportdialog.h
100101
symbology-ng/qgsellipsesymbollayerv2widget.h
102+
symbology-ng/qgspointdisplacementrendererwidget.h
101103

102104
attributetable/qgsattributetableview.h
103105
attributetable/qgsattributetablemodel.h

‎src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "qgscategorizedsymbolrendererv2widget.h"
1010
#include "qgsgraduatedsymbolrendererv2widget.h"
1111
#include "qgsrulebasedrendererv2widget.h"
12+
#include "qgspointdisplacementrendererwidget.h"
1213

1314
#include "qgssymbollevelsv2dialog.h"
1415

@@ -53,6 +54,7 @@ static void _initRendererWidgetFunctions()
5354
_initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.png" );
5455
_initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.png" );
5556
_initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create );
57+
_initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create );
5658
initialized = true;
5759
}
5860

‎src/plugins/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ADD_SUBDIRECTORY(raster_terrain_analysis)
1010
ADD_SUBDIRECTORY(coordinate_capture)
1111
ADD_SUBDIRECTORY(dxf2shp_converter)
1212
ADD_SUBDIRECTORY(evis)
13-
ADD_SUBDIRECTORY(point_displacement_renderer)
1413
ADD_SUBDIRECTORY(spatialquery)
1514
ADD_SUBDIRECTORY(sqlanywhere)
1615
ADD_SUBDIRECTORY(roadgraph)

‎src/plugins/point_displacement_renderer/CMakeLists.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎src/plugins/point_displacement_renderer/qgsdisplacementplugin.h

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.