Skip to content
Permalink
Browse files

Merge branch 'master' into rulebaseDialog

  • Loading branch information
DelazJ committed Jan 30, 2018
2 parents 9fff5f0 + 1194c78 commit 3a6eac233ccdb9036b7df2656f391c9eb1374b4f
Showing with 2,520 additions and 1,315 deletions.
  1. +2 −2 CMakeLists.txt
  2. +1 −1 cmake/FindGDAL.cmake
  3. +1 −1 cmake/FindGEOS.cmake
  4. +14 −2 cmake/FindGRASS.cmake
  5. +1 −1 cmake/FindPostgres.cmake
  6. +7 −1 cmake/FindPyQt5.py
  7. +1 −0 cmake/FindQScintilla.cmake
  8. +3 −1 cmake/FindQwt.cmake
  9. +10 −7 python/console/console.py
  10. +7 −5 python/core/conversions.sip
  11. +2 −0 python/core/processing/models/qgsprocessingmodelalgorithm.sip.in
  12. +1 −1 python/core/processing/qgsprocessingalgorithm.sip.in
  13. +4 −0 python/core/processing/qgsprocessingprovider.sip.in
  14. +3 −0 python/core/qgis.sip.in
  15. +9 −9 python/core/qgsattributes.sip.in
  16. +1 −0 python/core/qgsbearingutils.sip.in
  17. +7 −4 python/core/qgsfeatureiterator.sip.in
  18. +22 −0 python/core/qgsmapsettings.sip.in
  19. +20 −0 python/core/qgsrendercontext.sip.in
  20. +45 −1 python/core/qgsvectorlayer.sip.in
  21. +9 −0 python/core/qgsvectorlayereditbuffer.sip.in
  22. +11 −0 python/core/qgsvectorlayereditpassthrough.sip.in
  23. +17 −0 python/core/qgsvectorlayerjoinbuffer.sip.in
  24. +31 −0 python/core/qgsvectorlayerundopassthroughcommand.sip.in
  25. +6 −0 python/core/raster/qgsrasterfilewriter.sip.in
  26. +8 −0 python/core/symbology/qgsfillsymbollayer.sip.in
  27. +0 −2 python/gui/qgsconfigureshortcutsdialog.sip.in
  28. +4 −0 python/gui/raster/qgssinglebandpseudocolorrendererwidget.sip.in
  29. +1 −1 python/plugins/db_manager/db_plugins/postgis/plugins/versioning/DlgVersioning.ui
  30. +1 −1 python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py
  31. +6 −0 python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
  32. +3 −0 python/plugins/processing/algs/gdal/warp.py
  33. +4 −0 python/plugins/processing/algs/grass7/Grass7Algorithm.py
  34. +4 −9 python/plugins/processing/algs/help/qgis.yaml
  35. +4 −0 python/plugins/processing/algs/qgis/CreateAttributeIndex.py
  36. +4 −0 python/plugins/processing/algs/qgis/DefineProjection.py
  37. +1 −1 python/plugins/processing/algs/qgis/DensifyGeometries.py
  38. +3 −0 python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
  39. +4 −0 python/plugins/processing/algs/qgis/EliminateSelection.py
  40. +4 −0 python/plugins/processing/algs/qgis/ExecuteSQL.py
  41. +30 −30 python/plugins/processing/algs/qgis/{ExtractSpecificNodes.py → ExtractSpecificVertices.py}
  42. +4 −0 python/plugins/processing/algs/qgis/ImportIntoSpatialite.py
  43. +2 −2 python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py
  44. +4 −0 python/plugins/processing/algs/qgis/RandomSelection.py
  45. +4 −0 python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py
  46. +4 −0 python/plugins/processing/algs/qgis/SelectByAttribute.py
  47. +4 −0 python/plugins/processing/algs/qgis/SelectByExpression.py
  48. +5 −1 python/plugins/processing/algs/qgis/SetRasterStyle.py
  49. +5 −1 python/plugins/processing/algs/qgis/SetVectorStyle.py
  50. +4 −0 python/plugins/processing/algs/qgis/SpatialIndex.py
  51. +4 −0 python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py
  52. +5 −1 python/plugins/processing/algs/qgis/TruncateTable.py
  53. +5 −0 python/plugins/processing/algs/saga/SagaAlgorithm.py
  54. +6 −0 python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
  55. +1 −1 python/plugins/processing/gui/AlgorithmDialog.py
  56. +1 −1 python/plugins/processing/gui/BatchPanel.py
  57. +7 −3 python/plugins/processing/gui/wrappers.py
  58. +6 −6 python/plugins/processing/tests/testdata/expected/extract_nodes_lines.gfs
  59. +51 −51 python/plugins/processing/tests/testdata/expected/extract_nodes_lines.gml
  60. +6 −6 python/plugins/processing/tests/testdata/expected/extract_nodes_multilines.gfs
  61. +45 −45 python/plugins/processing/tests/testdata/expected/extract_nodes_multilines.gml
  62. +8 −8 python/plugins/processing/tests/testdata/expected/extract_nodes_multipolys.gfs
  63. +100 −100 python/plugins/processing/tests/testdata/expected/extract_nodes_multipolys.gml
  64. +8 −8 python/plugins/processing/tests/testdata/expected/extract_nodes_polys.gfs
  65. +132 −132 python/plugins/processing/tests/testdata/expected/extract_nodes_polys.gml
  66. +8 −8 python/plugins/processing/tests/testdata/expected/extract_specific_nodes_lines.gfs
  67. +84 −84 python/plugins/processing/tests/testdata/expected/extract_specific_nodes_lines.gml
  68. +10 −10 python/plugins/processing/tests/testdata/expected/extract_specific_nodes_polys.gfs
  69. +90 −90 python/plugins/processing/tests/testdata/expected/extract_specific_nodes_polys.gml
  70. +16 −16 python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
  71. +21 −1 resources/qgis_global_settings.ini
  72. +1 −1 scripts/spell_check/.agignore
  73. +1 −0 scripts/spell_check/spelling.dat
  74. +0 −5 src/3d/processing/qgsalgorithmtessellate.cpp
  75. +0 −1 src/3d/processing/qgsalgorithmtessellate.h
  76. +19 −0 src/3d/qgs3dmapsettings.h
  77. +1 −0 src/3d/terrain/qgsterraintexturegenerator_p.cpp
  78. +2 −2 src/analysis/CMakeLists.txt
  79. +0 −5 src/analysis/processing/qgsalgorithmaddincrementalfield.cpp
  80. +0 −1 src/analysis/processing/qgsalgorithmaddincrementalfield.h
  81. +0 −5 src/analysis/processing/qgsalgorithmassignprojection.cpp
  82. +0 −1 src/analysis/processing/qgsalgorithmassignprojection.h
  83. +0 −5 src/analysis/processing/qgsalgorithmboundary.cpp
  84. +0 −1 src/analysis/processing/qgsalgorithmboundary.h
  85. +0 −5 src/analysis/processing/qgsalgorithmboundingbox.cpp
  86. +0 −1 src/analysis/processing/qgsalgorithmboundingbox.h
  87. +0 −5 src/analysis/processing/qgsalgorithmbuffer.cpp
  88. +0 −1 src/analysis/processing/qgsalgorithmbuffer.h
  89. +0 −5 src/analysis/processing/qgsalgorithmcentroid.cpp
  90. +0 −1 src/analysis/processing/qgsalgorithmcentroid.h
  91. +0 −5 src/analysis/processing/qgsalgorithmclip.cpp
  92. +0 −1 src/analysis/processing/qgsalgorithmclip.h
  93. +0 −5 src/analysis/processing/qgsalgorithmconvexhull.cpp
  94. +0 −1 src/analysis/processing/qgsalgorithmconvexhull.h
  95. +0 −5 src/analysis/processing/qgsalgorithmdissolve.cpp
  96. +0 −1 src/analysis/processing/qgsalgorithmdissolve.h
  97. +0 −5 src/analysis/processing/qgsalgorithmdropgeometry.cpp
  98. +0 −1 src/analysis/processing/qgsalgorithmdropgeometry.h
  99. +0 −5 src/analysis/processing/qgsalgorithmdropmzvalues.cpp
  100. +0 −1 src/analysis/processing/qgsalgorithmdropmzvalues.h
  101. +0 −5 src/analysis/processing/qgsalgorithmextenttolayer.cpp
  102. +0 −1 src/analysis/processing/qgsalgorithmextenttolayer.h
  103. +0 −5 src/analysis/processing/qgsalgorithmextractbyattribute.cpp
  104. +0 −1 src/analysis/processing/qgsalgorithmextractbyattribute.h
  105. +0 −5 src/analysis/processing/qgsalgorithmextractbyexpression.cpp
  106. +0 −1 src/analysis/processing/qgsalgorithmextractbyexpression.h
  107. +0 −6 src/analysis/processing/qgsalgorithmextractbyextent.cpp
  108. +0 −1 src/analysis/processing/qgsalgorithmextractbyextent.h
  109. +5 −5 src/analysis/processing/qgsalgorithmextractbylocation.cpp
  110. +1 −1 src/analysis/processing/qgsalgorithmextractbylocation.h
  111. +22 −27 src/analysis/processing/{qgsalgorithmextractnodes.cpp → qgsalgorithmextractvertices.cpp}
  112. +7 −8 src/analysis/processing/{qgsalgorithmextractnodes.h → qgsalgorithmextractvertices.h}
  113. +0 −5 src/analysis/processing/qgsalgorithmfiledownloader.cpp
  114. +0 −1 src/analysis/processing/qgsalgorithmfiledownloader.h
  115. +0 −5 src/analysis/processing/qgsalgorithmfixgeometries.cpp
  116. +0 −1 src/analysis/processing/qgsalgorithmfixgeometries.h
  117. +0 −5 src/analysis/processing/qgsalgorithmjoinbyattribute.cpp
  118. +0 −1 src/analysis/processing/qgsalgorithmjoinbyattribute.h
  119. +0 −5 src/analysis/processing/qgsalgorithmjoinwithlines.cpp
  120. +0 −1 src/analysis/processing/qgsalgorithmjoinwithlines.h
  121. +0 −5 src/analysis/processing/qgsalgorithmlineintersection.cpp
  122. +0 −1 src/analysis/processing/qgsalgorithmlineintersection.h
  123. +0 −5 src/analysis/processing/qgsalgorithmloadlayer.cpp
  124. +0 −1 src/analysis/processing/qgsalgorithmloadlayer.h
  125. +0 −5 src/analysis/processing/qgsalgorithmmeancoordinates.cpp
  126. +0 −1 src/analysis/processing/qgsalgorithmmeancoordinates.h
  127. +0 −5 src/analysis/processing/qgsalgorithmmergelines.cpp
  128. +0 −1 src/analysis/processing/qgsalgorithmmergelines.h
  129. +0 −5 src/analysis/processing/qgsalgorithmmergevector.cpp
  130. +0 −1 src/analysis/processing/qgsalgorithmmergevector.h
  131. +0 −5 src/analysis/processing/qgsalgorithmminimumenclosingcircle.cpp
  132. +0 −1 src/analysis/processing/qgsalgorithmminimumenclosingcircle.h
  133. +0 −5 src/analysis/processing/qgsalgorithmmultiparttosinglepart.cpp
  134. +0 −1 src/analysis/processing/qgsalgorithmmultiparttosinglepart.h
  135. +0 −5 src/analysis/processing/qgsalgorithmorderbyexpression.cpp
  136. +0 −1 src/analysis/processing/qgsalgorithmorderbyexpression.h
  137. +0 −5 src/analysis/processing/qgsalgorithmorientedminimumboundingbox.cpp
  138. +0 −1 src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h
  139. +0 −5 src/analysis/processing/qgsalgorithmpackage.cpp
  140. +0 −1 src/analysis/processing/qgsalgorithmpackage.h
  141. +0 −5 src/analysis/processing/qgsalgorithmpromotetomultipart.cpp
  142. +0 −1 src/analysis/processing/qgsalgorithmpromotetomultipart.h
  143. +0 −5 src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp
  144. +0 −1 src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h
  145. +21 −26 ...lysis/processing/{qgsalgorithmremoveduplicatenodes.cpp → qgsalgorithmremoveduplicatevertices.cpp}
  146. +7 −8 src/analysis/processing/{qgsalgorithmremoveduplicatenodes.h → qgsalgorithmremoveduplicatevertices.h}
  147. +0 −5 src/analysis/processing/qgsalgorithmremovenullgeometry.cpp
  148. +0 −1 src/analysis/processing/qgsalgorithmremovenullgeometry.h
  149. +0 −5 src/analysis/processing/qgsalgorithmrenamelayer.cpp
  150. +0 −1 src/analysis/processing/qgsalgorithmrenamelayer.h
  151. +1 −1 src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp
  152. +0 −5 src/analysis/processing/qgsalgorithmsimplify.cpp
  153. +0 −1 src/analysis/processing/qgsalgorithmsimplify.h
  154. +0 −5 src/analysis/processing/qgsalgorithmsmooth.cpp
  155. +0 −1 src/analysis/processing/qgsalgorithmsmooth.h
  156. +0 −5 src/analysis/processing/qgsalgorithmsnaptogrid.cpp
  157. +0 −1 src/analysis/processing/qgsalgorithmsnaptogrid.h
  158. +0 −5 src/analysis/processing/qgsalgorithmsplitwithlines.cpp
  159. +0 −1 src/analysis/processing/qgsalgorithmsplitwithlines.h
  160. +1 −1 src/analysis/processing/qgsalgorithmstringconcatenation.cpp
  161. +0 −6 src/analysis/processing/qgsalgorithmsubdivide.cpp
  162. +0 −1 src/analysis/processing/qgsalgorithmsubdivide.h
  163. +0 −5 src/analysis/processing/qgsalgorithmtransect.cpp
  164. +0 −1 src/analysis/processing/qgsalgorithmtransect.h
  165. +0 −5 src/analysis/processing/qgsalgorithmtransform.cpp
  166. +0 −1 src/analysis/processing/qgsalgorithmtransform.h
  167. +0 −5 src/analysis/processing/qgsalgorithmtranslate.cpp
  168. +0 −1 src/analysis/processing/qgsalgorithmtranslate.h
  169. +0 −8 src/analysis/processing/qgsalgorithmuniquevalueindex.cpp
  170. +0 −1 src/analysis/processing/qgsalgorithmuniquevalueindex.h
  171. +4 −4 src/analysis/processing/qgsnativealgorithms.cpp
  172. +1 −1 src/app/layout/qgslayoutappmenuprovider.cpp
  173. +9 −1 src/app/layout/qgslayoutdesignerdialog.cpp
  174. +1 −0 src/app/layout/qgslayoutpropertieswidget.cpp
  175. +39 −6 src/app/mainwin.cpp
  176. +0 −6 src/app/nodetool/qgsnodeeditor.cpp
  177. +0 −3 src/app/nodetool/qgsnodeeditor.h
  178. +25 −12 src/app/qgisapp.cpp
  179. +2 −2 src/app/qgisapp.h
  180. +2 −2 src/app/qgscustomization.cpp
  181. +1 −1 src/app/qgsdecorationnortharrow.cpp
  182. +1 −0 src/app/qgsmapsavedialog.cpp
  183. +2 −2 src/app/qgsoptions.cpp
  184. +13 −15 src/app/qgsrasterlayerproperties.cpp
  185. +3 −3 src/app/qgsrasterlayerproperties.h
  186. +2 −0 src/core/geometry/qgsgeometrycollection.cpp
  187. +1 −1 src/core/layout/qgslayoutitem.cpp
  188. +26 −8 src/core/layout/qgslayoutitemmap.cpp
  189. +8 −4 src/core/layout/qgslayoutitemmap.h
  190. +1 −2 src/core/layout/qgslayoutitemmapgrid.cpp
  191. +2 −1 src/core/layout/qgslayoutitempicture.cpp
  192. +6 −0 src/core/processing/models/qgsprocessingmodelalgorithm.cpp
  193. +1 −0 src/core/processing/models/qgsprocessingmodelalgorithm.h
  194. +3 −0 src/core/processing/qgsprocessingalgorithm.cpp
  195. +1 −1 src/core/processing/qgsprocessingalgorithm.h
  196. +8 −0 src/core/processing/qgsprocessingprovider.cpp
  197. +6 −1 src/core/processing/qgsprocessingprovider.h
  198. +1 −1 src/core/processing/qgsprocessingutils.cpp
  199. +4 −0 src/core/qgis.cpp
  200. +11 −0 src/core/qgis.h
  201. +9 −9 src/core/qgsattributes.h
  202. +3 −4 src/core/qgsbearingutils.cpp
  203. +2 −0 src/core/qgsbearingutils.h
  204. +1 −1 src/core/qgsdataitem.cpp
  205. +7 −4 src/core/qgsfeatureiterator.h
  206. +21 −0 src/core/qgsmapsettings.h
  207. +2 −2 src/core/qgspallabeling.cpp
  208. +1 −1 src/core/qgspathresolver.cpp
  209. +3 −0 src/core/qgsrendercontext.cpp
  210. +22 −0 src/core/qgsrendercontext.h
  211. +5 −5 src/core/qgssnappingconfig.cpp
  212. +2 −2 src/core/qgstolerance.cpp
  213. +17 −13 src/core/qgsvectordataprovider.cpp
  214. +58 −0 src/core/qgsvectorlayer.cpp
  215. +39 −1 src/core/qgsvectorlayer.h
  216. +17 −0 src/core/qgsvectorlayereditbuffer.cpp
  217. +8 −0 src/core/qgsvectorlayereditbuffer.h
  218. +5 −0 src/core/qgsvectorlayereditpassthrough.cpp
  219. +8 −0 src/core/qgsvectorlayereditpassthrough.h
  220. +19 −0 src/core/qgsvectorlayerjoinbuffer.cpp
  221. +16 −0 src/core/qgsvectorlayerjoinbuffer.h
  222. +32 −0 src/core/qgsvectorlayerundopassthroughcommand.cpp
  223. +29 −0 src/core/qgsvectorlayerundopassthroughcommand.h
  224. +2 −2 src/core/raster/qgsrasterfilewriter.cpp
  225. +7 −0 src/core/raster/qgsrasterfilewriter.h
  226. +15 −2 src/core/symbology/qgsfillsymbollayer.cpp
  227. +7 −0 src/core/symbology/qgsfillsymbollayer.h
  228. +6 −3 src/core/symbology/qgsmarkersymbollayer.cpp
  229. +1 −1 src/core/symbology/qgssymbollayerregistry.cpp
  230. +1 −1 src/gui/editorwidgets/qgsdatetimeeditconfig.cpp
  231. +22 −9 src/gui/editorwidgets/qgsrangeconfigdlg.cpp
  232. +16 −8 src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
  233. +3 −0 src/gui/editorwidgets/qgsrangewidgetwrapper.h
  234. +29 −0 src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp
  235. +11 −0 src/gui/editorwidgets/qgsvaluemapconfigdlg.h
  236. +2 −9 src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
  237. +1 −21 src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp
  238. +1 −1 src/gui/processing/qgsprocessingalgorithmdialogbase.cpp
  239. +8 −1 src/gui/qgsattributeform.cpp
  240. +1 −19 src/gui/qgsconfigureshortcutsdialog.cpp
  241. +0 −8 src/gui/qgsconfigureshortcutsdialog.h
  242. +1 −0 src/gui/qgsfontbutton.cpp
  243. +1 −0 src/gui/qgsmapcanvas.cpp
  244. +93 −17 src/gui/qgsoptionsdialogbase.cpp
  245. +8 −1 src/gui/qgsoptionsdialogbase.h
  246. +1 −0 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  247. +45 −17 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  248. +2 −1 src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
  249. +4 −6 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  250. +2 −0 src/plugins/grass/qtermwidget/kpty.cpp
  251. +29 −2 src/server/services/wfs/qgswfsgetfeature.cpp
  252. +3 −2 src/server/services/wfs/qgswfsparameters.cpp
  253. +6 −32 src/ui/editorwidgets/qgsrangeconfigdlgbase.ui
  254. +7 −1 src/ui/qgisapp.ui
  255. +3 −2 src/ui/qgsrendererrulepropsdialogbase.ui
  256. +4 −1 src/ui/qgsxyzconnectiondialog.ui
  257. +12 −10 tests/src/core/testqgslayoutitem.cpp
  258. +1 −1 tests/src/core/testqgslayoutmultiframe.cpp
  259. +13 −0 tests/src/core/testqgsproject.cpp
  260. +2 −0 tests/src/gui/CMakeLists.txt
  261. +1 −1 tests/src/gui/testqgslayoutview.cpp
  262. +279 −0 tests/src/gui/testqgsrangewidgetwrapper.cpp
  263. +136 −0 tests/src/gui/testqgsvaluemapwidgetwrapper.cpp
  264. +66 −4 tests/src/python/test_provider_postgres.py
  265. +13 −10 tests/src/python/test_qgsbearingutils.py
  266. +1 −0 tests/src/python/test_qgsfieldmodel.py
  267. +4 −0 tests/src/python/test_qgsrasterfilewriter.py
  268. +2 −2 tests/src/python/test_qgssearchwidgetwrapper.py
  269. +24 −3 tests/src/python/test_qgsserver_wfs.py
  270. +11 −0 tests/testdata/provider/testdata_pg.sql
  271. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_1_0_0.txt
  272. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_3857_1_0_0.txt
  273. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_1_0_0.txt
  274. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_3857_1_0_0.txt
  275. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature.txt
  276. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature_3857.txt
  277. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature.txt
  278. +6 −0 tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature_3857.txt
