Skip to content

Commit

Permalink
Merge pull request #50960 from DelazJ/maplayerrendererListdocs
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Nov 23, 2022
2 parents 2a0fc59 + 3d51ab3 commit 6f47a5f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgsdefaultvalue.sip.in
Expand Up @@ -21,7 +21,7 @@ on the client when a default field value needs to be generated.

Usual values for such an expression are

- `:py:func:`~now`` for a timestamp for a record
- :py:func:`~now` for a timestamp for a record
- `@some_variable` to insert a project or application level variable like
the username of the one digitizing a feature
- `$length` to insert a derived attribute of a geometry
Expand Down
8 changes: 4 additions & 4 deletions python/core/auto_generated/qgsmaplayerrenderer.sip.in
Expand Up @@ -27,13 +27,13 @@ Qt containers and various Qt classes use implicit sharing.

The scenario will be:

# renderer job (doing preparation in the GUI thread) calls
#. renderer job (doing preparation in the GUI thread) calls
:py:func:`QgsMapLayer.createMapRenderer()` and gets instance of this class.
The instance is initialized at that point and should not need
additional calls to :py:class:`QgsVectorLayer`.
# renderer job (still in GUI thread) stores the renderer for later use.
# renderer job (in worker thread) calls :py:func:`QgsMapLayerRenderer.render()`
# renderer job (again in GUI thread) will check :py:func:`~errors` and report them
#. renderer job (still in GUI thread) stores the renderer for later use.
#. renderer job (in worker thread) calls :py:func:`QgsMapLayerRenderer.render()`
#. renderer job (again in GUI thread) will check :py:func:`~errors` and report them

.. versionadded:: 2.4
%End
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdefaultvalue.h
Expand Up @@ -34,7 +34,7 @@
*
* Usual values for such an expression are
*
* - `now()` for a timestamp for a record
* - now() for a timestamp for a record
* - `@some_variable` to insert a project or application level variable like
* the username of the one digitizing a feature
* - `$length` to insert a derived attribute of a geometry
Expand Down
14 changes: 7 additions & 7 deletions src/core/qgsmaplayerrenderer.h
Expand Up @@ -41,13 +41,13 @@ class QgsRenderedItemDetails;
*
* The scenario will be:
*
* # renderer job (doing preparation in the GUI thread) calls
* QgsMapLayer::createMapRenderer() and gets instance of this class.
* The instance is initialized at that point and should not need
* additional calls to QgsVectorLayer.
* # renderer job (still in GUI thread) stores the renderer for later use.
* # renderer job (in worker thread) calls QgsMapLayerRenderer::render()
* # renderer job (again in GUI thread) will check errors() and report them
* #. renderer job (doing preparation in the GUI thread) calls
* QgsMapLayer::createMapRenderer() and gets instance of this class.
* The instance is initialized at that point and should not need
* additional calls to QgsVectorLayer.
* #. renderer job (still in GUI thread) stores the renderer for later use.
* #. renderer job (in worker thread) calls QgsMapLayerRenderer::render()
* #. renderer job (again in GUI thread) will check errors() and report them
*
* \since QGIS 2.4
*/
Expand Down

0 comments on commit 6f47a5f

Please sign in to comment.