Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
timlinux committed Oct 14, 2011
2 parents 8154103 + f8ed801 commit 2ef1772f081b69276c410adf468ffce81cbaf93f
Showing with 6,524 additions and 6,316 deletions.
  1. +1 −4 BUGS
  2. +11 −3 CMakeLists.txt
  3. +2 −2 COPYING
  4. +2 −2 README
  5. +43 −0 cmake/FindSpatialindex.cmake
  6. +3 −1 debian/changelog
  7. +1 −0 debian/control.lucid
  8. +1 −0 debian/control.maverick
  9. +1 −0 debian/control.natty
  10. +1 −0 debian/control.oneiric
  11. +1 −0 debian/control.sid
  12. +1 −0 debian/control.squeeze
  13. +0 −1 debian/qgis.install
  14. +4 −0 debian/rules
  15. +1 −1 images/images.qrc
  16. BIN src/plugins/wfs/wfs.png → images/themes/default/mActionAddWfsLayer.png
  17. BIN images/themes/gis/plugins/wfs.png
  18. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  19. +1 −0 ms-windows/osgeo4w/package.cmd
  20. +13 −4 python/core/qgsrasterlayer.sip
  21. +8 −0 python/core/qgsvectorlayer.sip
  22. +1 −1 python/plugins/GdalTools/__init__.py
  23. BIN python/plugins/GdalTools/icons/edit.png
  24. BIN python/plugins/GdalTools/icons/reset.png
  25. +3 −1 python/plugins/GdalTools/resources.qrc
  26. +40 −17 python/plugins/GdalTools/tools/dialogBase.py
  27. +75 −19 python/plugins/GdalTools/tools/dialogBase.ui
  28. +1 −0 python/plugins/GdalTools/tools/widgetPluginBase.py
  29. +33 −1 src/app/qgisapp.cpp
  30. +5 −0 src/app/qgisapp.h
  31. +60 −1 src/app/qgsbrowserdockwidget.cpp
  32. +6 −0 src/app/qgsbrowserdockwidget.h
  33. +1 −1 src/app/qgsidentifyresults.cpp
  34. +1 −1 src/app/qgsmaptoolidentify.cpp
  35. +1 −1 src/app/qgsprojectproperties.cpp
  36. +1 −1 src/app/qgstilescalewidget.cpp
  37. +33 −22 src/core/CMakeLists.txt
  38. +1 −1 src/core/qgsapplication.cpp
  39. +3 −0 src/core/qgsdataitem.h
  40. +31 −0 src/core/qgsexpression.cpp
  41. +8 −8 src/core/{spatialindex → }/qgsspatialindex.cpp
  42. +4 −10 src/core/{spatialindex → }/qgsspatialindex.h
  43. +36 −0 src/core/qgsvectorlayer.cpp
  44. +6 −0 src/core/qgsvectorlayer.h
  45. +1 −1 src/core/raster/qgsrasterlayer.cpp
  46. +13 −4 src/core/raster/qgsrasterlayer.h
  47. +5 −9 src/core/spatialindex/README
  48. +49 −54 src/core/spatialindex/include/LineSegment.h
  49. +43 −49 src/core/spatialindex/include/Point.h
  50. +43 −45 src/core/spatialindex/include/RTree.h
  51. +73 −79 src/core/spatialindex/include/Region.h
  52. +154 −125 src/core/spatialindex/include/SpatialIndex.h
  53. +0 −789 src/core/spatialindex/include/Tools.h
  54. +18 −27 src/core/spatialindex/include/{TemporaryFile.h → Version.h}
  55. +12 −19 src/core/spatialindex/include/{ → tools}/PointerPool.h
  56. +4 −4 src/core/spatialindex/include/{ → tools}/PoolPointer.h
  57. +2 −4 src/core/spatialindex/include/{ → tools}/SmartPointer.h
  58. +513 −0 src/core/spatialindex/include/tools/Tools.h
  59. +0 −390 src/core/spatialindex/rtree/BulkLoader.cc
  60. +0 −123 src/core/spatialindex/rtree/BulkLoader.h
  61. +0 −175 src/core/spatialindex/rtree/Statistics.cc
  62. +461 −0 src/core/spatialindex/src/rtree/BulkLoader.cc
  63. +131 −0 src/core/spatialindex/src/rtree/BulkLoader.h
  64. +47 −53 src/core/spatialindex/{ → src}/rtree/Index.cc
  65. +11 −15 src/core/spatialindex/{ → src}/rtree/Index.h
  66. +19 −30 src/core/spatialindex/{ → src}/rtree/Leaf.cc
  67. +17 −20 src/core/spatialindex/{ → src}/rtree/Leaf.h
  68. +216 −207 src/core/spatialindex/{ → src}/rtree/Node.cc
  69. +36 −41 src/core/spatialindex/{ → src}/rtree/Node.h
  70. +16 −21 src/core/spatialindex/{ → src}/rtree/PointerPoolNode.h
  71. +364 −241 src/core/spatialindex/{ → src}/rtree/RTree.cc
  72. +25 −25 src/core/spatialindex/{ → src}/rtree/RTree.h
  73. +172 −0 src/core/spatialindex/src/rtree/Statistics.cc
  74. +24 −28 src/core/spatialindex/{ → src}/rtree/Statistics.h
  75. +69 −72 src/core/spatialindex/{geometry → src/spatialindex}/LineSegment.cc
  76. +50 −47 src/core/spatialindex/{geometry → src/spatialindex}/Point.cc
  77. +153 −119 src/core/spatialindex/{geometry → src/spatialindex}/Region.cc
  78. +15 −10 src/core/spatialindex/{ → src}/spatialindex/SpatialIndexImpl.cc
  79. +3 −8 src/core/spatialindex/{ → src}/spatialindex/SpatialIndexImpl.h
  80. +35 −39 src/core/spatialindex/{ → src}/storagemanager/Buffer.cc
  81. +14 −14 src/core/spatialindex/{ → src}/storagemanager/Buffer.h
  82. +501 −0 src/core/spatialindex/src/storagemanager/DiskStorageManager.cc
  83. +13 −17 src/core/spatialindex/{ → src}/storagemanager/DiskStorageManager.h
  84. +22 −25 src/core/spatialindex/{ → src}/storagemanager/MemoryStorageManager.cc
  85. +7 −10 src/core/spatialindex/{ → src}/storagemanager/MemoryStorageManager.h
  86. +15 −21 src/core/spatialindex/{ → src}/storagemanager/RandomEvictionsBuffer.cc
  87. +13 −17 src/core/spatialindex/{ → src}/storagemanager/RandomEvictionsBuffer.h
  88. +1,364 −0 src/core/spatialindex/src/tools/Tools.cc
  89. +0 −474 src/core/spatialindex/storagemanager/DiskStorageManager.cc
  90. +0 −306 src/core/spatialindex/tools/ExternalSort.cc
  91. +0 −93 src/core/spatialindex/tools/ExternalSort.h
  92. +0 −254 src/core/spatialindex/tools/TemporaryFile.cc
  93. +0 −1,136 src/core/spatialindex/tools/Tools.cc
  94. +2 −1 src/gui/qgsprojectionselector.cpp
  95. +0 −1 src/plugins/CMakeLists.txt
  96. +1 −1 src/plugins/interpolation/qgsinterpolationdialog.cpp
  97. +11 −0 src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
  98. +2 −1 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
  99. +0 −50 src/plugins/wfs/CMakeLists.txt
  100. +0 −135 src/plugins/wfs/qgswfsplugin.cpp
  101. +0 −49 src/plugins/wfs/qgswfsplugin.h
  102. +0 −487 src/plugins/wfs/qgswfssourceselect.cpp
  103. +0 −5 src/plugins/wfs/wfsplugin.qrc
  104. +2 −0 src/providers/postgres/CMakeLists.txt
  105. +10 −5 src/providers/postgres/qgspgsourceselect.cpp
  106. +4 −0 src/providers/postgres/qgspgsourceselect.h
  107. +219 −0 src/providers/postgres/qgspostgresdataitems.cpp
  108. +72 −0 src/providers/postgres/qgspostgresdataitems.h
  109. +1 −157 src/providers/postgres/qgspostgresprovider.cpp
  110. +0 −54 src/providers/postgres/qgspostgresprovider.h
  111. +13 −1 src/providers/wfs/CMakeLists.txt
  112. +231 −0 src/providers/wfs/qgswfsconnection.cpp
  113. +76 −0 src/providers/wfs/qgswfsconnection.h
  114. +183 −0 src/providers/wfs/qgswfsdataitems.cpp
  115. +62 −0 src/providers/wfs/qgswfsdataitems.h
  116. +9 −0 src/providers/wfs/qgswfsprovider.cpp
  117. +364 −0 src/providers/wfs/qgswfssourceselect.cpp
  118. +7 −7 src/{plugins → providers}/wfs/qgswfssourceselect.h
  119. +27 −0 src/providers/wms/qgswmsconnection.cpp
  120. +8 −0 src/providers/wms/qgswmsconnection.h
  121. +1 −3 src/providers/wms/qgswmsprovider.cpp
  122. +5 −13 src/providers/wms/qgswmssourceselect.cpp
  123. +17 −3 src/ui/qgisapp.ui
  124. 0 src/{plugins/wfs → ui}/qgswfssourceselectbase.ui
  125. +8 −0 tests/src/core/testqgsexpression.cpp
