Skip to content
Permalink
Browse files
Merge branch 'master' of git://github.com/qgis/Quantum-GIS into android
  • Loading branch information
mbernasocchi committed Nov 25, 2011
2 parents 5b9cc5c + 898604d commit 249d8892b194dfa513519349ee4bae0d98cf4a30
Showing with 80,692 additions and 1,217 deletions.
  1. +154 −81 CHANGELOG
  2. +5 −1 CMakeLists.txt
  3. +6 −0 debian/changelog
  4. +5 −0 debian/rules
  5. +1 −0 doc/SPONSORS
  6. +61 −13 doc/changelog.t2t
  7. +254 −196 i18n/qgis_de.ts
  8. +38,492 −0 i18n/qgis_gl_ES.ts
  9. +3 −3 i18n/qgis_it.ts
  10. +38,492 −0 i18n/qgis_no.ts
  11. +1 −0 images/images.qrc
  12. BIN images/themes/default/propertyicons/gdal.png
  13. +5 −1 ms-windows/osgeo4w/package-nightly.cmd
  14. +6 −1 python/CMakeLists.txt
  15. +2 −0 python/core/core.sip
  16. +10 −0 python/core/qgsmessagelog.sip
  17. +60 −0 python/core/qgsvectorfieldsymbollayer.sip
  18. +10 −1 python/core/symbology-ng-core.sip
  19. +1 −0 resources/CMakeLists.txt
  20. +4 −0 resources/function_help/CMakeLists.txt
  21. +13 −0 resources/function_help/length-en_US
  22. +11 −0 resources/function_help/lower-en_US
  23. +15 −0 resources/function_help/replace-en_US
  24. +15 −0 resources/function_help/substr-en_US
  25. +13 −0 resources/function_help/template
  26. +13 −0 resources/function_help/upper-en_US
  27. +2 −0 src/analysis/vector/qgsgeometryanalyzer.cpp
  28. +9 −5 src/app/main.cpp
  29. +27 −28 src/app/qgisapp.cpp
  30. +7 −3 src/app/qgisapp.h
  31. +16 −3 src/app/qgsbrowserdockwidget.cpp
  32. +8 −6 src/app/qgsmaptoolnodetool.cpp
  33. +2 −2 src/app/qgsmaptoolsimplify.cpp
  34. +14 −0 src/app/qgsoptions.cpp
  35. +9 −11 src/app/qgspluginregistry.cpp
  36. +27 −82 src/app/spatialite/qgsnewspatialitelayerdialog.cpp
  37. +0 −3 src/app/spatialite/qgsnewspatialitelayerdialog.h
  38. +3 −0 src/core/CMakeLists.txt
  39. +4 −1 src/core/qgsapplication.h
  40. +20 −21 src/core/qgsbrowsermodel.cpp
  41. +6 −1 src/core/qgsbrowsermodel.h
  42. +7 −0 src/core/qgsdataitem.h
  43. +4 −10 src/core/qgsexpression.cpp
  44. +40 −0 src/core/qgsmessagelog.cpp
  45. +60 −0 src/core/qgsmessagelog.h
  46. +77 −0 src/core/qgsmimedatautils.cpp
  47. +34 −0 src/core/qgsmimedatautils.h
  48. +5 −1 src/core/qgsproject.cpp
  49. +1 −7 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  50. +1 −3 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  51. +3 −0 src/gui/CMakeLists.txt
  52. +0 −2 src/gui/attributetable/qgsattributetablememorymodel.h
  53. +32 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  54. +6 −0 src/gui/attributetable/qgsattributetablemodel.h
  55. +81 −5 src/gui/qgsexpressionbuilderwidget.cpp
  56. +1 −0 src/gui/qgsexpressionbuilderwidget.h
  57. +86 −0 src/gui/qgsmessagelogviewer.cpp
  58. +42 −0 src/gui/qgsmessagelogviewer.h
  59. +73 −3 src/gui/qgsprojectionselector.cpp
  60. +1 −0 src/gui/qgsprojectionselector.h
  61. +1 −1 src/mapserver/qgis_map_serv.cpp
  62. +159 −102 src/mapserver/qgsprojectparser.cpp
  63. +3 −0 src/mapserver/qgsprojectparser.h
  64. +27 −1 src/mapserver/qgswmsserver.cpp
  65. +0 −1 src/plugins/grass/modules/v.generalize.qgm
  66. +2 −2 src/plugins/grass/modules/v.what.vect.qgm
  67. +2 −2 src/plugins/grass/qgsgrassmodule.cpp
  68. +2 −2 src/plugins/roadgraph/linevectorlayerwidget.cpp
  69. +8 −1 src/providers/ogr/qgsogrprovider.cpp
  70. +15 −11 src/providers/postgres/qgspostgresdataitems.cpp
  71. +2 −3 src/providers/postgres/qgspostgresdataitems.h
  72. +81 −63 src/providers/postgres/qgspostgresprovider.cpp
  73. +145 −1 src/providers/spatialite/qgsspatialitedataitems.cpp
  74. +11 −5 src/providers/spatialite/qgsspatialitedataitems.h
  75. +148 −2 src/providers/spatialite/qgsspatialiteprovider.cpp
  76. +6 −2 src/providers/spatialite/qgsspatialiteprovider.h
  77. +11 −10 src/providers/wms/qgswmsprovider.cpp
  78. +3 −58 src/ui/qgsexpressionbuilder.ui
  79. +38 −0 src/ui/qgsmessagelogviewer.ui
  80. +215 −120 src/ui/qgsoptionsbase.ui
  81. +149 −124 src/ui/qgsprojectionselectorbase.ui
  82. +15 −13 src/ui/qgssponsorsbase.ui
  83. +1 −0 tests/CMakeLists.txt
  84. +0 −9 tests/README
  85. +64 −0 tests/bench/CMakeLists.txt
  86. +78 −0 tests/bench/README
  87. +550 −0 tests/bench/main.cpp
  88. +339 −0 tests/bench/qgsbench.cpp
  89. +94 −0 tests/bench/qgsbench.h
  90. +28 −42 tests/src/analysis/CMakeLists.txt
  91. +7 −5 tests/src/analysis/testqgsvectoranalyzer.cpp
  92. +4 −4 tests/src/core/CMakeLists.txt
  93. +5 −4 tests/src/core/regression992.cpp
  94. +3 −3 tests/src/core/testcontrastenhancements.cpp
  95. +8 −11 tests/src/core/testqgsapplication.cpp
  96. +1 −1 tests/src/core/testqgscoordinatereferencesystem.cpp
  97. +2 −2 tests/src/core/testqgsexpression.cpp
  98. +3 −3 tests/src/core/testqgsgeometry.cpp
  99. +3 −3 tests/src/core/testqgsmaprenderer.cpp
  100. +16 −8 tests/src/core/testqgspoint.cpp
  101. +4 −4 tests/src/core/testqgsrasterlayer.cpp
  102. +5 −18 tests/src/core/testqgsrenderers.cpp
  103. +3 −3 tests/src/core/testqgsvectorlayer.cpp
  104. BIN tests/testdata/expected_continuous.png
  105. BIN tests/testdata/expected_geometry_bufferCheck.png
  106. BIN tests/testdata/expected_geometry_differenceCheck1.png
  107. BIN tests/testdata/expected_geometry_differenceCheck2.png
  108. BIN tests/testdata/expected_geometry_intersectionCheck1.png
  109. BIN tests/testdata/expected_geometry_simplifyCheck1.png
  110. BIN tests/testdata/expected_geometry_unionCheck1.png
  111. BIN tests/testdata/expected_geometry_unionCheck2.png
  112. BIN tests/testdata/expected_graduated.png
  113. BIN tests/testdata/expected_landsat_875.png
  114. BIN tests/testdata/expected_landsat_basic.png
  115. BIN tests/testdata/expected_raster.png
  116. BIN tests/testdata/expected_raster_pseudo.png
  117. BIN tests/testdata/expected_rgbwcmyk01_YeGeo.jp2.png
  118. BIN tests/testdata/expected_single.png
  119. BIN tests/testdata/expected_uniquevalue.png
  120. +71 −78 tests/testdata/polys_uniquevalue_symbol.qml
