[Git][debian-gis-team/qgis][upstream-ltr] New upstream version 2.18.24+dfsg
Bas Couwenberg
gitlab at salsa.debian.org
Sat Sep 15 11:29:24 BST 2018
Bas Couwenberg pushed to branch upstream-ltr at Debian GIS Project / qgis
Commits:
d729ecd9 by Bas Couwenberg at 2018-09-15T06:39:38Z
New upstream version 2.18.24+dfsg
- - - - -
25 changed files:
- .travis.yml
- CMakeLists.txt
- ChangeLog
- debian/changelog
- python/core/qgsexpressioncontext.sip
- python/core/qgshttptransaction.sip
- python/ext-libs/CMakeLists.txt
- python/plugins/processing/algs/otb/description/5.0.0/doc/MeanShiftSmoothing.html
- python/plugins/processing/algs/otb/description/5.4.0/doc/MeanShiftSmoothing.html
- python/plugins/processing/algs/otb/description/5.6.0/doc/MeanShiftSmoothing.html
- python/plugins/processing/algs/otb/description/5.8.0/doc/MeanShiftSmoothing.html
- src/app/qgisapp.h
- src/core/qgsexpressioncontext.h
- src/core/qgshttptransaction.cpp
- src/core/qgshttptransaction.h
- src/gui/qgsadvanceddigitizingdockwidget.h
- tests/src/app/testqgisappclipboard.cpp
- tests/src/app/testqgisapppython.cpp
- tests/src/app/testqgsattributetable.cpp
- tests/src/app/testqgsfieldcalculator.cpp
- tests/src/app/testqgsmaptoolidentifyaction.cpp
- tests/src/app/testqgsmaptoolreshape.cpp
- tests/src/app/testqgsmeasuretool.cpp
- tests/src/app/testqgsvectorlayersaveasdialog.cpp
- tests/src/python/test_qgsfiledownloader.py
Changes:
=====================================
.travis.yml
=====================================
@@ -58,47 +58,47 @@ matrix:
- python-sip-dev
- txt2tags
- xvfb
- # QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
- - os: linux
- language: python # This lets us use newer python versions from virtualenv
- env:
- - BUILD=qt5
- - QT_VERSION=5
- - LLVM_VERSION=3.8
- dist: precise
- sudo: false
- cache:
- apt: true
- directories:
- - $HOME/.ccache
- compiler: gcc
- python: "3.3"
- addons:
- postgresql: "9.4"
- apt:
- sources:
- - llvm-toolchain-precise-3.8
- - ubuntu-toolchain-r-test
- - george-edison55-precise-backports # doxygen 1.8.3
- packages:
- - doxygen
- - bison
- - flex
- - graphviz
- - libpq-dev
- - libfcgi-dev
- - libfftw3-3
- - pkg-config
- - poppler-utils
- - txt2tags
- - xvfb
- - flip
- - clang-3.8
+ # QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
+ # - os: linux
+ # language: python # This lets us use newer python versions from virtualenv
+ # env:
+ # - BUILD=qt5
+ # - QT_VERSION=5
+ # - LLVM_VERSION=3.8
+ # dist: precise
+ # sudo: false
+ # cache:
+ # apt: true
+ # directories:
+ # - $HOME/.ccache
+ # compiler: gcc
+ # python: "3.3"
+ # addons:
+ # postgresql: "9.4"
+ # apt:
+ # sources:
+ # - llvm-toolchain-precise-3.8
+ # - ubuntu-toolchain-r-test
+ # - george-edison55-precise-backports # doxygen 1.8.3
+ # packages:
+ # - doxygen
+ # - bison
+ # - flex
+ # - graphviz
+ # - libpq-dev
+ # - libfcgi-dev
+ # - libfftw3-3
+ # - pkg-config
+ # - poppler-utils
+ # - txt2tags
+ # - xvfb
+ # - flip
+ # - clang-3.8
# OSX based build with QT4 and Python 2
- - os: osx
- env:
- - BUILD=osx
- - IGNORE_BUILD_FAILURES=YES
+ # - os: osx
+ # env:
+ # - BUILD=osx
+ # - IGNORE_BUILD_FAILURES=YES
git:
depth: 30
=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "23")
+SET(CPACK_PACKAGE_VERSION_PATCH "24")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Las Palmas")
IF (POLICY CMP0048) # in CMake 3.0.0+
=====================================
ChangeLog
=====================================
@@ -1,3 +1,60 @@
+Juergen E. Fischer <jef at norbit.de> 2018-09-03
+
+ workaround for moc issue with app tests
+
+Merge: 2a1459cb99 a5dd6eb877
+rldhont <rldhont at gmail.com> 2018-09-10
+
+ Merge pull request #7827 from rldhont/fix-qgshttptransaction-support-https-server
+
+ [BUGFIX][Server] Quickfix in QgsHttpTransaction to support HTTPS scheme
+
+rldhont <rldhont at gmail.com> 2018-09-07
+
+ [BUGFIX][Server] Quickfix in QgsHttpTransaction to support HTTPS scheme
+
+ The class QgsHttpTransaction is only used in server for getting files provided by URL. This class does not support HTTPS.
+
+ This is a quickfix to enable requesting SLD files provided through HTTPS scheme.
+
+ Fixes #6898 *QGIS mapserver forces http when requesting SLD=https* https://issues.qgis.org/issues/6898 a five year old issue.
+
+Andrew Childs <lorne at cons.org.nz> 2018-08-31
+
+ Fix pyfuture installation under CMake 3.12
+
+ The logic here was incorrect, but managed to do the right thing
+ anyway. Under CMake 3.12, this is a hard error.
+
+Nyall Dawson <nyall.dawson at gmail.com> 2018-09-04
+
+ Also disable OSX builds on Travis - the environment has been broken for a long time
+ and the results are currently ignored anyway
+
+ May as well save some unneeded work for Travis
+
+Nyall Dawson <nyall.dawson at gmail.com> 2018-09-03
+
+ Disable qt5 Travis builds -- the build environment is currently broken
+
+rldhont <rldhont at gmail.com> 2018-08-28
+
+ Fix trusty build (QStringLiteral is Qt5; followup 9241e2d)
+
+Matthias Kuhn <matthias at opengis.ch> 2017-11-09
+
+ [travis] Disable non-local file download tests
+
+ (cherry picked from commit 8d8f38d4c40a64082e396017cbca3399cfafb3ca)
+
+Juergen E. Fischer <jef at norbit.de> 2018-08-26
+
+ Typo fix
+
+Juergen E. Fischer <jef at norbit.de> 2018-08-17
+
+ Release of 2.18.23
+
Radoslaw Guzinski <radosuav at op.pl> 2018-08-09
[Processing] Fix exception when producing a csv output.
=====================================
debian/changelog
=====================================
@@ -1,8 +1,14 @@
-qgis (2.18.23) UNRELEASED; urgency=medium
+qgis (2.18.24) UNRELEASED; urgency=medium
+
+ * Release of 2.18.24
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 14 Sep 2018 14:00:17 +0200
+
+qgis (2.18.23) unstable; urgency=medium
* Release of 2.18.23
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 17 Aug 2018 14:00:06 +0200
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 14 Sep 2018 14:00:17 +0200
qgis (2.18.22) unstable; urgency=medium
=====================================
python/core/qgsexpressioncontext.sip
=====================================
@@ -133,7 +133,7 @@ class QgsExpressionContextScope
*/
QStringList variableNames() const;
- /** Returns a fitlered and sorted list of variable names contained within the scope.
+ /** Returns a filtered and sorted list of variable names contained within the scope.
* Hidden variable names will be excluded, and the list will be sorted so that
* read only variables are listed first.
* @see variableNames()
=====================================
python/core/qgshttptransaction.sip
=====================================
@@ -79,6 +79,12 @@ class QgsHttpTransaction : QObject
void networkTimedOut();
+ /**
+ * Handle SSL errors
+ * @since QGIS 2.18.24
+ */
+ void handleSslErrors( const QList<QSslError> &errors );
+
/** Aborts the current transaction*/
void abort();
=====================================
python/ext-libs/CMakeLists.txt
=====================================
@@ -49,8 +49,8 @@ IF(NOT ENABLE_PYTHON3)
FILE(GLOB_RECURSE files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/future future/*)
ADD_CUSTOM_COMMAND(TARGET pyfuture
POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${item} "${PYTHON_OUTPUT_DIRECTORY}/"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${item} "${PYTHON_OUTPUT_DIRECTORY}/${item}"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/future
DEPENDS ${files}
)
PY_COMPILE(pyfuture "${PYTHON_OUTPUT_DIRECTORY}/${item}")
=====================================
python/plugins/processing/algs/otb/description/5.0.0/doc/MeanShiftSmoothing.html
=====================================
@@ -2,4 +2,4 @@
<style type="text/css">
dl { border: 3px double #ccc; padding: 0.5em; } dt { float: left; clear: left; text-align: left; font-weight: bold; color: green; } dt:after { content: ":"; } dd { margin: 0 0 0 220px; padding: 0 0 0.5em 0; }
</style>
-</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift fitlering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: True. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path . Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
\ No newline at end of file
+</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift filtering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: True. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path . Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
=====================================
python/plugins/processing/algs/otb/description/5.4.0/doc/MeanShiftSmoothing.html
=====================================
@@ -2,4 +2,4 @@
<style type="text/css">
dl { border: 3px double #ccc; padding: 0.5em; } dt { float: left; clear: left; text-align: left; font-weight: bold; color: green; } dt:after { content: ":"; } dd { margin: 0 0 0 220px; padding: 0 0 0.5em 0; }
</style>
-</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift fitlering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: True. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path . Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
\ No newline at end of file
+</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift filtering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: True. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path . Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
=====================================
python/plugins/processing/algs/otb/description/5.6.0/doc/MeanShiftSmoothing.html
=====================================
@@ -2,4 +2,4 @@
<style type="text/css">
dl { border: 3px double #ccc; padding: 0.5em; } dt { float: left; clear: left; text-align: left; font-weight: bold; color: green; } dt:after { content: ":"; } dd { margin: 0 0 0 220px; padding: 0 0 0.5em 0; }
</style>
-</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift fitlering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: False. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path crosses an already converged pixel. Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
\ No newline at end of file
+</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift filtering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: False. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path crosses an already converged pixel. Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
=====================================
python/plugins/processing/algs/otb/description/5.8.0/doc/MeanShiftSmoothing.html
=====================================
@@ -2,4 +2,4 @@
<style type="text/css">
dl { border: 3px double #ccc; padding: 0.5em; } dt { float: left; clear: left; text-align: left; font-weight: bold; color: green; } dt:after { content: ":"; } dd { margin: 0 0 0 220px; padding: 0 0 0.5em 0; }
</style>
-</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift fitlering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: False. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path crosses an already converged pixel. Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
\ No newline at end of file
+</head><body><h1>MeanShiftSmoothing</h1><h2>Brief Description</h2>Perform mean shift filtering<h2>Tags</h2>Image Filtering,LSMS<h2>Long Description</h2>This application performs mean shift filtering (multi-threaded).<h2>Parameters</h2><ul><li><b>[param] -in</b> <string> The input image.. Mandatory: True. Default Value: ""</li><li><b>[param] -fout</b> <string> The filtered output image.. Mandatory: True. Default Value: ""</li><li><b>[param] -foutpos</b> <string> The spatial image output. Spatial image output is a displacement map (pixel position after convergence).. Mandatory: False. Default Value: ""</li><li><b>[param] -ram</b> <int32> Available memory for processing (in MB). Mandatory: False. Default Value: "128"</li><li><b>[param] -spatialr</b> <int32> Spatial radius of the neighborhood.. Mandatory: False. Default Value: "5"</li><li><b>[param] -ranger</b> <float> Range radius defining the radius (expressed in radiometry unit) in the multi-spectral space.. Mandatory: False. Default Value: "15"</li><li><b>[param] -thres</b> <float> Algorithm iterative scheme will stop if mean-shift vector is below this threshold or if iteration number reached maximum number of iterations.. Mandatory: False. Default Value: "0.1"</li><li><b>[param] -maxiter</b> <int32> Algorithm iterative scheme will stop if convergence hasn't been reached after the maximum number of iterations.. Mandatory: False. Default Value: "100"</li><li><b>[param] -rangeramp</b> <float> This coefficient makes dependent the ranger of the colorimetry of the filtered pixel : y = rangeramp*x+ranger.. Mandatory: False. Default Value: "0"</li><li><b>[param] -modesearch</b> <boolean> If activated pixel iterative convergence is stopped if the path crosses an already converged pixel. Be careful, with this option, the result will slightly depend on thread number. Mandatory: False. Default Value: "True"</li><li><b>[param] -inxml</b> <string> Load otb application from xml file. Mandatory: False. Default Value: ""</li><li><b>[param] -outxml</b> <string> Save otb application to xml file. Mandatory: False. Default Value: ""</li></ul><h2>Limitations</h2>With mode search option, the result will slightly depend on thread number.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: maur_rgb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fout: MeanShift_FilterOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">foutpos: MeanShift_SpatialOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">spatialr: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ranger: 16</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">thres: 0.1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">maxiter: 100</p></li></ul></body></html>
=====================================
src/app/qgisapp.h
=====================================
@@ -121,7 +121,6 @@ class QgsDiagramProperties;
#include "qgswelcomepageitemsmodel.h"
#include "qgsruntimeprofiler.h"
-
#include "ui_qgisapp.h"
#ifdef HAVE_TOUCH
=====================================
src/core/qgsexpressioncontext.h
=====================================
@@ -167,7 +167,7 @@ class CORE_EXPORT QgsExpressionContextScope
*/
QStringList variableNames() const;
- /** Returns a fitlered and sorted list of variable names contained within the scope.
+ /** Returns a filtered and sorted list of variable names contained within the scope.
* Hidden variable names will be excluded, and the list will be sorted so that
* read only variables are listed first.
* @see variableNames()
=====================================
src/core/qgshttptransaction.cpp
=====================================
@@ -22,6 +22,7 @@
#include "qgshttptransaction.h"
#include "qgslogger.h"
+#include "qgsmessagelog.h"
#include "qgsconfig.h"
#include <QApplication>
@@ -30,6 +31,7 @@
#include <QTimer>
static int HTTP_PORT_DEFAULT = 80;
+static int HTTPS_PORT_DEFAULT = 443;
//XXX Set the connection name when creating the provider instance
//XXX in qgswmsprovider. When creating a QgsHttpTransaction, pass
@@ -118,7 +120,14 @@ bool QgsHttpTransaction::getSynchronously( QByteArray &respondedContent, int red
// Set the user agent to QGIS plus the version name
header.setValue( "User-agent", QString( "QGIS - " ) + VERSION );
// Set the host in the QHttp object
- http->setHost( qurl.host(), qurl.port( HTTP_PORT_DEFAULT ) );
+ if ( qurl.scheme() == QString( "https" ) )
+ {
+ http->setHost( qurl.host(), QHttp::ConnectionModeHttps, qurl.port( HTTPS_PORT_DEFAULT ) );
+ }
+ else
+ {
+ http->setHost( qurl.host(), qurl.port( HTTP_PORT_DEFAULT ) );
+ }
// Set the username and password if supplied for this connection
// If we have username and password set in header
if ( !mUserName.isEmpty() && !mPassword.isEmpty() )
@@ -189,6 +198,9 @@ bool QgsHttpTransaction::getSynchronously( QByteArray &respondedContent, int red
connect( http, SIGNAL( stateChanged( int ) ),
this, SLOT( dataStateChanged( int ) ) );
+ connect( http, SIGNAL( sslErrors( const QList<QSslError>& ) ),
+ this, SLOT( handleSslErrors( const QList<QSslError>& ) ) );
+
// Set up the watchdog timer
connect( mWatchdogTimer, SIGNAL( timeout() ),
this, SLOT( networkTimedOut() ) );
@@ -485,6 +497,13 @@ void QgsHttpTransaction::dataStateChanged( int state )
}
}
+void QgsHttpTransaction::handleSslErrors( const QList<QSslError> &errors )
+{
+ Q_FOREACH ( const QSslError &e, errors )
+ {
+ QgsMessageLog::logMessage( e.errorString() );
+ }
+}
void QgsHttpTransaction::networkTimedOut()
{
=====================================
src/core/qgshttptransaction.h
=====================================
@@ -22,6 +22,7 @@
#define QGSHTTPTRANSACTION_H
#include <QHttp>
+#include <QSslError>
#include <QNetworkProxy>
#include <QString>
@@ -114,6 +115,12 @@ class CORE_EXPORT QgsHttpTransaction : public QObject
void networkTimedOut();
+ /**
+ * Handle SSL errors
+ * @since QGIS 2.18.24
+ */
+ void handleSslErrors( const QList<QSslError> &errors );
+
/** Aborts the current transaction*/
void abort();
=====================================
src/gui/qgsadvanceddigitizingdockwidget.h
=====================================
@@ -402,7 +402,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
void clearPoints();
//! filters key press
- //! @note called by eventFilter (fitler on line edits), canvasKeyPressEvent (filter on map tool) and keyPressEvent (filter on dock)
+ //! @note called by eventFilter (filter on line edits), canvasKeyPressEvent (filter on map tool) and keyPressEvent (filter on dock)
bool filterKeyPress( QKeyEvent* e );
//! event filter for line edits in the dock UI (angle/distance/x/y line edits)
=====================================
tests/src/app/testqgisappclipboard.cpp
=====================================
@@ -19,7 +19,10 @@
#include <QStringList>
#include <QtTest/QtTest>
-#include <qgisapp.h>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
+#endif
+
#include <qgsapplication.h>
#include <qgsfeature.h>
#include <qgsfield.h>
@@ -296,7 +299,7 @@ void TestQgisAppClipboard::pasteWkt()
QCOMPARE( features.at( 1 ).attributes().at( 0 ).toString(), QString( "3" ) );
QCOMPARE( features.at( 1 ).attributes().at( 1 ).toString(), QString( "c3" ) );
QCOMPARE( features.at( 1 ).attributes().at( 2 ).toString(), QString( "4" ) );
- QCOMPARE( features.at( 2 ).constGeometry()->exportToWkt(), QStringLiteral( "Point (5 4)" ) );
+ QCOMPARE( features.at( 2 ).constGeometry()->exportToWkt(), QString( "Point (5 4)" ) );
QCOMPARE( features.at( 2 ).attributes().count(), 3 );
QCOMPARE( features.at( 2 ).attributes().at( 0 ).toString(), QString( "2" ) );
QCOMPARE( features.at( 2 ).attributes().at( 1 ).toString(), QString( "b2" ) );
=====================================
tests/src/app/testqgisapppython.cpp
=====================================
@@ -19,7 +19,10 @@
#include <QStringList>
#include <QtTest/QtTest>
-#include <qgisapp.h>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
+#endif
+
#include <qgsapplication.h>
/** \ingroup UnitTests
=====================================
tests/src/app/testqgsattributetable.cpp
=====================================
@@ -13,7 +13,9 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
#include "qgisapp.h"
+#endif
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsfeature.h"
@@ -25,6 +27,7 @@
#include "qgsunittypes.h"
#include "qgsvectorfilewriter.h"
+
/** \ingroup UnitTests
* This is a unit test for the attribute table dialog
*/
=====================================
tests/src/app/testqgsfieldcalculator.cpp
=====================================
@@ -13,7 +13,9 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
#include "qgisapp.h"
+#endif
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsfeature.h"
=====================================
tests/src/app/testqgsmaptoolidentifyaction.cpp
=====================================
@@ -14,6 +14,8 @@
***************************************************************************/
#include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsrasterlayer.h"
@@ -24,9 +26,9 @@
#include "qgsmapcanvas.h"
#include "qgsunittypes.h"
#include "qgsmaptoolidentifyaction.h"
-#include "qgisapp.h"
#include "qgsidentifymenu.h"
#include "qgsidentifyresultsdialog.h"
+#endif
#include "cpl_conv.h"
=====================================
tests/src/app/testqgsmaptoolreshape.cpp
=====================================
@@ -14,6 +14,9 @@ Email : paul.blottiere at oslandia.com
***************************************************************************/
#include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
+#endif
#include "qgsapplication.h"
#include "qgsmapcanvas.h"
#include "qgsvectorlayer.h"
@@ -21,7 +24,6 @@ Email : paul.blottiere at oslandia.com
#include "qgsmaptoolreshape.h"
#include "qgsvectordataprovider.h"
#include "qgsmaplayerregistry.h"
-#include "qgisapp.h"
class TestQgsMapToolReshape : public QObject
{
=====================================
tests/src/app/testqgsmeasuretool.cpp
=====================================
@@ -13,7 +13,9 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
#include "qgisapp.h"
+#endif
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsfeature.h"
=====================================
tests/src/app/testqgsvectorlayersaveasdialog.cpp
=====================================
@@ -13,7 +13,9 @@
* *
***************************************************************************/
#include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
#include "qgisapp.h"
+#endif
#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsfeature.h"
@@ -24,6 +26,7 @@
#include "qgsproject.h"
#include "qgsmapcanvas.h"
+
/** \ingroup UnitTests
* This is a unit test for the save as dialog
*/
=====================================
tests/src/python/test_qgsfiledownloader.py
=====================================
@@ -57,6 +57,7 @@ class TestQgsFileDownloader(unittest.TestCase):
loop.exec_()
+ @unittest.skipIf(os.environ.get('TRAVIS', '') == 'true', 'Test with http://www.qgis.org unstable. Needs local server.')
def test_validDownload(self):
"""Tests a valid download"""
destination = tempfile.mktemp()
@@ -81,6 +82,7 @@ class TestQgsFileDownloader(unittest.TestCase):
self.assertEqual(self.error_args[1], [u'Download failed: Host www.doesnotexistofthatimsure.qgis not found'])
self.assertFalse(os.path.isfile(destination))
+ @unittest.skipIf(os.environ.get('TRAVIS', '') == 'true', 'Test with http://www.github.com unstable. Needs local server.')
def test_dowloadCanceled(self):
"""Tests user canceled download"""
destination = tempfile.mktemp()
@@ -101,6 +103,7 @@ class TestQgsFileDownloader(unittest.TestCase):
self.assertFalse(os.path.isfile(destination))
self.assertEqual(self.error_args[1], [u"Download failed: Protocol \"xyz\" is unknown"])
+ @unittest.skipIf(os.environ.get('TRAVIS', '') == 'true', 'Test with http://www.github.com unstable. Needs local server.')
def test_InvalidFile(self):
self._make_download('https://github.com/qgis/QGIS/archive/master.zip', "")
self.assertTrue(self.exited_was_called)
@@ -132,6 +135,7 @@ class TestQgsFileDownloader(unittest.TestCase):
result = ';'.join(result)
self.assertEqual(result, error, msg + "expected:\n%s\nactual:\n%s\n" % (error, result))
+ @unittest.skipIf(os.environ.get('TRAVIS', '') == 'true', 'Test with badssl.com unstable. Needs local server.')
def test_sslExpired(self):
self.ssl_compare("expired", "https://expired.badssl.com/", "SSL Errors: ;The certificate has expired")
self.ssl_compare("self-signed", "https://self-signed.badssl.com/", "SSL Errors: ;The certificate has expired;The certificate is self-signed, and untrusted")
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/d729ecd9538b86857fd470db3afd43cbff44973d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/d729ecd9538b86857fd470db3afd43cbff44973d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180915/27c6ecd0/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list