Skip to content
Permalink
Browse files

merge from trunk r11500:11550

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11891 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent d282d2a commit f2896613aa3c1e9aa0846e53b0b85738fdac2aac
Showing with 82,301 additions and 44,154 deletions.
  1. +3 −0 CMakeLists.txt
  2. +3 −2 debian/changelog
  3. +1 −1 debian/control
  4. +1 −0 debian/libqgis1.3.0.install
  5. +1,852 −1,472 i18n/qgis_ar.ts
  6. +1,878 −1,457 i18n/qgis_cs_CZ.ts
  7. +1,994 −1,543 i18n/qgis_de.ts
  8. +1,853 −1,465 i18n/qgis_el_GR.ts
  9. +2,971 −1,926 i18n/qgis_es.ts
  10. +2,115 −1,632 i18n/qgis_fr.ts
  11. +1,851 −1,463 i18n/qgis_he.ts
  12. +3,057 −2,083 i18n/qgis_hu.ts
  13. +1,882 −1,482 i18n/qgis_id.ts
  14. +2,097 −1,614 i18n/qgis_it.ts
  15. +1,886 −1,482 i18n/qgis_ja.ts
  16. +1,879 −1,459 i18n/qgis_ka_GE.ts
  17. +1,883 −1,475 i18n/qgis_lo.ts
  18. +1,862 −1,474 i18n/qgis_lt.ts
  19. +2,082 −1,622 i18n/qgis_lv.ts
  20. +1,881 −1,473 i18n/qgis_mn.ts
  21. +3,001 −2,307 i18n/qgis_nl.ts
  22. +2,103 −2,183 i18n/qgis_pl_PL.ts
  23. +1,888 −1,464 i18n/qgis_pt_BR.ts
  24. +1,886 −1,482 i18n/qgis_ro.ts
  25. +2,102 −1,626 i18n/qgis_ru.ts
  26. +1,885 −1,461 i18n/qgis_sk.ts
  27. +1,885 −1,473 i18n/qgis_sq_AL.ts
  28. +2,028 −1,568 i18n/qgis_sv.ts
  29. +1,880 −1,476 i18n/qgis_th.ts
  30. +1,890 −1,470 i18n/qgis_tr.ts
  31. +22,596 −0 i18n/qgis_uk.ts
  32. +667 −303 i18n/qgis_vi.ts
  33. +447 −154 i18n/qgis_xh.ts
  34. +476 −160 i18n/qgis_zh_CN.ts
  35. +1,289 −450 i18n/qgis_zh_TW.ts
  36. +550 −194 mac/xcode/Qgis.xcodeproj/project.pbxproj
  37. +2 −1 mac/xcode/qgis_settings.xcconfig
  38. +1 −2 python/configure.py.in
  39. +8 −0 python/core/qgsproject.sip
  40. +3 −0 python/core/qgsrect.sip
  41. +1 −1 python/plugins/osm/OsmDownloadDlg.py
  42. +1 −2 python/plugins/osm/OsmLoadDlg.py
  43. +1 −1 src/CMakeLists.txt
  44. +104 −0 src/analysis/CMakeLists.txt
  45. 0 src/{plugins → analysis}/interpolation/DualEdgeTriangulation.cc
  46. +1 −1 src/{plugins → analysis}/interpolation/DualEdgeTriangulation.h
  47. 0 src/{plugins → analysis}/interpolation/HalfEdge.cc
  48. +1 −1 src/{plugins → analysis}/interpolation/HalfEdge.h
  49. 0 src/{plugins → analysis}/interpolation/LinTriangleInterpolator.cc
  50. +1 −1 src/{plugins → analysis}/interpolation/LinTriangleInterpolator.h
  51. 0 src/{plugins → analysis}/interpolation/Line3D.cc
  52. +1 −1 src/{plugins → analysis}/interpolation/Line3D.h
  53. 0 src/{plugins → analysis}/interpolation/MathUtils.cc
  54. +28 −28 src/{plugins → analysis}/interpolation/MathUtils.h
  55. 0 src/{plugins → analysis}/interpolation/Node.cc
  56. +1 −1 src/{plugins → analysis}/interpolation/Node.h
  57. 0 src/{plugins → analysis}/interpolation/Point3D.cc
  58. +1 −1 src/{plugins → analysis}/interpolation/Point3D.h
  59. 0 src/{plugins → analysis}/interpolation/TriangleInterpolator.cc
  60. +1 −1 src/{plugins → analysis}/interpolation/TriangleInterpolator.h
  61. 0 src/{plugins → analysis}/interpolation/Triangulation.cc
  62. +1 −1 src/{plugins → analysis}/interpolation/Triangulation.h
  63. 0 src/{plugins → analysis}/interpolation/Vector3D.cc
  64. +4 −4 src/{plugins → analysis}/interpolation/Vector3D.h
  65. 0 src/{plugins → analysis}/interpolation/qgsgridfilewriter.cpp
  66. +1 −1 src/{plugins → analysis}/interpolation/qgsgridfilewriter.h
  67. 0 src/{plugins → analysis}/interpolation/qgsidwinterpolator.cpp
  68. +1 −1 src/{plugins → analysis}/interpolation/qgsidwinterpolator.h
  69. 0 src/{plugins → analysis}/interpolation/qgsinterpolator.cpp
  70. +2 −2 src/{plugins → analysis}/interpolation/qgsinterpolator.h
  71. 0 src/{plugins → analysis}/interpolation/qgstininterpolator.cpp
  72. +1 −1 src/{plugins → analysis}/interpolation/qgstininterpolator.h
  73. +5 −5 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsaspectfilter.cpp
  74. +1 −1 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsaspectfilter.h
  75. 0 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsderivativefilter.cpp
  76. 0 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsderivativefilter.h
  77. 0 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsninecellfilter.cpp
  78. +1 −1 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsninecellfilter.h
  79. 0 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsruggednessfilter.cpp
  80. +1 −1 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsruggednessfilter.h
  81. 0 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsslopefilter.cpp
  82. +1 −1 src/{plugins/raster_terrain_analysis → analysis/raster}/qgsslopefilter.h
  83. 0 src/{plugins/raster_terrain_analysis → analysis/raster}/qgstotalcurvaturefilter.cpp
  84. +1 −1 src/{plugins/raster_terrain_analysis → analysis/raster}/qgstotalcurvaturefilter.h
  85. +609 −0 src/analysis/vector/qgsgeometryanalyzer.cpp
  86. +117 −0 src/analysis/vector/qgsgeometryanalyzer.h
  87. +1 −1 src/app/main.cpp
  88. +86 −29 src/app/qgisapp.cpp
  89. +7 −1 src/app/qgisapp.h
  90. +2 −0 src/app/qgsabout.cpp
  91. +396 −207 src/app/qgsidentifyresults.cpp
  92. +41 −59 src/app/qgsidentifyresults.h
  93. +142 −318 src/app/qgsmaptoolidentify.cpp
  94. +13 −48 src/app/qgsmaptoolidentify.h
  95. +9 −1 src/app/qgsoptions.cpp
  96. +65 −0 src/app/qgsprojectproperties.cpp
  97. +0 −1 src/core/pal/pal.cpp
  98. +7 −4 src/core/qgscoordinatereferencesystem.cpp
  99. +1 −1 src/core/qgsdistancearea.cpp
  100. +2 −27 src/core/qgsmaplayer.cpp
  101. +151 −0 src/core/qgsproject.cpp
  102. +9 −0 src/core/qgsproject.h
  103. +5 −0 src/core/qgsrectangle.cpp
  104. +3 −0 src/core/qgsrectangle.h
  105. +1 −1 src/core/qgsscalecalculator.cpp
  106. +14 −6 src/core/qgsvectorlayer.cpp
  107. +7 −1 src/core/qgsvectorlayer.h
  108. +9 −8 src/core/raster/qgsrasterlayer.cpp
  109. +1 −1 src/gui/qgsgenericprojectionselector.h
  110. +3 −1 src/helpviewer/qgshelpviewerbase.ui
  111. +3 −1 src/plugins/coordinate_capture/coordinatecaptureguibase.ui
  112. +3 −1 src/plugins/copyright_label/pluginguibase.ui
  113. +3 −1 src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
  114. +3 −1 src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui
  115. +1 −1 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h
  116. +1 −1 src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
  117. +3 −1 src/plugins/gps_importer/qgsgpspluginguibase.ui
  118. +4 −6 src/plugins/grass/qgsgrassmodel.cpp
  119. +3 −18 src/plugins/grass/qgsgrassmodule.cpp
  120. +12 −19 src/plugins/grass/qgsgrassnewmapset.cpp
  121. +24 −22 src/plugins/grass/qgsgrassplugin.cpp
  122. +7 −7 src/plugins/grass/qgsgrassselect.cpp
  123. +1 −12 src/plugins/grass/qgsgrasstools.cpp
  124. +2 −14 src/plugins/interpolation/CMakeLists.txt
  125. +4 −4 src/plugins/interpolation/qgsinterpolationdialog.cpp
  126. +3 −1 src/plugins/north_arrow/pluginguibase.ui
  127. +3 −1 src/plugins/ogr_converter/ogrconverterguibase.ui
  128. +2 −6 src/plugins/raster_terrain_analysis/CMakeLists.txt
  129. +3 −1 src/plugins/scale_bar/pluginguibase.ui
  130. +0 −1 src/providers/grass/provider.cpp
  131. +78 −90 src/providers/grass/qgsgrass.cpp
  132. +14 −15 src/providers/grass/qgsgrass.h
  133. +111 −94 src/providers/grass/qgsgrassprovider.cpp
  134. +50 −7 src/ui/qgsoptionsbase.ui
  135. +184 −151 src/ui/qgsprojectpropertiesbase.ui
  136. +3 −1 src/ui/qgsserversourceselectbase.ui
  137. +1 −0 tests/src/CMakeLists.txt
  138. +111 −0 tests/src/analysis/CMakeLists.txt
  139. +139 −0 tests/src/analysis/testqgsvectoranalyzer.cpp
  140. +44 −4 tests/src/core/testqgsgeometry.cpp
  141. BIN tests/testdata/expected_geometry_simplifyCheck1.png
