Skip to content

Commit

Permalink
Merge of raster transparency branch
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@7926 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman committed Jan 11, 2008
1 parent 15bd5a9 commit c73ffbe
Show file tree
Hide file tree
Showing 23 changed files with 6,082 additions and 3,273 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
@@ -1,4 +1,4 @@
PROJECT(qgis0.9.2)
PROJECT(qgis0.9.1-raster)

# TODO:
# - install includes for libs
Expand Down
9 changes: 9 additions & 0 deletions debian/changelog
@@ -1,3 +1,11 @@
<<<<<<< .trabalho
qgis (0.9.1raster+svn20071111) gutsy; urgency=low

* Initial test build for gutsy

-- Tim Sutton <tim@linfiniti.com> Sun, 11 Nov 2007 13:20:54 -0200

=======
qgis (0.9.1) gutsy; urgency=low

* This is a bug fix release
Expand All @@ -10,6 +18,7 @@ qgis (0.9.1) gutsy; urgency=low

-- Tim Sutton <tim@linfiniti.com> Fri, 07 Dec 2007 01:36:55 -0200

>>>>>>> .mesclagem-direita.r7786
qgis (0.9.0) gutsy; urgency=low

* Quantum GIS 0.9.0 'Ganymede' release
Expand Down
8 changes: 4 additions & 4 deletions debian/files
@@ -1,4 +1,4 @@
qgis_0.9.0_i386.deb science extra
libqgis1_0.9.0_i386.deb science extra
libqgis1-dev_0.9.0_i386.deb science extra
qgis-plugin-grass_0.9.0_i386.deb science extra
qgis_0.9.1raster+svn20071111_i386.deb science extra
libqgis1_0.9.1raster+svn20071111_i386.deb science extra
libqgis1-dev_0.9.1raster+svn20071111_i386.deb science extra
qgis-plugin-grass_0.9.1raster+svn20071111_i386.deb science extra
2 changes: 0 additions & 2 deletions debian/rules
Expand Up @@ -30,8 +30,6 @@ CMakeCache.txt: CMakeLists.txt
# Add here commands to configure the package.
uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
cmake -D CMAKE_INSTALL_PREFIX=/usr \
-D GDAL_INCLUDE_DIR=/usr/include/gdal \
-D GDAL_LIBRARY=/usr/lib/libgdal1.3.2.so \
.

build: patch build-stamp
Expand Down
5 changes: 5 additions & 0 deletions python/core/core.sip
Expand Up @@ -14,6 +14,8 @@
%Include qgscolortable.sip
%Include qgscontexthelp.sip
%Include qgscontinuouscolorrenderer.sip
%Include qgscontrastenhancement.sip
%Include qgscontrastenhancementfunction.sip
%Include qgscoordinatetransform.sip
%Include qgsdataprovider.sip
%Include qgsdatasourceuri.sip
Expand All @@ -39,6 +41,9 @@
%Include qgsrasterdataprovider.sip
%Include qgsrasterlayer.sip
%Include qgsrasterpyramid.sip
%Include qgsrastershader.sip
%Include qgsrastershaderfunction.sip
%Include qgsrastertransparency.sip
%Include qgsrasterviewport.sip
%Include qgsrect.sip
%Include qgsrenderer.sip
Expand Down
18 changes: 9 additions & 9 deletions python/core/qgsrasterbandstats.sip
Expand Up @@ -12,29 +12,29 @@ class QgsRasterBandStats
/** \brief The name of the band that these stats belong to. */
QString bandName;
/** \brief The gdal band number (starts at 1)*/
int bandNoInt;
int bandNo;
/** \brief A flag to indicate whether this RasterBandStats struct
* is completely populated */
bool statsGatheredFlag;
/** \brief The minimum cell value in the raster band. NO_DATA values
* are ignored. This does not use the gdal GetMinimum function. */
double minValDouble;
double minVal;
/** \brief The maximum cell value in the raster band. NO_DATA values
* are ignored. This does not use the gdal GetMaximmum function. */
double maxValDouble;
double maxVal;
/** \brief The range is the distance between min & max. */
double rangeDouble;
double range;
/** \brief The mean cell value for the band. NO_DATA values are excluded. */
double meanDouble;
double mean;
/** \brief The sum of the squares. Used to calculate standard deviation. */
double sumSqrDevDouble;
double sumSqrDev;
/** \brief The standard deviation of the cell values. */
double stdDevDouble;
double stdDev;
/** \brief The sum of all cells in the band. NO_DATA values are excluded. */
double sumDouble;
double sum;
/** \brief The number of cells in the band. Equivalent to height x width.
* TODO: check if NO_DATA are excluded!*/
int elementCountInt;
int elementCount;
/** \brief Store the histogram for a given layer */
typedef QVector<int> HistogramVector;
//HistogramVector * histogramVector;
Expand Down

0 comments on commit c73ffbe

Please sign in to comment.