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.

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

Vector symbology batch update #6997

Merged
merged 17 commits into from
Feb 28, 2022
Merged

Conversation

roya0045
Copy link
Collaborator

@roya0045 roya0045 commented Oct 24, 2021

Fixes #6421 Fixes #6571 Fixes #6692 Fixes #6715 Fixes #6790 Fixes #6948

Proposal to update the vector symbology sections.

Images still need to be added.

@DelazJ
Copy link
Collaborator

DelazJ commented Oct 24, 2021

@roya0045 Can you split up the PR so that 3.24 features are moved to another one? master is currently targeting 3.22LTR so until we set up a branch and release 3.22 docs, we cannot merge these

@roya0045
Copy link
Collaborator Author

@roya0045 Can you split up the PR so that 3.24 features are moved to another one? master is currently targeting 3.22LTR so until we set up a branch and release 3.22 docs, we cannot merge these

Sure thing!

@DelazJ
Copy link
Collaborator

DelazJ commented Nov 2, 2021

@roya0045 I created a dedicated branch for 3.22 so you can open a PR with #6989 changes against master

Copy link
Collaborator

@DelazJ DelazJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing some review

docs/user_manual/style_library/symbol_selector.rst Outdated Show resolved Hide resolved
docs/user_manual/style_library/symbol_selector.rst Outdated Show resolved Hide resolved
docs/user_manual/working_with_vector/vector_properties.rst Outdated Show resolved Hide resolved
docs/user_manual/working_with_vector/vector_properties.rst Outdated Show resolved Hide resolved
Merged Features Renderer
....................

The |mergedFeaturesSymbol| :guilabel:`Merged Features` renderer is a meta-renderer.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The symbol referenced by the |mergedFeaturesSymbol| substitution does not exist yet in the repo. You need to create and load it (https://docs.qgis.org/testing/en/docs/documentation_guidelines/substitutions.html#usage)

docs/user_manual/working_with_vector/vector_properties.rst Outdated Show resolved Hide resolved
Comment on lines 3067 to 3068
This variable forces the rendering to be displayed as if the layer was
at the provided scale, regardless of the scale of the map extent.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using "variable" is confusing as it might mean things like @.... "option" looks more appropriate to me.
This description does not look correct to me (or I don't understand it) and I feel like it contradicts the next paragraph. The scale is actually taken into consideration, leading to the size scaling. #6790 explains that well IMHO.

at the provided scale, regardless of the scale of the map extent.

In the case where the reference scale is set at 1:1000 and
use a width of 1mm to render a line. If the map is at a scale of 1: 10 000
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
use a width of 1mm to render a line. If the map is at a scale of 1: 10 000
the line uses a width of 1mm to render, if the map is at a scale of 1: 10 000

We can also reuse the sentence in the GUI or the issue report.

docs/user_manual/working_with_vector/vector_properties.rst Outdated Show resolved Hide resolved
docs/user_manual/working_with_vector/vector_properties.rst Outdated Show resolved Hide resolved
@roya0045
Copy link
Collaborator Author

@DelazJ The embeded render doesn't have an icon, I'm not sure if I should remove the substitution or not.

@DelazJ
Copy link
Collaborator

DelazJ commented Jan 30, 2022

@roya0045 no icon then no substitution possible. We will add one if ever the renderer has an icon (qgis/QGIS#42071)

@roya0045 roya0045 marked this pull request as ready for review January 31, 2022 18:14
@roya0045
Copy link
Collaborator Author

@roya0045 no icon then no substitution possible. We will add one if ever the renderer has an icon (qgis/QGIS#42071)

Good, should be fine now.

Copy link
Collaborator

@DelazJ DelazJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@roya0045 Sorry for the delay.

Co-authored-by: Harrissou Sant-anna <delazj@gmail.com>
@DelazJ DelazJ enabled auto-merge (squash) February 28, 2022 13:39
@DelazJ DelazJ merged commit 489159f into qgis:master Feb 28, 2022
@github-actions
Copy link

The backport to release_3.22 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 870768a9c1... 6692 base
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging docs/user_manual/working_with_vector/vector_properties.rst
[backport-6997-to-release_3.22 82928d92f0] 6421 base
 Author: Alex <roya0045@users.noreply.github.com>
 Date: Sun Oct 24 09:20:21 2021 -0400
 1 file changed, 17 insertions(+)
Auto-merging docs/user_manual/working_with_vector/vector_properties.rst
[backport-6997-to-release_3.22 f62872ddba] 6571 base
 Author: Alex <roya0045@users.noreply.github.com>
 Date: Sun Oct 24 09:23:52 2021 -0400
 1 file changed, 13 insertions(+)
Auto-merging docs/user_manual/style_library/symbol_selector.rst
CONFLICT (content): Merge conflict in docs/user_manual/style_library/symbol_selector.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3.22 release_3.22
# Navigate to the new working tree
cd .worktrees/backport-release_3.22
# Create a new branch
git switch --create backport-6997-to-release_3.22
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f841693bcf790953b01565a10cd242ec1f1409c4,b595f36b6695207a515b743a1ba4a92f44ab39c3,870768a9c196ed075ff98b6fe4c4ffedfd7bb466,ea71b1cde6f33aec123cd43d3826a34366200e78,0a82e58611854b6fb49512d95e0f1df882ead796,05bcecb7113e9d8adb2dc4867198549dae85cb18,831086891250f7ab424d2df153ddc9f423145652,39c304247d0637fb112f36f0cf3b167e5ff30bd8,02880d02840954f5a2c6f77c44b46119ceec77fa,8e9e1e50c295473c4ec0104887e20519bf14a4a1,71d8b4df3be067de3dddf39f041a2344be71bd42,34babfe0ecd5e36055b9e09edd4a69a00ce1364b,88837eb1a9932fcd30fdde98306f3a59f9f42044,b9dc1863206e16a97d06d957bf82d9b49896d2e4,6f5c170107a208f1c8c6babac609668edc486801,47fe4fd9c5e1fac06a133cd7ec6d89e752d9ca79,3a27d7f45bffd9ca8a74c21ca3898b7872759083
# Push it to GitHub
git push --set-upstream origin backport-6997-to-release_3.22
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.22

Then, create a pull request where the base branch is release_3.22 and the compare/head branch is backport-6997-to-release_3.22.

DelazJ added a commit to DelazJ/QGIS-Documentation that referenced this pull request Feb 28, 2022
DelazJ added a commit that referenced this pull request Feb 28, 2022
@roya0045 roya0045 deleted the vector_symbology_batch_updt branch February 28, 2022 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment