Skip to content
Permalink
Browse files

Merge branch 'extendMapTool' of github.com:lbartoletti/QGIS into exte…

…ndMapTool
  • Loading branch information
lbartoletti committed Nov 13, 2018
2 parents 7b98302 + be2ac88 commit 574a57f2e49517e462c2dbfc1145cf8aca5b69f7
Showing with 2,269 additions and 232 deletions.
  1. +1 −0 .docker/qgis3-build-deps.dockerfile
  2. +10 −10 INSTALL
  3. +22 −0 cmake/FindEXIV2.cmake
  4. +2 −0 debian/control
  5. +4 −0 debian/control.in
  6. +10 −10 doc/INSTALL.html
  7. +6 −6 doc/linux.t2t
  8. +1 −0 images/images.qrc
  9. +1 −0 images/themes/default/mIconFieldBinary.svg
  10. +1 −1 images/themes/default/mIconFieldDate.svg
  11. +1 −1 images/themes/default/mIconFieldDateTime.svg
  12. +1 −1 images/themes/default/mIconFieldFloat.svg
  13. +1 −1 images/themes/default/mIconFieldInteger.svg
  14. +1 −1 images/themes/default/mIconFieldText.svg
  15. +1 −1 images/themes/default/mIconFieldTime.svg
  16. +2 −0 python/3d/auto_generated/qgsphongmaterialsettings.sip.in
  17. +1 −0 python/analysis/analysis_auto.sip
  18. +75 −0 python/analysis/auto_generated/raster/qgsexiftools.sip.in
  19. +1 −1 python/core/auto_generated/geometry/qgsgeometryutils.sip.in
  20. +1 −1 python/gui/auto_generated/qgsdataitemguiprovider.sip.in
  21. +8 −0 python/gui/auto_generated/qgsnewgeopackagelayerdialog.sip.in
  22. +4 −0 scripts/astyle.sh
  23. +1 −0 src/3d/qgs3dmapscene.cpp
  24. +28 −0 src/3d/qgs3dmapsettings.cpp
  25. +41 −3 src/3d/qgs3dmapsettings.h
  26. +8 −0 src/3d/qgsphongmaterialsettings.h
  27. +55 −13 src/3d/terrain/qgsdemterraintilegeometry_p.cpp
  28. +3 −1 src/3d/terrain/qgsdemterraintilegeometry_p.h
  29. +11 −10 src/3d/terrain/qgsdemterraintileloader_p.cpp
  30. +2 −1 src/3d/terrain/qgsflatterraingenerator.cpp
  31. +20 −14 src/3d/terrain/qgsterraintileloader_p.cpp
  32. +2 −1 src/3d/terrain/qgsterraintileloader_p.h
  33. +11 −1 src/analysis/CMakeLists.txt
  34. +158 −0 src/analysis/processing/qgsalgorithmextractbinary.cpp
  35. +59 −0 src/analysis/processing/qgsalgorithmextractbinary.h
  36. +2 −0 src/analysis/processing/qgsnativealgorithms.cpp
  37. +226 −0 src/analysis/raster/qgsexiftools.cpp
  38. +84 −0 src/analysis/raster/qgsexiftools.h
  39. +7 −0 src/app/3d/qgs3dmapconfigwidget.cpp
  40. +11 −0 src/app/3d/qgsphongmaterialwidget.cpp
  41. +3 −0 src/app/3d/qgsphongmaterialwidget.h
  42. +14 −1 src/app/browser/qgsinbuiltdataitemproviders.cpp
  43. +1 −1 src/app/main.cpp
  44. +4 −4 src/app/pluginmanager/qgspluginmanager.cpp
  45. +1 −26 src/app/qgisapp.cpp
  46. +0 −2 src/app/qgisapp.h
  47. +1 −0 src/app/qgsattributetabledialog.cpp
  48. +23 −2 src/app/qgsfeatureaction.cpp
  49. +9 −0 src/app/qgsfeatureaction.h
  50. +3 −3 src/app/qgshandlebadlayers.cpp
  51. +0 −4 src/app/qgsstatusbarcoordinateswidget.cpp
  52. +0 −1 src/app/qgsstatusbarscalewidget.cpp
  53. +0 −5 src/app/qgsvectorlayerproperties.cpp
  54. +1 −1 src/core/geometry/qgsgeometryutils.h
  55. +12 −1 src/core/providers/memory/qgsmemoryprovider.cpp
  56. +3 −0 src/core/providers/memory/qgsmemoryproviderutils.cpp
  57. +4 −0 src/core/qgsfield.cpp
  58. +4 −0 src/core/qgsfields.cpp
  59. +1 −1 src/core/qgsmaplayermodel.cpp
  60. +15 −0 src/core/qgsogrutils.cpp
  61. +12 −0 src/core/qgsvectorfilewriter.cpp
  62. +4 −0 src/gui/CMakeLists.txt
  63. +2 −0 src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
  64. +45 −0 src/gui/editorwidgets/qgsbinarywidgetfactory.cpp
  65. +59 −0 src/gui/editorwidgets/qgsbinarywidgetfactory.h
  66. +196 −0 src/gui/editorwidgets/qgsbinarywidgetwrapper.cpp
  67. +86 −0 src/gui/editorwidgets/qgsbinarywidgetwrapper.h
  68. +5 −0 src/gui/editorwidgets/qgscheckboxwidgetfactory.h
  69. +2 −2 src/gui/editorwidgets/qgscheckboxwidgetwrapper.cpp
  70. +12 −1 src/gui/editorwidgets/qgscheckboxwidgetwrapper.h
  71. +2 −2 src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp
  72. +12 −1 src/gui/editorwidgets/qgsclassificationwidgetwrapper.h
  73. +5 −0 src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.h
  74. +5 −0 src/gui/editorwidgets/qgscolorwidgetfactory.h
  75. +2 −2 src/gui/editorwidgets/qgscolorwidgetwrapper.cpp
  76. +12 −1 src/gui/editorwidgets/qgscolorwidgetwrapper.h
  77. +5 −0 src/gui/editorwidgets/qgsdatetimeeditfactory.h
  78. +2 −2 src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
  79. +12 −1 src/gui/editorwidgets/qgsdatetimeeditwrapper.h
  80. +5 −0 src/gui/editorwidgets/qgsenumerationwidgetfactory.h
  81. +2 −2 src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp
  82. +12 −1 src/gui/editorwidgets/qgsenumerationwidgetwrapper.h
  83. +5 −0 src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h
  84. +2 −2 src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp
  85. +12 −1 src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.h
  86. +5 −0 src/gui/editorwidgets/qgshiddenwidgetfactory.h
  87. +2 −2 src/gui/editorwidgets/qgshiddenwidgetwrapper.cpp
  88. +12 −1 src/gui/editorwidgets/qgshiddenwidgetwrapper.h
  89. +2 −1 src/gui/editorwidgets/qgskeyvaluewidgetfactory.h
  90. +2 −2 src/gui/editorwidgets/qgskeyvaluewidgetwrapper.cpp
  91. +9 −2 src/gui/editorwidgets/qgskeyvaluewidgetwrapper.h
  92. +2 −1 src/gui/editorwidgets/qgslistwidgetfactory.h
  93. +2 −2 src/gui/editorwidgets/qgslistwidgetwrapper.cpp
  94. +9 −2 src/gui/editorwidgets/qgslistwidgetwrapper.h
  95. +5 −0 src/gui/editorwidgets/qgsrangewidgetfactory.h
  96. +2 −2 src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
  97. +12 −1 src/gui/editorwidgets/qgsrangewidgetwrapper.h
  98. +4 −4 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  99. +1 −1 src/gui/editorwidgets/qgssearchwidgettoolbutton.cpp
  100. +6 −0 src/gui/editorwidgets/qgstexteditwidgetfactory.h
  101. +2 −2 src/gui/editorwidgets/qgstexteditwrapper.cpp
  102. +12 −1 src/gui/editorwidgets/qgstexteditwrapper.h
  103. +5 −0 src/gui/editorwidgets/qgsuniquevaluewidgetfactory.h
  104. +2 −2 src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp
  105. +12 −1 src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.h
  106. +5 −0 src/gui/editorwidgets/qgsuuidwidgetfactory.h
  107. +2 −2 src/gui/editorwidgets/qgsuuidwidgetwrapper.cpp
  108. +12 −1 src/gui/editorwidgets/qgsuuidwidgetwrapper.h
  109. +6 −0 src/gui/editorwidgets/qgsvaluemapwidgetfactory.h
  110. +2 −2 src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp
  111. +12 −1 src/gui/editorwidgets/qgsvaluemapwidgetwrapper.h
  112. +5 −0 src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h
  113. +2 −2 src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
  114. +12 −1 src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h
  115. +4 −4 src/gui/qgsattributeform.cpp
  116. +1 −1 src/gui/qgsdataitemguiprovider.cpp
  117. +1 −1 src/gui/qgsdataitemguiprovider.h
  118. +25 −10 src/gui/qgsnewgeopackagelayerdialog.cpp
  119. +9 −0 src/gui/qgsnewgeopackagelayerdialog.h
  120. +9 −9 src/gui/qgsrelationeditorwidget.cpp
  121. +46 −9 src/native/win/qgswinnative.cpp
  122. +3 −1 src/native/win/qgswinnative.h
  123. +1 −1 src/plugins/coordinate_capture/coordinatecapture.cpp
  124. +6 −3 src/providers/arcgisrest/qgsafsfeatureiterator.cpp
  125. +31 −0 src/providers/ogr/qgsogrprovider.cpp
  126. +28 −1 src/ui/3d/map3dconfigwidget.ui
  127. +0 −1 src/ui/qgisapp.ui
  128. +39 −0 tests/src/analysis/testqgsprocessingalgs.cpp
  129. +5 −0 tests/src/core/testqgsfield.cpp
  130. +5 −0 tests/src/gui/testqgseditorwidgetregistry.cpp
  131. +2 −0 tests/src/python/CMakeLists.txt
  132. +42 −1 tests/src/python/test_provider_memory.py
  133. +56 −1 tests/src/python/test_provider_ogr.py
  134. +50 −1 tests/src/python/test_provider_ogr_sqlite.py
  135. +71 −0 tests/src/python/test_qgsbinarywidget.py
  136. +96 −0 tests/src/python/test_qgsexiftools.py
  137. +9 −3 tests/src/python/test_qgsmaplayermodel.py
  138. +62 −1 tests/src/python/test_qgsvectorfilewriter.py
  139. BIN tests/testdata/attachments.gdb/a00000001.TablesByName.atx
  140. BIN tests/testdata/attachments.gdb/a00000001.freelist
  141. BIN tests/testdata/attachments.gdb/a00000001.gdbindexes
  142. BIN tests/testdata/attachments.gdb/a00000001.gdbtable
  143. BIN tests/testdata/attachments.gdb/a00000001.gdbtablx
  144. BIN tests/testdata/attachments.gdb/a00000002.gdbtable
  145. BIN tests/testdata/attachments.gdb/a00000002.gdbtablx
  146. BIN tests/testdata/attachments.gdb/a00000003.gdbindexes
  147. BIN tests/testdata/attachments.gdb/a00000003.gdbtable
  148. BIN tests/testdata/attachments.gdb/a00000003.gdbtablx
  149. BIN tests/testdata/attachments.gdb/a00000004.CatItemsByPhysicalName.atx
  150. BIN tests/testdata/attachments.gdb/a00000004.CatItemsByType.atx
  151. BIN tests/testdata/attachments.gdb/a00000004.FDO_UUID.atx
  152. BIN tests/testdata/attachments.gdb/a00000004.freelist
  153. BIN tests/testdata/attachments.gdb/a00000004.gdbindexes
  154. BIN tests/testdata/attachments.gdb/a00000004.gdbtable
  155. BIN tests/testdata/attachments.gdb/a00000004.gdbtablx
  156. BIN tests/testdata/attachments.gdb/a00000004.spx
  157. BIN tests/testdata/attachments.gdb/a00000005.CatItemTypesByName.atx
  158. BIN tests/testdata/attachments.gdb/a00000005.CatItemTypesByParentTypeID.atx
  159. BIN tests/testdata/attachments.gdb/a00000005.CatItemTypesByUUID.atx
  160. BIN tests/testdata/attachments.gdb/a00000005.gdbindexes
  161. BIN tests/testdata/attachments.gdb/a00000005.gdbtable
  162. BIN tests/testdata/attachments.gdb/a00000005.gdbtablx
  163. BIN tests/testdata/attachments.gdb/a00000006.CatRelsByDestinationID.atx
  164. BIN tests/testdata/attachments.gdb/a00000006.CatRelsByOriginID.atx
  165. BIN tests/testdata/attachments.gdb/a00000006.CatRelsByType.atx
  166. BIN tests/testdata/attachments.gdb/a00000006.FDO_UUID.atx
  167. BIN tests/testdata/attachments.gdb/a00000006.freelist
  168. BIN tests/testdata/attachments.gdb/a00000006.gdbindexes
  169. BIN tests/testdata/attachments.gdb/a00000006.gdbtable
  170. BIN tests/testdata/attachments.gdb/a00000006.gdbtablx
  171. BIN tests/testdata/attachments.gdb/a00000007.CatRelTypesByBackwardLabel.atx
  172. BIN tests/testdata/attachments.gdb/a00000007.CatRelTypesByDestItemTypeID.atx
  173. BIN tests/testdata/attachments.gdb/a00000007.CatRelTypesByForwardLabel.atx
  174. BIN tests/testdata/attachments.gdb/a00000007.CatRelTypesByName.atx
  175. BIN tests/testdata/attachments.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx
  176. BIN tests/testdata/attachments.gdb/a00000007.CatRelTypesByUUID.atx
  177. BIN tests/testdata/attachments.gdb/a00000007.gdbindexes
  178. BIN tests/testdata/attachments.gdb/a00000007.gdbtable
  179. BIN tests/testdata/attachments.gdb/a00000007.gdbtablx
  180. BIN tests/testdata/attachments.gdb/a00000016.gdbindexes
  181. BIN tests/testdata/attachments.gdb/a00000016.gdbtable
  182. BIN tests/testdata/attachments.gdb/a00000016.gdbtablx
  183. BIN tests/testdata/attachments.gdb/a00000016.spx
  184. BIN tests/testdata/attachments.gdb/a00000017.GDB_5_REL_OBJECTID.atx
  185. BIN tests/testdata/attachments.gdb/a00000017.gdbindexes
  186. BIN tests/testdata/attachments.gdb/a00000017.gdbtable
  187. BIN tests/testdata/attachments.gdb/a00000017.gdbtablx
  188. BIN tests/testdata/attachments.gdb/gdb
  189. BIN tests/testdata/attachments.gdb/timestamps
  190. BIN tests/testdata/photos/0997.JPG
  191. BIN tests/testdata/photos/geotagged.jpg
  192. +1 −0 tests/testdata/photos/not_photo.jpg
  193. BIN tests/testdata/photos/notags.JPG
