Skip to content
Permalink
Browse files

Add qgis_analysis.h with ANALYSIS_EXPORT macro

  • Loading branch information
m-kuhn committed Jan 4, 2017
1 parent 2306c11 commit d006784ded603a5557b7388fd3efc18b14d4698d
Showing with 66 additions and 4 deletions.
  1. +0 −1 CMakeLists.txt
  2. +1 −0 python/CMakeLists.txt
  3. +9 −3 src/analysis/CMakeLists.txt
  4. +1 −0 src/analysis/interpolation/Bezier3D.h
  5. +1 −0 src/analysis/interpolation/CloughTocherInterpolator.h
  6. +1 −0 src/analysis/interpolation/DualEdgeTriangulation.h
  7. +2 −0 src/analysis/interpolation/HalfEdge.h
  8. +1 −0 src/analysis/interpolation/LinTriangleInterpolator.h
  9. +1 −0 src/analysis/interpolation/Line3D.h
  10. +1 −0 src/analysis/interpolation/MathUtils.h
  11. +1 −0 src/analysis/interpolation/Node.h
  12. +1 −0 src/analysis/interpolation/NormVecDecorator.h
  13. +1 −0 src/analysis/interpolation/ParametricLine.h
  14. +1 −0 src/analysis/interpolation/Point3D.h
  15. +1 −0 src/analysis/interpolation/TriDecorator.h
  16. +1 −0 src/analysis/interpolation/TriangleInterpolator.h
  17. +1 −0 src/analysis/interpolation/Triangulation.h
  18. +1 −0 src/analysis/interpolation/Vector3D.h
  19. +1 −0 src/analysis/interpolation/qgsgridfilewriter.h
  20. +1 −0 src/analysis/interpolation/qgsidwinterpolator.h
  21. +1 −0 src/analysis/interpolation/qgsinterpolator.h
  22. +1 −0 src/analysis/interpolation/qgstininterpolator.h
  23. +1 −0 src/analysis/network/qgsgraph.h
  24. +1 −0 src/analysis/network/qgsgraphanalyzer.h
  25. +1 −0 src/analysis/network/qgsgraphbuilder.h
  26. +1 −0 src/analysis/network/qgsgraphbuilderinterface.h
  27. +1 −0 src/analysis/network/qgsgraphdirector.h
  28. +1 −0 src/analysis/network/qgsnetworkdistancestrategy.h
  29. +1 −0 src/analysis/network/qgsnetworkspeedstrategy.h
  30. +1 −0 src/analysis/network/qgsnetworkstrategy.h
  31. +1 −0 src/analysis/network/qgsvectorlayerdirector.h
  32. +1 −0 src/analysis/openstreetmap/qgsosmbase.h
  33. +1 −0 src/analysis/openstreetmap/qgsosmdatabase.h
  34. +1 −0 src/analysis/openstreetmap/qgsosmdownload.h
  35. +1 −0 src/analysis/openstreetmap/qgsosmimport.h
  36. +1 −0 src/analysis/raster/qgsalignraster.h
  37. +1 −0 src/analysis/raster/qgsaspectfilter.h
  38. +1 −0 src/analysis/raster/qgsderivativefilter.h
  39. +1 −0 src/analysis/raster/qgshillshadefilter.h
  40. +1 −0 src/analysis/raster/qgskde.h
  41. +1 −0 src/analysis/raster/qgsninecellfilter.h
  42. +1 −0 src/analysis/raster/qgsrastercalcnode.h
  43. +1 −0 src/analysis/raster/qgsrastercalculator.h
  44. +2 −0 src/analysis/raster/qgsrastermatrix.h
  45. +1 −0 src/analysis/raster/qgsrelief.h
  46. +1 −0 src/analysis/raster/qgsruggednessfilter.h
  47. +1 −0 src/analysis/raster/qgsslopefilter.h
  48. +1 −0 src/analysis/raster/qgstotalcurvaturefilter.h
  49. +1 −0 src/analysis/vector/qgsgeometryanalyzer.h
  50. +1 −0 src/analysis/vector/qgsgeometrysnapper.h
  51. +1 −0 src/analysis/vector/qgsoverlayanalyzer.h
  52. +1 −0 src/analysis/vector/qgspointsample.h
  53. +1 −0 src/analysis/vector/qgstransectsample.h
  54. +1 −0 src/analysis/vector/qgszonalstatistics.h
  55. +1 −0 src/app/CMakeLists.txt
  56. +1 −0 src/server/CMakeLists.txt
  57. +1 −0 tests/src/analysis/CMakeLists.txt
@@ -581,7 +581,6 @@ ELSE (WIN32)

