Skip to content

Update annotations documentation #9727

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Mar 21, 2025
Merged

Update annotations documentation #9727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
340b920
Remove balloon text and svg annotation types
DelazJ Mar 14, 2025
0aaa679
Add linked layer option for annotation layers
DelazJ Mar 14, 2025
dc65bf6
Refactor description of feature annotation properties
DelazJ Mar 14, 2025
05f2630
Add text annotation inside rectangle
DelazJ Mar 14, 2025
05d05fd
Add picture annotation item type
DelazJ Mar 14, 2025
6f5acc5
Add support for callouts to some text and picture annotations
DelazJ Mar 14, 2025
26aa774
Revert attempt to describe annotation placement options
DelazJ Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions docs/documentation_guidelines/substitutions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ Icon Substitution Icon S
|text| ``|text|`` |histogram| ``|histogram|``
|stackedBar| ``|stackedBar|`` |stackedDiagram| ``|stackedDiagram|``
|createAnnotationLayer| ``|createAnnotationLayer|`` |annotationLayer| ``|annotationLayer|``
|textAnnotation| ``|textAnnotation|`` |svgAnnotation| ``|svgAnnotation|``
|formAnnotation| ``|formAnnotation|`` |htmlAnnotation| ``|htmlAnnotation|``
|actionText| ``|actionText|`` |textAlongLine| ``|textAlongLine|``
|addImage| ``|addImage|`` |textInsideRect| ``|textInsideRect|``
|labelbackground| ``|labelbackground|`` |labelbuffer| ``|labelbuffer|``
|labelformatting| ``|labelformatting|`` |labelplacement| ``|labelplacement|``
|labelshadow| ``|labelshadow|`` |render| ``|render|``
Expand Down Expand Up @@ -1611,8 +1611,6 @@ Icon Substitution Icon
:width: 1.5em
.. |sumPoints| image:: /static/common/mAlgorithmSumPoints.png
:width: 1.5em
.. |svgAnnotation| image:: /static/common/mActionSvgAnnotation.png
:width: 1.5em
.. |symbology| image:: /static/common/symbology.png
:width: 2em
.. |symbologyAdd| image:: /static/common/symbologyAdd.png
Expand Down Expand Up @@ -1643,7 +1641,7 @@ Icon Substitution Icon
:width: 1.5em
.. |textAlongLine| image:: /static/common/mActionTextAlongLine.png
:width: 1.5em
.. |textAnnotation| image:: /static/common/mActionTextAnnotation.png
.. |textInsideRect| image:: /static/common/mActionTextInsideRect.png
:width: 1.5em
.. |tiledSceneLayer| image:: /static/common/mIconTiledSceneLayer.png
:width: 1.5em
Expand Down
12 changes: 0 additions & 12 deletions docs/user_manual/introduction/qgis_gui.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,6 @@ menu options you need to switch to editing mode by clicking on |toggleEditing|
-
-
- :ref:`sec_annotations`
* - :menuselection:`-->` |textAnnotation| :menuselection:`Text Annotation`
-
- :guilabel:`Annotations`
- :ref:`sec_annotations`
* - :menuselection:`-->` |formAnnotation| :menuselection:`Form Annotation`
-
- :guilabel:`Annotations`
Expand All @@ -367,10 +363,6 @@ menu options you need to switch to editing mode by clicking on |toggleEditing|
-
- :guilabel:`Annotations`
- :ref:`sec_annotations`
* - :menuselection:`-->` |svgAnnotation| :menuselection:`SVG Annotation`
-
- :guilabel:`Annotations`
- :ref:`sec_annotations`
* - :menuselection:`Edit Attributes -->`
-
-
Expand Down Expand Up @@ -2502,14 +2494,10 @@ processes (QGIS startup, plugins loading, processing tools...)
:width: 1.5em
.. |sumPoints| image:: /static/common/mAlgorithmSumPoints.png
:width: 1.5em
.. |svgAnnotation| image:: /static/common/mActionSvgAnnotation.png
:width: 1.5em
.. |symmetricalDifference| image:: /static/common/mAlgorithmSymmetricalDifference.png
:width: 1.5em
.. |temporal| image:: /static/common/temporal.png
:width: 1.5em
.. |textAnnotation| image:: /static/common/mActionTextAnnotation.png
:width: 1.5em
.. |tiles| image:: /static/common/tiles.png
:width: 1.5em
.. |titleLabel| image:: /static/common/title_label.png
Expand Down
166 changes: 108 additions & 58 deletions docs/user_manual/map_views/map_view.rst
View file
Open in desktop

Large diffs are not rendered by default.

Binary file removed static/common/mActionSvgAnnotation.png
View file
Open in desktop
Binary file not shown.
Binary file removed static/common/mActionTextAnnotation.png
View file
Open in desktop
Binary file not shown.
Binary file added static/common/mActionTextInsideRect.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions substitutions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,8 +1214,6 @@
:width: 1.5em
.. |sumPoints| image:: /static/common/mAlgorithmSumPoints.png
:width: 1.5em
.. |svgAnnotation| image:: /static/common/mActionSvgAnnotation.png
:width: 1.5em
.. |symbology| image:: /static/common/symbology.png
:width: 2em
.. |symbologyAdd| image:: /static/common/symbologyAdd.png
Expand Down Expand Up @@ -1250,7 +1248,7 @@
:width: 1.5em
.. |textAlongLine| image:: /static/common/mActionTextAlongLine.png
:width: 1.5em
.. |textAnnotation| image:: /static/common/mActionTextAnnotation.png
.. |textInsideRect| image:: /static/common/mActionTextInsideRect.png
:width: 1.5em
.. |tiledSceneLayer| image:: /static/common/mIconTiledSceneLayer.png
:width: 1.5em
Expand Down
Loading