@@ -616,11 +616,11 @@ IF (WITH_CORE)
ENDIF(MSVC)
ENDIF(COMMAND cmake_policy)

IF (PEDANTIC AND NOT WIN32 AND NOT APPLE)
if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
ENDIF(PEDANTIC AND NOT WIN32 AND NOT APPLE)
endif() #"${CMAKE_SYSTEM_NAME}" MATCHES "Linux")

SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
INCLUDE(GenerateExportHeader)
@@ -167,7 +167,7 @@ ELSE(WIN32)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GDAL_LIBRARY)
ELSE (APPLE)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} PATHS ${GDAL_LINK_DIRECTORIES}/lib)
ENDIF (APPLE)

ELSE(GDAL_CONFIG)
@@ -148,7 +148,7 @@ ELSE(WIN32)
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GEOS_LIBRARY)
ELSE (APPLE)
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
FIND_LIBRARY(GEOS_LIBRARY NAMES ${GEOS_LIB_NAME} PATHS ${GEOS_LIB_DIRECTORIES}/lib)
ENDIF (APPLE)
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")

@@ -159,8 +159,20 @@ ENDIF (WIN32)

IF (UNIX)
IF (GRASS_FIND_VERSION EQUAL 7)
LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
ENDIF ()
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
FOREACH (VERSION_MINOR 0 1 2 3 4)
FOREACH (VERSION_BUILD 0 1 2 3 4 5)
LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD})
ENDFOREACH (VERSION_BUILD)
ENDFOREACH(VERSION_MINOR)
ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
FOREACH (PATH /usr/lib64 /usr/lib)
FOREACH (VERSION grass70, grass71, grass72)
LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
ENDFOREACH (VERSION)
ENDFOREACH (PATH)
ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
ENDIF (GRASS_FIND_VERSION EQUAL 7)
ENDIF (UNIX)

