Showing with 5,187 additions and 803 deletions.
  1. +2 −2 CMakeLists.txt
  2. +662 −0 ChangeLog
  3. +5 −1 cmake/MacBundleMacros.cmake
  4. +1 −0 cmake_templates/Doxyfile.in
  5. +8 −2 debian/changelog
  6. +1 −0 debian/qgis-common.links
  7. +44 −45 doc/TRANSLATORS
  8. +1 −1 i18n/CMakeLists.txt
  9. +1,114 −49 i18n/qgis_de.ts
  10. +888 −43 i18n/qgis_en.ts
  11. +5 −0 mac/cmake/0qgis.cmake.in
  12. +2 −3 ms-windows/osgeo4w/package-nightly.cmd
  13. +6 −6 ms-windows/osgeo4w/postinstall-dev.bat
  14. +11 −0 ms-windows/osgeo4w/preremove-dev.bat
  15. +1 −0 python/core/core.sip
  16. +8 −8 python/core/qgslayerdefinition.sip
  17. +1 −1 python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
  18. +3 −0 python/gui/qgsmapcanvas.sip
  19. +13 −1 python/plugins/MetaSearch/dialogs/maindialog.py
  20. +1 −1 python/plugins/db_manager/db_model.py
  21. +2 −6 python/plugins/db_manager/db_plugins/spatialite/plugin.py
  22. +1 −1 python/plugins/processing/algs/gdal/ClipByExtent.py
  23. +1 −1 python/plugins/processing/algs/gdal/ColorRelief.py
  24. +1 −1 python/plugins/processing/algs/gdal/GridAverage.py
  25. +1 −1 python/plugins/processing/algs/gdal/GridDataMetrics.py
  26. +1 −1 python/plugins/processing/algs/gdal/GridInvDist.py
  27. +1 −1 python/plugins/processing/algs/gdal/GridNearest.py
  28. +31 −2 python/plugins/processing/algs/gdal/OgrAlgorithm.py
  29. +1 −1 python/plugins/processing/algs/gdal/aspect.py
  30. +1 −1 python/plugins/processing/algs/gdal/buildvrt.py
  31. +1 −1 python/plugins/processing/algs/gdal/fillnodata.py
  32. +1 −1 python/plugins/processing/algs/gdal/gdal2xyz.py
  33. +1 −1 python/plugins/processing/algs/gdal/gdaladdo.py
  34. +1 −1 python/plugins/processing/algs/gdal/hillshade.py
  35. +1 −1 python/plugins/processing/algs/gdal/merge.py
  36. +1 −1 python/plugins/processing/algs/gdal/nearblack.py
  37. +1 −1 python/plugins/processing/algs/gdal/pct2rgb.py
  38. +1 −1 python/plugins/processing/algs/gdal/polygonize.py
  39. +1 −1 python/plugins/processing/algs/gdal/proximity.py
  40. +19 −21 python/plugins/processing/algs/gdal/rasterize.py
  41. +1 −1 python/plugins/processing/algs/gdal/rgb2pct.py
  42. +1 −1 python/plugins/processing/algs/gdal/roughness.py
  43. +1 −1 python/plugins/processing/algs/gdal/sieve.py
  44. +1 −1 python/plugins/processing/algs/gdal/slope.py
  45. +1 −1 python/plugins/processing/algs/gdal/tpi.py
  46. +2 −2 python/plugins/processing/algs/gdal/translate.py
  47. +2 −2 python/plugins/processing/algs/gdal/warp.py
  48. +1 −1 python/plugins/processing/algs/grass/description/v.buffer.column.txt
  49. +1 −1 python/plugins/processing/algs/grass/description/v.buffer.distance.txt
  50. +1 −1 python/plugins/processing/algs/grass7/description/v.buffer.column.txt
  51. +1 −1 python/plugins/processing/algs/grass7/description/v.buffer.distance.txt
  52. +2 −1 python/plugins/processing/algs/grass7/description/v.generalize.txt
  53. +2 −1 python/plugins/processing/algs/otb/OTBUtils.py
  54. +4 −6 python/plugins/processing/algs/qgis/Grid.py
  55. +6 −0 python/plugins/processing/algs/qgis/HypsometricCurves.py
  56. +2 −2 python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
  57. +2 −2 python/plugins/processing/algs/qgis/{SymetricalDifference.py → SymmetricalDifference.py}
  58. +2 −0 python/plugins/processing/algs/qgis/VectorLayerScatterplot.py
  59. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/AddCoordinatestopoints.txt
  60. +4 −4 python/plugins/processing/algs/saga/description/2.1.3/CatchmentArea(FlowTracing).txt
  61. +2 −2 python/plugins/processing/algs/saga/description/2.1.3/CatchmentArea(Parallel).txt
  62. +3 −3 python/plugins/processing/algs/saga/description/2.1.3/CatchmentArea(Recursive).txt
  63. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/ClipGridwithPolygon.txt
  64. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/ContourLinesfromGrid.txt
  65. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/CropToData.txt
  66. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/GridCalculator.txt
  67. +5 −5 python/plugins/processing/algs/saga/description/2.1.3/InverseDistanceWeighted.txt
  68. +3 −2 python/plugins/processing/algs/saga/description/2.1.3/KernelDensityEstimation.txt
  69. +2 −2 python/plugins/processing/algs/saga/description/2.1.3/MultilevelB-SplineInterpolation(fromGrid).txt
  70. +6 −4 python/plugins/processing/algs/saga/description/2.1.3/MultilevelB-SplineInterpolation.txt
  71. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/NaturalNeighbour.txt
  72. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/NearestNeighbour.txt
  73. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/OrdinaryKriging(Global).txt
  74. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/OrdinaryKriging.txt
  75. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/PolynomialRegression.txt
  76. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/Resampling.txt
  77. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/Separatepointsbydirection.txt
  78. +9 −5 python/plugins/processing/algs/saga/description/2.1.3/ShapestoGrid.txt
  79. +3 −3 python/plugins/processing/algs/saga/description/2.1.3/Slope,Aspect,Curvature.txt
  80. +5 −1 python/plugins/processing/algs/saga/description/2.1.3/StatisticsforGrids.txt
  81. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/TransformShapes.txt
  82. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/Triangulation.txt
  83. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/UniversalKriging(Global).txt
  84. +1 −1 python/plugins/processing/algs/saga/description/2.1.3/UniversalKriging.txt
  85. +3 −3 python/plugins/processing/algs/saga/description/2.1.3/VectorisingGridClasses.txt
  86. +4 −2 python/plugins/processing/algs/taudem/CMakeLists.txt
  87. +5 −2 python/plugins/processing/algs/taudem/TauDEMAlgorithm.py
  88. +82 −31 python/plugins/processing/algs/taudem/TauDEMAlgorithmProvider.py
  89. +122 −0 python/plugins/processing/algs/taudem/TauDEMMultifileAlgorithm.py
  90. +24 −4 python/plugins/processing/algs/taudem/TauDEMUtils.py
  91. +8 −0 python/plugins/processing/algs/taudem/description/multi/aread8.txt
  92. +8 −0 python/plugins/processing/algs/taudem/description/multi/areadinf.txt
  93. +6 −0 python/plugins/processing/algs/taudem/description/multi/d8flowdir.txt
  94. +9 −0 python/plugins/processing/algs/taudem/description/multi/d8flowpathextremeup.txt
  95. +7 −0 python/plugins/processing/algs/taudem/description/multi/d8hdisttostrm.txt
  96. +11 −0 python/plugins/processing/algs/taudem/description/multi/dinfavalanche.txt
  97. +11 −0 python/plugins/processing/algs/taudem/description/multi/dinfconclimaccum.txt
  98. +9 −0 python/plugins/processing/algs/taudem/description/multi/dinfdecayaccum.txt
  99. +6 −0 python/plugins/processing/algs/taudem/description/multi/dinfflowdir.txt
  100. +7 −0 python/plugins/processing/algs/taudem/description/multi/dinfrevaccum.txt
  101. +6 −0 python/plugins/processing/algs/taudem/description/multi/dinfupdependence.txt
  102. +6 −0 python/plugins/processing/algs/taudem/description/multi/gagewatershed.txt
  103. +7 −0 python/plugins/processing/algs/taudem/description/multi/gagewatershed2.txt
  104. +8 −0 python/plugins/processing/algs/taudem/description/multi/moveoutletstostrm.txt
  105. +5 −0 python/plugins/processing/algs/taudem/description/multi/pitremove.txt
  106. +6 −0 python/plugins/processing/algs/taudem/description/multi/selectgtthreshold.txt
  107. +6 −0 python/plugins/processing/algs/taudem/description/multi/slopearearatio.txt
  108. +7 −0 python/plugins/processing/algs/taudem/description/multi/slopeavedown.txt
  109. +14 −0 python/plugins/processing/algs/taudem/description/multi/streamnet.txt
  110. +7 −0 python/plugins/processing/algs/taudem/description/multi/threshold.txt
  111. +6 −0 python/plugins/processing/algs/taudem/description/multi/twi.txt
  112. 0 python/plugins/processing/algs/taudem/description/{ → single}/aread8.txt
  113. 0 python/plugins/processing/algs/taudem/description/{ → single}/areadinf.txt
  114. 0 python/plugins/processing/algs/taudem/description/{ → single}/d8flowdir.txt
  115. 0 python/plugins/processing/algs/taudem/description/{ → single}/d8flowpathextremeup.txt
  116. 0 python/plugins/processing/algs/taudem/description/{ → single}/d8hdisttostrm.txt
  117. 0 python/plugins/processing/algs/taudem/description/{ → single}/dinfavalanche.txt
  118. 0 python/plugins/processing/algs/taudem/description/{ → single}/dinfconclimaccum.txt
  119. 0 python/plugins/processing/algs/taudem/description/{ → single}/dinfdecayaccum.txt
  120. 0 python/plugins/processing/algs/taudem/description/{ → single}/dinfflowdir.txt
  121. 0 python/plugins/processing/algs/taudem/description/{ → single}/dinfrevaccum.txt
  122. 0 python/plugins/processing/algs/taudem/description/{ → single}/dinfupdependence.txt
  123. +6 −0 python/plugins/processing/algs/taudem/description/single/gagewatershed.txt
  124. +7 −0 python/plugins/processing/algs/taudem/description/single/gagewatershed2.txt
  125. 0 python/plugins/processing/algs/taudem/description/{ → single}/moveoutletstostrm.txt
  126. 0 python/plugins/processing/algs/taudem/description/{ → single}/pitremove.txt
  127. +6 −0 python/plugins/processing/algs/taudem/description/single/selectgtthreshold.txt
  128. 0 python/plugins/processing/algs/taudem/description/{ → single}/slopearearatio.txt
  129. 0 python/plugins/processing/algs/taudem/description/{ → single}/slopeavedown.txt
  130. 0 python/plugins/processing/algs/taudem/description/{ → single}/streamnet.txt
  131. 0 python/plugins/processing/algs/taudem/description/{ → single}/threshold.txt
  132. +6 −0 python/plugins/processing/algs/taudem/description/single/twi.txt
  133. +1 −1 python/plugins/processing/algs/taudem/dinfdistdown.py
  134. +127 −0 python/plugins/processing/algs/taudem/dinfdistdown_multi.py
  135. +1 −1 python/plugins/processing/algs/taudem/dinfdistup.py
  136. +124 −0 python/plugins/processing/algs/taudem/dinfdistup_multi.py
  137. +1 −1 python/plugins/processing/algs/taudem/dinftranslimaccum.py
  138. +1 −1 python/plugins/processing/algs/taudem/dinftranslimaccum2.py
  139. +122 −0 python/plugins/processing/algs/taudem/dinftranslimaccum2_multi.py
  140. +114 −0 python/plugins/processing/algs/taudem/dinftranslimaccum_multi.py
  141. +124 −0 python/plugins/processing/algs/taudem/dropanalysis_multi.py
  142. +114 −0 python/plugins/processing/algs/taudem/gridnet_multi.py
  143. +96 −0 python/plugins/processing/algs/taudem/lengtharea_multi.py
  144. +94 −0 python/plugins/processing/algs/taudem/peukerdouglas_multi.py
  145. +96 −0 python/plugins/processing/algs/taudem/slopearea_multi.py
  146. +1 −1 python/plugins/processing/gui/BatchPanel.py
  147. +3 −0 python/plugins/processing/gui/MultipleFileInputDialog.py
  148. +7 −1 python/plugins/processing/modeler/AddModelFromFileAction.py
  149. +6 −2 python/plugins/processing/script/AddScriptFromFileAction.py
  150. +0 −1 resources/customization.xml
  151. +2 −2 scripts/tsstat.pl
  152. +1 −1 scripts/update_ts.sh
  153. +1 −1 src/analysis/raster/qgsrastermatrix.cpp
  154. +1 −1 src/app/composer/qgscomposerattributetablewidget.cpp
  155. +18 −0 src/app/main.cpp
  156. +11 −4 src/app/qgisapp.cpp
  157. +6 −2 src/app/qgsattributetabledialog.cpp
  158. +1 −0 src/app/qgsdecorationgriddialog.cpp
  159. +5 −1 src/app/qgsfieldcalculator.cpp
  160. +1 −1 src/app/qgslabelpropertydialog.cpp
  161. +1 −1 src/app/qgsrasterlayerproperties.cpp
  162. +2 −0 src/browser/CMakeLists.txt
  163. +28 −0 src/browser/main.cpp
  164. +0 −7 src/core/diagram/qgstextdiagram.cpp
  165. +40 −49 src/core/dxf/qgsdxfexport.cpp
  166. +16 −20 src/core/dxf/qgsdxfpaintengine.cpp
  167. +0 −1 src/core/dxf/qgsdxfpaintengine.h
  168. +1 −9 src/core/pal/feature.cpp
  169. +6 −2 src/core/qgsexpression.cpp
  170. +2 −0 src/core/qgsmimedatautils.cpp
  171. +23 −3 src/core/qgspallabeling.cpp
  172. +26 −3 src/core/qgspointlocator.cpp
  173. +13 −2 src/core/qgsvectorlayer.cpp
  174. +21 −2 src/core/symbology-ng/qgsheatmaprenderer.cpp
  175. +1 −1 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  176. +1 −1 src/gui/editorwidgets/core/qgseditorwidgetfactory.h
  177. +1 −0 src/gui/qgsattributedialog.cpp
  178. +1 −1 src/gui/qgsexpressionbuilderwidget.cpp
  179. +11 −0 src/gui/qgsmapcanvas.cpp
  180. +3 −0 src/gui/qgsmapcanvas.h
  181. +6 −2 src/gui/qgsrasterlayersaveasdialog.cpp
  182. +20 −5 src/gui/qgsrubberband.cpp
  183. +1 −1 src/gui/raster/qgsrasterhistogramwidget.cpp
  184. +4 −4 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  185. +1 −6 src/plugins/grass/qgsgrassnewmapset.cpp
  186. +2 −1 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
  187. +7 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  188. +5 −5 src/providers/gdal/qgsgdalprovider.cpp
  189. +15 −16 src/providers/grass/qgsgrass.cpp
  190. +15 −1 src/providers/grass/qgsgrass.h
  191. +6 −0 src/providers/oracle/ocispatial/qsql_ocispatial.cpp
  192. +1 −1 src/providers/oracle/qgsoracleconn.cpp
  193. +3 −4 src/providers/oracle/qgsoraclefeatureiterator.cpp
  194. +1 −1 src/providers/oracle/qgsoraclenewconnection.cpp
  195. +1 −1 src/providers/oracle/qgsoracleprovider.cpp
  196. +1 −1 src/providers/postgres/qgspgnewconnection.cpp
  197. +34 −12 src/providers/postgres/qgspostgresconn.cpp
  198. +1 −1 src/providers/postgres/qgspostgresconn.h
  199. +2 −1 src/providers/postgres/qgspostgresdataitems.cpp
  200. +11 −2 src/providers/postgres/qgspostgresfeatureiterator.cpp
  201. +7 −8 src/providers/postgres/qgspostgresprovider.cpp
  202. +15 −0 src/providers/spatialite/qgsspatialitefeatureiterator.cpp
  203. +1 −0 src/providers/spatialite/qgsspatialitefeatureiterator.h
  204. +1 −1 src/providers/spatialite/qgsspatialiteprovider.cpp
  205. +1 −1 src/providers/wms/qgswmscapabilities.h
  206. +6 −4 src/providers/wms/qgswmsprovider.cpp
  207. +1 −1 src/providers/wms/qgswmsprovider.h
  208. +4 −0 src/server/CMakeLists.txt
  209. +10 −0 src/server/qgis_map_serv.cpp
  210. +4 −3 src/server/qgshttprequesthandler.cpp
  211. +14 −7 src/server/qgsserverprojectparser.cpp
  212. +4 −0 src/server/qgsserverprojectparser.h
  213. +8 −4 src/server/qgswfsserver.cpp
  214. +43 −168 src/server/qgswmsprojectparser.cpp
  215. +4 −8 src/server/qgswmsprojectparser.h
  216. +23 −46 src/server/qgswmsserver.cpp
  217. +8 −17 src/ui/qgsattributetabledialog.ui
  218. +0 −11 src/ui/qgscategorizedsymbolrendererv2widget.ui
  219. +1 −1 src/ui/qgscolordialog.ui
  220. +1 −1 src/ui/qgscomposerlegendwidgetbase.ui
  221. +1 −1 src/ui/qgsfieldspropertiesbase.ui
  222. +1 −1 src/ui/qgsoptionsbase.ui
  223. +1 −1 src/ui/qgsprojectpropertiesbase.ui
  224. +1 −1 src/ui/qgsrasterlayerpropertiesbase.ui
  225. +1 −1 src/ui/qgsrelationmanagerdialogbase.ui
  226. +1 −1 src/ui/qgsrulebasedrendererv2widget.ui
  227. +1 −1 src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
  228. +6 −0 tests/bench/CMakeLists.txt
  229. +18 −0 tests/bench/main.cpp
  230. +87 −2 tests/src/gui/testqgsrubberband.cpp
  231. +1 −0 tests/src/providers/CMakeLists.txt
  232. +107 −0 tests/src/providers/testqgsgdalprovider.cpp
  233. BIN tests/testdata/int_raster_with_scale.tif
  234. +30 −0 tests/testdata/int_raster_with_scale.tif.aux.xml
  235. BIN tests/testdata/requires_warped_vrt.tif
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "8")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(CPACK_PACKAGE_VERSION_PATCH "2")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Wien")
IF (POLICY CMP0048) # in CMake 3.0.0+
Expand Down Expand Up @@ -293,7 +293,7 @@ IF (ENABLE_TESTS)
IMMEDIATE @ONLY)
# For server side testing we have no X, we can use xfvb as a fake x
# sudo apt-get install xfvb
add_custom_target(check-no-x COMMAND xvfb-run --server-args="-screen 10 1024x768x24" ctest --output-on-failure)
add_custom_target(check-no-x COMMAND xvfb-run --server-args=-screen\ 10\ 1024x768x24 ctest --output-on-failure)
ENDIF (ENABLE_TESTS)

IF (SUPPRESS_QT_WARNINGS)
Expand Down
Loading