Skip to content
Permalink
Browse files

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

  • Loading branch information
etiennesky committed Sep 6, 2012
2 parents 5b49c9e + e690048 commit 0d189ffaea943796e98d6255b515badd6e02f2ff
Showing with 6,970 additions and 1,998 deletions.
  1. +1 −0 .gitignore
  2. +6 −4 CMakeLists.txt
  3. +1 −0 doc/CONTRIBUTORS
  4. +3 −0 images/images.qrc
  5. BIN images/themes/default/histogram.png
  6. +786 −0 images/themes/default/histogram.svg
  7. BIN images/themes/default/pie-chart.png
  8. +755 −0 images/themes/default/pie-chart.svg
  9. BIN images/themes/default/text.png
  10. +766 −0 images/themes/default/text.svg
  11. +1 −0 python/core/core.sip
  12. +5 −0 python/core/qgscomposition.sip
  13. +9 −0 python/core/qgsrasterlayer.sip
  14. +43 −0 python/core/qgsrenderchecker.sip
  15. +1 −1 src/analysis/network/qgslinevectorlayerdirector.cpp
  16. +2 −0 src/app/CMakeLists.txt
  17. +6 −10 src/app/composer/qgscomposer.cpp
  18. +1 −1 src/app/composer/qgscomposerhtmlwidget.cpp
  19. +1 −1 src/app/qgisapp.cpp
  20. +590 −0 src/app/qgsdiagramproperties.cpp
  21. +58 −0 src/app/qgsdiagramproperties.h
  22. +2 −0 src/app/qgslabelinggui.cpp
  23. +139 −82 src/app/qgsoptions.cpp
  24. +20 −6 src/app/qgsoptions.h
  25. +15 −385 src/app/qgsvectorlayerproperties.cpp
  26. +4 −14 src/app/qgsvectorlayerproperties.h
  27. +20 −2 src/core/CMakeLists.txt
  28. +2 −2 src/core/composer/qgscomposermultiframe.cpp
  29. +67 −7 src/core/composer/qgscomposition.cpp
  30. +24 −0 src/core/composer/qgscomposition.h
  31. +71 −0 src/core/diagram/qgsdiagram.cpp
  32. +79 −0 src/core/diagram/qgsdiagram.h
  33. +167 −0 src/core/diagram/qgshistogramdiagram.cpp
  34. +52 −0 src/core/diagram/qgshistogramdiagram.h
  35. +153 −0 src/core/diagram/qgspiediagram.cpp
  36. +50 −0 src/core/diagram/qgspiediagram.h
  37. +69 −99 src/core/{qgsdiagram.cpp → diagram/qgstextdiagram.cpp}
  38. +11 −33 src/core/{qgsdiagram.h → diagram/qgstextdiagram.h}
  39. +2 −2 src/core/pal/layer.cpp
  40. +4 −1 src/core/pal/layer.h
  41. +2 −2 src/core/pal/pal.cpp
  42. +2 −1 src/core/pal/pal.h
  43. +20 −1 src/core/pal/problem.cpp
  44. +2 −0 src/core/pal/problem.h
  45. +128 −30 src/core/qgsdiagramrendererv2.cpp
  46. +275 −247 src/core/qgsdiagramrendererv2.h
  47. +23 −1 src/core/qgsdistancearea.cpp
  48. +2 −2 src/core/qgsexpression.cpp
  49. +7 −2 src/core/qgspallabeling.cpp
  50. +1 −0 src/core/qgspallabeling.h
  51. +3 −2 src/core/qgsrasterdataprovider.h
  52. 0 {tests → }/src/core/qgsrenderchecker.cpp
  53. +1 −1 {tests → }/src/core/qgsrenderchecker.h
  54. +8 −1 src/core/qgsvectordataprovider.cpp
  55. +236 −0 src/core/raster/qgsrasterchecker.cpp
  56. +71 −0 src/core/raster/qgsrasterchecker.h
  57. +22 −2 src/core/raster/qgsrasterlayer.cpp
  58. +7 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  59. +6 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  60. +7 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  61. +7 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  62. +16 −3 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  63. +3 −1 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  64. +6 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  65. +7 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  66. +4 −0 src/core/symbology-ng/qgssymbollayerv2.h
  67. +34 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  68. +3 −0 src/core/symbology-ng/qgssymbollayerv2utils.h
  69. +23 −1 src/core/symbology-ng/qgssymbolv2.cpp
  70. +9 −0 src/core/symbology-ng/qgssymbolv2.h
  71. +14 −4 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  72. +1 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  73. +11 −1 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  74. +1 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  75. +72 −26 src/gui/symbology-ng/qgsrendererv2widget.cpp
  76. +14 −7 src/gui/symbology-ng/qgsrendererv2widget.h
  77. +7 −1 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  78. +1 −0 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  79. +8 −72 src/mapserver/qgsprojectparser.cpp
  80. +1 −1 src/plugins/plugin_template/README
  81. +135 −5 src/providers/grass/qgis.g.info.c
  82. +17 −7 src/providers/grass/qgsgrass.cpp
  83. +20 −6 src/providers/grass/qgsgrass.h
  84. +55 −1 src/providers/grass/qgsgrassrasterprovider.cpp
  85. +5 −0 src/providers/grass/qgsgrassrasterprovider.h
  86. +1,026 −0 src/ui/qgsdiagrampropertiesbase.ui
  87. +88 −16 src/ui/qgsengineconfigdialog.ui
  88. +15 −8 src/ui/qgslabelingguibase.ui
  89. +176 −159 src/ui/qgsoptionsbase.ui
  90. +13 −524 src/ui/qgsvectorlayerpropertiesbase.ui
  91. +1 −1 tests/src/analysis/CMakeLists.txt
  92. +2 −1 tests/src/core/CMakeLists.txt
  93. +11 −0 tests/src/core/testqgsexpression.cpp
  94. +184 −0 tests/src/core/testqgsrasterfilewriter.cpp
  95. +56 −3 tests/src/core/testqgsrasterlayer.cpp
  96. +1 −1 tests/src/gui/CMakeLists.txt
  97. +10 −204 tests/src/providers/testqgswcsprovider.cpp
  98. +65 −2 tests/src/python/test_qgsrasterlayer.py
  99. BIN tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency.png
  100. +29 −0 tests/testdata/control_images/expected_raster_transparency/expected_raster_transparency.png.aux.xml
  101. +10 −0 tests/testdata/raster/band1_float32_noct_epsg4326.tif.aux.xml
@@ -43,3 +43,4 @@ scripts/RelWithDebInfo
/CMakeLists.txt.user
qgis-test.ctest
i18n/*.qm
.project
@@ -559,6 +559,12 @@ ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
#############################################################
# process subdirs

#create a variable to specify where our test data is
#so that unit tests can use TEST_DATA_DIR to locate
#the test data. See CMakeLists in test dirs for more info
#TEST_DATA_DIR is also used by QgsRenderChecker currently in core
SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")

ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(images)
@@ -570,10 +576,6 @@ IF (WITH_BINDINGS)
ENDIF (WITH_BINDINGS)

IF (ENABLE_TESTS)
#create a variable to specify where our test data is
#so that unit tests can use TEST_DATA_DIR to locate
#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}")
@@ -39,6 +39,7 @@ Mark Baas
Markus Neteler
Mathias Walker
Matt Amos
Matthias Kuhn
Maurizio Napolitano
Mayeul Kauffmann
Milena Nowotarska
@@ -462,6 +462,9 @@
<file>flags/en_US.png</file>
<file>flags/da_DK.png</file>
<file>flags/et_EE.png</file>
<file>themes/default/text.png</file>
<file>themes/default/histogram.png</file>
<file>themes/default/pie-chart.png</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
Binary file not shown.

0 comments on commit 0d189ff

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