Skip to content
Permalink
Browse files

Remove diagram_overlay plugin

  • Loading branch information
mhugent committed Jul 6, 2013
1 parent 0f578a4 commit 17b09c2fb43eed6a6d84b04190da4115ef8978df
@@ -6,8 +6,6 @@ IF (NOT FCGI_FOUND)
MESSAGE (SEND_ERROR "Fast CGI dependency was not found!")
ENDIF (NOT FCGI_FOUND)

ADD_DEFINITIONS(-DDIAGRAMSERVER=1)

IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
ADD_DEFINITIONS(-DQGSMSDEBUG=1)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
@@ -44,15 +42,6 @@ SET ( qgis_mapserv_SRCS
qgsremotedatasourcebuilder.cpp
qgssentdatasourcebuilder.cpp
qgsmsutils.cpp

../plugins/diagram_overlay/qgsdiagramcategory.cpp
../plugins/diagram_overlay/qgsdiagramfactory.cpp
../plugins/diagram_overlay/qgswkndiagramfactory.cpp
../plugins/diagram_overlay/qgsbardiagramfactory.cpp
../plugins/diagram_overlay/qgspiediagramfactory.cpp
../plugins/diagram_overlay/qgssvgdiagramfactory.cpp
../plugins/diagram_overlay/qgsdiagramoverlay.cpp
../plugins/diagram_overlay/qgsdiagramrenderer.cpp
)

# SET (qgis_mapserv_UIS
@@ -102,14 +102,6 @@ QgsMapLayer* QgsMSLayerCache::searchLayer( const QString& url, const QString& la
{
QgsMSLayerCacheEntry &entry = mEntries[ urlNamePair ];
entry.lastUsedTime = time( NULL );
#ifdef DIAGRAMSERVER
//delete any existing diagram overlays in vectorlayers
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( entry.layerPointer );
if ( vl )
{
vl->removeOverlay( "diagram" );
}
#endif //DIAGRAMSERVER
QgsDebugMsg( "Layer found in cache" );
return entry.layerPointer;
}
@@ -59,14 +59,6 @@
#include "qgsremoteowsbuilder.h"
#include "qgssentdatasourcebuilder.h"

#ifdef DIAGRAMSERVER
#include "qgsdiagramoverlay.h"
#include "qgsbardiagramfactory.h"
#include "qgspiediagramfactory.h"
#include "qgsdiagramrenderer.h"
#include "qgssvgdiagramfactory.h"
#endif //DIAGRAMSERVER

//for contours
#include "gdal_alg.h"
#include "ogr_srs_api.h"
@@ -280,9 +272,6 @@ QList<QgsMapLayer*> QgsSLDParser::mapLayerFromStyle( const QString& layerName, c
QgsFeatureRendererV2* r = rendererFromUserStyle( userStyleElement, v );
v->setRendererV2( r );
labelSettingsFromUserStyle( userStyleElement, v );
#ifdef DIAGRAMSERVER
overlaysFromUserStyle( userStyleElement, v );
#endif //DIAGRAMSERVER
#if 0
setOpacityForLayer( namedLayerElemList[i], v );
#endif
@@ -389,11 +378,6 @@ QList<QgsMapLayer*> QgsSLDParser::mapLayerFromStyle( const QString& layerName, c
theRenderer = rendererFromUserStyle( userStyleElement, theVectorLayer );
//apply labels if <TextSymbolizer> tag is present
labelSettingsFromUserStyle( userStyleElement, theVectorLayer );
#ifdef DIAGRAMSERVER
//apply any vector overlays
QgsDebugMsg( "Trying to get overlays from user style" );
overlaysFromUserStyle( userStyleElement, theVectorLayer );
#endif //DIAGRAMSERVER
}

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

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

#endif //DIAGRAMSERVER
#endif //0 part that needs to be ported to the new diagram engine
@@ -35,14 +35,6 @@ class QgsFeatureRendererV2;
#include <QList>
#include <QString>

#ifdef DIAGRAMSERVER
#include "qgsdiagramcategory.h"
#include "qgsdiagramrenderer.h"
class QgsVectorOverlay;
class QgsVectorDataProvider;
#endif //DIAGRAMSERVER


/**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*/
class QgsSLDParser: public QgsConfigParser
{
@@ -137,31 +129,6 @@ class QgsSLDParser: public QgsConfigParser
/**Reads attributes "epsg" or "proj" from layer element and sets specified CRS if present*/
void setCrsForLayer( const QDomElement& layerElem, QgsMapLayer* ml ) const;


#ifdef DIAGRAMSERVER
/**Parses the user style and adds the vector overlays contained in it(most likely diagrams)
to the vector layer*/
int overlaysFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const;
/**Creates a diagram overlay from a diagram symbolizer element*/
QgsVectorOverlay* vectorOverlayFromDiagramSymbolizer( const QDomElement& symbolizerElem, QgsVectorLayer* vec ) const;
/**Returns a list of diagram items from the contents of a <Categorize> element
@param attribute name of the scaling attribute
@return 0 in case of success*/
int diagramItemsFromCategorize( const QDomElement& categorizeElement, QList<QgsDiagramItem>& items, QString& attribute ) const;
/**Returns a list of diagram items from the contents of a <Interpolate> element
@param attribute name of the scaling attribute
@return 0 in case of success*/
int diagramItemsFromInterpolate( const QDomElement& interpolateElement, QList<QgsDiagramItem>& items, QString& attribute ) const;
/**Returns diagram categories from <Category> tags
@param diagramElement <Diagram> xml element containing the categories
@param p provider for the vectorlayer (needed to convert attribute names to indices)
@param categories list that will contain the created elements
@return 0 in case of success*/
int symbologyFromCategoryTags( const QDomElement& diagramElement, const QgsVectorDataProvider* p, QList<QgsDiagramCategory>& categories ) const;
/**Returns the scale multiplication factor from the <Scale> Element*/
double scaleFactorFromScaleTag( const QDomElement& scaleElem ) const;
#endif //DIAGRAMSERVER

/**SLD as dom document*/
QDomDocument* mXMLDoc;

@@ -2,7 +2,6 @@
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDIR})
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDIR})

ADD_SUBDIRECTORY(diagram_overlay)
ADD_SUBDIRECTORY(interpolation)
ADD_SUBDIRECTORY(oracle_raster)
ADD_SUBDIRECTORY(raster_terrain_analysis)

This file was deleted.

This file was deleted.

0 comments on commit 17b09c2

Please sign in to comment.
You can’t perform that action at this time.