IF (APPLE)
@@ -96,7 +96,7 @@ ELSE(WIN32)
ENDFOREACH(_LIBNAME ${_LIBS})

ELSE (CYGWIN)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS ${PG_TMP}/lib)
ENDIF (APPLE)
ENDIF(POSTGRES_CONFIG)

@@ -37,9 +37,15 @@
import PyQt5.QtCore
import sipconfig # won't work for SIP v5
import os.path
import sys
cfg = sipconfig.Configuration()
sip_dir = cfg.default_sip_dir
for p in (os.path.join(sip_dir, "PyQt5"), sip_dir):
if sys.platform.startswith('freebsd'):
py_version = str(sys.version_info.major) + str(sys.version_info.minor)
sip_dir = sip_dir.replace(py_version, '')
for p in (os.path.join(sip_dir, "PyQt5"),
os.path.join(sip_dir, "PyQt5-3"),
sip_dir):
if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
sip_dir = p
break
@@ -39,6 +39,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
PATHS
"${QT_LIBRARY_DIR}"
/usr/local/lib
/usr/local/lib/qt5
/usr/lib
)

@@ -12,13 +12,14 @@
#


set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5 qwt)
set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5 qwt qwt6)

find_library(QWT_LIBRARY
NAMES ${QWT_LIBRARY_NAMES}
PATHS
/usr/lib
/usr/local/lib
/usr/local/lib/qt5
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}"
)
@@ -32,6 +33,7 @@ FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
"${_qwt_fw}/Headers"
/usr/include
/usr/local/include
/usr/local/include/qt5
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
PATH_SUFFIXES qwt-qt5 qwt qwt6
@@ -23,7 +23,7 @@
import os