@@ -25,6 +25,7 @@ RUN apt-get update \
git \
graphviz \
grass-dev \
libexiv2-dev \
libexpat1-dev \
libfcgi-dev \
libgdal-dev \
20 INSTALL

Large diffs are not rendered by default.

@@ -0,0 +1,22 @@
# Find EXIV2
# ~~~~~~~~~~
# CMake module to search for EXIV2 library
#
# If it's found it sets EXIV2_FOUND to TRUE
# and following variables are set:
# EXIV2_INCLUDE_DIR
# EXIV2_LIBRARY
#


FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exiv2.hpp /usr/local/include /usr/include)
FIND_LIBRARY(EXIV2_LIBRARY NAMES exiv2 PATHS /usr/local/lib /usr/lib)

IF (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARY)
SET(EXIV2_FOUND TRUE)
MESSAGE(STATUS "Found exiv2: ${EXIV2_LIBRARY}")
ELSE (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARY)
MESSAGE(EXIV2_INCLUDE_DIR=${EXIV2_INCLUDE_DIR})
MESSAGE(EXIV2_LIBRARY=${EXIV2_LIBRARY})
MESSAGE(FATAL_ERROR "Could not find exiv2")
ENDIF (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARY)
@@ -10,6 +10,7 @@ Build-Depends:
dh-python,
flex,
grass-dev,
libexiv2-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.11),
@@ -182,6 +183,7 @@ Architecture: any
Section: libdevel
Depends:
grass-dev,
libexiv2-dev,
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
@@ -10,6 +10,7 @@ Build-Depends:
dh-python,
flex,
grass-dev,
libexiv2-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.11),
@@ -21,6 +22,7 @@ Build-Depends:
libsqlite3-dev,
libspatialindex-dev,
libzip-dev,
libexiv2-dev,
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev,
#!xenial# qtbase5-private-dev,
libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5serialport5-dev, libqt5scintilla2-dev,
@@ -214,6 +216,7 @@ Architecture: any
Section: libdevel
Depends:
grass-dev,
libexiv2-dev,
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
@@ -381,6 +384,7 @@ Section: python
Provides: ${python:Provides}
Depends:
gdal-bin,
python-gdal,
python3-gdal,
python3-matplotlib,
libqgis-customwidgets,

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -728,6 +728,7 @@
<file>themes/default/mIconAllRings.svg</file>
<file>themes/default/mIconExteriorRing.svg</file>
<file>themes/default/mIconInteriorRings.svg</file>
<file>themes/default/mIconFieldBinary.svg</file>
<file>themes/default/mActionTrimExtendFeature.svg</file>
</qresource>
<qresource prefix="/images/tips">
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M5.8 5.92c-.282 0-.489-.15-.62-.454-.13-.3-.195-.788-.195-1.462 0-.671.065-1.159.196-1.462.13-.3.337-.45.62-.45.285 0 .493.15.624.45.13.303.195.79.195 1.462 0 .674-.065 1.161-.195 1.462-.13.303-.339.455-.624.455zM3.833 4.005c0 .96.165 1.685.496 2.176.333.491.824.737 1.473.737.651 0 1.142-.246 1.473-.737.333-.491.5-1.216.5-2.176 0-.957-.167-1.681-.5-2.172-.33-.491-.822-.737-1.473-.737-.65 0-1.14.246-1.473.737-.331.49-.496 1.215-.496 2.172zm5.122 1.827h1.24V2.189l-1.154.286v-1l1.162-.278h1.07V5.83h1.24v.977H8.955z" font-weight="700" font-family="DejaVu Sans Mono" letter-spacing="0" word-spacing="0" fill="#555" stroke="#555" stroke-width=".353"/><circle cx="5.78" cy="3.962" r=".545" fill="#555"/><path d="M10.523 10.116c-.284 0-.49.151-.62.455-.13.3-.196.787-.196 1.461 0 .672.065 1.16.196 1.462.13.301.337.451.62.451.285 0 .493-.15.623-.45.13-.304.196-.791.196-1.463 0-.674-.065-1.16-.196-1.461-.13-.304-.338-.455-.623-.455zm-1.97 1.916c0-.96.166-1.684.496-2.176.334-.49.825-.736 1.474-.736.65 0 1.142.245 1.473.736.333.492.5 1.217.5 2.176 0 .958-.167 1.682-.5 2.173-.331.49-.822.736-1.473.736-.65 0-1.14-.245-1.474-.736-.33-.491-.496-1.215-.496-2.173zm-4.595 1.823h1.24v-3.641l-1.154.285v-1l1.162-.278h1.07v4.634h1.24v.977H3.959z" font-weight="700" letter-spacing="0" word-spacing="0" font-family="DejaVu Sans Mono" fill="#555" stroke="#555" stroke-width=".353"/><circle cx="10.516" cy="12.059" r=".545" fill="#555"/></svg>
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="128" width="128"><path d="M43.016 46.164h16.787V62.95H43.016zm25.18 0h16.788V62.95H68.197zm25.181 0h16.787V62.95H93.377zm-75.54 50.36h16.786v16.787H17.836zm25.18 0h16.786v16.787H43.016zm25.18 0h16.787v16.787H68.197zm-25.18-25.18h16.786v16.787H43.016zm25.18 0h16.787v16.787H68.197zm25.18 0h16.787v16.787H93.377zm-75.54 0h16.786v16.787H17.836zM110.163 0v8.393H93.377V0H34.623v8.393H17.836V0H3.148v128h121.704V0zm8.393 121.705H9.443V29.377h109.114z" fill="#555"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M5.61 6.05h1.926v1.835H5.61zm2.89 0h1.926v1.835H8.5zm2.889 0h1.926v1.835h-1.926zM2.72 11.556h1.926v1.836H2.721zm2.89 0h1.925v1.836H5.61zm2.889 0h1.926v1.836H8.5zM5.61 8.803h1.926v1.836H5.61zm2.89 0h1.926v1.836H8.5zm2.889 0h1.926v1.836h-1.926zm-8.668 0h1.926v1.836H2.721zM12.991 1v1.014h-1.926V1H4.971v1.014H2.973V1H1.036v14H15V1zm1.059 13.024H1.986V3.997H14.05z" fill="#555"/></svg>
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="128" width="128"><path d="M43.016 46.164h16.787V62.95H43.016zm25.18 0h16.788V62.95H68.197zm25.181 0h16.787V62.95H93.377zm-75.54 50.36h16.786v16.787H17.836zm25.18 0h16.786v16.787H43.016zm25.18 0h16.787v16.787H68.197zm-25.18-25.18h16.786v16.787H43.016zm25.18 0h16.787v16.787H68.197zm25.18 0h16.787v16.787H93.377zm-75.54 0h16.786v16.787H17.836zM110.163 0v8.393H93.377V0H34.623v8.393H17.836V0H3.148v128h121.704V0zm8.393 121.705H9.443V29.377h109.114z" fill="#555"/><circle r="23.004" cy="95" cx="91.25" fill="#fff" stroke="#000" stroke-width="2.16"/><path d="M91.25 68c14.87 0 27 12.046 27 27 0 14.87-12.13 27-27 27-14.954 0-27-12.13-27-27 0-14.954 12.046-27 27-27zm0 48.018c11.63 0 21.018-9.47 21.018-21.101 0-11.63-9.387-21.019-21.018-21.019-11.63 0-21.102 9.388-21.102 21.019 0 11.63 9.471 21.101 21.102 21.101zm7.975-17.778h-8.473c-.914 0-1.662-.332-2.16-.997l-9.554-10.385c-2.576-2.741 1.661-6.729 4.32-4.07l8.64 9.47h7.227c4.071 0 3.656 5.982 0 5.982zm-9.637-19.108c0-.83.748-1.578 1.579-1.578.83 0 1.578.748 1.578 1.578 0 .831-.747 1.579-1.578 1.579-.83 0-1.579-.748-1.579-1.579zm11.05 4.32c0-.83.747-1.578 1.578-1.578.83 0 1.579.748 1.579 1.578 0 .831-.748 1.579-1.579 1.579-.83 0-1.578-.748-1.578-1.579zm4.901 11.382c0-.83.748-1.579 1.579-1.579.83 0 1.578.748 1.578 1.579 0 .83-.748 1.578-1.578 1.578-.831 0-1.579-.747-1.579-1.578zm-4.403 11.132c0-.83.748-1.578 1.579-1.578.83 0 1.578.747 1.578 1.578 0 .83-.748 1.579-1.578 1.579-.831 0-1.579-.748-1.579-1.579zm-11.63 4.819c0-.831.747-1.579 1.578-1.579.83 0 1.578.748 1.578 1.579 0 .83-.747 1.578-1.578 1.578-.83 0-1.579-.748-1.579-1.578zm-10.8-4.32c0-.831.747-1.579 1.578-1.579.83 0 1.578.748 1.578 1.579 0 .83-.747 1.578-1.578 1.578-.83 0-1.579-.748-1.579-1.578zM73.72 94.834c0-.83.747-1.579 1.578-1.579.831 0 1.579.748 1.579 1.579 0 .83-.748 1.578-1.579 1.578-.83 0-1.578-.747-1.578-1.578z" fill="#555"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M5.61 6.05h1.926v1.835H5.61zm2.89 0h1.926v1.835H8.5zm2.889 0h1.926v1.835h-1.926zM2.72 11.556h1.926v1.836H2.721zm2.89 0h1.925v1.836H5.61zm2.889 0h1.926v1.836H8.5zM5.61 8.803h1.926v1.836H5.61zm2.89 0h1.926v1.836H8.5zm2.889 0h1.926v1.836h-1.926zm-8.668 0h1.926v1.836H2.721zM12.991 1v1.014h-1.926V1H4.971v1.014H2.973V1H1.036v14H15V1zm1.059 13.024H1.986V3.997H14.05z" fill="#555"/><g transform="matrix(.18334 0 0 .18334 6.178 6.922)"><circle cx="24.25" cy="20" r="23.004" fill="#fff" stroke="#000" stroke-width="2.16"/><path d="M24.25-7c14.87 0 27 12.046 27 27 0 14.87-12.13 27-27 27-14.954 0-27-12.13-27-27 0-14.954 12.046-27 27-27zm0 48.018c11.63 0 21.018-9.47 21.018-21.101 0-11.63-9.387-21.019-21.018-21.019-11.63 0-21.102 9.388-21.102 21.019 0 11.63 9.471 21.101 21.102 21.101zm7.975-17.778h-8.473c-.914 0-1.662-.332-2.16-.997l-9.554-10.385c-2.576-2.741 1.661-6.729 4.32-4.07l8.64 9.47h7.227c4.071 0 3.656 5.982 0 5.982zM22.588 4.132c0-.83.748-1.578 1.579-1.578.83 0 1.578.748 1.578 1.578 0 .831-.747 1.579-1.578 1.579-.83 0-1.579-.748-1.579-1.579zm11.05 4.32c0-.83.747-1.578 1.578-1.578.83 0 1.579.748 1.579 1.578 0 .831-.748 1.579-1.579 1.579-.83 0-1.578-.748-1.578-1.579zm4.901 11.382c0-.83.748-1.579 1.579-1.579.83 0 1.578.748 1.578 1.579 0 .83-.748 1.578-1.578 1.578-.831 0-1.579-.747-1.579-1.578zm-4.403 11.132c0-.83.748-1.578 1.579-1.578.83 0 1.578.747 1.578 1.578 0 .83-.748 1.579-1.578 1.579-.831 0-1.579-.748-1.579-1.579zm-11.63 4.819c0-.831.747-1.579 1.578-1.579.83 0 1.578.748 1.578 1.579 0 .83-.747 1.578-1.578 1.578-.83 0-1.579-.748-1.579-1.578zm-10.8-4.32c0-.831.747-1.579 1.578-1.579.83 0 1.578.748 1.578 1.579 0 .83-.747 1.578-1.578 1.578-.83 0-1.579-.748-1.579-1.578zM6.72 19.834c0-.83.747-1.579 1.578-1.579.831 0 1.579.748 1.579 1.579 0 .83-.748 1.578-1.579 1.578-.83 0-1.578-.747-1.578-1.578z" fill="#555"/></g></svg>
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="64" width="64"><text transform="translate(0 32)" x="-1.521" y="13.321" font-weight="700" font-size="36.594" font-family="DejaVu Sans Mono" letter-spacing="0" word-spacing="0" stroke="#555" stroke-width="1.677" fill="#555"><tspan font-weight="bold" x="-1.521" y="13.321">1.2</tspan></text></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><text x="-.351" y="10.773" font-weight="700" font-size="9.188" letter-spacing="0" word-spacing="0" font-family="DejaVu Sans Mono" fill="#555" stroke="#555" stroke-width=".421"><tspan x="-.351" y="10.773">1.2</tspan></text></svg>
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="64" width="64"><text transform="translate(0 32)" x="-1.521" y="13.321" font-weight="700" font-size="36.594" font-family="DejaVu Sans Mono" letter-spacing="0" word-spacing="0" stroke="#555" stroke-width="1.677" fill="#555"><tspan font-weight="bold" x="-1.521" y="13.321">123</tspan></text></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><text x="-.239" y="10.792" font-weight="700" font-size="9.11" letter-spacing="0" word-spacing="0" font-family="DejaVu Sans Mono" fill="#555" stroke="#555" stroke-width=".417"><tspan x="-.239" y="10.792">123</tspan></text></svg>
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="64" width="64"><text transform="translate(0 32)" x="-.333" y="13.642" font-weight="700" font-size="36.594" font-family="DejaVu Sans Mono" letter-spacing="0" word-spacing="0" stroke="#555" stroke-width="1.677" fill="#555"><tspan font-weight="bold" x="-.333" y="13.642">abc</tspan></text></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><text x=".346" y="10.715" font-weight="700" font-size="8.62" letter-spacing="0" word-spacing="0" font-family="DejaVu Sans Mono" fill="#555" stroke="#555" stroke-width=".395"><tspan x=".346" y="10.715">abc</tspan></text></svg>
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="128" width="128"><path d="M64 0c35.25 0 64 28.554 64 64 0 35.25-28.75 64-64 64-35.446 0-64-28.75-64-64C0 28.554 28.554 0 64 0zm0 113.822c27.57 0 49.822-22.45 49.822-50.019 0-27.57-22.253-49.821-49.822-49.821-27.57 0-50.018 22.252-50.018 49.821 0 27.57 22.449 50.019 50.018 50.019zM82.905 71.68H62.818c-2.166 0-3.938-.788-5.12-2.363L35.052 44.702c-6.104-6.499 3.939-15.951 10.24-9.65l20.48 22.45h17.133c9.649 0 8.664 14.178 0 14.178zM60.062 26.388c0-1.97 1.772-3.742 3.741-3.742 1.97 0 3.742 1.772 3.742 3.742 0 1.969-1.773 3.741-3.742 3.741-1.97 0-3.741-1.772-3.741-3.741zm26.19 10.24c0-1.97 1.773-3.742 3.742-3.742 1.97 0 3.741 1.772 3.741 3.742 0 1.969-1.772 3.741-3.741 3.741-1.97 0-3.742-1.772-3.742-3.741zm11.619 26.978c0-1.97 1.772-3.741 3.741-3.741 1.97 0 3.742 1.772 3.742 3.741 0 1.97-1.772 3.742-3.742 3.742-1.969 0-3.741-1.773-3.741-3.742zM87.434 89.994c0-1.97 1.772-3.742 3.741-3.742 1.97 0 3.742 1.773 3.742 3.742 0 1.97-1.772 3.741-3.742 3.741-1.969 0-3.741-1.772-3.741-3.741zm-27.57 11.421c0-1.969 1.773-3.741 3.742-3.741 1.97 0 3.742 1.772 3.742 3.741 0 1.97-1.773 3.742-3.742 3.742-1.97 0-3.741-1.772-3.741-3.742zm-25.6-10.24c0-1.969 1.773-3.741 3.742-3.741 1.97 0 3.742 1.772 3.742 3.741 0 1.97-1.773 3.742-3.742 3.742-1.97 0-3.741-1.772-3.741-3.742zM22.45 63.606c0-1.97 1.773-3.741 3.742-3.741s3.741 1.772 3.741 3.741c0 1.97-1.772 3.742-3.741 3.742-1.97 0-3.742-1.773-3.742-3.742z" fill="#555"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8.004.088a7.932 7.932 0 0 1 7.932 7.932c0 4.369-3.563 7.932-7.932 7.932A7.932 7.932 0 0 1 .072 8.02 7.916 7.916 0 0 1 8.004.088zm0 14.107c3.417 0 6.175-2.783 6.175-6.2a6.166 6.166 0 0 0-6.175-6.174c-3.417 0-6.2 2.758-6.2 6.174 0 3.417 2.783 6.2 6.2 6.2zm2.343-5.223h-2.49c-.268 0-.487-.098-.634-.293L4.416 5.628c-.756-.805.488-1.977 1.27-1.196l2.538 2.782h2.123c1.196 0 1.074 1.758 0 1.758zM7.516 3.358a.48.48 0 0 1 .464-.464.48.48 0 0 1 .463.464.48.48 0 0 1-.463.464.48.48 0 0 1-.464-.464zm3.246 1.27a.48.48 0 0 1 .464-.464.48.48 0 0 1 .463.463.48.48 0 0 1-.463.464.48.48 0 0 1-.464-.464zm1.44 3.343a.48.48 0 0 1 .464-.464.48.48 0 0 1 .464.464.48.48 0 0 1-.464.464.48.48 0 0 1-.464-.464zm-1.293 3.27a.48.48 0 0 1 .463-.463.48.48 0 0 1 .464.464.48.48 0 0 1-.464.463.48.48 0 0 1-.463-.463zM7.49 12.658a.48.48 0 0 1 .464-.464.48.48 0 0 1 .464.464.48.48 0 0 1-.464.464.48.48 0 0 1-.463-.464zm-3.172-1.27a.48.48 0 0 1 .463-.463.48.48 0 0 1 .464.464.48.48 0 0 1-.464.464.48.48 0 0 1-.463-.464zM2.854 7.972a.48.48 0 0 1 .464-.464.48.48 0 0 1 .464.464.48.48 0 0 1-.464.464.48.48 0 0 1-.464-.464z" fill="#555"/></svg>
@@ -73,6 +73,8 @@ Reads settings from a DOM element
Writes settings to a DOM element
%End

