Skip to content
Permalink
Browse files

merge from trunk r11200:11250

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11884 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent bbaf61d commit 20b599b7b8fdbd07c5ad46bc6aa3351ef6cfc698
Showing with 80,962 additions and 30,318 deletions.
  1. +4 −1 CMakeLists.txt
  2. +27 −15 cmake/FindGSL.cmake
  3. +1 −0 debian/qgis.install
  4. +1,969 −1,141 i18n/qgis_ar.ts
  5. +2,042 −1,066 i18n/qgis_cs_CZ.ts
  6. +2,022 −1,205 i18n/qgis_de.ts
  7. +1,965 −1,148 i18n/qgis_el_GR.ts
  8. +2,068 −1,085 i18n/qgis_es.ts
  9. +2,115 −1,045 i18n/qgis_fr.ts
  10. +1,968 −1,151 i18n/qgis_he.ts
  11. +2,050 −1,083 i18n/qgis_hu.ts
  12. +1,972 −1,144 i18n/qgis_id.ts
  13. +2,042 −1,071 i18n/qgis_it.ts
  14. +2,000 −1,145 i18n/qgis_ja.ts
  15. +2,037 −1,066 i18n/qgis_ka_GE.ts
  16. +2,004 −1,120 i18n/qgis_lo.ts
  17. +1,966 −1,145 i18n/qgis_lt.ts
  18. +2,046 −1,085 i18n/qgis_lv.ts
  19. +2,004 −1,120 i18n/qgis_mn.ts
  20. +2,092 −1,061 i18n/qgis_nl.ts
  21. +2,065 −1,081 i18n/qgis_pl_PL.ts
  22. +2,043 −1,068 i18n/qgis_pt_BR.ts
  23. +2,008 −1,121 i18n/qgis_ro.ts
  24. +2,050 −1,086 i18n/qgis_ru.ts
  25. +2,045 −1,069 i18n/qgis_sk.ts
  26. +2,005 −1,117 i18n/qgis_sq_AL.ts
  27. +2,045 −1,070 i18n/qgis_sv.ts
  28. +2,003 −1,124 i18n/qgis_th.ts
  29. +2,034 −1,102 i18n/qgis_tr.ts
  30. +989 −184 i18n/qgis_vi.ts
  31. +902 −251 i18n/qgis_xh.ts
  32. +929 −215 i18n/qgis_zh_CN.ts
  33. +963 −193 i18n/qgis_zh_TW.ts
  34. BIN images/splash/splash.png
  35. BIN images/splash/splash.xcf.bz2
  36. +432 −3 mac/xcode/Qgis.xcodeproj/project.pbxproj
  37. +0 −12 python/configure.py.in
  38. +1 −1 python/plugins/CMakeLists.txt
  39. +12 −0 python/plugins/osm/CMakeLists.txt
  40. +2,589 −0 python/plugins/osm/DatabaseManager.py
  41. +798 −0 python/plugins/osm/DlgAddRelation.py
  42. +140 −0 python/plugins/osm/DlgAddRelation_ui.py
  43. +491 −0 python/plugins/osm/DlgDownloadOSM.py
  44. +162 −0 python/plugins/osm/DlgDownloadOSM_ui.py
  45. +252 −0 python/plugins/osm/DlgImport.py
  46. +62 −0 python/plugins/osm/DlgImport_ui.py
  47. +320 −0 python/plugins/osm/DlgLoadOSM.py
  48. +86 −0 python/plugins/osm/DlgLoadOSM_ui.py
  49. +314 −0 python/plugins/osm/DlgSaveOSM.py
  50. +99 −0 python/plugins/osm/DlgSaveOSM_ui.py
  51. +1,548 −0 python/plugins/osm/DlgUploadOSM.py
  52. +118 −0 python/plugins/osm/DlgUploadOSM_ui.py
  53. +441 −0 python/plugins/osm/DockUndoRedo.py
  54. +59 −0 python/plugins/osm/DockUndoRedo_ui.py
  55. +1,243 −0 python/plugins/osm/DockWidget.py
  56. +290 −0 python/plugins/osm/DockWidget_ui.py
  57. +37 −0 python/plugins/osm/Makefile
  58. +65 −0 python/plugins/osm/__init__.py
  59. +4,016 −0 python/plugins/osm/images/osmIconsMaster.svg
  60. BIN python/plugins/osm/images/osm_createLine.png
  61. BIN python/plugins/osm/images/osm_createPoint.png
  62. BIN python/plugins/osm/images/osm_createPolygon.png
  63. BIN python/plugins/osm/images/osm_createRelation.png
  64. BIN python/plugins/osm/images/osm_download.png
  65. BIN python/plugins/osm/images/osm_featureManager.png
  66. BIN python/plugins/osm/images/osm_identify.png
  67. BIN python/plugins/osm/images/osm_import.png
  68. BIN python/plugins/osm/images/osm_load.png
  69. BIN python/plugins/osm/images/osm_move.png
  70. BIN python/plugins/osm/images/osm_questionMark.png
  71. BIN python/plugins/osm/images/osm_redo.png
  72. BIN python/plugins/osm/images/osm_remove.png
  73. BIN python/plugins/osm/images/osm_save.png
  74. BIN python/plugins/osm/images/osm_star.png
  75. BIN python/plugins/osm/images/osm_undo.png
  76. BIN python/plugins/osm/images/osm_upload.png
  77. +337 −0 python/plugins/osm/map_tools/CreateLineMapTool.py
  78. +265 −0 python/plugins/osm/map_tools/CreatePointMapTool.py
  79. +336 −0 python/plugins/osm/map_tools/CreatePolygonMapTool.py
  80. +292 −0 python/plugins/osm/map_tools/IdentifyMapTool.py
  81. +768 −0 python/plugins/osm/map_tools/MoveMapTool.py
  82. 0 src/plugins/grass/qgsgrassshellbase.ui → python/plugins/osm/map_tools/__init__.py
  83. +333 −0 python/plugins/osm/osm_plugin.py
  84. +1,693 −0 python/plugins/osm/resources.py
  85. +53 −0 python/plugins/osm/resources.qrc
  86. +34 −0 python/plugins/osm/styles/big_scale.style
  87. +45 −0 python/plugins/osm/styles/medium_scale.style
  88. +48 −0 python/plugins/osm/styles/small_scale.style
  89. +289 −0 python/plugins/osm/ui_files/DlgAddRelation.ui
  90. +375 −0 python/plugins/osm/ui_files/DlgDownloadOSM.ui
  91. +122 −0 python/plugins/osm/ui_files/DlgImport.ui
  92. +163 −0 python/plugins/osm/ui_files/DlgLoadOSM.ui
  93. +226 −0 python/plugins/osm/ui_files/DlgSaveOSM.ui
  94. +229 −0 python/plugins/osm/ui_files/DlgUploadOSM.ui
  95. +100 −0 python/plugins/osm/ui_files/DockUndoRedo.ui
  96. +731 −0 python/plugins/osm/ui_files/DockWidget.ui
  97. +16 −4 scripts/update_ts_files.sh
  98. +5 −0 src/app/CMakeLists.txt
  99. +1 −1 src/app/composer/qgscomposer.cpp
  100. +127 −62 src/app/composer/qgscompositionwidget.cpp
  101. +4 −0 src/app/composer/qgscompositionwidget.h
  102. +152 −56 src/app/legend/qgslegend.cpp
  103. +27 −1 src/app/legend/qgslegend.h
  104. +6 −0 src/app/legend/qgslegendlayerfile.cpp
  105. +2 −2 src/app/ogr/qgsopenvectorlayerdialog.cpp
  106. +2 −2 src/app/qgisapp.cpp
  107. +9 −9 src/app/qgsabout.cpp
  108. +87 −128 src/app/qgsattributetypedialog.cpp
  109. +1 −1 src/app/qgsattributetypedialog.h
  110. +1 −1 src/app/qgsattributetypeloaddialog.h
  111. +2 −0 src/app/qgsmaptooladdvertex.h
  112. +2 −0 src/app/qgsmaptooldeletepart.h
  113. +2 −0 src/app/qgsmaptooldeletering.h
  114. +2 −2 src/app/qgsmaptooldeletevertex.cpp
  115. +2 −0 src/app/qgsmaptooldeletevertex.h
  116. +2 −0 src/app/qgsmaptoolmovevertex.h
  117. +31 −31 src/app/qgsmaptoolnodetool.cpp
  118. +2 −2 src/app/qgsmaptoolnodetool.h
  119. +6 −5 src/app/qgsmaptoolsimplify.cpp
  120. +2 −2 src/app/qgssinglesymboldialog.cpp
  121. +4 −2 src/app/qgsuniquevaluedialog.cpp
  122. +31 −104 src/app/qgsvectorlayerproperties.cpp
  123. +5 −2 src/app/qgsvectorlayerproperties.h
  124. +2 −4 src/core/CMakeLists.txt
  125. +11 −0 src/core/qgis.h
  126. +2 −3 src/core/qgsattributeaction.cpp
  127. +2 −2 src/core/qgsattributeaction.h
  128. +1 −1 src/core/qgsgeometry.cpp
  129. +1 −1 src/core/qgsvectordataprovider.cpp
  130. +17 −17 src/core/qgsvectorfilewriter.cpp
  131. +2 −1 src/core/qgsvectorfilewriter.h
  132. +4 −0 src/core/qgsvectorlayer.cpp
  133. +1 −0 src/core/raster/qgsrasterlayer.cpp
  134. +1 −3 src/gui/CMakeLists.txt
  135. +3 −3 src/gui/qgsencodingfiledialog.cpp
  136. +1 −1 src/plugins/diagram_overlay/qgspiediagramfactory.cpp
  137. +1 −2 src/plugins/geoprocessing/qgspggeoprocessing.cpp
  138. +8 −8 src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp
  139. +1 −1 src/plugins/georeferencer/qgspointdialog.h
  140. +4 −2 src/plugins/grass/modules-6.3/default.qgc
  141. +4 −2 src/plugins/grass/modules-6.4/default.qgc
  142. +2 −2 src/plugins/grass/modules-common/r.out.gdal.qgm
  143. +2 −1 src/plugins/grass/modules-common/v.out.ogr.qgm
  144. +53 −21 src/plugins/grass/qgsgrassbrowser.cpp
  145. +11 −10 src/plugins/grass/qgsgrassplugin.cpp
  146. +1 −1 src/plugins/grass/qgsgrassplugin.h
  147. +14 −14 src/plugins/grass/qgsgrassshell.cpp
  148. +115 −33 src/plugins/interpolation/DualEdgeTriangulation.cc
  149. +11 −3 src/plugins/interpolation/DualEdgeTriangulation.h
  150. +4 −1 src/plugins/interpolation/Triangulation.h
  151. +2 −2 src/plugins/interpolation/qgsidwinterpolator.cpp
  152. +1 −1 src/plugins/interpolation/qgsidwinterpolator.h
  153. +1 −9 src/plugins/interpolation/qgsidwinterpolatordialog.cpp
  154. +165 −32 src/plugins/interpolation/qgsinterpolationdialog.cpp
  155. +7 −3 src/plugins/interpolation/qgsinterpolationdialog.h
  156. +53 −32 src/plugins/interpolation/qgsinterpolationdialogbase.ui
  157. +15 −20 src/plugins/interpolation/qgsinterpolator.cpp
  158. +15 −13 src/plugins/interpolation/qgsinterpolator.h
  159. +1 −1 src/plugins/interpolation/qgsinterpolatordialog.cpp
  160. +3 −3 src/plugins/interpolation/qgsinterpolatordialog.h
  161. +186 −18 src/plugins/interpolation/qgstininterpolator.cpp
  162. +19 −1 src/plugins/interpolation/qgstininterpolator.h
  163. +50 −7 src/plugins/interpolation/qgstininterpolatordialog.cpp
  164. +4 −0 src/plugins/interpolation/qgstininterpolatordialog.h
  165. +28 −10 src/plugins/interpolation/qgstininterpolatordialogbase.ui
  166. +1 −1 src/providers/CMakeLists.txt
  167. +1 −3 src/providers/grass/CMakeLists.txt
  168. +1 −1 src/providers/grass/qgsgrass.cpp
  169. +9 −1 src/providers/ogr/CMakeLists.txt
  170. +36 −6 src/providers/ogr/qgsogrprovider.cpp
  171. +5 −0 src/providers/ogr/qgsogrprovider.h
  172. +46 −0 src/providers/osm/CMakeLists.txt
  173. +386 −0 src/providers/osm/osmhandler.cpp
  174. +86 −0 src/providers/osm/osmhandler.h
  175. +1,683 −0 src/providers/osm/osmprovider.cpp
  176. +305 −0 src/providers/osm/osmprovider.h
  177. +180 −0 src/providers/osm/osmrenderer.cpp
  178. +77 −0 src/providers/osm/osmrenderer.h
  179. +206 −0 src/providers/osm/osmstyle.cpp
  180. +73 −0 src/providers/osm/osmstyle.h
  181. +2 −2 src/providers/postgres/qgspostgresprovider.cpp
  182. +2 −2 src/ui/qgsattributeactiondialogbase.ui
  183. +1 −1 src/ui/qgsogrsublayersdialogbase.ui
  184. +11 −1 src/ui/qgsuniquevaluedialogbase.ui
