Skip to content
Permalink
Browse files

Merge branch 'master' into processing_sampling

  • Loading branch information
ghtmtt committed Jul 16, 2018
2 parents 1a0d0db + 7933c85 commit 14c74d88c8975a45b4ab8b4c003e6739db7776b1
Showing with 9,235 additions and 1,627 deletions.
  1. +1 −1 .ci/travis/code_layout/install.sh
  2. +7 −14 doc/CMakeLists.txt
  3. +3 −0 doc/qgsquick.dox
  4. +2 −0 images/images.qrc
  5. +106 −0 images/themes/default/mActionAddMeshLayer.svg
  6. 0 python/plugins/processing/images/history.svg → images/themes/default/mIconHistory.svg
  7. +1 −24 images/themes/default/providerQgis.svg
  8. +8 −1 python/core/auto_generated/qgsofflineediting.sip.in
  9. +2 −2 python/core/auto_generated/raster/qgscolorrampshader.sip.in
  10. +2 −2 python/core/auto_generated/raster/qgsrastershaderfunction.sip.in
  11. +3 −0 python/gui/auto_additions/qgsprocessingtoolboxmodel.py
  12. +452 −0 python/gui/auto_generated/processing/qgsprocessingtoolboxmodel.sip.in
  13. +92 −0 python/gui/auto_generated/processing/qgsprocessingtoolboxtreeview.sip.in
  14. +5 −0 python/gui/auto_generated/qgisinterface.sip.in
  15. +7 −0 python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in
  16. +2 −0 python/gui/gui_auto.sip
  17. +391 −0 python/gui/processing/qgsprocessingtoolboxmodel.sip.in
  18. +2 −2 python/plugins/processing/ProcessingPlugin.py
  19. +1 −1 python/plugins/processing/algs/gdal/fillnodata.py
  20. +1 −1 python/plugins/processing/algs/gdal/translate.py
  21. +8 −7 python/plugins/processing/algs/gdal/warp.py
  22. +6 −0 python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
  23. +4 −4 python/plugins/processing/algs/saga/description/SnapPointstoLines.txt
  24. +4 −4 python/plugins/processing/algs/saga/description/SnapPointstoPoints.txt
  25. +1 −1 python/plugins/processing/gui/NumberInputPanel.py
  26. +31 −349 python/plugins/processing/gui/ProcessingToolbox.py
  27. +3 −3 python/plugins/processing/gui/wrappers.py
  28. +54 −225 python/plugins/processing/modeler/ModelerDialog.py
  29. +106 −0 python/plugins/processing/tests/GdalAlgorithmsTest.py
  30. +84 −0 python/plugins/processing/tests/testdata/expected/dbscan_5_2.gml
  31. +37 −0 python/plugins/processing/tests/testdata/expected/dbscan_5_2.xsd
  32. +84 −0 python/plugins/processing/tests/testdata/expected/dbscan_multiple_clusters.gml
  33. +37 −0 python/plugins/processing/tests/testdata/expected/dbscan_multiple_clusters.xsd
  34. +84 −0 python/plugins/processing/tests/testdata/expected/dbscan_no_clusters.gml
  35. +37 −0 python/plugins/processing/tests/testdata/expected/dbscan_no_clusters.xsd
  36. +84 −0 python/plugins/processing/tests/testdata/expected/dbscan_star_5_2.gml
  37. +37 −0 python/plugins/processing/tests/testdata/expected/dbscan_star_5_2.xsd
  38. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_moves.dbf
  39. +29 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_moves.mshp
  40. +1 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_moves.prj
  41. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_moves.shp
  42. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_moves.shx
  43. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_result.dbf
  44. +29 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_result.mshp
  45. +1 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_result.prj
  46. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_result.shp
  47. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_lines_result.shx
  48. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_moves.dbf
  49. +29 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_moves.mshp
  50. +1 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_moves.prj
  51. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_moves.shp
  52. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_moves.shx
  53. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_result.dbf
  54. +29 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_result.mshp
  55. +1 −0 python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_result.prj
  56. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_result.shp
  57. BIN python/plugins/processing/tests/testdata/expected/saga/snap_points_to_points_result.shx
  58. +61 −2 python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
  59. +36 −0 python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml
  60. +6 −26 python/plugins/processing/ui/ProcessingToolbox.ui
  61. +3 −2 python/server/auto_generated/qgsaccesscontrol.sip.in
  62. +3 −2 python/server/auto_generated/qgsbufferserverrequest.sip.in
  63. +2 −0 python/server/auto_generated/qgsbufferserverresponse.sip.in
  64. +12 −1 python/server/auto_generated/qgsconfigcache.sip.in
  65. +7 −0 python/server/auto_generated/qgsmapserviceexception.sip.in
  66. +1 −2 python/server/auto_generated/qgsserversettings.sip.in
  67. +9 −7 python/server/auto_generated/qgsservicemodule.sip.in
  68. +1 −1 python/server/server_auto.sip
  69. +1 −1 scripts/spell_check/check_spelling.sh
  70. +1 −0 scripts/spell_check/spelling.dat
  71. +5 −0 src/3d/processing/qgsalgorithmtessellate.cpp
  72. +1 −0 src/3d/processing/qgsalgorithmtessellate.h
  73. +1 −0 src/analysis/CMakeLists.txt
  74. +298 −0 src/analysis/processing/qgsalgorithmdbscanclustering.cpp
  75. +72 −0 src/analysis/processing/qgsalgorithmdbscanclustering.h
  76. +2 −0 src/analysis/processing/qgsnativealgorithms.cpp
  77. +1 −1 src/app/layout/qgsreportsectionmodel.cpp
  78. +1 −1 src/app/layout/qgsreportsectionmodel.h
  79. +49 −0 src/app/qgisapp.cpp
  80. +6 −0 src/app/qgisapp.h
  81. +5 −0 src/app/qgisappinterface.cpp
  82. +2 −0 src/app/qgisappinterface.h
  83. +0 −2 src/app/qgsmaptoolmovefeature.cpp
  84. +0 −2 src/app/qgsmaptoolrotatefeature.cpp
  85. +1 −3 src/app/qgsmaptoolsimplify.cpp
  86. +3 −3 src/app/qgsprojectlayergroupdialog.cpp
  87. +39 −5 src/core/mesh/qgsmeshlayerrenderer.cpp
  88. +5 −0 src/core/mesh/qgsmeshlayerrenderer.h
  89. +19 −3 src/core/mesh/qgsmeshvectorrenderer.cpp
  90. +2 −0 src/core/mesh/qgsmeshvectorrenderer.h
  91. +6 −0 src/core/processing/models/qgsprocessingmodelalgorithm.cpp
  92. +5 −0 src/core/processing/qgsprocessingalgorithm.cpp
  93. +55 −0 src/core/processing/qgsprocessingparameters.cpp
  94. +6 −0 src/core/processing/qgsprocessingutils.cpp
  95. +269 −195 src/core/qgsofflineediting.cpp
  96. +12 −3 src/core/qgsofflineediting.h
  97. +19 −16 src/core/raster/qgscolorrampshader.cpp
  98. +6 −6 src/core/raster/qgscolorrampshader.h
  99. +1 −1 src/core/raster/qgsmultibandcolorrenderer.cpp
  100. +2 −2 src/core/raster/qgsrastershaderfunction.cpp
  101. +2 −2 src/core/raster/qgsrastershaderfunction.h
  102. +10 −7 src/core/raster/qgssinglebandpseudocolorrenderer.cpp
  103. +4 −0 src/gui/CMakeLists.txt
  104. +790 −0 src/gui/processing/qgsprocessingtoolboxmodel.cpp
  105. +491 −0 src/gui/processing/qgsprocessingtoolboxmodel.h
  106. +112 −0 src/gui/processing/qgsprocessingtoolboxtreeview.cpp
  107. +109 −0 src/gui/processing/qgsprocessingtoolboxtreeview.h
  108. +4 −0 src/gui/qgisinterface.h
  109. +6 −0 src/gui/qgsabstractdatasourcewidget.h
  110. +2 −0 src/gui/qgsdatasourcemanagerdialog.cpp
  111. +6 −0 src/gui/qgsdatasourcemanagerdialog.h
  112. +0 −3 src/gui/raster/qgscolorrampshaderwidget.cpp
  113. +8 −5 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  114. +1 −1 src/plugins/offline_editing/offline_editing_plugin.cpp
  115. +70 −17 src/plugins/offline_editing/offline_editing_plugin_gui.cpp
  116. +3 −0 src/plugins/offline_editing/offline_editing_plugin_gui.h
  117. +37 −0 src/plugins/offline_editing/offline_editing_plugin_guibase.ui
  118. +19 −0 src/providers/mdal/CMakeLists.txt
  119. +34 −0 src/providers/mdal/qgsmdalprovider.cpp
  120. +59 −0 src/providers/mdal/qgsmdalsourceselect.cpp
  121. +46 −0 src/providers/mdal/qgsmdalsourceselect.h
  122. +1 −1 src/providers/postgres/qgspostgresprojectstorage.cpp
  123. +11 −0 src/quickgui/CMakeLists.txt
  124. +72 −0 src/quickgui/attributes/qgsquickattributeformmodel.cpp
  125. +122 −0 src/quickgui/attributes/qgsquickattributeformmodel.h
  126. +383 −0 src/quickgui/attributes/qgsquickattributeformmodelbase.cpp
  127. +132 −0 src/quickgui/attributes/qgsquickattributeformmodelbase.h
  128. +331 −0 src/quickgui/attributes/qgsquickattributemodel.cpp
  129. +153 −0 src/quickgui/attributes/qgsquickattributemodel.h
  130. +183 −0 src/quickgui/attributes/qgsquicksubmodel.cpp
  131. +93 −0 src/quickgui/attributes/qgsquicksubmodel.h
  132. +5 −0 src/quickgui/images/ic_broken_image_black.svg
  133. +71 −0 src/quickgui/images/ic_camera_alt_border.svg
  134. +4 −0 src/quickgui/images/ic_check_black.svg
  135. +4 −0 src/quickgui/images/ic_clear_black.svg
  136. +4 −0 src/quickgui/images/ic_clear_white.svg
  137. +5 −0 src/quickgui/images/ic_delete_forever_white.svg
  138. +66 −0 src/quickgui/images/ic_photo_notavailable_white.svg
  139. +4 −0 src/quickgui/images/ic_save_white.svg
  140. +8 −0 src/quickgui/images/images.qrc
  141. +8 −0 src/quickgui/plugin/CMakeLists.txt
  142. +49 −0 src/quickgui/plugin/editor/qgsquickcheckbox.qml
  143. +125 −0 src/quickgui/plugin/editor/qgsquickdatetime.qml
  144. +85 −0 src/quickgui/plugin/editor/qgsquickexternalresource.qml
  145. +88 −0 src/quickgui/plugin/editor/qgsquicktextedit.qml
  146. +109 −0 src/quickgui/plugin/editor/qgsquickvaluemap.qml
  147. +487 −0 src/quickgui/plugin/qgsquickfeatureform.qml
  148. +47 −0 src/quickgui/plugin/qgsquickfeatureformstyling.qml
  149. +222 −0 src/quickgui/plugin/qgsquickphotopanel.qml
  150. +7 −0 src/quickgui/plugin/qgsquickplugin.cpp
  151. +3 −0 src/quickgui/plugin/qmldir
  152. +1 −1 src/quickgui/qgsquickcoordinatetransformer.h
  153. +1 −1 src/quickgui/qgsquickfeaturehighlight.h
  154. +5 −0 src/quickgui/qgsquickfeaturelayerpair.cpp
  155. +3 −0 src/quickgui/qgsquickfeaturelayerpair.h
  156. +3 −3 src/quickgui/qgsquickmaptransform.h
  157. +34 −0 src/quickgui/qgsquickutils.cpp
  158. +27 −2 src/quickgui/qgsquickutils.h
  159. +1 −2 src/server/CMakeLists.txt
  160. +3 −3 src/server/qgsaccesscontrol.h
  161. +3 −2 src/server/qgsbufferserverrequest.h
  162. +2 −1 src/server/qgsbufferserverresponse.h
  163. +12 −3 src/server/qgsconfigcache.h
  164. +0 −337 src/server/qgsconfigparserutils.cpp
  165. +0 −54 src/server/qgsconfigparserutils.h
  166. +3 −2 src/server/qgsfcgiserverrequest.h
  167. +7 −2 src/server/qgsfcgiserverresponse.h
  168. +7 −1 src/server/qgsfilterresponsedecorator.h
  169. +6 −1 src/server/qgsfilterrestorer.h
  170. +6 −0 src/server/qgsmapserviceexception.h
  171. +0 −1 src/server/qgsserver.h
  172. +0 −1 src/server/qgsserverexception.h
  173. +4 −6 src/server/qgsserverinterfaceimpl.h
  174. +5 −1 src/server/qgsserverlogger.h
  175. +8 −2 src/server/qgsserverplugins.h
  176. +9 −6 src/server/qgsserversettings.h
  177. +0 −29 src/server/qgsservicemodule.cpp
  178. +17 −10 src/server/qgsservicemodule.h
  179. +11 −2 src/server/qgsservicenativeloader.cpp
  180. +6 −5 src/server/qgsservicenativeloader.h
  181. +2 −3 src/server/services/wcs/CMakeLists.txt
  182. +17 −8 src/server/services/wcs/qgswcs.cpp
  183. +33 −11 src/server/services/wcs/qgswcsserviceexception.h
  184. +0 −1 src/server/services/wfs/CMakeLists.txt
  185. +17 −8 src/server/services/wfs/qgswfs.cpp
  186. +21 −17 src/server/services/wfs/qgswfsparameters.h
  187. +43 −7 src/server/services/wfs/qgswfsserviceexception.h
  188. +0 −1 src/server/services/wms/CMakeLists.txt
  189. +13 −1 src/server/services/wms/qgslayerrestorer.h
  190. +17 −14 src/server/services/wms/qgsmaprendererjobproxy.h
  191. +18 −10 src/server/services/wms/qgswms.cpp
  192. +9 −11 src/server/services/wms/qgswmsgetcapabilities.h
  193. +60 −57 src/server/services/wms/qgswmsparameters.h
  194. +24 −19 src/server/services/wms/qgswmsrenderer.h
  195. +35 −5 src/server/services/wms/qgswmsserviceexception.h
  196. +33 −3 src/ui/3d/point3dsymbolwidget.ui
  197. +108 −0 src/ui/mesh/qgsmdalsourceselectbase.ui
  198. +37 −2 tests/src/analysis/testqgsprocessing.cpp
  199. +1 −0 tests/src/core/CMakeLists.txt
  200. +147 −0 tests/src/core/testqgsofflineediting.cpp
  201. +5 −0 tests/src/gui/CMakeLists.txt
  202. +640 −0 tests/src/gui/testqgsprocessingmodel.cpp
  203. +1 −0 tests/src/quickgui/app/CMakeLists.txt
  204. +73 −0 tests/src/quickgui/app/FeaturePanel.qml
  205. +27 −6 tests/src/quickgui/app/main.qml
  206. +1 −0 tests/src/quickgui/app/qml.qrc
  207. +1 −1 tests/src/quickgui/testqgsquickidentifykit.cpp
  208. +28 −0 tests/src/quickgui/testqgsquickutils.cpp