5 BUGS
@@ -3,7 +3,7 @@ Help I think I found a bug!

If you find a bug in QGIS, you can report it using the QGIS ticket/bug database at:

http://trac.osgeo.org/qgis/report
http://hub.qgis.org/projects/quantum-gis/issues/new


Some hints about when you should file a bug:
@@ -25,6 +25,3 @@ Some hints about when you should file a bug:
do. While we appreciate it's inconvenient if some issue prevents you doing
your work, we need to take the big picture view of things and focus on
things that affect the largest proportion of our user base.


$Id$
@@ -51,7 +51,9 @@ IF (WITH_POSTGRESQL)
SET (POSTGRESQL_PREFIX "" CACHE PATH "Path to POSTGRESQL base directory")
ENDIF (WITH_POSTGRESQL)

SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal built of QwtPolar")
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")

SET (WITH_INTERNAL_SPATIALINDEX TRUE CACHE BOOL "Use internal build of Spatialindex")

SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")

@@ -136,6 +138,11 @@ FIND_PACKAGE(Expat) # GPS importer plugin
FIND_PACKAGE(GSL) # Georeferencer
FIND_PACKAGE(GEOS)
FIND_PACKAGE(GDAL)

IF (NOT WITH_INTERNAL_SPATIALINDEX)
FIND_PACKAGE(Spatialindex REQUIRED)
ENDIF(NOT WITH_INTERNAL_SPATIALINDEX)

