[QGIS Commit] r10310 - in branches/analysis_branch: .
src/analysis/interpolation
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Mar 19 14:35:46 EDT 2009
Author: mhugent
Date: 2009-03-19 14:35:46 -0400 (Thu, 19 Mar 2009)
New Revision: 10310
Modified:
branches/analysis_branch/CMakeLists.txt
branches/analysis_branch/src/analysis/interpolation/DualEdgeTriangulation.h
branches/analysis_branch/src/analysis/interpolation/HalfEdge.h
branches/analysis_branch/src/analysis/interpolation/LinTriangleInterpolator.h
branches/analysis_branch/src/analysis/interpolation/Line3D.h
branches/analysis_branch/src/analysis/interpolation/Node.h
branches/analysis_branch/src/analysis/interpolation/Point3D.h
branches/analysis_branch/src/analysis/interpolation/TriangleInterpolator.h
branches/analysis_branch/src/analysis/interpolation/Triangulation.h
branches/analysis_branch/src/analysis/interpolation/Vector3D.h
branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.h
branches/analysis_branch/src/analysis/interpolation/qgsidwinterpolator.h
branches/analysis_branch/src/analysis/interpolation/qgsinterpolator.h
branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.h
Log:
Added ANALYSIS export macro to interpolation classes
Modified: branches/analysis_branch/CMakeLists.txt
===================================================================
--- branches/analysis_branch/CMakeLists.txt 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/CMakeLists.txt 2009-03-19 18:35:46 UTC (rev 10310)
@@ -270,16 +270,19 @@
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
+ ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
+ ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
ENDIF (MSVC)
ELSE (WIN32)
# other compilers don't use that MSVC construct
ADD_DEFINITIONS(-DCORE_EXPORT=)
ADD_DEFINITIONS(-DGUI_EXPORT=)
ADD_DEFINITIONS(-DPYTHON_EXPORT=)
+ ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
ENDIF (WIN32)
#############################################################
Modified: branches/analysis_branch/src/analysis/interpolation/DualEdgeTriangulation.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/DualEdgeTriangulation.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/DualEdgeTriangulation.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -37,7 +37,7 @@
#include <set>
/**DualEdgeTriangulation is an implementation of a triangulation class based on the dual edge data structure*/
-class DualEdgeTriangulation: public Triangulation
+class ANALYSIS_EXPORT DualEdgeTriangulation: public Triangulation
{
public:
DualEdgeTriangulation();
Modified: branches/analysis_branch/src/analysis/interpolation/HalfEdge.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/HalfEdge.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/HalfEdge.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -17,7 +17,7 @@
#ifndef HALFEDGE_H
#define HALFEDGE_H
-class HalfEdge
+class ANALYSIS_EXPORT HalfEdge
{
protected:
/**Number of the dual HalfEdge*/
Modified: branches/analysis_branch/src/analysis/interpolation/LinTriangleInterpolator.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/LinTriangleInterpolator.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/LinTriangleInterpolator.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -21,7 +21,7 @@
#include "DualEdgeTriangulation.h"
/**LinTriangleInterpolator is a class which interpolates linearly on a triangulation*/
-class LinTriangleInterpolator : public TriangleInterpolator
+class ANALYSIS_EXPORT LinTriangleInterpolator : public TriangleInterpolator
{
public:
/**Default constructor*/
Modified: branches/analysis_branch/src/analysis/interpolation/Line3D.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/Line3D.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/Line3D.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -21,7 +21,7 @@
#include "Node.h"
/**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*/
-class Line3D
+class ANALYSIS_EXPORT Line3D
{
private:
/**copy constructor, declared privat to not use it*/
Modified: branches/analysis_branch/src/analysis/interpolation/Node.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/Node.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/Node.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -21,7 +21,7 @@
#include <iostream>
/**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.*/
-class Node
+class ANALYSIS_EXPORT Node
{
protected:
/**Pointer to the Point3D object associated with the node*/
Modified: branches/analysis_branch/src/analysis/interpolation/Point3D.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/Point3D.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/Point3D.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -21,7 +21,7 @@
#include <iostream>
/**Point3D is a class to represent a three dimensional point*/
-class Point3D
+class ANALYSIS_EXPORT Point3D
{
protected:
/**X-coordinate*/
Modified: branches/analysis_branch/src/analysis/interpolation/TriangleInterpolator.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/TriangleInterpolator.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/TriangleInterpolator.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -21,7 +21,7 @@
#include <Vector3D.h>
/**This is an interface for interpolator classes for triangulations*/
-class TriangleInterpolator
+class ANALYSIS_EXPORT TriangleInterpolator
{
public:
virtual ~TriangleInterpolator() {}
Modified: branches/analysis_branch/src/analysis/interpolation/Triangulation.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/Triangulation.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/Triangulation.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -25,7 +25,7 @@
#include <TriangleInterpolator.h>
/**Interface for Triangulation classes*/
-class Triangulation
+class ANALYSIS_EXPORT Triangulation
{
public:
/**Enumeration describing the behaviour, if two forced lines cross. SnappingType_VERTICE means, that the second inserted forced line is snapped to the closest vertice of the first inserted forced line. DELETE_FIRST means, that the status of the first inserted forced line is reset to that of a normal edge (so that the second inserted forced line remain and the first not*/
Modified: branches/analysis_branch/src/analysis/interpolation/Vector3D.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/Vector3D.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/Vector3D.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -19,7 +19,7 @@
#include <cmath>
-class Vector3D
+class ANALYSIS_EXPORT Vector3D
/**
Class Vector3D represents a 3D-Vector, capable to store x-,y- and z-coordinates in double values. In fact, the class is the same as Point3D. The name 'vector' makes it easier to understand the programms.
*/
Modified: branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -26,7 +26,7 @@
/**A class that does interpolation to a grid and writes the results to an ascii grid*/
//todo: extend such that writing to other file types is possible
-class QgsGridFileWriter
+class ANALYSIS_EXPORT QgsGridFileWriter
{
public:
QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows );
Modified: branches/analysis_branch/src/analysis/interpolation/qgsidwinterpolator.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/qgsidwinterpolator.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/qgsidwinterpolator.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -20,7 +20,7 @@
#include "qgsinterpolator.h"
-class QgsIDWInterpolator: public QgsInterpolator
+class ANALYSIS_EXPORT QgsIDWInterpolator: public QgsInterpolator
{
public:
QgsIDWInterpolator( const QList<QgsVectorLayer*>& vlayers );
Modified: branches/analysis_branch/src/analysis/interpolation/qgsinterpolator.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/qgsinterpolator.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/qgsinterpolator.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -23,7 +23,7 @@
class QgsVectorLayer;
class QgsGeometry;
-struct vertexData
+struct ANALYSIS_EXPORT vertexData
{
double x;
double y;
@@ -33,7 +33,7 @@
/**Interface class for interpolations. Interpolators take
the vertices of a vector layer as base data. The z-Value
can be an attribute or the z-coordinates in case of 25D types*/
-class QgsInterpolator
+class ANALYSIS_EXPORT QgsInterpolator
{
public:
/**Describes the type of input data*/
Modified: branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.h
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.h 2009-03-19 18:24:38 UTC (rev 10309)
+++ branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.h 2009-03-19 18:35:46 UTC (rev 10310)
@@ -24,7 +24,7 @@
class TriangleInterpolator;
/**Interpolation in a triangular irregular network*/
-class QgsTINInterpolator: public QgsInterpolator
+class ANALYSIS_EXPORT QgsTINInterpolator: public QgsInterpolator
{
public:
QgsTINInterpolator( const QList<QgsVectorLayer*>& inputData );
More information about the QGIS-commit
mailing list