@@ -19,6 +19,6 @@ export CORES=2
mkdir build
pushd build || exit

cmake -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
cmake -DWITH_SERVER=ON -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..

popd || exit
@@ -104,23 +104,16 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/quickgui/plugin
)

IF(WITH_SERVER_PLUGINS)
IF(WITH_SERVER)
SET(DOXYGEN_INPUT
${DOXYGEN_INPUT}
${CMAKE_SOURCE_DIR}/src/server/qgsserver.h
${CMAKE_SOURCE_DIR}/src/server/qgscapabilitiescache.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverexception.h
${CMAKE_SOURCE_DIR}/src/server/qgsrequesthandler.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverfilter.h
${CMAKE_SOURCE_DIR}/src/server/qgsaccesscontrolfilter.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverinterface.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverresponse.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
${CMAKE_SOURCE_DIR}/src/server/qgsservice.h
${CMAKE_SOURCE_DIR}/src/server/qgsserviceregistry.h
${CMAKE_SOURCE_DIR}/src/server/
${CMAKE_SOURCE_DIR}/src/server/services/
${CMAKE_SOURCE_DIR}/src/server/services/wms
${CMAKE_SOURCE_DIR}/src/server/services/wfs
${CMAKE_SOURCE_DIR}/src/server/services/wcs
)
ENDIF(WITH_SERVER_PLUGINS)
ENDIF(WITH_SERVER)