from qgis.PyQt.QtCore import Qt, QTimer, QCoreApplication, QSize, QByteArray, QFileInfo, QUrl, QDir
from qgis.PyQt.QtWidgets import QDockWidget, QToolBar, QToolButton, QWidget, QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, QShortcut
from qgis.PyQt.QtWidgets import QToolBar, QToolButton, QWidget, QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, QShortcut
from qgis.PyQt.QtGui import QDesktopServices, QKeySequence
from qgis.PyQt.QtWidgets import QVBoxLayout
from qgis.utils import iface
@@ -32,7 +32,7 @@
from .console_editor import EditorTabWidget
from .console_settings import optionsDialog
from qgis.core import QgsApplication, QgsSettings
from qgis.gui import QgsFilterLineEdit, QgsHelp
from qgis.gui import QgsFilterLineEdit, QgsHelp, QgsDockWidget
from functools import partial

import sys
@@ -46,14 +46,17 @@ def show_console():
if _console is None:
parent = iface.mainWindow() if iface else None
_console = PythonConsole(parent)
if iface:
_console.visibilityChanged.connect(iface.actionShowPythonDialog().setChecked)

_console.show() # force show even if it was restored as hidden
# set focus to the console so the user can start typing
# defer the set focus event so it works also whether the console not visible yet
QTimer.singleShot(0, _console.activate)
else:
_console.setVisible(not _console.isVisible())
_console.setUserVisible(not _console.isUserVisible())
# set focus to the console so the user can start typing
if _console.isVisible():
if _console.isUserVisible():
_console.activate()

