Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/QGIS/QGIS into regularSha…

…pe_gui
  • Loading branch information
lbartoletti committed Aug 17, 2017
2 parents 9ae68e8 + e325895 commit d1e40d90865ac208b2a371b4953163340cf36949
Showing with 560 additions and 3,373 deletions.
  1. +3 −0 Dockerfile
  2. +2 −1 README.md
  3. +2 −1 debian/libqgis-dev.install.in
  4. +1 −0 debian/qgis-common.install
  5. +0 −1 debian/qgis.install
  6. +0 −4 debian/qgis.lintian-overrides
  7. +2 −0 doc/api_break.dox
  8. +0 −1 ms-windows/osgeo4w/package.cmd
  9. +0 −3 python/analysis/analysis_auto.sip
  10. +0 −143 python/analysis/vector/qgsgeometryanalyzer.sip
  11. +0 −46 python/analysis/vector/qgsoverlayanalyzer.sip
  12. +0 −38 python/analysis/vector/qgspointsample.sip
  13. +0 −6 python/core/qgsapplication.sip
  14. +2 −2 python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
  15. +45 −22 python/plugins/processing/algs/gdal/buildvrt.py
  16. +77 −12 python/plugins/processing/gui/MultipleInputDialog.py
  17. +14 −10 python/plugins/processing/gui/MultipleInputPanel.py
  18. +26 −16 python/plugins/processing/gui/wrappers.py
  19. +3 −2 python/plugins/processing/modeler/ModelerParametersDialog.py
  20. +0 −6 src/analysis/CMakeLists.txt
  21. +0 −1,493 src/analysis/vector/qgsgeometryanalyzer.cpp
  22. +0 −161 src/analysis/vector/qgsgeometryanalyzer.h
  23. +0 −195 src/analysis/vector/qgsoverlayanalyzer.cpp
  24. +0 −54 src/analysis/vector/qgsoverlayanalyzer.h
  25. +0 −170 src/analysis/vector/qgspointsample.cpp
  26. +0 −57 src/analysis/vector/qgspointsample.h
  27. +0 −4 src/app/CMakeLists.txt
  28. +0 −13 src/app/qgisapp.cpp
  29. +0 −2 src/app/qgsoptions.cpp
  30. +0 −59 src/app/qgstip.h
  31. +0 −362 src/app/qgstipfactory.cpp
  32. +0 −77 src/app/qgstipfactory.h
  33. +0 −108 src/app/qgstipgui.cpp
  34. +0 −43 src/app/qgstipgui.h
  35. +23 −17 src/core/processing/qgsprocessingparameters.cpp
  36. +0 −15 src/core/qgsapplication.cpp
  37. +0 −3 src/core/qgsapplication.h
  38. +166 −1 src/providers/ogr/qgsgeopackagedataitems.cpp
  39. +6 −2 src/providers/ogr/qgsgeopackagedataitems.h
  40. +72 −4 src/providers/ogr/qgsogrdataitems.cpp
  41. +9 −1 src/providers/ogr/qgsogrdataitems.h
  42. +73 −0 src/providers/ogr/qgsogrprovider.cpp
  43. +21 −71 src/ui/qgsoptionsbase.ui
  44. +0 −1 tests/src/analysis/CMakeLists.txt
  45. +0 −145 tests/src/analysis/testqgsvectoranalyzer.cpp
  46. +13 −1 tests/src/core/testqgsprocessing.cpp
@@ -1,4 +1,7 @@

# CACHE_TAG is provided by Docker cloud
# see https://docs.docker.com/docker-cloud/builds/advanced/
# using ARG in FROM requires min v17.05.0-ce
ARG CACHE_TAG=latest

FROM qgis/qgis3-build-deps:${CACHE_TAG}
@@ -1,6 +1,7 @@
# About QGIS