bool operator==( const QgsPhongMaterialSettings &other ) const;

};


@@ -3,6 +3,7 @@
%Include auto_generated/raster/qgsalignraster.sip
%Include auto_generated/raster/qgsaspectfilter.sip
%Include auto_generated/raster/qgsderivativefilter.sip
%Include auto_generated/raster/qgsexiftools.sip
%Include auto_generated/raster/qgshillshadefilter.sip
%Include auto_generated/raster/qgskde.sip
%Include auto_generated/raster/qgsninecellfilter.sip
@@ -0,0 +1,75 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/raster/qgsexiftools.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/



class QgsExifTools
{
%Docstring
Contains utilities for working with EXIF tags in images.

.. versionadded:: 3.6
%End

%TypeHeaderCode
#include "qgsexiftools.h"
%End
public:


static QgsPoint getGeoTag( const QString &imagePath, bool &ok /Out/ );
%Docstring
Returns the geotagged coordinate stored in the image at ``imagePath``.

If a geotag was found, ``ok`` will be set to true.

If the image contains an elevation tag then the returned point will contain
the elevation as a z value.

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

class GeoTagDetails
{
%Docstring
Extended image geotag details.

.. versionadded:: 3.6
%End

%TypeHeaderCode
#include "qgsexiftools.h"
%End
public:

GeoTagDetails();

double elevation;
};

static bool geoTagImage( const QString &imagePath, const QgsPointXY &location, const GeoTagDetails &details = QgsExifTools::GeoTagDetails() );
%Docstring
Writes geotags to the image at ``imagePath``.

The ``location`` argument indicates the GPS location to write to the image, as a WGS84 latitude/longitude coordinate.

If desired, extended GPS tags (such as elevation) can be specified via the ``details`` argument.

Returns true if writing was successful.

.. seealso:: :py:func:`getGeoTag`
%End
};