return _console
@@ -70,10 +73,10 @@ def console_displayhook(obj):
_console_output = obj


class PythonConsole(QDockWidget):
class PythonConsole(QgsDockWidget):

def __init__(self, parent=None):
QDockWidget.__init__(self, parent)
super().__init__(parent)
self.setObjectName("PythonConsole")
self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console"))
# self.setAllowedAreas(Qt.BottomDockWidgetArea)
@@ -89,7 +92,7 @@ def __init__(self, parent=None):
def activate(self):
self.activateWindow()
self.raise_()
QDockWidget.setFocus(self)
QgsDockWidget.setFocus(self)

def closeEvent(self, event):
self.console.saveSettingsConsole()
@@ -1799,6 +1799,8 @@ template<int, TYPE2*>
return NULL;
}

Py_DECREF(valueobj);
Py_DECREF(keyobj);
}

return d;
@@ -1997,9 +1999,7 @@ template <TYPE>
{
Py_DECREF(l);

if (tobj)
Py_DECREF(tobj);
else
if (!tobj)
delete t;

return NULL;
@@ -2073,8 +2073,6 @@ template <TYPE>

PyObject *keyobj = PyLong_FromLong(it.key());
PyObject *pyOobj = sipConvertFromType(oobj, sipType_QgsFeature, sipTransferObj);
PyDict_SetItem(d, keyobj, pyOobj);

if(pyOobj == NULL || keyobj == NULL || PyDict_SetItem(d, keyobj, pyOobj) < 0)
{
Py_DECREF(d);
@@ -2083,6 +2081,10 @@ template <TYPE>
{
Py_DECREF(pyOobj);
}
else
{
delete oobj;
}

if (keyobj)
{
@@ -47,6 +47,8 @@ Constructor for QgsProcessingModelAlgorithm.

virtual QString helpUrl() const;

virtual Flags flags() const;


virtual bool canExecute( QString *errorMessage /Out/ = 0 ) const;

@@ -44,7 +44,7 @@ Abstract base class for processing algorithms.
FlagSupportsBatch,
FlagCanCancel,
FlagRequiresMatchingCrs,
FlagCanRunInBackground,
FlagNoThreading,
FlagDeprecated,
};
typedef QFlags<QgsProcessingAlgorithm::Flag> Flags;
@@ -148,6 +148,10 @@ indicates that none of the outputs from any of the provider's algorithms have
support for non-file based outputs. Returning true indicates that the algorithm's
parameters will each individually declare their non-file based support.

The default behavior for providers is to support non-file based outputs, and most
providers which rely solely on QGIS API (and which do not depend on third-party scripts
or external dependencies) will automatically support this.

.. seealso:: :py:func:`supportedOutputVectorLayerExtensions`
%End

@@ -69,6 +69,9 @@ The Qgis class provides global constants for use throughout the application.

static const double UI_SCALE_FACTOR;

static const double DEFAULT_SNAP_TOLERANCE;

static const int DEFAULT_SNAP_UNITS;
};


@@ -71,19 +71,20 @@ typedef QVector<QVariant> QgsAttributes;
}

