diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index adbc51405927..1c0ff46680ae 100644 --- a/src/core/CMakeLists.txt +++ b/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 diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp similarity index 100% rename from src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp rename to src/core/symbology-ng/qgspointdisplacementrenderer.cpp diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h b/src/core/symbology-ng/qgspointdisplacementrenderer.h similarity index 100% rename from src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h rename to src/core/symbology-ng/qgspointdisplacementrenderer.h diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp index bbe9484c7836..eb4bf3aa85c4 100644 --- a/src/core/symbology-ng/qgsrendererv2registry.cpp +++ b/src/core/symbology-ng/qgsrendererv2registry.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() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 6892585a12d3..4fda9223241a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -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 diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp similarity index 100% rename from src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp rename to src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.h b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.h similarity index 100% rename from src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.h rename to src/gui/symbology-ng/qgspointdisplacementrendererwidget.h diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp index 372a8ca1e48c..7288d28eded8 100644 --- a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp +++ b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.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; } diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index f81ca31fa6b2..9717a5625e94 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/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) diff --git a/src/plugins/point_displacement_renderer/CMakeLists.txt b/src/plugins/point_displacement_renderer/CMakeLists.txt deleted file mode 100644 index ecdb4ad79d5c..000000000000 --- a/src/plugins/point_displacement_renderer/CMakeLists.txt +++ /dev/null @@ -1,56 +0,0 @@ -######################################################## -# Files - -SET (POINT_DISPLACEMENT_SRCS - qgsdisplacementplugin.cpp - qgspointdisplacementrenderer.cpp - qgspointdisplacementrendererwidget.cpp -) - -SET (POINT_DISPLACEMENT_UIS - qgspointdisplacementrendererwidgetbase.ui - ) - -SET (POINT_DISPLACEMENT_MOC_HDRS - qgspointdisplacementrendererwidget.h -) - -######################################################## -# Build - -QT4_WRAP_UI (POINT_DISPLACEMENT_UIS_H ${POINT_DISPLACEMENT_UIS}) - -QT4_WRAP_CPP (POINT_DISPLACEMENT_MOC_SRCS ${POINT_DISPLACEMENT_MOC_HDRS}) - -ADD_LIBRARY (displacementplugin MODULE - ${POINT_DISPLACEMENT_SRCS} - ${POINT_DISPLACEMENT_UIS_H} - ${POINT_DISPLACEMENT_MOC_SRCS} -) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../../ui - ${GEOS_INCLUDE_DIR} - ../../core - ../../core/symbology-ng - ../../core/spatialindex - ../../gui - ../../gui/symbology-ng - .. - . -) - -TARGET_LINK_LIBRARIES(displacementplugin - qgis_core - qgis_gui -) - - -######################################################## -# Install - -INSTALL(TARGETS displacementplugin - RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} - LIBRARY DESTINATION ${QGIS_PLUGIN_DIR} - ) diff --git a/src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp b/src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp deleted file mode 100644 index 63c716ad837a..000000000000 --- a/src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/*************************************************************************** - qgsdisplacementplugin.cpp - ------------------------- - begin : January 26, 2010 - copyright : (C) 2010 by Marco Hugentobler - email : marco at hugis dot net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "qgsdisplacementplugin.h" -#include "qgisinterface.h" -#include "qgspointdisplacementrenderer.h" -#include "qgspointdisplacementrendererwidget.h" -#include "qgsrendererv2registry.h" -#include "qgssymbollayerv2registry.h" -#include - -static const QString name_ = QObject::tr( "Displacement plugin" ); -static const QString description_ = QObject::tr( "Adds a new renderer that automatically handles point displacement in case they have the same position" ); -static const QString version_ = QObject::tr( "Version 0.1" ); - -QgsDisplacementPlugin::QgsDisplacementPlugin( QgisInterface* iface ): mIface( iface ) -{ - -} - -QgsDisplacementPlugin::~QgsDisplacementPlugin() -{ - -} - -void QgsDisplacementPlugin::initGui() -{ - //Add new renderer to the registry - - QgsRendererV2Registry::instance()->addRenderer( new QgsRendererV2Metadata( "pointDisplacement", - QObject::tr( "Point Displacement" ), - QgsPointDisplacementRenderer::create, QIcon(), - QgsPointDisplacementRendererWidget::create ) ); -} - -void QgsDisplacementPlugin::unload() -{ - //Remove renderer type from the registry - QgsRendererV2Registry::instance()->removeRenderer( "pointDisplacement" ); -} - -QGISEXTERN QgisPlugin * classFactory( QgisInterface * theQgisInterfacePointer ) -{ - return new QgsDisplacementPlugin( theQgisInterfacePointer ); -} - -QGISEXTERN QString name() -{ - return name_; -} - -QGISEXTERN QString description() -{ - return description_; -} - -QGISEXTERN QString version() -{ - return version_; -} - -QGISEXTERN int type() -{ - return QgisPlugin::UI; -} - -QGISEXTERN void unload( QgisPlugin* thePluginPointer ) -{ - delete thePluginPointer; -} - - diff --git a/src/plugins/point_displacement_renderer/qgsdisplacementplugin.h b/src/plugins/point_displacement_renderer/qgsdisplacementplugin.h deleted file mode 100644 index 5f8998a9cf31..000000000000 --- a/src/plugins/point_displacement_renderer/qgsdisplacementplugin.h +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - qgsdisplacementplugin.h - ----------------------- - begin : January 26, 2010 - copyright : (C) 2010 by Marco Hugentobler - email : marco at hugis dot net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef QGSDISPLACEMENTPLUGIN_H -#define QGSDISPLACEMENTPLUGIN_H - -#include "qgisplugin.h" - -class QgisInterface; - -/**A plugin that adds a point displacement renderer to the symbol registry*/ -class QgsDisplacementPlugin: public QgisPlugin -{ - public: - QgsDisplacementPlugin( QgisInterface* iface ); - ~QgsDisplacementPlugin(); - /**Adds renderer to the registry*/ - void initGui(); - /**Removes renderer from the registry*/ - void unload(); - - private: - QgisInterface* mIface; -}; - -#endif // QGSDISPLACEMENTPLUGIN_H diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidgetbase.ui b/src/ui/qgspointdisplacementrendererwidgetbase.ui similarity index 100% rename from src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidgetbase.ui rename to src/ui/qgspointdisplacementrendererwidgetbase.ui