[FEATURE] Map guides #55883

3nids · 2024-01-18T18:44:21Z

This introduces map guides in advanced digitizing.

Map guides are saved in an annotation layer (i.e. in the project) and can be either points or lines/curves.

For now, this introduces 4 map tools to create guides:

distance to 2 points
line extension
parallel
perpendicular

There is no spatial index of the guides. We assume for now that the number of guides will not be large enough to justify this.

Once the CRS is set (as soon as the first guide is added), it is kept even if the project CRS changes. This means that a transform will take place in the snapping.
Introducing a process to transform the guides sounds like an overkill.

cad.mov

allows map renderer jobs to be nulls

3nids · 2024-01-18T18:45:20Z

I would have like to get this in for 3.36, but couldn't make it soon enough. Let's see if this raises discussions :)

Tests for the snapping are coming.

rouault · 2024-01-19T00:24:28Z

src/gui/qgsdigitizingguidemaptool.h

+/**
+ * \ingroup gui
+ * \brief The QgsDigitizingGuideMapTool is a base class for map tools drawing map guides
+ * \since QGIS 3.34


3.36 or 3.38. Several similar instances below

rouault · 2024-01-19T00:26:39Z

src/gui/qgsdigitizingguidemaptool.cpp

@@ -0,0 +1,561 @@
+/***************************************************************************
+    qgsdigitizingguidemaptool.h


Suggested change

qgsdigitizingguidemaptool.h

qgsdigitizingguidemaptool.cpp

rouault · 2024-01-19T00:28:22Z

src/gui/qgsdigitizingguidemaptool.cpp

+  {
+    mCenterRubberBand.reset( new QgsRubberBand( mCanvas, Qgis::GeometryType::Point ) );
+    mCenterRubberBand->setIcon( QgsRubberBand::ICON_CROSS );
+    //mCenterRubberBand->setWidth( QgsGuiUtils::scaleIconSize( 8 ) );


Suggested change

//mCenterRubberBand->setWidth( QgsGuiUtils::scaleIconSize( 8 ) );

rouault · 2024-01-19T00:28:36Z

src/gui/qgsdigitizingguidemaptool.cpp

+    if ( mDistances.count() < 2 )
+    {
+      QInputDialog *d = new QInputDialog;
+      //d->setDialogTitle( tr( "Distance to point" ) );


Suggested change

//d->setDialogTitle( tr( "Distance to point" ) );

rouault · 2024-01-19T00:33:55Z

src/gui/qgsdigitizingguidemaptool.cpp

+  const QgsPointXY &s1 = mSegment->first;
+  const QgsPointXY &s2 = mSegment->second;
+
+  const double nx = s2.y() - s1.y();


Some high level comment about what all the below maths is trying to accomplish would be welcome :-)
I'd note that there's a division by zero if s1 == s2

Wondering if there wouldn't be value to move the computation part to some non-GUI method in case it might be helpful (but no strong opinion)

rouault · 2024-01-19T00:35:36Z

src/core/annotations/qgsannotationmarkeritem.h

-    QList< QgsAnnotationItemNode > nodes() const override;
-    Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ) override;
-    QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) override SIP_FACTORY;
+    virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const override;


why adding virtual here ? override already indicates this (not sure about QGIS habits though)

rouault · 2024-01-19T00:36:23Z

src/core/maprenderer/qgsmaprendererjob.cpp

@@ -649,7 +649,7 @@ std::vector<LayerRenderJob> QgsMapRendererJob::prepareJobs( QPainter *painter, Q
      job.context()->setElevationMap( job.elevationMap );
    }

-    if ( ( job.renderer->flags() & Qgis::MapLayerRendererFlag::RenderPartialOutputs ) && ( mSettings.flags() & Qgis::MapSettingsFlag::RenderPartialOutput ) )
+    if ( job.renderer && ( job.renderer->flags() & Qgis::MapLayerRendererFlag::RenderPartialOutputs ) && ( mSettings.flags() & Qgis::MapSettingsFlag::RenderPartialOutput ) )


are this additional check and the one in qgsmaprenderedparalleljob.cpp specific to the new dev, or bug fixes ? If the later, they should probably be in a separate commit (apologies if it is already the case, but wasn't obvious from looking at commit titles)

nyalldawson · 2024-01-19T02:00:14Z

Hmm -- I have reservations. The approach here of storing the guides in an annotation layer makes me uneasy. Why go for this approach? As far as I can see, we'd never want guides to be rendered outside of the mapcanvas so my gut instinct is that rubber bands / canvas items would be a better fit for rendering the guides. And then there's other things which look odd to me, eg why are we needing a creation datetime value for the guide model?

The UI also looks very rough to me. A collapsed group doesn't seem at all appropriate here. I'd prefer a panel stack there. And a proper toolbar instead of the row of custom buttons.

How does this feature relate to the other guides option in the CAD panel? Does it ultimately supersede that? Or will we have two approaches to this?

uclaros · 2024-01-19T07:45:43Z

Hmm -- I have reservations.

👍

A plugin to assist drawing such guides in an annotation layer would be more appropriate imho, instead of adding another hidden entity in the project (I'm looking at you default annotation layer!)

3nids · 2024-01-22T14:39:59Z

Thank you for the valuable feedback.

Canvas Item sounds indeed like a wiser choice, I'll come back later with a refactored implementation.

Regarding the coexistence with current helpers/guides in the Advanced Digitizing tools, the idea here is that you take time to build the guides and keep them around for a while, rather than having them placed during the digitizing process. There are a few reasons to this:

guides can be (re)used for several digitizations
it's easier to lose time when making error (no need to restart a complete digitization) and the process is more obvious
you avoid switching map tools while digitizing

The only overlap I see is with the line extension (but again, having a clear construction process of the guides makes sense).

I will try to improve UX following the comments.
Cheers.

uclaros · 2024-01-23T08:11:52Z

One can achieve the same goal by adding a point and a line layer to his project and store features as snapping guides. This will have all the proposed pros but also have lots of extra benefits, off the top of my head:

Customized symbology / labeling
Visibility toggling
Tools to spatially select, modify, and export/import such guides to reuse in other project
Attributes (creation date, user name, metadata ...)
CRS transformation
Snap to intersections with other layers
Construction mode for complex guides (eg parallel to endpoints of two separate features etc...)
Less code

The only overlap I see is with the line extension

Actually, IMO the only non-ovelap is the two circle intersection, which now requires two actual circles to be added as guides.

I would suggest we come up with an elegant way to add the two distances tool to the existing advanced digitizing tools/locks (so far such attempts had a very intrusive ui and terrible ux) and let user manage their guides on their layers of choice.

github-actions · 2024-04-20T02:33:31Z

The QGIS project highly values your contribution and would love to see this work merged! Unfortunately this PR has not had any activity in the last 14 days and is being automatically marked as "stale". If you think this pull request should be merged, please check

that all unit tests are passing
that all comments by reviewers have been addressed
that there is enough information for reviewers, in particular
- link to any issues which this pull request fixes
- add a description of workflows which this pull request fixes
- add screenshots if applicable
that you have written unit tests where possible
In case you should have any uncertainty, please leave a comment and we will be happy to help you proceed with this pull request.
If there is no further activity on this pull request, it will be closed in a week.

github-actions · 2024-04-27T02:34:22Z

While we hate to see this happen, this PR has been automatically closed because it has not had any activity in the last 21 days. If this pull request should be reconsidered, please follow the guidelines in the previous comment and reopen this pull request. Or, if you have any further questions, just ask! We love to help, and if there's anything the QGIS project can do to help push this PR forward please let us know how we can assist.

3nids · 2024-05-28T05:55:02Z

superseded by #57584

3nids added 9 commits January 18, 2024 19:12

Map guides layer and model

6cf95ca

map tools to create map guides

cbe9a95

map guides widget

3ae4766

add map guides layer to project

9066938

make map guides available in snapping

0b032c0

make annotation layer methods virtual

348a275

integrate map guides in advanced digitizing widget

c0e69a5

cmakelists + sipify

4d98de1

correctly disable guides rendering and snapping

9c13cb6

allows map renderer jobs to be nulls

github-actions bot added this to the 3.36.0 milestone Jan 18, 2024

3nids force-pushed the map-guides branch from c65577f to 2e41a60 Compare January 18, 2024 19:15

fix documentation

ecbc8ef

3nids force-pushed the map-guides branch from 2e41a60 to ecbc8ef Compare January 18, 2024 19:27

rouault reviewed Jan 19, 2024

View reviewed changes

3nids marked this pull request as draft January 22, 2024 14:40

nyalldawson added the Frozen Feature freeze - Do not merge! label Feb 1, 2024

nyalldawson removed the Frozen Feature freeze - Do not merge! label Apr 5, 2024

github-actions bot added the stale Uh oh! Seems this work is abandoned, and the PR is about to close. label Apr 20, 2024

github-actions bot closed this Apr 27, 2024

3nids removed the stale Uh oh! Seems this work is abandoned, and the PR is about to close. label May 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEATURE] Map guides #55883

[FEATURE] Map guides #55883

3nids commented Jan 18, 2024

3nids commented Jan 18, 2024 •

edited

Loading

rouault Jan 19, 2024

rouault Jan 19, 2024

rouault Jan 19, 2024

rouault Jan 19, 2024

rouault Jan 19, 2024

rouault Jan 19, 2024

rouault Jan 19, 2024

nyalldawson commented Jan 19, 2024

uclaros commented Jan 19, 2024

3nids commented Jan 22, 2024

uclaros commented Jan 23, 2024

github-actions bot commented Apr 20, 2024

github-actions bot commented Apr 27, 2024

3nids commented May 28, 2024

		@@ -0,0 +1,561 @@
		/***************************************************************************
		qgsdigitizingguidemaptool.h

[FEATURE] Map guides #55883

[FEATURE] Map guides #55883

Conversation

3nids commented Jan 18, 2024

3nids commented Jan 18, 2024 • edited Loading

rouault Jan 19, 2024

Choose a reason for hiding this comment

rouault Jan 19, 2024

Choose a reason for hiding this comment

rouault Jan 19, 2024

Choose a reason for hiding this comment

rouault Jan 19, 2024

Choose a reason for hiding this comment

rouault Jan 19, 2024

Choose a reason for hiding this comment

rouault Jan 19, 2024

Choose a reason for hiding this comment

rouault Jan 19, 2024

Choose a reason for hiding this comment

nyalldawson commented Jan 19, 2024

uclaros commented Jan 19, 2024

3nids commented Jan 22, 2024

uclaros commented Jan 23, 2024

github-actions bot commented Apr 20, 2024

github-actions bot commented Apr 27, 2024

3nids commented May 28, 2024

3nids commented Jan 18, 2024 •

edited

Loading