Skip to content
Permalink
Browse files

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

  • Loading branch information
slarosa committed Oct 19, 2012
2 parents ca20be1 + 8ca2236 commit 3fecd44ae52af42a5de8b9cfdf960d0d08025f6e
Showing with 82,282 additions and 10,526 deletions.
  1. +4 −0 CMakeLists.txt
  2. +3 −0 cmake/FindOSGEARTH.cmake
  3. +2 −0 cmake_templates/qgsconfig.h.in
  4. +28 −27 doc/TRANSLATORS
  5. +703 −668 i18n/qgis_de.ts
  6. +1,639 −1,348 i18n/qgis_gl_ES.ts
  7. +5 −3 i18n/qgis_it.ts
  8. +55,238 −0 i18n/qgis_sr_Cyrl.ts
  9. +8,524 −5,474 i18n/{qgis_sr_CS-Latn.ts → qgis_sr_Latn.ts}
  10. BIN images/flags/{sr_CS-Latn.png → sr_Cyrl.png}
  11. BIN images/flags/sr_Latn.png
  12. +485 −484 images/images.qrc
  13. BIN images/themes/default/mActionExpandNewTree.png
  14. +3 −3 python/CMakeLists.txt
  15. +14 −6 python/console.py
  16. +17 −46 python/core/raster/qgsrasterdataprovider.sip
  17. +1 −1 python/core/raster/qgsrasterinterface.sip
  18. +1 −1 python/core/raster/qgsrasteriterator.sip
  19. +7 −7 python/core/raster/qgsrasterlayer.sip
  20. +1 −1 python/gui/raster/qgsmultibandcolorrendererwidget.sip
  21. +17 −0 python/plugins/CMakeLists.txt
  22. +2 −7 python/plugins/db_manager/CMakeLists.txt
  23. +1 −1 python/plugins/db_manager/db_plugins/CMakeLists.txt
  24. +3 −6 python/plugins/db_manager/db_plugins/postgis/CMakeLists.txt
  25. +2 −2 python/plugins/db_manager/db_plugins/postgis/plugins/CMakeLists.txt
  26. +2 −4 python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/CMakeLists.txt
  27. +1 −2 python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/CMakeLists.txt
  28. +1 −8 python/plugins/db_manager/db_plugins/postgis/plugins/versioning/CMakeLists.txt
  29. +3 −5 python/plugins/db_manager/db_plugins/spatialite/CMakeLists.txt
  30. +2 −1 python/plugins/db_manager/icons/CMakeLists.txt
  31. +2 −0 python/plugins/fTools/tools/doGeoprocessing.py
  32. +2 −0 python/plugins/plugin_installer/CMakeLists.txt
  33. +2 −2 python/plugins/sextante/core/QGisLayers.py
  34. +1 −0 python/plugins/sextante/core/Sextante.py
  35. +1 −0 python/plugins/sextante/gdal/warp.py
  36. +27 −2 python/plugins/sextante/grass/GrassAlgorithm.py
  37. +10 −0 python/plugins/sextante/grass/description/r.series.txt
  38. +16 −3 python/plugins/sextante/gui/BatchProcessingDialog.py
  39. +2 −1 python/plugins/sextante/gui/ExtentSelectionPanel.py
  40. +15 −1 python/plugins/sextante/gui/MultipleInputPanel.py
  41. +1 −1 python/plugins/sextante/gui/ParametersPanel.py
  42. +18 −4 python/plugins/sextante/modeler/ModelerParametersDialog.py
  43. +5 −3 python/plugins/sextante/otb/OTBAlgorithm.py
  44. +33 −0 python/plugins/sextante/otb/description/BlockMatching.txt
  45. +1 −1 python/plugins/sextante/otb/description/ColorMapping.txt
  46. +2 −5 python/plugins/sextante/otb/description/ConvertCartoToGeoPoint.txt
  47. +16 −0 python/plugins/sextante/otb/description/DimensionalityReduction.txt
  48. +19 −0 python/plugins/sextante/otb/description/DisparityMapToElevationMap.txt
  49. +1 −0 python/plugins/sextante/otb/description/ImageEnvelope.txt
  50. +11 −0 python/plugins/sextante/otb/description/MeanShiftSmoothing.txt
  51. +1 −0 python/plugins/sextante/otb/description/OpticalCalibration.txt
  52. +2 −5 python/plugins/sextante/otb/description/OrthoRectification.txt
  53. +14 −10 python/plugins/sextante/otb/description/Rasterization.txt
  54. +11 −2 python/plugins/sextante/otb/description/RigidTransformResample.txt
  55. +0 −1 python/plugins/sextante/otb/description/Smoothing.txt
  56. +13 −0 python/plugins/sextante/otb/description/VectorDataReprojection.txt
  57. +2 −0 python/plugins/sextante/otb/description/doc/BandMath.html
  58. +901 −0 python/plugins/sextante/otb/description/doc/BlockMatching.html
  59. +1 −0 python/plugins/sextante/otb/description/doc/BundleToPerfectSensor.html
  60. +7 −0 python/plugins/sextante/otb/description/doc/ColorMapping.html
  61. +1 −0 python/plugins/sextante/otb/description/doc/CompareImages.html
  62. +1 −0 python/plugins/sextante/otb/description/doc/ComputeImagesStatistics.html
  63. +1 −0 python/plugins/sextante/otb/description/doc/ComputePolylineFeatureFromImage.html
  64. +1 −0 python/plugins/sextante/otb/description/doc/ConcatenateImages.html
  65. +1 −0 python/plugins/sextante/otb/description/doc/ConcatenateVectorData.html
  66. +1 −0 python/plugins/sextante/otb/description/doc/ConnectedComponentSegmentation.html
  67. +2 −0 python/plugins/sextante/otb/description/doc/Convert.html
  68. +1 −0 python/plugins/sextante/otb/description/doc/ConvertCartoToGeoPoint.html
  69. +200 −0 python/plugins/sextante/otb/description/doc/CookBook.css
  70. +1 −0 python/plugins/sextante/otb/description/doc/DEMConvert.html
  71. +1 −0 python/plugins/sextante/otb/description/doc/DSFuzzyModelEstimation.html
  72. +488 −0 python/plugins/sextante/otb/description/doc/DimensionalityReduction.html
  73. +613 −0 python/plugins/sextante/otb/description/doc/DisparityMapToElevationMap.html
  74. +1,040 −0 python/plugins/sextante/otb/description/doc/EdisonMeanShiftSegmentation.html
  75. +1,040 −0 python/plugins/sextante/otb/description/doc/EdisonMeanShiftSegmentationVector.html
  76. +1 −0 python/plugins/sextante/otb/description/doc/ExtractROI.html
  77. +1 −0 python/plugins/sextante/otb/description/doc/FineRegistration.html
  78. +4 −0 python/plugins/sextante/otb/description/doc/HyperspectralUnmixing.html
  79. +1 −0 python/plugins/sextante/otb/description/doc/ImageEnvelope.html
  80. +1 −0 python/plugins/sextante/otb/description/doc/ImageSVMClassifier.html
  81. +1 −0 python/plugins/sextante/otb/description/doc/KMeansClassification.html
  82. +1 −0 python/plugins/sextante/otb/description/doc/KmzExport.html
  83. +3 −0 python/plugins/sextante/otb/description/doc/LineSegmentDetection.html
  84. +1 −0 python/plugins/sextante/otb/description/doc/MaximumAutocorrelationFactor.html
  85. +1,040 −0 python/plugins/sextante/otb/description/doc/MeanShiftSegmentation.html
  86. +1,040 −0 python/plugins/sextante/otb/description/doc/MeanShiftSegmentationVector.html
  87. +421 −0 python/plugins/sextante/otb/description/doc/MeanShiftSmoothing.html
  88. +1 −0 python/plugins/sextante/otb/description/doc/MultiResolutionPyramid.html
  89. +1 −0 python/plugins/sextante/otb/description/doc/MultivariateAlterationDetector.html
  90. +2 −0 python/plugins/sextante/otb/description/doc/OSMDownloader.html
  91. +6 −0 python/plugins/sextante/otb/description/doc/OpticalCalibration.html
  92. +3 −0 python/plugins/sextante/otb/description/doc/OrthoRectification.html
  93. +2 −0 python/plugins/sextante/otb/description/doc/Quicklook.html
  94. +1 −0 python/plugins/sextante/otb/description/doc/RadiometricVegetationIndices.html
  95. +1 −0 python/plugins/sextante/otb/description/doc/Rasterization.html
  96. +1 −0 python/plugins/sextante/otb/description/doc/ReadImageInfo.html
  97. +1 −0 python/plugins/sextante/otb/description/doc/Rescale.html
  98. +2 −0 python/plugins/sextante/otb/description/doc/RigidTransformResample.html
  99. +1 −0 python/plugins/sextante/otb/description/doc/SarRadiometricCalibration.html
  100. +1,040 −0 python/plugins/sextante/otb/description/doc/SimpleConnectedComponentsSegmentation.html
  101. +1,040 −0 python/plugins/sextante/otb/description/doc/SimpleConnectedComponentsSegmentationVector.html
  102. +1 −0 python/plugins/sextante/otb/description/doc/Smoothing.html
  103. +1 −0 python/plugins/sextante/otb/description/doc/SplitImage.html
  104. +1 −0 python/plugins/sextante/otb/description/doc/StereoSensorModelToElevationMap.html
  105. +1 −0 python/plugins/sextante/otb/description/doc/Superimpose.html
  106. +3 −0 python/plugins/sextante/otb/description/doc/TrainSVMImagesClassifier.html
  107. +3 −0 python/plugins/sextante/otb/description/doc/ValidateSVMImagesClassifier.html
  108. +1 −0 python/plugins/sextante/otb/description/doc/VectorDataDSValidation.html
  109. +1 −0 python/plugins/sextante/otb/description/doc/VectorDataExtractROIApplication.html
  110. +489 −0 python/plugins/sextante/otb/description/doc/VectorDataReprojection.html
  111. +1 −0 python/plugins/sextante/otb/description/doc/VectorDataSetField.html
  112. +1 −0 python/plugins/sextante/otb/description/doc/VectorDataTransform.html
  113. +1 −0 python/plugins/sextante/otb/description/doc/VertexComponentAnalysis.html
  114. +1,040 −0 python/plugins/sextante/otb/description/doc/WatershedSegmentation.html
  115. +1,040 −0 python/plugins/sextante/otb/description/doc/WatershedSegmentationVector.html
  116. +1 −1 python/plugins/sextanteexampleprovider/__init__.py
  117. +2 −0 scripts/tsstat.pl
  118. +2 −2 src/app/CMakeLists.txt
  119. +15 −12 src/app/qgisapp.cpp
  120. +19 −1 src/app/qgsidentifyresults.cpp
  121. +5 −0 src/app/qgsidentifyresults.h
  122. +40 −34 src/app/qgsmaptoolidentify.cpp
  123. +53 −25 src/app/{qgsembedlayerdialog.cpp → qgsprojectlayergroupdialog.cpp}
  124. +16 −13 src/app/{qgsembedlayerdialog.h → qgsprojectlayergroupdialog.h}
  125. +249 −8 src/app/qgsprojectproperties.cpp
  126. +12 −0 src/app/qgsprojectproperties.h
  127. +11 −3 src/app/qgsrasterlayerproperties.cpp
  128. +26 −13 src/app/qgsvectorlayerproperties.cpp
  129. +2 −0 src/app/qgsvectorlayerproperties.h
  130. +3 −3 src/core/qgis.h
  131. +2 −0 src/core/qgscoordinatereferencesystem.cpp
  132. +935 −24 src/core/qgsgeometry.cpp
  133. +30 −0 src/core/qgsgeometry.h
  134. +4 −0 src/core/qgsmaprenderer.cpp
  135. +46 −0 src/core/qgsvectorlayer.cpp
  136. +13 −0 src/core/qgsvectorlayer.h
  137. +0 −8 src/core/raster/qgspalettedrasterrenderer.cpp
  138. +167 −83 src/core/raster/qgsrasterblock.cpp
  139. +26 −7 src/core/raster/qgsrasterblock.h
  140. +226 −311 src/core/raster/qgsrasterdataprovider.cpp
  141. +37 −57 src/core/raster/qgsrasterdataprovider.h
  142. +5 −0 src/core/raster/qgsrasterdrawer.cpp
  143. +8 −8 src/core/raster/qgsrasterfilewriter.cpp
  144. +1 −1 src/core/raster/qgsrasterinterface.h
  145. +4 −5 src/core/raster/qgsrasteriterator.cpp
  146. +0 −1 src/core/raster/qgsrasteriterator.h
  147. +4 −2 src/core/raster/qgsrasterlayer.cpp
  148. +4 −4 src/core/raster/qgsrasterlayer.h
  149. +15 −13 src/core/raster/qgsrasterprojector.cpp
  150. +1 −1 src/core/raster/qgsrasterrenderer.cpp
  151. +0 −3 src/core/raster/qgsrasterrenderer.h
  152. +10 −0 src/core/symbology-ng/qgscptcityarchive.cpp
  153. +4 −0 src/gui/qgscollapsiblegroupbox.cpp
  154. +4 −3 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  155. +1 −1 src/gui/raster/qgsmultibandcolorrendererwidget.h
  156. +1 −0 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  157. +1 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  158. +4 −0 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  159. +20 −0 src/mapserver/qgis_map_serv.cpp
  160. +3 −7 src/mapserver/qgsconfigparser.h
  161. +33 −2 src/mapserver/qgspostrequesthandler.cpp
  162. +348 −85 src/mapserver/qgsprojectparser.cpp
  163. +13 −7 src/mapserver/qgsprojectparser.h
  164. +463 −241 src/mapserver/qgswfsserver.cpp
  165. +14 −12 src/mapserver/qgswfsserver.h
  166. +47 −38 src/mapserver/qgswmsserver.cpp
  167. +1 −1 src/mapserver/qgswmsserver.h
  168. +19 −5 src/plugins/globe/CMakeLists.txt
  169. +60 −12 src/plugins/globe/globe_plugin.cpp
  170. +19 −5 src/plugins/globe/globe_plugin.h
  171. +4 −5 src/plugins/globe/globe_plugin_dialog.cpp
  172. BIN src/plugins/globe/images/gui/zoom-out.png
  173. +80 −94 src/providers/gdal/qgsgdalprovider.cpp
  174. +1 −27 src/providers/gdal/qgsgdalprovider.h
  175. +3 −2 src/providers/grass/qgis.g.info.c
  176. +39 −37 src/providers/grass/qgsgrassrasterprovider.cpp
  177. +4 −25 src/providers/grass/qgsgrassrasterprovider.h
  178. +3 −0 src/providers/postgres/qgscolumntypethread.cpp
  179. +5 −0 src/providers/postgres/qgspgsourceselect.cpp
  180. +75 −38 src/providers/postgres/qgspostgresconn.cpp
  181. +6 −0 src/providers/postgres/qgspostgresprovider.cpp
  182. +16 −7 src/providers/spatialite/qgsspatialiteprovider.cpp
  183. +63 −54 src/providers/wcs/qgswcsprovider.cpp
  184. +1 −4 src/providers/wcs/qgswcsprovider.h
  185. +16 −749 src/providers/wfs/qgswfsprovider.cpp
  186. +0 −31 src/providers/wfs/qgswfsprovider.h
  187. +75 −54 src/providers/wms/qgswmsprovider.cpp
  188. +2 −31 src/providers/wms/qgswmsprovider.h
  189. +0 −3 src/python/qgspythonutilsimpl.cpp
  190. +76 −8 src/ui/qgsidentifyresultsbase.ui
  191. +3 −3 src/ui/qgspgnewconnectionbase.ui
  192. +2 −2 src/ui/{qgsembedlayerdialogbase.ui → qgsprojectlayergroupdialogbase.ui}
  193. +270 −133 src/ui/qgsprojectpropertiesbase.ui
  194. +1 −1 tests/src/core/testqgsatlascomposition.cpp
  195. +2 −0 tests/src/core/testqgsdataitem.cpp
  196. +3 −3 tests/src/python/CMakeLists.txt
  197. +14 −7 tests/src/python/test_qgsrasterlayer.py
  198. +30 −0 tests/testdata/raster/band3_byte_noct_epsg4326.tif.aux.xml