SET(DOXYGEN_FILE_PATTERNS *.h *.cpp *.dox)

@@ -13,6 +13,9 @@ QGIS Quick consists of a Qt plugin that provides the QML components and of a sha

\subsection qgsquick_overview_widgets QML Classes
\subsubsection qgsquick_overview_widgets_mapcanvas MapCanvas
\subsubsection qgsquick_overview_widgets_featureform FeatureForm
A form listing attributes of a given feature. It supports basic edit field widgets for types such as edit text, map value,
checkbox, date/time picker or external resource (photo capture).
\subsubsection qgsquick_overview_widgets_positionmarker PositionMarker
The element refers to current position according gps location device connected to it. It holds information about longitude, latitude, altitude,
direction of the movement and accuracy of the signal. See also QgsQuickPositionKit.
@@ -170,6 +170,7 @@
<file>themes/default/mActionDistributeTop.svg</file>
<file>themes/default/mActionDistributeVCenter.svg</file>
<file>themes/default/mActionAddLayer.svg</file>
<file>themes/default/mActionAddMeshLayer.svg</file>
<file>themes/default/mActionAddAllToOverview.svg</file>
<file>themes/default/mActionAddArrow.svg</file>
<file>themes/default/mActionAddBasicShape.svg</file>
@@ -694,6 +695,7 @@
<file>themes/default/mActionIdentifyByRadius.svg</file>
<file>themes/default/mActionIdentifyByRectangle.svg</file>
<file>themes/default/mIndicatorEmbedded.svg</file>
<file>themes/default/mIconHistory.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="24"
width="24"
version="1.1"
id="svg22"
sodipodi:docname="mActionAddMeshLayer.svg"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
<metadata
id="metadata28">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs26" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1015"
id="namedview24"
showgrid="false"
inkscape:zoom="27.812867"
inkscape:cx="12.444503"
inkscape:cy="11.691578"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g20" />
<g
transform="translate(0 -8)"
id="g20">
<g
transform="matrix(.69230769 0 0 .69230769 1.8461539 9.8461539)"
id="g18">
<rect
fill="#5a8c5a"
height="13"
rx="2.6149371"
ry="2.6149368"
width="13"
x="19"
y="19"
id="rect10" />
<path
d="m21.6 25.499999l7.8 0"
style="fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round;overflow:visible"
id="path12" />
<path
d="m25.5 29.399999l0-7.799999"
style="fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round;overflow:visible"
id="path14" />
<path
d="m20.3 25.499999h10.4c0 0 0 0 0-2.6 0-2.599999-.65-2.599999-5.2-2.599999-4.55 0-5.2 0-5.2 2.599999 0 2.6 0 2.6 0 2.6z"
fill="#fcffff"
fill-rule="evenodd"
opacity=".3"
id="path16" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.5100924,9.3486136 1.0426829,30.202271 13.482968,30.022498 13.626786,21.393398 1.114592,21.24958 23.118796,21.501262 23.082841,8.629522 1.4381833,8.9171586 1.5100924,9.8519778 13.698696,21.429353 13.806559,8.8452495 v 0 0 -0.035955"
id="path829"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 22.615432,8.5935674 14.166105,20.961943"
id="path831"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 7.9819171,21.429353 7.8740534,30.166316"
id="path833"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.0067283,25.887721 H 13.482968"
id="path835"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.5100924,21.177671 13.806559,8.8452495"
id="path837"
inkscape:connector-curvature="0" />
</g>
</svg>
File renamed without changes.
@@ -1,24 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="14.224" height="15.686" viewBox="0, 0, 59.266, 65.359">
<g id="Background">
<rect x="0" y="0" width="59.266" height="65.359" fill="#000000" fill-opacity="0"/>
</g>
<defs>
<linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="45.722" y1="57.164" x2="44.919" y2="4.33" gradientTransform="matrix(1, 0, 0, 1, 0, 0)">
<stop offset="0" stop-color="#589632"/>
<stop offset="1" stop-color="#93B023"/>
</linearGradient>
<linearGradient id="Gradient_2" gradientUnits="userSpaceOnUse" x1="30.064" y1="58.911" x2="29.267" y2="6.518" gradientTransform="matrix(1, 0, 0, 1, 0, 0)">
<stop offset="0" stop-color="#589632"/>
<stop offset="1" stop-color="#93B023"/>
</linearGradient>
</defs>
<g id="Layer_1">
<path d="M31.683,32.253 L39.335,32.253 L32.859,25.85 L24.925,25.85 L24.925,33.474 L31.683,40.21 z" fill="#EE7913" id="polygon3"/>
<path d="M56.226,48.951 L42.573,35.454 L34.884,35.454 L34.884,43.4 L47.967,56.44 L56.226,56.44 z" fill="url(#Gradient_1)" id="polygon10"/>
<path d="M34.884,35.454 L42.573,35.454 L39.335,32.253 L31.683,32.253 L31.683,40.21 L34.884,43.4 z" fill="#F0E64A" id="polygon12"/>
<path d="M33.372,47.042 C32.213,47.309 31.007,47.453 29.764,47.453 C20.869,47.453 13.305,40.139 13.305,30.657 C13.305,21.174 20.786,14.021 29.764,14.021 C38.741,14.021 45.889,21.173 45.889,30.657 C45.889,32.199 45.697,33.683 45.342,35.089 L53.574,43.319 C55.697,39.601 56.884,35.277 56.884,30.593 C56.884,15.978 45.22,5.034 29.597,5.034 C14.045,5.034 2.382,15.906 2.382,30.593 C2.382,45.353 14.046,56.44 29.597,56.44 C33.612,56.44 37.364,55.702 40.725,54.358 L33.372,47.042 z" fill="url(#Gradient_2)" id="path19"/>
<path d="M24.925,25.85 L56.226,56.44 L56.226,48.951 L42.573,35.454 L39.335,32.253 L32.859,25.85 z" fill="#FFFFFF" fill-opacity="0.172" id="polygon4153"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 66.666 66.667"><defs><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="45.722" y1="57.164" x2="44.919" y2="4.33" gradientTransform="translate(0 -1.806)"><stop offset="0" stop-color="#589632"/><stop offset="1" stop-color="#93B023"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="30.064" y1="58.911" x2="29.267" y2="6.518" gradientTransform="translate(0 -1.806)"><stop offset="0" stop-color="#589632"/><stop offset="1" stop-color="#93B023"/></linearGradient></defs><path d="M35.527 34.956h8.19l-6.931-6.853h-8.492v8.16l7.233 7.21z" fill="#ee7913"/><path d="M61.796 51.022L47.183 36.576h-8.23v8.504l14.003 13.957h8.84z" fill="url(#a)" transform="translate(0 1.806)"/><path d="M38.953 38.381h8.23l-3.466-3.425h-8.19v8.516l3.426 3.415z" fill="#f0e64a"/><path d="M37.335 48.978a17.173 17.173 0 0 1-3.862.44c-9.52 0-17.616-7.828-17.616-17.977 0-10.15 8.007-17.805 17.616-17.805 9.608 0 17.259 7.655 17.259 17.805a19.351 19.351 0 0 1-.586 4.744l8.811 8.809c2.272-3.98 3.543-8.608 3.543-13.621 0-15.643-12.484-27.356-29.206-27.356-16.645 0-29.128 11.636-29.128 27.356 0 15.798 12.484 27.664 29.128 27.664 4.298 0 8.314-.79 11.91-2.228z" fill="url(#b)" transform="translate(0 1.806)"/><path d="M28.294 28.103l33.502 32.74v-8.016L47.183 38.383l-3.466-3.426-6.931-6.853z" fill="#fff" fill-opacity=".172"/></svg>
@@ -28,16 +28,23 @@ class QgsOfflineEditing : QObject
UpdateGeometries
};

