Skip to content
Permalink
Browse files

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

  • Loading branch information
etiennesky committed Sep 14, 2012
2 parents 1080d97 + 799795a commit 4fa28d8ce6a9c14b9d2306950218dadfa9bbee8d
Showing with 7,790 additions and 846 deletions.
  1. +3 −1 doc/CONTRIBUTORS
  2. +1 −1 mac/cmake/1qt.cmake.in
  3. +8 −1 python/CMakeLists.txt
  4. +3 −0 python/api/CMakeLists.txt
  5. +4,158 −0 python/api/PyQGIS_1.8.api
  6. +960 −0 python/api/osgeo_gdal-ogr_1.9.1-1.api
  7. BIN python/api/pyqgis_master.pap
  8. +225 −295 python/console.py
  9. +500 −0 python/console_sci.py
  10. +1 −1 python/core/qgsrasterdataprovider.sip
  11. +32 −0 python/core/qgsrasterinterface.sip
  12. +8 −6 python/core/qgsrasterlayer.sip
  13. +3 −3 python/core/qgsrasterpipe.sip
  14. +1 −1 python/core/qgsrasterprojector.sip
  15. +7 −4 python/core/qgsrasterrenderer.sip
  16. +1 −1 python/core/qgsrasterresamplefilter.sip
  17. +3 −0 python/core/qgsrectangle.sip
  18. +37 −0 python/help.py
  19. +2 −0 python/helpConsole/CMakeLists.txt
  20. +67 −0 python/helpConsole/help.htm
  21. +13 −0 python/iconConsole/CMakeLists.txt
  22. BIN python/iconConsole/iconClearConsole.png
  23. BIN python/iconConsole/iconHelpConsole.png
  24. BIN python/iconConsole/iconOpenConsole.png
  25. BIN python/iconConsole/iconRunConsole.png
  26. BIN python/iconConsole/iconSaveConsole.png
  27. BIN python/iconConsole/iconSextanteConsole.png
  28. BIN python/iconConsole/iconTempConsole.png
  29. BIN python/iconConsole/imgHelpDialog.png
  30. +47 −8 src/app/legend/qgsapplegendinterface.cpp
  31. +1 −0 src/app/legend/qgsapplegendinterface.h
  32. +63 −5 src/app/legend/qgslegend.cpp
  33. +3 −0 src/app/qgisapp.cpp
  34. +11 −0 src/app/qgslabelinggui.cpp
  35. +16 −17 src/app/qgsrasterlayerproperties.cpp
  36. +1 −1 src/app/qgsvectorlayerproperties.cpp
  37. +8 −3 src/core/qgsrasterdataprovider.cpp
  38. +1 −0 src/core/qgsrasterdataprovider.h
  39. +41 −11 src/core/qgsrasterprojector.cpp
  40. +19 −0 src/core/qgsrectangle.cpp
  41. +3 −0 src/core/qgsrectangle.h
  42. +27 −1 src/core/raster/qgsmultibandcolorrenderer.cpp
  43. +27 −1 src/core/raster/qgspalettedrasterrenderer.cpp
  44. +33 −11 src/core/raster/qgsrasterfilewriter.cpp
  45. +14 −0 src/core/raster/qgsrasterinterface.cpp
  46. +20 −4 src/core/raster/qgsrasterinterface.h
  47. +6 −0 src/core/raster/qgsrasteriterator.cpp
  48. +3 −1 src/core/raster/qgsrasternuller.cpp
  49. +7 −0 src/core/raster/qgsrasternuller.h
  50. +14 −5 src/core/raster/qgsrasterpipe.cpp
  51. +4 −1 src/core/raster/qgsrasterpipe.h
  52. +2 −0 src/core/raster/qgsrasterrenderer.cpp
  53. +2 −1 src/core/raster/qgsrasterresamplefilter.cpp
  54. +17 −0 src/core/raster/qgssinglebandcolordatarenderer.cpp
  55. +17 −0 src/core/raster/qgssinglebandpseudocolorrenderer.cpp
  56. +129 −83 src/gui/qgscollapsiblegroupbox.cpp
  57. +13 −7 src/gui/qgscollapsiblegroupbox.h
  58. +4 −4 src/gui/qgsrasterlayersaveasdialog.cpp
  59. +2 −0 src/plugins/georeferencer/CMakeLists.txt
  60. BIN src/plugins/georeferencer/icons/default/mActionFullHistogramStretch.png
  61. BIN src/plugins/georeferencer/icons/default/mActionLocalHistogramStretch.png
  62. +5 −5 src/plugins/georeferencer/qgsgcplistmodel.cpp
  63. +1 −1 src/plugins/georeferencer/qgsgcplistwidget.cpp
  64. +66 −18 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  65. +8 −1 src/plugins/georeferencer/qgsgeorefplugingui.h
  66. +27 −4 src/plugins/georeferencer/qgsgeorefpluginguibase.ui
  67. +19 −4 src/plugins/georeferencer/qgsgeoreftransform.cpp
  68. +20 −3 src/plugins/georeferencer/qgsgeoreftransform.h
  69. +4 −4 src/plugins/georeferencer/qgsmapcoordsdialogbase.ui
  70. +91 −0 src/plugins/georeferencer/qgsrasterchangecoords.cpp
  71. +43 −0 src/plugins/georeferencer/qgsrasterchangecoords.h
  72. +5 −1 src/providers/gdal/qgsgdalprovider.cpp
  73. +1 −0 src/providers/wcs/qgswcscapabilities.cpp
  74. +13 −2 src/providers/wcs/qgswcsprovider.cpp
  75. +7 −3 src/providers/wms/qgswmsprovider.cpp
  76. +18 −12 src/ui/qgslabelingguibase.ui
  77. +172 −158 src/ui/qgsrasterlayersaveasdialogbase.ui
  78. +1 −0 tests/src/gui/CMakeLists.txt
  79. +105 −0 tests/src/gui/testprojectionissues.cpp
  80. +339 −134 tests/src/providers/testqgswcspublicservers.cpp
  81. +31 −2 tests/src/providers/testqgswcspublicservers.h
  82. +4 −1 tests/src/python/test_qgscomposermap.py
  83. +1 −1 tests/src/python/test_qgsrasterfilewriter.py
  84. +56 −1 tests/src/python/test_qgsrasterlayer.py
  85. +64 −13 tests/src/python/test_qgsrectangle.py
  86. +21 −0 tests/testdata/checker360by180.asc
  87. +10 −0 tests/testdata/raster/band1_byte_noct_epsg4326.tif.aux.xml
  88. +10 −0 tests/testdata/raster/band1_int16_noct_epsg4326.tif.aux.xml
  89. +30 −0 tests/testdata/raster/band3_float32_noct_epsg4326.tif.aux.xml
  90. +30 −0 tests/testdata/raster/band3_int16_noct_epsg4326.tif.aux.xml