@@ -95,6 +95,10 @@ SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be buil
IF (WITH_GLOBE)
SET(QT_USE_QTOPENGL 1)
FIND_PACKAGE(OSGEARTH REQUIRED)
IF (OSGEARTHQT_LIBRARY)
# following variable is used in qgsconfig.h
SET(HAVE_OSGEARTHQT TRUE)
ENDIF (OSGEARTHQT_LIBRARY)
ENDIF (WITH_GLOBE)

# Compile flag. Make it possible to turn it off.
@@ -92,6 +92,9 @@ FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )

FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY osgEarthQt )
FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY_DEBUG osgEarthQtd )


SET( OSGEARTH_FOUND "NO" )
IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )
@@ -38,5 +38,7 @@

#cmakedefine HAVE_TOUCH

#cmakedefine HAVE_OSGEARTHQT

#endif

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -652,7 +652,7 @@ sono stati ridotti a %2 dopo la semplificazione</translation>
</message>
<message>
<source>Random selection within subsets</source>
<translation>Selezione causale con un sottoinsieme</translation>
<translation>Selezione casuale con un sottoinsieme</translation>
</message>
<message>
<source>Please specify input vector layer</source>
@@ -3252,7 +3252,8 @@ quando si preme sul bottone Aiuto del dialogo degli strumenti.</translation>
<message>
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="68"/>
<source>cubic</source>
<translation type="unfinished"></translation>
<translatorcomment>cubico</translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="73"/>
@@ -4919,7 +4920,8 @@ Ctl (Cmd) increments by 15 deg.</source>
<message>
<location filename="../src/ui/qgisapp.ui" line="1091"/>
<source>Layer Labeling Options</source>
<translation type="unfinished"></translation>
<translatorcomment>Opzioni per l&apos;etichettatura del layer</translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../src/ui/qgisapp.ui" line="1100"/>

Large diffs are not rendered by default.

0 comments on commit 3fecd44

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