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

Fix reshape for snapped point with Z #30108

Merged
merged 2 commits into from Jun 18, 2019

Conversation

lbartoletti
Copy link
Member

@lbartoletti lbartoletti commented Jun 6, 2019

Description

Reshape tool doesn't take care of snapped Z values. Indeed, QgsMapToolCapture::points() returns QgsPointXY and not map point snapped (with Z). So, we need to use snapped points from the captureCurve.

I haven't changed QVector<QgsPointXY> QgsMapToolCapture::points() to QVector<QgsPoint> QgsMapToolCapture::points() (or rename QVector<QgsPointXY> QgsMapToolCapture::pointsXY()) because it's a bugfix, I think it breaks the API. What do you think about that?

With this fix
reshape_snapped_z

cc @ponceta

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

  • Commit messages are descriptive and explain the rationale for changes
  • Commits which fix bugs include fixes #11111 in the commit message next to the description
  • 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 contain 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
Copy link
Collaborator

@3nids look good to you?

Copy link
Member

@3nids 3nids left a comment

Choose a reason for hiding this comment

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

looking good!
I left a todo here qgis/qgis4.0_api#96

@nyalldawson nyalldawson merged commit c3f5f71 into qgis:master Jun 18, 2019
@lbartoletti lbartoletti deleted the fix_snapped_z_reshapetool branch June 19, 2019 04:25
@lbartoletti
Copy link
Member Author

@nyalldawson @3nids thanks. Can you add backports flags please?

@nyalldawson
Copy link
Collaborator

It's too late for that, it needs to be done before merge. You'll need to manually open the backport as a pr against 3.4.

@3nids
Copy link
Member

3nids commented Jun 19, 2019

@nyalldawson I'm so happy I can give you a trick for once: yes you can do it after merge :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants