[FEATURE][needs-docs] Svg marker size: change aspect ratio by rldhont · Pull Request #4912 · qgis/QGIS

rldhont · 2017-07-24T08:35:13Z

Description

Qt gives us the ability to display SVG marker with a different aspect ratio than the one defined in the SVG file.
This PR updates the way to display SVG marker and gives the ability to user to update the aspect ratio.

This PR has been funded by Ville d'Avignon

Checklist

Commit messages are descriptive and explain the rationale for changes
Commits which add new features are tagged with [FEATURE] in the commit message
Commits which change the UI or existing user workflows are tagged with [needs-docs] in the commit message and containt sufficient information in the commit message to be documented
I have read the QGIS Coding Standards and this PR complies with them
This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
New unit tests have been added for core changes
I have run the scripts/prepare-commit.sh script before each commit

nyalldawson

Cool feature! Code looks good - just one concern I've noted above.

nyalldawson · 2017-07-24T09:38:50Z

This change is going to break data defined marker sizes (e.g. setting a data defined size for the whole symbol). What's the motivation behind changing this?

I thought I had to do like that.

nyalldawson · 2017-07-24T10:02:56Z

Can you initialize these in the header instead of here (c++11 style)

nirvn

@rldhont , nice feature, thanks for working this out.

There's a problem with the .ui file, whereas the minimum with of the svg marker's configuration panel has dramatically expanded.

PR looks good to me after the above .ui issue is fixed.

rldhont · 2017-07-25T18:18:43Z

@nirvn I have updated the ui, it is the right way ? If not, which line can I update ?

rldhont · 2017-07-25T18:19:36Z

@nyalldawson thanks for your review. Is my update right ?

nyalldawson · 2017-07-25T23:08:51Z

HEY! That's not how the doc test works... add documentation to the newly added members please :)

But no method has been documented here...

nyalldawson · 2017-07-25T23:11:48Z

This reference image looks fragile due to the ~1 pixel high areas. I'd suggest:

remove the outline from the symbol, that'll help avoid antialiasing/blending of fill/outline platform differences

boost the minimum size here so that the smallest symbol is at least a couple of pixels thick in its center

nyalldawson · 2017-07-25T23:13:48Z

What's happening here? is this supposed to be reusing the existing reference image? I'd have expected it to look different given that it's only the width which is varying?

In this case the aspect ratio has not been explicitly changed with setFixedAspectRatio or with the PreserveAspectRatio data defined property, so the Width data defined property gives the same has the Size data defined property.
I think I have to add some tests.

nirvn · 2017-07-26T03:16:23Z

@rldhont , the width issue is still present:

rldhont · 2017-07-26T08:29:56Z

@nirvn I apology but I don't understand the issue ?
I didn't see in the diff of .ui file where I have modified the minimum width of the svg marker's configuration panel. How do you want I fix it ?

nirvn · 2017-07-26T08:33:13Z

@rldhont , try a master vs. your PR build, and notice how the minimum width (before a scrollbar appears) of the svg marker panel in your PR is much wider than on master.

It's not clear to me which change in the .ui file led to that.

rldhont · 2017-07-26T08:37:40Z

@nirvn it is not just because this PR adds 2 new inputs and the panel it self is not scrollable ?

nirvn · 2017-07-26T09:15:45Z

@rldhont , problem has to do with the [x] preserve aspect ratio checkbox. The minimum width goes back to normal when I reduce the string to "P..." (test only, to dissect the issue):

rldhont · 2017-07-26T09:17:42Z

@nirvn, thanks ! I'll update the .ui to fix it

nyalldawson · 2017-07-26T09:25:11Z

@nirvn seems like a perfect place for your new ratio lock widget?

rldhont · 2017-07-28T16:09:09Z

@nyalldawson I have updated documentations and tests.
@nirvn I have updated the ui

rldhont · 2017-07-29T12:57:21Z

Do I rebase to reorganize commits ?

daydinodakent · 2017-07-31T14:14:47Z

@nyalldawson
I follow nightly edition of QGIS 2.99
There are three problems in showing point features as SVG file.
1- If you try to show point features as SVG marker and give any "Rotation Angle"
2- Make SVG marker settings in "MapUnit"/"Inches"/"Meters" (more than 1000 point symbols), [in "Milimeter"/"Pixels"/"Points" units there is no problem]
3- If you zoom in more than 1:25 to SVG symbol [in "Milimeter"/"Pixels/"Points" units there is no problem]
then QGIS stop working and close.

rldhont · 2017-08-07T16:14:28Z

@nyalldawson and @nirvn do you have any objection to merge ?

nyalldawson · 2017-08-08T06:21:40Z

Building now for a test...

nyalldawson

@rldhont I just tested and it's working very (very!) nicely. My one concern is with the UI here. What I'm wondering is whether the data defined control for preserving the aspect ratio is really necessary here? If it isn't, we should use @nirvn's new QgsRatioLockButton instead of a checkbox for the ratio lock widget. This will keep consistency between different parts of the UI, and is a lot nicer than a plain checkbox.

I also think the units combo box should be vertically centered between the width and height spin boxes. At the moment it's bottom aligned, so it doesn't look associated with the width spin box.

nyalldawson · 2017-08-08T06:32:19Z

far -> ratio

nyalldawson · 2017-08-08T06:32:42Z

Since these are protected members, they'll need doc strings (or make them private)

nyalldawson · 2017-08-08T06:34:52Z

Can we make these private slots? I don't like how all these widgets expose a lot of their internal workings publicly (and hence become part of stable API). If not, they need docstrings added

rldhont · 2017-08-23T07:25:28Z

@m-kuhn, @nirvn I have updated the UI and code as you requested it.
Is it ok for you ?

nirvn · 2017-08-23T10:12:11Z

@rldhont the checkbox label is being chopped off now:

DelazJ · 2017-08-23T10:52:05Z

Also, how about left aligning the "Preserve..." checkbox with "Height" and "Width" labels (capitalize first letter)? afaics, they are of the same level: subitems of the Size parameter.

nyalldawson · 2017-08-23T10:57:08Z

My view would still be to use the ratio luck button - it's much much less visual clutter then a checkbox with a lengthy label

nyalldawson · 2017-08-23T10:57:17Z

Luck=lock

rldhont · 2017-08-23T11:05:58Z

@nyalldawson @nirvn does the ratio lock button have documentation ? Is it already available in QGIS source tree ?

nyalldawson · 2017-08-23T11:09:35Z

QgsRatioLockButton. It's in master and should be suggested to use (API docs are there)

rldhont · 2017-08-27T14:15:50Z

Hi devs,
@nyalldawson QgsRatioLockButton added
@DelazJ labels updated
@nirvn Preserve Aspect Ratio checkbox removed
Telle me if it is good for you ?

nirvn · 2017-08-28T03:35:40Z

@rldhont , looking much better with the radio lock button:

There's an issue with the ratio lock button's pressed state, whereas the state is still pressed even though the ratio lock is disabled. Check the save as image dialog to see how it should look.

Otherwise, LGTM and can't wait for it to be merged.

rldhont · 2017-08-29T12:25:24Z

@dmarteau can you take a look ?

rldhont · 2017-09-07T14:18:57Z

@nirvn I don't understand how to fix this ui point

rldhont · 2017-09-11T07:53:57Z

@nirvn I have updated the way Size, Height and lock button is used. But I have an issue with the setDown button, if the button is firstly displayed as locked. Can we fix this after ?

…dingly

…SvgSymbolLayer

rldhont · 2017-09-28T12:15:17Z

@nirvn the setDown is fixed! Can I merge ?

rldhont · 2017-10-04T08:54:21Z

I'll merge this PR tomorrow if I've no more comments in the meantime.

nirvn · 2017-10-04T09:52:27Z

@rldhont , sorry for the delay -- the PR is fine by me. Thanks, great feature addition.

rldhont added Feature For Review labels Jul 24, 2017

rldhont added this to the QGIS 3 milestone Jul 24, 2017

rldhont requested review from nirvn and nyalldawson July 24, 2017 08:35

nyalldawson reviewed Jul 24, 2017

View reviewed changes

nyalldawson added the Requires Tests! Waiting on the submitter to add unit tests before eligible for merging label Jul 24, 2017

nirvn requested changes Jul 25, 2017

View reviewed changes

nyalldawson reviewed Jul 25, 2017

View reviewed changes

rldhont force-pushed the svg-marker-size branch 2 times, most recently from 36a786f to 87febcf Compare August 7, 2017 16:11

nyalldawson reviewed Aug 8, 2017

View reviewed changes

rldhont force-pushed the svg-marker-size branch 2 times, most recently from d7ac750 to 2ab222a Compare August 20, 2017 14:17

rldhont force-pushed the svg-marker-size branch from 2ab222a to 352e3af Compare August 22, 2017 18:35

rldhont force-pushed the svg-marker-size branch from 352e3af to 6ffae09 Compare August 27, 2017 14:13

rldhont force-pushed the svg-marker-size branch from 6ffae09 to 98f9957 Compare September 11, 2017 07:52

rldhont force-pushed the svg-marker-size branch from 98f9957 to aaaba5a Compare September 19, 2017 06:57

dmarteau and others added 6 commits September 28, 2017 12:23

Add fixedAspectRatio in QgsSvgCacheEntry and compute image size accor…

740ccbe

…dingly

Configure and use fixedAspectRatio in QgsSvgSymbolLayerWidget and Qgs…

60cf7bd

…SvgSymbolLayer

Add tests for fixedAspectRatio in SVG marker

48514d2

Update SIP for fixedAspectRatio in SVG marker

954d62f

Use QgsRatioLockButton for fixedAspectRatio in SVG marker

aee93b0

Update the QgsRatioLockButton use for fixedAspectRatio in SVG marker

f8152c1

rldhont force-pushed the svg-marker-size branch from aaaba5a to f8152c1 Compare September 28, 2017 10:25

nirvn approved these changes Oct 4, 2017

View reviewed changes

rldhont merged commit 3e45f99 into qgis:master Oct 4, 2017

Uh oh!

Conversation

rldhont commented Jul 24, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Uh oh!

nyalldawson left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nirvn left a comment

Choose a reason for hiding this comment

Uh oh!

rldhont commented Jul 25, 2017

Uh oh!

rldhont commented Jul 25, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nirvn commented Jul 26, 2017

Uh oh!

rldhont commented Jul 26, 2017

Uh oh!

nirvn commented Jul 26, 2017

Uh oh!

rldhont commented Jul 26, 2017

Uh oh!

nirvn commented Jul 26, 2017

Uh oh!

rldhont commented Jul 26, 2017

Uh oh!

nyalldawson commented Jul 26, 2017

Uh oh!

rldhont commented Jul 28, 2017

Uh oh!

rldhont commented Jul 29, 2017

Uh oh!

daydinodakent commented Jul 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rldhont commented Aug 7, 2017

Uh oh!

nyalldawson commented Aug 8, 2017

Uh oh!

nyalldawson left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rldhont commented Aug 23, 2017

Uh oh!

nirvn commented Aug 23, 2017

Uh oh!

DelazJ commented Aug 23, 2017

Uh oh!

nyalldawson commented Aug 23, 2017

Uh oh!

nyalldawson commented Aug 23, 2017

Uh oh!

rldhont commented Aug 23, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rldhont commented Jul 24, 2017 •

edited

Loading

daydinodakent commented Jul 31, 2017 •

edited

Loading

rldhont commented Aug 23, 2017 •

edited

Loading

rldhont commented Sep 11, 2017 •

edited

Loading