Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge from qgis #11

Merged
merged 56 commits into from
Oct 13, 2020
Merged

merge from qgis #11

merged 56 commits into from
Oct 13, 2020

Commits on Sep 28, 2020

  1. 1st fix for broken GetFeatureInfo URLs in REST WMTS layers

    @ianturton
    ianturton committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    878d229 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. formatted

    @ianturton
    ianturton committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    d97d11f View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2020

  1. Rename geometry_overlay_* functions into overlay_*

    @DelazJ
    DelazJ committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    5f74d6a View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. add robustness

    @ianturton
    ianturton committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    a775957 View commit details
    Browse the repository at this point in the history

  2. swtich to QStringList

    @ianturton
    ianturton committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    1bce971 View commit details
    Browse the repository at this point in the history

  3. [OGR provider] Remove calls to ResetReading() in changeGeometryValues… 

    …() and changeGeometryValues() in situations where this is safe to do

Such calls will cause issues in the context of transaction groups where
feature iterators will share the same connection handle.
    @rouault
    rouault committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    d3d88e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2020

  1. Merge branch 'ogrprovider_remove_useless_resetreading' of https://git… 

    …hub.com/rouault/QGIS into rouault-ogrprovider_remove_useless_resetreading
    @elpaso
    elpaso committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    2f6c33c View commit details
    Browse the repository at this point in the history

  2. Skip potential reset reading calls

    @elpaso
    elpaso committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    505ef99 View commit details
    Browse the repository at this point in the history

  3. mDoNotResetReading -> mAllowResetReading

    @elpaso
    elpaso committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    02c168a View commit details
    Browse the repository at this point in the history

  4. Update src/core/providers/ogr/qgsogrfeatureiterator.cpp 

    Co-authored-by: Even Rouault <even.rouault@spatialys.com>
    @elpaso @rouault
    elpaso and rouault committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    1d5ebe9 View commit details
    Browse the repository at this point in the history

  5. Skip test on GDAL < 2.3

    @elpaso
    elpaso committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    fd495d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. [layouts] Allow negative values for grid annotation distance 

    This works, it was just blocked by the spin box minimum value
    @nyalldawson
    nyalldawson committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    7216045 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #39257 from elpaso/rouault-ogrprovider_remove_usel… 

    …ess_resetreading

ogrprovider remove useless resetreading
    @elpaso
    elpaso committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    5ddf9aa View commit details
    Browse the repository at this point in the history

  3. Transaction group: keep editing status after save 

    Fixes #39282
    @elpaso
    elpaso committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    72c8673 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #39174 from DelazJ/overlayOnly 

    Rename geometry_overlay_* functions into overlay_*
    @m-kuhn
    m-kuhn committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    1258afe View commit details
    Browse the repository at this point in the history

  5. fix crashes in QGIS 3D, mostly directly at project load

    @PeterPetrik @nyalldawson
    PeterPetrik authored and nyalldawson committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    9d06186 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2020

  1. GUI: renaming GPKG layer: allow any character but | (fixes #39288)

    @rouault @nyalldawson
    rouault authored and nyalldawson committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    f940ffc View commit details
    Browse the repository at this point in the history

  2. [layouts] Fix resizing multiline label items to adjust to the size 

    of their text
    @nyalldawson
    nyalldawson committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    6829e63 View commit details
    Browse the repository at this point in the history

  3. [ui] use a lower size for border in metadata information

    @slarosa
    slarosa committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    b788aa2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #39286 from elpaso/bugfix-gh39282-transaction-grou… 

    …p-editing-status-on-other-layers

Transaction group: keep editing status after save
    @elpaso
    elpaso committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    8eb52c8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #39070 from ianturton/issue-39002 

    1st fix for broken GetFeatureInfo URLs in REST WMTS layers
    @elpaso
    elpaso committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    0824eff View commit details
    Browse the repository at this point in the history

  6. Merge pull request #39297 from slarosa/stylesheet 

    [ui] use a lower size for border in metadata information
    @slarosa
    slarosa committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    e0ce602 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2020

  1. Add scripts/qstringfixup.py and .sh 

    The .py script is the lower level one that acts on a single file.

The .sh one is the one aimed at being used by the user:
- qstringfixup.sh without argument fixes up files modified in git
- qstringfixup.sh --all runs on all .h/.cpp files under src/ and tests/
    @rouault @nyalldawson
    rouault authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    1c06551 View commit details
    Browse the repository at this point in the history

  2. QStringLiteral -> QLatin1String changes generated by scripts/qstringf… 

    …ixup.sh --all
    @rouault @nyalldawson
    rouault authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    a76670e View commit details
    Browse the repository at this point in the history

  3. [ui] use grid layout for groupbox widgets in digitizing option

    @slarosa @nyalldawson
    slarosa authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    66f19ab View commit details
    Browse the repository at this point in the history

  4. [ui] stretch last section in filed table widget

    @slarosa @nyalldawson
    slarosa authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    6de9f60 View commit details
    Browse the repository at this point in the history

  5. Fix translation for geometry checks 

    Q_DELCARE_TR_FUNCTIONS must be used in the subclass. If used from the super class
it simply does not work.
    @m-kuhn @nyalldawson
    m-kuhn authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    1ddfbe6 View commit details
    Browse the repository at this point in the history

  6. Readd q_gadget

    @m-kuhn @nyalldawson
    m-kuhn authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    99dc28e View commit details
    Browse the repository at this point in the history

  7. Remove include

    @m-kuhn @nyalldawson
    m-kuhn authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    bd60cf1 View commit details
    Browse the repository at this point in the history

  8. Try to make PROJ >= 6 related tests more robust to output from differ… 

    …ent PROJ versions
    @rouault @nyalldawson
    rouault authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    18bfe1f View commit details
    Browse the repository at this point in the history

  9. Use edge color for tab indentation guide in code editors

    @nyalldawson
    nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    e29f17c View commit details
    Browse the repository at this point in the history

  10. Enable -DQT_USE_QSTRINGBUILDER and fix related build errors 

    Background:
https://www.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder

When enabling -DQT_USE_QSTRINGBUILDER, QString() concatenation with operator +
are done in a more efficient way, especially with repeated + operators.

Qt and creator themselves are built with that enabled.
    @rouault @nyalldawson
    rouault authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    5e4707f View commit details
    Browse the repository at this point in the history

  11. qgspostgresprovider.cpp: use classic initialization

    @rouault @nyalldawson
    rouault authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    e4fa6cb View commit details
    Browse the repository at this point in the history

  12. [pyqgis-console] restore marker icon for syntax check

    @slarosa @nyalldawson
    slarosa authored and nyalldawson committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    cce7aa7 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. Split indentation guide color from edge color in code editor settings 

    Reusing the same color resulted in too subtle indentation guides
    @nyalldawson
    nyalldawson committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    aaa813a View commit details
    Browse the repository at this point in the history

  2. [console] Fix exception when running scripts (followup cce7aa7) 

    and move responsibility for showing warning messages to QgsCodeEditor
base class, so that the same code can be used by other dialog script editors
    @nyalldawson
    nyalldawson committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    5c8013d View commit details
    Browse the repository at this point in the history

  3. Lazy construct expression context for memory provider feature sources 

    It's not free to calculate, and is only used when
iterating over a memory layer with a subset string set

Results in a big speed up to scripts which fire off many individual
feature requests to a memory provider layer
    @nyalldawson
    nyalldawson committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    1d2bb41 View commit details
    Browse the repository at this point in the history

  4. Don't crash on transaction save 

    Fixes #39265
    @elpaso
    elpaso committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    c2831cc View commit details
    Browse the repository at this point in the history

  5. flake8

    @elpaso
    elpaso committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    ea90774 View commit details
    Browse the repository at this point in the history

  6. OGR decodeUri: be tolerant on layerName case 

    Unreported issue: discovered in the QGIS-Documentation
test CI issue
https://travis-ci.org/github/qgis/QGIS-Documentation/builds/734917369#L679
    @elpaso
    elpaso committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    9b99ecb View commit details
    Browse the repository at this point in the history

  7. Merge pull request #39283 from elpaso/bugfix-gh39265-transactions-cra… 

    …sh-on-save

Don't crash on transaction save
    @elpaso
    elpaso committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    498bbbb View commit details
    Browse the repository at this point in the history

  8. Merge pull request #39328 from elpaso/bugfix-unreported-ogr-gpkg-laye… 

    …rType-case

OGR decodeUri: be tolerant on layerName case
    @elpaso
    elpaso committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    afd474b View commit details
    Browse the repository at this point in the history

  9. GDAL provider: don't crash on invalid bands 

    Fix unreported crash
    @elpaso @nyalldawson
    elpaso authored and nyalldawson committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    00ccfc8 View commit details
    Browse the repository at this point in the history

  10. Add note about Python bindings in QgsAction

    @Gustry @nyalldawson
    Gustry authored and nyalldawson committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    dbe2a3b View commit details
    Browse the repository at this point in the history

  11. fix 3d mesh dataset rendering

    @vcloarec @nyalldawson
    vcloarec authored and nyalldawson committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    5aba56c View commit details
    Browse the repository at this point in the history

  12. fix and improve test

    @vcloarec @nyalldawson
    vcloarec authored and nyalldawson committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    364e2e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. Add option to apply parameterized colors to SVGs returned by 

    QgsApplication::getThemePixmap
    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    b02d7b3 View commit details
    Browse the repository at this point in the history

  2. Allow error indicator colors to be controlled for code editor color s… 

    …cheme
    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    0a3f40a View commit details
    Browse the repository at this point in the history

  3. Spelling

    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    56b3494 View commit details
    Browse the repository at this point in the history

  4. Catch another situation where the user-set custom CRS name needs to b… 

    …e restored from XML
    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    8298d68 View commit details
    Browse the repository at this point in the history

  5. When creating a CRS from WKT and the WKT has an embedded CRS name, co… 

    …rrectly use this to set the QgsCoordinateReferenceSystem description
    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    9a35b27 View commit details
    Browse the repository at this point in the history

  6. Make test WKT comparison more tolerant

    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    ad3f0a8 View commit details
    Browse the repository at this point in the history

  7. Cleanup handling of margins in QgsCodeEditor and subclasses

    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    1ac5941 View commit details
    Browse the repository at this point in the history

  8. Javascript code editor should show line numbers

    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    88726e9 View commit details
    Browse the repository at this point in the history

  9. Use proper method to show line numbers in Virtual Layers SQL editor

    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    66226f6 View commit details
    Browse the repository at this point in the history

  10. Cleanup raw margin manipulation used to hide holding controls, use pr… 

    …oper methods
    @nyalldawson
    nyalldawson committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    8d3e028 View commit details
    Browse the repository at this point in the history