From 0f8f6188b0def1b60ce885a3c8b51c8e627cdca5 Mon Sep 17 00:00:00 2001 From: elpaso Date: Sat, 30 May 2015 15:26:55 +0200 Subject: [PATCH] Added documentation and QgsServer to doxy template --- cmake_templates/Doxyfile.in | 1 + src/server/qgsserverfilter.h | 1 - src/server/qgsserverinterface.h | 37 +++++++++++++++++++++++++++------ src/server/qgsserverplugins.h | 7 +++++++ 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in index 1e32d69956a..6d69d79131d 100644 --- a/cmake_templates/Doxyfile.in +++ b/cmake_templates/Doxyfile.in @@ -596,6 +596,7 @@ INPUT = @CMAKE_SOURCE_DIR@/doc \ @CMAKE_SOURCE_DIR@/src/analysis/raster \ @CMAKE_SOURCE_DIR@/src/analysis/vector \ @CMAKE_SOURCE_DIR@/src/plugins \ + @CMAKE_SOURCE_DIR@/src/server/qgsserver.h \ @CMAKE_SOURCE_DIR@/src/server/qgscapabilitiescache.h \ @CMAKE_SOURCE_DIR@/src/server/qgsmapserviceexception.h \ @CMAKE_SOURCE_DIR@/src/server/qgsrequesthandler.h \ diff --git a/src/server/qgsserverfilter.h b/src/server/qgsserverfilter.h index 3e3ec16b081..45a4400fcf9 100644 --- a/src/server/qgsserverfilter.h +++ b/src/server/qgsserverfilter.h @@ -34,7 +34,6 @@ class QgsServerInterface; * after core services have returned to main loop * * sendResponse() - called just before sending output to FGCI */ - class SERVER_EXPORT QgsServerFilter { diff --git a/src/server/qgsserverinterface.h b/src/server/qgsserverinterface.h index c2dc9d5b883..f85f358e5e0 100644 --- a/src/server/qgsserverinterface.h +++ b/src/server/qgsserverinterface.h @@ -41,14 +41,39 @@ class SERVER_EXPORT QgsServerInterface /** Destructor */ virtual ~QgsServerInterface() = 0; + /** + * Set the request handler + * @param QgsRequestHandler + */ virtual void setRequestHandler( QgsRequestHandler* requestHandler ) = 0; - virtual QgsCapabilitiesCache* capabiblitiesCache() = 0; - virtual QgsRequestHandler* requestHandler( ) = 0; - virtual void registerFilter( QgsServerFilter* filter, int priority = 0 ) = 0; - virtual QgsServerFiltersMap filters( ) = 0; - /*Pass environment variables to python*/ - virtual QString getEnv( const QString& name ) const = 0; + /** + * Get pointer to the capabiblities cache + * @return QgsCapabilitiesCache + */ + virtual QgsCapabilitiesCache* capabiblitiesCache() = 0; + + /** + * Get pointer to the request handler + * @return QgsRequestHandler + */ + virtual QgsRequestHandler* requestHandler( ) = 0; + + /** + * Register a QgsServerFilter + * @param filter the QgsServerFilter to add + * @param priority an optional priority for the filter order + */ + virtual void registerFilter( QgsServerFilter* filter, int priority = 0 ) = 0; + + /** + * Return the list of current QgsServerFilter + * @return QgsServerFiltersMap list of QgsServerFilter + */ + virtual QgsServerFiltersMap filters( ) = 0; + + //! Return an enrironment variable, used to pass environment variables to python + virtual QString getEnv( const QString& name ) const = 0; }; #endif // QGSSERVERINTERFACE_H diff --git a/src/server/qgsserverplugins.h b/src/server/qgsserverplugins.h index 73059634931..2b7b28ee413 100644 --- a/src/server/qgsserverplugins.h +++ b/src/server/qgsserverplugins.h @@ -26,8 +26,15 @@ class SERVER_EXPORT QgsServerPlugins { public: explicit QgsServerPlugins(); + /** + * Initialise the python plugins + * @param interface QgsServerInterface + * @return bool true on success + */ static bool initPlugins( QgsServerInterface* interface ); + //! Pointer to QgsPythonUtils static QgsPythonUtils* mPythonUtils; + //! List of available server plugin names static QStringList mServerPlugins; };