@@ -2,7 +2,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "2")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Unstable Trunk")
SET(RELEASE_NAME "Daphnis")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
# Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
@@ -107,6 +107,9 @@ ENDIF (NOT BISON_EXECUTABLE)
#############################################################
# search for dependencies

# we don't use cblas
SET(DONT_LINK_CBLAS TRUE)

# required
FIND_PACKAGE(Proj)
FIND_PACKAGE(Expat) # GPS importer plugin
@@ -27,24 +27,30 @@ IF(WIN32)

SET(GSL_MINGW_PREFIX "c:/msys/local" )
SET(GSL_MSVC_PREFIX "$ENV{LIB_DIR}")
FIND_LIBRARY(GSL_LIB gsl PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
)
#MSVC version of the lib is just called 'cblas'
FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
)

FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h
${GSL_MINGW_PREFIX}/include
${GSL_MSVC_PREFIX}/include
)

IF (GSL_LIB AND GSLCBLAS_LIB)
SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
ENDIF (GSL_LIB AND GSLCBLAS_LIB)
FIND_LIBRARY(GSL_LIB gsl PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
)

IF (DONT_LINK_CBLAS)
IF (GSL_LIB)
SET (GSL_LIBRARIES ${GSL_LIB} )
ENDIF (GSL_LIB)
ELSE (DONT_LINK_CBLAS)
FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
)
IF (GSL_LIB AND GSLCBLAS_LIB)
SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
ENDIF (GSL_LIB AND GSLCBLAS_LIB)
ENDIF (DONT_LINK_CBLAS)

