Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'extendMapTool' of github.com:lbartoletti/QGIS into exte…
Browse files Browse the repository at this point in the history
…ndMapTool
  • Loading branch information
lbartoletti committed Nov 13, 2018
2 parents 7b98302 + be2ac88 commit 574a57f
Show file tree
Hide file tree
Showing 193 changed files with 2,269 additions and 232 deletions.
1 change: 1 addition & 0 deletions .docker/qgis3-build-deps.dockerfile
Expand Up @@ -25,6 +25,7 @@ RUN apt-get update \
git \
graphviz \
grass-dev \
libexiv2-dev \
libexpat1-dev \
libfcgi-dev \
libgdal-dev \
Expand Down
20 changes: 10 additions & 10 deletions INSTALL

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions 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)
2 changes: 2 additions & 0 deletions debian/control
Expand Up @@ -10,6 +10,7 @@ Build-Depends:
dh-python,
flex,
grass-dev,
libexiv2-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.11),
Expand Down Expand Up @@ -182,6 +183,7 @@ Architecture: any
Section: libdevel
Depends:
grass-dev,
libexiv2-dev,
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
Expand Down
4 changes: 4 additions & 0 deletions debian/control.in
Expand Up @@ -10,6 +10,7 @@ Build-Depends:
dh-python,
flex,
grass-dev,
libexiv2-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.11),
Expand All @@ -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,
Expand Down Expand Up @@ -214,6 +216,7 @@ Architecture: any
Section: libdevel
Depends:
grass-dev,
libexiv2-dev,
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
Expand Down Expand Up @@ -381,6 +384,7 @@ Section: python
Provides: ${python:Provides}
Depends:
gdal-bin,
python-gdal,
python3-gdal,
python3-matplotlib,
libqgis-customwidgets,
Expand Down
20 changes: 10 additions & 10 deletions doc/INSTALL.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions doc/linux.t2t

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions images/images.qrc
Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions images/themes/default/mIconFieldBinary.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/themes/default/mIconFieldDate.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/themes/default/mIconFieldDateTime.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/themes/default/mIconFieldFloat.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/themes/default/mIconFieldInteger.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/themes/default/mIconFieldText.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/themes/default/mIconFieldTime.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions python/3d/auto_generated/qgsphongmaterialsettings.sip.in
Expand Up @@ -73,6 +73,8 @@ Reads settings from a DOM element
Writes settings to a DOM element
%End

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

};


Expand Down
1 change: 1 addition & 0 deletions python/analysis/analysis_auto.sip
Expand Up @@ -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
Expand Down
75 changes: 75 additions & 0 deletions 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 *
************************************************************************/