Skip to content

Commit ce6bd6c

Browse files
committedJul 25, 2016
Move QgsSymbolV2::OutputUnit enum to QgsUnitTypes
And rename to QgsUnitTypes::RenderUnits. This enum is used in much more contexts than just symbols, so QgsUnitTypes is a better fit for it. All methods which previously accepted QgsSymbolV2::OutputUnit parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.
1 parent f6f5010 commit ce6bd6c

File tree

97 files changed

+838
-822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+838
-822
lines changed
 

‎doc/api_break.dox

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,15 @@ has improved sort capabilities including the ability to set custom sort values f
447447
and for forcing certain items to always sort on top.</li>
448448
</ul>
449449

450+
\subsection qgis_api_break_3_0_QgsSymbolV2 QgsSymbolV2
451+
452+
<ul>
453+
<li>The OutputUnit enum, including QgsSymbolV2::MM, QgsSymbolV2::MapUnit, QgsSymbolV2::Mixed, QgsSymbolV2::Pixel and QgsSymbolV2::Percentage has been moved to QgsUnitTypes
454+
and renamed to RenderUnit. QgsSymbolV2::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbolV2::OutputUnit
455+
parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
456+
<li>subsetString() was made const. This has no effect on PyQGIS code, but c++ code implementing derived layer classes will need to update the signature of this method to match.</li>
457+
</ul>
458+
450459
\subsection qgis_api_break_3_0_QgsTreeWidgetItem QgsTreeWidgetItem
451460

452461
<ul>

‎python/core/dxf/qgsdxfexport.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ class QgsDxfExport
327327
//! @note added in 2.15
328328
void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor& color );
329329

330-
static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits );
330+
static double mapUnitScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits );
331331

332332
//! Return cleaned layer name for use in DXF
333333
static QString dxfLayerName( const QString &name );

0 commit comments

Comments
 (0)
Please sign in to comment.