QgsAttributes *qv = new QgsAttributes;
SIP_SSIZE_T listSize = PyList_GET_SIZE( sipPy );
qv->reserve( listSize );

for ( SIP_SSIZE_T i = 0; i < PyList_GET_SIZE( sipPy ); ++i )
for ( SIP_SSIZE_T i = 0; i < listSize; ++i )
{
int state;
PyObject *obj = PyList_GET_ITEM( sipPy, i );
QVariant *t;
if ( obj == Py_None )
{
t = new QVariant( QVariant::Int );
qv->append( QVariant( QVariant::Int ) );
}
else
{
t = reinterpret_cast<QVariant *>( sipConvertToType( obj, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr ) );
int state;
QVariant *t = reinterpret_cast<QVariant *>( sipConvertToType( obj, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr ) );

if ( *sipIsErr )
{
@@ -92,11 +93,10 @@ typedef QVector<QVariant> QgsAttributes;
delete qv;
return 0;
}
}

qv->append( *t );

sipReleaseType( t, sipType_QVariant, state );
qv->append( *t );
sipReleaseType( t, sipType_QVariant, state );
}
}

*sipCppPtr = qv;
@@ -24,6 +24,7 @@ Utilities for calculating bearings and directions.
public:

static double bearingTrueNorth( const QgsCoordinateReferenceSystem &crs,
const QgsCoordinateTransformContext &transformContext,
const QgsPointXY &point );
%Docstring
Returns the direction to true north from a specified point and for a specified
@@ -201,12 +201,15 @@ Wrapper for iterator of features from vector data provider or vector layer