FIND_PACKAGE(Qwt REQUIRED)
IF (NOT WITH_INTERNAL_QWTPOLAR)
FIND_PACKAGE(QwtPolar REQUIRED)
@@ -219,9 +226,10 @@ IF (PEDANTIC)
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
ELSE (MSVC)
ADD_DEFINITIONS( -Wall -Wextra -Wredundant-decls -Wno-long-long -Wformat-security -Wno-strict-aliasing )
ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
# Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 )
# There are redundant declarations in Qt and GDAL
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
ENDIF (MSVC)
ENDIF (PEDANTIC)

@@ -2,7 +2,7 @@
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

@@ -318,7 +318,7 @@ the "copyright" line and a pointer to where the full notice is found.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


Also add information on how to contact you by electronic and paper mail.
4 README
@@ -46,7 +46,7 @@ installation document in qgis/doc/index.html. The installation document is
also available as PDF in the same directory.

HELP US -- Please submit bug reports using the QGIS bug tracker at:
http://trac.osgeo.org/qgis/
http://hub.qgis.org/
When reporting a bug, either login or, if you don't
have a qgis trac, provide an email address where we can
request additional information.
@@ -60,7 +60,7 @@ SUPPORT - You can get support in the following ways:
folks on the channel are doing other things and it may take a
while for them to notice your question.

QGIS is on GitHub at http://github.com/qgis/qgis. If you wish to contribute
QGIS is on GitHub at http://github.com/qgis/Quantum-GIS. If you wish to contribute
patches you can fork the project, make your changes, commit to your
repository, and then issue a pull request. The development team can then
review your contribution and commit it upstream as appropriate. See
@@ -0,0 +1,43 @@
# Find Spatialindex
# ~~~~~~~~
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# Once run this will define:
#
# SPATIALINDEX_FOUND = system has Spatialindex lib
# SPATIALINDEX_LIBRARY = full path to the Spatialindex library
# SPATIALINDEX_INCLUDE_DIR = where to find headers
#


FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS
/usr/include
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
"$ENV{OSGEO4W_ROOT}/include"
PATH_SUFFIXES spatialindex
)

FIND_LIBRARY(SPATIALINDEX_LIBRARY NAMES spatialindex_i spatialindex PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
"$ENV{OSGEO4W_ROOT}/lib"
)

IF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
SET(SPATIALINDEX_FOUND TRUE)
ENDIF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)

