[QGIS Commit] r11559 - in trunk/qgis/src: analysis/raster plugins/interpolation

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-09-05 07:55:02 -0400 (Sat, 05 Sep 2009)
New Revision: 11559

Modified:
   trunk/qgis/src/analysis/raster/qgsaspectfilter.h
   trunk/qgis/src/analysis/raster/qgsninecellfilter.h
   trunk/qgis/src/analysis/raster/qgsruggednessfilter.h
   trunk/qgis/src/analysis/raster/qgsslopefilter.h
   trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.h
   trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp
Log:
fix windows build

Modified: trunk/qgis/src/analysis/raster/qgsaspectfilter.h
===================================================================
--- trunk/qgis/src/analysis/raster/qgsaspectfilter.h	2009-09-05 09:59:26 UTC (rev 11558)
+++ trunk/qgis/src/analysis/raster/qgsaspectfilter.h	2009-09-05 11:55:02 UTC (rev 11559)
@@ -21,7 +21,7 @@
 #include "qgsderivativefilter.h"
 
 /**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*/
-class QgsAspectFilter: public QgsDerivativeFilter
+class ANALYSIS_EXPORT QgsAspectFilter: public QgsDerivativeFilter
 {
   public:
     QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );

Modified: trunk/qgis/src/analysis/raster/qgsninecellfilter.h
===================================================================
--- trunk/qgis/src/analysis/raster/qgsninecellfilter.h	2009-09-05 09:59:26 UTC (rev 11558)
+++ trunk/qgis/src/analysis/raster/qgsninecellfilter.h	2009-09-05 11:55:02 UTC (rev 11559)
@@ -27,7 +27,7 @@
 the cell value and the eight neighbour cells. Common examples are slope and aspect calculation in DEMs. Subclasses only implement \
 the method that calculates the new value from the nine values. Everything else (reading file, writing file) is done by this subclass*/
 
-class QgsNineCellFilter
+class ANALYSIS_EXPORT QgsNineCellFilter
 {
   public:
     /**Constructor that takes input file, output file and output format (GDAL string)*/

Modified: trunk/qgis/src/analysis/raster/qgsruggednessfilter.h
===================================================================
--- trunk/qgis/src/analysis/raster/qgsruggednessfilter.h	2009-09-05 09:59:26 UTC (rev 11558)
+++ trunk/qgis/src/analysis/raster/qgsruggednessfilter.h	2009-09-05 11:55:02 UTC (rev 11559)
@@ -21,7 +21,7 @@
 #include "qgsninecellfilter.h"
 
 /**Calculates the ruggedness index based on a 3x3 moving window*/
-class QgsRuggednessFilter: public QgsNineCellFilter
+class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
 {
   public:
     QgsRuggednessFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );

Modified: trunk/qgis/src/analysis/raster/qgsslopefilter.h
===================================================================
--- trunk/qgis/src/analysis/raster/qgsslopefilter.h	2009-09-05 09:59:26 UTC (rev 11558)
+++ trunk/qgis/src/analysis/raster/qgsslopefilter.h	2009-09-05 11:55:02 UTC (rev 11559)
@@ -21,7 +21,7 @@
 #include "qgsderivativefilter.h"
 
 /**Calculates slope values in a window of 3x3 cells based on first order derivatives in x- and y- directions*/
-class QgsSlopeFilter: public QgsDerivativeFilter
+class ANALYSIS_EXPORT QgsSlopeFilter: public QgsDerivativeFilter
 {
   public:
     QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );

Modified: trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.h
===================================================================
--- trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.h	2009-09-05 09:59:26 UTC (rev 11558)
+++ trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.h	2009-09-05 11:55:02 UTC (rev 11559)
@@ -21,7 +21,7 @@
 #include "qgsninecellfilter.h"
 
 /**Calculates total curvature as described by Wilson, Gallant (2000): terrain analysis*/
-class QgsTotalCurvatureFilter: public QgsNineCellFilter
+class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter
 {
   public:
     QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );

Modified: trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp	2009-09-05 09:59:26 UTC (rev 11558)
+++ trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp	2009-09-05 11:55:02 UTC (rev 11559)
@@ -495,12 +495,12 @@
   QgsRectangle currentBBox = currentBoundingBox();
   int newSize;
 
-  if ( !mCellsizeXSpinBox->value() > 0 )
+  if ( mCellsizeXSpinBox->value() <= 0 )
   {
     return;
   }
 
-  if ( !currentBBox.width() > 0 )
+  if ( currentBBox.width() <= 0 )
   {
     newSize = 0;
   }
@@ -519,12 +519,12 @@
   QgsRectangle currentBBox = currentBoundingBox();
   int newSize;
 
-  if ( !mCellSizeYSpinBox->value() > 0 )
+  if ( mCellSizeYSpinBox->value() <= 0 )
   {
     return;
   }
 
-  if ( !currentBBox.height() > 0 )
+  if ( currentBBox.height() <= 0 )
   {
     newSize = 0;
   }