/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/raster/qgsexiftools.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -226,7 +226,7 @@ If the return value is 0, then the test was unsuccessful (e.g. due to testing a
on the line, or exactly in line with the segment) and the result is undefined.
%End

static int leftOfLine( const QgsPoint point, const QgsPoint p1, const QgsPoint p2 );
static int leftOfLine( const QgsPoint &point, const QgsPoint &p1, const QgsPoint &p2 );
%Docstring
Returns a value < 0 if the point ``point`` is left of the line from ``p1`` -> ``p2``.
A positive return value indicates the point is to the right of the line.
@@ -28,7 +28,7 @@ Encapsulates the context in which a QgsDataItem is shown within the application
Constructor for QgsDataItemGuiContext.
%End

QgsMessageBar *messageBar();
QgsMessageBar *messageBar() const;
%Docstring
Returns the associated message bar.

@@ -67,6 +67,14 @@ Sets the ``behavior`` to use when a path to an existing geopackage file is used.
The default behavior is to prompt the user for an action to take.

.. versionadded:: 3.0
%End

void setAddToProject( bool addToProject );
%Docstring
Sets whether a newly created layer should automatically be added to the current project.
Defaults to true.

.. versionadded:: 3.6
%End

};
@@ -71,6 +71,10 @@ if type -p cygpath >/dev/null; then
ASTYLEOPTS="$(cygpath -w "$ASTYLEOPTS")"
fi

if type -p wslpath >/dev/null; then
ASTYLEOPTS="$(wslpath -a -w "$ASTYLEOPTS")"
fi

set -e

astyleit() {
@@ -92,6 +92,7 @@ Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, QgsAbstract3DEngine *
connect( &map, &Qgs3DMapSettings::mapTileResolutionChanged, this, &Qgs3DMapScene::createTerrain );
connect( &map, &Qgs3DMapSettings::maxTerrainScreenErrorChanged, this, &Qgs3DMapScene::createTerrain );
connect( &map, &Qgs3DMapSettings::maxTerrainGroundErrorChanged, this, &Qgs3DMapScene::createTerrain );
connect( &map, &Qgs3DMapSettings::terrainShadingChanged, this, &Qgs3DMapScene::createTerrain );

// create entities of renderers

0 comments on commit 574a57f

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