IF (SPATIALINDEX_FOUND)
IF (NOT SPATIALINDEX_FIND_QUIETLY)
MESSAGE(STATUS "Found Spatialindex: ${SPATIALINDEX_LIBRARY}")
ENDIF (NOT SPATIALINDEX_FIND_QUIETLY)
ELSE (SPATIALINDEX_FOUND)
IF (SPATIALINDEX_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Spatialindex")
ENDIF (SPATIALINDEX_FIND_REQUIRED)
ENDIF (SPATIALINDEX_FOUND)
@@ -9,8 +9,10 @@ qgis (1.8.0) UNRELEASED; urgency=low
* update watch
* drop abi postfix from sqlanywhere plugin
* include network analysis library
* build package with libspatialindex where available
* drop wfsplugin

-- Jürgen E. Fischer <jef@norbit.de> Thu, 29 Sep 2011 21:44:50 +0000
-- Jürgen E. Fischer <jef@norbit.de> Sat, 08 Oct 2011 20:03:51 +0000

qgis (1.7.0) UNRELEASED; urgency=low

@@ -18,6 +18,7 @@ Build-Depends:
libqt4-dev (>=4.4.0),
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
@@ -19,6 +19,7 @@ Build-Depends:
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
@@ -19,6 +19,7 @@ Build-Depends:
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
@@ -19,6 +19,7 @@ Build-Depends:
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
@@ -21,6 +21,7 @@ Build-Depends:
libqwt-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
@@ -19,6 +19,7 @@ Build-Depends:
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
@@ -2,7 +2,6 @@ usr/lib/qgis/plugins/libdelimitedtextplugin.so
usr/lib/qgis/plugins/libgeorefplugin.so
usr/lib/qgis/plugins/libgpsimporterplugin.so
usr/lib/qgis/plugins/libspitplugin.so
usr/lib/qgis/plugins/libwfsplugin.so
usr/lib/qgis/plugins/libdxf2shpconverterplugin.so
usr/lib/qgis/plugins/libinterpolationplugin.so
usr/lib/qgis/plugins/libcoordinatecaptureplugin.so
@@ -46,6 +46,10 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
CMAKE_OPTS += -D WITH_GLOBE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=FALSE
endif

ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
endif
@@ -345,14 +345,14 @@
<file>themes/gis/plugins/quick_print.png</file>
<file>themes/gis/plugins/scale_bar.png</file>
<file>themes/gis/plugins/spit.png</file>
<file>themes/gis/plugins/wfs.png</file>
<file>splash/splash.png</file>
<file>north_arrows/default.png</file>
<file>themes/default/locked.png</file>
<file>themes/default/unlocked.png</file>
<file>themes/default/plugins/copyright_label.png</file>
<file>themes/default/plugins/north_arrow.png</file>
<file>themes/default/plugins/scale_bar.png</file>
<file>themes/default/mActionAddWfsLayer.png</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
File renamed without changes.
Binary file not shown.
@@ -93,6 +93,7 @@ cmake -G "Visual Studio 9 2008" ^
-D WITH_ASTYLE=TRUE ^
-D WITH_GLOBE=TRUE ^
-D WITH_INTERNAL_SPATIALITE=TRUE ^
-D WITH_INTERNAL_SPATIALINDEX=FALSE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^
@@ -91,6 +91,7 @@ cmake -G "Visual Studio 9 2008" ^
-D WITH_MAPSERVER=TRUE ^
-D WITH_GLOBE=TRUE ^
-D WITH_INTERNAL_SPATIALITE=TRUE ^
-D WITH_INTERNAL_SPATIALINDEX=FALSE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^
@@ -228,8 +228,10 @@ public:
/** \brief Accessor for transparent band name mapping */
QString transparentBandName() const;

/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data? */
bool usesProvider();
/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
* @deprecated in 2.0
*/
bool usesProvider() /Deprecated/;

/** \brief Accessor that returns the width of the (unclipped) raster */
int width();
@@ -375,8 +377,15 @@ public:
/** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
QPixmap paletteAsPixmap( int theBand = 1 );

/** \brief [ data provider interface ] Which provider is being used for this Raster Layer? */
QString providerKey() const;
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
* @note added in 2.0
*/
QString providerType() const;

/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
* @deprecated in 2.0
*/
QString providerKey() const /Deprecated/;

/** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
double rasterUnitsPerPixel();
@@ -272,10 +272,18 @@ public:
bool featureAtId(int featureId, QgsFeature& f, bool fetchGeometries = true, bool fetchAttributes = true);

/** Adds a feature
@param f feature to add
@param alsoUpdateExtent If True, will also go to the effort of e.g. updating the extents.
@return True in case of success and False in case of error
*/
bool addFeature(QgsFeature& f, bool alsoUpdateExtent = TRUE);

/** Update an existing feature
@param f feature to update
@return True in case of success and False in case of error
@note added in 1.8
*/
bool updateFeature(QgsFeature& f );


/** Insert a new vertex before the given vertex number,
@@ -22,7 +22,7 @@ def name():
def description():
return "Integrate gdal tools into qgis"
def version():
return "Version 1.2.27"
return "Version 1.2.28"
def qgisMinimumVersion():
return "1.0"
def icon():
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/" >
<qresource prefix="/">
<file>icons/contour.png</file>
<file>icons/merge.png</file>
<file>icons/polygonize.png</file>
@@ -21,5 +21,7 @@
<file>icons/about.png</file>
<file>icons/dem.png</file>
<file>icons/projection-export.png</file>
<file>icons/edit.png</file>
<file>icons/reset.png</file>
</qresource>
</RCC>

0 comments on commit 2ef1772

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