[![Build Status](https://travis-ci.org/qgis/QGIS.svg?branch=master)](https://travis-ci.org/qgis/QGIS)
[![Docker Status](https://img.shields.io/docker/automated/qgis/qgis.svg)](https://cloud.docker.com/app/qgis/repository/docker/qgis/qgis/general)

QGIS is an Open Source Geographic Information System. The project was born in
May of 2002 and was established as a project on SourceForge in June of the same
@@ -63,7 +64,7 @@ an email address where we can request additional information.
## Support
You can get support in the following ways:

- Using the QGIS community site at http://qgis.org
- Using the QGIS community site at http://qgis.org
- Joining the [qgis-users mailing list](https://lists.osgeo.org/mailman/listinfo/qgis-user)
- Using IRC by joining the [#qgis](http://webchat.freenode.net/?channels=#qgis) channel on irc.freenode.net. Please wait around for a response to your question as many folks on the channel are doing other things and it may take a while for them to notice your question.
- Join the [Gitter](https://gitter.im/qgis/QGIS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) chat.
@@ -3,7 +3,8 @@ usr/lib/libqgis_app.so
usr/lib/libqgis_core.so
usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
#server#usr/lib/libqgis_server.so
usr/lib/libqgis_native.so
usr/lib/libqgis_server.so
usr/lib/libqgisgrass{GRASSVER}.so
usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake
@@ -12,6 +12,7 @@ usr/share/qgis/doc/images
usr/share/qgis/doc/index.html
usr/share/qgis/doc/news
usr/share/qgis/doc/news.html
usr/share/qgis/doc/nohelp.html
usr/share/qgis/doc/style.css
usr/share/qgis/i18n/*
usr/share/qgis/images/*
@@ -6,7 +6,6 @@ usr/lib/qgis/plugins/libspatialqueryplugin.so
usr/lib/qgis/plugins/libofflineeditingplugin.so
usr/lib/qgis/plugins/libtopolplugin.so
usr/lib/qgis/plugins/libgeometrycheckerplugin.so
usr/lib/qgis/qgis_help
usr/share/pixmaps/
usr/share/applications/
usr/share/mime/packages/

This file was deleted.

@@ -269,6 +269,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
- QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
- QgsFileDropEdit was removed. Use QgsFileWidget instead.
- QgsFormAnnotationItem. Use QgsFormAnnotation instead.
- QgsGeometryAnalyzer. Use the equivalent Processing algorithms instead.
- QgsHtmlAnnotationItem. Use QgsHtmlAnnotation instead.
- QgsHttpTransaction. This class was outdated and code should be ported to native Qt or Python implementations.
- QgsGenericProjectionSelector. Use QgsProjectionSelectionTreeWidget instead.
@@ -287,6 +288,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
- QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.
- QgsMapToolTouch. The touch navigation functionality is now built into the standard QgsMapToolPan tool.
- QgsPhotoWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
- QgsPointSample. Use the Processing "Random Points in Polygon" algorithm instead.
- QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.
- QgsProjectBadLayerGuiHandler was removed. It was unused in QGIS code and barely useful. Implement your own QgsProjectBadLayerHandler subclass if needed.
- QgsRendererV2DataDefinedMenus was removed. Use QgsPropertyOverrideButton instead.
@@ -384,7 +384,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
"apps/%PACKAGENAME%/plugins/spatialqueryplugin.dll" ^
"apps/%PACKAGENAME%/plugins/topolplugin.dll" ^
"apps/%PACKAGENAME%/plugins/geometrycheckerplugin.dll" ^
"apps/%PACKAGENAME%/qgis_help.exe" ^
"apps/%PACKAGENAME%/qtplugins/sqldrivers/qsqlspatialite.dll" ^
"apps/%PACKAGENAME%/qtplugins/designer/" ^
"apps/%PACKAGENAME%/python/" ^
@@ -12,9 +12,6 @@
%Include raster/qgsrastermatrix.sip
%Include raster/qgsrastercalcnode.sip
%Include raster/qgstotalcurvaturefilter.sip
%Include vector/qgsgeometryanalyzer.sip
%Include vector/qgsoverlayanalyzer.sip
%Include vector/qgspointsample.sip
%Include vector/qgstransectsample.sip
%Include vector/qgszonalstatistics.sip
%Include interpolation/qgsinterpolator.sip

This file was deleted.

This file was deleted.

This file was deleted.

@@ -223,12 +223,6 @@ Returns the path to the licence file.
:rtype: str
%End

static QString helpAppPath();
%Docstring
Returns the path to the help application.
:rtype: str
%End

static QString i18nPath();
%Docstring
Returns the path to the translation directory.
@@ -35,6 +35,7 @@

from .AssignProjection import AssignProjection
from .aspect import aspect
from .buildvrt import buildvrt
from .ColorRelief import ColorRelief
from .tri import tri
from .warp import warp
@@ -44,7 +45,6 @@
# from .translate import translate
# from .pct2rgb import pct2rgb
# from .merge import merge
# from .buildvrt import buildvrt
# from .polygonize import polygonize
# from .gdaladdo import gdaladdo
# from .ClipByExtent import ClipByExtent
@@ -144,14 +144,14 @@ def loadAlgorithms(self):
# information(),
AssignProjection(),
aspect(),
buildvrt(),
ColorRelief(),
tri(),
warp(),
# translate(),
# rgb2pct(),
# pct2rgb(),
# merge(),
# buildvrt(),
# polygonize(),
# gdaladdo(),
# ClipByExtent(),

0 comments on commit d1e40d9

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