Skip to content
Permalink
Browse files

update docu since 3.8

(cherry-picked from 6b09be7) and resolved conflicts
  • Loading branch information
signedav committed Feb 26, 2019
1 parent 1366b66 commit 47345ba33833eab4fbbb21e4960ed72277682eb5
Showing with 6 additions and 0 deletions.
  1. +4 −0 python/core/auto_generated/qgslegendsettings.sip.in
  2. +2 −0 src/core/qgslegendsettings.h
@@ -199,13 +199,17 @@ The ``scale`` value indicates the scale denominator, e.g. 1000.0 for a 1:1000 ma
Returns the factor of map units per pixel for symbols with size given in map units calculated by mDpi and mMmPerMapUnit

.. seealso:: :py:func:`setMapUnitsPerPixel`

.. versionadded:: 3.8
%End

void setMapUnitsPerPixel( double mapUnitsPerPixel );
%Docstring
Sets the the mMmPerMapUnit calculated by ``mapUnitsPerPixel`` mostly taken from the map settings.

.. seealso:: :py:func:`mapUnitsPerPixel`

.. versionadded:: 3.8
%End

int dpi() const;
@@ -180,12 +180,14 @@ class CORE_EXPORT QgsLegendSettings
/**
* Returns the factor of map units per pixel for symbols with size given in map units calculated by mDpi and mMmPerMapUnit
* \see setMapUnitsPerPixel()
* \since QGIS 3.8

This comment has been minimized.

Copy link
@DelazJ

DelazJ Feb 27, 2019

Contributor

I wonder how weird it's to have this in a 3.4 doc...

*/
double mapUnitsPerPixel() const;

/**
* Sets the the mMmPerMapUnit calculated by \a mapUnitsPerPixel mostly taken from the map settings.
* \see mapUnitsPerPixel()
* \since QGIS 3.8
*/
void setMapUnitsPerPixel( double mapUnitsPerPixel );

0 comments on commit 47345ba

Please sign in to comment.
You can’t perform that action at this time.