@@ -18,8 +18,8 @@ Cédric Möri
Christian Ferreira
Diego Moreira
Duarte Carreira
Faunalia (http://www.faunalia.it)
Etienne Tourigny
Faunalia (http://www.faunalia.it)
Fernando Pacheco
Florian El Ahdab
Florian Hof
@@ -49,11 +49,13 @@ Paul Ramsey
Richard Duivenvoorde
Richard Kostecky
Robert Szczepanek
Salvatore Larosa
Stefanie Tellex
Steven Mizuno
Tamas Szekeres
Tom Russo
Tyler Mitchell
Vita Cizek
Yann Chemin

Includes Map icons CC-0 from SJJB Management
@@ -121,7 +121,7 @@ FOREACH (PU pylupdate4;pyrcc4)
ENDIF ()
ENDFOREACH (PU)
IF (NOT EXISTS "${QBINDIR}/pyuic4")
EXECUTE_PROCESS (COMMAND sed -E "s, /.*/PyQt4/uic/pyuic.py, ${QDATADIR}/python/PyQt4/uic/pyuic.py," "@PYQT4_BIN_DIR@/pyuic4"
EXECUTE_PROCESS (COMMAND sed -E "s, /.*/PyQt4/uic/pyuic.py, \"\$(/usr/bin/dirname \"\$0\")/../../Resources/python/PyQt4/uic/pyuic.py\"," "@PYQT4_BIN_DIR@/pyuic4"
OUTPUT_VARIABLE PYUIC_CONTENTS)
FILE (WRITE "${QBINDIR}/pyuic4" "${PYUIC_CONTENTS}")
EXECUTE_PROCESS (COMMAND chmod +x "${QBINDIR}/pyuic4")
@@ -1,4 +1,5 @@
ADD_SUBDIRECTORY(plugins)
ADD_SUBDIRECTORY(api)

SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
SET (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
@@ -97,13 +98,16 @@ SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)

ADD_CUSTOM_TARGET(compile_python_files ALL)

ADD_SUBDIRECTORY(iconConsole)
ADD_SUBDIRECTORY(helpConsole)

ADD_CUSTOM_COMMAND(TARGET compile_python_files
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

FOREACH(file __init__.py utils.py console.py)
FOREACH(file __init__.py utils.py console.py console_sci.py help.py)
ADD_CUSTOM_COMMAND(TARGET compile_python_files
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${file} ${QGIS_PYTHON_OUTPUT_DIRECTORY}
@@ -115,3 +119,6 @@ ENDFOREACH(file)
PYTHON_INSTALL(__init__.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(utils.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(console.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(console_sci.py ${QGIS_PYTHON_DIR})
PYTHON_INSTALL(help.py ${QGIS_PYTHON_DIR})

@@ -0,0 +1,3 @@
SET (QGIS_PYTHON_OUTPUT_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis/api)
FILE(GLOB API_FILES *.pap)
INSTALL(FILES ${API_FILES} DESTINATION ${QGIS_PYTHON_OUTPUT_DIR})

Large diffs are not rendered by default.

0 comments on commit 4fa28d8

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