ENDIF(WIN32)

ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")
@@ -121,6 +121,7 @@ INCLUDE_DIRECTORIES(

${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/analysis
)

IF(NOT ANDROID)
@@ -163,6 +163,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/analysis
interpolation
network
)
@@ -173,9 +174,6 @@ INCLUDE_DIRECTORIES(SYSTEM
${SQLITE3_INCLUDE_DIR}
)

REMOVE_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=${DLLEXPORT}\"")

#############################################################
# qgis_analysis library

@@ -208,6 +206,14 @@ ENDIF (NOT ANDROID)

TARGET_LINK_LIBRARIES(qgis_analysis qgis_core)

GENERATE_EXPORT_HEADER(
qgis_analysis
BASE_NAME ANALYSIS
EXPORT_FILE_NAME qgis_analysis.h
)

SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${PROJECT_BINARY_DIR}/qgis_analysis.h)


# install

@@ -19,6 +19,7 @@

#include "ParametricLine.h"
#include "qgslogger.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* Class Bezier3D represents a bezier curve, represented by control points. Parameter t is running from 0 to 1. The class is capable to calculate the curve point and the first two derivatives belonging to t.*/
@@ -19,6 +19,7 @@

#include "TriangleInterpolator.h"
#include "Point3D.h"
#include "qgis_analysis.h"

class NormVecDecorator;

@@ -31,6 +31,7 @@
#include <QStringList>
#include <QProgressDialog>
#include <QCursor>
#include "qgis_analysis.h"

/** \ingroup analysis
* DualEdgeTriangulation is an implementation of a triangulation class based on the dual edge data structure*/
@@ -17,6 +17,8 @@
#ifndef HALFEDGE_H
#define HALFEDGE_H

#include "qgis_analysis.h"

/** \ingroup analysis
* \class HalfEdge
*/
@@ -19,6 +19,7 @@

#include "TriangleInterpolator.h"
#include "DualEdgeTriangulation.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* LinTriangleInterpolator is a class which interpolates linearly on a triangulation*/
@@ -18,6 +18,7 @@
#define LINE3D_H

#include "Node.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* This class represents a line. It is implemented as a single directed linked list of nodes (with related Point3D objects). Attention: the points inserted in a line are not deleted from Line3D*/
@@ -18,6 +18,7 @@
#define MATHUTILS_H

#include <cmath>
#include "qgis_analysis.h"

class Point3D;
class Vector3D;
@@ -18,6 +18,7 @@
#define NODE_H

#include "Point3D.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* Node is a class used by Line3D. It represents a node in the single directed linked list. Associated Point3D objects are deleted when the node is deleted.*/
@@ -21,6 +21,7 @@
#include <TriangleInterpolator.h>
#include <MathUtils.h>
#include "qgslogger.h"
#include "qgis_analysis.h"

class QProgressDialog;

@@ -19,6 +19,7 @@

#include "Point3D.h"
#include <QVector>
#include "qgis_analysis.h"

class Vector3D;

@@ -18,6 +18,7 @@
#define POINT3D_H

#include <cmath>
#include "qgis_analysis.h"

/** \ingroup analysis
* Point3D is a class to represent a three dimensional point*/
@@ -18,6 +18,7 @@
#define TRIDECORATOR_H

#include "Triangulation.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* Decorator class for Triangulations (s. Decorator pattern in Gamma et al.)*/
@@ -19,6 +19,7 @@

#include <Point3D.h>
#include <Vector3D.h>
#include "qgis_analysis.h"

/** \ingroup analysis
* This is an interface for interpolator classes for triangulations*/
@@ -20,6 +20,7 @@
#include <QList>
#include <qpainter.h>
#include <TriangleInterpolator.h>
#include "qgis_analysis.h"

class Line3D;

@@ -18,6 +18,7 @@
#define VECTOR3D_H

#include <cmath>
#include "qgis_analysis.h"

