53942 Commits

Author SHA1 Message Date
Matthias Kuhn
81f0c5ce00
Merge pull request #9241 from m-kuhn/merge-lines-on-dissolve
[processing] Merge lines on dissolve
2019-02-26 07:54:51 +01:00
Nyall Dawson
fb324f3e43 srs.db add Australian entries
insert into tbl_datum_transform VALUES (8447,100020,4283,7844,9615, 'GDA94_GDA2020_conformal_and_distortion.gsb', null, null, null, null,null, null, 'Conformal + Distortion: includes regional distortion',null,1,0,2575);

insert into tbl_datum_transform VALUES (8446,100021,4283,7844,9615, 'GDA94_GDA2020_conformal.gsb', null, null, null, null,null, null, 'Conformal: predominantly plate tectonic motion (~1.8m NNE)',null,1,0,2575);

insert into tbl_datum_transform VALUES (1804,100022,4203,4283,9615, 'National_84_02_07_01.gsb', null, null, null, null,null, null, 'Full coverage two-way transformation file in those states that originally adopted AGD84 - West Australia, South Australia, Queensland',null,1,0,2576);

insert into tbl_datum_transform VALUES (1803,100023,4202,4283,9615, 'A66_National_13_09_01.gsb', null, null, null, null,null, null, 'Full national coverage two-way transformation file',null,1,0,2575);
2019-02-26 12:49:02 +10:00
volaya
f76be664fe [processing] Script decorators: correctly check that parent parameter exist 2019-02-26 08:31:11 +10:00
Juergen E. Fischer
206cc96014 debian packaging:
* remove xenial & stretch support
* remove globe plugin
* always enable 3d
2019-02-25 22:28:00 +01:00
Bas Couwenberg
aeec6dfa8e debian packaging updates (squashed pull request #9254)
1b1e60d2a5 Use libqscintilla2-qt5-dev instead of virtual package.
dd5003e1e4 Use "-noawait" variant for qgis-crssync trigger.
d0e156e44e Remove obsolete diversions in qgis.preinst, but don't rename.
25a677e1ff Update watch file to use HTTPS.
7ca6a995eb Update registration URL in upstream metadata.
789d4fb56b Don't recommend liblwgeom-dev, it shouldn't be used by other projects.
7d3844047a Update packaging for Python 3.
bb0017c793 Remove documentation outside /usr/share/doc from non-doc packages.
cd7f1fd9b4 Fix FTBFS when building only arch:any packages (with -B).
03e4d0b6e1 Add -DNDEBUG flag for non-debug builds.
c6cb002fc9 Include percentage of started edges in ninja output.
f86761e712 Set -j & -v ninja options based on DEB_BUILD_OPTIONS.
3b07a54606 Use pkg-info.mk variables instead of dpkg-parsechangelog output.
5e18a74d8d Align paths in links file to improve readability.
2bd52f39b0 Don't use libjs-jquery for Doxygen docs.
3b9e875bbf Simplify python-qgis.install with common path to match all files.
96d5f202a3 Don't rely on QT_PLUGINS_DIR placeholder in template files.
74c3750741 Update copyright file.
1b596f5c21 Don't rely on QGIS_ABI placeholder in template files.
aaabb94e70 Simplify lintian overrides.
38fad4d44c Don't rely on GRASSVER placeholder in template files.
9c772d174f Override dh_gencontrol to set GRASS ABI dependency with substvars.
8b9c14ba76 Reorder paths in install files.
c518e14d1b Reorder (build) dependencies & remove duplicates.
2019-02-25 22:24:59 +01:00
Alessandro Pasotti
a3e37420c8
Merge pull request #9273 from elpaso/bugfix-fix-path-resolver-urls
fix path resolver urls
2019-02-25 22:03:10 +01:00
Víctor Olaya
29b952d90c [processing] consider destination params as outputs when defining scripts 2019-02-26 06:56:28 +10:00
Alessandro Pasotti
84e903c161 Typo 2019-02-25 19:52:20 +01:00
Nyall Dawson
519a30f10c Standardise dox for signals 2019-02-26 03:24:31 +10:00
Nyall Dawson
cab2dcf62c Fix regex used to replace [% %] expressions in text
Was incorrectly truncating at first ']' character

Fixes #21366
2019-02-26 03:24:09 +10:00
Alessandro Pasotti
98bd6d651b Fix path resolver with extra URL-like stuff
Like for CSVs: see #21150
2019-02-25 15:23:18 +01:00
Alessandro Pasotti
a615a3b3f5
Merge pull request #9260 from elpaso/form-background-color
Add bg color option to form containers
2019-02-25 15:13:36 +01:00
Alessandro Pasotti
ed2254a203 Typo 2019-02-25 15:04:21 +01:00
sklencar
77f500b12e [QgsQuick] - externalResource widget handler (#9232)
* [QgsQuick] - extended externalResource widget

Added removeFile function and modified fileName function - former has been missing and photoPanel is using it. The latter needed modification due to a new option to choose image from a gallery.
Added externalResource handler for externalResource widget which enables following features:
* option to choose an image from a gallery - selected image is copied to projects folder, if it doesnt exists there. Added "ic_gallery" icon.
* ability to remove value for externalResource field. Optionally removes referenced image as well ("Ok" option in dialog)
* ability to interact with image preview onClick - the main idea is to have ability to enlarge preview image. Currently its possible only in edit state of the form since the whole field is disabled otherwise.

Fixed resizing of icon/previewImage and component itself as well.

* [QgsQuick] - extended externalResource widget
Commit contains following fixes/changes/additions after review:
* Added QgsQuickUtils::getRelativePath which replaced QgsQuickUtils::getFileName + related changes in photoPanel
* Added test for new QgsQuickUtils functionality
* fixed weird or redundant size definitions in externalResource widget
* Some changes in docs.

* [QgsQuick] Changed "default" case result for QgsQuickUtils::getRelativePath

* [QgsQuick] Fixed test after changed functionality in QgsQuickUtils
2019-02-25 14:49:00 +01:00
Denis Rouzaud
d49dc897f5
Merge pull request #9246 from 3nids/vertextool_sync2
[vertex tool] synchronisation of map tool and editor selections
2019-02-25 07:15:09 -05:00
Nyall Dawson
4839740262 Spelling 2019-02-25 19:02:12 +10:00
Nyall Dawson
7eab74f803 Fix use of trailing */ in dox, which messes with sipify Python documentation output 2019-02-25 19:02:12 +10:00
Matthias Kuhn
98348599d3
Merge pull request #9239 from m-kuhn/better-error-messages-gpkg-fail
Better error message when failed to open DB
2019-02-25 09:11:47 +01:00
Blottiere Paul
9f576b678e
Merge pull request #9204 from troopa81/wms_filters
Add possbility to define one filter for several layers
2019-02-25 09:05:08 +01:00
Alessandro Pasotti
94b5fed57a Add test case for backgroundColor serialization 2019-02-25 09:03:33 +01:00
Alessandro Pasotti
e63b2ef69c Rename container background color dialog title 2019-02-25 09:03:08 +01:00
volaya
2f305c560e [processing] fixed finding grass folder 2019-02-25 08:49:57 +01:00
Matthias Kuhn
7f30680bed
Add test files for dissolve consecutive lines 2019-02-25 08:49:05 +01:00
Denis Rouzaud
884d9f688c
Merge pull request #9209 from jdugge/advanceddigitizing_rotated
Fix advanced digitizing display for rotated map canvas
2019-02-24 21:28:36 -05:00
Etienne Trimaille
8151872d41 add tooltips in the vertex editor 2019-02-25 11:32:36 +10:00
Nyall Dawson
50f3a32f4e Fix crash when exporting reports 2019-02-25 11:10:19 +10:00
uclaros
403a2e302e Ran scripts/astyle-all.sh and scripts/sipify_all.sh 2019-02-25 09:26:11 +10:00
uclaros
09efa48b97 Fixed notation of doxygen comments that were after a member 2019-02-25 09:26:11 +10:00
JF Perini
a020d479b4 fix error: call to 'abs' is ambiguous 2019-02-25 08:41:39 +10:00
Nyall Dawson
ec1218314d [processing] Fix "Add geometry attributes" handling of multipoint geom
For multipoints, export the count of geometries only
2019-02-25 07:50:48 +10:00
Nyall Dawson
0efa0b1dde Fix space inserted at start of graduated legend entries
Fixes #21339
2019-02-25 07:50:28 +10:00
Juergen E. Fischer
918f5f393d fix Pal::registerCancellationCallback spelling 2019-02-24 22:44:45 +01:00
Bas Couwenberg
371176357b Fix spelling errors.
* cancelation -> cancellation
 * overal      -> overall
2019-02-24 22:39:40 +01:00
Juergen E. Fischer
13a08c97fb nsis: remove desktop links 2019-02-24 18:13:53 +01:00
Alessandro Pasotti
6bdabcfe88 Doc for the new backgroundColor argument 2019-02-24 13:29:25 +01:00
Alessandro Pasotti
8d3f73a62a [feature][needs-docs] Add bg color option to form containers
Because gray is boring.
2019-02-24 13:18:29 +01:00
Alessandro Pasotti
c672893e9c Typo 2019-02-24 13:14:32 +01:00
Alessandro Pasotti
678f98c355
Merge pull request #9247 from elpaso/bugfix-21353-db-manager-sql-error
Fix db manager sql query
2019-02-23 23:23:09 +01:00
Juergen E. Fischer
2b21a97994 fix #19933 2019-02-23 22:09:53 +01:00
Alessandro Pasotti
a9652316af Tiny cosmetic fix: error by 1 on iteration counter text 2019-02-23 15:30:57 +01:00
Alessandro Pasotti
74aa8ca16e Fix db manager sql query
Fixes #21353
2019-02-23 11:10:50 +01:00
Denis Rouzaud
57ac4e67c9 use bool variables instead of connecting/disconnecting signals
also move simple QgsVertexEntry to qgsvertexeditor.h
2019-02-22 22:58:20 -05:00
Denis Rouzaud
4c1f08cc7a fix updating vertex selection 2019-02-22 22:32:13 -05:00
Denis Rouzaud
f77538e8f5 fix updating table selection 2019-02-22 22:05:34 -05:00
Denis Rouzaud
1d0ca0867f only select vertices from locked feature again 2019-02-22 22:05:34 -05:00
Denis Rouzaud
b8f1cb37ed correctly keep/clear vertices selection when switching locked feature 2019-02-22 22:05:34 -05:00
Denis Rouzaud
21fb44266a synchronize selection from the editor to the tool 2019-02-22 22:05:34 -05:00
Denis Rouzaud
5427392d04 remove vertex highlighting from editor 2019-02-22 22:05:34 -05:00
Juergen E. Fischer
ddb589a3c8 fix ui warnings 2019-02-22 23:50:56 +01:00
Juergen E. Fischer
6bf2d9d450 dwg import: implement suggestion from #21330 2019-02-22 23:50:56 +01:00