ELSE(WIN32)
IF(UNIX)
@@ -55,8 +61,14 @@ ELSE(WIN32)
/usr/bin/
)
# MESSAGE("DBG GSL_CONFIG ${GSL_CONFIG}")

IF (GSL_CONFIG)
IF (DONT_LINK_CBLAS)
SET(LIBS_ARG "--libs-without-cblas")
ELSE (DONT_LINK_CBLAS)
SET(LIBS_ARG "--libs")
ENDIF (DONT_LINK_CBLAS)

# set CXXFLAGS to be fed into CXX_FLAGS by the user:
SET(GSL_CXX_FLAGS "`${GSL_CONFIG} --cflags`")

@@ -68,12 +80,12 @@ ELSE(WIN32)

# set link libraries and link flags
EXEC_PROGRAM(${GSL_CONFIG}
ARGS --libs
ARGS ${LIBS_ARG}
OUTPUT_VARIABLE GSL_LIBRARIES)

## extract link dirs for rpath
EXEC_PROGRAM(${GSL_CONFIG}
ARGS --libs
ARGS ${LIBS_ARG}
OUTPUT_VARIABLE GSL_CONFIG_LIBS )

## split off the link dirs (for rpath)
@@ -23,6 +23,7 @@ usr/lib/qgis/libspatialiteprovider.so
usr/lib/qgis/liboracleplugin.so
usr/lib/qgis/libdiagramoverlay.so
usr/lib/qgis/libevis.so
usr/lib/qgis/libosmprovider.so
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

0 comments on commit 20b599b

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