235 CHANGELOG

Large diffs are not rendered by default.

@@ -88,7 +88,7 @@ ENDIF (WITH_GLOBE)
SET (PEDANTIC TRUE CACHE BOOL "Determines if we should compile in pedantic mode.")

# whether unit tests should be build
SET (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?")
SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")

# hide this variable because building of python bindings might fail
# if set to other directory than expected
@@ -195,6 +195,8 @@ ENDIF ()
IF (ENABLE_TESTS)
SET( QT_USE_QTTEST TRUE )
ENABLE_TESTING()
# Define "make check" as alias for "make test" - thanks geos :-)
add_custom_target(check COMMAND ctest)
ENDIF (ENABLE_TESTS)


@@ -504,6 +506,8 @@ IF (ENABLE_TESTS)
#the test data. See CMakeLists in test dirs for more info
SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")
ADD_SUBDIRECTORY(tests)
SET (CTEST_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/bin" )
MESSAGE (STATUS "Ctest Binary Directory set to: ${CTEST_BINARY_DIRECTORY}")
ENDIF (ENABLE_TESTS)

IF (APPLE)
@@ -1,3 +1,9 @@
qgis (1.9.90) UNRELEASED; urgency=low

* new development version 1.9.90 after branch of 1.8.0

-- Jürgen E. Fischer <jef@norbit.de> Wed, 16 Nov 2011 09:43:40 +0100

qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
@@ -106,6 +106,11 @@ build-stamp: debian/build/CMakeCache.txt
# Add here commands to compile the package.
$(MAKE) -C debian/build

ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Code to run the package test suite - and ignore the outcome for now
LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build test || true
endif

touch $@

cleantemplates:
@@ -20,5 +20,6 @@ State of Vorarlberg, Austria (11.2011)|http://www.vorarlberg.at/
Kanton Solothurn, Switzerland (4.2011)|http://www.agi.so.ch/

BRONZE
City of Uster, Switzerland (11.2011)|http://gis.uster.ch/
Studio Associato Gfosservices|http://www.gfosservices.com
NEXTGIS|http://nextgis.org
@@ -15,29 +15,77 @@ Change history for the QGIS Project
% These are comments and will not be generated in any output
% -------------------

% This document is in txt2tags format. You can generate html, plain text and
% moinmoin formatted documentation by running txt2tags on this document. See the
% txt2tags home page for more details. Please insert manual line breaks in this
% document as it makes diffing for changes much easier. To do this in vim
% automatically, select a section then issue (gq) command. Please don't
% apply vim formatting to the whole document as it screws up some formatting
% rather apply it selectively to paragraphs where needed.
%This document is in txt2tags format. You can generate html, plain text and
%moinmoin formatted documentation by running txt2tags on this document. See the
%txt2tags home page for more details. Please insert manual line breaks in this
%document as it makes diffing for changes much easier. To do this in vim
%automatically, select a section then issue (gq) command. Please don't
%apply vim formatting to the whole document as it screws up some formatting
%rather apply it selectively to paragraphs where needed.

% To generate the text version of this document:
% txt2tags -t txt -o CHANGELOG CHANGELOG.t2t
% txt2tags -t txt -o ../CHANGELOG changelog.t2t
% To generate the mediawiki version of this document:
% txt2tags -t wiki --no-enum-title -o CHANGELOG.wiki CHANGELOG.t2t
% txt2tags -t wiki --no-enum-title -o CHANGELOG.wiki changelog.t2t
% To generate the html version of this document:
% txt2tags -t html -o CHANGELOG.html CHANGELOG.t2t
% txt2tags -t html -o changelog.html changelog.t2t
% To generate the LaTeX version of this document:
% txt2tags -t tex -o CHANGELOG.tex CHANGELOG.t2t; pdflatex CHANGELOG.tex
% txt2tags -t tex -o CHANGELOG.tex CHANGELOG.t2t; pdflatex changelog.tex

% End of comments
% -------------------

Last Updated: %%date(%A %B %d, %Y)
Last Change : %%mtime(%A %B %d, %Y)

= Whats new in Version 1.7.2 'Wroclaw'? =

This is a bugfix release over version 1.7.1. The following changes
were made.

- Fix Gdaltools error checking for ogr layers
- More Translations in OSM plugin
- Fix for ticket #4283 (composer forgets on/off status of layers)
- Fix to v.generalize for recent GRASS versions
- Fix typos in GRASS command list
- Restore override cursor when about box is shown
- Fix #4319 (Enhance maximum for point displacement tolerance)
- Added Python wrappers for QgsZonalStatistics
- Fix #4331 (Classification dialog issues)
- Fix #4282 (Wrong map zooming when using the "Attribute Table" zoom tool)
- Match proj4string in database
- Fix #4241 (Ensure that we have a valid line in line decoration)
- Fix label id for GetPrint in composer
- Fix #3041 (Make the gdaltools command editable)
- Fix shift in point displacement renderer
- Fix for a crash in projection selection
- Fix #4308 (Interpolation and Terrain core plugins)
- Insert date value in attribute editor
- Fix #4387 (Enable "add direction symbol" only for line layers)
- Fix #2491 (Handle raster layer's transparency band while rendering)
- Allow setting I/O encoding for OGR layers in vector layer properties.
- Fix #4414 (SVG indicators for arrows are not shown)
- Label direction symbol shouldn't depend on "map" vs. "line" orientation.
- Set prompt as default behaviour for unknown CRS
- For EPSG initialize GDAL CRS from authid instead of proj.4 string
- Fix #4439 (Crash when changing style in Layer Properties)
- Fix #4444 (Error when loading Python plugins)
- Fix #4440 (invalid reference to Trac)
- Fix stopRender call in graduated symbol renderer
- Fix #4479 - trigger "new color ramp" always when activated
- Hide query entry in legend context menu for layers with joins
- Fix #4496 (Refresh map list in composer table widget in showEvent)
- OS X build/install updates
- GRASS version support
- Intializing from WKT favourize EPSG instead of PROJ.4
- Add What's this to Help menu (implement #4179)
- fTools: update layers lists after adding new layer to TOC (fix #4318)
- Don't block QGIS main window when running Merge shapefiles tool. Partially addresses #4383
- Fix broken Assign projection functionality in GDALTools and improve handling output file extension
-



= Whats new in Version 1.7.1 'Wroclaw'? =

This is a bugfix release over version 1.7.0. The following changes
@@ -81,7 +129,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
- Reduce top and side margins for attribute table dialog
- Remove the (hopefully) last SVN reference
- More svn version removal
- Added missing color accessor/mutator/member from composerlegenditem header
- Added missing colour accessor/mutator/member from composerlegenditem header
- Get rid of svn version stuff from release branch.
- Other workaround for Qt#5114 (fixes #3250, #3028, #2598)
- Try to make the histogram smoother
@@ -216,7 +264,7 @@ changed so we will just provide a bullet list of key new features here.

- Support for icons of plugins in the plugin manager dialog.
- Removed quickprint plugin - use easyprint plugin rather from plugin repo.
- Removed ogr converter plugin - use 'save as' context menu rather.
- Removed ogr convertor plugin - use 'save as' context menu rather.
-

==Printing==

0 comments on commit 249d889

Please sign in to comment.