Merge branch 'master' into extendMapTool

qgis · Nov 13, 2018 · be2ac88 · be2ac88
2 parents 8b2331a + 5dab30b
commit be2ac88
Show file tree

Hide file tree

Showing 191 changed files with 2,267 additions and 230 deletions.
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -25,6 +25,7 @@ RUN  apt-get update \
     git \
     graphviz \
     grass-dev \
+    libexiv2-dev \
     libexpat1-dev \
     libfcgi-dev \
     libgdal-dev \

diff --git a/INSTALL b/INSTALL
diff --git a/cmake/FindEXIV2.cmake b/cmake/FindEXIV2.cmake
@@ -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)
diff --git a/debian/control b/debian/control
@@ -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),

diff --git a/debian/control.in b/debian/control.in
@@ -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,

diff --git a/doc/INSTALL.html b/doc/INSTALL.html
diff --git a/doc/linux.t2t b/doc/linux.t2t
diff --git a/images/images.qrc b/images/images.qrc
@@ -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">

diff --git a/images/themes/default/mIconFieldBinary.svg b/images/themes/default/mIconFieldBinary.svg
diff --git a/images/themes/default/mIconFieldDate.svg b/images/themes/default/mIconFieldDate.svg
diff --git a/images/themes/default/mIconFieldDateTime.svg b/images/themes/default/mIconFieldDateTime.svg
diff --git a/images/themes/default/mIconFieldFloat.svg b/images/themes/default/mIconFieldFloat.svg
diff --git a/images/themes/default/mIconFieldInteger.svg b/images/themes/default/mIconFieldInteger.svg
diff --git a/images/themes/default/mIconFieldText.svg b/images/themes/default/mIconFieldText.svg
diff --git a/images/themes/default/mIconFieldTime.svg b/images/themes/default/mIconFieldTime.svg
diff --git a/python/3d/auto_generated/qgsphongmaterialsettings.sip.in b/python/3d/auto_generated/qgsphongmaterialsettings.sip.in
@@ -73,6 +73,8 @@ Reads settings from a DOM element
 Writes settings to a DOM element
 %End
 
+    bool operator==( const QgsPhongMaterialSettings &other ) const;
+
 };
 
 

diff --git a/python/analysis/analysis_auto.sip b/python/analysis/analysis_auto.sip
@@ -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

diff --git a/python/analysis/auto_generated/raster/qgsexiftools.sip.in b/python/analysis/auto_generated/raster/qgsexiftools.sip.in
@@ -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   *
+ ************************************************************************/
diff --git a/python/gui/auto_generated/qgsdataitemguiprovider.sip.in b/python/gui/auto_generated/qgsdataitemguiprovider.sip.in
@@ -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.
 

diff --git a/python/gui/auto_generated/qgsnewgeopackagelayerdialog.sip.in b/python/gui/auto_generated/qgsnewgeopackagelayerdialog.sip.in
@@ -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
 
 };

diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -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() {

diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -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