SIP_PYOBJECT __next__();
%MethodCode
QgsFeature *f = new QgsFeature;
if ( sipCpp->nextFeature( *f ) )
sipRes = sipConvertFromType( f, sipType_QgsFeature, Py_None );
std::unique_ptr< QgsFeature > f = qgis::make_unique< QgsFeature >();
bool result = false;
Py_BEGIN_ALLOW_THREADS
result = ( sipCpp->nextFeature( *f ) );
Py_END_ALLOW_THREADS
if ( result )
sipRes = sipConvertFromType( f.release(), sipType_QgsFeature, Py_None );
else
{
delete f;
PyErr_SetString( PyExc_StopIteration, "" );
}
%End
@@ -327,6 +327,26 @@ from a source to destination coordinate reference system.
.. versionadded:: 3.0

.. seealso:: :py:func:`transformContext`
%End

const QgsPathResolver &pathResolver() const;
%Docstring
Returns the path resolver for conversion between relative and absolute paths
during rendering operations, e.g. for resolving relative symbol paths.

.. versionadded:: 3.0

.. seealso:: :py:func:`setPathResolver`
%End

void setPathResolver( const QgsPathResolver &resolver );
%Docstring
Sets the path ``resolver`` for conversion between relative and absolute paths
during rendering operations, e.g. for resolving relative symbol paths.

.. versionadded:: 3.0

.. seealso:: :py:func:`pathResolver`
%End

const QgsMapToPixel &mapToPixel() const;
@@ -465,6 +485,8 @@ Returns global configuration of the labeling engine





void updateDerived();
};

@@ -131,6 +131,26 @@ from a source to destination coordinate reference system.
.. versionadded:: 3.0

.. seealso:: :py:func:`transformContext`
%End

const QgsPathResolver &pathResolver() const;
%Docstring
Returns the path resolver for conversion between relative and absolute paths
during rendering operations, e.g. for resolving relative symbol paths.

.. versionadded:: 3.0

.. seealso:: :py:func:`setPathResolver`
%End

void setPathResolver( const QgsPathResolver &resolver );
%Docstring
Sets the path ``resolver`` for conversion between relative and absolute paths
during rendering operations, e.g. for resolving relative symbol paths.

.. versionadded:: 3.0

.. seealso:: :py:func:`pathResolver`
%End

const QgsRectangle &extent() const;

0 comments on commit 3a6eac2

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