/** \ingroup analysis
* Class Vector3D represents a 3D-Vector, capable to store x-,y- and
@@ -21,6 +21,7 @@
#include "qgsrectangle.h"
#include <QString>
#include <QTextStream>
#include "qgis_analysis.h"

class QgsInterpolator;

@@ -19,6 +19,7 @@
#define QGSIDWINTERPOLATOR_H

#include "qgsinterpolator.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* \class QgsIDWInterpolator
@@ -19,6 +19,7 @@
#define QGSINTERPOLATOR_H

#include <QVector>
#include "qgis_analysis.h"

class QgsVectorLayer;
class QgsGeometry;
@@ -20,6 +20,7 @@

#include "qgsinterpolator.h"
#include <QString>
#include "qgis_analysis.h"

class Triangulation;
class TriangleInterpolator;
@@ -30,6 +30,7 @@
#include <QVariant>

#include "qgspoint.h"
#include "qgis_analysis.h"

class QgsGraphVertex;

@@ -17,6 +17,7 @@
#define QGSGRAPHANALYZER_H

#include <QVector>
#include "qgis_analysis.h"

class QgsGraph;

@@ -19,6 +19,7 @@
#include "qgsgraphbuilderinterface.h"

#include <qgsspatialindex.h>
#include "qgis_analysis.h"

class QgsDistanceArea;
class QgsCoordinateTransform;
@@ -22,6 +22,7 @@
#include <qgspoint.h>
#include <qgscoordinatereferencesystem.h>
#include <qgsdistancearea.h>
#include "qgis_analysis.h"

/**
* \ingroup analysis
@@ -22,6 +22,7 @@

#include <qgspoint.h>
#include "qgsnetworkstrategy.h"
#include "qgis_analysis.h"

class QgsGraphBuilderInterface;

@@ -17,6 +17,7 @@
#define QGSNETWORKDISTANCESTRATEGY_H

#include <qgsnetworkstrategy.h>
#include "qgis_analysis.h"

/** \ingroup analysis
* \class QgsNetworkDistanceStrategy
@@ -17,6 +17,7 @@
#define QGSNETWORKSPEEDSTRATEGY_H

#include <qgsnetworkstrategy.h>
#include "qgis_analysis.h"

/** \ingroup analysis
* \class QgsNetworkSpeedStrategy
@@ -20,6 +20,7 @@

#include <qgsfeature.h>
#include <qgsfeaturerequest.h>
#include "qgis_analysis.h"

/**
* \ingroup analysis
@@ -17,6 +17,7 @@
#define QGSVECTORLAYERDIRECTOR_H

#include "qgsgraphdirector.h"
#include "qgis_analysis.h"

class QgsGraphBuilderInterface;
class QgsVectorLayer;
@@ -20,6 +20,7 @@
#include "qgspoint.h"

#include <sqlite3.h>
#include "qgis_analysis.h"

typedef qint64 QgsOSMId;

@@ -22,6 +22,7 @@
#include "qgsosmbase.h"

#include "qgsgeometry.h"
#include "qgis_analysis.h"

class QgsOSMNodeIterator;
class QgsOSMWayIterator;
@@ -20,6 +20,7 @@
#include <QObject>
#include <QFile>
#include <QNetworkReply>
#include "qgis_analysis.h"

class QgsRectangle;

@@ -20,6 +20,7 @@
#include <QObject>

#include "qgsosmbase.h"
#include "qgis_analysis.h"

class QXmlStreamReader;

@@ -21,6 +21,7 @@
#include <QSizeF>
#include <QString>
#include <gdal_version.h>
#include "qgis_analysis.h"

class QgsRectangle;

@@ -19,6 +19,7 @@
#define QGSASPECTFILTER_H

#include "qgsderivativefilter.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* Calculates aspect values in a window of 3x3 cells based on first order derivatives in x- and y- directions. Direction is clockwise starting from north*/
@@ -19,6 +19,7 @@
#define QGSDERIVATIVEFILTER_H

#include "qgsninecellfilter.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* Adds the ability to calculate derivatives in x- and y-directions. Needs to be subclassed (e.g. for slope and aspect)*/
@@ -19,6 +19,7 @@
#define QGSHILLSHADEFILTER_H

#include "qgsderivativefilter.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* \class QgsHillshadeFilter
@@ -23,6 +23,7 @@
#include <gdal.h>
#include <cpl_string.h>
#include <cpl_conv.h>
#include "qgis_analysis.h"

class QgsVectorLayer;
class QProgressDialog;
@@ -20,6 +20,7 @@

#include <QString>
#include "gdal.h"
#include "qgis_analysis.h"

class QProgressDialog;

@@ -21,6 +21,7 @@

#include <QMap>
#include <QString>
#include "qgis_analysis.h"

class QgsRasterBlock;
class QgsRasterMatrix;
@@ -23,6 +23,7 @@
#include <QString>
#include <QVector>
#include "gdal.h"
#include "qgis_analysis.h"

class QgsRasterLayer;
class QProgressDialog;
@@ -18,6 +18,8 @@
#ifndef QGSRASTERMATRIX_H
#define QGSRASTERMATRIX_H

#include "qgis_analysis.h"

/** \ingroup analysis
* \class QgsRasterMatrix
*/
@@ -23,6 +23,7 @@
#include <QPair>
#include <QString>
#include "gdal.h"
#include "qgis_analysis.h"

class QgsAspectFilter;
class QgsSlopeFilter;
@@ -19,6 +19,7 @@
#define QGSRUGGEDNESSFILTER_H

#include "qgsninecellfilter.h"
#include "qgis_analysis.h"

/** \ingroup analysis
* Calculates the ruggedness index based on a 3x3 moving window.

0 comments on commit d006784

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