@@ -282,16 +282,19 @@ IF (WIN32)
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
ENDIF (MSVC)
ELSE (WIN32)
# other compilers don't use that MSVC construct
ADD_DEFINITIONS(-DCORE_EXPORT=)
ADD_DEFINITIONS(-DGUI_EXPORT=)
ADD_DEFINITIONS(-DPYTHON_EXPORT=)
ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
ENDIF (WIN32)

#############################################################
@@ -1,9 +1,10 @@
qgis (1.3.0) UNRELEASED; urgency=low

* new development version after 1.2 branch
* add raster terrain analysis plugin
* add analysis library and raster terrain analysis plugin
* alternativly depend on libgdal1-1.6.0-grass

-- Jürgen E. Fischer <jef@norbit.de> Wed, 26 Aug 2009 21:10:10 +0200
-- Jürgen E. Fischer <jef@norbit.de> Sat, 05 Sep 2009 17:45:21 +0200

qgis (1.2.0) UNRELEASED; urgency=low

@@ -70,7 +70,7 @@ Description: Quantum GIS - development files

Package: qgis-plugin-grass
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass | libgdal1-1.6.0-grass
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -1,2 +1,3 @@
usr/lib/libqgis_core.so.*.*.*
usr/lib/libqgis_gui.so.*.*.*
usr/lib/libqgis_analysis.so.*.*.*

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit f289661

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