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

Fix relative paths to SVG files in embedded projects #4426

Merged
merged 14 commits into from
May 14, 2017
Merged

Fix relative paths to SVG files in embedded projects #4426

merged 14 commits into from
May 14, 2017

Commits on May 13, 2017

  1. Propagate path resolver through renderers, annotations, diagrams 

    This is necessary in order to be able to correctly translate between absolute and relative paths
deeper in the code - e.g. paths to SVG files used in marker or fill symbols.

Until now, relative paths were translated to absolute paths on the fly.
This is now changed - paths to files should be always absolute within QGIS objects - and paths
only get turned into relative when saving projects. When loading a project, relative paths
are translated to absolute paths immediately.

This should lower the overall confusion about relative/absolute paths within QGIS, and also
allow having different base directories for relative paths (e.g. QML or QPT files may use relative paths
to their directory - rather than to the project directory)
    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    8ffd91e View commit details
    Browse the repository at this point in the history

  2. Respect relative paths in embedded projects (fixes qgis#16355)

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    3e18cc1 View commit details
    Browse the repository at this point in the history

  3. Fixes to unit tests

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    bbe5996 View commit details
    Browse the repository at this point in the history

  4. Remove duplicate code - now handled by QgsPathResolver

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    15fc16d View commit details
    Browse the repository at this point in the history

  5. Introduce QgsReadWriteContext that encapsulates QgsPathResolver 

    This should make the read/write methods more flexible if we need to give them extra context.
    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    23a7bd0 View commit details
    Browse the repository at this point in the history

  6. API break update + read/write context in labeling and text renderer 

    This enables correct loading/saving of relative paths of SVG files for background of labels
    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    5bdae75 View commit details
    Browse the repository at this point in the history

  7. Remove "relative path" checkbox from svg selector widget 

    It is decided on different level whether files are saved with relative paths
and internally now QGIS always uses absolute paths to SVG files.
    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    c882f88 View commit details
    Browse the repository at this point in the history

  8. Fix text renderer test

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    bbb13f4 View commit details
    Browse the repository at this point in the history

  9. Add doxygen comments to updated methods

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    93bfa94 View commit details
    Browse the repository at this point in the history

  10. Bring back temporarily disabled projects upgrade + fix a loading bug 

    Loading bug: on the first project load, data-defined properties for diagram layer settings were not read
as the default constructor did not populate the list of data-defined property definitions.
    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    8dd5886 View commit details
    Browse the repository at this point in the history

  11. Fix build and add bits to project test to understand fail on mac

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    dfcfadc View commit details
    Browse the repository at this point in the history

  12. Fixes to relative paths read/write in composer picture and arrow items

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    a4717e2 View commit details
    Browse the repository at this point in the history

  13. Trying to fix mac test for QgsProject

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    40f683d View commit details
    Browse the repository at this point in the history

  14. Another trial to fix mac tests on travis

    @wonder-sk
    wonder-sk committed May 13, 2017
    Configuration menu
    Copy the full SHA
    590526e View commit details
    Browse the repository at this point in the history