enum ContainerType
{
SpatiaLite,
GPKG
};

QgsOfflineEditing();

bool convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected = false );
bool convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected = false, ContainerType containerType = SpatiaLite );
%Docstring
Convert current project for offline editing

:param offlineDataPath: Path to offline db file
:param offlineDbFile: Offline db file name
:param layerIds: List of layer names to convert
:param onlySelected: Only copy selected features from layers where a selection is present
:param containerType: defines the SQLite file container type like SpatiaLite or GPKG
%End

bool isOfflineProject() const;
@@ -143,7 +143,7 @@ Classify color ramp shader
:param input: raster input used in classification (quantile mode only)
%End

virtual bool shade( double value, int *returnRedValue /Out/, int *returnGreenValue /Out/, int *returnBlueValue /Out/, int *returnAlphaValue /Out/ );
virtual bool shade( double value, int *returnRedValue /Out/, int *returnGreenValue /Out/, int *returnBlueValue /Out/, int *returnAlphaValue /Out/ ) const;

%Docstring
Generates and new RGB value based on one input value
@@ -152,7 +152,7 @@ Generates and new RGB value based on one input value
virtual bool shade( double redValue, double greenValue,
double blueValue, double alphaValue,
int *returnRedValue /Out/, int *returnGreenValue /Out/,
int *returnBlueValue /Out/, int *returnAlphaValue /Out/ );
int *returnBlueValue /Out/, int *returnAlphaValue /Out/ ) const;
%Docstring
Generates and new RGB value based on original RGB value
%End
@@ -54,7 +54,7 @@ Sets the minimum ``value`` for the raster shader.
int *returnRedValue /Out/,
int *returnGreenValue /Out/,
int *returnBlueValue /Out/,
int *returnAlpha /Out/ );
int *returnAlpha /Out/ ) const;
%Docstring
Generates an new RGBA value based on one input ``value``.

@@ -74,7 +74,7 @@ Generates an new RGBA value based on one input ``value``.
int *returnRedValue /Out/,
int *returnGreenValue /Out/,
int *returnBlueValue /Out/,
int *returnAlpha /Out/ );
int *returnAlpha /Out/ ) const;
%Docstring
Generates an new RGBA value based on an original RGBA value.

@@ -0,0 +1,3 @@
# The following has been generated automatically from src/gui/processing/qgsprocessingtoolboxmodel.h
QgsProcessingToolboxProxyModel.Filters.baseClass = QgsProcessingToolboxProxyModel
Filters = QgsProcessingToolboxProxyModel # dirty hack since SIP seems to introduce the flags in module

0 comments on commit 14c74d8

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