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

Advanced digitizing - circle intersection #9569

Merged
merged 4 commits into from
Jan 22, 2025

Conversation

selmaVH1
Copy link
Collaborator

fixes #9184

Goal:

Ticket(s): #

  • Backport to LTR documentation is requested

@DelazJ DelazJ added Editing backport release_3.40 On merge create a backported pull request to 3.40 Vector labels Jan 19, 2025
---------------------------

To find the intersection point of two circles, click the
|circleIntersection| :sup:`2-circle Point Intersection` icon.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Given that this button is not directly exposed in the toolbar, for people that would arrive directly to this section, let's add where to find it

Suggested change
|circleIntersection| :sup:`2-circle Point Intersection` icon.
|circleIntersection| :sup:`2-circle Point Intersection` icon
in the |extractVertices| :sup:`Construction Tools` drop-down menu.


To find the intersection point of two circles, click the
|circleIntersection| :sup:`2-circle Point Intersection` icon.
This will open a dialog where you can define the parametaers for
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
This will open a dialog where you can define the parametaers for
This will open a dialog where you can define the parameters for

2-circle point intersection
---------------------------

To find the intersection point of two circles, click the
Copy link
Collaborator

Choose a reason for hiding this comment

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

Assuming there is no "pick"...

Suggested change
To find the intersection point of two circles, click the
To add a vertex at the intersection of two circles, click the

It is even possible to hover over two different vertices, generating virtual
coordinate lines for both, and snap to their intersection.
* |circleIntersection| :sup:`2-circle Point Intersection`: allows you to
pick or digitize a point at the intersection of two circles.
Copy link
Collaborator

Choose a reason for hiding this comment

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

What is meant by "pick", here? Catch? How? @nirvn

Suggested change
pick or digitize a point at the intersection of two circles.
digitize a point or vertex at the intersection of two circles.

based on your clicks on the map canvas.
You will need to enter the distance :guilabel:`d` for each circle, the tool will then calculate
and display the two intersection points of the circles.

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
Click one of them to add the new vertex.

And maybe the above should be as steps..

Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need the advanced digitizing panel, here? I find the two other elements enough complementary, and we would avoid adding "unnecessary" elements that may look outdated in a few releases, e.g. because of new tools/options in GUI.
But if we do, can it be placed on the left of the circles, to get a more landscaped image and less blank part in a higher image, in docs? Thanks.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Not willing to nitpick but can you add the dialog with more buttons enabled. The perpendicular and parallel buttons should at least be clearly identifiable.

@@ -218,6 +218,8 @@
:width: 1.5em
.. |circleCenterPoint| image:: /static/common/mActionCircleCenterPoint.png
:width: 1.5em
.. |circleIntersection| image:: /static/common/circlesintersection.png
Copy link
Collaborator

Choose a reason for hiding this comment

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

This should be |circlesintersection|, given the filename. Or we rename the icon in code repo for consistency with others...

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I follow the docs guidelines: "The replacement text should be derived from the file name and written in camelCase."

Copy link
Collaborator

Choose a reason for hiding this comment

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

Indeed. I'm mixing requirements of my long time plan of automatizing substitutions addition process with actual rules. Sorry.
Then it should be circlesIntersection, here.

Suggested change
.. |circleIntersection| image:: /static/common/circlesintersection.png
.. |circlesIntersection| image:: /static/common/circlesintersection.png

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.

Should be good to merge then

@@ -218,6 +218,8 @@
:width: 1.5em
.. |circleCenterPoint| image:: /static/common/mActionCircleCenterPoint.png
:width: 1.5em
.. |circleIntersection| image:: /static/common/circlesintersection.png
Copy link
Collaborator

Choose a reason for hiding this comment

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

Indeed. I'm mixing requirements of my long time plan of automatizing substitutions addition process with actual rules. Sorry.
Then it should be circlesIntersection, here.

Suggested change
.. |circleIntersection| image:: /static/common/circlesintersection.png
.. |circlesIntersection| image:: /static/common/circlesintersection.png

@@ -2156,6 +2182,8 @@ To edit features in-place:
:width: 1.5em
.. |circleCenterPoint| image:: /static/common/mActionCircleCenterPoint.png
:width: 1.5em
.. |circleIntersection| image:: /static/common/circlesintersection.png
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
.. |circleIntersection| image:: /static/common/circlesintersection.png
.. |circlesIntersection| image:: /static/common/circlesintersection.png


To add a vertex at the intersection of two circles, follow these steps:

#. Click the |circleIntersection| :sup:`2-circle Point Intersection` icon in the
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
#. Click the |circleIntersection| :sup:`2-circle Point Intersection` icon in the
#. Click the |circlesIntersection| :sup:`2-circle Point Intersection` icon in the

Comment on lines 1780 to 1782
* |circleIntersection| :sup:`2-circle Point Intersection`: allows you to
digitize a point or vertex at the intersection of two circles.
(more at :ref:`circle_intersection`).
Copy link
Collaborator

Choose a reason for hiding this comment

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

should be indented

Suggested change
* |circleIntersection| :sup:`2-circle Point Intersection`: allows you to
digitize a point or vertex at the intersection of two circles.
(more at :ref:`circle_intersection`).
* |circlesIntersection| :sup:`2-circle Point Intersection`: allows you to
digitize a point or vertex at the intersection of two circles.
(more at :ref:`circle_intersection`).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sorry, I don’t understand why it needs to be indented, as it’s in line with the other items. If we indent it, I’m afraid it might look like it belongs to the construction tools...
image

Copy link
Collaborator Author

@selmaVH1 selmaVH1 Jan 22, 2025

Choose a reason for hiding this comment

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

@nirvn @DelazJ Sorry, my mistake. So, the tool from which we get the (drop-down) 2-circle point intersection does not have a tooltip in the GUI, but we can call it 'construction tools'? We describe it that way, but I'm not sure now...
image

Copy link
Collaborator

Choose a reason for hiding this comment

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

So, the tool from which we get the (drop-down) 2-circle point intersection does not have a tooltip in the GUI

Indeed. I asked for a name at qgis/QGIS#57648 (comment). Let's expect we get something...

but we can call it 'construction tools'? We describe it that way, but I'm not sure now...

No "Construction tools" is the one on the left so can't be used. Let's remove that mention in the meantime (and ignore the drop-down)

@DelazJ DelazJ merged commit 253e438 into qgis:master Jan 22, 2025
3 checks passed
DelazJ added a commit that referenced this pull request Jan 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3.40 On merge create a backported pull request to 3.40 Editing Vector
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[advanced digitizing] Add circles intersection digitizing tool (Request in QGIS)
2 participants