Skip to content

Commit 17b09c2

Browse files
committed
Remove diagram_overlay plugin
1 parent 0f578a4 commit 17b09c2

24 files changed

+2
-2423
lines changed

src/mapserver/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ IF (NOT FCGI_FOUND)
66
MESSAGE (SEND_ERROR "Fast CGI dependency was not found!")
77
ENDIF (NOT FCGI_FOUND)
88

9-
ADD_DEFINITIONS(-DDIAGRAMSERVER=1)
10-
119
IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
1210
ADD_DEFINITIONS(-DQGSMSDEBUG=1)
1311
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
@@ -44,15 +42,6 @@ SET ( qgis_mapserv_SRCS
4442
qgsremotedatasourcebuilder.cpp
4543
qgssentdatasourcebuilder.cpp
4644
qgsmsutils.cpp
47-
48-
../plugins/diagram_overlay/qgsdiagramcategory.cpp
49-
../plugins/diagram_overlay/qgsdiagramfactory.cpp
50-
../plugins/diagram_overlay/qgswkndiagramfactory.cpp
51-
../plugins/diagram_overlay/qgsbardiagramfactory.cpp
52-
../plugins/diagram_overlay/qgspiediagramfactory.cpp
53-
../plugins/diagram_overlay/qgssvgdiagramfactory.cpp
54-
../plugins/diagram_overlay/qgsdiagramoverlay.cpp
55-
../plugins/diagram_overlay/qgsdiagramrenderer.cpp
5645
)
5746

5847
# SET (qgis_mapserv_UIS

src/mapserver/qgsmslayercache.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,6 @@ QgsMapLayer* QgsMSLayerCache::searchLayer( const QString& url, const QString& la
102102
{
103103
QgsMSLayerCacheEntry &entry = mEntries[ urlNamePair ];
104104
entry.lastUsedTime = time( NULL );
105-
#ifdef DIAGRAMSERVER
106-
//delete any existing diagram overlays in vectorlayers
107-
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( entry.layerPointer );
108-
if ( vl )
109-
{
110-
vl->removeOverlay( "diagram" );
111-
}
112-
#endif //DIAGRAMSERVER
113105
QgsDebugMsg( "Layer found in cache" );
114106
return entry.layerPointer;
115107
}

src/mapserver/qgssldparser.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@
5959
#include "qgsremoteowsbuilder.h"
6060
#include "qgssentdatasourcebuilder.h"
6161

62-
#ifdef DIAGRAMSERVER
63-
#include "qgsdiagramoverlay.h"
64-
#include "qgsbardiagramfactory.h"
65-
#include "qgspiediagramfactory.h"
66-
#include "qgsdiagramrenderer.h"
67-
#include "qgssvgdiagramfactory.h"
68-
#endif //DIAGRAMSERVER
69-
7062
//for contours
7163
#include "gdal_alg.h"
7264
#include "ogr_srs_api.h"
@@ -280,9 +272,6 @@ QList<QgsMapLayer*> QgsSLDParser::mapLayerFromStyle( const QString& layerName, c
280272
QgsFeatureRendererV2* r = rendererFromUserStyle( userStyleElement, v );
281273
v->setRendererV2( r );
282274
labelSettingsFromUserStyle( userStyleElement, v );
283-
#ifdef DIAGRAMSERVER
284-
overlaysFromUserStyle( userStyleElement, v );
285-
#endif //DIAGRAMSERVER
286275
#if 0
287276
setOpacityForLayer( namedLayerElemList[i], v );
288277
#endif
@@ -389,11 +378,6 @@ QList<QgsMapLayer*> QgsSLDParser::mapLayerFromStyle( const QString& layerName, c
389378
theRenderer = rendererFromUserStyle( userStyleElement, theVectorLayer );
390379
//apply labels if <TextSymbolizer> tag is present
391380
labelSettingsFromUserStyle( userStyleElement, theVectorLayer );
392-
#ifdef DIAGRAMSERVER
393-
//apply any vector overlays
394-
QgsDebugMsg( "Trying to get overlays from user style" );
395-
overlaysFromUserStyle( userStyleElement, theVectorLayer );
396-
#endif //DIAGRAMSERVER
397381
}
398382

399383
if ( !theRenderer )
@@ -1596,7 +1580,7 @@ void QgsSLDParser::drawOverlays( QPainter* p, int dpi, int width, int height ) c
15961580
}
15971581
}
15981582

1599-
#ifdef DIAGRAMSERVER
1583+
#if 0 //This part needs to be ported to the new diagram engine
16001584
int QgsSLDParser::overlaysFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const
16011585
{
16021586
if ( userStyleElement.isNull() || !vec )
@@ -2012,4 +1996,4 @@ double QgsSLDParser::scaleFactorFromScaleTag( const QDomElement& scaleElem ) con
20121996
}
20131997
}
20141998

2015-
#endif //DIAGRAMSERVER
1999+
#endif //0 part that needs to be ported to the new diagram engine

src/mapserver/qgssldparser.h

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ class QgsFeatureRendererV2;
3535
#include <QList>
3636
#include <QString>
3737

38-
#ifdef DIAGRAMSERVER
39-
#include "qgsdiagramcategory.h"
40-
#include "qgsdiagramrenderer.h"
41-
class QgsVectorOverlay;
42-
class QgsVectorDataProvider;
43-
#endif //DIAGRAMSERVER
44-
45-
4638
/**A class that creates QGIS maplayers and layer specific capabilities output from Styled layer descriptor (SLD). A QgsSLDParser object may have a pointer to a fallback object to model the situation where a user defined SLD refers to layers in the administrator sld*/
4739
class QgsSLDParser: public QgsConfigParser
4840
{
@@ -137,31 +129,6 @@ class QgsSLDParser: public QgsConfigParser
137129
/**Reads attributes "epsg" or "proj" from layer element and sets specified CRS if present*/
138130
void setCrsForLayer( const QDomElement& layerElem, QgsMapLayer* ml ) const;
139131

140-
141-
#ifdef DIAGRAMSERVER
142-
/**Parses the user style and adds the vector overlays contained in it(most likely diagrams)
143-
to the vector layer*/
144-
int overlaysFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const;
145-
/**Creates a diagram overlay from a diagram symbolizer element*/
146-
QgsVectorOverlay* vectorOverlayFromDiagramSymbolizer( const QDomElement& symbolizerElem, QgsVectorLayer* vec ) const;
147-
/**Returns a list of diagram items from the contents of a <Categorize> element
148-
@param attribute name of the scaling attribute
149-
@return 0 in case of success*/
150-
int diagramItemsFromCategorize( const QDomElement& categorizeElement, QList<QgsDiagramItem>& items, QString& attribute ) const;
151-
/**Returns a list of diagram items from the contents of a <Interpolate> element
152-
@param attribute name of the scaling attribute
153-
@return 0 in case of success*/
154-
int diagramItemsFromInterpolate( const QDomElement& interpolateElement, QList<QgsDiagramItem>& items, QString& attribute ) const;
155-
/**Returns diagram categories from <Category> tags
156-
@param diagramElement <Diagram> xml element containing the categories
157-
@param p provider for the vectorlayer (needed to convert attribute names to indices)
158-
@param categories list that will contain the created elements
159-
@return 0 in case of success*/
160-
int symbologyFromCategoryTags( const QDomElement& diagramElement, const QgsVectorDataProvider* p, QList<QgsDiagramCategory>& categories ) const;
161-
/**Returns the scale multiplication factor from the <Scale> Element*/
162-
double scaleFactorFromScaleTag( const QDomElement& scaleElem ) const;
163-
#endif //DIAGRAMSERVER
164-
165132
/**SLD as dom document*/
166133
QDomDocument* mXMLDoc;
167134

src/plugins/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDIR})
33
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDIR})
44

5-
ADD_SUBDIRECTORY(diagram_overlay)
65
ADD_SUBDIRECTORY(interpolation)
76
ADD_SUBDIRECTORY(oracle_raster)
87
ADD_SUBDIRECTORY(raster_terrain_analysis)

src/plugins/diagram_overlay/CMakeLists.txt

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

src/plugins/diagram_overlay/qgsbardiagramfactory.cpp

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

0 commit comments

Comments
 (0)