diff --git a/doc/api_break.dox b/doc/api_break.dox
index cf9ba072716..aefa3aca15a 100644
--- a/doc/api_break.dox
+++ b/doc/api_break.dox
@@ -53,6 +53,14 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
permissiveToDouble() and permissiveToInt() where moved out of the QGis class and renamed to qgsPermissiveToDouble() and
qgsPermissiveToInt()
The constants DEFAULT_IDENTIFY_RADIUS and MINIMUM_POINT_SIZE were removed
+QGis::DecimalDegrees, DegreesMinutesSeconds and DegreesDecimalMinutes have been removed, and have all been replaced
+with the general Degrees unit
+The distance unit types QGis::UnitType (including QGis::Meters, QGis::Feet, QGis::Degrees, QGis::NauticalMiles,
+QGis::Kilometers, QGis::Yards, QGis::Miles and QGis::UnknownUnit have been moved to QgsUnitTypes::DistanceUnit.
+Some of these unit types have also been renamed - see the notes on QgsUnitTypes below. All methods which accepted
+QGis::UnitType parameters have been updated to take QgsUnitTypes::DistanceUnit instead.
+The unit handling methods toLiteral, fromLiteral, tr, fromTr, fromUnitToUnitFactor have been removed. Their
+corresponding counterparts in QgsUnitTypes should be used instead.
\subsection qgis_api_break_3_0_QgsAuthConfigUriEdit QgsAuthConfigUriEdit
@@ -447,6 +455,20 @@ has improved sort capabilities including the ability to set custom sort values f
and for forcing certain items to always sort on top.
+\subsection qgis_api_break_3_0_QgsSymbolV2 QgsSymbolV2
+
+
+- The OutputUnit enum, including QgsSymbolV2::MM, QgsSymbolV2::MapUnit, QgsSymbolV2::Mixed, QgsSymbolV2::Pixel and QgsSymbolV2::Percentage has been moved to QgsUnitTypes
+and renamed to RenderUnit. QgsSymbolV2::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbolV2::OutputUnit
+parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.
+
+
+\subsection qgis_api_break_3_0_QgsSymbolLayerV2Utils QgsSymbolLayerV2Utils
+
+
+- encodeOutputUnit() and decodeOutputUnit() were removed. QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.
+
+
\subsection qgis_api_break_3_0_QgsTreeWidgetItem QgsTreeWidgetItem
@@ -454,6 +476,23 @@ and for forcing certain items to always sort on top.
use QgsTreeWidgetItemObject which is an upgraded version of the original QgsTreeWidgetItem
+\subsection qgis_api_break_3_0_QgsUnitTypes QgsUnitTypes
+
+
+- All distance enumeration values were renamed to have a "Distance" prefix, including
+Meters (to DistanceMeters), Kilometers (to DistanceKilometers), Feet (to DistanceFeet),
+NauticalMiles (to DistanceNauticalMiles), Yards (to DistanceYards), Miles (to DistanceMiles),
+Degrees (to DistanceDegrees) and UnknownDistanceUnit to DistanceUnknownUnit
+- All area enumeration values were renamed to have a "Area" prefix, including
+SquareMeters (to AreaSquareMeters), SquareKilometers (to AreaSquareKilometers), SquareFeet (to AreaSquareFeet),
+SquareYards (to AreaSquareYards), SquareMiles (to AreaSquareMiles), Hectares (to AreaHectares),
+Acres (to AreaAcres), SquareNauticalMiles (to AreaSquareNauticalMiles), SquareDegrees (to AreaSquareDegrees)
+and UnknownAreaUnit to AreaUnknownUnit
+- All angle enumeration values were renamed to have a "Angle" prefix, including
+Radians (to AngleRadians), Gon (to AngleGon), MinutesOfArc (to AngleMinutesOfArc),
+SecondsOfArc (to AngleSecondsOfArc), Turn (to AngleTurn) and UnknownAngleUnit to AngleUnknownUnit
+
+
\subsection qgis_api_break_3_0_QgsVectorLayer QgsVectorLayer
diff --git a/python/core/dxf/qgsdxfexport.sip b/python/core/dxf/qgsdxfexport.sip
index 58eec03d61b..692555bcc09 100644
--- a/python/core/dxf/qgsdxfexport.sip
+++ b/python/core/dxf/qgsdxfexport.sip
@@ -63,14 +63,14 @@ class QgsDxfExport
* Set map units
* @param u unit
*/
- void setMapUnits( Qgis::UnitType u );
+ void setMapUnits( QgsUnitTypes::DistanceUnit u );
/**
* Retrieve map units
* @returns unit
* @see setMapUnits
*/
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
/**
* Set symbology export mode
@@ -327,7 +327,8 @@ class QgsDxfExport
//! @note added in 2.15
void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor& color );
- static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
+ //! Calculates a scaling factor to convert from map units to a specified symbol unit.
+ static double mapUnitScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits );
//! Return cleaned layer name for use in DXF
static QString dxfLayerName( const QString &name );
diff --git a/python/core/effects/qgsgloweffect.sip b/python/core/effects/qgsgloweffect.sip
index 83b42b18c7b..c411fe9caba 100644
--- a/python/core/effects/qgsgloweffect.sip
+++ b/python/core/effects/qgsgloweffect.sip
@@ -50,7 +50,7 @@ class QgsGlowEffect : QgsPaintEffect
* @see setSpread
* @see setSpreadMapUnitScale
*/
- void setSpreadUnit( const QgsSymbolV2::OutputUnit unit );
+ void setSpreadUnit( const QgsUnitTypes::RenderUnit unit );
/** Returns the units used for the glow spread distance.
* @returns units for spread distance
@@ -58,7 +58,7 @@ class QgsGlowEffect : QgsPaintEffect
* @see spread
* @see spreadMapUnitScale
*/
- QgsSymbolV2::OutputUnit spreadUnit() const;
+ QgsUnitTypes::RenderUnit spreadUnit() const;
/** Sets the map unit scale used for the spread distance.
* @param scale map unit scale for spread distance
diff --git a/python/core/effects/qgsshadoweffect.sip b/python/core/effects/qgsshadoweffect.sip
index fe3010d5757..a0aece1fee4 100644
--- a/python/core/effects/qgsshadoweffect.sip
+++ b/python/core/effects/qgsshadoweffect.sip
@@ -69,7 +69,7 @@ class QgsShadowEffect : QgsPaintEffect
* @see setOffsetDistance
* @see setOffsetMapUnitScale
*/
- void setOffsetUnit( const QgsSymbolV2::OutputUnit unit );
+ void setOffsetUnit( const QgsUnitTypes::RenderUnit unit );
/** Returns the units used for the shadow offset distance.
* @returns units for offset distance
@@ -77,7 +77,7 @@ class QgsShadowEffect : QgsPaintEffect
* @see offsetDistance
* @see offsetMapUnitScale
*/
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ QgsUnitTypes::RenderUnit offsetUnit() const;
/** Sets the map unit scale used for the shadow offset distance.
* @param scale map unit scale for offset distance
diff --git a/python/core/effects/qgstransformeffect.sip b/python/core/effects/qgstransformeffect.sip
index 32aaee726e3..4ef3603a21a 100644
--- a/python/core/effects/qgstransformeffect.sip
+++ b/python/core/effects/qgstransformeffect.sip
@@ -71,7 +71,7 @@ class QgsTransformEffect : QgsPaintEffect
* @see setTranslateY
* @see setTranslateMapUnitScale
*/
- void setTranslateUnit( const QgsSymbolV2::OutputUnit unit );
+ void setTranslateUnit( const QgsUnitTypes::RenderUnit unit );
/** Returns the units used for the transform translation.
* @returns units for translation
@@ -80,7 +80,7 @@ class QgsTransformEffect : QgsPaintEffect
* @see translateY
* @see translateMapUnitScale
*/
- QgsSymbolV2::OutputUnit translateUnit() const;
+ QgsUnitTypes::RenderUnit translateUnit() const;
/** Sets the map unit scale used for the transform translation.
* @param scale map unit scale for translation
diff --git a/python/core/qgis.sip b/python/core/qgis.sip
index 389cace2b72..ac2be35e333 100644
--- a/python/core/qgis.sip
+++ b/python/core/qgis.sip
@@ -136,50 +136,6 @@ class Qgis
QImage::Format_ARGB32_Premultiplied */ ARGB32_Premultiplied,
};
-
- /** Map units that qgis supports
- * @note that QGIS < 1.4 api had only Meters, Feet, Degrees and UnknownUnit
- * @note and QGIS >1.8 returns to that
- */
- //TODO QGIS 3.0 - clean up and move to QgsUnitTypes and rename to DistanceUnit
- enum UnitType
- {
- Meters, /*!< meters */
- Feet, /*!< imperial feet */
- Degrees, /*!< degrees, for planar geographic CRS distance measurements */ //for 1.0 api backwards compatibility
- NauticalMiles, /*!< nautical miles */
- Kilometers, /*!< kilometers */
- Yards, /*!< imperial yards */
- Miles, /*!< terrestial miles */
-
- UnknownUnit, /*!< unknown distance unit */
-
- // for [1.4;1.8] api compatibility
- DecimalDegrees, // was 2
- DegreesMinutesSeconds, // was 4
- DegreesDecimalMinutes, // was 5
- };
-
- //! Provides the canonical name of the type value
- //! @deprecated use QgsUnitTypes::encodeUnit() instead
- static QString toLiteral( Qgis::UnitType unit ) /Deprecated/;
-
- //! Converts from the canonical name to the type value
- //! @deprecated use QgsUnitTypes::decodeDistanceUnit() instead
- static UnitType fromLiteral( const QString& literal, Qgis::UnitType defaultType = UnknownUnit ) /Deprecated/;
-
- //! Provides translated version of the type value
- //! @deprecated use QgsUnitTypes::toString() instead
- static QString tr( Qgis::UnitType unit ) /Deprecated/;
-
- //! Provides type value from translated version
- //! @deprecated use QgsUnitTypes::stringToDistanceUnit() instead
- static UnitType fromTr( const QString& literal, Qgis::UnitType defaultType = UnknownUnit ) /Deprecated/;
-
- //! Returns the conversion factor between the specified units
- //! @deprecated use QgsUnitTyoes::fromUnitToUnitFactor() instead
- static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit ) /Deprecated/;
-
//! User defined event types
enum UserEvent
{
diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip
index 669e4a455e1..8173e47bc30 100644
--- a/python/core/qgscoordinatereferencesystem.sip
+++ b/python/core/qgscoordinatereferencesystem.sip
@@ -479,7 +479,7 @@ class QgsCoordinateReferenceSystem
/** Returns the units for the projection used by the CRS.
*/
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
// Mutators -----------------------------------
diff --git a/python/core/qgsdiagramrendererv2.sip b/python/core/qgsdiagramrendererv2.sip
index 53bbb26188d..ee277925f61 100644
--- a/python/core/qgsdiagramrendererv2.sip
+++ b/python/core/qgsdiagramrendererv2.sip
@@ -285,7 +285,7 @@ class QgsDiagramSettings
/** Diagram size unit
*/
- QgsSymbolV2::OutputUnit sizeType;
+ QgsUnitTypes::RenderUnit sizeType;
/** Diagram size unit scale
* @note added in 2.16
@@ -295,7 +295,7 @@ class QgsDiagramSettings
/** Line unit index
* @note added in 2.16
*/
- QgsSymbolV2::OutputUnit lineSizeUnit;
+ QgsUnitTypes::RenderUnit lineSizeUnit;
/** Line unit scale
* @note added in 2.16
diff --git a/python/core/qgsdistancearea.sip b/python/core/qgsdistancearea.sip
index 623fb328b15..8386acdbeb4 100644
--- a/python/core/qgsdistancearea.sip
+++ b/python/core/qgsdistancearea.sip
@@ -155,7 +155,7 @@ class QgsDistanceArea
* @note added in QGIS 2.14
* @see areaUnits()
*/
- Qgis::UnitType lengthUnits() const;
+ QgsUnitTypes::DistanceUnit lengthUnits() const;
/** Returns the units of area for areal calculations made by this object.
* @note added in QGIS 2.14
@@ -179,7 +179,7 @@ class QgsDistanceArea
* @return formatted measurement string
* @deprecated use formatDistance() or formatArea() instead
*/
- static QString textUnit( double value, int decimals, Qgis::UnitType u, bool isArea, bool keepBaseUnit = false ) /Deprecated/;
+ static QString textUnit( double value, int decimals, QgsUnitTypes::DistanceUnit u, bool isArea, bool keepBaseUnit = false ) /Deprecated/;
/** Returns an distance formatted as a friendly string.
* @param distance distance to format
@@ -191,7 +191,7 @@ class QgsDistanceArea
* @note added in QGIS 2.16
* @see formatArea()
*/
- static QString formatDistance( double distance, int decimals, Qgis::UnitType unit, bool keepBaseUnit = false );
+ static QString formatDistance( double distance, int decimals, QgsUnitTypes::DistanceUnit unit, bool keepBaseUnit = false );
/** Returns an area formatted as a friendly string.
* @param area area to format
@@ -208,7 +208,7 @@ class QgsDistanceArea
//! Helper for conversion between physical units
// TODO QGIS 3.0 - remove this method, as its behaviour is non-intuitive.
- void convertMeasurement( double &measure /In,Out/, Qgis::UnitType &measureUnits /In,Out/, Qgis::UnitType displayUnits, bool isArea ) const;
+ void convertMeasurement( double &measure /In,Out/, QgsUnitTypes::DistanceUnit &measureUnits /In,Out/, QgsUnitTypes::DistanceUnit displayUnits, bool isArea ) const;
/** Takes a length measurement calculated by this QgsDistanceArea object and converts it to a
* different distance unit.
@@ -219,7 +219,7 @@ class QgsDistanceArea
* @see convertAreaMeasurement()
* @note added in QGIS 2.14
*/
- double convertLengthMeasurement( double length, Qgis::UnitType toUnits ) const;
+ double convertLengthMeasurement( double length, QgsUnitTypes::DistanceUnit toUnits ) const;
/** Takes an area measurement calculated by this QgsDistanceArea object and converts it to a
* different areal unit.
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
index 12e8d79cd16..3a615ba2381 100644
--- a/python/core/qgsexpression.sip
+++ b/python/core/qgsexpression.sip
@@ -167,14 +167,14 @@ class QgsExpression
* @note added in QGIS 2.14
* @see setDistanceUnits()
*/
- Qgis::UnitType distanceUnits() const;
+ QgsUnitTypes::DistanceUnit distanceUnits() const;
/** Sets the desired distance units for calculations involving geomCalculator(), eg "$length" and "$perimeter".
* @note distances are only converted when a geomCalculator() has been set
* @note added in QGIS 2.14
* @see distanceUnits()
*/
- void setDistanceUnits( Qgis::UnitType unit );
+ void setDistanceUnits( QgsUnitTypes::DistanceUnit unit );
/** Returns the desired areal units for calculations involving geomCalculator(), eg "$area".
* @note areas are only converted when a geomCalculator() has been set
diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip
index 6f56c90f78e..9844ec95815 100644
--- a/python/core/qgsmapsettings.sip
+++ b/python/core/qgsmapsettings.sip
@@ -91,9 +91,9 @@ class QgsMapSettings
QgsCoordinateReferenceSystem destinationCrs() const;
//! Get units of map's geographical coordinates - used for scale calculation
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
//! Set units of map's geographical coordinates - used for scale calculation
- void setMapUnits( Qgis::UnitType u );
+ void setMapUnits( QgsUnitTypes::DistanceUnit u );
//! Set the background color of the map
void setBackgroundColor( const QColor& color );
diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip
index cc004739ae8..91596b87eca 100644
--- a/python/core/qgsproject.sip
+++ b/python/core/qgsproject.sip
@@ -246,7 +246,7 @@ class QgsProject : QObject
* @note added in QGIS 2.14
* @see areaUnits()
*/
- Qgis::UnitType distanceUnits() const;
+ QgsUnitTypes::DistanceUnit distanceUnits() const;
/** Convenience function to query default area measurement units for project.
* @note added in QGIS 2.14
diff --git a/python/core/qgsscalecalculator.sip b/python/core/qgsscalecalculator.sip
index ef2b77186f3..2e5e6ff3959 100644
--- a/python/core/qgsscalecalculator.sip
+++ b/python/core/qgsscalecalculator.sip
@@ -13,11 +13,10 @@ class QgsScaleCalculator
/**
* Constructor
* @param dpi Monitor resolution in dots per inch
- * @param mapUnits Units of the data on the map. Must match a value from the
- * Qgis::UnitType enum (Meters, Feet, Degrees)
+ * @param mapUnits Units of the data on the map
*/
QgsScaleCalculator( double dpi = 0,
- Qgis::UnitType mapUnits = Qgis::Meters );
+ QgsUnitTypes::DistanceUnit mapUnits = QgsUnitTypes::DistanceMeters );
/**
* Set the dpi to be used in scale calculations
@@ -35,10 +34,10 @@ class QgsScaleCalculator
* Set the map units
* @param mapUnits Units of the data on the map. Must match a value from the
*/
- void setMapUnits( Qgis::UnitType mapUnits );
+ void setMapUnits( QgsUnitTypes::DistanceUnit mapUnits );
/** Returns current map units */
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
/**
* Calculate the scale denominator
diff --git a/python/core/qgsunittypes.sip b/python/core/qgsunittypes.sip
index 3f23530bd3c..320771205f5 100644
--- a/python/core/qgsunittypes.sip
+++ b/python/core/qgsunittypes.sip
@@ -12,52 +12,78 @@ class QgsUnitTypes
public:
+ //! Units of distance
+ enum DistanceUnit
+ {
+ DistanceMeters, /*!< meters */
+ DistanceKilometers, /*!< kilometers */
+ DistanceFeet, /*!< imperial feet */
+ DistanceNauticalMiles, /*!< nautical miles */
+ DistanceYards, /*!< imperial yards */
+ DistanceMiles, /*!< terrestial miles */
+ DistanceDegrees, /*!< degrees, for planar geographic CRS distance measurements */
+ DistanceUnknownUnit, /*!< unknown distance unit */
+ };
+
/** Types of distance units
*/
enum DistanceUnitType
{
- Standard, /*!< unit is a standard measurement unit */
- Geographic, /*!< unit is a geographic (eg degree based) unit */
- UnknownType, /*!< unknown unit type */
+ Standard, /*!< unit is a standard measurement unit */
+ Geographic, /*!< unit is a geographic (eg degree based) unit */
+ UnknownType, /*!< unknown unit type */
};
//! Units of area
enum AreaUnit
{
- SquareMeters, /*!< square meters */
- SquareKilometers, /*!< square kilometers */
- SquareFeet, /*!< square feet */
- SquareYards, /*!< square yards */
- SquareMiles, /*!< square miles */
- Hectares, /*!< hectares */
- Acres, /*!< acres */
- SquareNauticalMiles, /*!< square nautical miles */
- SquareDegrees, /*!< square degrees, for planar geographic CRS area measurements */
- UnknownAreaUnit, /*!< unknown areal unit */
+ AreaSquareMeters, /*!< square meters */
+ AreaSquareKilometers, /*!< square kilometers */
+ AreaSquareFeet, /*!< square feet */
+ AreaSquareYards, /*!< square yards */
+ AreaSquareMiles, /*!< square miles */
+ AreaHectares, /*!< hectares */
+ AreaAcres, /*!< acres */
+ AreaSquareNauticalMiles, /*!< square nautical miles */
+ AreaSquareDegrees, /*!< square degrees, for planar geographic CRS area measurements */
+ AreaUnknownUnit, /*!< unknown areal unit */
};
//! Units of angles
enum AngleUnit
{
- AngleDegrees = 0, /*!< degrees */
- Radians, /*!< square kilometers */
- Gon, /*!< gon/gradian */
- MinutesOfArc, /*!< minutes of arc */
- SecondsOfArc, /*!< seconds of arc */
- Turn, /*!< turn/revolutions */
- UnknownAngleUnit, /*!< unknown angle unit */
+ AngleDegrees, /*!< degrees */
+ AngleRadians, /*!< square kilometers */
+ AngleGon, /*!< gon/gradian */
+ AngleMinutesOfArc, /*!< minutes of arc */
+ AngleSecondsOfArc, /*!< seconds of arc */
+ AngleTurn, /*!< turn/revolutions */
+ AngleUnknownUnit, /*!< unknown angle unit */
};
+ //! Rendering size units
+ enum RenderUnit
+ {
+ RenderMillimeters, //!< millimeters
+ RenderMapUnits, //!< map units
+ RenderPixels, //!< pixels
+ RenderPercentage, //!< percentage of another measurement (eg canvas size, feature size)
+ RenderUnknownUnit, //!< mixed or unknown units
+ };
+
+ //! List of render units
+ typedef QList RenderUnitList;
+
/** Returns the type for a distance unit.
*/
- static DistanceUnitType unitType( Qgis::UnitType unit );
+ static DistanceUnitType unitType( QgsUnitTypes::DistanceUnit unit );
/** Encodes a distance unit to a string.
* @param unit unit to encode
* @returns encoded string
* @see decodeDistanceUnit()
*/
- static QString encodeUnit( Qgis::UnitType unit );
+ static QString encodeUnit( QgsUnitTypes::DistanceUnit unit );
/** Decodes a distance unit from a string.
* @param string string to decode
@@ -65,27 +91,27 @@ class QgsUnitTypes
* @returns decoded units
* @see encodeUnit()
*/
- static Qgis::UnitType decodeDistanceUnit( const QString& string, bool *ok = 0 );
+ static QgsUnitTypes::DistanceUnit decodeDistanceUnit( const QString& string, bool *ok /Out/ = 0 );
/** Returns a translated string representing a distance unit.
* @param unit unit to convert to string
* @see stringToDistanceUnit()
*/
- static QString toString( Qgis::UnitType unit );
+ static QString toString( QgsUnitTypes::DistanceUnit unit );
/** Converts a translated string to a distance unit.
* @param string string representing a distance unit
* @param ok optional boolean, will be set to true if string was converted successfully
* @see toString()
*/
- static Qgis::UnitType stringToDistanceUnit( const QString& string, bool *ok = 0 );
+ static QgsUnitTypes::DistanceUnit stringToDistanceUnit( const QString& string, bool *ok /Out/ = 0 );
/** Returns the conversion factor between the specified distance units.
* @param fromUnit distance unit to convert from
* @param toUnit distance unit to convert to
* @returns multiplication factor to convert between units
*/
- static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit );
+ static double fromUnitToUnitFactor( QgsUnitTypes::DistanceUnit fromUnit, QgsUnitTypes::DistanceUnit toUnit );
/** Returns the type for an areal unit.
*/
@@ -104,7 +130,7 @@ class QgsUnitTypes
* @returns decoded units
* @see encodeUnit()
*/
- static AreaUnit decodeAreaUnit( const QString& string, bool *ok = 0 );
+ static AreaUnit decodeAreaUnit( const QString& string, bool *ok /Out/ = 0 );
/** Returns a translated string representing an areal unit.
* @param unit unit to convert to string
@@ -117,7 +143,7 @@ class QgsUnitTypes
* @param ok optional boolean, will be set to true if string was converted successfully
* @see toString()
*/
- static AreaUnit stringToAreaUnit( const QString& string, bool *ok = 0 );
+ static AreaUnit stringToAreaUnit( const QString& string, bool *ok /Out/ = 0 );
/** Returns the conversion factor between the specified areal units.
* @param fromUnit area unit to convert from
@@ -130,7 +156,7 @@ class QgsUnitTypes
* @param distanceUnit distance unit to convert
* @return matching areal unit
*/
- static AreaUnit distanceToAreaUnit( Qgis::UnitType distanceUnit );
+ static AreaUnit distanceToAreaUnit( QgsUnitTypes::DistanceUnit distanceUnit );
// ANGULAR UNITS
@@ -147,7 +173,7 @@ class QgsUnitTypes
* @returns decoded units
* @see encodeUnit()
*/
- static AngleUnit decodeAngleUnit( const QString& string, bool *ok = 0 );
+ static AngleUnit decodeAngleUnit( const QString& string, bool *ok /Out/ = 0 );
/** Returns a translated string representing an angular unit.
* @param unit unit to convert to string
@@ -168,5 +194,23 @@ class QgsUnitTypes
* @returns formatted angle string
*/
static QString formatAngle( double angle, int decimals, AngleUnit unit );
+
+ // RENDER UNITS
+
+ /** Encodes a render unit to a string.
+ * @param unit unit to encode
+ * @returns encoded string
+ * @see decodeRenderUnit()
+ */
+ static QString encodeUnit( RenderUnit unit );
+
+ /** Decodes a render unit from a string.
+ * @param string string to decode
+ * @param ok optional boolean, will be set to true if string was converted successfully
+ * @returns decoded units
+ * @see encodeUnit()
+ */
+ static RenderUnit decodeRenderUnit( const QString& string, bool *ok /Out/ = 0 );
+
};
diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
index a70d02180cb..6141a073229 100644
--- a/python/core/qgsvectorfilewriter.sip
+++ b/python/core/qgsvectorfilewriter.sip
@@ -271,7 +271,7 @@ class QgsVectorFileWriter
QString errorMessage();
/** Add feature to the currently opened data source */
- bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = 0, Qgis::UnitType outputUnit = Qgis::Meters );
+ bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = 0, QgsUnitTypes::DistanceUnit outputUnit = QgsUnitTypes::DistanceMeters );
//! @note not available in python bindings
// QMap attrIdxToOgrIdx();
diff --git a/python/core/qgsxmlutils.sip b/python/core/qgsxmlutils.sip
index b301aaed7b3..f784949af42 100644
--- a/python/core/qgsxmlutils.sip
+++ b/python/core/qgsxmlutils.sip
@@ -8,13 +8,24 @@ class QgsXmlUtils
%End
public:
- /* reading */
+ /** Decodes a distance unit from a DOM element.
+ * @param element DOM element to decode
+ * @returns distance units
+ * @see writeMapUnits()
+ */
+ static QgsUnitTypes::DistanceUnit readMapUnits( const QDomElement& element );
- static Qgis::UnitType readMapUnits( const QDomElement& element );
static QgsRectangle readRectangle( const QDomElement& element );
/* writing */
- static QDomElement writeMapUnits( Qgis::UnitType units, QDomDocument& doc );
+ /** Encodes a distance unit to a DOM element.
+ * @param units units to encode
+ * @param doc DOM document
+ * @returns element containing encoded units
+ * @see readMapUnits()
+ */
+ static QDomElement writeMapUnits( QgsUnitTypes::DistanceUnit units, QDomDocument& doc );
+
static QDomElement writeRectangle( const QgsRectangle& rect, QDomDocument& doc );
};
diff --git a/python/core/symbology-ng/qgsarrowsymbollayer.sip b/python/core/symbology-ng/qgsarrowsymbollayer.sip
index 322b9b58760..1969f7c0847 100644
--- a/python/core/symbology-ng/qgsarrowsymbollayer.sip
+++ b/python/core/symbology-ng/qgsarrowsymbollayer.sip
@@ -39,9 +39,9 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow width */
void setArrowWidth( double width );
/** Get the unit for the arrow width */
- QgsSymbolV2::OutputUnit arrowWidthUnit() const;
+ QgsUnitTypes::RenderUnit arrowWidthUnit() const;
/** Set the unit for the arrow width */
- void setArrowWidthUnit( QgsSymbolV2::OutputUnit unit );
+ void setArrowWidthUnit( QgsUnitTypes::RenderUnit unit );
/** Get the scale for the arrow width */
QgsMapUnitScale arrowWidthUnitScale() const;
/** Set the scale for the arrow width */
@@ -52,9 +52,9 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow start width */
void setArrowStartWidth( double width );
/** Get the unit for the arrow start width */
- QgsSymbolV2::OutputUnit arrowStartWidthUnit() const;
+ QgsUnitTypes::RenderUnit arrowStartWidthUnit() const;
/** Set the unit for the arrow start width */
- void setArrowStartWidthUnit( QgsSymbolV2::OutputUnit unit );
+ void setArrowStartWidthUnit( QgsUnitTypes::RenderUnit unit );
/** Get the scale for the arrow start width */
QgsMapUnitScale arrowStartWidthUnitScale() const;
/** Set the scale for the arrow start width */
@@ -65,9 +65,9 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow head length */
void setHeadLength( double length );
/** Get the unit for the head length */
- QgsSymbolV2::OutputUnit headLengthUnit() const;
+ QgsUnitTypes::RenderUnit headLengthUnit() const;
/** Set the unit for the head length */
- void setHeadLengthUnit( QgsSymbolV2::OutputUnit unit );
+ void setHeadLengthUnit( QgsUnitTypes::RenderUnit unit );
/** Get the scale for the head length */
QgsMapUnitScale headLengthUnitScale() const;
/** Set the scale for the head length */
@@ -78,9 +78,9 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow head height */
void setHeadThickness( double thickness );
/** Get the unit for the head height */
- QgsSymbolV2::OutputUnit headThicknessUnit() const;
+ QgsUnitTypes::RenderUnit headThicknessUnit() const;
/** Set the unit for the head height */
- void setHeadThicknessUnit( QgsSymbolV2::OutputUnit unit );
+ void setHeadThicknessUnit( QgsUnitTypes::RenderUnit unit );
/** Get the scale for the head height */
QgsMapUnitScale headThicknessUnitScale() const;
/** Set the scale for the head height */
diff --git a/python/core/symbology-ng/qgsellipsesymbollayerv2.sip b/python/core/symbology-ng/qgsellipsesymbollayerv2.sip
index 16eecec6392..b295e2d8665 100644
--- a/python/core/symbology-ng/qgsellipsesymbollayerv2.sip
+++ b/python/core/symbology-ng/qgsellipsesymbollayerv2.sip
@@ -51,26 +51,54 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
void setOutlineColor( const QColor& c );
QColor outlineColor() const;
- void setSymbolWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit symbolWidthUnit() const;
+ /** Sets the units for the symbol's width.
+ * @param unit symbol units
+ * @see symbolWidthUnit()
+ * @see setSymbolHeightUnit()
+ */
+ void setSymbolWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the symbol's width.
+ * @see setSymbolWidthUnit()
+ * @see symbolHeightUnit()
+ */
+ QgsUnitTypes::RenderUnit symbolWidthUnit() const;
void setSymbolWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& symbolWidthMapUnitScale() const;
- void setSymbolHeightUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit symbolHeightUnit() const;
+ /** Sets the units for the symbol's height.
+ * @param unit symbol units
+ * @see symbolHeightUnit()
+ * @see setSymbolWidthUnit()
+ */
+ void setSymbolHeightUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the symbol's height.
+ * @see setSymbolHeightUnit()
+ * @see symbolWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit symbolHeightUnit() const;
void setSymbolHeightMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& symbolHeightMapUnitScale() const;
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outlineWidthUnit() const;
+ /** Sets the units for the symbol's outline width.
+ * @param unit symbol units
+ * @see outlineWidthUnit()
+ */
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the symbol's outline width.
+ * @see setOutlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const;
void setOutlineWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& outlineWidthMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
diff --git a/python/core/symbology-ng/qgsfillsymbollayerv2.sip b/python/core/symbology-ng/qgsfillsymbollayerv2.sip
index 9086be545d0..cf47ec70029 100644
--- a/python/core/symbology-ng/qgsfillsymbollayerv2.sip
+++ b/python/core/symbology-ng/qgsfillsymbollayerv2.sip
@@ -68,20 +68,36 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
void setOffset( QPointF offset );
QPointF offset();
- void setBorderWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit borderWidthUnit() const;
+ /** Sets the units for the width of the fill's border.
+ * @param unit width units
+ * @see borderWidthUnit()
+ */
+ void setBorderWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the width of the fill's border.
+ * @see setBorderWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit borderWidthUnit() const;
void setBorderWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& borderWidthMapUnitScale() const;
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ /** Sets the units for the fill's offset.
+ * @param unit offset units
+ * @see offsetUnit()
+ */
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the fill's offset.
+ * @see setOffsetUnit()
+ */
+ QgsUnitTypes::RenderUnit offsetUnit() const;
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& offsetMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale &scale );
QgsMapUnitScale mapUnitScale() const;
@@ -203,14 +219,14 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
QPointF offset() const;
/** Units for gradient fill offset*/
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit offsetUnit() const;
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& offsetMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale &scale );
QgsMapUnitScale mapUnitScale() const;
@@ -308,14 +324,14 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
* @see setMaxDistance
* @see distanceUnit
*/
- void setDistanceUnit( QgsSymbolV2::OutputUnit unit );
+ void setDistanceUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the unit for the maximum distance to shade inside of the shape from the polygon's boundary.
* @returns distance unit for the maximum distance
* @note added in 2.3
* @see maxDistance
* @see setDistanceUnit
*/
- QgsSymbolV2::OutputUnit distanceUnit() const;
+ QgsUnitTypes::RenderUnit distanceUnit() const;
void setDistanceMapUnitScale( const QgsMapUnitScale& scale );
const QgsMapUnitScale& distanceMapUnitScale() const;
@@ -406,20 +422,20 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
* @see setOffset
* @see offsetUnit
*/
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the units used for the offset of the shapeburst fill.
* @returns units used for the fill offset
* @note added in 2.3
* @see offset
* @see setOffsetUnit
*/
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ QgsUnitTypes::RenderUnit offsetUnit() const;
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& offsetMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale &scale );
QgsMapUnitScale mapUnitScale() const;
@@ -440,14 +456,22 @@ class QgsImageFillSymbolLayer: QgsFillSymbolLayerV2
virtual QgsSymbolV2* subSymbol();
virtual bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outlineWidthUnit() const;
+ /** Sets the units for the symbol's outline width.
+ * @param unit symbol units
+ * @see outlineWidthUnit()
+ */
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the symbol's outline width.
+ * @see setOutlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const;
void setOutlineWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& outlineWidthMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
@@ -557,14 +581,14 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
* @see setOffset
* @see setOffsetMapUnitScale
*/
- void setOffsetUnit( const QgsSymbolV2::OutputUnit unit );
+ void setOffsetUnit( const QgsUnitTypes::RenderUnit unit );
/** Returns the units for the fill's offset.
* @returns units for offset
* @see setOffsetUnit
* @see offset
* @see offsetMapUnitScale
*/
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ QgsUnitTypes::RenderUnit offsetUnit() const;
/** Sets the map unit scale for the fill's offset.
* @param scale map unit scale for offset
@@ -604,14 +628,14 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
* @see setWidth
* @see setWidthMapUnitScale
*/
- void setWidthUnit( const QgsSymbolV2::OutputUnit unit );
+ void setWidthUnit( const QgsUnitTypes::RenderUnit unit );
/** Returns the units for the image's width.
* @returns units for width
* @see setWidthUnit
* @see width
* @see widthMapUnitScale
*/
- QgsSymbolV2::OutputUnit widthUnit() const;
+ QgsUnitTypes::RenderUnit widthUnit() const;
/** Sets the map unit scale for the image's width.
* @param scale map unit scale for width
@@ -676,20 +700,36 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
void setSvgOutlineWidth( double w );
double svgOutlineWidth() const;
- void setPatternWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit patternWidthUnit() const;
+ /** Sets the units for the width of the SVG images in the pattern.
+ * @param unit width units
+ * @see patternWidthUnit()
+ */
+ void setPatternWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the width of the SVG images in the pattern.
+ * @see setPatternWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit patternWidthUnit() const;
void setPatternWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& patternWidthMapUnitScale() const;
- void setSvgOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit svgOutlineWidthUnit() const;
+ /** Sets the units for the outline width.
+ * @param unit width units
+ * @see svgOutlineWidthUnit()
+ */
+ void setSvgOutlineWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the outline width.
+ * @see setSvgOutlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit svgOutlineWidthUnit() const;
void setSvgOutlineWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& svgOutlineWidthMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale &scale );
QgsMapUnitScale mapUnitScale() const;
@@ -729,7 +769,18 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
//getters and setters
void setLineAngle( double a );
double lineAngle() const;
+
+ /** Sets the distance between lines in the fill pattern.
+ * @param d distance. Units are specified by setDistanceUnit()
+ * @see distance()
+ * @see setDistanceUnit()
+ */
void setDistance( double d );
+
+ /** Returns the distance between lines in the fill pattern. Units are retrieved by distanceUnit().
+ * @see setDistance()
+ * @see distanceUnit()
+ */
double distance() const;
void setLineWidth( double w );
double lineWidth() const;
@@ -738,26 +789,52 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
void setOffset( double offset );
double offset() const;
- void setDistanceUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit distanceUnit() const;
+ /** Sets the units for the distance between lines in the fill pattern.
+ * @param unit distance units
+ * @see distanceUnit()
+ * @see setDistance()
+ */
+ void setDistanceUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the distance between lines in the fill pattern.
+ * @see setDistanceUnit()
+ * @see distance()
+ */
+ QgsUnitTypes::RenderUnit distanceUnit() const;
void setDistanceMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& distanceMapUnitScale() const;
- void setLineWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit lineWidthUnit() const;
+ /** Sets the units for the line's width.
+ * @param unit width units
+ * @see lineWidthUnit()
+ */
+ void setLineWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the line's width.
+ * @see setLineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit lineWidthUnit() const;
void setLineWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& lineWidthMapUnitScale() const;
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ /** Sets the units for the line pattern's offset.
+ * @param unit offset units
+ * @see offsetUnit()
+ */
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the line pattern's offset.
+ * @see setOffsetUnit()
+ */
+ QgsUnitTypes::RenderUnit offsetUnit() const;
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& offsetMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
@@ -811,32 +888,52 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );
virtual QgsSymbolV2* subSymbol();
- void setDistanceXUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit distanceXUnit() const;
+ /** Sets the units for the horizontal distance between points in the pattern.
+ * @param unit distance units
+ * @see distanceXUnit()
+ * @see setDistanceYUnit()
+ */
+ void setDistanceXUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the horizontal distance between points in the pattern.
+ * @see setDistanceXUnit()
+ * @see distanceYUnit()
+ */
+ QgsUnitTypes::RenderUnit distanceXUnit() const;
void setDistanceXMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& distanceXMapUnitScale() const;
- void setDistanceYUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit distanceYUnit() const;
+ /** Sets the units for the vertical distance between points in the pattern.
+ * @param unit distance units
+ * @see distanceYUnit()
+ * @see setDistanceXUnit()
+ */
+ void setDistanceYUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the vertical distance between points in the pattern.
+ * @see setDistanceYUnit()
+ * @see distanceXUnit()
+ */
+ QgsUnitTypes::RenderUnit distanceYUnit() const;
void setDistanceYMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& distanceYMapUnitScale() const;
- void setDisplacementXUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit displacementXUnit() const;
+ void setDisplacementXUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit displacementXUnit() const;
void setDisplacementXMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& displacementXMapUnitScale() const;
- void setDisplacementYUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit displacementYUnit() const;
+ void setDisplacementYUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit displacementYUnit() const;
void setDisplacementYMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& displacementYMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale &scale );
QgsMapUnitScale mapUnitScale() const;
@@ -887,8 +984,8 @@ class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2
QgsSymbolV2* subSymbol();
bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale(const QgsMapUnitScale &scale);
QgsMapUnitScale mapUnitScale() const;
diff --git a/python/core/symbology-ng/qgsheatmaprenderer.sip b/python/core/symbology-ng/qgsheatmaprenderer.sip
index a03624c5e84..2a6b9c77918 100644
--- a/python/core/symbology-ng/qgsheatmaprenderer.sip
+++ b/python/core/symbology-ng/qgsheatmaprenderer.sip
@@ -75,14 +75,14 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2
* @see setRadiusUnit
* @see radiusMapUnitScale
*/
- QgsSymbolV2::OutputUnit radiusUnit() const;
+ QgsUnitTypes::RenderUnit radiusUnit() const;
/** Sets the units used for the heatmap's radius
* @param unit units for heatmap radius
* @see radiusUnit
* @see setRadius
* @see radiusMapUnitScale
*/
- void setRadiusUnit( const QgsSymbolV2::OutputUnit unit );
+ void setRadiusUnit( const QgsUnitTypes::RenderUnit unit );
/** Returns the map unit scale used for the heatmap's radius
* @returns map unit scale for heatmap's radius
diff --git a/python/core/symbology-ng/qgslinesymbollayerv2.sip b/python/core/symbology-ng/qgslinesymbollayerv2.sip
index d376e9cb5e9..d6890b87d0b 100644
--- a/python/core/symbology-ng/qgslinesymbollayerv2.sip
+++ b/python/core/symbology-ng/qgslinesymbollayerv2.sip
@@ -35,8 +35,8 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale &scale );
QgsMapUnitScale mapUnitScale() const;
@@ -57,8 +57,16 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
bool useCustomDashPattern() const;
void setUseCustomDashPattern( bool b );
- void setCustomDashPatternUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit customDashPatternUnit() const;
+ /** Sets the units for lengths used in the custom dash pattern.
+ * @param unit length units
+ * @see customDashPatternUnit()
+ */
+ void setCustomDashPatternUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for lengths used in the custom dash pattern.
+ * @see setCustomDashPatternUnit()
+ */
+ QgsUnitTypes::RenderUnit customDashPatternUnit() const;
const QgsMapUnitScale& customDashPatternMapUnitScale() const;
void setCustomDashPatternMapUnitScale( const QgsMapUnitScale& scale);
@@ -71,7 +79,7 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
//Set to true if the line should only be drawn inside the polygon
void setDrawInsidePolygon( bool drawInsidePolygon );
- QVector dxfCustomDashPattern( QgsSymbolV2::OutputUnit& unit ) const;
+ QVector dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const;
Qt::PenStyle dxfPenStyle() const;
double dxfWidth( const QgsDxfExport& e, QgsSymbolV2RenderContext &context ) const;
@@ -170,12 +178,17 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
void setRotateMarker( bool rotate );
/**
- * The interval between individual markers.
+ * Returns the interval between individual markers. Units are specified through intervalUnits().
+ * @see setInterval()
+ * @see intervalUnit()
*/
double interval() const;
/**
- * The interval between individual markers.
+ * Sets the interval between individual markers.
+ * @param interval interval size. Units are specified through setIntervalUnits()
+ * @see interval()
+ * @see setIntervalUnits()
*/
void setInterval( double interval );
@@ -219,14 +232,14 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
* @see setOffsetAlongLineUnit
* @see offsetAlongLine
*/
- QgsSymbolV2::OutputUnit offsetAlongLineUnit() const;
+ QgsUnitTypes::RenderUnit offsetAlongLineUnit() const;
/** Sets the unit used for calculating the offset along line for markers.
* @param unit Offset along line unit type.
* @see offsetAlongLineUnit
* @see setOffsetAlongLine
*/
- void setOffsetAlongLineUnit( QgsSymbolV2::OutputUnit unit );
+ void setOffsetAlongLineUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the map unit scale used for calculating the offset in map units along line for markers.
* @returns Offset along line map unit scale.
@@ -238,14 +251,24 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
*/
void setOffsetAlongLineMapUnitScale( const QgsMapUnitScale& scale );
- void setIntervalUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit intervalUnit() const;
+ /** Sets the units for the interval between markers.
+ * @param unit interval units
+ * @see intervalUnit()
+ * @see setInterval()
+ */
+ void setIntervalUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the interval between markers.
+ * @see setIntervalUnit()
+ * @see interval()
+ */
+ QgsUnitTypes::RenderUnit intervalUnit() const;
void setIntervalMapUnitScale( const QgsMapUnitScale& scale );
const QgsMapUnitScale& intervalMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
diff --git a/python/core/symbology-ng/qgsmarkersymbollayerv2.sip b/python/core/symbology-ng/qgsmarkersymbollayerv2.sip
index 274e98ba9aa..e53d0fde443 100644
--- a/python/core/symbology-ng/qgsmarkersymbollayerv2.sip
+++ b/python/core/symbology-ng/qgsmarkersymbollayerv2.sip
@@ -211,8 +211,8 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const;
bool writeDxf( QgsDxfExport &e, double mmMapUnitScaleFactor, const QString &layerName, QgsSymbolV2RenderContext &context, QPointF shift = QPointF( 0.0, 0.0 ) ) const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
QRectF bounds( QPointF point, QgsSymbolV2RenderContext& context );
@@ -301,14 +301,14 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
* @see setOutlineWidth()
* @see setOutlineWidthMapUnitScale()
*/
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit u );
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit u );
/** Returns the unit for the width of the marker's outline.
* @see setOutlineWidthUnit()
* @see outlineWidth()
* @see outlineWidthMapUnitScale()
*/
- QgsSymbolV2::OutputUnit outlineWidthUnit() const;
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const;
/** Sets the map scale for the width of the marker's outline.
* @param scale outline width map unit scale
@@ -448,14 +448,22 @@ class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
double outlineWidth() const;
void setOutlineWidth( double w );
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outlineWidthUnit() const;
+ /** Sets the units for the outline width.
+ * @param unit width units
+ * @see outlineWidthUnit()
+ */
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the outline width.
+ * @see outlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const;
void setOutlineWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& outlineWidthMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
@@ -525,10 +533,10 @@ class QgsFontMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
/** Get outline width unit.
* @note added in 2.16 */
- QgsSymbolV2::OutputUnit outlineWidthUnit() const;
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const;
/** Set outline width unit.
* @note added in 2.16 */
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit );
/** Get outline width map unit scale.
* @note added in 2.16 */
diff --git a/python/core/symbology-ng/qgspointdisplacementrenderer.sip b/python/core/symbology-ng/qgspointdisplacementrenderer.sip
index 6542a027c93..632843439cc 100644
--- a/python/core/symbology-ng/qgspointdisplacementrenderer.sip
+++ b/python/core/symbology-ng/qgspointdisplacementrenderer.sip
@@ -138,14 +138,14 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
* @see toleranceUnit()
* @note added in QGIS 2.12
*/
- void setToleranceUnit( QgsSymbolV2::OutputUnit unit );
+ void setToleranceUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the units for the tolerance distance.
* @see tolerance()
* @see setToleranceUnit()
* @note added in QGIS 2.12
*/
- QgsSymbolV2::OutputUnit toleranceUnit() const;
+ QgsUnitTypes::RenderUnit toleranceUnit() const;
/** Sets the map unit scale object for the distance tolerance. This is only used if the
* toleranceUnit() is set to QgsSymbolV2::MapUnit.
diff --git a/python/core/symbology-ng/qgssymbollayerv2.sip b/python/core/symbology-ng/qgssymbollayerv2.sip
index 7db1123b5ba..5356538e566 100644
--- a/python/core/symbology-ng/qgssymbollayerv2.sip
+++ b/python/core/symbology-ng/qgssymbollayerv2.sip
@@ -142,8 +142,23 @@ class QgsSymbolLayerV2
be affected by data defined symbology rules.*/
virtual double estimateMaxBleed() const;
- virtual void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- virtual QgsSymbolV2::OutputUnit outputUnit() const;
+ /** Sets the units to use for sizes and widths within the symbol layer. Individual
+ * symbol layer subclasses will interpret this in different ways, eg a marker symbol
+ * layer may use it to specify the units for the marker size, while a line symbol
+ * layer may use it to specify the units for the line width.
+ * @param unit output units
+ * @see outputUnit()
+ */
+ virtual void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units to use for sizes and widths within the symbol layer. Individual
+ * symbol layer subclasses will interpret this in different ways, eg a marker symbol
+ * layer may use it to specify the units for the marker size, while a line symbol
+ * layer may use it to specify the units for the line width.
+ * @returns output unit, or QgsUnitTypes::RenderUnknownUnit if the symbol layer contains mixed units
+ * @see setOutputUnit()
+ */
+ virtual QgsUnitTypes::RenderUnit outputUnit() const;
virtual void setMapUnitScale( const QgsMapUnitScale& scale );
virtual QgsMapUnitScale mapUnitScale() const;
@@ -264,7 +279,7 @@ class QgsSymbolLayerV2
virtual QColor dxfColor( QgsSymbolV2RenderContext& context ) const;
virtual double dxfAngle( QgsSymbolV2RenderContext& context ) const;
- virtual QVector dxfCustomDashPattern( QgsSymbolV2::OutputUnit& unit ) const;
+ virtual QVector dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const;
virtual Qt::PenStyle dxfPenStyle() const;
virtual QColor dxfBrushColor( QgsSymbolV2RenderContext& context ) const;
virtual Qt::BrushStyle dxfBrushStyle() const;
@@ -415,14 +430,14 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
* @see setSize()
* @see setSizeMapUnitScale()
*/
- void setSizeUnit( QgsSymbolV2::OutputUnit unit );
+ void setSizeUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the units for the symbol's size.
* @see setSizeUnit()
* @see size()
* @see sizeMapUnitScale()
*/
- QgsSymbolV2::OutputUnit sizeUnit() const;
+ QgsUnitTypes::RenderUnit sizeUnit() const;
/** Sets the map unit scale for the symbol's size.
* @param scale size map unit scale
@@ -473,14 +488,14 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
* @see setOffset()
* @see setOffsetMapUnitScale()
*/
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the units for the symbol's offset.
* @see setOffsetUnit()
* @see offset()
* @see offsetMapUnitScale()
*/
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ QgsUnitTypes::RenderUnit offsetUnit() const;
/** Sets the map unit scale for the symbol's offset.
* @param scale offset map unit scale
@@ -536,8 +551,8 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
*/
virtual void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
@@ -579,7 +594,7 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
//! @note available in python bindings as markerOffset2
void markerOffset( QgsSymbolV2RenderContext& context, double width, double height,
- QgsSymbolV2::OutputUnit widthUnit, QgsSymbolV2::OutputUnit heightUnit,
+ QgsUnitTypes::RenderUnit widthUnit, QgsUnitTypes::RenderUnit heightUnit,
double& offsetX, double& offsetY,
const QgsMapUnitScale &widthMapUnitScale, const QgsMapUnitScale &heightMapUnitScale ) const /PyName=markerOffset2/;
@@ -608,20 +623,36 @@ class QgsLineSymbolLayerV2 : QgsSymbolLayerV2
double offset() const;
void setOffset( double offset );
- void setWidthUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit widthUnit() const;
+ /** Sets the units for the line's width.
+ * @param unit width units
+ * @see widthUnit()
+ */
+ void setWidthUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the line's width.
+ * @see setWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit widthUnit() const;
void setWidthMapUnitScale( const QgsMapUnitScale& scale);
const QgsMapUnitScale& widthMapUnitScale() const;
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit offsetUnit() const;
+ /** Sets the units for the line's offset.
+ * @param unit offset units
+ * @see offsetUnit()
+ */
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the line's offset.
+ * @see setOffsetUnit()
+ */
+ QgsUnitTypes::RenderUnit offsetUnit() const;
void setOffsetMapUnitScale( const QgsMapUnitScale& scale );
const QgsMapUnitScale& offsetMapUnitScale() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
diff --git a/python/core/symbology-ng/qgssymbollayerv2utils.sip b/python/core/symbology-ng/qgssymbollayerv2utils.sip
index c8e88e2940d..687daa52578 100644
--- a/python/core/symbology-ng/qgssymbollayerv2utils.sip
+++ b/python/core/symbology-ng/qgssymbollayerv2utils.sip
@@ -51,11 +51,21 @@ class QgsSymbolLayerV2Utils
static QString encodeSldRealVector( const QVector& v );
static QVector decodeSldRealVector( const QString& s );
- static QString encodeOutputUnit( QgsSymbolV2::OutputUnit unit );
- static QgsSymbolV2::OutputUnit decodeOutputUnit( const QString& str );
+ /** Encodes a render unit into an SLD unit of measure string.
+ * @param unit unit to encode
+ * @param scaleFactor if specified, will be set to scale factor for unit of measure
+ * @returns encoded string
+ * @see decodeSldUom()
+ */
+ static QString encodeSldUom( QgsUnitTypes::RenderUnit unit, double *scaleFactor );
- static QString encodeSldUom( QgsSymbolV2::OutputUnit unit, double *scaleFactor );
- static QgsSymbolV2::OutputUnit decodeSldUom( const QString& str, double *scaleFactor );
+ /** Decodes a SLD unit of measure string to a render unit.
+ * @param str string to decode
+ * @param scaleFactor if specified, will be set to scale factor for unit of measure
+ * @returns matching render unit
+ * @see encodeSldUom()
+ */
+ static QgsUnitTypes::RenderUnit decodeSldUom( const QString& str, double *scaleFactor );
static QString encodeScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod );
static QgsSymbolV2::ScaleMethod decodeScaleMethod( const QString& str );
@@ -71,10 +81,20 @@ class QgsSymbolLayerV2Utils
* @param scale map unit scale for preview
* @returns QPicture containing symbol layer preview
* @note added in QGIS 2.9
+ * @see symbolLayerPreviewIcon()
*/
- static QPicture symbolLayerPreviewPicture( QgsSymbolLayerV2* layer, QgsSymbolV2::OutputUnit units, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static QPicture symbolLayerPreviewPicture( QgsSymbolLayerV2* layer, QgsUnitTypes::RenderUnit units, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+
+ /** Draws a symbol layer preview to an icon.
+ * @param layer symbol layer to draw
+ * @param u size units
+ * @param size target size of preview icon
+ * @param scale map unit scale for preview
+ * @returns icon containing symbol layer preview
+ * @see symbolLayerPreviewPicture()
+ */
+ static QIcon symbolLayerPreviewIcon( QgsSymbolLayerV2* layer, QgsUnitTypes::RenderUnit u, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
- static QIcon symbolLayerPreviewIcon( QgsSymbolLayerV2* layer, QgsSymbolV2::OutputUnit u, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
static QIcon colorRampPreviewIcon( QgsVectorColorRampV2* ramp, QSize size );
static void drawStippledBackground( QPainter* painter, QRect rect );
@@ -327,7 +347,7 @@ class QgsSymbolLayerV2Utils
* @param scale map unit scale, specifying limits for the map units to convert from
* @see convertToPainterUnits()
*/
- static double lineWidthScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double lineWidthScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Converts a size from the specied units to painter units. The conversion respects the limits
* specified by the optional scale parameter.
@@ -339,7 +359,7 @@ class QgsSymbolLayerV2Utils
* @see lineWidthScaleFactor()
* @see convertToMapUnits()
*/
- static double convertToPainterUnits( const QgsRenderContext&c, double size, QgsSymbolV2::OutputUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double convertToPainterUnits( const QgsRenderContext&c, double size, QgsUnitTypes::RenderUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Converts a size from the specied units to map units. The conversion respects the limits
* specified by the optional scale parameter.
@@ -350,13 +370,13 @@ class QgsSymbolLayerV2Utils
* @note added in QGIS 2.16
* @see convertToPainterUnits()
*/
- static double convertToMapUnits( const QgsRenderContext&c, double size, QgsSymbolV2::OutputUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double convertToMapUnits( const QgsRenderContext&c, double size, QgsUnitTypes::RenderUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Returns scale factor painter units -> pixel dimensions*/
- static double pixelSizeScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double pixelSizeScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Returns scale factor painter units -> map units*/
- static double mapUnitScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double mapUnitScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Creates a render context for a pixel based device*/
static QgsRenderContext createRenderContext( QPainter* p );
diff --git a/python/core/symbology-ng/qgssymbolv2.sip b/python/core/symbology-ng/qgssymbolv2.sip
index 1e6d6c80ecb..9dc31bf689c 100644
--- a/python/core/symbology-ng/qgssymbolv2.sip
+++ b/python/core/symbology-ng/qgssymbolv2.sip
@@ -19,21 +19,6 @@ class QgsSymbolV2
public:
- /**
- * The unit of the output
- */
- //TODO QGIS 3.0 - move to QgsUnitTypes and rename to SymbolUnit
- enum OutputUnit
- {
- MM = 0, //!< The output shall be in millimeters
- MapUnit, //!< The output shall be in map unitx
- Mixed, //!< Mixed units in symbol layers
- Pixel, //!< The output shall be in pixels
- Percentage, //!< The ouput shall be a percentage of another measurement (eg canvas size, feature size)
- };
-
- typedef QList OutputUnitList;
-
/**
* Type of the symbol
*/
@@ -154,8 +139,23 @@ class QgsSymbolV2
void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const;
- OutputUnit outputUnit() const;
- void setOutputUnit( OutputUnit u );
+ /** Returns the units to use for sizes and widths within the symbol. Individual
+ * symbol layer definitions will interpret this in different ways, eg a marker symbol
+ * may use it to specify the units for the marker size, while a line symbol
+ * may use it to specify the units for the line width.
+ * @returns output unit, or QgsUnitTypes::RenderUnknownUnit if the symbol contains mixed units
+ * @see setOutputUnit()
+ */
+ QgsUnitTypes::RenderUnit outputUnit() const;
+
+ /** Sets the units to use for sizes and widths within the symbol. Individual
+ * symbol definitions will interpret this in different ways, eg a marker symbol
+ * may use it to specify the units for the marker size, while a line symbol
+ * may use it to specify the units for the line width.
+ * @param unit output units
+ * @see outputUnit()
+ */
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
QgsMapUnitScale mapUnitScale() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
@@ -281,7 +281,18 @@ class QgsSymbolV2RenderContext
%End
public:
- QgsSymbolV2RenderContext( QgsRenderContext& c, QgsSymbolV2::OutputUnit u, qreal alpha = 1.0, bool selected = false, int renderHints = 0, const QgsFeature* f = 0, const QgsFields* fields = 0, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() );
+
+ /** Constructor for QgsSymbolV2RenderContext
+ * @param c
+ * @param u
+ * @param alpha
+ * @param selected set to true if symbol should be drawn in a "selected" state
+ * @param renderHints
+ * @param f
+ * @param fields
+ * @param mapUnitScale
+ */
+ QgsSymbolV2RenderContext( QgsRenderContext& c, QgsUnitTypes::RenderUnit u, qreal alpha = 1.0, bool selected = false, int renderHints = 0, const QgsFeature* f = 0, const QgsFields* fields = 0, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() );
~QgsSymbolV2RenderContext();
QgsRenderContext& renderContext();
@@ -294,8 +305,11 @@ class QgsSymbolV2RenderContext
*/
void setOriginalValueVariable( const QVariant& value );
- QgsSymbolV2::OutputUnit outputUnit() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit u );
+ //! Returns the output unit for the context
+ QgsUnitTypes::RenderUnit outputUnit() const;
+
+ //! Sets the output unit for the context
+ void setOutputUnit( QgsUnitTypes::RenderUnit u );
QgsMapUnitScale mapUnitScale() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
@@ -447,7 +461,7 @@ class QgsMarkerSymbolV2 : QgsSymbolV2
* @see setSizeMapUnitScale()
* @see setSize()
*/
- void setSizeUnit( OutputUnit unit );
+ void setSizeUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the size units for the whole symbol (including all symbol layers).
* @returns size units, or mixed units if symbol layers have different units
@@ -456,7 +470,7 @@ class QgsMarkerSymbolV2 : QgsSymbolV2
* @see sizeMapUnitScale()
* @see size()
*/
- OutputUnit sizeUnit() const;
+ QgsUnitTypes::RenderUnit sizeUnit() const;
/** Sets the size map unit scale for the whole symbol (including all symbol layers).
* @param scale map unit scale
diff --git a/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip b/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
index b524991c201..37093b5baca 100644
--- a/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
+++ b/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
@@ -64,14 +64,22 @@ class QgsVectorFieldSymbolLayer : QgsMarkerSymbolLayerV2
void setAngleUnits( AngleUnits units );
AngleUnits angleUnits() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit outputUnit() const;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
+ QgsUnitTypes::RenderUnit outputUnit() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;
- void setDistanceUnit( QgsSymbolV2::OutputUnit unit );
- QgsSymbolV2::OutputUnit distanceUnit() const;
+ /** Sets the units for the distance.
+ * @param unit distance units
+ * @see distanceUnit()
+ */
+ void setDistanceUnit( QgsUnitTypes::RenderUnit unit );
+
+ /** Returns the units for the distance.
+ * @see setDistanceUnit()
+ */
+ QgsUnitTypes::RenderUnit distanceUnit() const;
void setDistanceMapUnitScale( const QgsMapUnitScale& scale );
const QgsMapUnitScale& distanceMapUnitScale() const;
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
index 4a193311568..c494f44a848 100644
--- a/python/gui/qgsmapcanvas.sip
+++ b/python/gui/qgsmapcanvas.sip
@@ -223,10 +223,10 @@ class QgsMapCanvas : QGraphicsView
bool isFrozen();
//! Set map units (needed by project properties dialog)
- void setMapUnits( Qgis::UnitType mapUnits );
+ void setMapUnits( QgsUnitTypes::DistanceUnit mapUnits );
//! Get the current canvas map units
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
//! Getter for stored overrides of styles for layers.
//! @note added in 2.12
diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip
index 9a0721d1559..74da899db96 100644
--- a/python/gui/qgsmaptoolidentify.sip
+++ b/python/gui/qgsmaptoolidentify.sip
@@ -114,18 +114,18 @@ class QgsMapToolIdentify : QgsMapTool
//! Private helper
//! @deprecated use displayDistanceUnits() and displayAreaUnits() instead
- virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, Qgis::UnitType &u, bool isArea ) /Deprecated/;
+ virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, QgsUnitTypes::DistanceUnit &u, bool isArea ) /Deprecated/;
/** Transforms the measurements of derived attributes in the desired units
* @deprecated use displayDistanceUnits() and displayAreaUnits() instead
*/
- virtual Qgis::UnitType displayUnits() /Deprecated/;
+ virtual QgsUnitTypes::DistanceUnit displayUnits() /Deprecated/;
/** Desired units for distance display.
* @note added in QGIS 2.14
* @see displayAreaUnits()
*/
- virtual Qgis::UnitType displayDistanceUnits() const;
+ virtual QgsUnitTypes::DistanceUnit displayDistanceUnits() const;
/** Desired units for area display.
* @note added in QGIS 2.14
diff --git a/python/gui/qgsunitselectionwidget.sip b/python/gui/qgsunitselectionwidget.sip
index c3cedbcbfe4..b09affab0d1 100644
--- a/python/gui/qgsunitselectionwidget.sip
+++ b/python/gui/qgsunitselectionwidget.sip
@@ -43,7 +43,7 @@ class QgsUnitSelectionWidget : QWidget
* @param units list of valid units
* @note added in QGIS 2.9
*/
- void setUnits( const QgsSymbolV2::OutputUnitList& units );
+ void setUnits( const QgsUnitTypes::RenderUnitList& units );
/** Get the selected unit index */
int getUnit() const;
@@ -52,7 +52,7 @@ class QgsUnitSelectionWidget : QWidget
* @returns selected output unit, or QgsSymbolV2::Mixed if the widget was populated with custom unit types
* @note added in QGIS 2.9
*/
- QgsSymbolV2::OutputUnit unit() const;
+ QgsUnitTypes::RenderUnit unit() const;
/** Sets the selected unit index
* @param unitIndex index of unit to set as current
@@ -63,7 +63,7 @@ class QgsUnitSelectionWidget : QWidget
/** Sets the selected unit
* @param unit predefined unit to set as current
*/
- void setUnit( QgsSymbolV2::OutputUnit unit );
+ void setUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the map unit scale */
QgsMapUnitScale getMapUnitScale() const;
diff --git a/python/server/qgsmaprenderer.sip b/python/server/qgsmaprenderer.sip
index 5c28a70ea8a..d2059deb6d0 100644
--- a/python/server/qgsmaprenderer.sip
+++ b/python/server/qgsmaprenderer.sip
@@ -74,8 +74,15 @@ class QgsMapRenderer : QObject
//! Recalculate the map scale
void updateScale();
- Qgis::UnitType mapUnits() const;
- void setMapUnits( Qgis::UnitType u );
+ /** Returns the distance units which are used for map units.
+ * @see setMapUnits()
+ */
+ QgsUnitTypes::DistanceUnit mapUnits() const;
+
+ /** Sets the distance units which will be used for map units.
+ * @see mapUnits()
+ */
+ void setMapUnits( QgsUnitTypes::DistanceUnit u );
//! sets whether map image will be for overview
void enableOverviewMode( bool isOverview = true );
diff --git a/src/analysis/vector/qgstransectsample.cpp b/src/analysis/vector/qgstransectsample.cpp
index c4eae71a293..4fbec5fdc51 100644
--- a/src/analysis/vector/qgstransectsample.cpp
+++ b/src/analysis/vector/qgstransectsample.cpp
@@ -181,7 +181,7 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
double minDistanceLayerUnits = minDistance;
//if minDistance is in meters and the data in degrees, we need to apply a rough conversion for the buffer distance
double bufferDist = bufferDistance( minDistance );
- if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == Qgis::DecimalDegrees )
+ if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == QgsUnitTypes::DistanceDegrees )
{
minDistanceLayerUnits = minDistance / 111319.9;
}
@@ -710,7 +710,7 @@ double QgsTransectSample::bufferDistance( double minDistanceFromAttribute ) cons
bufferDist = mBaselineBufferDistance;
}
- if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == Qgis::DecimalDegrees )
+ if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == QgsUnitTypes::DistanceDegrees )
{
bufferDist /= 111319.9;
}
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index a337c9b906c..3ff93c31caf 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -4419,7 +4419,7 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )
prj->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
prj->writeEntry( "SpatialRefSys", "/ProjectCRSID", static_cast< int >( srs.srsid() ) );
prj->setDirty( false );
- if ( srs.mapUnits() != Qgis::UnknownUnit )
+ if ( srs.mapUnits() != QgsUnitTypes::DistanceUnknownUnit )
{
mMapCanvas->setMapUnits( srs.mapUnits() );
}
@@ -8507,7 +8507,7 @@ void QgisApp::setProjectCrsFromLayer()
QgsCoordinateReferenceSystem crs = mLayerTreeView->currentLayer()->crs();
mMapCanvas->freeze();
mMapCanvas->setDestinationCrs( crs );
- if ( crs.mapUnits() != Qgis::UnknownUnit )
+ if ( crs.mapUnits() != QgsUnitTypes::DistanceUnknownUnit )
{
mMapCanvas->setMapUnits( crs.mapUnits() );
}
diff --git a/src/app/qgsdecorationcopyright.cpp b/src/app/qgsdecorationcopyright.cpp
index 2f062ce7cd2..2f899a08143 100644
--- a/src/app/qgsdecorationcopyright.cpp
+++ b/src/app/qgsdecorationcopyright.cpp
@@ -47,7 +47,7 @@ QgsDecorationCopyright::QgsDecorationCopyright( QObject* parent )
, mMarginVertical( 0 )
{
mPlacement = BottomRight;
- mMarginUnit = QgsSymbolV2::MM;
+ mMarginUnit = QgsUnitTypes::RenderMillimeters;
setName( "Copyright Label" );
// initialise default values in the gui
@@ -116,7 +116,7 @@ void QgsDecorationCopyright::render( QPainter * theQPainter )
// Set margin according to selected units
switch ( mMarginUnit )
{
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
{
int myPixelsInchX = theQPainter->device()->logicalDpiX();
int myPixelsInchY = theQPainter->device()->logicalDpiY();
@@ -125,12 +125,12 @@ void QgsDecorationCopyright::render( QPainter * theQPainter )
break;
}
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
myXOffset = mMarginHorizontal;
myYOffset = mMarginVertical;
break;
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderPercentage:
myXOffset = (( myWidth - size.width() ) / 100. ) * mMarginHorizontal;
myYOffset = (( myHeight - size.height() ) / 100. ) * mMarginVertical;
break;
diff --git a/src/app/qgsdecorationcopyrightdialog.cpp b/src/app/qgsdecorationcopyrightdialog.cpp
index e5e4850aba1..a85ced3be3f 100644
--- a/src/app/qgsdecorationcopyrightdialog.cpp
+++ b/src/app/qgsdecorationcopyrightdialog.cpp
@@ -46,7 +46,7 @@ QgsDecorationCopyrightDialog::QgsDecorationCopyrightDialog( QgsDecorationCopyrig
cboPlacement->setCurrentIndex( cboPlacement->findData( mDeco.placement() ) );
spnHorizontal->setValue( mDeco.mMarginHorizontal );
spnVertical->setValue( mDeco.mMarginVertical );
- wgtUnitSelection->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Percentage << QgsSymbolV2::Pixel );
+ wgtUnitSelection->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPercentage << QgsUnitTypes::RenderPixels );
wgtUnitSelection->setUnit( mDeco.mMarginUnit );
// color
diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp
index d9da8b554e7..7339b29643d 100644
--- a/src/app/qgsdecorationgrid.cpp
+++ b/src/app/qgsdecorationgrid.cpp
@@ -93,8 +93,8 @@ void QgsDecorationGrid::projectRead()
QgsDecorationItem::projectRead();
mEnabled = QgsProject::instance()->readBoolEntry( mNameConfig, "/Enabled", false );
- mMapUnits = static_cast< Qgis::UnitType >( QgsProject::instance()->readNumEntry( mNameConfig, "/MapUnits",
- Qgis::UnknownUnit ) );
+ mMapUnits = static_cast< QgsUnitTypes::DistanceUnit >( QgsProject::instance()->readNumEntry( mNameConfig, "/MapUnits",
+ QgsUnitTypes::DistanceUnknownUnit ) );
mGridStyle = static_cast< GridStyle >( QgsProject::instance()->readNumEntry( mNameConfig, "/Style",
QgsDecorationGrid::Line ) );
mGridIntervalX = QgsProject::instance()->readDoubleEntry( mNameConfig, "/IntervalX", 10 );
@@ -747,11 +747,11 @@ void QgsDecorationGrid::checkMapUnitsChanged()
// this is to avoid problems when CRS changes to/from geographic and projected
// a better solution would be to change the grid interval, but this is a little tricky
// note: we could be less picky (e.g. from degrees to DMS)
- Qgis::UnitType mapUnits = QgisApp::instance()->mapCanvas()->mapSettings().mapUnits();
+ QgsUnitTypes::DistanceUnit mapUnits = QgisApp::instance()->mapCanvas()->mapSettings().mapUnits();
if ( mEnabled && ( mMapUnits != mapUnits ) )
{
mEnabled = false;
- mMapUnits = Qgis::UnknownUnit; // make sure isDirty() returns true
+ mMapUnits = QgsUnitTypes::DistanceUnknownUnit; // make sure isDirty() returns true
if ( ! QgisApp::instance()->mapCanvas()->isFrozen() )
{
update();
@@ -763,7 +763,7 @@ bool QgsDecorationGrid::isDirty()
{
// checks if stored map units is undefined or different from canvas map units
// or if interval is 0
- if ( mMapUnits == Qgis::UnknownUnit ||
+ if ( mMapUnits == QgsUnitTypes::DistanceUnknownUnit ||
mMapUnits != QgisApp::instance()->mapCanvas()->mapSettings().mapUnits() ||
qgsDoubleNear( mGridIntervalX, 0.0 ) || qgsDoubleNear( mGridIntervalY, 0.0 ) )
return true;
@@ -774,7 +774,7 @@ void QgsDecorationGrid::setDirty( bool dirty )
{
if ( dirty )
{
- mMapUnits = Qgis::UnknownUnit;
+ mMapUnits = QgsUnitTypes::DistanceUnknownUnit;
}
else
{
diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h
index 10a97803458..e94ea96251c 100644
--- a/src/app/qgsdecorationgrid.h
+++ b/src/app/qgsdecorationgrid.h
@@ -124,8 +124,8 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
const QgsMarkerSymbolV2* markerSymbol() const { return mMarkerSymbol; }
/** Sets map unit type */
- void setMapUnits( Qgis::UnitType t ) { mMapUnits = t; }
- Qgis::UnitType mapUnits() { return mMapUnits; }
+ void setMapUnits( QgsUnitTypes::DistanceUnit t ) { mMapUnits = t; }
+ QgsUnitTypes::DistanceUnit mapUnits() { return mMapUnits; }
/** Set mapUnits value */
void setDirty( bool dirty = true );
@@ -193,7 +193,7 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
QgsLineSymbolV2* mLineSymbol;
QgsMarkerSymbolV2* mMarkerSymbol;
- Qgis::UnitType mMapUnits;
+ QgsUnitTypes::DistanceUnit mMapUnits;
/** Draw coordinates for mGridAnnotationType Coordinate
@param p drawing painter
diff --git a/src/app/qgsdecorationitem.cpp b/src/app/qgsdecorationitem.cpp
index 99aa032b0f5..bdd7d6cfe92 100644
--- a/src/app/qgsdecorationitem.cpp
+++ b/src/app/qgsdecorationitem.cpp
@@ -47,7 +47,7 @@ QgsDecorationItem::QgsDecorationItem( QObject* parent )
: QObject( parent )
, mEnabled( false )
, mPlacement( TopLeft )
- , mMarginUnit( QgsSymbolV2::MM )
+ , mMarginUnit( QgsUnitTypes::RenderMillimeters )
{
}
@@ -66,14 +66,14 @@ void QgsDecorationItem::projectRead()
{
mEnabled = QgsProject::instance()->readBoolEntry( mNameConfig, "/Enabled", false );
mPlacement = static_cast< Placement >( QgsProject::instance()->readNumEntry( mNameConfig, "/Placement", static_cast< int >( mPlacement ) ) );
- mMarginUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( QgsProject::instance()->readEntry( mNameConfig, "/MarginUnit", QgsSymbolLayerV2Utils::encodeOutputUnit( mMarginUnit ) ) );
+ mMarginUnit = QgsUnitTypes::decodeRenderUnit( QgsProject::instance()->readEntry( mNameConfig, "/MarginUnit", QgsUnitTypes::encodeUnit( mMarginUnit ) ) );
}
void QgsDecorationItem::saveToProject()
{
QgsProject::instance()->writeEntry( mNameConfig, "/Enabled", mEnabled );
QgsProject::instance()->writeEntry( mNameConfig, "/Placement", static_cast< int >( mPlacement ) );
- QgsProject::instance()->writeEntry( mNameConfig, "/MarginUnit", QgsSymbolLayerV2Utils::encodeOutputUnit( mMarginUnit ) );
+ QgsProject::instance()->writeEntry( mNameConfig, "/MarginUnit", QgsUnitTypes::encodeUnit( mMarginUnit ) );
}
void QgsDecorationItem::setName( const char *name )
diff --git a/src/app/qgsdecorationitem.h b/src/app/qgsdecorationitem.h
index d6da7514441..93d0dfd8d98 100644
--- a/src/app/qgsdecorationitem.h
+++ b/src/app/qgsdecorationitem.h
@@ -19,7 +19,7 @@
#define QGSDECORATIONITEM_H
#include
-#include "qgssymbolv2.h"
+#include "qgsunittypes.h"
class QPainter;
@@ -85,7 +85,7 @@ class APP_EXPORT QgsDecorationItem: public QObject
//! Placement of the decoration
Placement mPlacement;
//! Units used for the decoration placement margin
- QgsSymbolV2::OutputUnit mMarginUnit;
+ QgsUnitTypes::RenderUnit mMarginUnit;
QString mName;
QString mNameConfig;
diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp
index 363cb72c8af..38ea3b0e612 100644
--- a/src/app/qgsdecorationnortharrow.cpp
+++ b/src/app/qgsdecorationnortharrow.cpp
@@ -62,7 +62,7 @@ QgsDecorationNorthArrow::QgsDecorationNorthArrow( QObject* parent )
, mMarginVertical( 0 )
{
mPlacement = BottomLeft;
- mMarginUnit = QgsSymbolV2::MM;
+ mMarginUnit = QgsUnitTypes::RenderMillimeters;
setName( "North Arrow" );
projectRead();
@@ -145,7 +145,7 @@ void QgsDecorationNorthArrow::render( QPainter * theQPainter )
int myYOffset = 0;
switch ( mMarginUnit )
{
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
{
int myPixelsInchX = theQPainter->device()->logicalDpiX();
int myPixelsInchY = theQPainter->device()->logicalDpiY();
@@ -154,12 +154,12 @@ void QgsDecorationNorthArrow::render( QPainter * theQPainter )
break;
}
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
myXOffset = mMarginHorizontal - 5; // Minus 5 to shift tight into corner
myYOffset = mMarginVertical - 5;
break;
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderPercentage:
myXOffset = (( myWidth - myQPixmap.width() ) / 100. ) * mMarginHorizontal;
myYOffset = (( myHeight - myQPixmap.height() ) / 100. ) * mMarginVertical;
break;
diff --git a/src/app/qgsdecorationnortharrowdialog.cpp b/src/app/qgsdecorationnortharrowdialog.cpp
index 5b356429496..66e0b65022f 100644
--- a/src/app/qgsdecorationnortharrowdialog.cpp
+++ b/src/app/qgsdecorationnortharrowdialog.cpp
@@ -47,7 +47,7 @@ QgsDecorationNorthArrowDialog::QgsDecorationNorthArrowDialog( QgsDecorationNorth
cboPlacement->setCurrentIndex( cboPlacement->findData( mDeco.placement() ) );
spinHorizontal->setValue( mDeco.mMarginHorizontal );
spinVertical->setValue( mDeco.mMarginVertical );
- wgtUnitSelection->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Percentage << QgsSymbolV2::Pixel );
+ wgtUnitSelection->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPercentage << QgsUnitTypes::RenderPixels );
wgtUnitSelection->setUnit( mDeco.mMarginUnit );
// enabled
diff --git a/src/app/qgsdecorationscalebar.cpp b/src/app/qgsdecorationscalebar.cpp
index 707dc18dfa0..083e6288bf5 100644
--- a/src/app/qgsdecorationscalebar.cpp
+++ b/src/app/qgsdecorationscalebar.cpp
@@ -55,7 +55,7 @@ QgsDecorationScaleBar::QgsDecorationScaleBar( QObject* parent )
, mMarginVertical( 0 )
{
mPlacement = TopLeft;
- mMarginUnit = QgsSymbolV2::MM;
+ mMarginUnit = QgsUnitTypes::RenderMillimeters;
mStyleLabels << tr( "Tick Down" ) << tr( "Tick Up" )
<< tr( "Bar" ) << tr( "Box" );
@@ -133,10 +133,10 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
QSettings settings;
bool ok = false;
- Qgis::UnitType myPreferredUnits = QgsUnitTypes::decodeDistanceUnit( settings.value( "/qgis/measure/displayunits" ).toString(), &ok );
+ QgsUnitTypes::DistanceUnit myPreferredUnits = QgsUnitTypes::decodeDistanceUnit( settings.value( "/qgis/measure/displayunits" ).toString(), &ok );
if ( !ok )
- myPreferredUnits = Qgis::Meters;
- Qgis::UnitType myMapUnits = canvas->mapUnits();
+ myPreferredUnits = QgsUnitTypes::DistanceMeters;
+ QgsUnitTypes::DistanceUnit myMapUnits = canvas->mapUnits();
// Adjust units meter/feet/... or vice versa
myMapUnitsPerPixelDouble *= QgsUnitTypes::fromUnitToUnitFactor( myMapUnits, myPreferredUnits );
@@ -175,7 +175,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
QString myScaleBarUnitLabel;
switch ( myMapUnits )
{
- case Qgis::Meters:
+ case QgsUnitTypes::DistanceMeters:
if ( myActualSize > 1000.0 )
{
myScaleBarUnitLabel = tr( " km" );
@@ -194,7 +194,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
else
myScaleBarUnitLabel = tr( " m" );
break;
- case Qgis::Feet:
+ case QgsUnitTypes::DistanceFeet:
if ( myActualSize > 5280.0 ) //5280 feet to the mile
{
myScaleBarUnitLabel = tr( " miles" );
@@ -224,13 +224,13 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
myScaleBarUnitLabel = tr( " feet" );
}
break;
- case Qgis::Degrees:
+ case QgsUnitTypes::DistanceDegrees:
if ( myActualSize == 1.0 )
myScaleBarUnitLabel = tr( " degree" );
else
myScaleBarUnitLabel = tr( " degrees" );
break;
- case Qgis::UnknownUnit:
+ case QgsUnitTypes::DistanceUnknownUnit:
myScaleBarUnitLabel = tr( " unknown" );
//intentional fall-through
FALLTHROUGH;
@@ -260,7 +260,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
// Set margin according to selected units
switch ( mMarginUnit )
{
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
{
int myPixelsInchX = theQPainter->device()->logicalDpiX();
int myPixelsInchY = theQPainter->device()->logicalDpiY();
@@ -269,12 +269,12 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
break;
}
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
myOriginX = mMarginHorizontal - 5.; // Minus 5 to shift tight into corner
myOriginY = mMarginVertical - 5.;
break;
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderPercentage:
{
float myMarginDoubledW = myMarginW * 2.0;
float myMarginDoubledH = myMarginH * 2.0;
diff --git a/src/app/qgsdecorationscalebardialog.cpp b/src/app/qgsdecorationscalebardialog.cpp
index 65d246829f1..a4f9261326e 100644
--- a/src/app/qgsdecorationscalebardialog.cpp
+++ b/src/app/qgsdecorationscalebardialog.cpp
@@ -60,7 +60,7 @@ QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar&
cboPlacement->setCurrentIndex( cboPlacement->findData( mDeco.placement() ) );
spnHorizontal->setValue( mDeco.mMarginHorizontal );
spnVertical->setValue( mDeco.mMarginVertical );
- wgtUnitSelection->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Percentage << QgsSymbolV2::Pixel );
+ wgtUnitSelection->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPercentage << QgsUnitTypes::RenderPixels );
wgtUnitSelection->setUnit( mDeco.mMarginUnit );
grpEnable->setChecked( mDeco.enabled() );
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
index 5cc35204ff1..26e7ad92a5f 100644
--- a/src/app/qgsdiagramproperties.cpp
+++ b/src/app/qgsdiagramproperties.cpp
@@ -101,8 +101,8 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer,
connect( mFixedSizeRadio, SIGNAL( toggled( bool ) ), this, SLOT( scalingTypeChanged() ) );
connect( mAttributeBasedScalingRadio, SIGNAL( toggled( bool ) ), this, SLOT( scalingTypeChanged() ) );
- mDiagramUnitComboBox->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mDiagramLineUnitComboBox->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mDiagramUnitComboBox->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mDiagramLineUnitComboBox->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
Qgis::GeometryType layerType = layer->geometryType();
if ( layerType == Qgis::UnknownGeometry || layerType == Qgis::NoGeometry )
@@ -201,8 +201,8 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer,
mDiagramTypeComboBox->setCurrentIndex( 0 );
mDiagramTypeComboBox->blockSignals( false );
mFixedSizeRadio->setChecked( true );
- mDiagramUnitComboBox->setUnit( QgsSymbolV2::MM );
- mDiagramLineUnitComboBox->setUnit( QgsSymbolV2::MM );
+ mDiagramUnitComboBox->setUnit( QgsUnitTypes::RenderMillimeters );
+ mDiagramLineUnitComboBox->setUnit( QgsUnitTypes::RenderMillimeters );
mLabelPlacementComboBox->setCurrentIndex( mLabelPlacementComboBox->findText( tr( "x-height" ) ) );
mDiagramSizeSpinBox->setEnabled( true );
mDiagramSizeSpinBox->setValue( 15 );
diff --git a/src/app/qgsdiagramproperties.h b/src/app/qgsdiagramproperties.h
index dbda8551cac..93113f00936 100644
--- a/src/app/qgsdiagramproperties.h
+++ b/src/app/qgsdiagramproperties.h
@@ -18,7 +18,6 @@
#ifndef QGSDIAGRAMPROPERTIES_H
#define QGSDIAGRAMPROPERTIES_H
-#include "qgssymbolv2.h"
#include
#include
diff --git a/src/app/qgsdisplayangle.cpp b/src/app/qgsdisplayangle.cpp
index 0ceb41c5e0f..2da5aeb7c55 100644
--- a/src/app/qgsdisplayangle.cpp
+++ b/src/app/qgsdisplayangle.cpp
@@ -44,5 +44,5 @@ void QgsDisplayAngle::updateUi()
QSettings settings;
QgsUnitTypes::AngleUnit unit = QgsUnitTypes::decodeAngleUnit( settings.value( "/qgis/measure/angleunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AngleDegrees ) ).toString() );
int decimals = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt();
- mAngleLineEdit->setText( QgsUnitTypes::formatAngle( mValue * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::Radians, unit ), decimals, unit ) );
+ mAngleLineEdit->setText( QgsUnitTypes::formatAngle( mValue * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AngleRadians, unit ), decimals, unit ) );
}
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
index 5796384ff80..ca538af2ec7 100644
--- a/src/app/qgslabelinggui.cpp
+++ b/src/app/qgslabelinggui.cpp
@@ -85,16 +85,16 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
unitWidget->setMapCanvas( mMapCanvas );
}
mFontSizeUnitWidget->setUnits( QStringList() << tr( "Points" ) << tr( "Map unit" ), 1 );
- mBufferUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mShapeSizeUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mShapeOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
+ mBufferUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mShapeSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mShapeOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
mShapeRadiusUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ) << tr( "% of length" ), 1 );
- mShapeBorderWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mShadowOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mShadowRadiusUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mPointOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mLineDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mRepeatDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
+ mShapeBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mShadowOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mShadowRadiusUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mPointOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mLineDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mRepeatDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
mFontLineHeightSpinBox->setClearValue( 1.0 );
mShapeRotationDblSpnBx->setClearValue( 0.0 );
@@ -628,13 +628,13 @@ void QgsLabelingGui::init()
mCentroidInsideCheckBox->setChecked( lyr.centroidInside );
mFitInsidePolygonCheckBox->setChecked( lyr.fitInPolygonOnly );
mLineDistanceSpnBx->setValue( lyr.dist );
- mLineDistanceUnitWidget->setUnit( lyr.distInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mLineDistanceUnitWidget->setUnit( lyr.distInMapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mLineDistanceUnitWidget->setMapUnitScale( lyr.distMapUnitScale );
mOffsetTypeComboBox->setCurrentIndex( mOffsetTypeComboBox->findData( lyr.offsetType ) );
mQuadrantBtnGrp->button(( int )lyr.quadOffset )->setChecked( true );
mPointOffsetXSpinBox->setValue( lyr.xOffset );
mPointOffsetYSpinBox->setValue( lyr.yOffset );
- mPointOffsetUnitWidget->setUnit( lyr.labelOffsetInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mPointOffsetUnitWidget->setUnit( lyr.labelOffsetInMapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mPointOffsetUnitWidget->setMapUnitScale( lyr.labelOffsetMapUnitScale );
mPointAngleSpinBox->setValue( lyr.angleOffset );
chkLineAbove->setChecked( lyr.placementFlags & QgsPalLayerSettings::AboveLine );
@@ -675,7 +675,7 @@ void QgsLabelingGui::init()
// Label repeat distance
mRepeatDistanceSpinBox->setValue( lyr.repeatDistance );
- mRepeatDistanceUnitWidget->setUnit( lyr.repeatDistanceUnit == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mRepeatDistanceUnitWidget->setUnit( lyr.repeatDistanceUnit == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mRepeatDistanceUnitWidget->setMapUnitScale( lyr.repeatDistanceMapUnitScale );
mPrioritySlider->setValue( lyr.priority );
@@ -721,7 +721,7 @@ void QgsLabelingGui::init()
// buffer
mBufferDrawChkBx->setChecked( lyr.bufferDraw );
spinBufferSize->setValue( lyr.bufferSize );
- mBufferUnitWidget->setUnit( lyr.bufferSizeInMapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mBufferUnitWidget->setUnit( lyr.bufferSizeInMapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mBufferUnitWidget->setMapUnitScale( lyr.bufferSizeMapUnitScale );
btnBufferColor->setColor( lyr.bufferColor );
mBufferTranspSpinBox->setValue( lyr.bufferTransp );
@@ -782,7 +782,7 @@ void QgsLabelingGui::init()
mShapeSizeCmbBx->setCurrentIndex( lyr.shapeSizeType );
mShapeSizeXSpnBx->setValue( lyr.shapeSize.x() );
mShapeSizeYSpnBx->setValue( lyr.shapeSize.y() );
- mShapeSizeUnitWidget->setUnit( lyr.shapeSizeUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mShapeSizeUnitWidget->setUnit( lyr.shapeSizeUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mShapeSizeUnitWidget->setMapUnitScale( lyr.shapeSizeMapUnitScale );
mShapeRotationCmbBx->setCurrentIndex( lyr.shapeRotationType );
mShapeRotationDblSpnBx->setEnabled( lyr.shapeRotationType != QgsPalLayerSettings::RotationSync );
@@ -790,7 +790,7 @@ void QgsLabelingGui::init()
mShapeRotationDblSpnBx->setValue( lyr.shapeRotation );
mShapeOffsetXSpnBx->setValue( lyr.shapeOffset.x() );
mShapeOffsetYSpnBx->setValue( lyr.shapeOffset.y() );
- mShapeOffsetUnitWidget->setUnit( lyr.shapeOffsetUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mShapeOffsetUnitWidget->setUnit( lyr.shapeOffsetUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mShapeOffsetUnitWidget->setMapUnitScale( lyr.shapeOffsetMapUnitScale );
mShapeRadiusXDbSpnBx->setValue( lyr.shapeRadii.x() );
mShapeRadiusYDbSpnBx->setValue( lyr.shapeRadii.y() );
@@ -800,7 +800,7 @@ void QgsLabelingGui::init()
mShapeFillColorBtn->setColor( lyr.shapeFillColor );
mShapeBorderColorBtn->setColor( lyr.shapeBorderColor );
mShapeBorderWidthSpnBx->setValue( lyr.shapeBorderWidth );
- mShapeBorderWidthUnitWidget->setUnit( lyr.shapeBorderWidthUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mShapeBorderWidthUnitWidget->setUnit( lyr.shapeBorderWidthUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mShapeBorderWidthUnitWidget->setMapUnitScale( lyr.shapeBorderWidthMapUnitScale );
mShapePenStyleCmbBx->setPenJoinStyle( lyr.shapeJoinStyle );
@@ -815,12 +815,12 @@ void QgsLabelingGui::init()
mShadowUnderCmbBx->setCurrentIndex( lyr.shadowUnder );
mShadowOffsetAngleSpnBx->setValue( lyr.shadowOffsetAngle );
mShadowOffsetSpnBx->setValue( lyr.shadowOffsetDist );
- mShadowOffsetUnitWidget->setUnit( lyr.shadowOffsetUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mShadowOffsetUnitWidget->setUnit( lyr.shadowOffsetUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mShadowOffsetUnitWidget->setMapUnitScale( lyr.shadowOffsetMapUnitScale );
mShadowOffsetGlobalChkBx->setChecked( lyr.shadowOffsetGlobal );
mShadowRadiusDblSpnBx->setValue( lyr.shadowRadius );
- mShadowRadiusUnitWidget->setUnit( lyr.shadowRadiusUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ mShadowRadiusUnitWidget->setUnit( lyr.shadowRadiusUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
mShadowRadiusUnitWidget->setMapUnitScale( lyr.shadowRadiusMapUnitScale );
mShadowRadiusAlphaChkBx->setChecked( lyr.shadowRadiusAlphaOnly );
mShadowTranspSpnBx->setValue( lyr.shadowTransparency );
@@ -929,13 +929,13 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
lyr.centroidInside = mCentroidInsideCheckBox->isChecked();
lyr.fitInPolygonOnly = mFitInsidePolygonCheckBox->isChecked();
lyr.dist = mLineDistanceSpnBx->value();
- lyr.distInMapUnits = ( mLineDistanceUnitWidget->unit() == QgsSymbolV2::MapUnit );
+ lyr.distInMapUnits = ( mLineDistanceUnitWidget->unit() == QgsUnitTypes::RenderMapUnits );
lyr.distMapUnitScale = mLineDistanceUnitWidget->getMapUnitScale();
lyr.offsetType = static_cast< QgsPalLayerSettings::OffsetType >( mOffsetTypeComboBox->itemData( mOffsetTypeComboBox->currentIndex() ).toInt() );
lyr.quadOffset = ( QgsPalLayerSettings::QuadrantPosition )mQuadrantBtnGrp->checkedId();
lyr.xOffset = mPointOffsetXSpinBox->value();
lyr.yOffset = mPointOffsetYSpinBox->value();
- lyr.labelOffsetInMapUnits = ( mPointOffsetUnitWidget->unit() == QgsSymbolV2::MapUnit );
+ lyr.labelOffsetInMapUnits = ( mPointOffsetUnitWidget->unit() == QgsUnitTypes::RenderMapUnits );
lyr.labelOffsetMapUnitScale = mPointOffsetUnitWidget->getMapUnitScale();
lyr.angleOffset = mPointAngleSpinBox->value();
if ( chkLineAbove->isChecked() )
@@ -982,7 +982,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
}
lyr.repeatDistance = mRepeatDistanceSpinBox->value();
- lyr.repeatDistanceUnit = mRepeatDistanceUnitWidget->unit() == QgsSymbolV2::MapUnit ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
+ lyr.repeatDistanceUnit = mRepeatDistanceUnitWidget->unit() == QgsUnitTypes::RenderMapUnits ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
lyr.repeatDistanceMapUnitScale = mRepeatDistanceUnitWidget->getMapUnitScale();
lyr.textColor = btnTextColor->color();
@@ -1009,7 +1009,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
lyr.bufferSize = spinBufferSize->value();
lyr.bufferColor = btnBufferColor->color();
lyr.bufferTransp = mBufferTranspSpinBox->value();
- lyr.bufferSizeInMapUnits = ( mBufferUnitWidget->unit() == QgsSymbolV2::MapUnit );
+ lyr.bufferSizeInMapUnits = ( mBufferUnitWidget->unit() == QgsUnitTypes::RenderMapUnits );
lyr.bufferSizeMapUnitScale = mBufferUnitWidget->getMapUnitScale();
lyr.bufferJoinStyle = mBufferJoinStyleComboBox->penJoinStyle();
lyr.bufferNoFill = !mBufferTranspFillChbx->isChecked();
@@ -1022,12 +1022,12 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
lyr.shapeSizeType = ( QgsPalLayerSettings::SizeType )mShapeSizeCmbBx->currentIndex();
lyr.shapeSize = QPointF( mShapeSizeXSpnBx->value(), mShapeSizeYSpnBx->value() );
- lyr.shapeSizeUnits = mShapeSizeUnitWidget->unit() == QgsSymbolV2::MapUnit ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
+ lyr.shapeSizeUnits = mShapeSizeUnitWidget->unit() == QgsUnitTypes::RenderMapUnits ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
lyr.shapeSizeMapUnitScale = mShapeSizeUnitWidget->getMapUnitScale();
lyr.shapeRotationType = ( QgsPalLayerSettings::RotationType )( mShapeRotationCmbBx->currentIndex() );
lyr.shapeRotation = mShapeRotationDblSpnBx->value();
lyr.shapeOffset = QPointF( mShapeOffsetXSpnBx->value(), mShapeOffsetYSpnBx->value() );
- lyr.shapeOffsetUnits = mShapeOffsetUnitWidget->unit() == QgsSymbolV2::MapUnit ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
+ lyr.shapeOffsetUnits = mShapeOffsetUnitWidget->unit() == QgsUnitTypes::RenderMapUnits ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
lyr.shapeOffsetMapUnitScale = mShapeOffsetUnitWidget->getMapUnitScale();
lyr.shapeRadii = QPointF( mShapeRadiusXDbSpnBx->value(), mShapeRadiusYDbSpnBx->value() );
lyr.shapeRadiiUnits = ( QgsPalLayerSettings::SizeUnit )( mShapeRadiusUnitWidget->getUnit() + 1 );
@@ -1036,7 +1036,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
lyr.shapeFillColor = mShapeFillColorBtn->color();
lyr.shapeBorderColor = mShapeBorderColorBtn->color();
lyr.shapeBorderWidth = mShapeBorderWidthSpnBx->value();
- lyr.shapeBorderWidthUnits = mShapeBorderWidthUnitWidget->unit() == QgsSymbolV2::MapUnit ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
+ lyr.shapeBorderWidthUnits = mShapeBorderWidthUnitWidget->unit() == QgsUnitTypes::RenderMapUnits ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
lyr.shapeBorderWidthMapUnitScale = mShapeBorderWidthUnitWidget->getMapUnitScale();
lyr.shapeJoinStyle = mShapePenStyleCmbBx->penJoinStyle();
lyr.shapeTransparency = mShapeTranspSpinBox->value();
@@ -1047,11 +1047,11 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
lyr.shadowUnder = ( QgsPalLayerSettings::ShadowType )mShadowUnderCmbBx->currentIndex();
lyr.shadowOffsetAngle = mShadowOffsetAngleSpnBx->value();
lyr.shadowOffsetDist = mShadowOffsetSpnBx->value();
- lyr.shadowOffsetUnits = mShadowOffsetUnitWidget->unit() == QgsSymbolV2::MapUnit ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
+ lyr.shadowOffsetUnits = mShadowOffsetUnitWidget->unit() == QgsUnitTypes::RenderMapUnits ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
lyr.shadowOffsetMapUnitScale = mShadowOffsetUnitWidget->getMapUnitScale();
lyr.shadowOffsetGlobal = mShadowOffsetGlobalChkBx->isChecked();
lyr.shadowRadius = mShadowRadiusDblSpnBx->value();
- lyr.shadowRadiusUnits = mShadowRadiusUnitWidget->unit() == QgsSymbolV2::MapUnit ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
+ lyr.shadowRadiusUnits = mShadowRadiusUnitWidget->unit() == QgsUnitTypes::RenderMapUnits ? QgsPalLayerSettings::MapUnits : QgsPalLayerSettings::MM;
lyr.shadowRadiusMapUnitScale = mShadowRadiusUnitWidget->getMapUnitScale();
lyr.shadowRadiusAlphaOnly = mShadowRadiusAlphaChkBx->isChecked();
lyr.shadowTransparency = mShadowTranspSpnBx->value();
@@ -1567,7 +1567,7 @@ void QgsLabelingGui::updatePreview()
if ( mBufferDrawChkBx->isChecked() )
{
- if ( mBufferUnitWidget->unit() == QgsSymbolV2::MapUnit )
+ if ( mBufferUnitWidget->unit() == QgsUnitTypes::RenderMapUnits )
{
bufferSize = previewRatio * spinBufferSize->value() / 3.527;
}
@@ -1587,7 +1587,7 @@ void QgsLabelingGui::updatePreview()
if ( mBufferDrawChkBx->isChecked() )
{
- if ( mBufferUnitWidget->unit() == QgsSymbolV2::MM )
+ if ( mBufferUnitWidget->unit() == QgsUnitTypes::RenderMillimeters )
{
bufferSize = spinBufferSize->value();
}
diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp
index 029d77656e0..d5ff0356192 100644
--- a/src/app/qgsmaptoolidentifyaction.cpp
+++ b/src/app/qgsmaptoolidentifyaction.cpp
@@ -185,7 +185,7 @@ void QgsMapToolIdentifyAction::deactivate()
QgsMapTool::deactivate();
}
-Qgis::UnitType QgsMapToolIdentifyAction::displayDistanceUnits() const
+QgsUnitTypes::DistanceUnit QgsMapToolIdentifyAction::displayDistanceUnits() const
{
return QgsProject::instance()->distanceUnits();
}
diff --git a/src/app/qgsmaptoolidentifyaction.h b/src/app/qgsmaptoolidentifyaction.h
index dd66ceacc32..8507891f16c 100644
--- a/src/app/qgsmaptoolidentifyaction.h
+++ b/src/app/qgsmaptoolidentifyaction.h
@@ -76,7 +76,7 @@ class APP_EXPORT QgsMapToolIdentifyAction : public QgsMapToolIdentify
QgsIdentifyResultsDialog *resultsDialog();
- virtual Qgis::UnitType displayDistanceUnits() const override;
+ virtual QgsUnitTypes::DistanceUnit displayDistanceUnits() const override;
virtual QgsUnitTypes::AreaUnit displayAreaUnits() const override;
};
diff --git a/src/app/qgsmaptooloffsetpointsymbol.cpp b/src/app/qgsmaptooloffsetpointsymbol.cpp
index b267557c03f..d070743c2b6 100644
--- a/src/app/qgsmaptooloffsetpointsymbol.cpp
+++ b/src/app/qgsmaptooloffsetpointsymbol.cpp
@@ -223,7 +223,7 @@ void QgsMapToolOffsetPointSymbol::updateOffsetPreviewItem( const QgsPoint& start
mOffsetItem->updateSize();
}
-QPointF QgsMapToolOffsetPointSymbol::calculateOffset( const QgsPoint& startPoint, const QgsPoint& endPoint, QgsSymbolV2::OutputUnit unit ) const
+QPointF QgsMapToolOffsetPointSymbol::calculateOffset( const QgsPoint& startPoint, const QgsPoint& endPoint, QgsUnitTypes::RenderUnit unit ) const
{
double dx = endPoint.x() - startPoint.x();
double dy = -( endPoint.y() - startPoint.y() );
@@ -232,20 +232,20 @@ QPointF QgsMapToolOffsetPointSymbol::calculateOffset( const QgsPoint& startPoint
switch ( unit )
{
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
factor = 25.4 / mCanvas->mapSettings().outputDpi() / mCanvas->mapSettings().mapUnitsPerPixel() ;
break;
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
factor = 1.0 / mCanvas->mapSettings().mapUnitsPerPixel();
break;
- case QgsSymbolV2::MapUnit:
+ case QgsUnitTypes::RenderMapUnits:
factor = 1.0;
break;
- case QgsSymbolV2::Mixed:
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderUnknownUnit:
+ case QgsUnitTypes::RenderPercentage:
//no sensible value
factor = 1.0;
break;
diff --git a/src/app/qgsmaptooloffsetpointsymbol.h b/src/app/qgsmaptooloffsetpointsymbol.h
index 2b8b0753c0f..b52220afd4b 100644
--- a/src/app/qgsmaptooloffsetpointsymbol.h
+++ b/src/app/qgsmaptooloffsetpointsymbol.h
@@ -84,7 +84,7 @@ class APP_EXPORT QgsMapToolOffsetPointSymbol: public QgsMapToolPointSymbol
//! Calculates the required offset from the start to end points, in the specified unit
//! @note start and end points are in map units
- QPointF calculateOffset( const QgsPoint& startPoint, const QgsPoint& endPoint, QgsSymbolV2::OutputUnit unit ) const;
+ QPointF calculateOffset( const QgsPoint& startPoint, const QgsPoint& endPoint, QgsUnitTypes::RenderUnit unit ) const;
//! Adjusts the calculated offset to account for the symbol's rotation
QPointF rotatedOffset( QPointF offset, double angle ) const;
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
index bb39737c46f..0d4ce20266b 100644
--- a/src/app/qgsmeasuredialog.cpp
+++ b/src/app/qgsmeasuredialog.cpp
@@ -108,7 +108,7 @@ void QgsMeasureDialog::unitsChanged( int index )
if ( mMeasureArea )
mAreaUnits = static_cast< QgsUnitTypes::AreaUnit >( mUnitsCombo->itemData( index ).toInt() );
else
- mDistanceUnits = static_cast< Qgis::UnitType >( mUnitsCombo->itemData( index ).toInt() );
+ mDistanceUnits = static_cast< QgsUnitTypes::DistanceUnit >( mUnitsCombo->itemData( index ).toInt() );
mTable->clear();
mTotal = 0.;
updateUi();
@@ -274,8 +274,8 @@ void QgsMeasureDialog::updateUi()
if ( mMeasureArea )
{
- if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == Qgis::Degrees
- && ( mAreaUnits == QgsUnitTypes::SquareDegrees || mAreaUnits == QgsUnitTypes::UnknownAreaUnit ) )
+ if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == QgsUnitTypes::DistanceDegrees
+ && ( mAreaUnits == QgsUnitTypes::AreaSquareDegrees || mAreaUnits == QgsUnitTypes::AreaUnknownUnit ) )
{
//both source and destination units are degrees
toolTip += "
* " + tr( "Both project CRS (%1) and measured area are in degrees, so area is calculated using cartesian calculations in square degrees." ).arg(
@@ -285,7 +285,7 @@ void QgsMeasureDialog::updateUi()
}
else
{
- QgsUnitTypes::AreaUnit resultUnit = QgsUnitTypes::UnknownAreaUnit;
+ QgsUnitTypes::AreaUnit resultUnit = QgsUnitTypes::AreaUnknownUnit;
if ( ! mTool->canvas()->hasCrsTransformEnabled() )
{
resultUnit = QgsUnitTypes::distanceToAreaUnit( mTool->canvas()->mapSettings().destinationCrs().mapUnits() );
@@ -299,7 +299,7 @@ void QgsMeasureDialog::updateUi()
{
if ( mDa.willUseEllipsoid() )
{
- resultUnit = QgsUnitTypes::SquareMeters;
+ resultUnit = QgsUnitTypes::AreaSquareMeters;
toolTip += "
* " + tr( "Project CRS transformation is turned on and ellipsoidal calculation is selected." ) + ' ';
toolTip += "
* " + tr( "The coordinates are transformed to the chosen ellipsoid (%1), and the area is calculated in %2." ).arg( mDa.ellipsoid(),
QgsUnitTypes::toString( resultUnit ) );
@@ -318,13 +318,13 @@ void QgsMeasureDialog::updateUi()
QgsUnitTypes::unitType( mAreaUnits ) == QgsUnitTypes::Standard )
{
toolTip += "
* Area is roughly converted to square meters by using scale at equator (1 degree = 111319.49 meters).";
- resultUnit = QgsUnitTypes::SquareMeters;
+ resultUnit = QgsUnitTypes::AreaSquareMeters;
}
else if ( QgsUnitTypes::unitType( resultUnit ) == QgsUnitTypes::Standard &&
QgsUnitTypes::unitType( mAreaUnits ) == QgsUnitTypes::Geographic )
{
toolTip += "
* Area is roughly converted to square degrees by using scale at equator (1 degree = 111319.49 meters).";
- resultUnit = QgsUnitTypes::SquareDegrees;
+ resultUnit = QgsUnitTypes::AreaSquareDegrees;
}
if ( resultUnit != mAreaUnits )
@@ -348,8 +348,8 @@ void QgsMeasureDialog::updateUi()
}
else
{
- if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == Qgis::Degrees
- && mDistanceUnits == Qgis::Degrees )
+ if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == QgsUnitTypes::DistanceDegrees
+ && mDistanceUnits == QgsUnitTypes::DistanceDegrees )
{
//both source and destination units are degrees
toolTip += "
* " + tr( "Both project CRS (%1) and measured length are in degrees, so distance is calculated using cartesian calculations in degrees." ).arg(
@@ -359,7 +359,7 @@ void QgsMeasureDialog::updateUi()
}
else
{
- Qgis::UnitType resultUnit = Qgis::UnknownUnit;
+ QgsUnitTypes::DistanceUnit resultUnit = QgsUnitTypes::DistanceUnknownUnit;
if ( ! mTool->canvas()->hasCrsTransformEnabled() )
{
resultUnit = mTool->canvas()->mapSettings().destinationCrs().mapUnits();
@@ -373,7 +373,7 @@ void QgsMeasureDialog::updateUi()
{
if ( mDa.willUseEllipsoid() )
{
- resultUnit = Qgis::Meters;
+ resultUnit = QgsUnitTypes::DistanceMeters;
toolTip += "
* " + tr( "Project CRS transformation is turned on and ellipsoidal calculation is selected." ) + ' ';
toolTip += "
* " + tr( "The coordinates are transformed to the chosen ellipsoid (%1), and the distance is calculated in %2." ).arg( mDa.ellipsoid(),
QgsUnitTypes::toString( resultUnit ) );
@@ -392,13 +392,13 @@ void QgsMeasureDialog::updateUi()
QgsUnitTypes::unitType( mDistanceUnits ) == QgsUnitTypes::Standard )
{
toolTip += "
* Distance is roughly converted to meters by using scale at equator (1 degree = 111319.49 meters).";
- resultUnit = Qgis::Meters;
+ resultUnit = QgsUnitTypes::DistanceMeters;
}
else if ( QgsUnitTypes::unitType( resultUnit ) == QgsUnitTypes::Standard &&
QgsUnitTypes::unitType( mDistanceUnits ) == QgsUnitTypes::Geographic )
{
toolTip += "
* Distance is roughly converted to degrees by using scale at equator (1 degree = 111319.49 meters).";
- resultUnit = Qgis::Degrees;
+ resultUnit = QgsUnitTypes::DistanceDegrees;
}
if ( resultUnit != mDistanceUnits )
@@ -491,30 +491,30 @@ void QgsMeasureDialog::repopulateComboBoxUnits( bool isArea )
mUnitsCombo->clear();
if ( isArea )
{
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::SquareMeters ), QgsUnitTypes::SquareMeters );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::SquareKilometers ), QgsUnitTypes::SquareKilometers );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::SquareFeet ), QgsUnitTypes::SquareFeet );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::SquareYards ), QgsUnitTypes::SquareYards );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::SquareMiles ), QgsUnitTypes::SquareMiles );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::Hectares ), QgsUnitTypes::Hectares );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::Acres ), QgsUnitTypes::Acres );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::SquareNauticalMiles ), QgsUnitTypes::SquareNauticalMiles );
- mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::SquareDegrees ), QgsUnitTypes::SquareDegrees );
- mUnitsCombo->addItem( tr( "map units" ), QgsUnitTypes::UnknownAreaUnit );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaSquareMeters ), QgsUnitTypes::AreaSquareMeters );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaSquareKilometers ), QgsUnitTypes::AreaSquareKilometers );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaSquareFeet ), QgsUnitTypes::AreaSquareFeet );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaSquareYards ), QgsUnitTypes::AreaSquareYards );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaSquareMiles ), QgsUnitTypes::AreaSquareMiles );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaHectares ), QgsUnitTypes::AreaHectares );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaAcres ), QgsUnitTypes::AreaAcres );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaSquareNauticalMiles ), QgsUnitTypes::AreaSquareNauticalMiles );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::AreaSquareDegrees ), QgsUnitTypes::AreaSquareDegrees );
+ mUnitsCombo->addItem( tr( "map units" ), QgsUnitTypes::AreaUnknownUnit );
}
else
{
- mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Meters ), Qgis::Meters );
- mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Kilometers ), Qgis::Kilometers );
- mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Feet ), Qgis::Feet );
- mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Yards ), Qgis::Yards );
- mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Miles ), Qgis::Miles );
- mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Degrees ), Qgis::Degrees );
- mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::NauticalMiles ), Qgis::NauticalMiles );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::DistanceMeters ), QgsUnitTypes::DistanceMeters );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::DistanceKilometers ), QgsUnitTypes::DistanceKilometers );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::DistanceFeet ), QgsUnitTypes::DistanceFeet );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::DistanceYards ), QgsUnitTypes::DistanceYards );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::DistanceMiles ), QgsUnitTypes::DistanceMiles );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::DistanceDegrees ), QgsUnitTypes::DistanceDegrees );
+ mUnitsCombo->addItem( QgsUnitTypes::toString( QgsUnitTypes::DistanceNauticalMiles ), QgsUnitTypes::DistanceNauticalMiles );
}
}
-double QgsMeasureDialog::convertLength( double length, Qgis::UnitType toUnit ) const
+double QgsMeasureDialog::convertLength( double length, QgsUnitTypes::DistanceUnit toUnit ) const
{
return mDa.convertLengthMeasurement( length, toUnit );
}
diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h
index 926b840710e..0cbc2684b08 100644
--- a/src/app/qgsmeasuredialog.h
+++ b/src/app/qgsmeasuredialog.h
@@ -87,7 +87,7 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
*/
void repopulateComboBoxUnits( bool isArea );
- double convertLength( double length, Qgis::UnitType toUnit ) const;
+ double convertLength( double length, QgsUnitTypes::DistanceUnit toUnit ) const;
double convertArea( double area, QgsUnitTypes::AreaUnit toUnit ) const;
@@ -100,10 +100,10 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
int mDecimalPlaces;
//! Current unit for input values
- Qgis::UnitType mCanvasUnits;
+ QgsUnitTypes::DistanceUnit mCanvasUnits;
//! Current unit for distance values
- Qgis::UnitType mDistanceUnits;
+ QgsUnitTypes::DistanceUnit mDistanceUnits;
//! Current unit for area values
QgsUnitTypes::AreaUnit mAreaUnits;
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
index b69a6bb4743..2d7d9794ae7 100644
--- a/src/app/qgsoptions.cpp
+++ b/src/app/qgsoptions.cpp
@@ -459,43 +459,43 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
}
// Set the units for measuring
- mDistanceUnitsComboBox->addItem( tr( "Meters" ), Qgis::Meters );
- mDistanceUnitsComboBox->addItem( tr( "Kilometers" ), Qgis::Kilometers );
- mDistanceUnitsComboBox->addItem( tr( "Feet" ), Qgis::Feet );
- mDistanceUnitsComboBox->addItem( tr( "Yards" ), Qgis::Yards );
- mDistanceUnitsComboBox->addItem( tr( "Miles" ), Qgis::Miles );
- mDistanceUnitsComboBox->addItem( tr( "Nautical miles" ), Qgis::NauticalMiles );
- mDistanceUnitsComboBox->addItem( tr( "Degrees" ), Qgis::Degrees );
- mDistanceUnitsComboBox->addItem( tr( "Map units" ), Qgis::UnknownUnit );
+ mDistanceUnitsComboBox->addItem( tr( "Meters" ), QgsUnitTypes::DistanceMeters );
+ mDistanceUnitsComboBox->addItem( tr( "Kilometers" ), QgsUnitTypes::DistanceKilometers );
+ mDistanceUnitsComboBox->addItem( tr( "Feet" ), QgsUnitTypes::DistanceFeet );
+ mDistanceUnitsComboBox->addItem( tr( "Yards" ), QgsUnitTypes::DistanceYards );
+ mDistanceUnitsComboBox->addItem( tr( "Miles" ), QgsUnitTypes::DistanceMiles );
+ mDistanceUnitsComboBox->addItem( tr( "Nautical miles" ), QgsUnitTypes::DistanceNauticalMiles );
+ mDistanceUnitsComboBox->addItem( tr( "Degrees" ), QgsUnitTypes::DistanceDegrees );
+ mDistanceUnitsComboBox->addItem( tr( "Map units" ), QgsUnitTypes::DistanceUnknownUnit );
bool ok = false;
- Qgis::UnitType distanceUnits = QgsUnitTypes::decodeDistanceUnit( mSettings->value( "/qgis/measure/displayunits" ).toString(), &ok );
+ QgsUnitTypes::DistanceUnit distanceUnits = QgsUnitTypes::decodeDistanceUnit( mSettings->value( "/qgis/measure/displayunits" ).toString(), &ok );
if ( !ok )
- distanceUnits = Qgis::Meters;
+ distanceUnits = QgsUnitTypes::DistanceMeters;
mDistanceUnitsComboBox->setCurrentIndex( mDistanceUnitsComboBox->findData( distanceUnits ) );
- mAreaUnitsComboBox->addItem( tr( "Square meters" ), QgsUnitTypes::SquareMeters );
- mAreaUnitsComboBox->addItem( tr( "Square kilometers" ), QgsUnitTypes::SquareKilometers );
- mAreaUnitsComboBox->addItem( tr( "Square feet" ), QgsUnitTypes::SquareFeet );
- mAreaUnitsComboBox->addItem( tr( "Square yards" ), QgsUnitTypes::SquareYards );
- mAreaUnitsComboBox->addItem( tr( "Square miles" ), QgsUnitTypes::SquareMiles );
- mAreaUnitsComboBox->addItem( tr( "Hectares" ), QgsUnitTypes::Hectares );
- mAreaUnitsComboBox->addItem( tr( "Acres" ), QgsUnitTypes::Acres );
- mAreaUnitsComboBox->addItem( tr( "Square nautical miles" ), QgsUnitTypes::SquareNauticalMiles );
- mAreaUnitsComboBox->addItem( tr( "Square degrees" ), QgsUnitTypes::SquareDegrees );
- mAreaUnitsComboBox->addItem( tr( "Map units" ), QgsUnitTypes::UnknownAreaUnit );
+ mAreaUnitsComboBox->addItem( tr( "Square meters" ), QgsUnitTypes::AreaSquareMeters );
+ mAreaUnitsComboBox->addItem( tr( "Square kilometers" ), QgsUnitTypes::AreaSquareKilometers );
+ mAreaUnitsComboBox->addItem( tr( "Square feet" ), QgsUnitTypes::AreaSquareFeet );
+ mAreaUnitsComboBox->addItem( tr( "Square yards" ), QgsUnitTypes::AreaSquareYards );
+ mAreaUnitsComboBox->addItem( tr( "Square miles" ), QgsUnitTypes::AreaSquareMiles );
+ mAreaUnitsComboBox->addItem( tr( "Hectares" ), QgsUnitTypes::AreaHectares );
+ mAreaUnitsComboBox->addItem( tr( "Acres" ), QgsUnitTypes::AreaAcres );
+ mAreaUnitsComboBox->addItem( tr( "Square nautical miles" ), QgsUnitTypes::AreaSquareNauticalMiles );
+ mAreaUnitsComboBox->addItem( tr( "Square degrees" ), QgsUnitTypes::AreaSquareDegrees );
+ mAreaUnitsComboBox->addItem( tr( "Map units" ), QgsUnitTypes::AreaUnknownUnit );
QgsUnitTypes::AreaUnit areaUnits = QgsUnitTypes::decodeAreaUnit( mSettings->value( "/qgis/measure/areaunits" ).toString(), &ok );
if ( !ok )
- areaUnits = QgsUnitTypes::SquareMeters;
+ areaUnits = QgsUnitTypes::AreaSquareMeters;
mAreaUnitsComboBox->setCurrentIndex( mAreaUnitsComboBox->findData( areaUnits ) );
mAngleUnitsComboBox->addItem( tr( "Degrees" ), QgsUnitTypes::AngleDegrees );
- mAngleUnitsComboBox->addItem( tr( "Radians" ), QgsUnitTypes::Radians );
- mAngleUnitsComboBox->addItem( tr( "Gon/gradians" ), QgsUnitTypes::Gon );
- mAngleUnitsComboBox->addItem( tr( "Minutes of arc" ), QgsUnitTypes::MinutesOfArc );
- mAngleUnitsComboBox->addItem( tr( "Seconds of arc" ), QgsUnitTypes::SecondsOfArc );
- mAngleUnitsComboBox->addItem( tr( "Turns/revolutions" ), QgsUnitTypes::Turn );
+ mAngleUnitsComboBox->addItem( tr( "Radians" ), QgsUnitTypes::AngleRadians );
+ mAngleUnitsComboBox->addItem( tr( "Gon/gradians" ), QgsUnitTypes::AngleGon );
+ mAngleUnitsComboBox->addItem( tr( "Minutes of arc" ), QgsUnitTypes::AngleMinutesOfArc );
+ mAngleUnitsComboBox->addItem( tr( "Seconds of arc" ), QgsUnitTypes::AngleSecondsOfArc );
+ mAngleUnitsComboBox->addItem( tr( "Turns/revolutions" ), QgsUnitTypes::AngleTurn );
QgsUnitTypes::AngleUnit unit = QgsUnitTypes::decodeAngleUnit( mSettings->value( "/qgis/measure/angleunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AngleDegrees ) ).toString() );
mAngleUnitsComboBox->setCurrentIndex( mAngleUnitsComboBox->findData( unit ) );
@@ -1301,7 +1301,7 @@ void QgsOptions::saveOptions()
//measurement settings
- Qgis::UnitType distanceUnit = static_cast< Qgis::UnitType >( mDistanceUnitsComboBox->itemData( mDistanceUnitsComboBox->currentIndex() ).toInt() );
+ QgsUnitTypes::DistanceUnit distanceUnit = static_cast< QgsUnitTypes::DistanceUnit >( mDistanceUnitsComboBox->itemData( mDistanceUnitsComboBox->currentIndex() ).toInt() );
mSettings->setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( distanceUnit ) );
QgsUnitTypes::AreaUnit areaUnit = static_cast< QgsUnitTypes::AreaUnit >( mAreaUnitsComboBox->itemData( mAreaUnitsComboBox->currentIndex() ).toInt() );
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
index 80b13afcb8a..64a8582d9b0 100644
--- a/src/app/qgsprojectproperties.cpp
+++ b/src/app/qgsprojectproperties.cpp
@@ -86,25 +86,25 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
mCoordinateDisplayComboBox->addItem( tr( "Degrees, minutes" ), DegreesMinutes );
mCoordinateDisplayComboBox->addItem( tr( "Degrees, minutes, seconds" ), DegreesMinutesSeconds );
- mDistanceUnitsCombo->addItem( tr( "Meters" ), Qgis::Meters );
- mDistanceUnitsCombo->addItem( tr( "Kilometers" ), Qgis::Kilometers );
- mDistanceUnitsCombo->addItem( tr( "Feet" ), Qgis::Feet );
- mDistanceUnitsCombo->addItem( tr( "Yards" ), Qgis::Yards );
- mDistanceUnitsCombo->addItem( tr( "Miles" ), Qgis::Miles );
- mDistanceUnitsCombo->addItem( tr( "Nautical miles" ), Qgis::NauticalMiles );
- mDistanceUnitsCombo->addItem( tr( "Degrees" ), Qgis::Degrees );
- mDistanceUnitsCombo->addItem( tr( "Map units" ), Qgis::UnknownUnit );
+ mDistanceUnitsCombo->addItem( tr( "Meters" ), QgsUnitTypes::DistanceMeters );
+ mDistanceUnitsCombo->addItem( tr( "Kilometers" ), QgsUnitTypes::DistanceKilometers );
+ mDistanceUnitsCombo->addItem( tr( "Feet" ), QgsUnitTypes::DistanceFeet );
+ mDistanceUnitsCombo->addItem( tr( "Yards" ), QgsUnitTypes::DistanceYards );
+ mDistanceUnitsCombo->addItem( tr( "Miles" ), QgsUnitTypes::DistanceMiles );
+ mDistanceUnitsCombo->addItem( tr( "Nautical miles" ), QgsUnitTypes::DistanceNauticalMiles );
+ mDistanceUnitsCombo->addItem( tr( "Degrees" ), QgsUnitTypes::DistanceDegrees );
+ mDistanceUnitsCombo->addItem( tr( "Map units" ), QgsUnitTypes::DistanceUnknownUnit );
- mAreaUnitsCombo->addItem( tr( "Square meters" ), QgsUnitTypes::SquareMeters );
- mAreaUnitsCombo->addItem( tr( "Square kilometers" ), QgsUnitTypes::SquareKilometers );
- mAreaUnitsCombo->addItem( tr( "Square feet" ), QgsUnitTypes::SquareFeet );
- mAreaUnitsCombo->addItem( tr( "Square yards" ), QgsUnitTypes::SquareYards );
- mAreaUnitsCombo->addItem( tr( "Square miles" ), QgsUnitTypes::SquareMiles );
- mAreaUnitsCombo->addItem( tr( "Hectares" ), QgsUnitTypes::Hectares );
- mAreaUnitsCombo->addItem( tr( "Acres" ), QgsUnitTypes::Acres );
- mAreaUnitsCombo->addItem( tr( "Square nautical miles" ), QgsUnitTypes::SquareNauticalMiles );
- mAreaUnitsCombo->addItem( tr( "Square degrees" ), QgsUnitTypes::SquareDegrees );
- mAreaUnitsCombo->addItem( tr( "Map units" ), QgsUnitTypes::UnknownAreaUnit );
+ mAreaUnitsCombo->addItem( tr( "Square meters" ), QgsUnitTypes::AreaSquareMeters );
+ mAreaUnitsCombo->addItem( tr( "Square kilometers" ), QgsUnitTypes::AreaSquareKilometers );
+ mAreaUnitsCombo->addItem( tr( "Square feet" ), QgsUnitTypes::AreaSquareFeet );
+ mAreaUnitsCombo->addItem( tr( "Square yards" ), QgsUnitTypes::AreaSquareYards );
+ mAreaUnitsCombo->addItem( tr( "Square miles" ), QgsUnitTypes::AreaSquareMiles );
+ mAreaUnitsCombo->addItem( tr( "Hectares" ), QgsUnitTypes::AreaHectares );
+ mAreaUnitsCombo->addItem( tr( "Acres" ), QgsUnitTypes::AreaAcres );
+ mAreaUnitsCombo->addItem( tr( "Square nautical miles" ), QgsUnitTypes::AreaSquareNauticalMiles );
+ mAreaUnitsCombo->addItem( tr( "Square degrees" ), QgsUnitTypes::AreaSquareDegrees );
+ mAreaUnitsCombo->addItem( tr( "Map units" ), QgsUnitTypes::AreaUnknownUnit );
connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );
connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) );
@@ -732,17 +732,17 @@ QgsProjectProperties::~QgsProjectProperties()
}
// return the map units
-Qgis::UnitType QgsProjectProperties::mapUnits() const
+QgsUnitTypes::DistanceUnit QgsProjectProperties::mapUnits() const
{
return mMapCanvas->mapSettings().mapUnits();
}
-void QgsProjectProperties::setMapUnits( Qgis::UnitType unit )
+void QgsProjectProperties::setMapUnits( QgsUnitTypes::DistanceUnit unit )
{
// select the button
- if ( unit == Qgis::UnknownUnit )
+ if ( unit == QgsUnitTypes::DistanceUnknownUnit )
{
- unit = Qgis::Meters;
+ unit = QgsUnitTypes::DistanceMeters;
}
mMapCanvas->setMapUnits( unit );
@@ -787,7 +787,7 @@ void QgsProjectProperties::apply()
{
// If we couldn't get the map units, default to the value in the
// projectproperties dialog box (set above)
- if ( srs.mapUnits() != Qgis::UnknownUnit )
+ if ( srs.mapUnits() != QgsUnitTypes::DistanceUnknownUnit )
mMapCanvas->setMapUnits( srs.mapUnits() );
}
@@ -831,7 +831,7 @@ void QgsProjectProperties::apply()
// Announce that we may have a new display precision setting
emit displayPrecisionChanged();
- Qgis::UnitType distanceUnits = static_cast< Qgis::UnitType >( mDistanceUnitsCombo->itemData( mDistanceUnitsCombo->currentIndex() ).toInt() );
+ QgsUnitTypes::DistanceUnit distanceUnits = static_cast< QgsUnitTypes::DistanceUnit >( mDistanceUnitsCombo->itemData( mDistanceUnitsCombo->currentIndex() ).toInt() );
QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( distanceUnits ) );
QgsUnitTypes::AreaUnit areaUnits = static_cast< QgsUnitTypes::AreaUnit >( mAreaUnitsCombo->itemData( mAreaUnitsCombo->currentIndex() ).toInt() );
@@ -1274,7 +1274,7 @@ void QgsProjectProperties::cbxWCSPubliedStateChanged( int aIdx )
}
}
-void QgsProjectProperties::updateGuiForMapUnits( Qgis::UnitType units )
+void QgsProjectProperties::updateGuiForMapUnits( QgsUnitTypes::DistanceUnit units )
{
//make sure map units option is shown in coordinate display combo
int idx = mCoordinateDisplayComboBox->findData( MapUnits );
@@ -1282,13 +1282,13 @@ void QgsProjectProperties::updateGuiForMapUnits( Qgis::UnitType units )
mCoordinateDisplayComboBox->setItemText( idx, mapUnitString );
//also update unit combo boxes
- idx = mDistanceUnitsCombo->findData( Qgis::UnknownUnit );
+ idx = mDistanceUnitsCombo->findData( QgsUnitTypes::DistanceUnknownUnit );
if ( idx >= 0 )
{
QString mapUnitString = tr( "Map units (%1)" ).arg( QgsUnitTypes::toString( units ) );
mDistanceUnitsCombo->setItemText( idx, mapUnitString );
}
- idx = mAreaUnitsCombo->findData( QgsUnitTypes::UnknownAreaUnit );
+ idx = mAreaUnitsCombo->findData( QgsUnitTypes::AreaUnknownUnit );
if ( idx >= 0 )
{
QString mapUnitString = tr( "Map units (%1)" ).arg( QgsUnitTypes::toString( QgsUnitTypes::distanceToAreaUnit( units ) ) );
@@ -1304,7 +1304,7 @@ void QgsProjectProperties::srIdUpdated()
QgsCoordinateReferenceSystem srs = QgsCoordinateReferenceSystem::fromSrsId( myCRSID );
//set radio button to crs map unit type
- Qgis::UnitType units = srs.mapUnits();
+ QgsUnitTypes::DistanceUnit units = srs.mapUnits();
updateGuiForMapUnits( units );
diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
index 4cd8732ab8f..cc8e8578431 100644
--- a/src/app/qgsprojectproperties.h
+++ b/src/app/qgsprojectproperties.h
@@ -20,6 +20,7 @@
#include "qgsoptionsdialogbase.h"
#include "ui_qgsprojectpropertiesbase.h"
#include "qgis.h"
+#include "qgsunittypes.h"
#include "qgisgui.h"
#include "qgscontexthelp.h"
@@ -47,12 +48,12 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
/** Gets the currently select map units
*/
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
/*!
* Set the map units
*/
- void setMapUnits( Qgis::UnitType );
+ void setMapUnits( QgsUnitTypes::DistanceUnit );
/*!
Every project has a title
@@ -240,5 +241,5 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
static const char * GEO_NONE_DESC;
- void updateGuiForMapUnits( Qgis::UnitType units );
+ void updateGuiForMapUnits( QgsUnitTypes::DistanceUnit units );
};
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
index 5f67fc4c055..8666eb356c2 100644
--- a/src/core/composer/qgscomposerscalebar.cpp
+++ b/src/core/composer/qgscomposerscalebar.cpp
@@ -306,20 +306,20 @@ double QgsComposerScaleBar::mapWidth() const
da.setSourceCrs( mComposition->mapSettings().destinationCrs().srsid() );
da.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", "WGS84" ) );
- Qgis::UnitType units = Qgis::Meters;
+ QgsUnitTypes::DistanceUnit units = QgsUnitTypes::DistanceMeters;
double measure = da.measureLine( QgsPoint( composerMapRect.xMinimum(), composerMapRect.yMinimum() ),
QgsPoint( composerMapRect.xMaximum(), composerMapRect.yMinimum() ),
units );
switch ( mUnits )
{
case QgsComposerScaleBar::Feet:
- measure /= QgsUnitTypes::fromUnitToUnitFactor( Qgis::Feet, units );
+ measure /= QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::DistanceFeet, units );
break;
case QgsComposerScaleBar::NauticalMiles:
- measure /= QgsUnitTypes::fromUnitToUnitFactor( Qgis::NauticalMiles, units );
+ measure /= QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::DistanceNauticalMiles, units );
break;
case QgsComposerScaleBar::Meters:
- measure /= QgsUnitTypes::fromUnitToUnitFactor( Qgis::Meters, units );
+ measure /= QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::DistanceMeters, units );
break;
case QgsComposerScaleBar::MapUnits:
//avoid warning
diff --git a/src/core/diagram/qgsdiagram.cpp b/src/core/diagram/qgsdiagram.cpp
index 38dd0e75713..cff90344366 100644
--- a/src/core/diagram/qgsdiagram.cpp
+++ b/src/core/diagram/qgsdiagram.cpp
@@ -88,7 +88,7 @@ float QgsDiagram::sizePainterUnits( float l, const QgsDiagramSettings& s, const
QFont QgsDiagram::scaledFont( const QgsDiagramSettings& s, const QgsRenderContext& c )
{
QFont f = s.font;
- if ( s.sizeType == QgsSymbolV2::MapUnit )
+ if ( s.sizeType == QgsUnitTypes::RenderMapUnits )
{
int pixelsize = s.font.pointSizeF() / c.mapToPixel().mapUnitsPerPixel();
f.setPixelSize( pixelsize > 0 ? pixelsize : 1 );
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
index 4cce4147aa5..b21dde22daa 100644
--- a/src/core/dxf/qgsdxfexport.cpp
+++ b/src/core/dxf/qgsdxfexport.cpp
@@ -366,7 +366,7 @@ const char *QgsDxfExport::mDxfEncodings[][2] =
QgsDxfExport::QgsDxfExport()
: mSymbologyScaleDenominator( 1.0 )
, mSymbologyExport( NoSymbology )
- , mMapUnits( Qgis::Meters )
+ , mMapUnits( QgsUnitTypes::DistanceMeters )
, mLayerTitleAsName( false )
, mSymbolLayerCounter( 0 )
, mNextHandleId( DXF_HANDSEED )
@@ -852,7 +852,7 @@ void QgsDxfExport::writeBlocks()
continue;
// if point symbol layer and no data defined properties: write block
- QgsSymbolV2RenderContext ctx( ct, QgsSymbolV2::MapUnit, slIt->second->alpha(), false, slIt->second->renderHints(), nullptr );
+ QgsSymbolV2RenderContext ctx( ct, QgsUnitTypes::RenderMapUnits, slIt->second->alpha(), false, slIt->second->renderHints(), nullptr );
ml->startRender( ctx );
// markers with data defined properties are inserted inline
@@ -912,7 +912,7 @@ void QgsDxfExport::writeEntities()
mapSettings.setExtent( bbox );
int dpi = 96;
- double factor = 1000 * dpi / mSymbologyScaleDenominator / 25.4 * QgsUnitTypes::fromUnitToUnitFactor( mMapUnits, Qgis::Meters );
+ double factor = 1000 * dpi / mSymbologyScaleDenominator / 25.4 * QgsUnitTypes::fromUnitToUnitFactor( mMapUnits, QgsUnitTypes::DistanceMeters );
mapSettings.setOutputSize( QSize( bbox.width() * factor, bbox.height() * factor ) );
mapSettings.setOutputDpi( dpi );
mapSettings.setCrsTransformEnabled( false );
@@ -945,7 +945,7 @@ void QgsDxfExport::writeEntities()
continue;
}
- QgsSymbolV2RenderContext sctx( ctx, QgsSymbolV2::MM, 1.0, false, 0, nullptr );
+ QgsSymbolV2RenderContext sctx( ctx, QgsUnitTypes::RenderMillimeters, 1.0, false, 0, nullptr );
QgsFeatureRendererV2* renderer = vl->rendererV2();
if ( !renderer )
{
@@ -1084,7 +1084,7 @@ void QgsDxfExport::writeEntitiesSymbolLevels( QgsVectorLayer* layer )
ctx.expressionContext() << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope()
<< QgsExpressionContextUtils::layerScope( layer );
- QgsSymbolV2RenderContext sctx( ctx, QgsSymbolV2::MM, 1.0, false, 0, nullptr );
+ QgsSymbolV2RenderContext sctx( ctx, QgsUnitTypes::RenderMillimeters, 1.0, false, 0, nullptr );
renderer->startRender( ctx, layer->fields() );
// get iterator
@@ -3960,14 +3960,14 @@ QgsRenderContext QgsDxfExport::renderContext() const
return context;
}
-double QgsDxfExport::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits )
+double QgsDxfExport::mapUnitScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits )
{
- if ( symbolUnits == QgsSymbolV2::MapUnit )
+ if ( symbolUnits == QgsUnitTypes::RenderMapUnits )
{
return 1.0;
}
// MM symbol unit
- return scaleDenominator * QgsUnitTypes::fromUnitToUnitFactor( Qgis::Meters, mapUnits ) / 1000.0;
+ return scaleDenominator * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::DistanceMeters, mapUnits ) / 1000.0;
}
QList< QPair< QgsSymbolLayerV2*, QgsSymbolV2* > > QgsDxfExport::symbolLayers( QgsRenderContext &context )
@@ -4035,19 +4035,19 @@ void QgsDxfExport::writeDefaultLinetypes()
QVector dashVector( 2 );
dashVector[0] = das;
dashVector[1] = dss;
- writeLinetype( "DASH", dashVector, QgsSymbolV2::MapUnit );
+ writeLinetype( "DASH", dashVector, QgsUnitTypes::RenderMapUnits );
QVector dotVector( 2 );
dotVector[0] = dos;
dotVector[1] = dss;
- writeLinetype( "DOT", dotVector, QgsSymbolV2::MapUnit );
+ writeLinetype( "DOT", dotVector, QgsUnitTypes::RenderMapUnits );
QVector dashDotVector( 4 );
dashDotVector[0] = das;
dashDotVector[1] = dss;
dashDotVector[2] = dos;
dashDotVector[3] = dss;
- writeLinetype( "DASHDOT", dashDotVector, QgsSymbolV2::MapUnit );
+ writeLinetype( "DASHDOT", dashDotVector, QgsUnitTypes::RenderMapUnits );
QVector dashDotDotVector( 6 );
dashDotDotVector[0] = das;
@@ -4056,7 +4056,7 @@ void QgsDxfExport::writeDefaultLinetypes()
dashDotDotVector[3] = dss;
dashDotDotVector[4] = dos;
dashDotDotVector[5] = dss;
- writeLinetype( "DASHDOTDOT", dashDotDotVector, QgsSymbolV2::MapUnit );
+ writeLinetype( "DASHDOTDOT", dashDotDotVector, QgsUnitTypes::RenderMapUnits );
}
void QgsDxfExport::writeSymbolLayerLinetype( const QgsSymbolLayerV2* symbolLayer )
@@ -4066,7 +4066,7 @@ void QgsDxfExport::writeSymbolLayerLinetype( const QgsSymbolLayerV2* symbolLayer
return;
}
- QgsSymbolV2::OutputUnit unit;
+ QgsUnitTypes::RenderUnit unit;
QVector customLinestyle = symbolLayer->dxfCustomDashPattern( unit );
if ( !customLinestyle.isEmpty() )
{
@@ -4094,7 +4094,7 @@ int QgsDxfExport::nLineTypes( const QList< QPair< QgsSymbolLayerV2*, QgsSymbolV2
return nLineTypes;
}
-void QgsDxfExport::writeLinetype( const QString& styleName, const QVector& pattern, QgsSymbolV2::OutputUnit u )
+void QgsDxfExport::writeLinetype( const QString& styleName, const QVector& pattern, QgsUnitTypes::RenderUnit u )
{
double length = 0;
QVector::const_iterator dashIt = pattern.constBegin();
@@ -4164,7 +4164,7 @@ double QgsDxfExport::dashSeparatorSize() const
double QgsDxfExport::sizeToMapUnits( double s ) const
{
- double size = s * QgsUnitTypes::fromUnitToUnitFactor( Qgis::Meters, mMapUnits );
+ double size = s * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::DistanceMeters, mMapUnits );
return size;
}
diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
index 387255bdb90..ed8d5ebeaa4 100644
--- a/src/core/dxf/qgsdxfexport.h
+++ b/src/core/dxf/qgsdxfexport.h
@@ -86,14 +86,14 @@ class CORE_EXPORT QgsDxfExport
* Set map units
* @param u unit
*/
- void setMapUnits( Qgis::UnitType u ) { mMapUnits = u; }
+ void setMapUnits( QgsUnitTypes::DistanceUnit u ) { mMapUnits = u; }
/**
* Retrieve map units
* @returns unit
* @see setMapUnits
*/
- Qgis::UnitType mapUnits() const { return mMapUnits; }
+ QgsUnitTypes::DistanceUnit mapUnits() const { return mMapUnits; }
/**
* Set symbology export mode
@@ -352,7 +352,8 @@ class CORE_EXPORT QgsDxfExport
//! @note added in 2.15
void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor& color );
- static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
+ //! Calculates a scaling factor to convert from map units to a specified symbol unit.
+ static double mapUnitScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits );
//! Return cleaned layer name for use in DXF
static QString dxfLayerName( const QString &name );
@@ -387,7 +388,7 @@ class CORE_EXPORT QgsDxfExport
/** Scale for symbology export (used if symbols units are mm)*/
double mSymbologyScaleDenominator;
SymbologyExport mSymbologyExport;
- Qgis::UnitType mMapUnits;
+ QgsUnitTypes::DistanceUnit mMapUnits;
bool mLayerTitleAsName;
QTextStream mTextStream;
@@ -416,7 +417,7 @@ class CORE_EXPORT QgsDxfExport
void writePoint( const QgsPointV2 &pt, const QString &layer, const QColor& color, QgsSymbolV2RenderContext &ctx, const QgsSymbolLayerV2 *symbolLayer, const QgsSymbolV2 *symbol, double angle );
void writeDefaultLinetypes();
void writeSymbolLayerLinetype( const QgsSymbolLayerV2 *symbolLayer );
- void writeLinetype( const QString &styleName, const QVector &pattern, QgsSymbolV2::OutputUnit u );
+ void writeLinetype( const QString &styleName, const QVector &pattern, QgsUnitTypes::RenderUnit u );
QgsRectangle dxfExtent() const;
diff --git a/src/core/effects/qgsgloweffect.cpp b/src/core/effects/qgsgloweffect.cpp
index 33b5d9f1a3d..3cc71376a2e 100644
--- a/src/core/effects/qgsgloweffect.cpp
+++ b/src/core/effects/qgsgloweffect.cpp
@@ -24,7 +24,7 @@
QgsGlowEffect::QgsGlowEffect()
: QgsPaintEffect()
, mSpread( 2.0 )
- , mSpreadUnit( QgsSymbolV2::MM )
+ , mSpreadUnit( QgsUnitTypes::RenderMillimeters )
, mRamp( nullptr )
, mBlurLevel( 3 )
, mTransparency( 0.5 )
@@ -124,7 +124,7 @@ QgsStringMap QgsGlowEffect::properties() const
props.insert( "transparency", QString::number( mTransparency ) );
props.insert( "blur_level", QString::number( mBlurLevel ) );
props.insert( "spread", QString::number( mSpread ) );
- props.insert( "spread_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mSpreadUnit ) );
+ props.insert( "spread_unit", QgsUnitTypes::encodeUnit( mSpreadUnit ) );
props.insert( "spread_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mSpreadMapUnitScale ) );
props.insert( "color_type", QString::number( static_cast< int >( mColorType ) ) );
props.insert( "single_color", QgsSymbolLayerV2Utils::encodeColor( mColor ) );
@@ -162,7 +162,7 @@ void QgsGlowEffect::readProperties( const QgsStringMap &props )
{
mSpread = spread;
}
- mSpreadUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "spread_unit" ) );
+ mSpreadUnit = QgsUnitTypes::decodeRenderUnit( props.value( "spread_unit" ) );
mSpreadMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "spread_unit_scale" ) );
QgsGlowEffect::GlowColorType type = static_cast< QgsGlowEffect::GlowColorType >( props.value( "color_type" ).toInt( &ok ) );
if ( ok )
diff --git a/src/core/effects/qgsgloweffect.h b/src/core/effects/qgsgloweffect.h
index 47412386184..46efa7b41a2 100644
--- a/src/core/effects/qgsgloweffect.h
+++ b/src/core/effects/qgsgloweffect.h
@@ -72,7 +72,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect
* @see setSpread
* @see setSpreadMapUnitScale
*/
- void setSpreadUnit( const QgsSymbolV2::OutputUnit unit ) { mSpreadUnit = unit; }
+ void setSpreadUnit( const QgsUnitTypes::RenderUnit unit ) { mSpreadUnit = unit; }
/** Returns the units used for the glow spread distance.
* @returns units for spread distance
@@ -80,7 +80,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect
* @see spread
* @see spreadMapUnitScale
*/
- QgsSymbolV2::OutputUnit spreadUnit() const { return mSpreadUnit; }
+ QgsUnitTypes::RenderUnit spreadUnit() const { return mSpreadUnit; }
/** Sets the map unit scale used for the spread distance.
* @param scale map unit scale for spread distance
@@ -209,7 +209,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect
virtual bool shadeExterior() const = 0;
double mSpread;
- QgsSymbolV2::OutputUnit mSpreadUnit;
+ QgsUnitTypes::RenderUnit mSpreadUnit;
QgsMapUnitScale mSpreadMapUnitScale;
QgsVectorColorRampV2* mRamp;
int mBlurLevel;
diff --git a/src/core/effects/qgsshadoweffect.cpp b/src/core/effects/qgsshadoweffect.cpp
index e0b9ef5a391..6c944b615fd 100644
--- a/src/core/effects/qgsshadoweffect.cpp
+++ b/src/core/effects/qgsshadoweffect.cpp
@@ -25,7 +25,7 @@ QgsShadowEffect::QgsShadowEffect()
, mBlurLevel( 10 )
, mOffsetAngle( 135 )
, mOffsetDist( 2.0 )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
, mTransparency( 0.0 )
, mColor( Qt::black )
, mBlendMode( QPainter::CompositionMode_Multiply )
@@ -103,7 +103,7 @@ QgsStringMap QgsShadowEffect::properties() const
props.insert( "blur_level", QString::number( mBlurLevel ) );
props.insert( "offset_angle", QString::number( mOffsetAngle ) );
props.insert( "offset_distance", QString::number( mOffsetDist ) );
- props.insert( "offset_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit ) );
+ props.insert( "offset_unit", QgsUnitTypes::encodeUnit( mOffsetUnit ) );
props.insert( "offset_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale ) );
props.insert( "color", QgsSymbolLayerV2Utils::encodeColor( mColor ) );
return props;
@@ -139,7 +139,7 @@ void QgsShadowEffect::readProperties( const QgsStringMap &props )
{
mOffsetDist = distance;
}
- mOffsetUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "offset_unit" ) );
+ mOffsetUnit = QgsUnitTypes::decodeRenderUnit( props.value( "offset_unit" ) );
mOffsetMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "offset_unit_scale" ) );
if ( props.contains( "color" ) )
{
diff --git a/src/core/effects/qgsshadoweffect.h b/src/core/effects/qgsshadoweffect.h
index 65faae31b5c..5995fe96a82 100644
--- a/src/core/effects/qgsshadoweffect.h
+++ b/src/core/effects/qgsshadoweffect.h
@@ -90,7 +90,7 @@ class CORE_EXPORT QgsShadowEffect : public QgsPaintEffect
* @see setOffsetDistance
* @see setOffsetMapUnitScale
*/
- void setOffsetUnit( const QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
+ void setOffsetUnit( const QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
/** Returns the units used for the shadow offset distance.
* @returns units for offset distance
@@ -98,7 +98,7 @@ class CORE_EXPORT QgsShadowEffect : public QgsPaintEffect
* @see offsetDistance
* @see offsetMapUnitScale
*/
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
/** Sets the map unit scale used for the shadow offset distance.
* @param scale map unit scale for offset distance
@@ -171,7 +171,7 @@ class CORE_EXPORT QgsShadowEffect : public QgsPaintEffect
int mBlurLevel;
int mOffsetAngle;
double mOffsetDist;
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
QgsMapUnitScale mOffsetMapUnitScale;
double mTransparency;
QColor mColor;
diff --git a/src/core/effects/qgstransformeffect.cpp b/src/core/effects/qgstransformeffect.cpp
index 2decba9b7b4..5b28eb171ac 100644
--- a/src/core/effects/qgstransformeffect.cpp
+++ b/src/core/effects/qgstransformeffect.cpp
@@ -32,7 +32,7 @@ QgsTransformEffect::QgsTransformEffect()
: QgsPaintEffect()
, mTranslateX( 0.0 )
, mTranslateY( 0.0 )
- , mTranslateUnit( QgsSymbolV2::MM )
+ , mTranslateUnit( QgsUnitTypes::RenderMillimeters )
, mScaleX( 1.0 )
, mScaleY( 1.0 )
, mRotation( 0.0 )
@@ -78,7 +78,7 @@ QgsStringMap QgsTransformEffect::properties() const
props.insert( "shear_y", QString::number( mShearY ) );
props.insert( "translate_x", QString::number( mTranslateX ) );
props.insert( "translate_y", QString::number( mTranslateY ) );
- props.insert( "translate_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mTranslateUnit ) );
+ props.insert( "translate_unit", QgsUnitTypes::encodeUnit( mTranslateUnit ) );
props.insert( "translate_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mTranslateMapUnitScale ) );
props.insert( "enabled", mEnabled ? "1" : "0" );
props.insert( "draw_mode", QString::number( int( mDrawMode ) ) );
@@ -96,7 +96,7 @@ void QgsTransformEffect::readProperties( const QgsStringMap &props )
mRotation = props.value( "rotation", "0.0" ).toDouble();
mTranslateX = props.value( "translate_x", "0.0" ).toDouble();
mTranslateY = props.value( "translate_y", "0.0" ).toDouble();
- mTranslateUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "translate_unit" ) );
+ mTranslateUnit = QgsUnitTypes::decodeRenderUnit( props.value( "translate_unit" ) );
mTranslateMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "translate_unit_scale" ) );
}
diff --git a/src/core/effects/qgstransformeffect.h b/src/core/effects/qgstransformeffect.h
index ea1d1f75125..b0866019fd2 100644
--- a/src/core/effects/qgstransformeffect.h
+++ b/src/core/effects/qgstransformeffect.h
@@ -20,7 +20,6 @@
#include "qgspainteffect.h"
#include "qgis.h"
#include "qgsmapunitscale.h"
-#include "qgssymbolv2.h"
#include
/** \ingroup core
@@ -93,7 +92,7 @@ class CORE_EXPORT QgsTransformEffect : public QgsPaintEffect
* @see setTranslateY
* @see setTranslateMapUnitScale
*/
- void setTranslateUnit( const QgsSymbolV2::OutputUnit unit ) { mTranslateUnit = unit; }
+ void setTranslateUnit( const QgsUnitTypes::RenderUnit unit ) { mTranslateUnit = unit; }
/** Returns the units used for the transform translation.
* @returns units for translation
@@ -102,7 +101,7 @@ class CORE_EXPORT QgsTransformEffect : public QgsPaintEffect
* @see translateY
* @see translateMapUnitScale
*/
- QgsSymbolV2::OutputUnit translateUnit() const { return mTranslateUnit; }
+ QgsUnitTypes::RenderUnit translateUnit() const { return mTranslateUnit; }
/** Sets the map unit scale used for the transform translation.
* @param scale map unit scale for translation
@@ -226,7 +225,7 @@ class CORE_EXPORT QgsTransformEffect : public QgsPaintEffect
double mTranslateX;
double mTranslateY;
- QgsSymbolV2::OutputUnit mTranslateUnit;
+ QgsUnitTypes::RenderUnit mTranslateUnit;
QgsMapUnitScale mTranslateMapUnitScale;
double mScaleX;
double mScaleY;
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
index c5693fc9baf..1e8e6935a57 100644
--- a/src/core/layertree/qgslayertreemodellegendnode.cpp
+++ b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -140,7 +140,7 @@ QgsSymbolV2LegendNode::QgsSymbolV2LegendNode( QgsLayerTreeLayer* nodeLayer, cons
updateLabel();
if ( mItem.symbol() )
- mSymbolUsesMapUnits = ( mItem.symbol()->outputUnit() != QgsSymbolV2::MM );
+ mSymbolUsesMapUnits = ( mItem.symbol()->outputUnit() != QgsUnitTypes::RenderMillimeters );
}
QgsSymbolV2LegendNode::~QgsSymbolV2LegendNode()
diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
index b37f0a90fa1..867c8f7f49e 100644
--- a/src/core/qgis.cpp
+++ b/src/core/qgis.cpp
@@ -28,7 +28,6 @@
#include "qgsconfig.h"
#include "qgslogger.h"
#include "geometry/qgswkbtypes.h"
-#include "qgsunittypes.h"
#include
@@ -88,20 +87,6 @@ double Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM = 1.0;
double Qgis::SCALE_PRECISION = 0.9999999999;
-// description strings for units
-// Order must match enum indices
-const char* Qgis::qgisUnitTypes[] =
-{
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "meters" ),
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "feet" ),
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "degrees" ),
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "" ),
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "degrees" ),
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "degrees" ),
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "degrees" ),
- QT_TRANSLATE_NOOP( "Qgis::UnitType", "nautical miles" )
-};
-
QgsWKBTypes::Type Qgis::fromOldWkbType( Qgis::WkbType type )
{
switch ( type )
@@ -186,36 +171,6 @@ Qgis::WkbType Qgis::fromNewWkbType( QgsWKBTypes::Type type )
return static_cast< Qgis::WkbType >( type );
}
-
-Qgis::UnitType Qgis::fromLiteral( const QString& literal, Qgis::UnitType defaultType )
-{
- bool ok = false;
- Qgis::UnitType unit = QgsUnitTypes::decodeDistanceUnit( literal, &ok );
- return ok ? unit : defaultType;
-}
-
-QString Qgis::toLiteral( Qgis::UnitType unit )
-{
- return QgsUnitTypes::encodeUnit( unit );
-}
-
-QString Qgis::tr( Qgis::UnitType unit )
-{
- return QgsUnitTypes::toString( unit );
-}
-
-Qgis::UnitType Qgis::fromTr( const QString& literal, Qgis::UnitType defaultType )
-{
- bool ok = false;
- Qgis::UnitType unit = QgsUnitTypes::stringToDistanceUnit( literal, &ok );
- return ok ? unit : defaultType;
-}
-
-double Qgis::fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit )
-{
- return QgsUnitTypes::fromUnitToUnitFactor( fromUnit, toUnit );
-}
-
double qgsPermissiveToDouble( QString string, bool &ok )
{
//remove any thousands separators
diff --git a/src/core/qgis.h b/src/core/qgis.h
index a60126f8fa2..2ef8544d19b 100644
--- a/src/core/qgis.h
+++ b/src/core/qgis.h
@@ -150,50 +150,6 @@ class CORE_EXPORT Qgis
QImage::Format_ARGB32_Premultiplied */ ARGB32_Premultiplied = 13
};
-
- /** Map units that qgis supports
- * @note that QGIS < 1.4 api had only Meters, Feet, Degrees and UnknownUnit
- * @note and QGIS >1.8 returns to that
- */
- //TODO QGIS 3.0 - clean up and move to QgsUnitTypes and rename to DistanceUnit
- enum UnitType
- {
- Meters = 0, /*!< meters */
- Feet = 1, /*!< imperial feet */
- Degrees = 2, /*!< degrees, for planar geographic CRS distance measurements */ //for 1.0 api backwards compatibility
- NauticalMiles = 7, /*!< nautical miles */
- Kilometers = 8, /*!< kilometers */
- Yards = 9, /*!< imperial yards */
- Miles = 10, /*!< terrestial miles */
-
- UnknownUnit = 3, /*!< unknown distance unit */
-
- // for [1.4;1.8] api compatibility
- DecimalDegrees = 2, // was 2
- DegreesMinutesSeconds = 2, // was 4
- DegreesDecimalMinutes = 2, // was 5
- };
-
- //! Provides the canonical name of the type value
- //! @deprecated use QgsUnitTypes::encodeUnit() instead
- Q_DECL_DEPRECATED static QString toLiteral( Qgis::UnitType unit );
-
- //! Converts from the canonical name to the type value
- //! @deprecated use QgsUnitTypes::decodeDistanceUnit() instead
- Q_DECL_DEPRECATED static UnitType fromLiteral( const QString& literal, Qgis::UnitType defaultType = UnknownUnit );
-
- //! Provides translated version of the type value
- //! @deprecated use QgsUnitTypes::toString() instead
- Q_DECL_DEPRECATED static QString tr( Qgis::UnitType unit );
-
- //! Provides type value from translated version
- //! @deprecated use QgsUnitTypes::stringToDistanceUnit() instead
- Q_DECL_DEPRECATED static UnitType fromTr( const QString& literal, Qgis::UnitType defaultType = UnknownUnit );
-
- //! Returns the conversion factor between the specified units
- //! @deprecated use QgsUnitTyoes::fromUnitToUnitFactor() instead
- Q_DECL_DEPRECATED static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit );
-
//! User defined event types
enum UserEvent
{
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
index 9956833a100..971198e6365 100644
--- a/src/core/qgscoordinatereferencesystem.cpp
+++ b/src/core/qgscoordinatereferencesystem.cpp
@@ -1019,7 +1019,7 @@ bool QgsCoordinateReferenceSystem::isGeographic() const
return d->mIsGeographic;
}
-Qgis::UnitType QgsCoordinateReferenceSystem::mapUnits() const
+QgsUnitTypes::DistanceUnit QgsCoordinateReferenceSystem::mapUnits() const
{
return d->mMapUnits;
}
@@ -1105,7 +1105,7 @@ void QgsCoordinateReferenceSystem::setMapUnits()
d.detach();
if ( !d->mIsValid )
{
- d->mMapUnits = Qgis::UnknownUnit;
+ d->mMapUnits = QgsUnitTypes::DistanceUnknownUnit;
return;
}
@@ -1134,13 +1134,13 @@ void QgsCoordinateReferenceSystem::setMapUnits()
QgsDebugMsg( "Projection has linear units of " + unit );
if ( qgsDoubleNear( toMeter, 1.0 ) ) //Unit name for meters would be "metre"
- d->mMapUnits = Qgis::Meters;
+ d->mMapUnits = QgsUnitTypes::DistanceMeters;
else if ( unit == "Foot" )
- d->mMapUnits = Qgis::Feet;
+ d->mMapUnits = QgsUnitTypes::DistanceFeet;
else
{
QgsDebugMsg( "Unsupported map units of " + unit );
- d->mMapUnits = Qgis::UnknownUnit;
+ d->mMapUnits = QgsUnitTypes::DistanceUnknownUnit;
}
}
else
@@ -1148,11 +1148,11 @@ void QgsCoordinateReferenceSystem::setMapUnits()
OSRGetAngularUnits( d->mCRS, &unitName );
QString unit( unitName );
if ( unit == "degree" )
- d->mMapUnits = Qgis::Degrees;
+ d->mMapUnits = QgsUnitTypes::DistanceDegrees;
else
{
QgsDebugMsg( "Unsupported map units of " + unit );
- d->mMapUnits = Qgis::UnknownUnit;
+ d->mMapUnits = QgsUnitTypes::DistanceUnknownUnit;
}
QgsDebugMsgLevel( "Projection has angular units of " + unit, 3 );
}
@@ -1567,15 +1567,15 @@ void QgsCoordinateReferenceSystem::debugPrint()
QgsDebugMsg( "* Proj4 : " + toProj4() );
QgsDebugMsg( "* WKT : " + toWkt() );
QgsDebugMsg( "* Desc. : " + d->mDescription );
- if ( mapUnits() == Qgis::Meters )
+ if ( mapUnits() == QgsUnitTypes::DistanceMeters )
{
QgsDebugMsg( "* Units : meters" );
}
- else if ( mapUnits() == Qgis::Feet )
+ else if ( mapUnits() == QgsUnitTypes::DistanceFeet )
{
QgsDebugMsg( "* Units : feet" );
}
- else if ( mapUnits() == Qgis::Degrees )
+ else if ( mapUnits() == QgsUnitTypes::DistanceDegrees )
{
QgsDebugMsg( "* Units : degrees" );
}
diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
index f789b71f72d..28c67221779 100644
--- a/src/core/qgscoordinatereferencesystem.h
+++ b/src/core/qgscoordinatereferencesystem.h
@@ -36,6 +36,7 @@ typedef struct sqlite3 sqlite3;
//qgis includes
#include "qgis.h"
+#include "qgsunittypes.h"
#ifdef DEBUG
typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
@@ -530,8 +531,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
/** Returns the units for the projection used by the CRS.
*/
- Qgis::UnitType mapUnits() const;
-
+ QgsUnitTypes::DistanceUnit mapUnits() const;
// Mutators -----------------------------------
/** Set user hint for validation
diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h
index 8c0c86480c7..d3a32ac3637 100644
--- a/src/core/qgscoordinatereferencesystem_p.h
+++ b/src/core/qgscoordinatereferencesystem_p.h
@@ -45,7 +45,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
explicit QgsCoordinateReferenceSystemPrivate()
: mSrsId( 0 )
, mIsGeographic( false )
- , mMapUnits( Qgis::UnknownUnit )
+ , mMapUnits( QgsUnitTypes::DistanceUnknownUnit )
, mSRID( 0 )
, mIsValid( 0 )
, mCRS( OSRNewSpatialReference( nullptr ) )
@@ -99,7 +99,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
bool mIsGeographic;
//! The map units for the CRS
- Qgis::UnitType mMapUnits;
+ QgsUnitTypes::DistanceUnit mMapUnits;
//! If available, the Postgis spatial_ref_sys identifier for this CRS (defaults to 0)
long mSRID;
diff --git a/src/core/qgsdiagramrendererv2.cpp b/src/core/qgsdiagramrendererv2.cpp
index 241b943cdd7..a99f3031ed4 100644
--- a/src/core/qgsdiagramrendererv2.cpp
+++ b/src/core/qgsdiagramrendererv2.cpp
@@ -21,7 +21,6 @@
#include "qgslayertreemodellegendnode.h"
#include "qgsfontutils.h"
#include "qgssymbollayerv2utils.h"
-#include "qgssymbolv2.h"
#include
#include
@@ -193,16 +192,16 @@ void QgsDiagramSettings::readXml( const QDomElement& elem, const QgsVectorLayer*
if ( elem.attribute( "sizeType" ) == "MapUnits" )
{
//compatibility with pre-2.16 project files
- sizeType = QgsSymbolV2::MapUnit;
+ sizeType = QgsUnitTypes::RenderMapUnits;
}
else
{
- sizeType = QgsSymbolLayerV2Utils::decodeOutputUnit( elem.attribute( "sizeType" ) );
+ sizeType = QgsUnitTypes::decodeRenderUnit( elem.attribute( "sizeType" ) );
}
sizeScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( elem.attribute( "sizeScale" ) );
//line width unit type and scale
- lineSizeUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( elem.attribute( "lineSizeType" ) );
+ lineSizeUnit = QgsUnitTypes::decodeRenderUnit( elem.attribute( "lineSizeType" ) );
lineSizeScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( elem.attribute( "lineSizeScale" ) );
//label placement method
@@ -314,11 +313,11 @@ void QgsDiagramSettings::writeXml( QDomElement& rendererElem, QDomDocument& doc,
categoryElem.setAttribute( "transparency", QString::number( transparency ) );
//diagram size unit type and scale
- categoryElem.setAttribute( "sizeType", QgsSymbolLayerV2Utils::encodeOutputUnit( sizeType ) );
+ categoryElem.setAttribute( "sizeType", QgsUnitTypes::encodeUnit( sizeType ) );
categoryElem.setAttribute( "sizeScale", QgsSymbolLayerV2Utils::encodeMapUnitScale( sizeScale ) );
//line width unit type and scale
- categoryElem.setAttribute( "lineSizeType", QgsSymbolLayerV2Utils::encodeOutputUnit( lineSizeUnit ) );
+ categoryElem.setAttribute( "lineSizeType", QgsUnitTypes::encodeUnit( lineSizeUnit ) );
categoryElem.setAttribute( "lineSizeScale", QgsSymbolLayerV2Utils::encodeMapUnitScale( lineSizeScale ) );
// label placement method (text diagram)
diff --git a/src/core/qgsdiagramrendererv2.h b/src/core/qgsdiagramrendererv2.h
index 8281e47491c..f18c52d7ae7 100644
--- a/src/core/qgsdiagramrendererv2.h
+++ b/src/core/qgsdiagramrendererv2.h
@@ -297,7 +297,7 @@ class CORE_EXPORT QgsDiagramSettings
{
public:
- //! @deprecated use QgsSymbolV2::OutputUnit instead
+ //! @deprecated use QgsUnitTypes::RenderUnit instead
enum SizeType
{
MM,
@@ -321,8 +321,8 @@ class CORE_EXPORT QgsDiagramSettings
QgsDiagramSettings()
: enabled( true )
- , sizeType( QgsSymbolV2::MM )
- , lineSizeUnit( QgsSymbolV2::MM )
+ , sizeType( QgsUnitTypes::RenderMillimeters )
+ , lineSizeUnit( QgsUnitTypes::RenderMillimeters )
, penWidth( 0.0 )
, labelPlacementMethod( QgsDiagramSettings::Height )
, diagramOrientation( QgsDiagramSettings::Up )
@@ -345,7 +345,7 @@ class CORE_EXPORT QgsDiagramSettings
/** Diagram size unit
*/
- QgsSymbolV2::OutputUnit sizeType;
+ QgsUnitTypes::RenderUnit sizeType;
/** Diagram size unit scale
* @note added in 2.16
@@ -355,7 +355,7 @@ class CORE_EXPORT QgsDiagramSettings
/** Line unit index
* @note added in 2.16
*/
- QgsSymbolV2::OutputUnit lineSizeUnit;
+ QgsUnitTypes::RenderUnit lineSizeUnit;
/** Line unit scale
* @note added in 2.16
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
index 8cedf6507c4..032ccded8b3 100644
--- a/src/core/qgsdistancearea.cpp
+++ b/src/core/qgsdistancearea.cpp
@@ -486,11 +486,11 @@ double QgsDistanceArea::measureLine( const QList &points ) const
double QgsDistanceArea::measureLine( const QgsPoint &p1, const QgsPoint &p2 ) const
{
- Qgis::UnitType units;
+ QgsUnitTypes::DistanceUnit units;
return measureLine( p1, p2, units );
}
-double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, Qgis::UnitType& units ) const
+double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QgsUnitTypes::DistanceUnit& units ) const
{
double result;
units = mCoordTransform.sourceCrs().mapUnits();
@@ -502,7 +502,7 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, Qgi
QgsDebugMsgLevel( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ), p2.toString( 4 ) ), 3 );
if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
{
- units = Qgis::Meters;
+ units = QgsUnitTypes::DistanceMeters;
QgsDebugMsgLevel( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ), 4 );
QgsDebugMsgLevel( QString( "From proj4 : %1" ).arg( mCoordTransform.sourceCrs().toProj4() ), 4 );
QgsDebugMsgLevel( QString( "To proj4 : %1" ).arg( mCoordTransform.destinationCrs().toProj4() ), 4 );
@@ -527,14 +527,14 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, Qgi
return result;
}
-Qgis::UnitType QgsDistanceArea::lengthUnits() const
+QgsUnitTypes::DistanceUnit QgsDistanceArea::lengthUnits() const
{
- return willUseEllipsoid() ? Qgis::Meters : mCoordTransform.sourceCrs().mapUnits();
+ return willUseEllipsoid() ? QgsUnitTypes::DistanceMeters : mCoordTransform.sourceCrs().mapUnits();
}
QgsUnitTypes::AreaUnit QgsDistanceArea::areaUnits() const
{
- return willUseEllipsoid() ? QgsUnitTypes::SquareMeters :
+ return willUseEllipsoid() ? QgsUnitTypes::AreaSquareMeters :
QgsUnitTypes::distanceToAreaUnit( mCoordTransform.sourceCrs().mapUnits() );
}
@@ -966,13 +966,13 @@ double QgsDistanceArea::computePolygonFlatArea( const QList& points )
return qAbs( area ); // All areas are positive!
}
-QString QgsDistanceArea::textUnit( double value, int decimals, Qgis::UnitType u, bool isArea, bool keepBaseUnit )
+QString QgsDistanceArea::textUnit( double value, int decimals, QgsUnitTypes::DistanceUnit u, bool isArea, bool keepBaseUnit )
{
QString unitLabel;
switch ( u )
{
- case Qgis::Meters:
+ case QgsUnitTypes::DistanceMeters:
if ( isArea )
{
if ( keepBaseUnit )
@@ -1021,7 +1021,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, Qgis::UnitType u,
}
}
break;
- case Qgis::Feet:
+ case QgsUnitTypes::DistanceFeet:
if ( isArea )
{
if ( keepBaseUnit || qAbs( value ) <= 0.5*43560.0 )
@@ -1062,7 +1062,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, Qgis::UnitType u,
}
}
break;
- case Qgis::NauticalMiles:
+ case QgsUnitTypes::DistanceNauticalMiles:
if ( isArea )
{
unitLabel = QObject::tr( " sq. NM" );
@@ -1072,7 +1072,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, Qgis::UnitType u,
unitLabel = QObject::tr( " NM" );
}
break;
- case Qgis::Degrees:
+ case QgsUnitTypes::DistanceDegrees:
if ( isArea )
{
unitLabel = QObject::tr( " sq.deg." );
@@ -1085,7 +1085,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, Qgis::UnitType u,
unitLabel = QObject::tr( " degrees" );
}
break;
- case Qgis::UnknownUnit:
+ case QgsUnitTypes::DistanceUnknownUnit:
unitLabel.clear();
break;
default:
@@ -1096,13 +1096,13 @@ QString QgsDistanceArea::textUnit( double value, int decimals, Qgis::UnitType u,
return QString( "%L1%2" ).arg( value, 0, 'f', decimals ).arg( unitLabel );
}
-QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::UnitType unit, bool keepBaseUnit )
+QString QgsDistanceArea::formatDistance( double distance, int decimals, QgsUnitTypes::DistanceUnit unit, bool keepBaseUnit )
{
QString unitLabel;
switch ( unit )
{
- case Qgis::Meters:
+ case QgsUnitTypes::DistanceMeters:
if ( keepBaseUnit || qAbs( distance ) == 0.0 )
{
unitLabel = QObject::tr( " m" );
@@ -1128,7 +1128,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::Un
}
break;
- case Qgis::Kilometers:
+ case QgsUnitTypes::DistanceKilometers:
if ( keepBaseUnit || qAbs( distance ) >= 1.0 )
{
unitLabel = QObject::tr( " km" );
@@ -1140,7 +1140,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::Un
}
break;
- case Qgis::Feet:
+ case QgsUnitTypes::DistanceFeet:
if ( qAbs( distance ) <= 5280.0 || keepBaseUnit )
{
unitLabel = QObject::tr( " ft" );
@@ -1152,7 +1152,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::Un
}
break;
- case Qgis::Yards:
+ case QgsUnitTypes::DistanceYards:
if ( qAbs( distance ) <= 1760.0 || keepBaseUnit )
{
unitLabel = QObject::tr( " yd" );
@@ -1164,7 +1164,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::Un
}
break;
- case Qgis::Miles:
+ case QgsUnitTypes::DistanceMiles:
if ( qAbs( distance ) >= 1.0 || keepBaseUnit )
{
unitLabel = QObject::tr( " mi" );
@@ -1176,11 +1176,11 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::Un
}
break;
- case Qgis::NauticalMiles:
+ case QgsUnitTypes::DistanceNauticalMiles:
unitLabel = QObject::tr( " NM" );
break;
- case Qgis::Degrees:
+ case QgsUnitTypes::DistanceDegrees:
if ( qAbs( distance ) == 1.0 )
unitLabel = QObject::tr( " degree" );
@@ -1188,7 +1188,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::Un
unitLabel = QObject::tr( " degrees" );
break;
- case Qgis::UnknownUnit:
+ case QgsUnitTypes::DistanceUnknownUnit:
unitLabel.clear();
break;
default:
@@ -1205,21 +1205,21 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
switch ( unit )
{
- case QgsUnitTypes::SquareMeters:
+ case QgsUnitTypes::AreaSquareMeters:
{
if ( keepBaseUnit )
{
unitLabel = QObject::trUtf8( " m²" );
}
- else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareKilometers, QgsUnitTypes::SquareMeters ) )
+ else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareKilometers, QgsUnitTypes::AreaSquareMeters ) )
{
unitLabel = QObject::trUtf8( " km²" );
- area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareMeters, QgsUnitTypes::SquareKilometers );
+ area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareMeters, QgsUnitTypes::AreaSquareKilometers );
}
- else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::Hectares, QgsUnitTypes::SquareMeters ) )
+ else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaHectares, QgsUnitTypes::AreaSquareMeters ) )
{
unitLabel = QObject::tr( " ha" );
- area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareMeters, QgsUnitTypes::Hectares );
+ area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareMeters, QgsUnitTypes::AreaHectares );
}
else
{
@@ -1228,22 +1228,22 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
break;
}
- case QgsUnitTypes::SquareKilometers:
+ case QgsUnitTypes::AreaSquareKilometers:
{
unitLabel = QObject::trUtf8( " km²" );
break;
}
- case QgsUnitTypes::SquareFeet:
+ case QgsUnitTypes::AreaSquareFeet:
{
if ( keepBaseUnit )
{
unitLabel = QObject::trUtf8( " ft²" );
}
- else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareMiles, QgsUnitTypes::SquareFeet ) )
+ else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareMiles, QgsUnitTypes::AreaSquareFeet ) )
{
unitLabel = QObject::trUtf8( " mi²" );
- area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareFeet, QgsUnitTypes::SquareMiles );
+ area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareFeet, QgsUnitTypes::AreaSquareMiles );
}
else
{
@@ -1252,16 +1252,16 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
break;
}
- case QgsUnitTypes::SquareYards:
+ case QgsUnitTypes::AreaSquareYards:
{
if ( keepBaseUnit )
{
unitLabel = QObject::trUtf8( " yd²" );
}
- else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareMiles, QgsUnitTypes::SquareYards ) )
+ else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareMiles, QgsUnitTypes::AreaSquareYards ) )
{
unitLabel = QObject::trUtf8( " mi²" );
- area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareYards, QgsUnitTypes::SquareMiles );
+ area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareYards, QgsUnitTypes::AreaSquareMiles );
}
else
{
@@ -1270,22 +1270,22 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
break;
}
- case QgsUnitTypes::SquareMiles:
+ case QgsUnitTypes::AreaSquareMiles:
{
unitLabel = QObject::trUtf8( " mi²" );
break;
}
- case QgsUnitTypes::Hectares:
+ case QgsUnitTypes::AreaHectares:
{
if ( keepBaseUnit )
{
unitLabel = QObject::trUtf8( " ha" );
}
- else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareKilometers, QgsUnitTypes::Hectares ) )
+ else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareKilometers, QgsUnitTypes::AreaHectares ) )
{
unitLabel = QObject::trUtf8( " km²" );
- area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::Hectares, QgsUnitTypes::SquareKilometers );
+ area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaHectares, QgsUnitTypes::AreaSquareKilometers );
}
else
{
@@ -1294,16 +1294,16 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
break;
}
- case QgsUnitTypes::Acres:
+ case QgsUnitTypes::AreaAcres:
{
if ( keepBaseUnit )
{
unitLabel = QObject::trUtf8( " ac" );
}
- else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::SquareMiles, QgsUnitTypes::Acres ) )
+ else if ( qAbs( area ) > QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaSquareMiles, QgsUnitTypes::AreaAcres ) )
{
unitLabel = QObject::trUtf8( " mi²" );
- area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::Acres, QgsUnitTypes::SquareMiles );
+ area = area * QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaAcres, QgsUnitTypes::AreaSquareMiles );
}
else
{
@@ -1312,19 +1312,19 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
break;
}
- case QgsUnitTypes::SquareNauticalMiles:
+ case QgsUnitTypes::AreaSquareNauticalMiles:
{
unitLabel = QObject::trUtf8( " nm²" );
break;
}
- case QgsUnitTypes::SquareDegrees:
+ case QgsUnitTypes::AreaSquareDegrees:
{
unitLabel = QObject::tr( " sq.deg." );
break;
}
- case QgsUnitTypes::UnknownAreaUnit:
+ case QgsUnitTypes::AreaUnknownUnit:
{
unitLabel.clear();
break;
@@ -1334,17 +1334,17 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
return QString( "%L1%2" ).arg( area, 0, 'f', decimals ).arg( unitLabel );
}
-void QgsDistanceArea::convertMeasurement( double &measure, Qgis::UnitType &measureUnits, Qgis::UnitType displayUnits, bool isArea ) const
+void QgsDistanceArea::convertMeasurement( double &measure, QgsUnitTypes::DistanceUnit &measureUnits, QgsUnitTypes::DistanceUnit displayUnits, bool isArea ) const
{
// Helper for converting between meters and feet and degrees and NauticalMiles...
// The parameters measure and measureUnits are in/out
- if (( measureUnits == Qgis::Degrees || measureUnits == Qgis::Feet || measureUnits == Qgis::NauticalMiles ) &&
+ if (( measureUnits == QgsUnitTypes::DistanceDegrees || measureUnits == QgsUnitTypes::DistanceFeet || measureUnits == QgsUnitTypes::DistanceNauticalMiles ) &&
mEllipsoid != GEO_NONE &&
mEllipsoidalMode )
{
// Measuring on an ellipsoid returned meters. Force!
- measureUnits = Qgis::Meters;
+ measureUnits = QgsUnitTypes::DistanceMeters;
QgsDebugMsg( "We're measuring on an ellipsoid or using projections, the system is returning meters" );
}
else if ( mEllipsoidalMode && mEllipsoid == GEO_NONE )
@@ -1365,10 +1365,10 @@ void QgsDistanceArea::convertMeasurement( double &measure, Qgis::UnitType &measu
measureUnits = displayUnits;
}
-double QgsDistanceArea::convertLengthMeasurement( double length, Qgis::UnitType toUnits ) const
+double QgsDistanceArea::convertLengthMeasurement( double length, QgsUnitTypes::DistanceUnit toUnits ) const
{
// get the conversion factor between the specified units
- Qgis::UnitType measureUnits = lengthUnits();
+ QgsUnitTypes::DistanceUnit measureUnits = lengthUnits();
double factorUnits = QgsUnitTypes::fromUnitToUnitFactor( measureUnits, toUnits );
double result = length * factorUnits;
diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h
index 4e2d5104338..54b0eaf9b9a 100644
--- a/src/core/qgsdistancearea.h
+++ b/src/core/qgsdistancearea.h
@@ -193,13 +193,13 @@ class CORE_EXPORT QgsDistanceArea
* @returns calculated distance between points. Distance units are stored in units parameter.
* @note added in QGIS 2.12
*/
- double measureLine( const QgsPoint& p1, const QgsPoint& p2, Qgis::UnitType& units ) const;
+ double measureLine( const QgsPoint& p1, const QgsPoint& p2, QgsUnitTypes::DistanceUnit& units ) const;
/** Returns the units of distance for length calculations made by this object.
* @note added in QGIS 2.14
* @see areaUnits()
*/
- Qgis::UnitType lengthUnits() const;
+ QgsUnitTypes::DistanceUnit lengthUnits() const;
/** Returns the units of area for areal calculations made by this object.
* @note added in QGIS 2.14
@@ -223,7 +223,7 @@ class CORE_EXPORT QgsDistanceArea
* @return formatted measurement string
* @deprecated use formatDistance() or formatArea() instead
*/
- Q_DECL_DEPRECATED static QString textUnit( double value, int decimals, Qgis::UnitType u, bool isArea, bool keepBaseUnit = false );
+ Q_DECL_DEPRECATED static QString textUnit( double value, int decimals, QgsUnitTypes::DistanceUnit u, bool isArea, bool keepBaseUnit = false );
/** Returns an distance formatted as a friendly string.
* @param distance distance to format
@@ -235,7 +235,7 @@ class CORE_EXPORT QgsDistanceArea
* @note added in QGIS 2.16
* @see formatArea()
*/
- static QString formatDistance( double distance, int decimals, Qgis::UnitType unit, bool keepBaseUnit = false );
+ static QString formatDistance( double distance, int decimals, QgsUnitTypes::DistanceUnit unit, bool keepBaseUnit = false );
/** Returns an area formatted as a friendly string.
* @param area area to format
@@ -251,7 +251,7 @@ class CORE_EXPORT QgsDistanceArea
//! Helper for conversion between physical units
// TODO QGIS 3.0 - remove this method, as its behaviour is non-intuitive.
- void convertMeasurement( double &measure, Qgis::UnitType &measureUnits, Qgis::UnitType displayUnits, bool isArea ) const;
+ void convertMeasurement( double &measure, QgsUnitTypes::DistanceUnit &measureUnits, QgsUnitTypes::DistanceUnit displayUnits, bool isArea ) const;
/** Takes a length measurement calculated by this QgsDistanceArea object and converts it to a
* different distance unit.
@@ -262,7 +262,7 @@ class CORE_EXPORT QgsDistanceArea
* @see convertAreaMeasurement()
* @note added in QGIS 2.14
*/
- double convertLengthMeasurement( double length, Qgis::UnitType toUnits ) const;
+ double convertLengthMeasurement( double length, QgsUnitTypes::DistanceUnit toUnits ) const;
/** Takes an area measurement calculated by this QgsDistanceArea object and converts it to a
* different areal unit.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
index cb23c20a000..5a684feb63e 100644
--- a/src/core/qgsexpression.cpp
+++ b/src/core/qgsexpression.cpp
@@ -3796,12 +3796,12 @@ QgsDistanceArea* QgsExpression::geomCalculator()
return d->mCalc.data();
}
-Qgis::UnitType QgsExpression::distanceUnits() const
+QgsUnitTypes::DistanceUnit QgsExpression::distanceUnits() const
{
return d->mDistanceUnit;
}
-void QgsExpression::setDistanceUnits( Qgis::UnitType unit )
+void QgsExpression::setDistanceUnits( QgsUnitTypes::DistanceUnit unit )
{
d->mDistanceUnit = unit;
}
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
index d35ff03d756..6f696331d8f 100644
--- a/src/core/qgsexpression.h
+++ b/src/core/qgsexpression.h
@@ -289,7 +289,7 @@ class CORE_EXPORT QgsExpression
* @see setDistanceUnits()
* @see areaUnits()
*/
- Qgis::UnitType distanceUnits() const;
+ QgsUnitTypes::DistanceUnit distanceUnits() const;
/** Sets the desired distance units for calculations involving geomCalculator(), eg "$length" and "$perimeter".
* @note distances are only converted when a geomCalculator() has been set
@@ -297,7 +297,7 @@ class CORE_EXPORT QgsExpression
* @see distanceUnits()
* @see setAreaUnits()
*/
- void setDistanceUnits( Qgis::UnitType unit );
+ void setDistanceUnits( QgsUnitTypes::DistanceUnit unit );
/** Returns the desired areal units for calculations involving geomCalculator(), eg "$area".
* @note areas are only converted when a geomCalculator() has been set
diff --git a/src/core/qgsexpressionprivate.h b/src/core/qgsexpressionprivate.h
index c02a2ab18b4..21b9c19fe97 100644
--- a/src/core/qgsexpressionprivate.h
+++ b/src/core/qgsexpressionprivate.h
@@ -39,8 +39,8 @@ class QgsExpressionPrivate
, mRowNumber( 0 )
, mScale( 0 )
, mCalc( nullptr )
- , mDistanceUnit( Qgis::UnknownUnit )
- , mAreaUnit( QgsUnitTypes::UnknownAreaUnit )
+ , mDistanceUnit( QgsUnitTypes::DistanceUnknownUnit )
+ , mAreaUnit( QgsUnitTypes::AreaUnknownUnit )
{}
QgsExpressionPrivate( const QgsExpressionPrivate& other )
@@ -73,7 +73,7 @@ class QgsExpressionPrivate
QString mExp;
QSharedPointer mCalc;
- Qgis::UnitType mDistanceUnit;
+ QgsUnitTypes::DistanceUnit mDistanceUnit;
QgsUnitTypes::AreaUnit mAreaUnit;
};
///@endcond
diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
index e0621844745..9ef460cb72d 100644
--- a/src/core/qgsmapsettings.cpp
+++ b/src/core/qgsmapsettings.cpp
@@ -53,7 +53,7 @@ QgsMapSettings::QgsMapSettings()
updateDerived();
// set default map units - we use WGS 84 thus use degrees
- setMapUnits( Qgis::Degrees );
+ setMapUnits( QgsUnitTypes::DistanceDegrees );
}
void QgsMapSettings::setMagnificationFactor( double factor )
@@ -297,7 +297,7 @@ QgsCoordinateReferenceSystem QgsMapSettings::destinationCrs() const
}
-void QgsMapSettings::setMapUnits( Qgis::UnitType u )
+void QgsMapSettings::setMapUnits( QgsUnitTypes::DistanceUnit u )
{
mScaleCalculator.setMapUnits( u );
@@ -328,7 +328,7 @@ bool QgsMapSettings::testFlag( QgsMapSettings::Flag flag ) const
return mFlags.testFlag( flag );
}
-Qgis::UnitType QgsMapSettings::mapUnits() const
+QgsUnitTypes::DistanceUnit QgsMapSettings::mapUnits() const
{
return mScaleCalculator.mapUnits();
}
@@ -608,7 +608,7 @@ void QgsMapSettings::readXml( QDomNode& theNode )
{
// set units
QDomNode mapUnitsNode = theNode.namedItem( "units" );
- Qgis::UnitType units = QgsXmlUtils::readMapUnits( mapUnitsNode.toElement() );
+ QgsUnitTypes::DistanceUnit units = QgsXmlUtils::readMapUnits( mapUnitsNode.toElement() );
setMapUnits( units );
// set projections flag
diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h
index 579b6211a3e..26e11c249e5 100644
--- a/src/core/qgsmapsettings.h
+++ b/src/core/qgsmapsettings.h
@@ -139,9 +139,9 @@ class CORE_EXPORT QgsMapSettings
QgsCoordinateReferenceSystem destinationCrs() const;
//! Get units of map's geographical coordinates - used for scale calculation
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
//! Set units of map's geographical coordinates - used for scale calculation
- void setMapUnits( Qgis::UnitType u );
+ void setMapUnits( QgsUnitTypes::DistanceUnit u );
//! Set the background color of the map
void setBackgroundColor( const QColor& color ) { mBackgroundColor = color; }
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
index fbb547a5375..26399b72f72 100644
--- a/src/core/qgspallabeling.cpp
+++ b/src/core/qgspallabeling.cpp
@@ -57,7 +57,6 @@
#include
#include
#include
-#include "qgssymbolv2.h"
#include "qgssymbollayerv2utils.h"
#include "qgsmaptopixelgeometrysimplifier.h"
#include
@@ -4811,15 +4810,15 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context,
QgsStringMap map; // for SVG symbology marker
map["name"] = QgsSymbolLayerV2Utils::symbolNameToPath( tmpLyr.shapeSVGFile.trimmed() );
map["size"] = QString::number( sizeOut );
- map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit(
- tmpLyr.shapeSizeUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ map["size_unit"] = QgsUnitTypes::encodeUnit(
+ tmpLyr.shapeSizeUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
map["angle"] = QString::number( 0.0 ); // angle is handled by this local painter
// offset is handled by this local painter
// TODO: see why the marker renderer doesn't seem to translate offset *after* applying rotation
//map["offset"] = QgsSymbolLayerV2Utils::encodePoint( tmpLyr.shapeOffset );
//map["offset_unit"] = QgsUnitTypes::encodeUnit(
- // tmpLyr.shapeOffsetUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ // tmpLyr.shapeOffsetUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::MapUnit : QgsUnitTypes::MM );
map["fill"] = tmpLyr.shapeFillColor.name();
map["outline"] = tmpLyr.shapeBorderColor.name();
@@ -4828,7 +4827,7 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context,
// TODO: fix overriding SVG symbol's border width/units in QgsSvgCache
// currently broken, fall back to symbol's
//map["outline_width_unit"] = QgsUnitTypes::encodeUnit(
- // tmpLyr.shapeBorderWidthUnits == QgsPalLayerSettings::MapUnits ? QgsSymbolV2::MapUnit : QgsSymbolV2::MM );
+ // tmpLyr.shapeBorderWidthUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::MapUnit : QgsUnitTypes::MM );
if ( tmpLyr.shadowDraw && tmpLyr.shadowUnder == QgsPalLayerSettings::ShadowShape )
{
@@ -4856,7 +4855,7 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context,
QgsSymbolLayerV2* symShdwL = QgsSvgMarkerSymbolLayerV2::create( shdwmap );
QgsSvgMarkerSymbolLayerV2* svgShdwM = static_cast( symShdwL );
- QgsSymbolV2RenderContext svgShdwContext( shdwContext, QgsSymbolV2::Mixed,
+ QgsSymbolV2RenderContext svgShdwContext( shdwContext, QgsUnitTypes::RenderUnknownUnit,
( 100.0 - static_cast< double >( tmpLyr.shapeTransparency ) ) / 100.0 );
double svgSize = tmpLyr.scaleToPixelContext( sizeOut, context, tmpLyr.shapeSizeUnits, true, tmpLyr.shapeSizeMapUnitScale );
@@ -4891,7 +4890,7 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context,
// draw the actual symbol
QgsSymbolLayerV2* symL = QgsSvgMarkerSymbolLayerV2::create( map );
QgsSvgMarkerSymbolLayerV2* svgM = static_cast( symL );
- QgsSymbolV2RenderContext svgContext( context, QgsSymbolV2::Mixed,
+ QgsSymbolV2RenderContext svgContext( context, QgsUnitTypes::RenderUnknownUnit,
( 100.0 - static_cast< double >( tmpLyr.shapeTransparency ) ) / 100.0 );
p->save();
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
index a2c42ddafbf..529d1714719 100644
--- a/src/core/qgsproject.cpp
+++ b/src/core/qgsproject.cpp
@@ -2076,7 +2076,7 @@ bool QgsProject::topologicalEditing() const
return ( QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 ) > 0 );
}
-Qgis::UnitType QgsProject::distanceUnits() const
+QgsUnitTypes::DistanceUnit QgsProject::distanceUnits() const
{
QString distanceUnitString = QgsProject::instance()->readEntry( "Measurement", "/DistanceUnits", QString() );
if ( !distanceUnitString.isEmpty() )
@@ -2085,8 +2085,8 @@ Qgis::UnitType QgsProject::distanceUnits() const
//fallback to QGIS default measurement unit
QSettings s;
bool ok = false;
- Qgis::UnitType type = QgsUnitTypes::decodeDistanceUnit( s.value( "/qgis/measure/displayunits" ).toString(), &ok );
- return ok ? type : Qgis::Meters;
+ QgsUnitTypes::DistanceUnit type = QgsUnitTypes::decodeDistanceUnit( s.value( "/qgis/measure/displayunits" ).toString(), &ok );
+ return ok ? type : QgsUnitTypes::DistanceMeters;
}
QgsUnitTypes::AreaUnit QgsProject::areaUnits() const
@@ -2099,7 +2099,7 @@ QgsUnitTypes::AreaUnit QgsProject::areaUnits() const
QSettings s;
bool ok = false;
QgsUnitTypes::AreaUnit type = QgsUnitTypes::decodeAreaUnit( s.value( "/qgis/measure/areaunits" ).toString(), &ok );
- return ok ? type : QgsUnitTypes::SquareMeters;
+ return ok ? type : QgsUnitTypes::AreaSquareMeters;
}
void QgsProjectBadLayerDefaultHandler::handleBadLayers( const QList& /*layers*/, const QDomDocument& /*projectDom*/ )
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
index 371200c9813..756370a84cb 100644
--- a/src/core/qgsproject.h
+++ b/src/core/qgsproject.h
@@ -301,7 +301,7 @@ class CORE_EXPORT QgsProject : public QObject
* @note added in QGIS 2.14
* @see areaUnits()
*/
- Qgis::UnitType distanceUnits() const;
+ QgsUnitTypes::DistanceUnit distanceUnits() const;
/** Convenience function to query default area measurement units for project.
* @note added in QGIS 2.14
diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
index cb6c1ac3990..a1bc726806b 100644
--- a/src/core/qgsscalecalculator.cpp
+++ b/src/core/qgsscalecalculator.cpp
@@ -21,7 +21,7 @@
#include "qgsrectangle.h"
#include "qgsscalecalculator.h"
-QgsScaleCalculator::QgsScaleCalculator( double dpi, Qgis::UnitType mapUnits )
+QgsScaleCalculator::QgsScaleCalculator( double dpi, QgsUnitTypes::DistanceUnit mapUnits )
: mDpi( dpi )
, mMapUnits( mapUnits )
{}
@@ -35,13 +35,13 @@ double QgsScaleCalculator::dpi()
return mDpi;
}
-void QgsScaleCalculator::setMapUnits( Qgis::UnitType mapUnits )
+void QgsScaleCalculator::setMapUnits( QgsUnitTypes::DistanceUnit mapUnits )
{
QgsDebugMsgLevel( QString( "Map units set to %1" ).arg( QString::number( mapUnits ) ), 3 );
mMapUnits = mapUnits;
}
-Qgis::UnitType QgsScaleCalculator::mapUnits() const
+QgsUnitTypes::DistanceUnit QgsScaleCalculator::mapUnits() const
{
QgsDebugMsgLevel( QString( "Map units returned as %1" ).arg( QString::number( mMapUnits ) ), 4 );
return mMapUnits;
@@ -55,23 +55,23 @@ double QgsScaleCalculator::calculate( const QgsRectangle &mapExtent, int canvasW
// users display, and the canvas width
switch ( mMapUnits )
{
- case Qgis::Meters:
+ case QgsUnitTypes::DistanceMeters:
// convert meters to inches
conversionFactor = 39.3700787;
delta = mapExtent.xMaximum() - mapExtent.xMinimum();
break;
- case Qgis::Feet:
+ case QgsUnitTypes::DistanceFeet:
conversionFactor = 12.0;
delta = mapExtent.xMaximum() - mapExtent.xMinimum();
break;
- case Qgis::NauticalMiles:
+ case QgsUnitTypes::DistanceNauticalMiles:
// convert nautical miles to inches
conversionFactor = 72913.4;
delta = mapExtent.xMaximum() - mapExtent.xMinimum();
break;
default:
- case Qgis::Degrees:
+ case QgsUnitTypes::DistanceDegrees:
// degrees require conversion to meters first
conversionFactor = 39.3700787;
delta = calculateGeographicDistance( mapExtent );
diff --git a/src/core/qgsscalecalculator.h b/src/core/qgsscalecalculator.h
index e2791989f69..fd9ecb5aad8 100644
--- a/src/core/qgsscalecalculator.h
+++ b/src/core/qgsscalecalculator.h
@@ -20,6 +20,7 @@
#define QGSSCALECALCULATOR_H
#include
+#include "qgsunittypes.h"
class QString;
class QgsRectangle;
@@ -35,11 +36,10 @@ class CORE_EXPORT QgsScaleCalculator
/**
* Constructor
* @param dpi Monitor resolution in dots per inch
- * @param mapUnits Units of the data on the map. Must match a value from the
- * Qgis::UnitType enum (Meters, Feet, Degrees)
+ * @param mapUnits Units of the data on the map
*/
QgsScaleCalculator( double dpi = 0,
- Qgis::UnitType mapUnits = Qgis::Meters );
+ QgsUnitTypes::DistanceUnit mapUnits = QgsUnitTypes::DistanceMeters );
/**
* Set the dpi to be used in scale calculations
@@ -57,10 +57,10 @@ class CORE_EXPORT QgsScaleCalculator
* Set the map units
* @param mapUnits Units of the data on the map. Must match a value from the
*/
- void setMapUnits( Qgis::UnitType mapUnits );
+ void setMapUnits( QgsUnitTypes::DistanceUnit mapUnits );
/** Returns current map units */
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
/**
* Calculate the scale denominator
@@ -84,7 +84,7 @@ class CORE_EXPORT QgsScaleCalculator
double mDpi;
//! map unit member
- Qgis::UnitType mMapUnits;
+ QgsUnitTypes::DistanceUnit mMapUnits;
};
#endif // #ifndef QGSSCALECALCULATOR_H
diff --git a/src/core/qgsunittypes.cpp b/src/core/qgsunittypes.cpp
index 691e272490e..89e75f9771f 100644
--- a/src/core/qgsunittypes.cpp
+++ b/src/core/qgsunittypes.cpp
@@ -23,22 +23,22 @@
* See details in QEP #17
****************************************************************************/
-QgsUnitTypes::DistanceUnitType QgsUnitTypes::unitType( Qgis::UnitType unit )
+QgsUnitTypes::DistanceUnitType QgsUnitTypes::unitType( DistanceUnit unit )
{
switch ( unit )
{
- case Qgis::Meters:
- case Qgis::Feet:
- case Qgis::NauticalMiles:
- case Qgis::Yards:
- case Qgis::Miles:
- case Qgis::Kilometers:
+ case DistanceMeters:
+ case DistanceFeet:
+ case DistanceNauticalMiles:
+ case DistanceYards:
+ case DistanceMiles:
+ case DistanceKilometers:
return Standard;
- case Qgis::Degrees:
+ case DistanceDegrees:
return Geographic;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
return UnknownType;
}
return UnknownType;
@@ -48,52 +48,52 @@ QgsUnitTypes::DistanceUnitType QgsUnitTypes::unitType( QgsUnitTypes::AreaUnit un
{
switch ( unit )
{
- case SquareMeters:
- case SquareKilometers:
- case SquareFeet:
- case SquareYards:
- case SquareMiles:
- case Hectares:
- case Acres:
- case SquareNauticalMiles:
+ case AreaSquareMeters:
+ case AreaSquareKilometers:
+ case AreaSquareFeet:
+ case AreaSquareYards:
+ case AreaSquareMiles:
+ case AreaHectares:
+ case AreaAcres:
+ case AreaSquareNauticalMiles:
return Standard;
- case SquareDegrees:
+ case AreaSquareDegrees:
return Geographic;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
return UnknownType;
}
return UnknownType;
}
-QString QgsUnitTypes::encodeUnit( Qgis::UnitType unit )
+QString QgsUnitTypes::encodeUnit( DistanceUnit unit )
{
switch ( unit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return "meters";
- case Qgis::Kilometers:
+ case DistanceKilometers:
return "km";
- case Qgis::Feet:
+ case DistanceFeet:
return "feet";
- case Qgis::Yards:
+ case DistanceYards:
return "yd";
- case Qgis::Miles:
+ case DistanceMiles:
return "mi";
- case Qgis::Degrees:
+ case DistanceDegrees:
return "degrees";
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
return "";
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return "nautical miles";
}
return QString();
@@ -105,63 +105,63 @@ QString QgsUnitTypes::encodeUnit( Qgis::UnitType unit )
* See details in QEP #17
****************************************************************************/
-Qgis::UnitType QgsUnitTypes::decodeDistanceUnit( const QString& string, bool* ok )
+QgsUnitTypes::DistanceUnit QgsUnitTypes::decodeDistanceUnit( const QString& string, bool* ok )
{
QString normalized = string.trimmed().toLower();
if ( ok )
*ok = true;
- if ( normalized == encodeUnit( Qgis::Meters ) )
- return Qgis::Meters;
- if ( normalized == encodeUnit( Qgis::Feet ) )
- return Qgis::Feet;
- if ( normalized == encodeUnit( Qgis::Degrees ) )
- return Qgis::Degrees;
- if ( normalized == encodeUnit( Qgis::NauticalMiles ) )
- return Qgis::NauticalMiles;
- if ( normalized == encodeUnit( Qgis::Kilometers ) )
- return Qgis::Kilometers;
- if ( normalized == encodeUnit( Qgis::Yards ) )
- return Qgis::Yards;
- if ( normalized == encodeUnit( Qgis::Miles ) )
- return Qgis::Miles;
- if ( normalized == encodeUnit( Qgis::UnknownUnit ) )
- return Qgis::UnknownUnit;
+ if ( normalized == encodeUnit( DistanceMeters ) )
+ return DistanceMeters;
+ if ( normalized == encodeUnit( DistanceFeet ) )
+ return DistanceFeet;
+ if ( normalized == encodeUnit( DistanceDegrees ) )
+ return DistanceDegrees;
+ if ( normalized == encodeUnit( DistanceNauticalMiles ) )
+ return DistanceNauticalMiles;
+ if ( normalized == encodeUnit( DistanceKilometers ) )
+ return DistanceKilometers;
+ if ( normalized == encodeUnit( DistanceYards ) )
+ return DistanceYards;
+ if ( normalized == encodeUnit( DistanceMiles ) )
+ return DistanceMiles;
+ if ( normalized == encodeUnit( DistanceUnknownUnit ) )
+ return DistanceUnknownUnit;
if ( ok )
*ok = false;
- return Qgis::UnknownUnit;
+ return DistanceUnknownUnit;
}
-QString QgsUnitTypes::toString( Qgis::UnitType unit )
+QString QgsUnitTypes::toString( DistanceUnit unit )
{
switch ( unit )
{
- case Qgis::Meters:
- return QCoreApplication::translate( "Qgis::UnitType", "meters" );
+ case DistanceMeters:
+ return QCoreApplication::translate( "UnitType", "meters" );
- case Qgis::Kilometers:
- return QCoreApplication::translate( "Qgis::UnitType", "kilometers" );
+ case DistanceKilometers:
+ return QCoreApplication::translate( "UnitType", "kilometers" );
- case Qgis::Feet:
- return QCoreApplication::translate( "Qgis::UnitType", "feet" );
+ case DistanceFeet:
+ return QCoreApplication::translate( "UnitType", "feet" );
- case Qgis::Yards:
- return QCoreApplication::translate( "Qgis::UnitType", "yards" );
+ case DistanceYards:
+ return QCoreApplication::translate( "UnitType", "yards" );
- case Qgis::Miles:
- return QCoreApplication::translate( "Qgis::UnitType", "miles" );
+ case DistanceMiles:
+ return QCoreApplication::translate( "UnitType", "miles" );
- case Qgis::Degrees:
- return QCoreApplication::translate( "Qgis::UnitType", "degrees" );
+ case DistanceDegrees:
+ return QCoreApplication::translate( "UnitType", "degrees" );
- case Qgis::UnknownUnit:
- return QCoreApplication::translate( "Qgis::UnitType", "" );
+ case DistanceUnknownUnit:
+ return QCoreApplication::translate( "UnitType", "" );
- case Qgis::NauticalMiles:
- return QCoreApplication::translate( "Qgis::UnitType", "nautical miles" );
+ case DistanceNauticalMiles:
+ return QCoreApplication::translate( "UnitType", "nautical miles" );
}
return QString();
}
@@ -172,34 +172,34 @@ QString QgsUnitTypes::toString( Qgis::UnitType unit )
* See details in QEP #17
****************************************************************************/
-Qgis::UnitType QgsUnitTypes::stringToDistanceUnit( const QString& string, bool* ok )
+QgsUnitTypes::DistanceUnit QgsUnitTypes::stringToDistanceUnit( const QString& string, bool* ok )
{
QString normalized = string.trimmed().toLower();
if ( ok )
*ok = true;
- if ( normalized == toString( Qgis::Meters ) )
- return Qgis::Meters;
- if ( normalized == toString( Qgis::Kilometers ) )
- return Qgis::Kilometers;
- if ( normalized == toString( Qgis::Feet ) )
- return Qgis::Feet;
- if ( normalized == toString( Qgis::Yards ) )
- return Qgis::Yards;
- if ( normalized == toString( Qgis::Miles ) )
- return Qgis::Miles;
- if ( normalized == toString( Qgis::Degrees ) )
- return Qgis::Degrees;
- if ( normalized == toString( Qgis::NauticalMiles ) )
- return Qgis::NauticalMiles;
- if ( normalized == toString( Qgis::UnknownUnit ) )
- return Qgis::UnknownUnit;
+ if ( normalized == toString( DistanceMeters ) )
+ return DistanceMeters;
+ if ( normalized == toString( DistanceKilometers ) )
+ return DistanceKilometers;
+ if ( normalized == toString( DistanceFeet ) )
+ return DistanceFeet;
+ if ( normalized == toString( DistanceYards ) )
+ return DistanceYards;
+ if ( normalized == toString( DistanceMiles ) )
+ return DistanceMiles;
+ if ( normalized == toString( DistanceDegrees ) )
+ return DistanceDegrees;
+ if ( normalized == toString( DistanceNauticalMiles ) )
+ return DistanceNauticalMiles;
+ if ( normalized == toString( DistanceUnknownUnit ) )
+ return DistanceUnknownUnit;
if ( ok )
*ok = false;
- return Qgis::UnknownUnit;
+ return DistanceUnknownUnit;
}
/***************************************************************************
@@ -208,7 +208,7 @@ Qgis::UnitType QgsUnitTypes::stringToDistanceUnit( const QString& string, bool*
* See details in QEP #17
****************************************************************************/
-double QgsUnitTypes::fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit )
+double QgsUnitTypes::fromUnitToUnitFactor( DistanceUnit fromUnit, DistanceUnit toUnit )
{
#define DEGREE_TO_METER 111319.49079327358
#define FEET_TO_METER 0.3048
@@ -217,185 +217,179 @@ double QgsUnitTypes::fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitTy
#define YARDS_TO_METER 0.9144
#define YARDS_TO_FEET 3.0
#define MILES_TO_METER 1609.344
- // Unify degree units
- // remove for QGIS 3.0, as extra degree types will be removed
- if ( fromUnit == Qgis::DecimalDegrees || fromUnit == Qgis::DegreesMinutesSeconds || fromUnit == Qgis::DegreesDecimalMinutes )
- fromUnit = Qgis::Degrees;
- if ( toUnit == Qgis::DecimalDegrees || toUnit == Qgis::DegreesMinutesSeconds || toUnit == Qgis::DegreesDecimalMinutes )
- toUnit = Qgis::Degrees;
// Calculate the conversion factor between the specified units
switch ( fromUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
{
switch ( toUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return 1.0;
- case Qgis::Kilometers:
+ case DistanceKilometers:
return 1.0 / KILOMETERS_TO_METER;
- case Qgis::Feet:
+ case DistanceFeet:
return 1.0 / FEET_TO_METER;
- case Qgis::Yards:
+ case DistanceYards:
return 1.0 / YARDS_TO_METER;
- case Qgis::Miles:
+ case DistanceMiles:
return 1.0 / MILES_TO_METER;
- case Qgis::Degrees:
+ case DistanceDegrees:
return 1.0 / DEGREE_TO_METER;
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return 1.0 / NMILE_TO_METER;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
break;
}
- case Qgis::Kilometers:
+ case DistanceKilometers:
{
switch ( toUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return KILOMETERS_TO_METER;
- case Qgis::Kilometers:
+ case DistanceKilometers:
return 1.0;
- case Qgis::Feet:
+ case DistanceFeet:
return KILOMETERS_TO_METER / FEET_TO_METER;
- case Qgis::Yards:
+ case DistanceYards:
return KILOMETERS_TO_METER / YARDS_TO_METER;
- case Qgis::Miles:
+ case DistanceMiles:
return KILOMETERS_TO_METER / MILES_TO_METER;
- case Qgis::Degrees:
+ case DistanceDegrees:
return KILOMETERS_TO_METER / DEGREE_TO_METER;
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return KILOMETERS_TO_METER / NMILE_TO_METER;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
break;
}
- case Qgis::Feet:
+ case DistanceFeet:
{
switch ( toUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return FEET_TO_METER;
- case Qgis::Kilometers:
+ case DistanceKilometers:
return FEET_TO_METER / KILOMETERS_TO_METER;
- case Qgis::Feet:
+ case DistanceFeet:
return 1.0;
- case Qgis::Yards:
+ case DistanceYards:
return 1.0 / YARDS_TO_FEET;
- case Qgis::Miles:
+ case DistanceMiles:
return FEET_TO_METER / MILES_TO_METER;
- case Qgis::Degrees:
+ case DistanceDegrees:
return FEET_TO_METER / DEGREE_TO_METER;
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return FEET_TO_METER / NMILE_TO_METER;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
break;
}
- case Qgis::Yards:
+ case DistanceYards:
{
switch ( toUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return YARDS_TO_METER;
- case Qgis::Kilometers:
+ case DistanceKilometers:
return YARDS_TO_METER / KILOMETERS_TO_METER;
- case Qgis::Feet:
+ case DistanceFeet:
return YARDS_TO_FEET;
- case Qgis::Yards:
+ case DistanceYards:
return 1.0;
- case Qgis::Miles:
+ case DistanceMiles:
return YARDS_TO_METER / MILES_TO_METER;
- case Qgis::Degrees:
+ case DistanceDegrees:
return YARDS_TO_METER / DEGREE_TO_METER;
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return YARDS_TO_METER / NMILE_TO_METER;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
break;
}
- case Qgis::Miles:
+ case DistanceMiles:
{
switch ( toUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return MILES_TO_METER;
- case Qgis::Kilometers:
+ case DistanceKilometers:
return MILES_TO_METER / KILOMETERS_TO_METER;
- case Qgis::Feet:
+ case DistanceFeet:
return MILES_TO_METER / FEET_TO_METER;
- case Qgis::Yards:
+ case DistanceYards:
return MILES_TO_METER / YARDS_TO_METER;
- case Qgis::Miles:
+ case DistanceMiles:
return 1.0;
- case Qgis::Degrees:
+ case DistanceDegrees:
return MILES_TO_METER / DEGREE_TO_METER;
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return MILES_TO_METER / NMILE_TO_METER;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
break;
}
- case Qgis::Degrees:
+ case DistanceDegrees:
{
switch ( toUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return DEGREE_TO_METER;
- case Qgis::Kilometers:
+ case DistanceKilometers:
return DEGREE_TO_METER / KILOMETERS_TO_METER;
- case Qgis::Feet:
+ case DistanceFeet:
return DEGREE_TO_METER / FEET_TO_METER;
- case Qgis::Yards:
+ case DistanceYards:
return DEGREE_TO_METER / YARDS_TO_METER;
- case Qgis::Miles:
+ case DistanceMiles:
return DEGREE_TO_METER / MILES_TO_METER;
- case Qgis::Degrees:
+ case DistanceDegrees:
return 1.0;
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return DEGREE_TO_METER / NMILE_TO_METER;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
break;
}
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
{
switch ( toUnit )
{
- case Qgis::Meters:
+ case DistanceMeters:
return NMILE_TO_METER;
- case Qgis::Kilometers:
+ case DistanceKilometers:
return NMILE_TO_METER / KILOMETERS_TO_METER;
- case Qgis::Feet:
+ case DistanceFeet:
return NMILE_TO_METER / FEET_TO_METER;
- case Qgis::Yards:
+ case DistanceYards:
return NMILE_TO_METER / YARDS_TO_METER;
- case Qgis::Miles:
+ case DistanceMiles:
return NMILE_TO_METER / MILES_TO_METER;
- case Qgis::Degrees:
+ case DistanceDegrees:
return NMILE_TO_METER / DEGREE_TO_METER;
- case Qgis::NauticalMiles:
+ case DistanceNauticalMiles:
return 1.0;
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
break;
}
- case Qgis::UnknownUnit:
+ case DistanceUnknownUnit:
break;
}
return 1.0;
@@ -405,25 +399,25 @@ QString QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaUnit unit )
{
switch ( unit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return "m2";
- case SquareKilometers:
+ case AreaSquareKilometers:
return "km2";
- case SquareFeet:
+ case AreaSquareFeet:
return "ft2";
- case SquareYards:
+ case AreaSquareYards:
return "y2";
- case SquareMiles:
+ case AreaSquareMiles:
return "mi2";
- case Hectares:
+ case AreaHectares:
return "ha";
- case Acres:
+ case AreaAcres:
return "ac";
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return "nm2";
- case SquareDegrees:
+ case AreaSquareDegrees:
return "deg2";
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
return "";
}
return QString();
@@ -436,56 +430,56 @@ QgsUnitTypes::AreaUnit QgsUnitTypes::decodeAreaUnit( const QString& string, bool
if ( ok )
*ok = true;
- if ( normalized == encodeUnit( SquareMeters ) )
- return SquareMeters;
- if ( normalized == encodeUnit( SquareKilometers ) )
- return SquareKilometers;
- if ( normalized == encodeUnit( SquareFeet ) )
- return SquareFeet;
- if ( normalized == encodeUnit( SquareYards ) )
- return SquareYards;
- if ( normalized == encodeUnit( SquareMiles ) )
- return SquareMiles;
- if ( normalized == encodeUnit( Hectares ) )
- return Hectares;
- if ( normalized == encodeUnit( Acres ) )
- return Acres;
- if ( normalized == encodeUnit( SquareNauticalMiles ) )
- return SquareNauticalMiles;
- if ( normalized == encodeUnit( SquareDegrees ) )
- return SquareDegrees;
- if ( normalized == encodeUnit( UnknownAreaUnit ) )
- return UnknownAreaUnit;
+ if ( normalized == encodeUnit( AreaSquareMeters ) )
+ return AreaSquareMeters;
+ if ( normalized == encodeUnit( AreaSquareKilometers ) )
+ return AreaSquareKilometers;
+ if ( normalized == encodeUnit( AreaSquareFeet ) )
+ return AreaSquareFeet;
+ if ( normalized == encodeUnit( AreaSquareYards ) )
+ return AreaSquareYards;
+ if ( normalized == encodeUnit( AreaSquareMiles ) )
+ return AreaSquareMiles;
+ if ( normalized == encodeUnit( AreaHectares ) )
+ return AreaHectares;
+ if ( normalized == encodeUnit( AreaAcres ) )
+ return AreaAcres;
+ if ( normalized == encodeUnit( AreaSquareNauticalMiles ) )
+ return AreaSquareNauticalMiles;
+ if ( normalized == encodeUnit( AreaSquareDegrees ) )
+ return AreaSquareDegrees;
+ if ( normalized == encodeUnit( AreaUnknownUnit ) )
+ return AreaUnknownUnit;
if ( ok )
*ok = false;
- return UnknownAreaUnit;
+ return AreaUnknownUnit;
}
QString QgsUnitTypes::toString( QgsUnitTypes::AreaUnit unit )
{
switch ( unit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "square meters" );
- case SquareKilometers:
+ case AreaSquareKilometers:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "square kilometers" );
- case SquareFeet:
+ case AreaSquareFeet:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "square feet" );
- case SquareYards:
+ case AreaSquareYards:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "square yards" );
- case SquareMiles:
+ case AreaSquareMiles:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "square miles" );
- case Hectares:
+ case AreaHectares:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "hectares" );
- case Acres:
+ case AreaAcres:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "acres" );
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "square nautical miles" );
- case SquareDegrees:
+ case AreaSquareDegrees:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "square degrees" );
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
return QCoreApplication::translate( "QgsUnitTypes::AreaUnit", "" );
}
return QString();
@@ -498,30 +492,30 @@ QgsUnitTypes::AreaUnit QgsUnitTypes::stringToAreaUnit( const QString& string, bo
if ( ok )
*ok = true;
- if ( normalized == toString( SquareMeters ) )
- return SquareMeters;
- if ( normalized == toString( SquareKilometers ) )
- return SquareKilometers;
- if ( normalized == toString( SquareFeet ) )
- return SquareFeet;
- if ( normalized == toString( SquareYards ) )
- return SquareYards;
- if ( normalized == toString( SquareMiles ) )
- return SquareMiles;
- if ( normalized == toString( Hectares ) )
- return Hectares;
- if ( normalized == toString( Acres ) )
- return Acres;
- if ( normalized == toString( SquareNauticalMiles ) )
- return SquareNauticalMiles;
- if ( normalized == toString( SquareDegrees ) )
- return SquareDegrees;
- if ( normalized == toString( UnknownAreaUnit ) )
- return UnknownAreaUnit;
+ if ( normalized == toString( AreaSquareMeters ) )
+ return AreaSquareMeters;
+ if ( normalized == toString( AreaSquareKilometers ) )
+ return AreaSquareKilometers;
+ if ( normalized == toString( AreaSquareFeet ) )
+ return AreaSquareFeet;
+ if ( normalized == toString( AreaSquareYards ) )
+ return AreaSquareYards;
+ if ( normalized == toString( AreaSquareMiles ) )
+ return AreaSquareMiles;
+ if ( normalized == toString( AreaHectares ) )
+ return AreaHectares;
+ if ( normalized == toString( AreaAcres ) )
+ return AreaAcres;
+ if ( normalized == toString( AreaSquareNauticalMiles ) )
+ return AreaSquareNauticalMiles;
+ if ( normalized == toString( AreaSquareDegrees ) )
+ return AreaSquareDegrees;
+ if ( normalized == toString( AreaUnknownUnit ) )
+ return AreaUnknownUnit;
if ( ok )
*ok = false;
- return UnknownAreaUnit;
+ return AreaUnknownUnit;
}
double QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaUnit fromUnit, QgsUnitTypes::AreaUnit toUnit )
@@ -538,300 +532,300 @@ double QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaUnit fromUnit, QgsU
// Calculate the conversion factor between the specified units
switch ( fromUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return 1.0;
- case SquareKilometers:
+ case AreaSquareKilometers:
return 1.0 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return 1.0 / FT2_TO_M2;
- case SquareYards:
+ case AreaSquareYards:
return 1.0 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return 1.0 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return 1.0 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return 1.0 / AC_TO_FT2 / FT2_TO_M2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return 1.0 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return 1.0 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case SquareKilometers:
+ case AreaSquareKilometers:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return KM2_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return 1.0;
- case SquareFeet:
+ case AreaSquareFeet:
return KM2_TO_M2 / FT2_TO_M2 ;
- case SquareYards:
+ case AreaSquareYards:
return KM2_TO_M2 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return KM2_TO_M2 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return KM2_TO_M2 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return KM2_TO_M2 / AC_TO_FT2 / FT2_TO_M2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return KM2_TO_M2 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return KM2_TO_M2 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case SquareFeet:
+ case AreaSquareFeet:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return FT2_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return FT2_TO_M2 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return 1.0;
- case SquareYards:
+ case AreaSquareYards:
return FT2_TO_M2 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return FT2_TO_M2 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return FT2_TO_M2 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return 1.0 / AC_TO_FT2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return FT2_TO_M2 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return FT2_TO_M2 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case SquareYards:
+ case AreaSquareYards:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return YD2_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return YD2_TO_M2 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return YD2_TO_M2 / FT2_TO_M2;
- case SquareYards:
+ case AreaSquareYards:
return 1.0;
- case SquareMiles:
+ case AreaSquareMiles:
return YD2_TO_M2 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return YD2_TO_M2 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return YD2_TO_M2 / FT2_TO_M2 / AC_TO_FT2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return YD2_TO_M2 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return YD2_TO_M2 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case SquareMiles:
+ case AreaSquareMiles:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return MI2_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return MI2_TO_M2 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return MI2_TO_M2 / FT2_TO_M2;
- case SquareYards:
+ case AreaSquareYards:
return MI2_TO_M2 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return 1.0;
- case Hectares:
+ case AreaHectares:
return MI2_TO_M2 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return MI2_TO_M2 / FT2_TO_M2 / AC_TO_FT2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return MI2_TO_M2 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return MI2_TO_M2 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case Hectares:
+ case AreaHectares:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return HA_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return HA_TO_M2 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return HA_TO_M2 / FT2_TO_M2;
- case SquareYards:
+ case AreaSquareYards:
return HA_TO_M2 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return HA_TO_M2 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return 1.0;
- case Acres:
+ case AreaAcres:
return HA_TO_M2 / FT2_TO_M2 / AC_TO_FT2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return HA_TO_M2 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return HA_TO_M2 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case Acres:
+ case AreaAcres:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return AC_TO_FT2 * FT2_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return AC_TO_FT2 * FT2_TO_M2 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return AC_TO_FT2;
- case SquareYards:
+ case AreaSquareYards:
return AC_TO_FT2 * FT2_TO_M2 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return AC_TO_FT2 * FT2_TO_M2 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return AC_TO_FT2 * FT2_TO_M2 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return 1.0;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return AC_TO_FT2 * FT2_TO_M2 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return AC_TO_FT2 * FT2_TO_M2 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return NM2_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return NM2_TO_M2 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return NM2_TO_M2 / FT2_TO_M2;
- case SquareYards:
+ case AreaSquareYards:
return NM2_TO_M2 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return NM2_TO_M2 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return NM2_TO_M2 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return NM2_TO_M2 / FT2_TO_M2 / AC_TO_FT2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return 1.0;
- case SquareDegrees:
+ case AreaSquareDegrees:
return NM2_TO_M2 / DEG2_TO_M2;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case SquareDegrees:
+ case AreaSquareDegrees:
{
switch ( toUnit )
{
- case SquareMeters:
+ case AreaSquareMeters:
return DEG2_TO_M2;
- case SquareKilometers:
+ case AreaSquareKilometers:
return DEG2_TO_M2 / KM2_TO_M2;
- case SquareFeet:
+ case AreaSquareFeet:
return DEG2_TO_M2 / FT2_TO_M2;
- case SquareYards:
+ case AreaSquareYards:
return DEG2_TO_M2 / YD2_TO_M2;
- case SquareMiles:
+ case AreaSquareMiles:
return DEG2_TO_M2 / MI2_TO_M2;
- case Hectares:
+ case AreaHectares:
return DEG2_TO_M2 / HA_TO_M2;
- case Acres:
+ case AreaAcres:
return DEG2_TO_M2 / FT2_TO_M2 / AC_TO_FT2;
- case SquareNauticalMiles:
+ case AreaSquareNauticalMiles:
return DEG2_TO_M2 / NM2_TO_M2;
- case SquareDegrees:
+ case AreaSquareDegrees:
return 1.0;
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
break;
}
- case UnknownAreaUnit:
+ case AreaUnknownUnit:
break;
}
return 1.0;
}
-QgsUnitTypes::AreaUnit QgsUnitTypes::distanceToAreaUnit( Qgis::UnitType distanceUnit )
+QgsUnitTypes::AreaUnit QgsUnitTypes::distanceToAreaUnit( DistanceUnit distanceUnit )
{
switch ( distanceUnit )
{
- case Qgis::Meters:
- return SquareMeters;
+ case DistanceMeters:
+ return AreaSquareMeters;
- case Qgis::Kilometers:
- return SquareKilometers;
+ case DistanceKilometers:
+ return AreaSquareKilometers;
- case Qgis::Feet:
- return SquareFeet;
+ case DistanceFeet:
+ return AreaSquareFeet;
- case Qgis::Yards:
- return SquareYards;
+ case DistanceYards:
+ return AreaSquareYards;
- case Qgis::Miles:
- return SquareMiles;
+ case DistanceMiles:
+ return AreaSquareMiles;
- case Qgis::Degrees:
- return SquareDegrees;
+ case DistanceDegrees:
+ return AreaSquareDegrees;
- case Qgis::UnknownUnit:
- return UnknownAreaUnit;
+ case DistanceUnknownUnit:
+ return AreaUnknownUnit;
- case Qgis::NauticalMiles:
- return SquareNauticalMiles;
+ case DistanceNauticalMiles:
+ return AreaSquareNauticalMiles;
}
- return UnknownAreaUnit;
+ return AreaUnknownUnit;
}
QString QgsUnitTypes::encodeUnit( QgsUnitTypes::AngleUnit unit )
@@ -840,17 +834,17 @@ QString QgsUnitTypes::encodeUnit( QgsUnitTypes::AngleUnit unit )
{
case AngleDegrees:
return "degrees";
- case Radians:
+ case AngleRadians:
return "radians";
- case Gon:
+ case AngleGon:
return "gon";
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return "moa";
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return "soa";
- case Turn:
+ case AngleTurn:
return "tr";
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
return "";
}
return QString();
@@ -865,22 +859,22 @@ QgsUnitTypes::AngleUnit QgsUnitTypes::decodeAngleUnit( const QString& string, bo
if ( normalized == encodeUnit( AngleDegrees ) )
return AngleDegrees;
- if ( normalized == encodeUnit( Radians ) )
- return Radians;
- if ( normalized == encodeUnit( Gon ) )
- return Gon;
- if ( normalized == encodeUnit( MinutesOfArc ) )
- return MinutesOfArc;
- if ( normalized == encodeUnit( SecondsOfArc ) )
- return SecondsOfArc;
- if ( normalized == encodeUnit( Turn ) )
- return Turn;
- if ( normalized == encodeUnit( UnknownAngleUnit ) )
- return UnknownAngleUnit;
+ if ( normalized == encodeUnit( AngleRadians ) )
+ return AngleRadians;
+ if ( normalized == encodeUnit( AngleGon ) )
+ return AngleGon;
+ if ( normalized == encodeUnit( AngleMinutesOfArc ) )
+ return AngleMinutesOfArc;
+ if ( normalized == encodeUnit( AngleSecondsOfArc ) )
+ return AngleSecondsOfArc;
+ if ( normalized == encodeUnit( AngleTurn ) )
+ return AngleTurn;
+ if ( normalized == encodeUnit( AngleUnknownUnit ) )
+ return AngleUnknownUnit;
if ( ok )
*ok = false;
- return UnknownAngleUnit;
+ return AngleUnknownUnit;
}
QString QgsUnitTypes::toString( QgsUnitTypes::AngleUnit unit )
@@ -889,17 +883,17 @@ QString QgsUnitTypes::toString( QgsUnitTypes::AngleUnit unit )
{
case AngleDegrees:
return QCoreApplication::translate( "QgsUnitTypes::AngleUnit", "degrees" );
- case Radians:
+ case AngleRadians:
return QCoreApplication::translate( "QgsUnitTypes::AngleUnit", "radians" );
- case Gon:
+ case AngleGon:
return QCoreApplication::translate( "QgsUnitTypes::AngleUnit", "gon" );
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return QCoreApplication::translate( "QgsUnitTypes::AngleUnit", "minutes of arc" );
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return QCoreApplication::translate( "QgsUnitTypes::AngleUnit", "seconds of arc" );
- case Turn:
+ case AngleTurn:
return QCoreApplication::translate( "QgsUnitTypes::AngleUnit", "turns" );
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
return QCoreApplication::translate( "QgsUnitTypes::AngleUnit", "" );
}
return QString();
@@ -916,127 +910,127 @@ double QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AngleUnit fromUnit, Qgs
{
case AngleDegrees:
return 1.0;
- case Radians:
+ case AngleRadians:
return M_PI / 180.0;
- case Gon:
+ case AngleGon:
return 400.0 / 360.0;
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return 60;
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return 3600;
- case Turn:
+ case AngleTurn:
return 1.0 / 360.0;
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
break;
}
- case Radians:
+ case AngleRadians:
{
switch ( toUnit )
{
case AngleDegrees:
return 180.0 / M_PI;
- case Radians:
+ case AngleRadians:
return 1.0;
- case Gon:
+ case AngleGon:
return 200.0 / M_PI;
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return 60 * 180.0 / M_PI;
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return 3600 * 180.0 / M_PI;
- case Turn:
+ case AngleTurn:
return 0.5 / M_PI;
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
break;
}
- case Gon:
+ case AngleGon:
{
switch ( toUnit )
{
case AngleDegrees:
return 360.0 / 400.0;
- case Radians:
+ case AngleRadians:
return M_PI / 200.0;
- case Gon:
+ case AngleGon:
return 1.0;
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return 60 * 360.0 / 400.0;
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return 3600 * 360.0 / 400.0;
- case Turn:
+ case AngleTurn:
return 1.0 / 400.0;
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
break;
}
- case MinutesOfArc:
+ case AngleMinutesOfArc:
{
switch ( toUnit )
{
case AngleDegrees:
return 1 / 60.0;
- case Radians:
+ case AngleRadians:
return M_PI / 180.0 / 60.0;
- case Gon:
+ case AngleGon:
return 400.0 / 360.0 / 60.0;
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return 1.0;
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return 60.0;
- case Turn:
+ case AngleTurn:
return 1.0 / 360.0 / 60.0;
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
break;
}
- case SecondsOfArc:
+ case AngleSecondsOfArc:
{
switch ( toUnit )
{
case AngleDegrees:
return 1 / 3600.0;
- case Radians:
+ case AngleRadians:
return M_PI / 180.0 / 3600.0;
- case Gon:
+ case AngleGon:
return 400.0 / 360.0 / 3600.0;
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return 1.0 / 60.0;
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return 1.0;
- case Turn:
+ case AngleTurn:
return 1.0 / 360.0 / 3600.0;
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
break;
}
- case Turn:
+ case AngleTurn:
{
switch ( toUnit )
{
case AngleDegrees:
return 360.0;
- case Radians:
+ case AngleRadians:
return 2 * M_PI;
- case Gon:
+ case AngleGon:
return 400.0;
- case MinutesOfArc:
+ case AngleMinutesOfArc:
return 360.0 * 60.0;
- case SecondsOfArc:
+ case AngleSecondsOfArc:
return 360.0 * 3600.0;
- case Turn:
+ case AngleTurn:
return 1.0;
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
break;
}
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
return 1.0;
@@ -1051,69 +1045,64 @@ QString QgsUnitTypes::formatAngle( double angle, int decimals, QgsUnitTypes::Ang
case AngleDegrees:
unitLabel = QObject::trUtf8( "°" );
break;
- case Radians:
+ case AngleRadians:
unitLabel = QObject::trUtf8( " rad" );
break;
- case Gon:
+ case AngleGon:
unitLabel = QObject::trUtf8( " gon" );
break;
- case MinutesOfArc:
+ case AngleMinutesOfArc:
unitLabel = QObject::trUtf8( "′" );
break;
- case SecondsOfArc:
+ case AngleSecondsOfArc:
unitLabel = QObject::trUtf8( "″" );
break;
- case Turn:
+ case AngleTurn:
unitLabel = QObject::trUtf8( " tr" );
break;
- case UnknownAngleUnit:
+ case AngleUnknownUnit:
break;
}
return QString( "%L1%2" ).arg( angle, 0, 'f', decimals ).arg( unitLabel );
}
-// enable for QGIS 3.0
-#if 0
-
-QString QgsUnitTypes::encodeUnit( QgsSymbolV2::OutputUnit unit )
+QString QgsUnitTypes::encodeUnit( RenderUnit unit )
{
switch ( unit )
{
- case QgsSymbolV2::MM:
+ case RenderMillimeters:
return "MM";
- case QgsSymbolV2::MapUnit:
+ case RenderMapUnits:
return "MapUnit";
- case QgsSymbolV2::Pixel:
+ case RenderPixels:
return "Pixel";
- case QgsSymbolV2::Percentage:
+ case RenderPercentage:
return "Percentage";
default:
return "MM";
}
}
-QgsSymbolV2::OutputUnit QgsUnitTypes::decodeSymbolUnit( const QString& string, bool* ok )
+QgsUnitTypes::RenderUnit QgsUnitTypes::decodeRenderUnit( const QString& string, bool* ok )
{
QString normalized = string.trimmed().toLower();
if ( ok )
*ok = true;
- if ( normalized == encodeUnit( QgsSymbolV2::MM ).toLower() )
- return QgsSymbolV2::MM;
- if ( normalized == encodeUnit( QgsSymbolV2::MapUnit ).toLower() )
- return QgsSymbolV2::MapUnit;
- if ( normalized == encodeUnit( QgsSymbolV2::Pixel ).toLower() )
- return QgsSymbolV2::Pixel;
- if ( normalized == encodeUnit( QgsSymbolV2::Percentage ).toLower() )
- return QgsSymbolV2::Percentage;
+ if ( normalized == encodeUnit( RenderMillimeters ).toLower() )
+ return RenderMillimeters;
+ if ( normalized == encodeUnit( RenderMapUnits ).toLower() )
+ return RenderMapUnits;
+ if ( normalized == encodeUnit( RenderPixels ).toLower() )
+ return RenderPixels;
+ if ( normalized == encodeUnit( RenderPercentage ).toLower() )
+ return RenderPercentage;
if ( ok )
*ok = false;
// millimeters are default
- return QgsSymbolV2::MM;
+ return RenderMillimeters;
}
-
-#endif
diff --git a/src/core/qgsunittypes.h b/src/core/qgsunittypes.h
index 32d4c10587b..fbb6aebabb1 100644
--- a/src/core/qgsunittypes.h
+++ b/src/core/qgsunittypes.h
@@ -36,6 +36,19 @@ class CORE_EXPORT QgsUnitTypes
{
public:
+ //! Units of distance
+ enum DistanceUnit
+ {
+ DistanceMeters = 0, /*!< meters */
+ DistanceKilometers, /*!< kilometers */
+ DistanceFeet, /*!< imperial feet */
+ DistanceNauticalMiles, /*!< nautical miles */
+ DistanceYards, /*!< imperial yards */
+ DistanceMiles, /*!< terrestial miles */
+ DistanceDegrees, /*!< degrees, for planar geographic CRS distance measurements */
+ DistanceUnknownUnit, /*!< unknown distance unit */
+ };
+
/** Types of distance units
*/
enum DistanceUnitType
@@ -48,42 +61,55 @@ class CORE_EXPORT QgsUnitTypes
//! Units of area
enum AreaUnit
{
- SquareMeters = 0, /*!< square meters */
- SquareKilometers, /*!< square kilometers */
- SquareFeet, /*!< square feet */
- SquareYards, /*!< square yards */
- SquareMiles, /*!< square miles */
- Hectares, /*!< hectares */
- Acres, /*!< acres */
- SquareNauticalMiles, /*!< square nautical miles */
- SquareDegrees, /*!< square degrees, for planar geographic CRS area measurements */
- UnknownAreaUnit, /*!< unknown areal unit */
+ AreaSquareMeters = 0, /*!< square meters */
+ AreaSquareKilometers, /*!< square kilometers */
+ AreaSquareFeet, /*!< square feet */
+ AreaSquareYards, /*!< square yards */
+ AreaSquareMiles, /*!< square miles */
+ AreaHectares, /*!< hectares */
+ AreaAcres, /*!< acres */
+ AreaSquareNauticalMiles, /*!< square nautical miles */
+ AreaSquareDegrees, /*!< square degrees, for planar geographic CRS area measurements */
+ AreaUnknownUnit, /*!< unknown areal unit */
};
//! Units of angles
enum AngleUnit
{
AngleDegrees = 0, /*!< degrees */
- Radians, /*!< square kilometers */
- Gon, /*!< gon/gradian */
- MinutesOfArc, /*!< minutes of arc */
- SecondsOfArc, /*!< seconds of arc */
- Turn, /*!< turn/revolutions */
- UnknownAngleUnit, /*!< unknown angle unit */
+ AngleRadians, /*!< square kilometers */
+ AngleGon, /*!< gon/gradian */
+ AngleMinutesOfArc, /*!< minutes of arc */
+ AngleSecondsOfArc, /*!< seconds of arc */
+ AngleTurn, /*!< turn/revolutions */
+ AngleUnknownUnit, /*!< unknown angle unit */
};
+ //! Rendering size units
+ enum RenderUnit
+ {
+ RenderMillimeters = 0, //!< millimeters
+ RenderMapUnits, //!< map units
+ RenderPixels, //!< pixels
+ RenderPercentage, //!< percentage of another measurement (eg canvas size, feature size)
+ RenderUnknownUnit, //!< mixed or unknown units
+ };
+
+ //! List of render units
+ typedef QList RenderUnitList;
+
// DISTANCE UNITS
/** Returns the type for a distance unit.
*/
- static DistanceUnitType unitType( Qgis::UnitType unit );
+ static DistanceUnitType unitType( DistanceUnit unit );
/** Encodes a distance unit to a string.
* @param unit unit to encode
* @returns encoded string
* @see decodeDistanceUnit()
*/
- static QString encodeUnit( Qgis::UnitType unit );
+ static QString encodeUnit( QgsUnitTypes::DistanceUnit unit );
/** Decodes a distance unit from a string.
* @param string string to decode
@@ -91,27 +117,27 @@ class CORE_EXPORT QgsUnitTypes
* @returns decoded units
* @see encodeUnit()
*/
- static Qgis::UnitType decodeDistanceUnit( const QString& string, bool *ok = 0 );
+ static QgsUnitTypes::DistanceUnit decodeDistanceUnit( const QString& string, bool *ok = 0 );
/** Returns a translated string representing a distance unit.
* @param unit unit to convert to string
* @see stringToDistanceUnit()
*/
- static QString toString( Qgis::UnitType unit );
+ static QString toString( QgsUnitTypes::DistanceUnit unit );
/** Converts a translated string to a distance unit.
* @param string string representing a distance unit
* @param ok optional boolean, will be set to true if string was converted successfully
* @see toString()
*/
- static Qgis::UnitType stringToDistanceUnit( const QString& string, bool *ok = 0 );
+ static QgsUnitTypes::DistanceUnit stringToDistanceUnit( const QString& string, bool *ok = 0 );
/** Returns the conversion factor between the specified distance units.
* @param fromUnit distance unit to convert from
* @param toUnit distance unit to convert to
* @returns multiplication factor to convert between units
*/
- static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit );
+ static double fromUnitToUnitFactor( QgsUnitTypes::DistanceUnit fromUnit, QgsUnitTypes::DistanceUnit toUnit );
// AREAL UNITS
@@ -158,7 +184,7 @@ class CORE_EXPORT QgsUnitTypes
* @param distanceUnit distance unit to convert
* @return matching areal unit
*/
- static AreaUnit distanceToAreaUnit( Qgis::UnitType distanceUnit );
+ static AreaUnit distanceToAreaUnit( QgsUnitTypes::DistanceUnit distanceUnit );
// ANGULAR UNITS
@@ -197,25 +223,22 @@ class CORE_EXPORT QgsUnitTypes
*/
static QString formatAngle( double angle, int decimals, AngleUnit unit );
- //TODO QGIS 3.0 - enable and move symbol units here! Otherwise creates circular dependencies...
-#if 0
- // SYMBOL UNITS
+ // RENDER UNITS
- /** Encodes a symbol unit to a string.
+ /** Encodes a render unit to a string.
* @param unit unit to encode
* @returns encoded string
- * @see decodeSymbolUnit()
+ * @see decodeRenderUnit()
*/
- static QString encodeUnit( QgsSymbolV2::OutputUnit unit );
+ static QString encodeUnit( RenderUnit unit );
- /** Decodes a symbol unit from a string.
+ /** Decodes a render unit from a string.
* @param string string to decode
* @param ok optional boolean, will be set to true if string was converted successfully
* @returns decoded units
* @see encodeUnit()
*/
- static QgsSymbolV2::OutputUnit decodeSymbolUnit( const QString& string, bool *ok = 0 );
-#endif
+ static RenderUnit decodeRenderUnit( const QString& string, bool *ok = 0 );
};
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
index 46a15bd467b..2f64b489fd9 100644
--- a/src/core/qgsvectorfilewriter.cpp
+++ b/src/core/qgsvectorfilewriter.cpp
@@ -1776,7 +1776,7 @@ QString QgsVectorFileWriter::errorMessage()
return mErrorMessage;
}
-bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer, Qgis::UnitType outputUnit )
+bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer, QgsUnitTypes::DistanceUnit outputUnit )
{
// create the feature
OGRFeatureH poFeature = createFeature( feature );
@@ -2318,7 +2318,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
int n = 0, errors = 0;
//unit type
- Qgis::UnitType mapUnits = layer->crs().mapUnits();
+ QgsUnitTypes::DistanceUnit mapUnits = layer->crs().mapUnits();
if ( ct.isValid() )
{
mapUnits = ct.destinationCrs().mapUnits();
@@ -2600,7 +2600,7 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl, const Qgs
}
//unit type
- Qgis::UnitType mapUnits = vl->crs().mapUnits();
+ QgsUnitTypes::DistanceUnit mapUnits = vl->crs().mapUnits();
if ( ct.isValid() )
{
mapUnits = ct.destinationCrs().mapUnits();
@@ -2651,7 +2651,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
QHash< QgsSymbolV2*, QList > features;
//unit type
- Qgis::UnitType mapUnits = layer->crs().mapUnits();
+ QgsUnitTypes::DistanceUnit mapUnits = layer->crs().mapUnits();
if ( ct.isValid() )
{
mapUnits = ct.destinationCrs().mapUnits();
@@ -2775,16 +2775,16 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
return ( nErrors > 0 ) ? QgsVectorFileWriter::ErrFeatureWriteFailed : QgsVectorFileWriter::NoError;
}
-double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits )
+double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits )
{
- if ( symbolUnits == QgsSymbolV2::MM )
+ if ( symbolUnits == QgsUnitTypes::RenderMillimeters )
{
return 1.0;
}
else
{
//conversion factor map units -> mm
- if ( mapUnits == Qgis::Meters )
+ if ( mapUnits == QgsUnitTypes::DistanceMeters )
{
return 1000 / scaleDenominator;
}
@@ -2793,15 +2793,15 @@ double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2:
return 1.0; //todo: map units
}
-double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits )
+double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits )
{
- if ( symbolUnits == QgsSymbolV2::MapUnit )
+ if ( symbolUnits == QgsUnitTypes::RenderMapUnits )
{
return 1.0;
}
else
{
- if ( symbolUnits == QgsSymbolV2::MM && mapUnits == Qgis::Meters )
+ if ( symbolUnits == QgsUnitTypes::RenderMillimeters && mapUnits == QgsUnitTypes::DistanceMeters )
{
return scaleDenominator / 1000;
}
diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
index f60efef6687..b081c44da6c 100644
--- a/src/core/qgsvectorfilewriter.h
+++ b/src/core/qgsvectorfilewriter.h
@@ -338,7 +338,7 @@ class CORE_EXPORT QgsVectorFileWriter
QString errorMessage();
/** Add feature to the currently opened data source */
- bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = nullptr, Qgis::UnitType outputUnit = Qgis::Meters );
+ bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = nullptr, QgsUnitTypes::DistanceUnit outputUnit = QgsUnitTypes::DistanceMeters );
//! @note not available in python bindings
QMap attrIdxToOgrIdx() { return mAttrIdxToOgrIdx; }
@@ -443,14 +443,14 @@ class CORE_EXPORT QgsVectorFileWriter
QgsRenderContext mRenderContext;
static QMap initMetaData();
- void createSymbolLayerTable( QgsVectorLayer* vl, const QgsCoordinateTransform& ct, OGRDataSourceH ds );
+ void createSymbolLayerTable( QgsVectorLayer* vl, const QgsCoordinateTransform& ct, OGRDataSourceH ds );
OGRFeatureH createFeature( QgsFeature& feature );
bool writeFeature( OGRLayerH layer, OGRFeatureH feature );
/** Writes features considering symbol level order*/
WriterError exportFeaturesSymbolLevels( QgsVectorLayer* layer, QgsFeatureIterator& fit, const QgsCoordinateTransform& ct, QString* errorMessage = nullptr );
- double mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
- double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
+ double mmScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits );
+ double mapUnitScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits );
void startRender( QgsVectorLayer* vl );
void stopRender( QgsVectorLayer* vl );
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
index 6a5d6a3b81a..2410aa327c3 100644
--- a/src/core/qgsvectorlayer.cpp
+++ b/src/core/qgsvectorlayer.cpp
@@ -75,7 +75,6 @@
#include "qgsvectorlayerundocommand.h"
#include "qgspointv2.h"
#include "qgsrendererv2.h"
-#include "qgssymbolv2.h"
#include "qgssymbollayerv2.h"
#include "qgssinglesymbolrendererv2.h"
#include "qgsdiagramrendererv2.h"
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
index 8b9a064b428..b5997fbc52d 100644
--- a/src/core/qgsvectorlayereditutils.cpp
+++ b/src/core/qgsvectorlayereditutils.cpp
@@ -688,11 +688,11 @@ int QgsVectorLayerEditUtils::addTopologicalPoints( const QgsPoint& p )
//work with a tolerance because coordinate projection may introduce some rounding
double threshold = 0.0000001;
- if ( L->crs().mapUnits() == Qgis::Meters )
+ if ( L->crs().mapUnits() == QgsUnitTypes::DistanceMeters )
{
threshold = 0.001;
}
- else if ( L->crs().mapUnits() == Qgis::Feet )
+ else if ( L->crs().mapUnits() == QgsUnitTypes::DistanceFeet )
{
threshold = 0.0001;
}
diff --git a/src/core/qgsxmlutils.cpp b/src/core/qgsxmlutils.cpp
index cad1c778be9..70f7f455fe8 100644
--- a/src/core/qgsxmlutils.cpp
+++ b/src/core/qgsxmlutils.cpp
@@ -20,32 +20,16 @@
#include "qgsrectangle.h"
-Qgis::UnitType QgsXmlUtils::readMapUnits( const QDomElement& element )
+QgsUnitTypes::DistanceUnit QgsXmlUtils::readMapUnits( const QDomElement& element )
{
- if ( "meters" == element.text() )
+ if ( "unknown" == element.text() )
{
- return Qgis::Meters;
- }
- else if ( "feet" == element.text() )
- {
- return Qgis::Feet;
- }
- else if ( "nautical miles" == element.text() )
- {
- return Qgis::NauticalMiles;
- }
- else if ( "degrees" == element.text() )
- {
- return Qgis::Degrees;
- }
- else if ( "unknown" == element.text() )
- {
- return Qgis::UnknownUnit;
+ return QgsUnitTypes::DistanceUnknownUnit;
}
else
{
- QgsDebugMsg( "Unknown map unit type " + element.text() );
- return Qgis::Degrees;
+ QgsUnitTypes::DistanceUnit unit = QgsUnitTypes::decodeDistanceUnit( element.text() );
+ return unit == QgsUnitTypes::DistanceUnknownUnit ? QgsUnitTypes::DistanceDegrees : unit;
}
}
@@ -79,28 +63,12 @@ QgsRectangle QgsXmlUtils::readRectangle( const QDomElement& element )
-QDomElement QgsXmlUtils::writeMapUnits( Qgis::UnitType units, QDomDocument& doc )
+QDomElement QgsXmlUtils::writeMapUnits( QgsUnitTypes::DistanceUnit units, QDomDocument& doc )
{
- QString unitsString;
- switch ( units )
- {
- case Qgis::Meters:
- unitsString = "meters";
- break;
- case Qgis::Feet:
- unitsString = "feet";
- break;
- case Qgis::NauticalMiles:
- unitsString = "nautical miles";
- break;
- case Qgis::Degrees:
- unitsString = "degrees";
- break;
- case Qgis::UnknownUnit:
- default:
- unitsString = "unknown";
- break;
- }
+ QString unitsString = QgsUnitTypes::encodeUnit( units );
+ // maintain compatibility with old projects
+ if ( units == QgsUnitTypes::DistanceUnknownUnit )
+ unitsString = "unknown";
QDomElement unitsNode = doc.createElement( "units" );
unitsNode.appendChild( doc.createTextNode( unitsString ) );
diff --git a/src/core/qgsxmlutils.h b/src/core/qgsxmlutils.h
index a8a4fec0c27..e2584ae7d11 100644
--- a/src/core/qgsxmlutils.h
+++ b/src/core/qgsxmlutils.h
@@ -21,6 +21,7 @@ class QDomElement;
class QgsRectangle;
#include "qgis.h"
+#include "qgsunittypes.h"
/** \ingroup core
* Assorted helper methods for reading and writing chunks of XML
@@ -31,12 +32,25 @@ class CORE_EXPORT QgsXmlUtils
/* reading */
- static Qgis::UnitType readMapUnits( const QDomElement& element );
+ /** Decodes a distance unit from a DOM element.
+ * @param element DOM element to decode
+ * @returns distance units
+ * @see writeMapUnits()
+ */
+ static QgsUnitTypes::DistanceUnit readMapUnits( const QDomElement& element );
+
static QgsRectangle readRectangle( const QDomElement& element );
/* writing */
- static QDomElement writeMapUnits( Qgis::UnitType units, QDomDocument& doc );
+ /** Encodes a distance unit to a DOM element.
+ * @param units units to encode
+ * @param doc DOM document
+ * @returns element containing encoded units
+ * @see readMapUnits()
+ */
+ static QDomElement writeMapUnits( QgsUnitTypes::DistanceUnit units, QDomDocument& doc );
+
static QDomElement writeRectangle( const QgsRectangle& rect, QDomDocument& doc );
};
diff --git a/src/core/symbology-ng/qgs25drenderer.cpp b/src/core/symbology-ng/qgs25drenderer.cpp
index 233e8d0b094..aff936c1984 100644
--- a/src/core/symbology-ng/qgs25drenderer.cpp
+++ b/src/core/symbology-ng/qgs25drenderer.cpp
@@ -87,7 +87,7 @@ Qgs25DRenderer::Qgs25DRenderer()
QgsEffectStack* effectStack = new QgsEffectStack();
QgsOuterGlowEffect* glowEffect = new QgsOuterGlowEffect();
glowEffect->setBlurLevel( 5 );
- glowEffect->setSpreadUnit( QgsSymbolV2::MapUnit );
+ glowEffect->setSpreadUnit( QgsUnitTypes::RenderMapUnits );
effectStack->appendEffect( glowEffect );
floor->setPaintEffect( effectStack );
diff --git a/src/core/symbology-ng/qgsarrowsymbollayer.cpp b/src/core/symbology-ng/qgsarrowsymbollayer.cpp
index e5310bcae14..a62809a75ec 100644
--- a/src/core/symbology-ng/qgsarrowsymbollayer.cpp
+++ b/src/core/symbology-ng/qgsarrowsymbollayer.cpp
@@ -18,13 +18,13 @@
QgsArrowSymbolLayer::QgsArrowSymbolLayer()
: QgsLineSymbolLayerV2()
, mArrowWidth( 1.0 )
- , mArrowWidthUnit( QgsSymbolV2::MM )
+ , mArrowWidthUnit( QgsUnitTypes::RenderMillimeters )
, mArrowStartWidth( 1.0 )
- , mArrowStartWidthUnit( QgsSymbolV2::MM )
+ , mArrowStartWidthUnit( QgsUnitTypes::RenderMillimeters )
, mHeadLength( 1.5 )
- , mHeadLengthUnit( QgsSymbolV2::MM )
+ , mHeadLengthUnit( QgsUnitTypes::RenderMillimeters )
, mHeadThickness( 1.5 )
- , mHeadThicknessUnit( QgsSymbolV2::MM )
+ , mHeadThicknessUnit( QgsUnitTypes::RenderMillimeters )
, mHeadType( HeadSingle )
, mArrowType( ArrowPlain )
, mIsCurved( true )
@@ -39,7 +39,7 @@ QgsArrowSymbolLayer::QgsArrowSymbolLayer()
{
/* default values */
setOffset( 0.0 );
- setOffsetUnit( QgsSymbolV2::MM );
+ setOffsetUnit( QgsUnitTypes::RenderMillimeters );
mSymbol.reset( static_cast( QgsFillSymbolV2::createSimple( QgsStringMap() ) ) );
}
@@ -63,7 +63,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
l->setArrowWidth( props["arrow_width"].toDouble() );
if ( props.contains( "arrow_width_unit" ) )
- l->setArrowWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["arrow_width_unit"] ) );
+ l->setArrowWidthUnit( QgsUnitTypes::decodeRenderUnit( props["arrow_width_unit"] ) );
if ( props.contains( "arrow_width_unit_scale" ) )
l->setArrowWidthUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["arrow_width_unit_scale"] ) );
@@ -72,7 +72,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
l->setArrowStartWidth( props["arrow_start_width"].toDouble() );
if ( props.contains( "arrow_start_width_unit" ) )
- l->setArrowStartWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["arrow_start_width_unit"] ) );
+ l->setArrowStartWidthUnit( QgsUnitTypes::decodeRenderUnit( props["arrow_start_width_unit"] ) );
if ( props.contains( "arrow_start_width_unit_scale" ) )
l->setArrowStartWidthUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["arrow_start_width_unit_scale"] ) );
@@ -87,7 +87,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
l->setHeadLength( props["head_length"].toDouble() );
if ( props.contains( "head_length_unit" ) )
- l->setHeadLengthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["head_length_unit"] ) );
+ l->setHeadLengthUnit( QgsUnitTypes::decodeRenderUnit( props["head_length_unit"] ) );
if ( props.contains( "head_length_unit_scale" ) )
l->setHeadLengthUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["head_length_unit_scale"] ) );
@@ -96,7 +96,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
l->setHeadThickness( props["head_thickness"].toDouble() );
if ( props.contains( "head_thickness_unit" ) )
- l->setHeadThicknessUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["head_thickness_unit"] ) );
+ l->setHeadThicknessUnit( QgsUnitTypes::decodeRenderUnit( props["head_thickness_unit"] ) );
if ( props.contains( "head_thickness_unit_scale" ) )
l->setHeadThicknessUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["head_thickness_unit_scale"] ) );
@@ -111,7 +111,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
l->setOffset( props["offset"].toDouble() );
if ( props.contains( "offset_unit" ) )
- l->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ l->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
if ( props.contains( "offset_unit_scale" ) )
l->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_unit_scale"] ) );
@@ -142,29 +142,29 @@ QgsStringMap QgsArrowSymbolLayer::properties() const
QgsStringMap map;
map["arrow_width"] = QString::number( arrowWidth() );
- map["arrow_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( arrowWidthUnit() );
+ map["arrow_width_unit"] = QgsUnitTypes::encodeUnit( arrowWidthUnit() );
map["arrow_width_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( arrowWidthUnitScale() );
map["arrow_start_width"] = QString::number( arrowStartWidth() );
- map["arrow_start_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( arrowStartWidthUnit() );
+ map["arrow_start_width_unit"] = QgsUnitTypes::encodeUnit( arrowStartWidthUnit() );
map["arrow_start_width_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( arrowStartWidthUnitScale() );
map["is_curved"] = QString::number( isCurved() ? 1 : 0 );
map["is_repeated"] = QString::number( isRepeated() ? 1 : 0 );
map["head_length"] = QString::number( headLength() );
- map["head_length_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( headLengthUnit() );
+ map["head_length_unit"] = QgsUnitTypes::encodeUnit( headLengthUnit() );
map["head_length_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( headLengthUnitScale() );
map["head_thickness"] = QString::number( headThickness() );
- map["head_thickness_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( headThicknessUnit() );
+ map["head_thickness_unit"] = QgsUnitTypes::encodeUnit( headThicknessUnit() );
map["head_thickness_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( headThicknessUnitScale() );
map["head_type"] = QString::number( headType() );
map["arrow_type"] = QString::number( arrowType() );
map["offset"] = QString::number( offset() );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( offsetUnit() );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( offsetUnit() );
map["offset_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( offsetMapUnitScale() );
saveDataDefinedProperties( map );
diff --git a/src/core/symbology-ng/qgsarrowsymbollayer.h b/src/core/symbology-ng/qgsarrowsymbollayer.h
index 14ac204cba5..736aed57bb2 100644
--- a/src/core/symbology-ng/qgsarrowsymbollayer.h
+++ b/src/core/symbology-ng/qgsarrowsymbollayer.h
@@ -57,9 +57,9 @@ class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow width */
void setArrowWidth( double width ) { mArrowWidth = width; }
/** Get the unit for the arrow width */
- QgsSymbolV2::OutputUnit arrowWidthUnit() const { return mArrowWidthUnit; }
+ QgsUnitTypes::RenderUnit arrowWidthUnit() const { return mArrowWidthUnit; }
/** Set the unit for the arrow width */
- void setArrowWidthUnit( QgsSymbolV2::OutputUnit unit ) { mArrowWidthUnit = unit; }
+ void setArrowWidthUnit( QgsUnitTypes::RenderUnit unit ) { mArrowWidthUnit = unit; }
/** Get the scale for the arrow width */
QgsMapUnitScale arrowWidthUnitScale() const { return mArrowWidthUnitScale; }
/** Set the scale for the arrow width */
@@ -70,9 +70,9 @@ class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow start width */
void setArrowStartWidth( double width ) { mArrowStartWidth = width; }
/** Get the unit for the arrow start width */
- QgsSymbolV2::OutputUnit arrowStartWidthUnit() const { return mArrowStartWidthUnit; }
+ QgsUnitTypes::RenderUnit arrowStartWidthUnit() const { return mArrowStartWidthUnit; }
/** Set the unit for the arrow start width */
- void setArrowStartWidthUnit( QgsSymbolV2::OutputUnit unit ) { mArrowStartWidthUnit = unit; }
+ void setArrowStartWidthUnit( QgsUnitTypes::RenderUnit unit ) { mArrowStartWidthUnit = unit; }
/** Get the scale for the arrow start width */
QgsMapUnitScale arrowStartWidthUnitScale() const { return mArrowStartWidthUnitScale; }
/** Set the scale for the arrow start width */
@@ -83,9 +83,9 @@ class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow head length */
void setHeadLength( double length ) { mHeadLength = length; }
/** Get the unit for the head length */
- QgsSymbolV2::OutputUnit headLengthUnit() const { return mHeadLengthUnit; }
+ QgsUnitTypes::RenderUnit headLengthUnit() const { return mHeadLengthUnit; }
/** Set the unit for the head length */
- void setHeadLengthUnit( QgsSymbolV2::OutputUnit unit ) { mHeadLengthUnit = unit; }
+ void setHeadLengthUnit( QgsUnitTypes::RenderUnit unit ) { mHeadLengthUnit = unit; }
/** Get the scale for the head length */
QgsMapUnitScale headLengthUnitScale() const { return mHeadLengthUnitScale; }
/** Set the scale for the head length */
@@ -96,9 +96,9 @@ class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
/** Set the arrow head height */
void setHeadThickness( double thickness ) { mHeadThickness = thickness; }
/** Get the unit for the head height */
- QgsSymbolV2::OutputUnit headThicknessUnit() const { return mHeadThicknessUnit; }
+ QgsUnitTypes::RenderUnit headThicknessUnit() const { return mHeadThicknessUnit; }
/** Set the unit for the head height */
- void setHeadThicknessUnit( QgsSymbolV2::OutputUnit unit ) { mHeadThicknessUnit = unit; }
+ void setHeadThicknessUnit( QgsUnitTypes::RenderUnit unit ) { mHeadThicknessUnit = unit; }
/** Get the scale for the head height */
QgsMapUnitScale headThicknessUnitScale() const { return mHeadThicknessUnitScale; }
/** Set the scale for the head height */
@@ -170,18 +170,18 @@ class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
QScopedPointer mSymbol;
double mArrowWidth;
- QgsSymbolV2::OutputUnit mArrowWidthUnit;
+ QgsUnitTypes::RenderUnit mArrowWidthUnit;
QgsMapUnitScale mArrowWidthUnitScale;
double mArrowStartWidth;
- QgsSymbolV2::OutputUnit mArrowStartWidthUnit;
+ QgsUnitTypes::RenderUnit mArrowStartWidthUnit;
QgsMapUnitScale mArrowStartWidthUnitScale;
double mHeadLength;
- QgsSymbolV2::OutputUnit mHeadLengthUnit;
+ QgsUnitTypes::RenderUnit mHeadLengthUnit;
QgsMapUnitScale mHeadLengthUnitScale;
double mHeadThickness;
- QgsSymbolV2::OutputUnit mHeadThicknessUnit;
+ QgsUnitTypes::RenderUnit mHeadThicknessUnit;
QgsMapUnitScale mHeadThicknessUnitScale;
HeadType mHeadType;
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
index 4dbe6567ea9..1717276744d 100644
--- a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -31,14 +31,14 @@ QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2()
: QgsMarkerSymbolLayerV2()
, mSymbolName( "circle" )
, mSymbolWidth( 4 )
- , mSymbolWidthUnit( QgsSymbolV2::MM )
+ , mSymbolWidthUnit( QgsUnitTypes::RenderMillimeters )
, mSymbolHeight( 3 )
- , mSymbolHeightUnit( QgsSymbolV2::MM )
+ , mSymbolHeightUnit( QgsUnitTypes::RenderMillimeters )
, mOutlineColor( Qt::black )
, mOutlineStyle( Qt::SolidLine )
, mPenJoinStyle( DEFAULT_ELLIPSE_JOINSTYLE )
, mOutlineWidth( 0 )
- , mOutlineWidthUnit( QgsSymbolV2::MM )
+ , mOutlineWidthUnit( QgsUnitTypes::RenderMillimeters )
{
mColor = Qt::white;
mPen.setColor( mOutlineColor );
@@ -68,7 +68,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
}
if ( properties.contains( "symbol_width_unit" ) )
{
- layer->setSymbolWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["symbol_width_unit"] ) );
+ layer->setSymbolWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["symbol_width_unit"] ) );
}
if ( properties.contains( "symbol_width_map_unit_scale" ) )
{
@@ -80,7 +80,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
}
if ( properties.contains( "symbol_height_unit" ) )
{
- layer->setSymbolHeightUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["symbol_height_unit"] ) );
+ layer->setSymbolHeightUnit( QgsUnitTypes::decodeRenderUnit( properties["symbol_height_unit"] ) );
}
if ( properties.contains( "symbol_height_map_unit_scale" ) )
{
@@ -112,11 +112,11 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
}
if ( properties.contains( "outline_width_unit" ) )
{
- layer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["outline_width_unit"] ) );
+ layer->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["outline_width_unit"] ) );
}
else if ( properties.contains( "line_width_unit" ) )
{
- layer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["line_width_unit"] ) );
+ layer->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["line_width_unit"] ) );
}
if ( properties.contains( "outline_width_map_unit_scale" ) )
{
@@ -145,7 +145,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
}
if ( properties.contains( "size_unit" ) )
{
- layer->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["size_unit"] ) );
+ layer->setSizeUnit( QgsUnitTypes::decodeRenderUnit( properties["size_unit"] ) );
}
if ( properties.contains( "size_map_unit_scale" ) )
{
@@ -157,7 +157,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
}
if ( properties.contains( "offset_unit" ) )
{
- layer->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["offset_unit"] ) );
+ layer->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( properties["offset_unit"] ) );
}
if ( properties.contains( "offset_map_unit_scale" ) )
{
@@ -510,24 +510,24 @@ QgsStringMap QgsEllipseSymbolLayerV2::properties() const
QgsStringMap map;
map["symbol_name"] = mSymbolName;
map["symbol_width"] = QString::number( mSymbolWidth );
- map["symbol_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolWidthUnit );
+ map["symbol_width_unit"] = QgsUnitTypes::encodeUnit( mSymbolWidthUnit );
map["symbol_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSymbolWidthMapUnitScale );
map["symbol_height"] = QString::number( mSymbolHeight );
- map["symbol_height_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolHeightUnit );
+ map["symbol_height_unit"] = QgsUnitTypes::encodeUnit( mSymbolHeightUnit );
map["symbol_height_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSymbolHeightMapUnitScale );
map["angle"] = QString::number( mAngle );
map["outline_style"] = QgsSymbolLayerV2Utils::encodePenStyle( mOutlineStyle );
map["outline_width"] = QString::number( mOutlineWidth );
- map["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit );
+ map["outline_width_unit"] = QgsUnitTypes::encodeUnit( mOutlineWidthUnit );
map["outline_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale );
map["joinstyle"] = QgsSymbolLayerV2Utils::encodePenJoinStyle( mPenJoinStyle );
map["color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
map["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mOutlineColor );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
map["size"] = QString::number( mSize );
- map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
+ map["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
map["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
map["horizontal_anchor_point"] = QString::number( mHorizontalAnchorPoint );
map["vertical_anchor_point"] = QString::number( mVerticalAnchorPoint );
@@ -637,7 +637,7 @@ void QgsEllipseSymbolLayerV2::preparePath( const QString& symbolName, QgsSymbolV
}
}
-void QgsEllipseSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsEllipseSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsMarkerSymbolLayerV2::setOutputUnit( unit );
mSymbolWidthUnit = unit;
@@ -645,12 +645,12 @@ void QgsEllipseSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
mOutlineWidthUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsEllipseSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsEllipseSymbolLayerV2::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = QgsMarkerSymbolLayerV2::outputUnit();
+ QgsUnitTypes::RenderUnit unit = QgsMarkerSymbolLayerV2::outputUnit();
if ( mSymbolWidthUnit != unit || mSymbolHeightUnit != unit || mOutlineWidthUnit != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
@@ -743,7 +743,7 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa
{
symbolWidth = mSize;
}
- if ( mSymbolWidthUnit == QgsSymbolV2::MM )
+ if ( mSymbolWidthUnit == QgsUnitTypes::RenderMillimeters )
{
symbolWidth *= mmMapUnitScaleFactor;
}
@@ -759,7 +759,7 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa
{
symbolHeight = mSize;
}
- if ( mSymbolHeightUnit == QgsSymbolV2::MM )
+ if ( mSymbolHeightUnit == QgsUnitTypes::RenderMillimeters )
{
symbolHeight *= mmMapUnitScaleFactor;
}
@@ -772,7 +772,7 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa
context.setOriginalValueVariable( mOutlineWidth );
outlineWidth = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_OUTLINE_WIDTH, context, mOutlineWidth ).toDouble();
}
- if ( mOutlineWidthUnit == QgsSymbolV2::MM )
+ if ( mOutlineWidthUnit == QgsUnitTypes::RenderMillimeters )
{
outlineWidth *= outlineWidth;
}
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.h b/src/core/symbology-ng/qgsellipsesymbollayerv2.h
index e9b02a6034a..340fa595c23 100644
--- a/src/core/symbology-ng/qgsellipsesymbollayerv2.h
+++ b/src/core/symbology-ng/qgsellipsesymbollayerv2.h
@@ -73,26 +73,54 @@ class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
void setOutlineColor( const QColor& c ) override { mOutlineColor = c; }
QColor outlineColor() const override { return mOutlineColor; }
- void setSymbolWidthUnit( QgsSymbolV2::OutputUnit unit ) { mSymbolWidthUnit = unit; }
- QgsSymbolV2::OutputUnit symbolWidthUnit() const { return mSymbolWidthUnit; }
+ /** Sets the units for the symbol's width.
+ * @param unit symbol units
+ * @see symbolWidthUnit()
+ * @see setSymbolHeightUnit()
+ */
+ void setSymbolWidthUnit( QgsUnitTypes::RenderUnit unit ) { mSymbolWidthUnit = unit; }
+
+ /** Returns the units for the symbol's width.
+ * @see setSymbolWidthUnit()
+ * @see symbolHeightUnit()
+ */
+ QgsUnitTypes::RenderUnit symbolWidthUnit() const { return mSymbolWidthUnit; }
void setSymbolWidthMapUnitScale( const QgsMapUnitScale& scale ) { mSymbolWidthMapUnitScale = scale; }
const QgsMapUnitScale& symbolWidthMapUnitScale() const { return mSymbolWidthMapUnitScale; }
- void setSymbolHeightUnit( QgsSymbolV2::OutputUnit unit ) { mSymbolHeightUnit = unit; }
- QgsSymbolV2::OutputUnit symbolHeightUnit() const { return mSymbolHeightUnit; }
+ /** Sets the units for the symbol's height.
+ * @param unit symbol units
+ * @see symbolHeightUnit()
+ * @see setSymbolWidthUnit()
+ */
+ void setSymbolHeightUnit( QgsUnitTypes::RenderUnit unit ) { mSymbolHeightUnit = unit; }
+
+ /** Returns the units for the symbol's height.
+ * @see setSymbolHeightUnit()
+ * @see symbolWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit symbolHeightUnit() const { return mSymbolHeightUnit; }
void setSymbolHeightMapUnitScale( const QgsMapUnitScale& scale ) { mSymbolHeightMapUnitScale = scale; }
const QgsMapUnitScale& symbolHeightMapUnitScale() const { return mSymbolHeightMapUnitScale; }
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit ) { mOutlineWidthUnit = unit; }
- QgsSymbolV2::OutputUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
+ /** Sets the units for the symbol's outline width.
+ * @param unit symbol units
+ * @see outlineWidthUnit()
+ */
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit ) { mOutlineWidthUnit = unit; }
+
+ /** Returns the units for the symbol's outline width.
+ * @see setOutlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
void setOutlineWidthMapUnitScale( const QgsMapUnitScale& scale ) { mOutlineWidthMapUnitScale = scale; }
const QgsMapUnitScale& outlineWidthMapUnitScale() const { return mOutlineWidthMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -102,16 +130,16 @@ class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
private:
QString mSymbolName;
double mSymbolWidth;
- QgsSymbolV2::OutputUnit mSymbolWidthUnit;
+ QgsUnitTypes::RenderUnit mSymbolWidthUnit;
QgsMapUnitScale mSymbolWidthMapUnitScale;
double mSymbolHeight;
- QgsSymbolV2::OutputUnit mSymbolHeightUnit;
+ QgsUnitTypes::RenderUnit mSymbolHeightUnit;
QgsMapUnitScale mSymbolHeightMapUnitScale;
QColor mOutlineColor;
Qt::PenStyle mOutlineStyle;
Qt::PenJoinStyle mPenJoinStyle;
double mOutlineWidth;
- QgsSymbolV2::OutputUnit mOutlineWidthUnit;
+ QgsUnitTypes::RenderUnit mOutlineWidthUnit;
QgsMapUnitScale mOutlineWidthMapUnitScale;
QPainterPath mPainterPath;
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
index 6ac334fb261..1ae1d07fab8 100644
--- a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -40,25 +40,25 @@ QgsSimpleFillSymbolLayerV2::QgsSimpleFillSymbolLayerV2( const QColor& color, Qt:
, mBorderColor( borderColor )
, mBorderStyle( borderStyle )
, mBorderWidth( borderWidth )
- , mBorderWidthUnit( QgsSymbolV2::MM )
+ , mBorderWidthUnit( QgsUnitTypes::RenderMillimeters )
, mPenJoinStyle( penJoinStyle )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
{
mColor = color;
}
-void QgsSimpleFillSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsSimpleFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
mBorderWidthUnit = unit;
mOffsetUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsSimpleFillSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsSimpleFillSymbolLayerV2::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = mBorderWidthUnit;
+ QgsUnitTypes::RenderUnit unit = mBorderWidthUnit;
if ( mOffsetUnit != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
@@ -200,18 +200,18 @@ QgsSymbolLayerV2* QgsSimpleFillSymbolLayerV2::create( const QgsStringMap& props
sl->setOffset( offset );
if ( props.contains( "border_width_unit" ) )
{
- sl->setBorderWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["border_width_unit"] ) );
+ sl->setBorderWidthUnit( QgsUnitTypes::decodeRenderUnit( props["border_width_unit"] ) );
}
else if ( props.contains( "outline_width_unit" ) )
{
- sl->setBorderWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["outline_width_unit"] ) );
+ sl->setBorderWidthUnit( QgsUnitTypes::decodeRenderUnit( props["outline_width_unit"] ) );
}
else if ( props.contains( "line_width_unit" ) )
{
- sl->setBorderWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["line_width_unit"] ) );
+ sl->setBorderWidthUnit( QgsUnitTypes::decodeRenderUnit( props["line_width_unit"] ) );
}
if ( props.contains( "offset_unit" ) )
- sl->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ sl->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
if ( props.contains( "border_width_map_unit_scale" ) )
sl->setBorderWidthMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["border_width_map_unit_scale"] ) );
@@ -303,11 +303,11 @@ QgsStringMap QgsSimpleFillSymbolLayerV2::properties() const
map["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mBorderColor );
map["outline_style"] = QgsSymbolLayerV2Utils::encodePenStyle( mBorderStyle );
map["outline_width"] = QString::number( mBorderWidth );
- map["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mBorderWidthUnit );
+ map["outline_width_unit"] = QgsUnitTypes::encodeUnit( mBorderWidthUnit );
map["border_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mBorderWidthMapUnitScale );
map["joinstyle"] = QgsSymbolLayerV2Utils::encodePenJoinStyle( mPenJoinStyle );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
saveDataDefinedProperties( map );
return map;
@@ -472,7 +472,7 @@ QgsGradientFillSymbolLayerV2::QgsGradientFillSymbolLayerV2( const QColor& color,
, mReferencePoint1IsCentroid( false )
, mReferencePoint2( QPointF( 0.5, 1 ) )
, mReferencePoint2IsCentroid( false )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
{
mColor = color;
mColor2 = color2;
@@ -543,7 +543,7 @@ QgsSymbolLayerV2* QgsGradientFillSymbolLayerV2::create( const QgsStringMap& prop
QgsGradientFillSymbolLayerV2* sl = new QgsGradientFillSymbolLayerV2( color, color2, colorType, type, coordinateMode, gradientSpread );
sl->setOffset( offset );
if ( props.contains( "offset_unit" ) )
- sl->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ sl->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
if ( props.contains( "offset_map_unit_scale" ) )
sl->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_map_unit_scale"] ) );
sl->setReferencePoint1( referencePoint1 );
@@ -890,7 +890,7 @@ QgsStringMap QgsGradientFillSymbolLayerV2::properties() const
map["reference_point2_iscentroid"] = QString::number( mReferencePoint2IsCentroid );
map["angle"] = QString::number( mAngle );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
saveDataDefinedProperties( map );
if ( mGradientRamp )
@@ -924,12 +924,12 @@ double QgsGradientFillSymbolLayerV2::estimateMaxBleed() const
return offsetBleed;
}
-void QgsGradientFillSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsGradientFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
mOffsetUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsGradientFillSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsGradientFillSymbolLayerV2::outputUnit() const
{
return mOffsetUnit;
}
@@ -951,13 +951,13 @@ QgsShapeburstFillSymbolLayerV2::QgsShapeburstFillSymbolLayerV2( const QColor& co
: mBlurRadius( blurRadius )
, mUseWholeShape( useWholeShape )
, mMaxDistance( maxDistance )
- , mDistanceUnit( QgsSymbolV2::MM )
+ , mDistanceUnit( QgsUnitTypes::RenderMillimeters )
, mColorType( colorType )
, mColor2( color2 )
, mGradientRamp( nullptr )
, mTwoColorGradientRamp( nullptr )
, mIgnoreRings( false )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
{
mColor = color;
}
@@ -1026,11 +1026,11 @@ QgsSymbolLayerV2* QgsShapeburstFillSymbolLayerV2::create( const QgsStringMap& pr
sl->setOffset( offset );
if ( props.contains( "offset_unit" ) )
{
- sl->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ sl->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
}
if ( props.contains( "distance_unit" ) )
{
- sl->setDistanceUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["distance_unit"] ) );
+ sl->setDistanceUnit( QgsUnitTypes::decodeRenderUnit( props["distance_unit"] ) );
}
if ( props.contains( "offset_map_unit_scale" ) )
{
@@ -1485,11 +1485,11 @@ QgsStringMap QgsShapeburstFillSymbolLayerV2::properties() const
map["blur_radius"] = QString::number( mBlurRadius );
map["use_whole_shape"] = QString::number( mUseWholeShape );
map["max_distance"] = QString::number( mMaxDistance );
- map["distance_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mDistanceUnit );
+ map["distance_unit"] = QgsUnitTypes::encodeUnit( mDistanceUnit );
map["distance_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mDistanceMapUnitScale );
map["ignore_rings"] = QString::number( mIgnoreRings );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
saveDataDefinedProperties( map );
@@ -1526,19 +1526,19 @@ double QgsShapeburstFillSymbolLayerV2::estimateMaxBleed() const
return offsetBleed;
}
-void QgsShapeburstFillSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsShapeburstFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
mDistanceUnit = unit;
mOffsetUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsShapeburstFillSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsShapeburstFillSymbolLayerV2::outputUnit() const
{
if ( mDistanceUnit == mOffsetUnit )
{
return mDistanceUnit;
}
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
void QgsShapeburstFillSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale )
@@ -1562,7 +1562,7 @@ QgsMapUnitScale QgsShapeburstFillSymbolLayerV2::mapUnitScale() const
QgsImageFillSymbolLayer::QgsImageFillSymbolLayer()
: mNextAngle( 0.0 )
, mOutlineWidth( 0.0 )
- , mOutlineWidthUnit( QgsSymbolV2::MM )
+ , mOutlineWidthUnit( QgsUnitTypes::RenderMillimeters )
, mOutline( nullptr )
{
setSubSymbol( new QgsLineSymbolV2() );
@@ -1656,12 +1656,12 @@ bool QgsImageFillSymbolLayer::setSubSymbol( QgsSymbolV2* symbol )
return false;
}
-void QgsImageFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsImageFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
mOutlineWidthUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsImageFillSymbolLayer::outputUnit() const
+QgsUnitTypes::RenderUnit QgsImageFillSymbolLayer::outputUnit() const
{
return mOutlineWidthUnit;
}
@@ -1736,8 +1736,8 @@ QSet QgsImageFillSymbolLayer::usedAttributes() const
QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString& svgFilePath, double width, double angle )
: QgsImageFillSymbolLayer()
, mPatternWidth( width )
- , mPatternWidthUnit( QgsSymbolV2::MM )
- , mSvgOutlineWidthUnit( QgsSymbolV2::MM )
+ , mPatternWidthUnit( QgsUnitTypes::RenderMillimeters )
+ , mSvgOutlineWidthUnit( QgsUnitTypes::RenderMillimeters )
{
setSvgFilePath( svgFilePath );
mOutlineWidth = 0.3;
@@ -1752,9 +1752,9 @@ QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString& svgFilePath, double
QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QByteArray& svgData, double width, double angle )
: QgsImageFillSymbolLayer()
, mPatternWidth( width )
- , mPatternWidthUnit( QgsSymbolV2::MM )
+ , mPatternWidthUnit( QgsUnitTypes::RenderMillimeters )
, mSvgData( svgData )
- , mSvgOutlineWidthUnit( QgsSymbolV2::MM )
+ , mSvgOutlineWidthUnit( QgsUnitTypes::RenderMillimeters )
{
storeViewBox();
mOutlineWidth = 0.3;
@@ -1772,7 +1772,7 @@ QgsSVGFillSymbolLayer::~QgsSVGFillSymbolLayer()
delete mSvgPattern;
}
-void QgsSVGFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsSVGFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsImageFillSymbolLayer::setOutputUnit( unit );
mPatternWidthUnit = unit;
@@ -1780,12 +1780,12 @@ void QgsSVGFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit )
mOutlineWidthUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsSVGFillSymbolLayer::outputUnit() const
+QgsUnitTypes::RenderUnit QgsSVGFillSymbolLayer::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = QgsImageFillSymbolLayer::outputUnit();
+ QgsUnitTypes::RenderUnit unit = QgsImageFillSymbolLayer::outputUnit();
if ( mPatternWidthUnit != unit || mSvgOutlineWidthUnit != unit || mOutlineWidthUnit != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
@@ -1894,7 +1894,7 @@ QgsSymbolLayerV2* QgsSVGFillSymbolLayer::create( const QgsStringMap& properties
//units
if ( properties.contains( "pattern_width_unit" ) )
{
- symbolLayer->setPatternWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["pattern_width_unit"] ) );
+ symbolLayer->setPatternWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["pattern_width_unit"] ) );
}
if ( properties.contains( "pattern_width_map_unit_scale" ) )
{
@@ -1902,7 +1902,7 @@ QgsSymbolLayerV2* QgsSVGFillSymbolLayer::create( const QgsStringMap& properties
}
if ( properties.contains( "svg_outline_width_unit" ) )
{
- symbolLayer->setSvgOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["svg_outline_width_unit"] ) );
+ symbolLayer->setSvgOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["svg_outline_width_unit"] ) );
}
if ( properties.contains( "svg_outline_width_map_unit_scale" ) )
{
@@ -1910,7 +1910,7 @@ QgsSymbolLayerV2* QgsSVGFillSymbolLayer::create( const QgsStringMap& properties
}
if ( properties.contains( "outline_width_unit" ) )
{
- symbolLayer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["outline_width_unit"] ) );
+ symbolLayer->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["outline_width_unit"] ) );
}
if ( properties.contains( "outline_width_map_unit_scale" ) )
{
@@ -1927,9 +1927,9 @@ QString QgsSVGFillSymbolLayer::layerType() const
return "SVGFill";
}
-void QgsSVGFillSymbolLayer::applyPattern( QBrush& brush, const QString& svgFilePath, double patternWidth, QgsSymbolV2::OutputUnit patternWidthUnit,
+void QgsSVGFillSymbolLayer::applyPattern( QBrush& brush, const QString& svgFilePath, double patternWidth, QgsUnitTypes::RenderUnit patternWidthUnit,
const QColor& svgFillColor, const QColor& svgOutlineColor, double svgOutlineWidth,
- QgsSymbolV2::OutputUnit svgOutlineWidthUnit, const QgsSymbolV2RenderContext& context,
+ QgsUnitTypes::RenderUnit svgOutlineWidthUnit, const QgsSymbolV2RenderContext& context,
const QgsMapUnitScale& patternWidthMapUnitScale, const QgsMapUnitScale& svgOutlineWidthMapUnitScale )
{
if ( mSvgViewBox.isNull() )
@@ -2026,11 +2026,11 @@ QgsStringMap QgsSVGFillSymbolLayer::properties() const
map.insert( "outline_width", QString::number( mSvgOutlineWidth ) );
//units
- map.insert( "pattern_width_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mPatternWidthUnit ) );
+ map.insert( "pattern_width_unit", QgsUnitTypes::encodeUnit( mPatternWidthUnit ) );
map.insert( "pattern_width_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mPatternWidthMapUnitScale ) );
- map.insert( "svg_outline_width_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mSvgOutlineWidthUnit ) );
+ map.insert( "svg_outline_width_unit", QgsUnitTypes::encodeUnit( mSvgOutlineWidthUnit ) );
map.insert( "svg_outline_width_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mSvgOutlineWidthMapUnitScale ) );
- map.insert( "outline_width_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit ) );
+ map.insert( "outline_width_unit", QgsUnitTypes::encodeUnit( mOutlineWidthUnit ) );
map.insert( "outline_width_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale ) );
saveDataDefinedProperties( map );
@@ -2307,12 +2307,12 @@ void QgsSVGFillSymbolLayer::setDefaultSvgParams()
QgsLinePatternFillSymbolLayer::QgsLinePatternFillSymbolLayer()
: QgsImageFillSymbolLayer()
, mDistance( 5.0 )
- , mDistanceUnit( QgsSymbolV2::MM )
+ , mDistanceUnit( QgsUnitTypes::RenderMillimeters )
, mLineWidth( 0 )
- , mLineWidthUnit( QgsSymbolV2::MM )
+ , mLineWidthUnit( QgsUnitTypes::RenderMillimeters )
, mLineAngle( 45.0 )
, mOffset( 0.0 )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
, mFillLineSymbol( nullptr )
{
setSubSymbol( new QgsLineSymbolV2() );
@@ -2381,7 +2381,7 @@ double QgsLinePatternFillSymbolLayer::estimateMaxBleed() const
return 0;
}
-void QgsLinePatternFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsLinePatternFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsImageFillSymbolLayer::setOutputUnit( unit );
mDistanceUnit = unit;
@@ -2389,12 +2389,12 @@ void QgsLinePatternFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit
mOffsetUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsLinePatternFillSymbolLayer::outputUnit() const
+QgsUnitTypes::RenderUnit QgsLinePatternFillSymbolLayer::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = QgsImageFillSymbolLayer::outputUnit();
+ QgsUnitTypes::RenderUnit unit = QgsImageFillSymbolLayer::outputUnit();
if ( mDistanceUnit != unit || mLineWidthUnit != unit || mOffsetUnit != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
@@ -2484,7 +2484,7 @@ QgsSymbolLayerV2* QgsLinePatternFillSymbolLayer::create( const QgsStringMap& pro
if ( properties.contains( "distance_unit" ) )
{
- patternLayer->setDistanceUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["distance_unit"] ) );
+ patternLayer->setDistanceUnit( QgsUnitTypes::decodeRenderUnit( properties["distance_unit"] ) );
}
if ( properties.contains( "distance_map_unit_scale" ) )
{
@@ -2492,11 +2492,11 @@ QgsSymbolLayerV2* QgsLinePatternFillSymbolLayer::create( const QgsStringMap& pro
}
if ( properties.contains( "line_width_unit" ) )
{
- patternLayer->setLineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["line_width_unit"] ) );
+ patternLayer->setLineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["line_width_unit"] ) );
}
else if ( properties.contains( "outline_width_unit" ) )
{
- patternLayer->setLineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["outline_width_unit"] ) );
+ patternLayer->setLineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["outline_width_unit"] ) );
}
if ( properties.contains( "line_width_map_unit_scale" ) )
{
@@ -2504,7 +2504,7 @@ QgsSymbolLayerV2* QgsLinePatternFillSymbolLayer::create( const QgsStringMap& pro
}
if ( properties.contains( "offset_unit" ) )
{
- patternLayer->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["offset_unit"] ) );
+ patternLayer->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( properties["offset_unit"] ) );
}
if ( properties.contains( "offset_map_unit_scale" ) )
{
@@ -2512,7 +2512,7 @@ QgsSymbolLayerV2* QgsLinePatternFillSymbolLayer::create( const QgsStringMap& pro
}
if ( properties.contains( "outline_width_unit" ) )
{
- patternLayer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["outline_width_unit"] ) );
+ patternLayer->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["outline_width_unit"] ) );
}
if ( properties.contains( "outline_width_map_unit_scale" ) )
{
@@ -2567,7 +2567,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContext
// offset regardless units. This has to be fixed especially
// in estimateMaxBleed(), context probably has to be used.
// For now, we only support millimeters
- double outputPixelLayerBleed = layerBleed * QgsSymbolLayerV2Utils::pixelSizeScaleFactor( ctx, QgsSymbolV2::MM );
+ double outputPixelLayerBleed = layerBleed * QgsSymbolLayerV2Utils::pixelSizeScaleFactor( ctx, QgsUnitTypes::RenderMillimeters );
outputPixelBleed = qMax( outputPixelBleed, outputPixelLayerBleed );
QgsMarkerLineSymbolLayerV2 *markerLineLayer = dynamic_cast( layer );
@@ -2842,13 +2842,13 @@ QgsStringMap QgsLinePatternFillSymbolLayer::properties() const
map.insert( "line_width", QString::number( mLineWidth ) );
map.insert( "color", QgsSymbolLayerV2Utils::encodeColor( mColor ) );
map.insert( "offset", QString::number( mOffset ) );
- map.insert( "distance_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mDistanceUnit ) );
- map.insert( "line_width_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mLineWidthUnit ) );
- map.insert( "offset_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit ) );
+ map.insert( "distance_unit", QgsUnitTypes::encodeUnit( mDistanceUnit ) );
+ map.insert( "line_width_unit", QgsUnitTypes::encodeUnit( mLineWidthUnit ) );
+ map.insert( "offset_unit", QgsUnitTypes::encodeUnit( mOffsetUnit ) );
map.insert( "distance_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mDistanceMapUnitScale ) );
map.insert( "line_width_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mLineWidthMapUnitScale ) );
map.insert( "offset_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale ) );
- map.insert( "outline_width_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit ) );
+ map.insert( "outline_width_unit", QgsUnitTypes::encodeUnit( mOutlineWidthUnit ) );
map.insert( "outline_width_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale ) );
saveDataDefinedProperties( map );
return map;
@@ -3036,13 +3036,13 @@ QgsPointPatternFillSymbolLayer::QgsPointPatternFillSymbolLayer()
: QgsImageFillSymbolLayer()
, mMarkerSymbol( nullptr )
, mDistanceX( 15 )
- , mDistanceXUnit( QgsSymbolV2::MM )
+ , mDistanceXUnit( QgsUnitTypes::RenderMillimeters )
, mDistanceY( 15 )
- , mDistanceYUnit( QgsSymbolV2::MM )
+ , mDistanceYUnit( QgsUnitTypes::RenderMillimeters )
, mDisplacementX( 0 )
- , mDisplacementXUnit( QgsSymbolV2::MM )
+ , mDisplacementXUnit( QgsUnitTypes::RenderMillimeters )
, mDisplacementY( 0 )
- , mDisplacementYUnit( QgsSymbolV2::MM )
+ , mDisplacementYUnit( QgsUnitTypes::RenderMillimeters )
{
mDistanceX = 15;
mDistanceY = 15;
@@ -3057,7 +3057,7 @@ QgsPointPatternFillSymbolLayer::~QgsPointPatternFillSymbolLayer()
delete mMarkerSymbol;
}
-void QgsPointPatternFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsPointPatternFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsImageFillSymbolLayer::setOutputUnit( unit );
mDistanceXUnit = unit;
@@ -3066,12 +3066,12 @@ void QgsPointPatternFillSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit
mDisplacementYUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsPointPatternFillSymbolLayer::outputUnit() const
+QgsUnitTypes::RenderUnit QgsPointPatternFillSymbolLayer::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = QgsImageFillSymbolLayer::outputUnit();
+ QgsUnitTypes::RenderUnit unit = QgsImageFillSymbolLayer::outputUnit();
if ( mDistanceXUnit != unit || mDistanceYUnit != unit || mDisplacementXUnit != unit || mDisplacementYUnit != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
@@ -3119,7 +3119,7 @@ QgsSymbolLayerV2* QgsPointPatternFillSymbolLayer::create( const QgsStringMap& pr
if ( properties.contains( "distance_x_unit" ) )
{
- layer->setDistanceXUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["distance_x_unit"] ) );
+ layer->setDistanceXUnit( QgsUnitTypes::decodeRenderUnit( properties["distance_x_unit"] ) );
}
if ( properties.contains( "distance_x_map_unit_scale" ) )
{
@@ -3127,7 +3127,7 @@ QgsSymbolLayerV2* QgsPointPatternFillSymbolLayer::create( const QgsStringMap& pr
}
if ( properties.contains( "distance_y_unit" ) )
{
- layer->setDistanceYUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["distance_y_unit"] ) );
+ layer->setDistanceYUnit( QgsUnitTypes::decodeRenderUnit( properties["distance_y_unit"] ) );
}
if ( properties.contains( "distance_y_map_unit_scale" ) )
{
@@ -3135,7 +3135,7 @@ QgsSymbolLayerV2* QgsPointPatternFillSymbolLayer::create( const QgsStringMap& pr
}
if ( properties.contains( "displacement_x_unit" ) )
{
- layer->setDisplacementXUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["displacement_x_unit"] ) );
+ layer->setDisplacementXUnit( QgsUnitTypes::decodeRenderUnit( properties["displacement_x_unit"] ) );
}
if ( properties.contains( "displacement_x_map_unit_scale" ) )
{
@@ -3143,7 +3143,7 @@ QgsSymbolLayerV2* QgsPointPatternFillSymbolLayer::create( const QgsStringMap& pr
}
if ( properties.contains( "displacement_y_unit" ) )
{
- layer->setDisplacementYUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["displacement_y_unit"] ) );
+ layer->setDisplacementYUnit( QgsUnitTypes::decodeRenderUnit( properties["displacement_y_unit"] ) );
}
if ( properties.contains( "displacement_y_map_unit_scale" ) )
{
@@ -3151,7 +3151,7 @@ QgsSymbolLayerV2* QgsPointPatternFillSymbolLayer::create( const QgsStringMap& pr
}
if ( properties.contains( "outline_width_unit" ) )
{
- layer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["outline_width_unit"] ) );
+ layer->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["outline_width_unit"] ) );
}
if ( properties.contains( "outline_width_map_unit_scale" ) )
{
@@ -3262,15 +3262,15 @@ QgsStringMap QgsPointPatternFillSymbolLayer::properties() const
map.insert( "distance_y", QString::number( mDistanceY ) );
map.insert( "displacement_x", QString::number( mDisplacementX ) );
map.insert( "displacement_y", QString::number( mDisplacementY ) );
- map.insert( "distance_x_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mDistanceXUnit ) );
- map.insert( "distance_y_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mDistanceYUnit ) );
- map.insert( "displacement_x_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mDisplacementXUnit ) );
- map.insert( "displacement_y_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mDisplacementYUnit ) );
+ map.insert( "distance_x_unit", QgsUnitTypes::encodeUnit( mDistanceXUnit ) );
+ map.insert( "distance_y_unit", QgsUnitTypes::encodeUnit( mDistanceYUnit ) );
+ map.insert( "displacement_x_unit", QgsUnitTypes::encodeUnit( mDisplacementXUnit ) );
+ map.insert( "displacement_y_unit", QgsUnitTypes::encodeUnit( mDisplacementYUnit ) );
map.insert( "distance_x_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mDistanceXMapUnitScale ) );
map.insert( "distance_y_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mDistanceYMapUnitScale ) );
map.insert( "displacement_x_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mDisplacementXMapUnitScale ) );
map.insert( "displacement_y_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mDisplacementYMapUnitScale ) );
- map.insert( "outline_width_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit ) );
+ map.insert( "outline_width_unit", QgsUnitTypes::encodeUnit( mOutlineWidthUnit ) );
map.insert( "outline_width_map_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale ) );
saveDataDefinedProperties( map );
return map;
@@ -3588,7 +3588,7 @@ QSet QgsCentroidFillSymbolLayerV2::usedAttributes() const
return attributes;
}
-void QgsCentroidFillSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsCentroidFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
if ( mMarker )
{
@@ -3596,13 +3596,13 @@ void QgsCentroidFillSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
}
}
-QgsSymbolV2::OutputUnit QgsCentroidFillSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsCentroidFillSymbolLayerV2::outputUnit() const
{
if ( mMarker )
{
return mMarker->outputUnit();
}
- return QgsSymbolV2::Mixed; //mOutputUnit;
+ return QgsUnitTypes::RenderUnknownUnit; //mOutputUnit;
}
void QgsCentroidFillSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale )
@@ -3630,9 +3630,9 @@ QgsRasterFillSymbolLayer::QgsRasterFillSymbolLayer( const QString &imageFilePath
, mImageFilePath( imageFilePath )
, mCoordinateMode( QgsRasterFillSymbolLayer::Feature )
, mAlpha( 1.0 )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
, mWidth( 0.0 )
- , mWidthUnit( QgsSymbolV2::Pixel )
+ , mWidthUnit( QgsUnitTypes::RenderPixels )
{
QgsImageFillSymbolLayer::setSubSymbol( nullptr ); //disable sub symbol
}
@@ -3683,7 +3683,7 @@ QgsSymbolLayerV2 *QgsRasterFillSymbolLayer::create( const QgsStringMap &properti
symbolLayer->setWidth( width );
if ( properties.contains( "offset_unit" ) )
{
- symbolLayer->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["offset_unit"] ) );
+ symbolLayer->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( properties["offset_unit"] ) );
}
if ( properties.contains( "offset_map_unit_scale" ) )
{
@@ -3691,7 +3691,7 @@ QgsSymbolLayerV2 *QgsRasterFillSymbolLayer::create( const QgsStringMap &properti
}
if ( properties.contains( "width_unit" ) )
{
- symbolLayer->setWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["width_unit"] ) );
+ symbolLayer->setWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["width_unit"] ) );
}
if ( properties.contains( "width_map_unit_scale" ) )
{
@@ -3761,11 +3761,11 @@ QgsStringMap QgsRasterFillSymbolLayer::properties() const
map["coordinate_mode"] = QString::number( mCoordinateMode );
map["alpha"] = QString::number( mAlpha );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
map["angle"] = QString::number( mAngle );
map["width"] = QString::number( mWidth );
- map["width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mWidthUnit );
+ map["width_unit"] = QgsUnitTypes::encodeUnit( mWidthUnit );
map["width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mWidthMapUnitScale );
saveDataDefinedProperties( map );
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h
index 6692e47955c..9f0a56515bf 100644
--- a/src/core/symbology-ng/qgsfillsymbollayerv2.h
+++ b/src/core/symbology-ng/qgsfillsymbollayerv2.h
@@ -99,20 +99,36 @@ class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2
void setOffset( QPointF offset ) { mOffset = offset; }
QPointF offset() { return mOffset; }
- void setBorderWidthUnit( QgsSymbolV2::OutputUnit unit ) { mBorderWidthUnit = unit; }
- QgsSymbolV2::OutputUnit borderWidthUnit() const { return mBorderWidthUnit; }
+ /** Sets the units for the width of the fill's border.
+ * @param unit width units
+ * @see borderWidthUnit()
+ */
+ void setBorderWidthUnit( QgsUnitTypes::RenderUnit unit ) { mBorderWidthUnit = unit; }
+
+ /** Returns the units for the width of the fill's border.
+ * @see setBorderWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit borderWidthUnit() const { return mBorderWidthUnit; }
void setBorderWidthMapUnitScale( const QgsMapUnitScale& scale ) { mBorderWidthMapUnitScale = scale; }
const QgsMapUnitScale& borderWidthMapUnitScale() const { return mBorderWidthMapUnitScale; }
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ /** Sets the units for the fill's offset.
+ * @param unit offset units
+ * @see offsetUnit()
+ */
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
+
+ /** Returns the units for the fill's offset.
+ * @see setOffsetUnit()
+ */
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
void setOffsetMapUnitScale( const QgsMapUnitScale& scale ) { mOffsetMapUnitScale = scale; }
const QgsMapUnitScale& offsetMapUnitScale() const { return mOffsetMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -134,14 +150,14 @@ class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2
QColor mBorderColor;
Qt::PenStyle mBorderStyle;
double mBorderWidth;
- QgsSymbolV2::OutputUnit mBorderWidthUnit;
+ QgsUnitTypes::RenderUnit mBorderWidthUnit;
QgsMapUnitScale mBorderWidthMapUnitScale;
Qt::PenJoinStyle mPenJoinStyle;
QPen mPen;
QPen mSelPen;
QPointF mOffset;
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
QgsMapUnitScale mOffsetMapUnitScale;
private:
@@ -259,14 +275,14 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2
QPointF offset() const { return mOffset; }
/** Units for gradient fill offset*/
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
void setOffsetMapUnitScale( const QgsMapUnitScale& scale ) { mOffsetMapUnitScale = scale; }
const QgsMapUnitScale& offsetMapUnitScale() const { return mOffsetMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -288,7 +304,7 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2
bool mReferencePoint2IsCentroid;
QPointF mOffset;
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
QgsMapUnitScale mOffsetMapUnitScale;
private:
@@ -397,14 +413,14 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2
* @see setMaxDistance
* @see distanceUnit
*/
- void setDistanceUnit( QgsSymbolV2::OutputUnit unit ) { mDistanceUnit = unit; }
+ void setDistanceUnit( QgsUnitTypes::RenderUnit unit ) { mDistanceUnit = unit; }
/** Returns the unit for the maximum distance to shade inside of the shape from the polygon's boundary.
* @returns distance unit for the maximum distance
* @note added in 2.3
* @see maxDistance
* @see setDistanceUnit
*/
- QgsSymbolV2::OutputUnit distanceUnit() const { return mDistanceUnit; }
+ QgsUnitTypes::RenderUnit distanceUnit() const { return mDistanceUnit; }
void setDistanceMapUnitScale( const QgsMapUnitScale& scale ) { mDistanceMapUnitScale = scale; }
const QgsMapUnitScale& distanceMapUnitScale() const { return mDistanceMapUnitScale; }
@@ -495,20 +511,20 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2
* @see setOffset
* @see offsetUnit
*/
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
/** Returns the units used for the offset of the shapeburst fill.
* @returns units used for the fill offset
* @note added in 2.3
* @see offset
* @see setOffsetUnit
*/
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
void setOffsetMapUnitScale( const QgsMapUnitScale& scale ) { mOffsetMapUnitScale = scale; }
const QgsMapUnitScale& offsetMapUnitScale() const { return mOffsetMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -521,7 +537,7 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2
bool mUseWholeShape;
double mMaxDistance;
- QgsSymbolV2::OutputUnit mDistanceUnit;
+ QgsUnitTypes::RenderUnit mDistanceUnit;
QgsMapUnitScale mDistanceMapUnitScale;
ShapeburstColorType mColorType;
@@ -532,7 +548,7 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2
bool mIgnoreRings;
QPointF mOffset;
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
QgsMapUnitScale mOffsetMapUnitScale;
private:
@@ -565,14 +581,22 @@ class CORE_EXPORT QgsImageFillSymbolLayer: public QgsFillSymbolLayerV2
virtual QgsSymbolV2* subSymbol() override { return mOutline; }
virtual bool setSubSymbol( QgsSymbolV2* symbol ) override;
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit ) { mOutlineWidthUnit = unit; }
- QgsSymbolV2::OutputUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
+ /** Sets the units for the symbol's outline width.
+ * @param unit symbol units
+ * @see outlineWidthUnit()
+ */
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit ) { mOutlineWidthUnit = unit; }
+
+ /** Returns the units for the symbol's outline width.
+ * @see setOutlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
void setOutlineWidthMapUnitScale( const QgsMapUnitScale& scale ) { mOutlineWidthMapUnitScale = scale; }
const QgsMapUnitScale& outlineWidthMapUnitScale() const { return mOutlineWidthMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -592,7 +616,7 @@ class CORE_EXPORT QgsImageFillSymbolLayer: public QgsFillSymbolLayerV2
/** Outline width*/
double mOutlineWidth;
- QgsSymbolV2::OutputUnit mOutlineWidthUnit;
+ QgsUnitTypes::RenderUnit mOutlineWidthUnit;
QgsMapUnitScale mOutlineWidthMapUnitScale;
/** Custom outline*/
@@ -690,14 +714,14 @@ class CORE_EXPORT QgsRasterFillSymbolLayer: public QgsImageFillSymbolLayer
* @see setOffset
* @see setOffsetMapUnitScale
*/
- void setOffsetUnit( const QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
+ void setOffsetUnit( const QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
/** Returns the units for the fill's offset.
* @returns units for offset
* @see setOffsetUnit
* @see offset
* @see offsetMapUnitScale
*/
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
/** Sets the map unit scale for the fill's offset.
* @param scale map unit scale for offset
@@ -737,14 +761,14 @@ class CORE_EXPORT QgsRasterFillSymbolLayer: public QgsImageFillSymbolLayer
* @see setWidth
* @see setWidthMapUnitScale
*/
- void setWidthUnit( const QgsSymbolV2::OutputUnit unit ) { mWidthUnit = unit; }
+ void setWidthUnit( const QgsUnitTypes::RenderUnit unit ) { mWidthUnit = unit; }
/** Returns the units for the image's width.
* @returns units for width
* @see setWidthUnit
* @see width
* @see widthMapUnitScale
*/
- QgsSymbolV2::OutputUnit widthUnit() const { return mWidthUnit; }
+ QgsUnitTypes::RenderUnit widthUnit() const { return mWidthUnit; }
/** Sets the map unit scale for the image's width.
* @param scale map unit scale for width
@@ -769,11 +793,11 @@ class CORE_EXPORT QgsRasterFillSymbolLayer: public QgsImageFillSymbolLayer
double mAlpha;
QPointF mOffset;
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
QgsMapUnitScale mOffsetMapUnitScale;
double mWidth;
- QgsSymbolV2::OutputUnit mWidthUnit;
+ QgsUnitTypes::RenderUnit mWidthUnit;
QgsMapUnitScale mWidthMapUnitScale;
void applyDataDefinedSettings( QgsSymbolV2RenderContext& context ) override;
@@ -825,20 +849,36 @@ class CORE_EXPORT QgsSVGFillSymbolLayer: public QgsImageFillSymbolLayer
void setSvgOutlineWidth( double w ) { mSvgOutlineWidth = w; }
double svgOutlineWidth() const { return mSvgOutlineWidth; }
- void setPatternWidthUnit( QgsSymbolV2::OutputUnit unit ) { mPatternWidthUnit = unit; }
- QgsSymbolV2::OutputUnit patternWidthUnit() const { return mPatternWidthUnit; }
+ /** Sets the units for the width of the SVG images in the pattern.
+ * @param unit width units
+ * @see patternWidthUnit()
+ */
+ void setPatternWidthUnit( QgsUnitTypes::RenderUnit unit ) { mPatternWidthUnit = unit; }
+
+ /** Returns the units for the width of the SVG images in the pattern.
+ * @see setPatternWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit patternWidthUnit() const { return mPatternWidthUnit; }
void setPatternWidthMapUnitScale( const QgsMapUnitScale& scale ) { mPatternWidthMapUnitScale = scale; }
const QgsMapUnitScale& patternWidthMapUnitScale() const { return mPatternWidthMapUnitScale; }
- void setSvgOutlineWidthUnit( QgsSymbolV2::OutputUnit unit ) { mSvgOutlineWidthUnit = unit; }
- QgsSymbolV2::OutputUnit svgOutlineWidthUnit() const { return mSvgOutlineWidthUnit; }
+ /** Sets the units for the outline width.
+ * @param unit width units
+ * @see svgOutlineWidthUnit()
+ */
+ void setSvgOutlineWidthUnit( QgsUnitTypes::RenderUnit unit ) { mSvgOutlineWidthUnit = unit; }
+
+ /** Returns the units for the outline width.
+ * @see setSvgOutlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit svgOutlineWidthUnit() const { return mSvgOutlineWidthUnit; }
void setSvgOutlineWidthMapUnitScale( const QgsMapUnitScale& scale ) { mSvgOutlineWidthMapUnitScale = scale; }
const QgsMapUnitScale& svgOutlineWidthMapUnitScale() const { return mSvgOutlineWidthMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -846,7 +886,7 @@ class CORE_EXPORT QgsSVGFillSymbolLayer: public QgsImageFillSymbolLayer
protected:
/** Width of the pattern (in output units)*/
double mPatternWidth;
- QgsSymbolV2::OutputUnit mPatternWidthUnit;
+ QgsUnitTypes::RenderUnit mPatternWidthUnit;
QgsMapUnitScale mPatternWidthMapUnitScale;
/** SVG data*/
@@ -862,7 +902,7 @@ class CORE_EXPORT QgsSVGFillSymbolLayer: public QgsImageFillSymbolLayer
//to be replaced in memory
QColor mSvgOutlineColor;
double mSvgOutlineWidth;
- QgsSymbolV2::OutputUnit mSvgOutlineWidthUnit;
+ QgsUnitTypes::RenderUnit mSvgOutlineWidthUnit;
QgsMapUnitScale mSvgOutlineWidthMapUnitScale;
void applyDataDefinedSettings( QgsSymbolV2RenderContext& context ) override;
@@ -873,8 +913,8 @@ class CORE_EXPORT QgsSVGFillSymbolLayer: public QgsImageFillSymbolLayer
void setDefaultSvgParams(); //fills mSvgFillColor, mSvgOutlineColor, mSvgOutlineWidth with default values for mSvgFilePath
/** Applies the svg pattern to the brush*/
- void applyPattern( QBrush& brush, const QString& svgFilePath, double patternWidth, QgsSymbolV2::OutputUnit patternWidthUnit, const QColor& svgFillColor, const QColor& svgOutlineColor,
- double svgOutlineWidth, QgsSymbolV2::OutputUnit svgOutlineWidthUnit, const QgsSymbolV2RenderContext& context, const QgsMapUnitScale& patternWidthMapUnitScale, const QgsMapUnitScale &svgOutlineWidthMapUnitScale );
+ void applyPattern( QBrush& brush, const QString& svgFilePath, double patternWidth, QgsUnitTypes::RenderUnit patternWidthUnit, const QColor& svgFillColor, const QColor& svgOutlineColor,
+ double svgOutlineWidth, QgsUnitTypes::RenderUnit svgOutlineWidthUnit, const QgsSymbolV2RenderContext& context, const QgsMapUnitScale& patternWidthMapUnitScale, const QgsMapUnitScale &svgOutlineWidthMapUnitScale );
};
/** \ingroup core
@@ -908,8 +948,20 @@ class CORE_EXPORT QgsLinePatternFillSymbolLayer: public QgsImageFillSymbolLayer
//getters and setters
void setLineAngle( double a ) { mLineAngle = a; }
double lineAngle() const { return mLineAngle; }
+
+ /** Sets the distance between lines in the fill pattern.
+ * @param d distance. Units are specified by setDistanceUnit()
+ * @see distance()
+ * @see setDistanceUnit()
+ */
void setDistance( double d ) { mDistance = d; }
+
+ /** Returns the distance between lines in the fill pattern. Units are retrieved by distanceUnit().
+ * @see setDistance()
+ * @see distanceUnit()
+ */
double distance() const { return mDistance; }
+
void setLineWidth( double w );
double lineWidth() const { return mLineWidth; }
void setColor( const QColor& c ) override;
@@ -917,26 +969,52 @@ class CORE_EXPORT QgsLinePatternFillSymbolLayer: public QgsImageFillSymbolLayer
void setOffset( double offset ) { mOffset = offset; }
double offset() const { return mOffset; }
- void setDistanceUnit( QgsSymbolV2::OutputUnit unit ) { mDistanceUnit = unit; }
- QgsSymbolV2::OutputUnit distanceUnit() const { return mDistanceUnit; }
+ /** Sets the units for the distance between lines in the fill pattern.
+ * @param unit distance units
+ * @see distanceUnit()
+ * @see setDistance()
+ */
+ void setDistanceUnit( QgsUnitTypes::RenderUnit unit ) { mDistanceUnit = unit; }
+
+ /** Returns the units for the distance between lines in the fill pattern.
+ * @see setDistanceUnit()
+ * @see distance()
+ */
+ QgsUnitTypes::RenderUnit distanceUnit() const { return mDistanceUnit; }
void setDistanceMapUnitScale( const QgsMapUnitScale& scale ) { mDistanceMapUnitScale = scale; }
const QgsMapUnitScale& distanceMapUnitScale() const { return mDistanceMapUnitScale; }
- void setLineWidthUnit( QgsSymbolV2::OutputUnit unit ) { mLineWidthUnit = unit; }
- QgsSymbolV2::OutputUnit lineWidthUnit() const { return mLineWidthUnit; }
+ /** Sets the units for the line's width.
+ * @param unit width units
+ * @see lineWidthUnit()
+ */
+ void setLineWidthUnit( QgsUnitTypes::RenderUnit unit ) { mLineWidthUnit = unit; }
+
+ /** Returns the units for the line's width.
+ * @see setLineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit lineWidthUnit() const { return mLineWidthUnit; }
void setLineWidthMapUnitScale( const QgsMapUnitScale& scale ) { mLineWidthMapUnitScale = scale; }
const QgsMapUnitScale& lineWidthMapUnitScale() const { return mLineWidthMapUnitScale; }
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ /** Sets the units for the line pattern's offset.
+ * @param unit offset units
+ * @see offsetUnit()
+ */
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
+
+ /** Returns the units for the line pattern's offset.
+ * @see setOffsetUnit()
+ */
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
void setOffsetMapUnitScale( const QgsMapUnitScale& scale ) { mOffsetMapUnitScale = scale; }
const QgsMapUnitScale& offsetMapUnitScale() const { return mOffsetMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -949,18 +1027,18 @@ class CORE_EXPORT QgsLinePatternFillSymbolLayer: public QgsImageFillSymbolLayer
protected:
/** Distance (in mm or map units) between lines*/
double mDistance;
- QgsSymbolV2::OutputUnit mDistanceUnit;
+ QgsUnitTypes::RenderUnit mDistanceUnit;
QgsMapUnitScale mDistanceMapUnitScale;
/** Line width (in mm or map units)*/
double mLineWidth;
- QgsSymbolV2::OutputUnit mLineWidthUnit;
+ QgsUnitTypes::RenderUnit mLineWidthUnit;
QgsMapUnitScale mLineWidthMapUnitScale;
QColor mColor;
/** Vector line angle in degrees (0 = horizontal, counterclockwise)*/
double mLineAngle;
/** Offset perpendicular to line direction*/
double mOffset;
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
QgsMapUnitScale mOffsetMapUnitScale;
void applyDataDefinedSettings( QgsSymbolV2RenderContext& context ) override;
@@ -1015,32 +1093,72 @@ class CORE_EXPORT QgsPointPatternFillSymbolLayer: public QgsImageFillSymbolLayer
bool setSubSymbol( QgsSymbolV2* symbol ) override;
virtual QgsSymbolV2* subSymbol() override { return mMarkerSymbol; }
- void setDistanceXUnit( QgsSymbolV2::OutputUnit unit ) { mDistanceXUnit = unit; }
- QgsSymbolV2::OutputUnit distanceXUnit() const { return mDistanceXUnit; }
+ /** Sets the units for the horizontal distance between points in the pattern.
+ * @param unit distance units
+ * @see distanceXUnit()
+ * @see setDistanceYUnit()
+ */
+ void setDistanceXUnit( QgsUnitTypes::RenderUnit unit ) { mDistanceXUnit = unit; }
+
+ /** Returns the units for the horizontal distance between points in the pattern.
+ * @see setDistanceXUnit()
+ * @see distanceYUnit()
+ */
+ QgsUnitTypes::RenderUnit distanceXUnit() const { return mDistanceXUnit; }
void setDistanceXMapUnitScale( const QgsMapUnitScale& scale ) { mDistanceXMapUnitScale = scale; }
const QgsMapUnitScale& distanceXMapUnitScale() const { return mDistanceXMapUnitScale; }
- void setDistanceYUnit( QgsSymbolV2::OutputUnit unit ) { mDistanceYUnit = unit; }
- QgsSymbolV2::OutputUnit distanceYUnit() const { return mDistanceYUnit; }
+ /** Sets the units for the vertical distance between points in the pattern.
+ * @param unit distance units
+ * @see distanceYUnit()
+ * @see setDistanceXUnit()
+ */
+ void setDistanceYUnit( QgsUnitTypes::RenderUnit unit ) { mDistanceYUnit = unit; }
+
+ /** Returns the units for the vertical distance between points in the pattern.
+ * @see setDistanceYUnit()
+ * @see distanceXUnit()
+ */
+ QgsUnitTypes::RenderUnit distanceYUnit() const { return mDistanceYUnit; }
void setDistanceYMapUnitScale( const QgsMapUnitScale& scale ) { mDistanceYMapUnitScale = scale; }
const QgsMapUnitScale& distanceYMapUnitScale() const { return mDistanceYMapUnitScale; }
- void setDisplacementXUnit( QgsSymbolV2::OutputUnit unit ) { mDisplacementXUnit = unit; }
- QgsSymbolV2::OutputUnit displacementXUnit() const { return mDisplacementXUnit; }
+ /** Sets the units for the horizontal displacement between rows in the pattern.
+ * @param unit displacement units
+ * @see displacementXUnit()
+ * @see setDisplacementYUnit()
+ */
+ void setDisplacementXUnit( QgsUnitTypes::RenderUnit unit ) { mDisplacementXUnit = unit; }
+
+ /** Returns the units for the horizontal displacement between rows in the pattern.
+ * @see setDisplacementXUnit()
+ * @see displacementYUnit()
+ */
+ QgsUnitTypes::RenderUnit displacementXUnit() const { return mDisplacementXUnit; }
void setDisplacementXMapUnitScale( const QgsMapUnitScale& scale ) { mDisplacementXMapUnitScale = scale; }
const QgsMapUnitScale& displacementXMapUnitScale() const { return mDisplacementXMapUnitScale; }
- void setDisplacementYUnit( QgsSymbolV2::OutputUnit unit ) { mDisplacementYUnit = unit; }
- QgsSymbolV2::OutputUnit displacementYUnit() const { return mDisplacementYUnit; }
+ /** Sets the units for the vertical displacement between rows in the pattern.
+ * @param unit displacement units
+ * @see displacementYUnit()
+ * @see setDisplacementXUnit()
+ */
+ void setDisplacementYUnit( QgsUnitTypes::RenderUnit unit ) { mDisplacementYUnit = unit; }
+
+ /** Returns the units for the vertical displacement between rows in the pattern.
+ * @see setDisplacementYUnit()
+ * @see displacementXUnit()
+ */
+ QgsUnitTypes::RenderUnit displacementYUnit() const { return mDisplacementYUnit; }
void setDisplacementYMapUnitScale( const QgsMapUnitScale& scale ) { mDisplacementYMapUnitScale = scale; }
const QgsMapUnitScale& displacementYMapUnitScale() const { return mDisplacementYMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -1052,16 +1170,16 @@ class CORE_EXPORT QgsPointPatternFillSymbolLayer: public QgsImageFillSymbolLayer
protected:
QgsMarkerSymbolV2* mMarkerSymbol;
double mDistanceX;
- QgsSymbolV2::OutputUnit mDistanceXUnit;
+ QgsUnitTypes::RenderUnit mDistanceXUnit;
QgsMapUnitScale mDistanceXMapUnitScale;
double mDistanceY;
- QgsSymbolV2::OutputUnit mDistanceYUnit;
+ QgsUnitTypes::RenderUnit mDistanceYUnit;
QgsMapUnitScale mDistanceYMapUnitScale;
double mDisplacementX;
- QgsSymbolV2::OutputUnit mDisplacementXUnit;
+ QgsUnitTypes::RenderUnit mDisplacementXUnit;
QgsMapUnitScale mDisplacementXMapUnitScale;
double mDisplacementY;
- QgsSymbolV2::OutputUnit mDisplacementYUnit;
+ QgsUnitTypes::RenderUnit mDisplacementYUnit;
QgsMapUnitScale mDisplacementYMapUnitScale;
void applyDataDefinedSettings( QgsSymbolV2RenderContext& context ) override;
@@ -1107,8 +1225,8 @@ class CORE_EXPORT QgsCentroidFillSymbolLayerV2 : public QgsFillSymbolLayerV2
QgsSymbolV2* subSymbol() override;
bool setSubSymbol( QgsSymbolV2* symbol ) override;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
diff --git a/src/core/symbology-ng/qgsheatmaprenderer.cpp b/src/core/symbology-ng/qgsheatmaprenderer.cpp
index 1c263956531..3173eec74d3 100644
--- a/src/core/symbology-ng/qgsheatmaprenderer.cpp
+++ b/src/core/symbology-ng/qgsheatmaprenderer.cpp
@@ -37,7 +37,7 @@ QgsHeatmapRenderer::QgsHeatmapRenderer()
, mRadius( 10 )
, mRadiusPixels( 0 )
, mRadiusSquared( 0 )
- , mRadiusUnit( QgsSymbolV2::MM )
+ , mRadiusUnit( QgsUnitTypes::RenderMillimeters )
, mWeightAttrNum( -1 )
, mGradientRamp( nullptr )
, mInvertRamp( false )
@@ -307,14 +307,14 @@ void QgsHeatmapRenderer::modifyRequestExtent( QgsRectangle &extent, QgsRenderCon
//we need to expand out the request extent so that it includes points which are up to the heatmap radius outside of the
//actual visible extent
double extension = 0.0;
- if ( mRadiusUnit == QgsSymbolV2::Pixel )
+ if ( mRadiusUnit == QgsUnitTypes::RenderPixels )
{
- extension = mRadius / QgsSymbolLayerV2Utils::pixelSizeScaleFactor( context, QgsSymbolV2::MapUnit, QgsMapUnitScale() );
+ extension = mRadius / QgsSymbolLayerV2Utils::pixelSizeScaleFactor( context, QgsUnitTypes::RenderMapUnits, QgsMapUnitScale() );
}
- else if ( mRadiusUnit == QgsSymbolV2::MM )
+ else if ( mRadiusUnit == QgsUnitTypes::RenderMillimeters )
{
- double pixelSize = mRadius * QgsSymbolLayerV2Utils::pixelSizeScaleFactor( context, QgsSymbolV2::MM, QgsMapUnitScale() );
- extension = pixelSize / QgsSymbolLayerV2Utils::pixelSizeScaleFactor( context, QgsSymbolV2::MapUnit, QgsMapUnitScale() );
+ double pixelSize = mRadius * QgsSymbolLayerV2Utils::pixelSizeScaleFactor( context, QgsUnitTypes::RenderMillimeters, QgsMapUnitScale() );
+ extension = pixelSize / QgsSymbolLayerV2Utils::pixelSizeScaleFactor( context, QgsUnitTypes::RenderMapUnits, QgsMapUnitScale() );
}
else
{
@@ -330,7 +330,7 @@ QgsFeatureRendererV2* QgsHeatmapRenderer::create( QDomElement& element )
{
QgsHeatmapRenderer* r = new QgsHeatmapRenderer();
r->setRadius( element.attribute( "radius", "50.0" ).toFloat() );
- r->setRadiusUnit( static_cast< QgsSymbolV2::OutputUnit >( element.attribute( "radius_unit", "0" ).toInt() ) );
+ r->setRadiusUnit( static_cast< QgsUnitTypes::RenderUnit >( element.attribute( "radius_unit", "0" ).toInt() ) );
r->setRadiusMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( element.attribute( "radius_map_unit_scale", QString() ) ) );
r->setMaximumValue( element.attribute( "max_value", "0.0" ).toFloat() );
r->setRenderQuality( element.attribute( "quality", "0" ).toInt() );
diff --git a/src/core/symbology-ng/qgsheatmaprenderer.h b/src/core/symbology-ng/qgsheatmaprenderer.h
index 11faa35f0f5..b490c1380b0 100644
--- a/src/core/symbology-ng/qgsheatmaprenderer.h
+++ b/src/core/symbology-ng/qgsheatmaprenderer.h
@@ -103,14 +103,14 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRendererV2
* @see setRadiusUnit
* @see radiusMapUnitScale
*/
- QgsSymbolV2::OutputUnit radiusUnit() const { return mRadiusUnit; }
+ QgsUnitTypes::RenderUnit radiusUnit() const { return mRadiusUnit; }
/** Sets the units used for the heatmap's radius
* @param unit units for heatmap radius
* @see radiusUnit
* @see setRadius
* @see radiusMapUnitScale
*/
- void setRadiusUnit( const QgsSymbolV2::OutputUnit unit ) { mRadiusUnit = unit; }
+ void setRadiusUnit( const QgsUnitTypes::RenderUnit unit ) { mRadiusUnit = unit; }
/** Returns the map unit scale used for the heatmap's radius
* @returns map unit scale for heatmap's radius
@@ -178,7 +178,7 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRendererV2
double mRadius;
int mRadiusPixels;
double mRadiusSquared;
- QgsSymbolV2::OutputUnit mRadiusUnit;
+ QgsUnitTypes::RenderUnit mRadiusUnit;
QgsMapUnitScale mRadiusMapUnitScale;
QString mWeightExpressionString;
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
index a0f21f6d7d6..7f3f4370679 100644
--- a/src/core/symbology-ng/qgslinesymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -36,7 +36,7 @@ QgsSimpleLineSymbolLayerV2::QgsSimpleLineSymbolLayerV2( const QColor& color, dou
, mPenJoinStyle( DEFAULT_SIMPLELINE_JOINSTYLE )
, mPenCapStyle( DEFAULT_SIMPLELINE_CAPSTYLE )
, mUseCustomDashPattern( false )
- , mCustomDashPatternUnit( QgsSymbolV2::MM )
+ , mCustomDashPatternUnit( QgsUnitTypes::RenderMillimeters )
, mDrawInsidePolygon( false )
{
mColor = color;
@@ -44,7 +44,7 @@ QgsSimpleLineSymbolLayerV2::QgsSimpleLineSymbolLayerV2( const QColor& color, dou
mCustomDashVector << 5 << 2;
}
-void QgsSimpleLineSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsSimpleLineSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsLineSymbolLayerV2::setOutputUnit( unit );
mWidthUnit = unit;
@@ -52,12 +52,12 @@ void QgsSimpleLineSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
mCustomDashPatternUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsSimpleLineSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsSimpleLineSymbolLayerV2::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = QgsLineSymbolLayerV2::outputUnit();
+ QgsUnitTypes::RenderUnit unit = QgsLineSymbolLayerV2::outputUnit();
if ( mWidthUnit != unit || mOffsetUnit != unit || mCustomDashPatternUnit != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
@@ -129,23 +129,23 @@ QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2::create( const QgsStringMap& props
QgsSimpleLineSymbolLayerV2* l = new QgsSimpleLineSymbolLayerV2( color, width, penStyle );
if ( props.contains( "line_width_unit" ) )
{
- l->setWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["line_width_unit"] ) );
+ l->setWidthUnit( QgsUnitTypes::decodeRenderUnit( props["line_width_unit"] ) );
}
else if ( props.contains( "outline_width_unit" ) )
{
- l->setWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["outline_width_unit"] ) );
+ l->setWidthUnit( QgsUnitTypes::decodeRenderUnit( props["outline_width_unit"] ) );
}
else if ( props.contains( "width_unit" ) )
{
//pre 2.5 projects used "width_unit"
- l->setWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["width_unit"] ) );
+ l->setWidthUnit( QgsUnitTypes::decodeRenderUnit( props["width_unit"] ) );
}
if ( props.contains( "width_map_unit_scale" ) )
l->setWidthMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["width_map_unit_scale"] ) );
if ( props.contains( "offset" ) )
l->setOffset( props["offset"].toDouble() );
if ( props.contains( "offset_unit" ) )
- l->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ l->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
if ( props.contains( "offset_map_unit_scale" ) )
l->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_map_unit_scale"] ) );
if ( props.contains( "joinstyle" ) )
@@ -163,7 +163,7 @@ QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2::create( const QgsStringMap& props
}
if ( props.contains( "customdash_unit" ) )
{
- l->setCustomDashPatternUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["customdash_unit"] ) );
+ l->setCustomDashPatternUnit( QgsUnitTypes::decodeRenderUnit( props["customdash_unit"] ) );
}
if ( props.contains( "customdash_map_unit_scale" ) )
{
@@ -355,17 +355,17 @@ QgsStringMap QgsSimpleLineSymbolLayerV2::properties() const
QgsStringMap map;
map["line_color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
map["line_width"] = QString::number( mWidth );
- map["line_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mWidthUnit );
+ map["line_width_unit"] = QgsUnitTypes::encodeUnit( mWidthUnit );
map["width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mWidthMapUnitScale );
map["line_style"] = QgsSymbolLayerV2Utils::encodePenStyle( mPenStyle );
map["joinstyle"] = QgsSymbolLayerV2Utils::encodePenJoinStyle( mPenJoinStyle );
map["capstyle"] = QgsSymbolLayerV2Utils::encodePenCapStyle( mPenCapStyle );
map["offset"] = QString::number( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
map["use_custom_dash"] = ( mUseCustomDashPattern ? "1" : "0" );
map["customdash"] = QgsSymbolLayerV2Utils::encodeRealVector( mCustomDashVector );
- map["customdash_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mCustomDashPatternUnit );
+ map["customdash_unit"] = QgsUnitTypes::encodeUnit( mCustomDashPatternUnit );
map["customdash_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mCustomDashPatternMapUnitScale );
map["draw_inside_polygon"] = ( mDrawInsidePolygon ? "1" : "0" );
saveDataDefinedProperties( map );
@@ -594,7 +594,7 @@ double QgsSimpleLineSymbolLayerV2::estimateMaxBleed() const
}
}
-QVector QgsSimpleLineSymbolLayerV2::dxfCustomDashPattern( QgsSymbolV2::OutputUnit& unit ) const
+QVector QgsSimpleLineSymbolLayerV2::dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const
{
unit = mCustomDashPatternUnit;
return mUseCustomDashPattern ? mCustomDashVector : QVector();
@@ -721,11 +721,11 @@ QgsMarkerLineSymbolLayerV2::QgsMarkerLineSymbolLayerV2( bool rotateMarker, doubl
{
mRotateMarker = rotateMarker;
mInterval = interval;
- mIntervalUnit = QgsSymbolV2::MM;
+ mIntervalUnit = QgsUnitTypes::RenderMillimeters;
mMarker = nullptr;
mPlacement = Interval;
mOffsetAlongLine = 0;
- mOffsetAlongLineUnit = QgsSymbolV2::MM;
+ mOffsetAlongLineUnit = QgsUnitTypes::RenderMillimeters;
setSubSymbol( new QgsMarkerSymbolV2() );
}
@@ -753,11 +753,11 @@ QgsSymbolLayerV2* QgsMarkerLineSymbolLayerV2::create( const QgsStringMap& props
}
if ( props.contains( "offset_unit" ) )
{
- x->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ x->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
}
if ( props.contains( "interval_unit" ) )
{
- x->setIntervalUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["interval_unit"] ) );
+ x->setIntervalUnit( QgsUnitTypes::decodeRenderUnit( props["interval_unit"] ) );
}
if ( props.contains( "offset_along_line" ) )
{
@@ -765,7 +765,7 @@ QgsSymbolLayerV2* QgsMarkerLineSymbolLayerV2::create( const QgsStringMap& props
}
if ( props.contains( "offset_along_line_unit" ) )
{
- x->setOffsetAlongLineUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_along_line_unit"] ) );
+ x->setOffsetAlongLineUnit( QgsUnitTypes::decodeRenderUnit( props["offset_along_line_unit"] ) );
}
if ( props.contains(( "offset_along_line_map_unit_scale" ) ) )
{
@@ -1324,11 +1324,11 @@ QgsStringMap QgsMarkerLineSymbolLayerV2::properties() const
map["interval"] = QString::number( mInterval );
map["offset"] = QString::number( mOffset );
map["offset_along_line"] = QString::number( mOffsetAlongLine );
- map["offset_along_line_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetAlongLineUnit );
+ map["offset_along_line_unit"] = QgsUnitTypes::encodeUnit( mOffsetAlongLineUnit );
map["offset_along_line_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetAlongLineMapUnitScale );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
- map["interval_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mIntervalUnit );
+ map["interval_unit"] = QgsUnitTypes::encodeUnit( mIntervalUnit );
map["interval_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mIntervalMapUnitScale );
if ( mPlacement == Vertex )
map["placement"] = "vertex";
@@ -1551,7 +1551,7 @@ double QgsMarkerLineSymbolLayerV2::width() const
return mMarker->size();
}
-void QgsMarkerLineSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsMarkerLineSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsLineSymbolLayerV2::setOutputUnit( unit );
mIntervalUnit = unit;
@@ -1559,12 +1559,12 @@ void QgsMarkerLineSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
mOffsetAlongLineUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsMarkerLineSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsMarkerLineSymbolLayerV2::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = QgsLineSymbolLayerV2::outputUnit();
+ QgsUnitTypes::RenderUnit unit = QgsLineSymbolLayerV2::outputUnit();
if ( mIntervalUnit != unit || mOffsetUnit != unit || mOffsetAlongLineUnit != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.h b/src/core/symbology-ng/qgslinesymbollayerv2.h
index 1481aeb0ae4..ea732247dfb 100644
--- a/src/core/symbology-ng/qgslinesymbollayerv2.h
+++ b/src/core/symbology-ng/qgslinesymbollayerv2.h
@@ -65,8 +65,8 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2
QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const override;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale &scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -87,8 +87,16 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2
bool useCustomDashPattern() const { return mUseCustomDashPattern; }
void setUseCustomDashPattern( bool b ) { mUseCustomDashPattern = b; }
- void setCustomDashPatternUnit( QgsSymbolV2::OutputUnit unit ) { mCustomDashPatternUnit = unit; }
- QgsSymbolV2::OutputUnit customDashPatternUnit() const { return mCustomDashPatternUnit; }
+ /** Sets the units for lengths used in the custom dash pattern.
+ * @param unit length units
+ * @see customDashPatternUnit()
+ */
+ void setCustomDashPatternUnit( QgsUnitTypes::RenderUnit unit ) { mCustomDashPatternUnit = unit; }
+
+ /** Returns the units for lengths used in the custom dash pattern.
+ * @see setCustomDashPatternUnit()
+ */
+ QgsUnitTypes::RenderUnit customDashPatternUnit() const { return mCustomDashPatternUnit; }
const QgsMapUnitScale& customDashPatternMapUnitScale() const { return mCustomDashPatternMapUnitScale; }
void setCustomDashPatternMapUnitScale( const QgsMapUnitScale& scale ) { mCustomDashPatternMapUnitScale = scale; }
@@ -101,7 +109,7 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2
//Set to true if the line should only be drawn inside the polygon
void setDrawInsidePolygon( bool drawInsidePolygon ) { mDrawInsidePolygon = drawInsidePolygon; }
- QVector dxfCustomDashPattern( QgsSymbolV2::OutputUnit& unit ) const override;
+ QVector dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const override;
Qt::PenStyle dxfPenStyle() const override;
double dxfWidth( const QgsDxfExport& e, QgsSymbolV2RenderContext &context ) const override;
@@ -117,7 +125,7 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2
//use a custom dash dot pattern instead of the predefined ones
bool mUseCustomDashPattern;
- QgsSymbolV2::OutputUnit mCustomDashPatternUnit;
+ QgsUnitTypes::RenderUnit mCustomDashPatternUnit;
QgsMapUnitScale mCustomDashPatternMapUnitScale;
/** Vector with an even number of entries for the */
@@ -224,12 +232,17 @@ class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2
void setRotateMarker( bool rotate ) { mRotateMarker = rotate; }
/**
- * The interval between individual markers.
+ * Returns the interval between individual markers. Units are specified through intervalUnits().
+ * @see setInterval()
+ * @see intervalUnit()
*/
double interval() const { return mInterval; }
/**
- * The interval between individual markers.
+ * Sets the interval between individual markers.
+ * @param interval interval size. Units are specified through setIntervalUnits()
+ * @see interval()
+ * @see setIntervalUnits()
*/
void setInterval( double interval ) { mInterval = interval; }
@@ -273,14 +286,14 @@ class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2
* @see setOffsetAlongLineUnit
* @see offsetAlongLine
*/
- QgsSymbolV2::OutputUnit offsetAlongLineUnit() const { return mOffsetAlongLineUnit; }
+ QgsUnitTypes::RenderUnit offsetAlongLineUnit() const { return mOffsetAlongLineUnit; }
/** Sets the unit used for calculating the offset along line for markers.
* @param unit Offset along line unit type.
* @see offsetAlongLineUnit
* @see setOffsetAlongLine
*/
- void setOffsetAlongLineUnit( QgsSymbolV2::OutputUnit unit ) { mOffsetAlongLineUnit = unit; }
+ void setOffsetAlongLineUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetAlongLineUnit = unit; }
/** Returns the map unit scale used for calculating the offset in map units along line for markers.
* @returns Offset along line map unit scale.
@@ -292,14 +305,24 @@ class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2
*/
void setOffsetAlongLineMapUnitScale( const QgsMapUnitScale& scale ) { mOffsetAlongLineMapUnitScale = scale; }
- void setIntervalUnit( QgsSymbolV2::OutputUnit unit ) { mIntervalUnit = unit; }
- QgsSymbolV2::OutputUnit intervalUnit() const { return mIntervalUnit; }
+ /** Sets the units for the interval between markers.
+ * @param unit interval units
+ * @see intervalUnit()
+ * @see setInterval()
+ */
+ void setIntervalUnit( QgsUnitTypes::RenderUnit unit ) { mIntervalUnit = unit; }
+
+ /** Returns the units for the interval between markers.
+ * @see setIntervalUnit()
+ * @see interval()
+ */
+ QgsUnitTypes::RenderUnit intervalUnit() const { return mIntervalUnit; }
void setIntervalMapUnitScale( const QgsMapUnitScale& scale ) { mIntervalMapUnitScale = scale; }
const QgsMapUnitScale& intervalMapUnitScale() const { return mIntervalMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -318,12 +341,12 @@ class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2
bool mRotateMarker;
double mInterval;
- QgsSymbolV2::OutputUnit mIntervalUnit;
+ QgsUnitTypes::RenderUnit mIntervalUnit;
QgsMapUnitScale mIntervalMapUnitScale;
QgsMarkerSymbolV2* mMarker;
Placement mPlacement;
double mOffsetAlongLine; //distance to offset along line before marker is drawn
- QgsSymbolV2::OutputUnit mOffsetAlongLineUnit; //unit for offset along line
+ QgsUnitTypes::RenderUnit mOffsetAlongLineUnit; //unit for offset along line
QgsMapUnitScale mOffsetAlongLineMapUnitScale;
private:
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
index 72ca05f9a99..d43f72e65e3 100644
--- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -90,8 +90,8 @@ QgsSimpleMarkerSymbolLayerBase::QgsSimpleMarkerSymbolLayerBase( QgsSimpleMarkerS
mAngle = angle;
mOffset = QPointF( 0, 0 );
mScaleMethod = scaleMethod;
- mSizeUnit = QgsSymbolV2::MM;
- mOffsetUnit = QgsSymbolV2::MM;
+ mSizeUnit = QgsUnitTypes::RenderMillimeters;
+ mOffsetUnit = QgsUnitTypes::RenderMillimeters;
}
bool QgsSimpleMarkerSymbolLayerBase::shapeIsFilled( QgsSimpleMarkerSymbolLayerBase::Shape shape )
@@ -689,7 +689,7 @@ QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( const QString& name,
, mBorderColor( borderColor )
, mOutlineStyle( Qt::SolidLine )
, mOutlineWidth( 0 )
- , mOutlineWidthUnit( QgsSymbolV2::MM )
+ , mOutlineWidthUnit( QgsUnitTypes::RenderMillimeters )
, mPenJoinStyle( penJoinStyle )
, mName( name )
, mUsingCache( false )
@@ -702,7 +702,7 @@ QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QgsSimpleMarkerSymbo
, mBorderColor( borderColor )
, mOutlineStyle( Qt::SolidLine )
, mOutlineWidth( 0 )
- , mOutlineWidthUnit( QgsSymbolV2::MM )
+ , mOutlineWidthUnit( QgsUnitTypes::RenderMillimeters )
, mPenJoinStyle( penJoinStyle )
, mName( encodeShape( shape ) )
, mUsingCache( false )
@@ -754,11 +754,11 @@ QgsSymbolLayerV2* QgsSimpleMarkerSymbolLayerV2::create( const QgsStringMap& prop
if ( props.contains( "offset" ) )
m->setOffset( QgsSymbolLayerV2Utils::decodePoint( props["offset"] ) );
if ( props.contains( "offset_unit" ) )
- m->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ m->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
if ( props.contains( "offset_map_unit_scale" ) )
m->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_map_unit_scale"] ) );
if ( props.contains( "size_unit" ) )
- m->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["size_unit"] ) );
+ m->setSizeUnit( QgsUnitTypes::decodeRenderUnit( props["size_unit"] ) );
if ( props.contains( "size_map_unit_scale" ) )
m->setSizeMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["size_map_unit_scale"] ) );
@@ -780,11 +780,11 @@ QgsSymbolLayerV2* QgsSimpleMarkerSymbolLayerV2::create( const QgsStringMap& prop
}
if ( props.contains( "outline_width_unit" ) )
{
- m->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["outline_width_unit"] ) );
+ m->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( props["outline_width_unit"] ) );
}
if ( props.contains( "line_width_unit" ) )
{
- m->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["line_width_unit"] ) );
+ m->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( props["line_width_unit"] ) );
}
if ( props.contains( "outline_width_map_unit_scale" ) )
{
@@ -1077,16 +1077,16 @@ QgsStringMap QgsSimpleMarkerSymbolLayerV2::properties() const
map["color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
map["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mBorderColor );
map["size"] = QString::number( mSize );
- map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
+ map["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
map["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
map["angle"] = QString::number( mAngle );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
map["scale_method"] = QgsSymbolLayerV2Utils::encodeScaleMethod( mScaleMethod );
map["outline_style"] = QgsSymbolLayerV2Utils::encodePenStyle( mOutlineStyle );
map["outline_width"] = QString::number( mOutlineWidth );
- map["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit );
+ map["outline_width_unit"] = QgsUnitTypes::encodeUnit( mOutlineWidthUnit );
map["outline_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale );
map["joinstyle"] = QgsSymbolLayerV2Utils::encodePenJoinStyle( mPenJoinStyle );
map["horizontal_anchor_point"] = QString::number( mHorizontalAnchorPoint );
@@ -1290,7 +1290,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
size = QgsSymbolLayerV2Utils::convertToPainterUnits( context.renderContext(), size, mSizeUnit, mSizeMapUnitScale );
}
- if ( mSizeUnit == QgsSymbolV2::MM )
+ if ( mSizeUnit == QgsUnitTypes::RenderMillimeters )
{
size *= mmMapUnitScaleFactor;
}
@@ -1304,7 +1304,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
context.setOriginalValueVariable( mOutlineWidth );
outlineWidth = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_OUTLINE_WIDTH, context, mOutlineWidth ).toDouble();
}
- if ( mSizeUnit == QgsSymbolV2::MM )
+ if ( mSizeUnit == QgsUnitTypes::RenderMillimeters )
{
outlineWidth *= mmMapUnitScaleFactor;
}
@@ -1359,7 +1359,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
if ( angle )
off = _rotatedOffset( off, angle );
- if ( mSizeUnit == QgsSymbolV2::MM )
+ if ( mSizeUnit == QgsUnitTypes::RenderMillimeters )
{
off *= mmMapUnitScaleFactor;
}
@@ -1450,19 +1450,19 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
}
-void QgsSimpleMarkerSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsSimpleMarkerSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsMarkerSymbolLayerV2::setOutputUnit( unit );
mOutlineWidthUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsSimpleMarkerSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsSimpleMarkerSymbolLayerV2::outputUnit() const
{
if ( QgsMarkerSymbolLayerV2::outputUnit() == mOutlineWidthUnit )
{
return mOutlineWidthUnit;
}
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
void QgsSimpleMarkerSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale& scale )
@@ -1573,11 +1573,11 @@ QgsSymbolLayerV2 *QgsFilledMarkerSymbolLayer::create( const QgsStringMap &props
if ( props.contains( "offset" ) )
m->setOffset( QgsSymbolLayerV2Utils::decodePoint( props["offset"] ) );
if ( props.contains( "offset_unit" ) )
- m->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ m->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
if ( props.contains( "offset_map_unit_scale" ) )
m->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_map_unit_scale"] ) );
if ( props.contains( "size_unit" ) )
- m->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["size_unit"] ) );
+ m->setSizeUnit( QgsUnitTypes::decodeRenderUnit( props["size_unit"] ) );
if ( props.contains( "size_map_unit_scale" ) )
m->setSizeMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["size_map_unit_scale"] ) );
if ( props.contains( "horizontal_anchor_point" ) )
@@ -1624,11 +1624,11 @@ QgsStringMap QgsFilledMarkerSymbolLayer::properties() const
QgsStringMap map;
map["name"] = encodeShape( mShape );
map["size"] = QString::number( mSize );
- map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
+ map["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
map["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
map["angle"] = QString::number( mAngle );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
map["scale_method"] = QgsSymbolLayerV2Utils::encodeScaleMethod( mScaleMethod );
map["horizontal_anchor_point"] = QString::number( mHorizontalAnchorPoint );
@@ -1746,7 +1746,7 @@ QgsSvgMarkerSymbolLayerV2::QgsSvgMarkerSymbolLayerV2( const QString& name, doubl
mOffset = QPointF( 0, 0 );
mScaleMethod = scaleMethod;
mOutlineWidth = 0.2;
- mOutlineWidthUnit = QgsSymbolV2::MM;
+ mOutlineWidthUnit = QgsUnitTypes::RenderMillimeters;
mColor = QColor( Qt::black );
mOutlineColor = QColor( Qt::black );
}
@@ -1812,13 +1812,13 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props )
}
if ( props.contains( "size_unit" ) )
- m->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["size_unit"] ) );
+ m->setSizeUnit( QgsUnitTypes::decodeRenderUnit( props["size_unit"] ) );
if ( props.contains( "size_map_unit_scale" ) )
m->setSizeMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["size_map_unit_scale"] ) );
if ( props.contains( "offset" ) )
m->setOffset( QgsSymbolLayerV2Utils::decodePoint( props["offset"] ) );
if ( props.contains( "offset_unit" ) )
- m->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
+ m->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
if ( props.contains( "offset_map_unit_scale" ) )
m->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_map_unit_scale"] ) );
if ( props.contains( "fill" ) )
@@ -1860,11 +1860,11 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props )
if ( props.contains( "outline_width_unit" ) )
{
- m->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["outline_width_unit"] ) );
+ m->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( props["outline_width_unit"] ) );
}
else if ( props.contains( "line_width_unit" ) )
{
- m->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["line_width_unit"] ) );
+ m->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( props["line_width_unit"] ) );
}
if ( props.contains( "outline_width_map_unit_scale" ) )
m->setOutlineWidthMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["outline_width_map_unit_scale"] ) );
@@ -2052,7 +2052,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolV2RenderCon
if ( context.selected() )
{
QPen pen( context.renderContext().selectionColor() );
- double penWidth = QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), QgsSymbolV2::MM );
+ double penWidth = QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), QgsUnitTypes::RenderMillimeters );
if ( penWidth > size / 20 )
{
// keep the pen width from covering symbol
@@ -2149,17 +2149,17 @@ QgsStringMap QgsSvgMarkerSymbolLayerV2::properties() const
QgsStringMap map;
map["name"] = QgsSymbolLayerV2Utils::symbolPathToName( mPath );
map["size"] = QString::number( mSize );
- map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
+ map["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
map["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
map["angle"] = QString::number( mAngle );
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
map["scale_method"] = QgsSymbolLayerV2Utils::encodeScaleMethod( mScaleMethod );
map["color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
map["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mOutlineColor );
map["outline_width"] = QString::number( mOutlineWidth );
- map["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit );
+ map["outline_width_unit"] = QgsUnitTypes::encodeUnit( mOutlineWidthUnit );
map["outline_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale );
map["horizontal_anchor_point"] = QString::number( mHorizontalAnchorPoint );
map["vertical_anchor_point"] = QString::number( mVerticalAnchorPoint );
@@ -2188,18 +2188,18 @@ QgsSvgMarkerSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::clone() const
return m;
}
-void QgsSvgMarkerSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsSvgMarkerSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsMarkerSymbolLayerV2::setOutputUnit( unit );
mOutlineWidthUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsSvgMarkerSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsSvgMarkerSymbolLayerV2::outputUnit() const
{
- QgsSymbolV2::OutputUnit unit = QgsMarkerSymbolLayerV2::outputUnit();
+ QgsUnitTypes::RenderUnit unit = QgsMarkerSymbolLayerV2::outputUnit();
if ( unit != mOutlineWidthUnit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return unit;
}
@@ -2315,7 +2315,7 @@ bool QgsSvgMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScale
}
}
- if ( mSizeUnit == QgsSymbolV2::MM )
+ if ( mSizeUnit == QgsUnitTypes::RenderMillimeters )
{
size *= mmMapUnitScaleFactor;
}
@@ -2334,7 +2334,7 @@ bool QgsSvgMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScale
}
double offsetX = offset.x();
double offsetY = offset.y();
- if ( mSizeUnit == QgsSymbolV2::MM )
+ if ( mSizeUnit == QgsUnitTypes::RenderMillimeters )
{
offsetX *= mmMapUnitScaleFactor;
offsetY *= mmMapUnitScaleFactor;
@@ -2511,12 +2511,12 @@ QgsFontMarkerSymbolLayerV2::QgsFontMarkerSymbolLayerV2( const QString& fontFamil
mAngle = angle;
mSize = pointSize;
mOrigSize = pointSize;
- mSizeUnit = QgsSymbolV2::MM;
+ mSizeUnit = QgsUnitTypes::RenderMillimeters;
mOffset = QPointF( 0, 0 );
- mOffsetUnit = QgsSymbolV2::MM;
+ mOffsetUnit = QgsUnitTypes::RenderMillimeters;
mOutlineColor = DEFAULT_FONTMARKER_BORDERCOLOR;
mOutlineWidth = 0.0;
- mOutlineWidthUnit = QgsSymbolV2::MM;
+ mOutlineWidthUnit = QgsUnitTypes::RenderMillimeters;
mPenJoinStyle = DEFAULT_FONTMARKER_JOINSTYLE;
}
@@ -2553,15 +2553,15 @@ QgsSymbolLayerV2* QgsFontMarkerSymbolLayerV2::create( const QgsStringMap& props
if ( props.contains( "offset" ) )
m->setOffset( QgsSymbolLayerV2Utils::decodePoint( props["offset"] ) );
if ( props.contains( "offset_unit" ) )
- m->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit" ] ) );
+ m->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit" ] ) );
if ( props.contains( "offset_map_unit_scale" ) )
m->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_map_unit_scale" ] ) );
if ( props.contains( "size_unit" ) )
- m->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["size_unit"] ) );
+ m->setSizeUnit( QgsUnitTypes::decodeRenderUnit( props["size_unit"] ) );
if ( props.contains( "size_map_unit_scale" ) )
m->setSizeMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["size_map_unit_scale"] ) );
if ( props.contains( "outline_width_unit" ) )
- m->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["outline_width_unit"] ) );
+ m->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( props["outline_width_unit"] ) );
if ( props.contains( "outline_width_map_unit_scale" ) )
m->setOutlineWidthMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["outline_width_map_unit_scale"] ) );
if ( props.contains( "joinstyle" ) )
@@ -2798,17 +2798,17 @@ QgsStringMap QgsFontMarkerSymbolLayerV2::properties() const
props["font"] = mFontFamily;
props["chr"] = mChr;
props["size"] = QString::number( mSize );
- props["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
+ props["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
props["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
props["color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
props["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mOutlineColor );
props["outline_width"] = QString::number( mOutlineWidth );
- props["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit );
+ props["outline_width_unit"] = QgsUnitTypes::encodeUnit( mOutlineWidthUnit );
props["outline_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale );
props["joinstyle"] = QgsSymbolLayerV2Utils::encodePenJoinStyle( mPenJoinStyle );
props["angle"] = QString::number( mAngle );
props["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- props["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ props["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
props["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
props["horizontal_anchor_point"] = QString::number( mHorizontalAnchorPoint );
props["vertical_anchor_point"] = QString::number( mVerticalAnchorPoint );
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
index 6b9ead63708..576cc57eb99 100644
--- a/src/core/symbology-ng/qgsmarkersymbollayerv2.h
+++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
@@ -249,8 +249,8 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay
void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override;
QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const override;
bool writeDxf( QgsDxfExport &e, double mmMapUnitScaleFactor, const QString &layerName, QgsSymbolV2RenderContext &context, QPointF shift = QPointF( 0.0, 0.0 ) ) const override;
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
QRectF bounds( QPointF point, QgsSymbolV2RenderContext& context ) override;
@@ -339,14 +339,14 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay
* @see setOutlineWidth()
* @see setOutlineWidthMapUnitScale()
*/
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit u ) { mOutlineWidthUnit = u; }
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit u ) { mOutlineWidthUnit = u; }
/** Returns the unit for the width of the marker's outline.
* @see setOutlineWidthUnit()
* @see outlineWidth()
* @see outlineWidthMapUnitScale()
*/
- QgsSymbolV2::OutputUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
/** Sets the map scale for the width of the marker's outline.
* @param scale outline width map unit scale
@@ -391,7 +391,7 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay
//! Outline width
double mOutlineWidth;
//! Outline width units
- QgsSymbolV2::OutputUnit mOutlineWidthUnit;
+ QgsUnitTypes::RenderUnit mOutlineWidthUnit;
//! Outline width map unit scale
QgsMapUnitScale mOutlineWidthMapUnitScale;
//! Outline pen join style
@@ -520,14 +520,22 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
double outlineWidth() const { return mOutlineWidth; }
void setOutlineWidth( double w ) { mOutlineWidth = w; }
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit ) { mOutlineWidthUnit = unit; }
- QgsSymbolV2::OutputUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
+ /** Sets the units for the outline width.
+ * @param unit width units
+ * @see outlineWidthUnit()
+ */
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit ) { mOutlineWidthUnit = unit; }
+
+ /** Returns the units for the outline width.
+ * @see outlineWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
void setOutlineWidthMapUnitScale( const QgsMapUnitScale& scale ) { mOutlineWidthMapUnitScale = scale; }
const QgsMapUnitScale& outlineWidthMapUnitScale() const { return mOutlineWidthMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -543,7 +551,7 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
//to be replaced in memory
QColor mOutlineColor;
double mOutlineWidth;
- QgsSymbolV2::OutputUnit mOutlineWidthUnit;
+ QgsUnitTypes::RenderUnit mOutlineWidthUnit;
QgsMapUnitScale mOutlineWidthMapUnitScale;
private:
@@ -625,10 +633,10 @@ class CORE_EXPORT QgsFontMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
/** Get outline width unit.
* @note added in 2.16 */
- QgsSymbolV2::OutputUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
+ QgsUnitTypes::RenderUnit outlineWidthUnit() const { return mOutlineWidthUnit; }
/** Set outline width unit.
* @note added in 2.16 */
- void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit ) { mOutlineWidthUnit = unit; }
+ void setOutlineWidthUnit( QgsUnitTypes::RenderUnit unit ) { mOutlineWidthUnit = unit; }
/** Get outline width map unit scale.
* @note added in 2.16 */
@@ -661,7 +669,7 @@ class CORE_EXPORT QgsFontMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
QColor mOutlineColor;
double mOutlineWidth;
- QgsSymbolV2::OutputUnit mOutlineWidthUnit;
+ QgsUnitTypes::RenderUnit mOutlineWidthUnit;
QgsMapUnitScale mOutlineWidthMapUnitScale;
Qt::PenJoinStyle mPenJoinStyle;
diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
index 94a036a073c..a4d79067b16 100644
--- a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
+++ b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
@@ -45,7 +45,7 @@ QgsPointDisplacementRenderer::QgsPointDisplacementRenderer( const QString& label
, mLabelAttributeName( labelAttributeName )
, mLabelIndex( -1 )
, mTolerance( 3 )
- , mToleranceUnit( QgsSymbolV2::MM )
+ , mToleranceUnit( QgsUnitTypes::RenderMillimeters )
, mPlacement( Ring )
, mCircleWidth( 0.4 )
, mCircleColor( QColor( 125, 125, 125 ) )
@@ -189,7 +189,7 @@ void QgsPointDisplacementRenderer::drawGroup( const DisplacementGroup& group, Qg
}
}
- QgsSymbolV2RenderContext symbolContext( context, QgsSymbolV2::MM, 1.0, selected );
+ QgsSymbolV2RenderContext symbolContext( context, QgsUnitTypes::RenderMillimeters, 1.0, selected );
QList symbolPositions;
QList labelPositions;
@@ -411,7 +411,7 @@ QgsFeatureRendererV2* QgsPointDisplacementRenderer::create( QDomElement& symbolo
r->setCircleRadiusAddition( symbologyElem.attribute( "circleRadiusAddition", "0.0" ).toDouble() );
r->setMaxLabelScaleDenominator( symbologyElem.attribute( "maxLabelScaleDenominator", "-1" ).toDouble() );
r->setTolerance( symbologyElem.attribute( "tolerance", "0.00001" ).toDouble() );
- r->setToleranceUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( symbologyElem.attribute( "toleranceUnit", "MapUnit" ) ) );
+ r->setToleranceUnit( QgsUnitTypes::decodeRenderUnit( symbologyElem.attribute( "toleranceUnit", "MapUnit" ) ) );
r->setToleranceMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( symbologyElem.attribute( "toleranceUnitScale" ) ) );
//look for an embedded renderer
@@ -444,7 +444,7 @@ QDomElement QgsPointDisplacementRenderer::save( QDomDocument& doc )
rendererElement.setAttribute( "placement", static_cast< int >( mPlacement ) );
rendererElement.setAttribute( "maxLabelScaleDenominator", QString::number( mMaxLabelScaleDenominator ) );
rendererElement.setAttribute( "tolerance", QString::number( mTolerance ) );
- rendererElement.setAttribute( "toleranceUnit", QgsSymbolLayerV2Utils::encodeOutputUnit( mToleranceUnit ) );
+ rendererElement.setAttribute( "toleranceUnit", QgsUnitTypes::encodeUnit( mToleranceUnit ) );
rendererElement.setAttribute( "toleranceUnitScale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mToleranceMapUnitScale ) );
if ( mRenderer )
diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.h b/src/core/symbology-ng/qgspointdisplacementrenderer.h
index 9a20bdb05c7..ab3958d3ada 100644
--- a/src/core/symbology-ng/qgspointdisplacementrenderer.h
+++ b/src/core/symbology-ng/qgspointdisplacementrenderer.h
@@ -166,17 +166,17 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2
* @see toleranceUnit()
* @note added in QGIS 2.12
*/
- void setToleranceUnit( QgsSymbolV2::OutputUnit unit ) { mToleranceUnit = unit; }
+ void setToleranceUnit( QgsUnitTypes::RenderUnit unit ) { mToleranceUnit = unit; }
/** Returns the units for the tolerance distance.
* @see tolerance()
* @see setToleranceUnit()
* @note added in QGIS 2.12
*/
- QgsSymbolV2::OutputUnit toleranceUnit() const { return mToleranceUnit; }
+ QgsUnitTypes::RenderUnit toleranceUnit() const { return mToleranceUnit; }
/** Sets the map unit scale object for the distance tolerance. This is only used if the
- * toleranceUnit() is set to QgsSymbolV2::MapUnit.
+ * toleranceUnit() is set to QgsUnitTypes::MapUnit.
* @param scale scale for distance tolerance
* @see toleranceMapUnitScale()
* @see setToleranceUnit()
@@ -184,7 +184,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2
void setToleranceMapUnitScale( const QgsMapUnitScale& scale ) { mToleranceMapUnitScale = scale; }
/** Returns the map unit scale object for the distance tolerance. This is only used if the
- * toleranceUnit() is set to QgsSymbolV2::MapUnit.
+ * toleranceUnit() is set to QgsUnitTypes::MapUnit.
* @see setToleranceMapUnitScale()
* @see toleranceUnit()
*/
@@ -210,7 +210,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2
/** Tolerance. Points that are closer together are considered as equal*/
double mTolerance;
- QgsSymbolV2::OutputUnit mToleranceUnit;
+ QgsUnitTypes::RenderUnit mToleranceUnit;
QgsMapUnitScale mToleranceMapUnitScale;
Placement mPlacement;
diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp
index fa18e743dd1..63f7cc2f572 100644
--- a/src/core/symbology-ng/qgssymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgssymbollayerv2.cpp
@@ -292,7 +292,7 @@ double QgsSymbolLayerV2::dxfAngle( QgsSymbolV2RenderContext &context ) const
return 0.0;
}
-QVector QgsSymbolLayerV2::dxfCustomDashPattern( QgsSymbolV2::OutputUnit& unit ) const
+QVector QgsSymbolLayerV2::dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const
{
Q_UNUSED( unit );
return QVector();
@@ -491,8 +491,8 @@ QgsMarkerSymbolLayerV2::QgsMarkerSymbolLayerV2( bool locked )
, mAngle( 0 )
, mLineAngle( 0 )
, mSize( 2.0 )
- , mSizeUnit( QgsSymbolV2::MM )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mSizeUnit( QgsUnitTypes::RenderMillimeters )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
, mScaleMethod( QgsSymbolV2::ScaleDiameter )
, mHorizontalAnchorPoint( HCenter )
, mVerticalAnchorPoint( VCenter )
@@ -503,9 +503,9 @@ QgsMarkerSymbolLayerV2::QgsMarkerSymbolLayerV2( bool locked )
QgsLineSymbolLayerV2::QgsLineSymbolLayerV2( bool locked )
: QgsSymbolLayerV2( QgsSymbolV2::Line, locked )
, mWidth( 0 )
- , mWidthUnit( QgsSymbolV2::MM )
+ , mWidthUnit( QgsUnitTypes::RenderMillimeters )
, mOffset( 0 )
- , mOffsetUnit( QgsSymbolV2::MM )
+ , mOffsetUnit( QgsUnitTypes::RenderMillimeters )
{
}
@@ -538,7 +538,7 @@ void QgsMarkerSymbolLayerV2::markerOffset( QgsSymbolV2RenderContext& context, do
}
void QgsMarkerSymbolLayerV2::markerOffset( QgsSymbolV2RenderContext& context, double width, double height,
- QgsSymbolV2::OutputUnit widthUnit, QgsSymbolV2::OutputUnit heightUnit,
+ QgsUnitTypes::RenderUnit widthUnit, QgsUnitTypes::RenderUnit heightUnit,
double& offsetX, double& offsetY, const QgsMapUnitScale& widthMapUnitScale, const QgsMapUnitScale& heightMapUnitScale ) const
{
offsetX = mOffset.x();
@@ -633,17 +633,17 @@ QgsMarkerSymbolLayerV2::VerticalAnchorPoint QgsMarkerSymbolLayerV2::decodeVertic
}
}
-void QgsMarkerSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsMarkerSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
mSizeUnit = unit;
mOffsetUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsMarkerSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsMarkerSymbolLayerV2::outputUnit() const
{
if ( mOffsetUnit != mSizeUnit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
return mOffsetUnit;
}
@@ -663,12 +663,12 @@ QgsMapUnitScale QgsMarkerSymbolLayerV2::mapUnitScale() const
return QgsMapUnitScale();
}
-void QgsLineSymbolLayerV2::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsLineSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
mWidthUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsLineSymbolLayerV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsLineSymbolLayerV2::outputUnit() const
{
return mWidthUnit;
}
diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
index 2e1ad56754d..5e7bbce526e 100644
--- a/src/core/symbology-ng/qgssymbollayerv2.h
+++ b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -124,8 +124,23 @@ class CORE_EXPORT QgsSymbolLayerV2
be affected by data defined symbology rules.*/
virtual double estimateMaxBleed() const { return 0; }
- virtual void setOutputUnit( QgsSymbolV2::OutputUnit unit ) { Q_UNUSED( unit ); }
- virtual QgsSymbolV2::OutputUnit outputUnit() const { return QgsSymbolV2::Mixed; }
+ /** Sets the units to use for sizes and widths within the symbol layer. Individual
+ * symbol layer subclasses will interpret this in different ways, eg a marker symbol
+ * layer may use it to specify the units for the marker size, while a line symbol
+ * layer may use it to specify the units for the line width.
+ * @param unit output units
+ * @see outputUnit()
+ */
+ virtual void setOutputUnit( QgsUnitTypes::RenderUnit unit ) { Q_UNUSED( unit ); }
+
+ /** Returns the units to use for sizes and widths within the symbol layer. Individual
+ * symbol layer subclasses will interpret this in different ways, eg a marker symbol
+ * layer may use it to specify the units for the marker size, while a line symbol
+ * layer may use it to specify the units for the line width.
+ * @returns output unit, or QgsUnitTypes::RenderUnknownUnit if the symbol layer contains mixed units
+ * @see setOutputUnit()
+ */
+ virtual QgsUnitTypes::RenderUnit outputUnit() const { return QgsUnitTypes::RenderUnknownUnit; }
virtual void setMapUnitScale( const QgsMapUnitScale& scale ) { Q_UNUSED( scale ); }
virtual QgsMapUnitScale mapUnitScale() const { return QgsMapUnitScale(); }
@@ -254,7 +269,7 @@ class CORE_EXPORT QgsSymbolLayerV2
virtual double dxfAngle( QgsSymbolV2RenderContext& context ) const;
//! get dash pattern
- virtual QVector dxfCustomDashPattern( QgsSymbolV2::OutputUnit& unit ) const;
+ virtual QVector dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const;
//! get pen style
virtual Qt::PenStyle dxfPenStyle() const;
@@ -480,14 +495,14 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayerV2
* @see setSize()
* @see setSizeMapUnitScale()
*/
- void setSizeUnit( QgsSymbolV2::OutputUnit unit ) { mSizeUnit = unit; }
+ void setSizeUnit( QgsUnitTypes::RenderUnit unit ) { mSizeUnit = unit; }
/** Returns the units for the symbol's size.
* @see setSizeUnit()
* @see size()
* @see sizeMapUnitScale()
*/
- QgsSymbolV2::OutputUnit sizeUnit() const { return mSizeUnit; }
+ QgsUnitTypes::RenderUnit sizeUnit() const { return mSizeUnit; }
/** Sets the map unit scale for the symbol's size.
* @param scale size map unit scale
@@ -538,14 +553,14 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayerV2
* @see setOffset()
* @see setOffsetMapUnitScale()
*/
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
/** Returns the units for the symbol's offset.
* @see setOffsetUnit()
* @see offset()
* @see offsetMapUnitScale()
*/
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
/** Sets the map unit scale for the symbol's offset.
* @param scale offset map unit scale
@@ -602,8 +617,8 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayerV2
virtual void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const
{ Q_UNUSED( props ); element.appendChild( doc.createComment( QString( "QgsMarkerSymbolLayerV2 %1 not implemented yet" ).arg( layerType() ) ) ); }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -644,7 +659,7 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayerV2
//! @note available in python bindings as markerOffset2
void markerOffset( QgsSymbolV2RenderContext& context, double width, double height,
- QgsSymbolV2::OutputUnit widthUnit, QgsSymbolV2::OutputUnit heightUnit,
+ QgsUnitTypes::RenderUnit widthUnit, QgsUnitTypes::RenderUnit heightUnit,
double& offsetX, double& offsetY,
const QgsMapUnitScale &widthMapUnitScale, const QgsMapUnitScale &heightMapUnitScale ) const;
@@ -662,13 +677,13 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayerV2
//! Marker size
double mSize;
//! Marker size unit
- QgsSymbolV2::OutputUnit mSizeUnit;
+ QgsUnitTypes::RenderUnit mSizeUnit;
//! Marker size map unit scale
QgsMapUnitScale mSizeMapUnitScale;
//! Marker offset
QPointF mOffset;
//! Offset units
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
//! Offset map unit scale
QgsMapUnitScale mOffsetMapUnitScale;
//! Marker size scaling method
@@ -699,20 +714,36 @@ class CORE_EXPORT QgsLineSymbolLayerV2 : public QgsSymbolLayerV2
double offset() const { return mOffset; }
void setOffset( double offset ) { mOffset = offset; }
- void setWidthUnit( QgsSymbolV2::OutputUnit unit ) { mWidthUnit = unit; }
- QgsSymbolV2::OutputUnit widthUnit() const { return mWidthUnit; }
+ /** Sets the units for the line's width.
+ * @param unit width units
+ * @see widthUnit()
+ */
+ void setWidthUnit( QgsUnitTypes::RenderUnit unit ) { mWidthUnit = unit; }
+
+ /** Returns the units for the line's width.
+ * @see setWidthUnit()
+ */
+ QgsUnitTypes::RenderUnit widthUnit() const { return mWidthUnit; }
void setWidthMapUnitScale( const QgsMapUnitScale& scale ) { mWidthMapUnitScale = scale; }
const QgsMapUnitScale& widthMapUnitScale() const { return mWidthMapUnitScale; }
- void setOffsetUnit( QgsSymbolV2::OutputUnit unit ) { mOffsetUnit = unit; }
- QgsSymbolV2::OutputUnit offsetUnit() const { return mOffsetUnit; }
+ /** Sets the units for the line's offset.
+ * @param unit offset units
+ * @see offsetUnit()
+ */
+ void setOffsetUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; }
+
+ /** Returns the units for the line's offset.
+ * @see setOffsetUnit()
+ */
+ QgsUnitTypes::RenderUnit offsetUnit() const { return mOffsetUnit; }
void setOffsetMapUnitScale( const QgsMapUnitScale& scale ) { mOffsetMapUnitScale = scale; }
const QgsMapUnitScale& offsetMapUnitScale() const { return mOffsetMapUnitScale; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
@@ -725,10 +756,10 @@ class CORE_EXPORT QgsLineSymbolLayerV2 : public QgsSymbolLayerV2
QgsLineSymbolLayerV2( bool locked = false );
double mWidth;
- QgsSymbolV2::OutputUnit mWidthUnit;
+ QgsUnitTypes::RenderUnit mWidthUnit;
QgsMapUnitScale mWidthMapUnitScale;
double mOffset;
- QgsSymbolV2::OutputUnit mOffsetUnit;
+ QgsUnitTypes::RenderUnit mOffsetUnit;
QgsMapUnitScale mOffsetMapUnitScale;
};
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
index 3c4ca452723..211e34d2f73 100644
--- a/src/core/symbology-ng/qgssymbollayerv2utils.cpp
+++ b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -407,50 +407,16 @@ QgsMapUnitScale QgsSymbolLayerV2Utils::decodeMapUnitScale( const QString& str )
return s;
}
-QString QgsSymbolLayerV2Utils::encodeOutputUnit( QgsSymbolV2::OutputUnit unit )
+QString QgsSymbolLayerV2Utils::encodeSldUom( QgsUnitTypes::RenderUnit unit, double *scaleFactor )
{
switch ( unit )
{
- case QgsSymbolV2::MM:
- return "MM";
- case QgsSymbolV2::MapUnit:
- return "MapUnit";
- case QgsSymbolV2::Pixel:
- return "Pixel";
- case QgsSymbolV2::Percentage:
- return "Percentage";
- default:
- return "MM";
- }
-}
-
-QgsSymbolV2::OutputUnit QgsSymbolLayerV2Utils::decodeOutputUnit( const QString& string )
-{
- QString normalized = string.trimmed().toLower();
-
- if ( normalized == encodeOutputUnit( QgsSymbolV2::MM ).toLower() )
- return QgsSymbolV2::MM;
- if ( normalized == encodeOutputUnit( QgsSymbolV2::MapUnit ).toLower() )
- return QgsSymbolV2::MapUnit;
- if ( normalized == encodeOutputUnit( QgsSymbolV2::Pixel ).toLower() )
- return QgsSymbolV2::Pixel;
- if ( normalized == encodeOutputUnit( QgsSymbolV2::Percentage ).toLower() )
- return QgsSymbolV2::Percentage;
-
- // millimeters are default
- return QgsSymbolV2::MM;
-}
-
-QString QgsSymbolLayerV2Utils::encodeSldUom( QgsSymbolV2::OutputUnit unit, double *scaleFactor )
-{
- switch ( unit )
- {
- case QgsSymbolV2::MapUnit:
+ case QgsUnitTypes::RenderMapUnits:
if ( scaleFactor )
*scaleFactor = 0.001; // from millimeters to meters
return "http://www.opengeospatial.org/se/units/metre";
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
default:
// pixel is the SLD default uom. The "standardized rendering pixel
// size" is defined to be 0.28mm × 0.28mm (millimeters).
@@ -462,26 +428,26 @@ QString QgsSymbolLayerV2Utils::encodeSldUom( QgsSymbolV2::OutputUnit unit, doubl
}
}
-QgsSymbolV2::OutputUnit QgsSymbolLayerV2Utils::decodeSldUom( const QString& str, double *scaleFactor )
+QgsUnitTypes::RenderUnit QgsSymbolLayerV2Utils::decodeSldUom( const QString& str, double *scaleFactor )
{
if ( str == "http://www.opengeospatial.org/se/units/metre" )
{
if ( scaleFactor )
*scaleFactor = 1000.0; // from meters to millimeters
- return QgsSymbolV2::MapUnit;
+ return QgsUnitTypes::RenderMapUnits;
}
else if ( str == "http://www.opengeospatial.org/se/units/foot" )
{
if ( scaleFactor )
*scaleFactor = 304.8; // from feet to meters
- return QgsSymbolV2::MapUnit;
+ return QgsUnitTypes::RenderMapUnits;
}
// pixel is the SLD default uom. The "standardized rendering pixel
// size" is defined to be 0.28mm x 0.28mm (millimeters).
if ( scaleFactor )
*scaleFactor = 1 / 0.00028; // from pixels to millimeters
- return QgsSymbolV2::MM;
+ return QgsUnitTypes::RenderMillimeters;
}
QString QgsSymbolLayerV2Utils::encodeRealVector( const QVector& v )
@@ -625,7 +591,7 @@ double QgsSymbolLayerV2Utils::estimateMaxSymbolBleed( QgsSymbolV2* symbol )
return maxBleed;
}
-QPicture QgsSymbolLayerV2Utils::symbolLayerPreviewPicture( QgsSymbolLayerV2* layer, QgsSymbolV2::OutputUnit units, QSize size, const QgsMapUnitScale& scale )
+QPicture QgsSymbolLayerV2Utils::symbolLayerPreviewPicture( QgsSymbolLayerV2* layer, QgsUnitTypes::RenderUnit units, QSize size, const QgsMapUnitScale& scale )
{
QPicture picture;
QPainter painter;
@@ -639,7 +605,7 @@ QPicture QgsSymbolLayerV2Utils::symbolLayerPreviewPicture( QgsSymbolLayerV2* lay
return picture;
}
-QIcon QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( QgsSymbolLayerV2* layer, QgsSymbolV2::OutputUnit u, QSize size, const QgsMapUnitScale& scale )
+QIcon QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( QgsSymbolLayerV2* layer, QgsUnitTypes::RenderUnit u, QSize size, const QgsMapUnitScale& scale )
{
QPixmap pixmap( size );
pixmap.fill( Qt::transparent );
@@ -1004,7 +970,7 @@ QgsSymbolV2* QgsSymbolLayerV2Utils::loadSymbol( const QDomElement &element )
if ( element.hasAttribute( "outputUnit" ) )
{
- symbol->setOutputUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( element.attribute( "outputUnit" ) ) );
+ symbol->setOutputUnit( QgsUnitTypes::decodeRenderUnit( element.attribute( "outputUnit" ) ) );
}
if ( element.hasAttribute(( "mapUnitScale" ) ) )
{
@@ -3357,13 +3323,13 @@ QColor QgsSymbolLayerV2Utils::parseColorWithAlpha( const QString& colorStr, bool
return QColor();
}
-double QgsSymbolLayerV2Utils::lineWidthScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale )
+double QgsSymbolLayerV2Utils::lineWidthScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale )
{
switch ( u )
{
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
return c.scaleFactor();
- case QgsSymbolV2::MapUnit:
+ case QgsUnitTypes::RenderMapUnits:
{
double mup = scale.computeMapUnitsPerPixel( c );
if ( mup > 0 )
@@ -3375,22 +3341,22 @@ double QgsSymbolLayerV2Utils::lineWidthScaleFactor( const QgsRenderContext& c, Q
return 1.0;
}
}
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
return 1.0 / c.rasterScaleFactor();
- case QgsSymbolV2::Mixed:
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderUnknownUnit:
+ case QgsUnitTypes::RenderPercentage:
//no sensible value
return 1.0;
}
return 1.0;
}
-double QgsSymbolLayerV2Utils::convertToPainterUnits( const QgsRenderContext &c, double size, QgsSymbolV2::OutputUnit unit, const QgsMapUnitScale &scale )
+double QgsSymbolLayerV2Utils::convertToPainterUnits( const QgsRenderContext &c, double size, QgsUnitTypes::RenderUnit unit, const QgsMapUnitScale &scale )
{
double conversionFactor = lineWidthScaleFactor( c, unit, scale );
double convertedSize = size * conversionFactor;
- if ( unit == QgsSymbolV2::MapUnit )
+ if ( unit == QgsUnitTypes::RenderMapUnits )
{
//check max/min size
if ( scale.minSizeMMEnabled )
@@ -3402,13 +3368,13 @@ double QgsSymbolLayerV2Utils::convertToPainterUnits( const QgsRenderContext &c,
return convertedSize;
}
-double QgsSymbolLayerV2Utils::convertToMapUnits( const QgsRenderContext &c, double size, QgsSymbolV2::OutputUnit unit, const QgsMapUnitScale &scale )
+double QgsSymbolLayerV2Utils::convertToMapUnits( const QgsRenderContext &c, double size, QgsUnitTypes::RenderUnit unit, const QgsMapUnitScale &scale )
{
double mup = c.mapToPixel().mapUnitsPerPixel();
switch ( unit )
{
- case QgsSymbolV2::MapUnit:
+ case QgsUnitTypes::RenderMapUnits:
{
// check scale
double minSizeMU = -DBL_MAX;
@@ -3435,30 +3401,30 @@ double QgsSymbolLayerV2Utils::convertToMapUnits( const QgsRenderContext &c, doub
return size;
}
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
{
return size * c.scaleFactor() * c.rasterScaleFactor() * mup;
}
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
{
return size * mup;
}
- case QgsSymbolV2::Mixed:
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderUnknownUnit:
+ case QgsUnitTypes::RenderPercentage:
//no sensible value
return 0.0;
}
return 0.0;
}
-double QgsSymbolLayerV2Utils::pixelSizeScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale )
+double QgsSymbolLayerV2Utils::pixelSizeScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale )
{
switch ( u )
{
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
return ( c.scaleFactor() * c.rasterScaleFactor() );
- case QgsSymbolV2::MapUnit:
+ case QgsUnitTypes::RenderMapUnits:
{
double mup = scale.computeMapUnitsPerPixel( c );
if ( mup > 0 )
@@ -3470,30 +3436,30 @@ double QgsSymbolLayerV2Utils::pixelSizeScaleFactor( const QgsRenderContext& c, Q
return 1.0;
}
}
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
return 1.0;
- case QgsSymbolV2::Mixed:
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderUnknownUnit:
+ case QgsUnitTypes::RenderPercentage:
//no sensible value
return 1.0;
}
return 1.0;
}
-double QgsSymbolLayerV2Utils::mapUnitScaleFactor( const QgsRenderContext &c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale &scale )
+double QgsSymbolLayerV2Utils::mapUnitScaleFactor( const QgsRenderContext &c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale &scale )
{
switch ( u )
{
- case QgsSymbolV2::MM:
+ case QgsUnitTypes::RenderMillimeters:
return scale.computeMapUnitsPerPixel( c ) * c.scaleFactor() * c.rasterScaleFactor();
- case QgsSymbolV2::MapUnit:
+ case QgsUnitTypes::RenderMapUnits:
{
return 1.0;
}
- case QgsSymbolV2::Pixel:
+ case QgsUnitTypes::RenderPixels:
return scale.computeMapUnitsPerPixel( c );
- case QgsSymbolV2::Mixed:
- case QgsSymbolV2::Percentage:
+ case QgsUnitTypes::RenderUnknownUnit:
+ case QgsUnitTypes::RenderPercentage:
//no sensible value
return 1.0;
}
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.h b/src/core/symbology-ng/qgssymbollayerv2utils.h
index f576966326a..2ed86165fc0 100644
--- a/src/core/symbology-ng/qgssymbollayerv2utils.h
+++ b/src/core/symbology-ng/qgssymbollayerv2utils.h
@@ -94,11 +94,21 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
static QString encodeSldRealVector( const QVector& v );
static QVector decodeSldRealVector( const QString& s );
- static QString encodeOutputUnit( QgsSymbolV2::OutputUnit unit );
- static QgsSymbolV2::OutputUnit decodeOutputUnit( const QString& str );
+ /** Encodes a render unit into an SLD unit of measure string.
+ * @param unit unit to encode
+ * @param scaleFactor if specified, will be set to scale factor for unit of measure
+ * @returns encoded string
+ * @see decodeSldUom()
+ */
+ static QString encodeSldUom( QgsUnitTypes::RenderUnit unit, double *scaleFactor );
- static QString encodeSldUom( QgsSymbolV2::OutputUnit unit, double *scaleFactor );
- static QgsSymbolV2::OutputUnit decodeSldUom( const QString& str, double *scaleFactor );
+ /** Decodes a SLD unit of measure string to a render unit.
+ * @param str string to decode
+ * @param scaleFactor if specified, will be set to scale factor for unit of measure
+ * @returns matching render unit
+ * @see encodeSldUom()
+ */
+ static QgsUnitTypes::RenderUnit decodeSldUom( const QString& str, double *scaleFactor );
static QString encodeScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod );
static QgsSymbolV2::ScaleMethod decodeScaleMethod( const QString& str );
@@ -114,9 +124,20 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
* @param scale map unit scale for preview
* @returns QPicture containing symbol layer preview
* @note added in QGIS 2.9
+ * @see symbolLayerPreviewIcon()
*/
- static QPicture symbolLayerPreviewPicture( QgsSymbolLayerV2* layer, QgsSymbolV2::OutputUnit units, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
- static QIcon symbolLayerPreviewIcon( QgsSymbolLayerV2* layer, QgsSymbolV2::OutputUnit u, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static QPicture symbolLayerPreviewPicture( QgsSymbolLayerV2* layer, QgsUnitTypes::RenderUnit units, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+
+ /** Draws a symbol layer preview to an icon.
+ * @param layer symbol layer to draw
+ * @param u size units
+ * @param size target size of preview icon
+ * @param scale map unit scale for preview
+ * @returns icon containing symbol layer preview
+ * @see symbolLayerPreviewPicture()
+ */
+ static QIcon symbolLayerPreviewIcon( QgsSymbolLayerV2* layer, QgsUnitTypes::RenderUnit u, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+
static QIcon colorRampPreviewIcon( QgsVectorColorRampV2* ramp, QSize size );
static void drawStippledBackground( QPainter* painter, QRect rect );
@@ -382,7 +403,7 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
* @param scale map unit scale, specifying limits for the map units to convert from
* @see convertToPainterUnits()
*/
- static double lineWidthScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double lineWidthScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Converts a size from the specied units to painter units. The conversion respects the limits
* specified by the optional scale parameter.
@@ -394,7 +415,7 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
* @see lineWidthScaleFactor()
* @see convertToMapUnits()
*/
- static double convertToPainterUnits( const QgsRenderContext&c, double size, QgsSymbolV2::OutputUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double convertToPainterUnits( const QgsRenderContext&c, double size, QgsUnitTypes::RenderUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Converts a size from the specied units to map units. The conversion respects the limits
* specified by the optional scale parameter.
@@ -405,13 +426,13 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
* @note added in QGIS 2.16
* @see convertToPainterUnits()
*/
- static double convertToMapUnits( const QgsRenderContext&c, double size, QgsSymbolV2::OutputUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double convertToMapUnits( const QgsRenderContext&c, double size, QgsUnitTypes::RenderUnit unit, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Returns scale factor painter units -> pixel dimensions*/
- static double pixelSizeScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double pixelSizeScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Returns scale factor painter units -> map units*/
- static double mapUnitScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
+ static double mapUnitScaleFactor( const QgsRenderContext& c, QgsUnitTypes::RenderUnit u, const QgsMapUnitScale& scale = QgsMapUnitScale() );
/** Creates a render context for a pixel based device*/
static QgsRenderContext createRenderContext( QPainter* p );
diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
index 9b36f933b03..c8c54930502 100644
--- a/src/core/symbology-ng/qgssymbolv2.cpp
+++ b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -250,22 +250,22 @@ QgsSymbolV2::~QgsSymbolV2()
qDeleteAll( mLayers );
}
-QgsSymbolV2::OutputUnit QgsSymbolV2::outputUnit() const
+QgsUnitTypes::RenderUnit QgsSymbolV2::outputUnit() const
{
if ( mLayers.empty() )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
QgsSymbolLayerV2List::const_iterator it = mLayers.constBegin();
- QgsSymbolV2::OutputUnit unit = ( *it )->outputUnit();
+ QgsUnitTypes::RenderUnit unit = ( *it )->outputUnit();
for ( ; it != mLayers.constEnd(); ++it )
{
if (( *it )->outputUnit() != unit )
{
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
}
return unit;
@@ -295,7 +295,7 @@ QgsMapUnitScale QgsSymbolV2::mapUnitScale() const
return scale;
}
-void QgsSymbolV2::setOutputUnit( QgsSymbolV2::OutputUnit u )
+void QgsSymbolV2::setOutputUnit( QgsUnitTypes::RenderUnit u )
{
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
@@ -1029,7 +1029,7 @@ void QgsSymbolV2::renderVertexMarker( QPointF pt, QgsRenderContext& context, int
////////////////////
-QgsSymbolV2RenderContext::QgsSymbolV2RenderContext( QgsRenderContext& c, QgsSymbolV2::OutputUnit u, qreal alpha, bool selected, int renderHints, const QgsFeature* f, const QgsFields* fields, const QgsMapUnitScale& mapUnitScale )
+QgsSymbolV2RenderContext::QgsSymbolV2RenderContext( QgsRenderContext& c, QgsUnitTypes::RenderUnit u, qreal alpha, bool selected, int renderHints, const QgsFeature* f, const QgsFields* fields, const QgsMapUnitScale& mapUnitScale )
: mRenderContext( c )
, mExpressionContextScope( nullptr )
, mOutputUnit( u )
@@ -1275,7 +1275,7 @@ double QgsMarkerSymbolV2::size() const
return maxSize;
}
-void QgsMarkerSymbolV2::setSizeUnit( QgsSymbolV2::OutputUnit unit )
+void QgsMarkerSymbolV2::setSizeUnit( QgsUnitTypes::RenderUnit unit )
{
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
@@ -1287,10 +1287,10 @@ void QgsMarkerSymbolV2::setSizeUnit( QgsSymbolV2::OutputUnit unit )
}
}
-QgsSymbolV2::OutputUnit QgsMarkerSymbolV2::sizeUnit() const
+QgsUnitTypes::RenderUnit QgsMarkerSymbolV2::sizeUnit() const
{
bool first = true;
- OutputUnit unit = Mixed;
+ QgsUnitTypes::RenderUnit unit = QgsUnitTypes::RenderUnknownUnit;
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
@@ -1303,7 +1303,7 @@ QgsSymbolV2::OutputUnit QgsMarkerSymbolV2::sizeUnit() const
else
{
if ( unit != markerLayer->sizeUnit() )
- return Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
first = false;
diff --git a/src/core/symbology-ng/qgssymbolv2.h b/src/core/symbology-ng/qgssymbolv2.h
index 75b29a3d777..1ec2cb43959 100644
--- a/src/core/symbology-ng/qgssymbolv2.h
+++ b/src/core/symbology-ng/qgssymbolv2.h
@@ -57,21 +57,6 @@ class CORE_EXPORT QgsSymbolV2
public:
- /**
- * The unit of the output
- */
- //TODO QGIS 3.0 - move to QgsUnitTypes and rename to SymbolUnit
- enum OutputUnit
- {
- MM = 0, //!< The output shall be in millimeters
- MapUnit, //!< The output shall be in map unitx
- Mixed, //!< Mixed units in symbol layers
- Pixel, //!< The output shall be in pixels
- Percentage, //!< The ouput shall be a percentage of another measurement (eg canvas size, feature size)
- };
-
- typedef QList OutputUnitList;
-
/**
* Type of the symbol
*/
@@ -192,8 +177,23 @@ class CORE_EXPORT QgsSymbolV2
void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const;
- QgsSymbolV2::OutputUnit outputUnit() const;
- void setOutputUnit( QgsSymbolV2::OutputUnit u );
+ /** Returns the units to use for sizes and widths within the symbol. Individual
+ * symbol layer definitions will interpret this in different ways, eg a marker symbol
+ * may use it to specify the units for the marker size, while a line symbol
+ * may use it to specify the units for the line width.
+ * @returns output unit, or QgsUnitTypes::RenderUnknownUnit if the symbol contains mixed units
+ * @see setOutputUnit()
+ */
+ QgsUnitTypes::RenderUnit outputUnit() const;
+
+ /** Sets the units to use for sizes and widths within the symbol. Individual
+ * symbol definitions will interpret this in different ways, eg a marker symbol
+ * may use it to specify the units for the marker size, while a line symbol
+ * may use it to specify the units for the line width.
+ * @param unit output units
+ * @see outputUnit()
+ */
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit );
QgsMapUnitScale mapUnitScale() const;
void setMapUnitScale( const QgsMapUnitScale& scale );
@@ -348,7 +348,18 @@ class CORE_EXPORT QgsSymbolV2
class CORE_EXPORT QgsSymbolV2RenderContext
{
public:
- QgsSymbolV2RenderContext( QgsRenderContext& c, QgsSymbolV2::OutputUnit u, qreal alpha = 1.0, bool selected = false, int renderHints = 0, const QgsFeature* f = nullptr, const QgsFields* fields = nullptr, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() );
+
+ /** Constructor for QgsSymbolV2RenderContext
+ * @param c
+ * @param u
+ * @param alpha
+ * @param selected set to true if symbol should be drawn in a "selected" state
+ * @param renderHints
+ * @param f
+ * @param fields
+ * @param mapUnitScale
+ */
+ QgsSymbolV2RenderContext( QgsRenderContext& c, QgsUnitTypes::RenderUnit u, qreal alpha = 1.0, bool selected = false, int renderHints = 0, const QgsFeature* f = nullptr, const QgsFields* fields = nullptr, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() );
~QgsSymbolV2RenderContext();
QgsRenderContext& renderContext() { return mRenderContext; }
@@ -361,8 +372,11 @@ class CORE_EXPORT QgsSymbolV2RenderContext
*/
void setOriginalValueVariable( const QVariant& value );
- QgsSymbolV2::OutputUnit outputUnit() const { return mOutputUnit; }
- void setOutputUnit( QgsSymbolV2::OutputUnit u ) { mOutputUnit = u; }
+ //! Returns the output unit for the context
+ QgsUnitTypes::RenderUnit outputUnit() const { return mOutputUnit; }
+
+ //! Sets the output unit for the context
+ void setOutputUnit( QgsUnitTypes::RenderUnit u ) { mOutputUnit = u; }
QgsMapUnitScale mapUnitScale() const { return mMapUnitScale; }
void setMapUnitScale( const QgsMapUnitScale& scale ) { mMapUnitScale = scale; }
@@ -430,7 +444,7 @@ class CORE_EXPORT QgsSymbolV2RenderContext
private:
QgsRenderContext& mRenderContext;
QgsExpressionContextScope* mExpressionContextScope;
- QgsSymbolV2::OutputUnit mOutputUnit;
+ QgsUnitTypes::RenderUnit mOutputUnit;
QgsMapUnitScale mMapUnitScale;
qreal mAlpha;
bool mSelected;
@@ -525,7 +539,7 @@ class CORE_EXPORT QgsMarkerSymbolV2 : public QgsSymbolV2
* @see setSizeMapUnitScale()
* @see setSize()
*/
- void setSizeUnit( OutputUnit unit );
+ void setSizeUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the size units for the whole symbol (including all symbol layers).
* @returns size units, or mixed units if symbol layers have different units
@@ -534,7 +548,7 @@ class CORE_EXPORT QgsMarkerSymbolV2 : public QgsSymbolV2
* @see sizeMapUnitScale()
* @see size()
*/
- OutputUnit sizeUnit() const;
+ QgsUnitTypes::RenderUnit sizeUnit() const;
/** Sets the size map unit scale for the whole symbol (including all symbol layers).
* @param scale map unit scale
diff --git a/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp b/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
index b2d7f162db2..401c3aad9c4 100644
--- a/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
+++ b/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
@@ -22,7 +22,7 @@
QgsVectorFieldSymbolLayer::QgsVectorFieldSymbolLayer()
: mXAttribute( "" )
, mYAttribute( "" )
- , mDistanceUnit( QgsSymbolV2::MM )
+ , mDistanceUnit( QgsUnitTypes::RenderMillimeters )
, mScale( 1.0 )
, mVectorFieldType( Cartesian )
, mAngleOrientation( ClockwiseFromNorth )
@@ -39,19 +39,19 @@ QgsVectorFieldSymbolLayer::~QgsVectorFieldSymbolLayer()
delete mLineSymbol;
}
-void QgsVectorFieldSymbolLayer::setOutputUnit( QgsSymbolV2::OutputUnit unit )
+void QgsVectorFieldSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit )
{
QgsMarkerSymbolLayerV2::setOutputUnit( unit );
mDistanceUnit = unit;
}
-QgsSymbolV2::OutputUnit QgsVectorFieldSymbolLayer::outputUnit() const
+QgsUnitTypes::RenderUnit QgsVectorFieldSymbolLayer::outputUnit() const
{
if ( QgsMarkerSymbolLayerV2::outputUnit() == mDistanceUnit )
{
return mDistanceUnit;
}
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
void QgsVectorFieldSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale )
@@ -82,7 +82,7 @@ QgsSymbolLayerV2* QgsVectorFieldSymbolLayer::create( const QgsStringMap& propert
}
if ( properties.contains( "distance_unit" ) )
{
- symbolLayer->setDistanceUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["distance_unit"] ) );
+ symbolLayer->setDistanceUnit( QgsUnitTypes::decodeRenderUnit( properties["distance_unit"] ) );
}
if ( properties.contains( "distance_map_unit_scale" ) )
{
@@ -110,7 +110,7 @@ QgsSymbolLayerV2* QgsVectorFieldSymbolLayer::create( const QgsStringMap& propert
}
if ( properties.contains( "size_unit" ) )
{
- symbolLayer->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["size_unit"] ) );
+ symbolLayer->setSizeUnit( QgsUnitTypes::decodeRenderUnit( properties["size_unit"] ) );
}
if ( properties.contains( "size_map_unit_scale" ) )
{
@@ -122,7 +122,7 @@ QgsSymbolLayerV2* QgsVectorFieldSymbolLayer::create( const QgsStringMap& propert
}
if ( properties.contains( "offset_unit" ) )
{
- symbolLayer->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["offset_unit"] ) );
+ symbolLayer->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( properties["offset_unit"] ) );
}
if ( properties.contains( "offset_map_unit_scale" ) )
{
@@ -246,17 +246,17 @@ QgsStringMap QgsVectorFieldSymbolLayer::properties() const
QgsStringMap properties;
properties["x_attribute"] = mXAttribute;
properties["y_attribute"] = mYAttribute;
- properties["distance_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mDistanceUnit );
+ properties["distance_unit"] = QgsUnitTypes::encodeUnit( mDistanceUnit );
properties["distance_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mDistanceMapUnitScale );
properties["scale"] = QString::number( mScale );
properties["vector_field_type"] = QString::number( mVectorFieldType );
properties["angle_orientation"] = QString::number( mAngleOrientation );
properties["angle_units"] = QString::number( mAngleUnits );
properties["size"] = QString::number( mSize );
- properties["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
+ properties["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
properties["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
properties["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
- properties["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
+ properties["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
properties["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
return properties;
}
diff --git a/src/core/symbology-ng/qgsvectorfieldsymbollayer.h b/src/core/symbology-ng/qgsvectorfieldsymbollayer.h
index 1e608651ce3..1154e0e2b85 100644
--- a/src/core/symbology-ng/qgsvectorfieldsymbollayer.h
+++ b/src/core/symbology-ng/qgsvectorfieldsymbollayer.h
@@ -85,14 +85,22 @@ class CORE_EXPORT QgsVectorFieldSymbolLayer: public QgsMarkerSymbolLayerV2
void setAngleUnits( AngleUnits units ) { mAngleUnits = units; }
AngleUnits angleUnits() const { return mAngleUnits; }
- void setOutputUnit( QgsSymbolV2::OutputUnit unit ) override;
- QgsSymbolV2::OutputUnit outputUnit() const override;
+ void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override;
+ QgsUnitTypes::RenderUnit outputUnit() const override;
void setMapUnitScale( const QgsMapUnitScale& scale ) override;
QgsMapUnitScale mapUnitScale() const override;
- void setDistanceUnit( QgsSymbolV2::OutputUnit unit ) { mDistanceUnit = unit; }
- QgsSymbolV2::OutputUnit distanceUnit() const { return mDistanceUnit; }
+ /** Sets the units for the distance.
+ * @param unit distance units
+ * @see distanceUnit()
+ */
+ void setDistanceUnit( QgsUnitTypes::RenderUnit unit ) { mDistanceUnit = unit; }
+
+ /** Returns the units for the distance.
+ * @see setDistanceUnit()
+ */
+ QgsUnitTypes::RenderUnit distanceUnit() const { return mDistanceUnit; }
void setDistanceMapUnitScale( const QgsMapUnitScale& scale ) { mDistanceMapUnitScale = scale; }
const QgsMapUnitScale& distanceMapUnitScale() const { return mDistanceMapUnitScale; }
@@ -100,7 +108,7 @@ class CORE_EXPORT QgsVectorFieldSymbolLayer: public QgsMarkerSymbolLayerV2
private:
QString mXAttribute;
QString mYAttribute;
- QgsSymbolV2::OutputUnit mDistanceUnit;
+ QgsUnitTypes::RenderUnit mDistanceUnit;
QgsMapUnitScale mDistanceMapUnitScale;
double mScale;
VectorFieldType mVectorFieldType;
diff --git a/src/gui/effects/qgspainteffectwidget.cpp b/src/gui/effects/qgspainteffectwidget.cpp
index b690609fbec..38c8ce32471 100644
--- a/src/gui/effects/qgspainteffectwidget.cpp
+++ b/src/gui/effects/qgspainteffectwidget.cpp
@@ -254,7 +254,7 @@ QgsShadowEffectWidget::QgsShadowEffectWidget( QWidget *parent )
mShadowColorBtn->setColorDialogTitle( tr( "Select shadow color" ) );
mShadowColorBtn->setContext( "symbology" );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits );
initGui();
}
@@ -419,7 +419,7 @@ QgsGlowWidget::QgsGlowWidget( QWidget *parent )
mColorBtn->setColorDialogTitle( tr( "Select glow color" ) );
mColorBtn->setContext( "symbology" );
- mSpreadUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );
+ mSpreadUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits );
mRampComboBox->populate( QgsStyleV2::defaultStyle() );
mRampComboBox->setShowGradientOnly( true );
@@ -612,7 +612,7 @@ QgsTransformWidget::QgsTransformWidget( QWidget *parent )
{
setupUi( this );
- mTranslateUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );
+ mTranslateUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits );
mSpinTranslateX->setClearValue( 0 );
mSpinTranslateY->setClearValue( 0 );
mSpinShearX->setClearValue( 0 );
diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
index dcb5bd60e99..203a1d0d0c0 100644
--- a/src/gui/qgshighlight.cpp
+++ b/src/gui/qgshighlight.cpp
@@ -186,13 +186,13 @@ void QgsHighlight::setSymbol( QgsSymbolV2* symbol, const QgsRenderContext & cont
}
}
-double QgsHighlight::getSymbolWidth( const QgsRenderContext & context, double width, QgsSymbolV2::OutputUnit unit )
+double QgsHighlight::getSymbolWidth( const QgsRenderContext & context, double width, QgsUnitTypes::RenderUnit unit )
{
// if necessary scale mm to map units
double scale = 1.;
- if ( unit == QgsSymbolV2::MapUnit )
+ if ( unit == QgsUnitTypes::RenderMapUnits )
{
- scale = QgsSymbolLayerV2Utils::lineWidthScaleFactor( context, QgsSymbolV2::MM ) / QgsSymbolLayerV2Utils::lineWidthScaleFactor( context, QgsSymbolV2::MapUnit );
+ scale = QgsSymbolLayerV2Utils::lineWidthScaleFactor( context, QgsUnitTypes::RenderMillimeters ) / QgsSymbolLayerV2Utils::lineWidthScaleFactor( context, QgsUnitTypes::RenderMapUnits );
}
width = qMax( width + 2 * mBuffer * scale, mMinWidth * scale );
return width;
diff --git a/src/gui/qgshighlight.h b/src/gui/qgshighlight.h
index e0efbb639fa..f32cda4c63a 100644
--- a/src/gui/qgshighlight.h
+++ b/src/gui/qgshighlight.h
@@ -78,7 +78,7 @@ class GUI_EXPORT QgsHighlight: public QgsMapCanvasItem
private:
void init();
void setSymbol( QgsSymbolV2* symbol, const QgsRenderContext & context, const QColor & color, const QColor & fillColor );
- double getSymbolWidth( const QgsRenderContext & context, double width, QgsSymbolV2::OutputUnit unit );
+ double getSymbolWidth( const QgsRenderContext & context, double width, QgsUnitTypes::RenderUnit unit );
/** Get renderer for current color mode and colors. The renderer should be freed by caller. */
QgsFeatureRendererV2 * getRenderer( QgsRenderContext &context, const QColor & color, const QColor & fillColor );
void paintPoint( QPainter *p, const QgsPoint& point );
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
index 0e1cc7dbc80..c43ae9e1fba 100644
--- a/src/gui/qgsmapcanvas.cpp
+++ b/src/gui/qgsmapcanvas.cpp
@@ -1680,7 +1680,7 @@ double QgsMapCanvas::mapUnitsPerPixel() const
} // mapUnitsPerPixel
-void QgsMapCanvas::setMapUnits( Qgis::UnitType u )
+void QgsMapCanvas::setMapUnits( QgsUnitTypes::DistanceUnit u )
{
if ( mSettings.mapUnits() == u )
return;
@@ -1696,7 +1696,7 @@ void QgsMapCanvas::setMapUnits( Qgis::UnitType u )
}
-Qgis::UnitType QgsMapCanvas::mapUnits() const
+QgsUnitTypes::DistanceUnit QgsMapCanvas::mapUnits() const
{
return mapSettings().mapUnits();
}
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
index 71fde89b2f4..5055fd265dd 100644
--- a/src/gui/qgsmapcanvas.h
+++ b/src/gui/qgsmapcanvas.h
@@ -290,10 +290,10 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
bool isFrozen();
//! Set map units (needed by project properties dialog)
- void setMapUnits( Qgis::UnitType mapUnits );
+ void setMapUnits( QgsUnitTypes::DistanceUnit mapUnits );
//! Get the current canvas map units
- Qgis::UnitType mapUnits() const;
+ QgsUnitTypes::DistanceUnit mapUnits() const;
//! Getter for stored overrides of styles for layers.
//! @note added in 2.12
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
index 4885cd669cf..a833677485d 100644
--- a/src/gui/qgsmaptoolidentify.cpp
+++ b/src/gui/qgsmaptoolidentify.cpp
@@ -660,13 +660,13 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList *results, Qg
return true;
}
-void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &measure, Qgis::UnitType &u, bool isArea )
+void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &measure, QgsUnitTypes::DistanceUnit &u, bool isArea )
{
// Helper for converting between units
// The parameter &u is out only...
// Get the canvas units
- Qgis::UnitType myUnits = mCanvas->mapUnits();
+ QgsUnitTypes::DistanceUnit myUnits = mCanvas->mapUnits();
Q_NOWARN_DEPRECATED_PUSH
calc.convertMeasurement( measure, myUnits, displayUnits(), isArea );
@@ -674,12 +674,12 @@ void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &meas
Q_NOWARN_DEPRECATED_POP
}
-Qgis::UnitType QgsMapToolIdentify::displayUnits()
+QgsUnitTypes::DistanceUnit QgsMapToolIdentify::displayUnits()
{
return mCanvas->mapUnits();
}
-Qgis::UnitType QgsMapToolIdentify::displayDistanceUnits() const
+QgsUnitTypes::DistanceUnit QgsMapToolIdentify::displayDistanceUnits() const
{
return mCanvas->mapUnits();
}
diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h
index 0568a3c8772..ea18440a944 100644
--- a/src/gui/qgsmaptoolidentify.h
+++ b/src/gui/qgsmaptoolidentify.h
@@ -161,18 +161,18 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
//! Private helper
//! @deprecated use displayDistanceUnits() and displayAreaUnits() instead
- Q_DECL_DEPRECATED virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, Qgis::UnitType &u, bool isArea );
+ Q_DECL_DEPRECATED virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, QgsUnitTypes::DistanceUnit &u, bool isArea );
/** Transforms the measurements of derived attributes in the desired units
* @deprecated use displayDistanceUnits() and displayAreaUnits() instead
*/
- Q_DECL_DEPRECATED virtual Qgis::UnitType displayUnits();
+ Q_DECL_DEPRECATED virtual QgsUnitTypes::DistanceUnit displayUnits();
/** Desired units for distance display.
* @note added in QGIS 2.14
* @see displayAreaUnits()
*/
- virtual Qgis::UnitType displayDistanceUnits() const;
+ virtual QgsUnitTypes::DistanceUnit displayDistanceUnits() const;
/** Desired units for area display.
* @note added in QGIS 2.14
diff --git a/src/gui/qgsunitselectionwidget.cpp b/src/gui/qgsunitselectionwidget.cpp
index f1720d813c8..4c33f80f66b 100644
--- a/src/gui/qgsunitselectionwidget.cpp
+++ b/src/gui/qgsunitselectionwidget.cpp
@@ -118,7 +118,7 @@ void QgsUnitSelectionWidget::setUnits( const QStringList &units, int mapUnitIdx
blockSignals( false );
}
-void QgsUnitSelectionWidget::setUnits( const QgsSymbolV2::OutputUnitList &units )
+void QgsUnitSelectionWidget::setUnits( const QgsUnitTypes::RenderUnitList &units )
{
blockSignals( true );
mUnitCombo->clear();
@@ -127,37 +127,37 @@ void QgsUnitSelectionWidget::setUnits( const QgsSymbolV2::OutputUnitList &units
//to ensure that the widget always keeps the same order for units, regardless of the
//order specified in the units list
mMapUnitIdx = -1;
- if ( units.contains( QgsSymbolV2::MM ) )
+ if ( units.contains( QgsUnitTypes::RenderMillimeters ) )
{
- mUnitCombo->addItem( tr( "Millimeter" ), QgsSymbolV2::MM );
+ mUnitCombo->addItem( tr( "Millimeter" ), QgsUnitTypes::RenderMillimeters );
}
- if ( units.contains( QgsSymbolV2::Pixel ) )
+ if ( units.contains( QgsUnitTypes::RenderPixels ) )
{
- mUnitCombo->addItem( tr( "Pixels" ), QgsSymbolV2::Pixel );
+ mUnitCombo->addItem( tr( "Pixels" ), QgsUnitTypes::RenderPixels );
}
- if ( units.contains( QgsSymbolV2::MapUnit ) )
+ if ( units.contains( QgsUnitTypes::RenderMapUnits ) )
{
- mUnitCombo->addItem( tr( "Map unit" ), QgsSymbolV2::MapUnit );
+ mUnitCombo->addItem( tr( "Map unit" ), QgsUnitTypes::RenderMapUnits );
}
- if ( units.contains( QgsSymbolV2::Percentage ) )
+ if ( units.contains( QgsUnitTypes::RenderPercentage ) )
{
- mUnitCombo->addItem( tr( "Percentage" ), QgsSymbolV2::Percentage );
+ mUnitCombo->addItem( tr( "Percentage" ), QgsUnitTypes::RenderPercentage );
}
blockSignals( false );
}
-QgsSymbolV2::OutputUnit QgsUnitSelectionWidget::unit() const
+QgsUnitTypes::RenderUnit QgsUnitSelectionWidget::unit() const
{
if ( mUnitCombo->count() == 0 )
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
QVariant currentData = mUnitCombo->itemData( mUnitCombo->currentIndex() );
if ( currentData.isValid() )
{
- return ( QgsSymbolV2::OutputUnit ) currentData.toInt();
+ return ( QgsUnitTypes::RenderUnit ) currentData.toInt();
}
//unknown
- return QgsSymbolV2::Mixed;
+ return QgsUnitTypes::RenderUnknownUnit;
}
void QgsUnitSelectionWidget::setUnit( int unitIndex )
@@ -167,7 +167,7 @@ void QgsUnitSelectionWidget::setUnit( int unitIndex )
blockSignals( false );
}
-void QgsUnitSelectionWidget::setUnit( QgsSymbolV2::OutputUnit unit )
+void QgsUnitSelectionWidget::setUnit( QgsUnitTypes::RenderUnit unit )
{
int idx = mUnitCombo->findData( QVariant(( int ) unit ) );
mUnitCombo->setCurrentIndex( idx == -1 ? 0 : idx );
@@ -197,9 +197,9 @@ void QgsUnitSelectionWidget::showDialog()
void QgsUnitSelectionWidget::toggleUnitRangeButton()
{
- if ( unit() != QgsSymbolV2::Mixed )
+ if ( unit() != QgsUnitTypes::RenderUnknownUnit )
{
- mMapScaleButton->setVisible( unit() == QgsSymbolV2::MapUnit );
+ mMapScaleButton->setVisible( unit() == QgsUnitTypes::RenderMapUnits );
}
else
{
diff --git a/src/gui/qgsunitselectionwidget.h b/src/gui/qgsunitselectionwidget.h
index aa343388472..d4a64af688d 100644
--- a/src/gui/qgsunitselectionwidget.h
+++ b/src/gui/qgsunitselectionwidget.h
@@ -76,16 +76,16 @@ class GUI_EXPORT QgsUnitSelectionWidget : public QWidget, private Ui::QgsUnitSel
* @param units list of valid units
* @note added in QGIS 2.9
*/
- void setUnits( const QgsSymbolV2::OutputUnitList& units );
+ void setUnits( const QgsUnitTypes::RenderUnitList& units );
/** Get the selected unit index */
int getUnit() const { return mUnitCombo->currentIndex(); }
/** Returns the current predefined selected unit (if applicable).
- * @returns selected output unit, or QgsSymbolV2::Mixed if the widget was populated with custom unit types
+ * @returns selected output unit, or QgsUnitTypes::RenderUnknownUnit if the widget was populated with custom unit types
* @note added in QGIS 2.9
*/
- QgsSymbolV2::OutputUnit unit() const;
+ QgsUnitTypes::RenderUnit unit() const;
/** Sets the selected unit index
* @param unitIndex index of unit to set as current
@@ -96,7 +96,7 @@ class GUI_EXPORT QgsUnitSelectionWidget : public QWidget, private Ui::QgsUnitSel
/** Sets the selected unit
* @param unit predefined unit to set as current
*/
- void setUnit( QgsSymbolV2::OutputUnit unit );
+ void setUnit( QgsUnitTypes::RenderUnit unit );
/** Returns the map unit scale */
QgsMapUnitScale getMapUnitScale() const { return mUnitScaleDialog->getMapUnitScale(); }
diff --git a/src/gui/symbology-ng/qgsarrowsymbollayerwidget.cpp b/src/gui/symbology-ng/qgsarrowsymbollayerwidget.cpp
index 8f17cca68b7..2f3e480e691 100644
--- a/src/gui/symbology-ng/qgsarrowsymbollayerwidget.cpp
+++ b/src/gui/symbology-ng/qgsarrowsymbollayerwidget.cpp
@@ -23,11 +23,11 @@ QgsArrowSymbolLayerWidget::QgsArrowSymbolLayerWidget( const QgsVectorLayer* vl,
{
setupUi( this );
- mArrowWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mArrowStartWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mHeadLengthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mHeadThicknessUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mArrowWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mArrowStartWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mHeadLengthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mHeadThicknessUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
mOffsetSpin->setClearValue( 0.0 );
}
diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
index 6372481e65d..98ac4483a4f 100644
--- a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
+++ b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
@@ -24,10 +24,10 @@ QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLay
{
setupUi( this );
- mSymbolWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mSymbolHeightUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOutlineWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mSymbolWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mSymbolHeightUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOutlineWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
btnChangeColorFill->setAllowAlpha( true );
btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );
@@ -56,7 +56,7 @@ QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLay
lyr->setFillColor( QColor( 200, 200, 200 ) );
lyr->setSymbolWidth( 4 );
lyr->setSymbolHeight( 2 );
- QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, iconSize );
+ QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsUnitTypes::RenderMillimeters, iconSize );
QListWidgetItem* item = new QListWidgetItem( icon, "", mShapeListWidget );
item->setToolTip( name );
item->setData( Qt::UserRole, name );
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
index f9c2898fb71..32e67739b47 100644
--- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -439,7 +439,7 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
mExpressionWidget->setFilters( QgsFieldProxyModel::Numeric | QgsFieldProxyModel::Date );
mExpressionWidget->setLayer( mLayer );
- mSizeUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
cboGraduatedColorRamp->populate( mStyle );
diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
index 45012a2d402..15a287cb894 100644
--- a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
+++ b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
@@ -79,7 +79,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt
setupUi( this );
- mRadiusUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );
+ mRadiusUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits );
mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, this );
if ( renderer )
diff --git a/src/gui/symbology-ng/qgslayerpropertieswidget.cpp b/src/gui/symbology-ng/qgslayerpropertieswidget.cpp
index 6ce7cc71ff2..ddbef3af455 100644
--- a/src/gui/symbology-ng/qgslayerpropertieswidget.cpp
+++ b/src/gui/symbology-ng/qgslayerpropertieswidget.cpp
@@ -236,7 +236,7 @@ void QgsLayerPropertiesWidget::emitSignalChanged()
emit changed();
// also update paint effect preview
- mEffectWidget->setPreviewPicture( QgsSymbolLayerV2Utils::symbolLayerPreviewPicture( mLayer, QgsSymbolV2::MM, QSize( 80, 80 ) ) );
+ mEffectWidget->setPreviewPicture( QgsSymbolLayerV2Utils::symbolLayerPreviewPicture( mLayer, QgsUnitTypes::RenderMillimeters, QSize( 80, 80 ) ) );
emit widgetChanged();
}
diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
index a7641c86119..e6f1bfb648c 100644
--- a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
+++ b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
@@ -50,7 +50,7 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
}
setupUi( this );
- mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
if ( renderer )
{
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
index 0d9301a5120..ee2f6e5510b 100644
--- a/src/gui/symbology-ng/qgsrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -147,11 +147,11 @@ void QgsRendererV2Widget::changeSymbolUnit()
return;
bool ok;
- int currentUnit = ( firstSymbol->outputUnit() == QgsSymbolV2::MM ) ? 0 : 1;
+ int currentUnit = ( firstSymbol->outputUnit() == QgsUnitTypes::RenderMillimeters ) ? 0 : 1;
QString item = QInputDialog::getItem( this, tr( "Symbol unit" ), tr( "Select symbol unit" ), QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), currentUnit, false, &ok );
if ( ok )
{
- QgsSymbolV2::OutputUnit unit = ( item.compare( tr( "Millimeter" ) ) == 0 ) ? QgsSymbolV2::MM : QgsSymbolV2::MapUnit;
+ QgsUnitTypes::RenderUnit unit = ( item.compare( tr( "Millimeter" ) ) == 0 ) ? QgsUnitTypes::RenderMillimeters : QgsUnitTypes::RenderMapUnits;
Q_FOREACH ( QgsSymbolV2* symbol, symbolList )
{
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
index e3d443248a2..97ea83cff88 100644
--- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
+++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -172,9 +172,9 @@ QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget( const QgsVec
mLayer = nullptr;
setupUi( this );
- mPenWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mDashPatternUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mPenWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mDashPatternUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
btnChangeColor->setAllowAlpha( true );
btnChangeColor->setColorDialogTitle( tr( "Select line color" ) );
@@ -402,7 +402,7 @@ void QgsSimpleLineSymbolLayerV2Widget::updatePatternIcon()
return;
}
layerCopy->setUseCustomDashPattern( true );
- QIcon buttonIcon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( layerCopy, QgsSymbolV2::MM, mChangePatternButton->iconSize() );
+ QIcon buttonIcon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( layerCopy, QgsUnitTypes::RenderMillimeters, mChangePatternButton->iconSize() );
mChangePatternButton->setIcon( buttonIcon );
delete layerCopy;
}
@@ -417,9 +417,9 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const Qg
mLayer = nullptr;
setupUi( this );
- mSizeUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOutlineWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOutlineWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
btnChangeColorFill->setAllowAlpha( true );
btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );
@@ -448,7 +448,7 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const Qg
QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( shape, markerSize );
lyr->setColor( QColor( 200, 200, 200 ) );
lyr->setOutlineColor( QColor( 0, 0, 0 ) );
- QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, size );
+ QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsUnitTypes::RenderMillimeters, size );
QListWidgetItem* item = new QListWidgetItem( icon, QString(), lstNames );
item->setData( Qt::UserRole, static_cast< int >( shape ) );
item->setToolTip( QgsSimpleMarkerSymbolLayerBase::encodeShape( shape ) );
@@ -698,8 +698,8 @@ QgsSimpleFillSymbolLayerV2Widget::QgsSimpleFillSymbolLayerV2Widget( const QgsVec
mLayer = nullptr;
setupUi( this );
- mBorderWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
btnChangeColor->setAllowAlpha( true );
btnChangeColor->setColorDialogTitle( tr( "Select fill color" ) );
@@ -847,8 +847,8 @@ QgsFilledMarkerSymbolLayerWidget::QgsFilledMarkerSymbolLayerWidget( const QgsVec
mLayer = nullptr;
setupUi( this );
- mSizeUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
spinOffsetX->setClearValue( 0.0 );
spinOffsetY->setClearValue( 0.0 );
@@ -869,7 +869,7 @@ QgsFilledMarkerSymbolLayerWidget::QgsFilledMarkerSymbolLayerWidget( const QgsVec
QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( shape, markerSize );
lyr->setColor( QColor( 200, 200, 200 ) );
lyr->setOutlineColor( QColor( 0, 0, 0 ) );
- QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, size );
+ QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsUnitTypes::RenderMillimeters, size );
QListWidgetItem* item = new QListWidgetItem( icon, QString(), lstNames );
item->setData( Qt::UserRole, static_cast< int >( shape ) );
item->setToolTip( QgsSimpleMarkerSymbolLayerBase::encodeShape( shape ) );
@@ -1028,7 +1028,7 @@ QgsGradientFillSymbolLayerV2Widget::QgsGradientFillSymbolLayerV2Widget( const Qg
mLayer = nullptr;
setupUi( this );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
cboGradientColorRamp->setShowGradientOnly( true );
cboGradientColorRamp->populate( QgsStyleV2::defaultStyle() );
@@ -1359,8 +1359,8 @@ QgsShapeburstFillSymbolLayerV2Widget::QgsShapeburstFillSymbolLayerV2Widget( cons
mLayer = nullptr;
setupUi( this );
- mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
QButtonGroup* group1 = new QButtonGroup( this );
group1->addButton( radioColorRamp );
@@ -1614,9 +1614,9 @@ QgsMarkerLineSymbolLayerV2Widget::QgsMarkerLineSymbolLayerV2Widget( const QgsVec
mLayer = nullptr;
setupUi( this );
- mIntervalUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetAlongLineUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mIntervalUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetAlongLineUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
spinOffset->setClearValue( 0.0 );
@@ -1778,9 +1778,9 @@ QgsSvgMarkerSymbolLayerV2Widget::QgsSvgMarkerSymbolLayerV2Widget( const QgsVecto
mLayer = nullptr;
setupUi( this );
- mSizeUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mBorderWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
viewGroups->setHeaderHidden( true );
mChangeColorButton->setAllowAlpha( true );
mChangeColorButton->setColorDialogTitle( tr( "Select fill color" ) );
@@ -2161,8 +2161,8 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( const QgsVectorLayer*
{
mLayer = nullptr;
setupUi( this );
- mTextureWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mSvgOutlineWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mTextureWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mSvgOutlineWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
mSvgTreeView->setHeaderHidden( true );
insertIcons();
@@ -2440,8 +2440,8 @@ QgsLinePatternFillSymbolLayerWidget::QgsLinePatternFillSymbolLayerWidget( const
QgsSymbolLayerV2Widget( parent, vl ), mLayer( nullptr )
{
setupUi( this );
- mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
mOffsetSpinBox->setClearValue( 0 );
}
@@ -2539,10 +2539,10 @@ QgsPointPatternFillSymbolLayerWidget::QgsPointPatternFillSymbolLayerWidget( cons
QgsSymbolLayerV2Widget( parent, vl ), mLayer( nullptr )
{
setupUi( this );
- mHorizontalDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mVerticalDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mHorizontalDisplacementUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mVerticalDisplacementUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mHorizontalDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mVerticalDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mHorizontalDisplacementUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mVerticalDisplacementUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
}
@@ -2679,9 +2679,9 @@ QgsFontMarkerSymbolLayerV2Widget::QgsFontMarkerSymbolLayerV2Widget( const QgsVec
mLayer = nullptr;
setupUi( this );
- mSizeUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mBorderWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
widgetChar = new CharacterWidget;
scrollArea->setWidget( widgetChar );
@@ -2953,8 +2953,8 @@ QgsRasterFillSymbolLayerWidget::QgsRasterFillSymbolLayerWidget( const QgsVectorL
mLayer = nullptr;
setupUi( this );
- mWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::Pixel << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
- mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits );
+ mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
mSpinOffsetX->setClearValue( 0.0 );
mSpinOffsetY->setClearValue( 0.0 );
diff --git a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
index c72cb54db60..524d1a35e66 100644
--- a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
+++ b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
@@ -111,7 +111,7 @@ void QgsSymbolLevelsV2Dialog::populateTable()
else
{
QgsSymbolLayerV2* sl = sym->symbolLayer( layer );
- QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( sl, QgsSymbolV2::MM, QSize( 16, 16 ) );
+ QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( sl, QgsUnitTypes::RenderMillimeters, QSize( 16, 16 ) );
item = new QTableWidgetItem( icon, QString::number( sl->renderingPass() ) );
}
tableLevels->setItem( row, layer + 1, item );
diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
index b1fb8066a72..5c8b65c4a4a 100644
--- a/src/gui/symbology-ng/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
@@ -53,7 +53,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
{
setupUi( this );
- mSymbolUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mSymbolUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
btnAdvanced->hide(); // advanced button is hidden by default
if ( menu ) // show it if there is a menu pointer
@@ -535,7 +535,7 @@ void QgsSymbolsListWidget::setSymbolFromStyle( const QModelIndex & index )
lblSymbolName->setText( symbolName );
// get new instance of symbol from style
QgsSymbolV2* s = mStyle->symbol( symbolName );
- QgsSymbolV2::OutputUnit unit = s->outputUnit();
+ QgsUnitTypes::RenderUnit unit = s->outputUnit();
// remove all symbol layers from original symbol
while ( mSymbol->symbolLayerCount() )
mSymbol->deleteSymbolLayer( 0 );
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
index a27ca302066..3f8e10d4933 100644
--- a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
+++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -147,7 +147,7 @@ class SymbolLayerItem : public QStandardItem
{
QIcon icon;
if ( mIsLayer )
- icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( mLayer, QgsSymbolV2::MM, QSize( 16, 16 ) ); //todo: make unit a parameter
+ icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( mLayer, QgsUnitTypes::RenderMillimeters, QSize( 16, 16 ) ); //todo: make unit a parameter
else
icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mSymbol, QSize( 16, 16 ) );
setIcon( icon );
diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
index 3248f134511..971c688c9c3 100644
--- a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
+++ b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
@@ -20,7 +20,7 @@ QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVecto
{
setupUi( this );
- mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
+ mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels );
if ( mVectorLayer )
{
diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp
index 1e3a267697f..f1470fccf2b 100644
--- a/src/plugins/coordinate_capture/coordinatecapture.cpp
+++ b/src/plugins/coordinate_capture/coordinatecapture.cpp
@@ -97,7 +97,7 @@ void CoordinateCapture::initGui()
setSourceCrs(); //set up the source CRS
mTransform.setDestinationCrs( mCrs ); // set the CRS in the transform
- mUserCrsDisplayPrecision = ( mCrs.mapUnits() == Qgis::Degrees ) ? 5 : 3; // precision depends on CRS units
+ mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QgsUnitTypes::DistanceDegrees ) ? 5 : 3; // precision depends on CRS units
//create the dock widget
mpDockWidget = new QgsDockWidget( tr( "Coordinate Capture" ), mQGisIface->mainWindow() );
@@ -190,14 +190,14 @@ void CoordinateCapture::setCRS()
{
mCrs.createFromSrsId( mySelector.selectedCrsId() );
mTransform.setDestinationCrs( mCrs );
- mUserCrsDisplayPrecision = ( mCrs.mapUnits() == Qgis::Degrees ) ? 5 : 3; //precision depends on CRS units
+ mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QgsUnitTypes::DistanceDegrees ) ? 5 : 3; //precision depends on CRS units
}
}
void CoordinateCapture::setSourceCrs()
{
mTransform.setSourceCrs( mQGisIface->mapCanvas()->mapSettings().destinationCrs() );
- mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapSettings().destinationCrs().mapUnits() == Qgis::Degrees ) ? 5 : 3; // for the map canvas coordinate display
+ mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapSettings().destinationCrs().mapUnits() == QgsUnitTypes::DistanceDegrees ) ? 5 : 3; // for the map canvas coordinate display
}
void CoordinateCapture::mouseClicked( const QgsPoint& thePoint )
diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
index 5250d8bb848..05a58d7c311 100644
--- a/src/plugins/grass/qgsgrassnewmapset.cpp
+++ b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -526,7 +526,7 @@ void QgsGrassNewMapset::setRegionPage()
if ( ok )
{
- int precision = newCrs.mapUnits() == Qgis::Degrees ? 6 : 1;
+ int precision = newCrs.mapUnits() == QgsUnitTypes::DistanceDegrees ? 6 : 1;
mNorthLineEdit->setText( qgsDoubleToString( points[1].y(), precision ) );
mSouthLineEdit->setText( qgsDoubleToString( points[0].y(), precision ) );
mEastLineEdit->setText( qgsDoubleToString( points[1].x(), precision ) );
diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
index be4824eae77..8ad3c738a75 100644
--- a/src/plugins/grass/qgsgrassregion.cpp
+++ b/src/plugins/grass/qgsgrassregion.cpp
@@ -256,12 +256,12 @@ QString QgsGrassRegion::formatExtent( double v )
{
// format with precision approximately to meters
// max length of degree of latitude on pole is 111694 m
- return qgsDoubleToString( v, mCrs.mapUnits() == Qgis::Degrees ? 6 : 1 );
+ return qgsDoubleToString( v, mCrs.mapUnits() == QgsUnitTypes::DistanceDegrees ? 6 : 1 );
}
QString QgsGrassRegion::formatResolution( double v )
{
- return qgsDoubleToString( v, mCrs.mapUnits() == Qgis::Degrees ? 10 : 4 );
+ return qgsDoubleToString( v, mCrs.mapUnits() == QgsUnitTypes::DistanceDegrees ? 10 : 4 );
}
void QgsGrassRegion::readRegion()
diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp
index 60e0f48ce9f..cf2c43e5985 100644
--- a/src/providers/arcgisrest/qgsamsprovider.cpp
+++ b/src/providers/arcgisrest/qgsamsprovider.cpp
@@ -246,7 +246,7 @@ QImage* QgsAmsProvider::draw( const QgsRectangle & viewExtent, int pixelWidth, i
QgsDataSourceURI dataSource( dataSourceUri() );
// Use of tiles currently only implemented if service CRS is meter based
- if ( mServiceInfo["singleFusedMapCache"].toBool() && mCrs.mapUnits() == Qgis::Meters )
+ if ( mServiceInfo["singleFusedMapCache"].toBool() && mCrs.mapUnits() == QgsUnitTypes::DistanceMeters )
{
// Compute ideal resolution
// - Measure distance in meters along lower and upper edge of bounding box
diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp
index 168f154ffd2..c30bdb034f6 100644
--- a/src/providers/wcs/qgswcsprovider.cpp
+++ b/src/providers/wcs/qgswcsprovider.cpp
@@ -1396,13 +1396,13 @@ QgsRasterIdentifyResult QgsWcsProvider::identify( const QgsPoint & thePoint, Qgs
// set resolution approximately to 1mm
switch ( mCrs.mapUnits() )
{
- case Qgis::Meters:
+ case QgsUnitTypes::DistanceMeters:
xRes = 0.001;
break;
- case Qgis::Feet:
+ case QgsUnitTypes::DistanceFeet:
xRes = 0.003;
break;
- case Qgis::Degrees:
+ case QgsUnitTypes::DistanceDegrees:
// max length of degree of latitude on pole is 111694 m
xRes = 1e-8;
break;
diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp
index e280ca4ae08..efcbf6a287d 100644
--- a/src/providers/wfs/qgswfsshareddata.cpp
+++ b/src/providers/wfs/qgswfsshareddata.cpp
@@ -1009,9 +1009,9 @@ void QgsWFSSharedData::endOfDownload( bool success, int featureCount,
{
// Grow the extent by ~ 50 km (completely arbitrary number if you wonder!)
// so that it is sufficiently zoomed out
- if ( mSourceCRS.mapUnits() == Qgis::Meters )
+ if ( mSourceCRS.mapUnits() == QgsUnitTypes::DistanceMeters )
mComputedExtent.grow( 50. * 1000. );
- else if ( mSourceCRS.mapUnits() == Qgis::Degrees )
+ else if ( mSourceCRS.mapUnits() == QgsUnitTypes::DistanceDegrees )
mComputedExtent.grow( 50. / 110 );
QgsMessageLog::logMessage( tr( "Layer extent reported by the server is not correct. "
"You may need to zoom on layer and then zoom out to see all features" ), tr( "WFS" ) );
diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
index d7db80d99fb..285cc34441b 100644
--- a/src/providers/wms/qgswmscapabilities.cpp
+++ b/src/providers/wms/qgswmscapabilities.cpp
@@ -1288,7 +1288,7 @@ void QgsWmsCapabilities::parseWMTSContents( QDomElement const &e )
s.wkScaleSet = e0.firstChildElement( "WellKnownScaleSet" ).text();
- double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), Qgis::Meters );
+ double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), QgsUnitTypes::DistanceMeters );
s.crs = crs.authid();
@@ -1796,7 +1796,7 @@ bool QgsWmsCapabilities::detectTileLayerBoundingBox( QgsWmtsTileLayer& l )
return false;
const QgsWmtsTileMatrix& tm = *tmIt;
- double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), Qgis::Meters );
+ double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), QgsUnitTypes::DistanceMeters );
double res = tm.scaleDenom * 0.00028 / metersPerUnit;
QgsPoint bottomRight( tm.topLeft.x() + res * tm.tileWidth * tm.matrixWidth,
tm.topLeft.y() - res * tm.tileHeight * tm.matrixHeight );
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
index 20ff64fd863..12fc3711a76 100644
--- a/src/providers/wms/qgswmsprovider.cpp
+++ b/src/providers/wms/qgswmsprovider.cpp
@@ -2109,13 +2109,13 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
// set resolution approximately to 1mm
switch ( crs.mapUnits() )
{
- case Qgis::Meters:
+ case QgsUnitTypes::DistanceMeters:
xRes = 0.001;
break;
- case Qgis::Feet:
+ case QgsUnitTypes::DistanceFeet:
xRes = 0.003;
break;
- case Qgis::Degrees:
+ case QgsUnitTypes::DistanceDegrees:
// max length of degree of latitude on pole is 111694 m
xRes = 1e-8;
break;
diff --git a/src/server/qgsmaprenderer.cpp b/src/server/qgsmaprenderer.cpp
index 9d07eaca5a4..f06c150126e 100644
--- a/src/server/qgsmaprenderer.cpp
+++ b/src/server/qgsmaprenderer.cpp
@@ -51,7 +51,7 @@ QgsMapRenderer::QgsMapRenderer()
mOverview = false;
// set default map units - we use WGS 84 thus use degrees
- setMapUnits( Qgis::Degrees );
+ setMapUnits( QgsUnitTypes::DistanceDegrees );
mSize = QSize( 0, 0 );
@@ -584,7 +584,7 @@ void QgsMapRenderer::render( QPainter* painter, double* forceWidthScale )
mDrawing = false;
}
-void QgsMapRenderer::setMapUnits( Qgis::UnitType u )
+void QgsMapRenderer::setMapUnits( QgsUnitTypes::DistanceUnit u )
{
mScaleCalculator->setMapUnits( u );
@@ -594,7 +594,7 @@ void QgsMapRenderer::setMapUnits( Qgis::UnitType u )
emit mapUnitsChanged();
}
-Qgis::UnitType QgsMapRenderer::mapUnits() const
+QgsUnitTypes::DistanceUnit QgsMapRenderer::mapUnits() const
{
return mScaleCalculator->mapUnits();
}
diff --git a/src/server/qgsmaprenderer.h b/src/server/qgsmaprenderer.h
index d140495c1cb..97559531484 100644
--- a/src/server/qgsmaprenderer.h
+++ b/src/server/qgsmaprenderer.h
@@ -110,8 +110,15 @@ class SERVER_EXPORT QgsMapRenderer : public QObject
//! Recalculate the map scale
void updateScale();
- Qgis::UnitType mapUnits() const;
- void setMapUnits( Qgis::UnitType u );
+ /** Returns the distance units which are used for map units.
+ * @see setMapUnits()
+ */
+ QgsUnitTypes::DistanceUnit mapUnits() const;
+
+ /** Sets the distance units which will be used for map units.
+ * @see mapUnits()
+ */
+ void setMapUnits( QgsUnitTypes::DistanceUnit u );
//! sets whether map image will be for overview
void enableOverviewMode( bool isOverview = true ) { mOverview = isOverview; }
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
index a3123614af9..f41b660ce87 100644
--- a/src/server/qgswmsserver.cpp
+++ b/src/server/qgswmsserver.cpp
@@ -2017,7 +2017,7 @@ int QgsWmsServer::configureMapRender( const QPaintDevice* paintDevice ) const
throw QgsMapServiceException( "InvalidParameterValue", "Invalid BBOX parameter" );
}
- Qgis::UnitType mapUnits = Qgis::Degrees;
+ QgsUnitTypes::DistanceUnit mapUnits = QgsUnitTypes::DistanceDegrees;
QString crs = mParameters.value( "CRS", mParameters.value( "SRS" ) );
diff --git a/tests/src/app/testqgsattributetable.cpp b/tests/src/app/testqgsattributetable.cpp
index e2de59e4d33..de434957821 100644
--- a/tests/src/app/testqgsattributetable.cpp
+++ b/tests/src/app/testqgsattributetable.cpp
@@ -90,7 +90,7 @@ void TestQgsAttributeTable::testFieldCalculation()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceMeters ) );
// run length calculation
QScopedPointer< QgsAttributeTableDialog > dlg( new QgsAttributeTableDialog( tempLayer.data() ) );
@@ -105,7 +105,7 @@ void TestQgsAttributeTable::testFieldCalculation()
QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 0.001 ) );
// change project length unit, check calculation respects unit
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceFeet ) );
QScopedPointer< QgsAttributeTableDialog > dlg2( new QgsAttributeTableDialog( tempLayer.data() ) );
tempLayer->startEditing();
dlg2->runFieldCalculation( tempLayer.data(), "col1", "$length" );
@@ -142,7 +142,7 @@ void TestQgsAttributeTable::testFieldCalculationArea()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMeters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMeters ) );
// run area calculation
QScopedPointer< QgsAttributeTableDialog > dlg( new QgsAttributeTableDialog( tempLayer.data() ) );
@@ -157,7 +157,7 @@ void TestQgsAttributeTable::testFieldCalculationArea()
QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 1.0 ) );
// change project area unit, check calculation respects unit
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMiles ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMiles ) );
QScopedPointer< QgsAttributeTableDialog > dlg2( new QgsAttributeTableDialog( tempLayer.data() ) );
tempLayer->startEditing();
dlg2->runFieldCalculation( tempLayer.data(), "col1", "$area" );
diff --git a/tests/src/app/testqgsfieldcalculator.cpp b/tests/src/app/testqgsfieldcalculator.cpp
index 86f539f11f8..76598471c2f 100644
--- a/tests/src/app/testqgsfieldcalculator.cpp
+++ b/tests/src/app/testqgsfieldcalculator.cpp
@@ -90,7 +90,7 @@ void TestQgsFieldCalculator::testLengthCalculations()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceMeters ) );
// run length calculation
tempLayer->startEditing();
@@ -112,7 +112,7 @@ void TestQgsFieldCalculator::testLengthCalculations()
QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 0.001 ) );
// change project length unit, check calculation respects unit
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceFeet ) );
tempLayer->startEditing();
QScopedPointer< QgsFieldCalculator > calc2( new QgsFieldCalculator( tempLayer.data() ) );
calc2->mUpdateExistingGroupBox->setChecked( true );
@@ -153,7 +153,7 @@ void TestQgsFieldCalculator::testAreaCalculations()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMeters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMeters ) );
// run area calculation
tempLayer->startEditing();
@@ -175,7 +175,7 @@ void TestQgsFieldCalculator::testAreaCalculations()
QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 1.0 ) );
// change project area unit, check calculation respects unit
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMiles ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMiles ) );
tempLayer->startEditing();
QScopedPointer< QgsFieldCalculator > calc2( new QgsFieldCalculator( tempLayer.data() ) );
calc2->mUpdateExistingGroupBox->setChecked( true );
diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
index 1dc1a6fcf5a..7a8f224e603 100644
--- a/tests/src/app/testqgsmaptoolidentifyaction.cpp
+++ b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -133,7 +133,7 @@ void TestQgsMapToolIdentifyAction::lengthCalculation()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceMeters ) );
QgsPoint mapPoint = canvas->getCoordinateTransform()->transform( 2484588, 2425722 );
@@ -145,7 +145,7 @@ void TestQgsMapToolIdentifyAction::lengthCalculation()
QVERIFY( qgsDoubleNear( length, 26932.2, 0.1 ) );
//check that project units are respected
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceFeet ) );
result = action->identify( mapPoint.x(), mapPoint.y(), QList() << tempLayer.data() );
QCOMPARE( result.length(), 1 );
derivedLength = result.at( 0 ).mDerivedAttributes[tr( "Length" )];
@@ -188,7 +188,7 @@ void TestQgsMapToolIdentifyAction::perimeterCalculation()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceMeters ) );
QgsPoint mapPoint = canvas->getCoordinateTransform()->transform( 2484588, 2425722 );
@@ -200,7 +200,7 @@ void TestQgsMapToolIdentifyAction::perimeterCalculation()
QCOMPARE( perimeter, 128289.074 );
//check that project units are respected
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceFeet ) );
result = action->identify( mapPoint.x(), mapPoint.y(), QList() << tempLayer.data() );
QCOMPARE( result.length(), 1 );
derivedPerimeter = result.at( 0 ).mDerivedAttributes[tr( "Perimeter" )];
@@ -244,7 +244,7 @@ void TestQgsMapToolIdentifyAction::areaCalculation()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMeters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMeters ) );
QgsPoint mapPoint = canvas->getCoordinateTransform()->transform( 2484588, 2425722 );
@@ -256,7 +256,7 @@ void TestQgsMapToolIdentifyAction::areaCalculation()
QVERIFY( qgsDoubleNear( area, 1009089817.0, 1.0 ) );
//check that project units are respected
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMiles ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMiles ) );
result = action->identify( mapPoint.x(), mapPoint.y(), QList() << tempLayer.data() );
QCOMPARE( result.length(), 1 );
derivedArea = result.at( 0 ).mDerivedAttributes[tr( "Area" )];
@@ -265,7 +265,7 @@ void TestQgsMapToolIdentifyAction::areaCalculation()
//test unchecked "keep base units" setting
s.setValue( "/qgis/measure/keepbaseunit", false );
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareFeet ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareFeet ) );
result = action->identify( mapPoint.x(), mapPoint.y(), QList() << tempLayer.data() );
QCOMPARE( result.length(), 1 );
derivedArea = result.at( 0 ).mDerivedAttributes[tr( "Area" )];
diff --git a/tests/src/app/testqgsmeasuretool.cpp b/tests/src/app/testqgsmeasuretool.cpp
index 5e0bf2851a4..00b038d1f27 100644
--- a/tests/src/app/testqgsmeasuretool.cpp
+++ b/tests/src/app/testqgsmeasuretool.cpp
@@ -98,7 +98,7 @@ void TestQgsMeasureTool::testLengthCalculation()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceMeters ) );
// run length calculation
QScopedPointer< QgsMeasureTool > tool( new QgsMeasureTool( mCanvas, false ) );
@@ -117,7 +117,7 @@ void TestQgsMeasureTool::testLengthCalculation()
QGSCOMPARENEAR( measured, expected, 0.001 );
// change project length unit, check calculation respects unit
- QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceFeet ) );
QScopedPointer< QgsMeasureTool > tool2( new QgsMeasureTool( mCanvas, false ) );
QScopedPointer< QgsMeasureDialog > dlg2( new QgsMeasureDialog( tool2.data() ) );
@@ -167,7 +167,7 @@ void TestQgsMeasureTool::testAreaCalculation()
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMeters ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMeters ) );
// run length calculation
QScopedPointer< QgsMeasureTool > tool( new QgsMeasureTool( mCanvas, true ) );
@@ -188,7 +188,7 @@ void TestQgsMeasureTool::testAreaCalculation()
QGSCOMPARENEAR( measured, expected, 1.0 );
// change project area unit, check calculation respects unit
- QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareMiles ) );
+ QgsProject::instance()->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareMiles ) );
QScopedPointer< QgsMeasureTool > tool2( new QgsMeasureTool( mCanvas, true ) );
QScopedPointer< QgsMeasureDialog > dlg2( new QgsMeasureDialog( tool2.data() ) );
diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
index dec4a615329..2ed2eb259b2 100644
--- a/tests/src/core/testqgsatlascomposition.cpp
+++ b/tests/src/core/testqgsatlascomposition.cpp
@@ -146,7 +146,7 @@ void TestQgsAtlasComposition::init()
//create composition with composer map
mMapSettings->setLayers( QStringList() << mVectorLayer->id() );
mMapSettings->setCrsTransformEnabled( true );
- mMapSettings->setMapUnits( Qgis::Meters );
+ mMapSettings->setMapUnits( QgsUnitTypes::DistanceMeters );
// select epsg:2154
QgsCoordinateReferenceSystem crs;
diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp
index 709fd852a54..37032042156 100644
--- a/tests/src/core/testqgscomposerdd.cpp
+++ b/tests/src/core/testqgscomposerdd.cpp
@@ -84,7 +84,7 @@ void TestQgsComposerDD::initTestCase()
//create composition with composer map
mMapSettings->setLayers( QStringList() << mVectorLayer->id() );
mMapSettings->setCrsTransformEnabled( true );
- mMapSettings->setMapUnits( Qgis::Meters );
+ mMapSettings->setMapUnits( QgsUnitTypes::DistanceMeters );
// select epsg:2154
QgsCoordinateReferenceSystem crs;
diff --git a/tests/src/core/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp
index 83b16c5fbfe..7cf6701f7c8 100644
--- a/tests/src/core/testqgscomposition.cpp
+++ b/tests/src/core/testqgscomposition.cpp
@@ -77,7 +77,7 @@ void TestQgsComposition::initTestCase()
//create composition
mMapSettings->setCrsTransformEnabled( true );
- mMapSettings->setMapUnits( Qgis::Meters );
+ mMapSettings->setMapUnits( QgsUnitTypes::DistanceMeters );
mComposition = new QgsComposition( *mMapSettings );
mComposition->setPaperSize( 297, 210 ); //A4 landscape
mComposition->setNumPages( 3 );
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
index 9837380642d..6dad514c071 100644
--- a/tests/src/core/testqgscoordinatereferencesystem.cpp
+++ b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -679,7 +679,7 @@ void TestQgsCoordinateReferenceSystem::mapUnits()
{
QgsCoordinateReferenceSystem myCrs;
myCrs.createFromSrid( GEOSRID );
- QVERIFY( myCrs.mapUnits() == Qgis::Degrees );
+ QVERIFY( myCrs.mapUnits() == QgsUnitTypes::DistanceDegrees );
debugPrint( myCrs );
}
void TestQgsCoordinateReferenceSystem::setValidationHint()
@@ -718,15 +718,15 @@ void TestQgsCoordinateReferenceSystem::debugPrint(
QgsDebugMsg( "* Proj4 : " + theCrs.toProj4() );
QgsDebugMsg( "* WKT : " + theCrs.toWkt() );
QgsDebugMsg( "* Desc. : " + theCrs.description() );
- if ( theCrs.mapUnits() == Qgis::Meters )
+ if ( theCrs.mapUnits() == QgsUnitTypes::DistanceMeters )
{
QgsDebugMsg( "* Units : meters" );
}
- else if ( theCrs.mapUnits() == Qgis::Feet )
+ else if ( theCrs.mapUnits() == QgsUnitTypes::DistanceFeet )
{
QgsDebugMsg( "* Units : feet" );
}
- else if ( theCrs.mapUnits() == Qgis::Degrees )
+ else if ( theCrs.mapUnits() == QgsUnitTypes::DistanceDegrees )
{
QgsDebugMsg( "* Units : degrees" );
}
diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
index c5a7b898d51..a3f15b9c6b0 100644
--- a/tests/src/core/testqgsdiagram.cpp
+++ b/tests/src/core/testqgsdiagram.cpp
@@ -143,7 +143,7 @@ class TestQgsDiagram : public QObject
ds.penColor = Qt::green;
ds.penWidth = .5;
ds.scaleByArea = true;
- ds.sizeType = QgsSymbolV2::MM;
+ ds.sizeType = QgsUnitTypes::RenderMillimeters;
ds.size = QSizeF( 5, 5 );
ds.angleOffset = 0;
@@ -180,7 +180,7 @@ class TestQgsDiagram : public QObject
ds.penColor = Qt::green;
ds.penWidth = .5;
ds.scaleByArea = true;
- ds.sizeType = QgsSymbolV2::MM;
+ ds.sizeType = QgsUnitTypes::RenderMillimeters;
ds.size = QSizeF( 5, 5 );
ds.angleOffset = 0;
diff --git a/tests/src/core/testqgsdistancearea.cpp b/tests/src/core/testqgsdistancearea.cpp
index ad70eaf3fe4..497205439b2 100644
--- a/tests/src/core/testqgsdistancearea.cpp
+++ b/tests/src/core/testqgsdistancearea.cpp
@@ -158,13 +158,13 @@ void TestQgsDistanceArea::unit_conversions()
myDa.setEllipsoidalMode( false );
double inputValue;
- Qgis::UnitType inputUnit;
- Qgis::UnitType outputUnit;
+ QgsUnitTypes::DistanceUnit inputUnit;
+ QgsUnitTypes::DistanceUnit outputUnit;
inputValue = 10000.0;
- inputUnit = Qgis::Meters;
- outputUnit = Qgis::Feet;
- //outputUnit = Qgis::Meters;
+ inputUnit = QgsUnitTypes::DistanceMeters;
+ outputUnit = QgsUnitTypes::DistanceFeet;
+ //outputUnit = QgsUnitTypes::Meters;
// First, convert from sq.meter to sq.feet
Q_NOWARN_DEPRECATED_PUSH
@@ -238,20 +238,20 @@ void TestQgsDistanceArea::measureUnits()
calc.setEllipsoidalMode( false );
calc.setEllipsoid( "NONE" );
calc.setSourceCrs( 254L );
- Qgis::UnitType units;
+ QgsUnitTypes::DistanceUnit units;
QgsPoint p1( 1341683.9854275715, 408256.9562717728 );
QgsPoint p2( 1349321.7807031618, 408256.9562717728 );
double result = calc.measureLine( p1, p2, units );
//no OTF, result will be in CRS unit (feet)
- QCOMPARE( units, Qgis::Feet );
+ QCOMPARE( units, QgsUnitTypes::DistanceFeet );
QGSCOMPARENEAR( result, 7637.7952755903825, 0.001 );
calc.setEllipsoidalMode( true );
calc.setEllipsoid( "WGS84" );
result = calc.measureLine( p1, p2, units );
//OTF, result will be in meters
- QCOMPARE( units, Qgis::Meters );
+ QCOMPARE( units, QgsUnitTypes::DistanceMeters );
QGSCOMPARENEAR( result, 2328.0988253106957, 0.001 );
}
@@ -283,16 +283,16 @@ void TestQgsDistanceArea::measureAreaAndUnits()
QgsDebugMsg( QString( "measured %1 in %2" ).arg( area ).arg( QgsUnitTypes::toString( units ) ) );
- QVERIFY(( qgsDoubleNear( area, 3.0, 0.00000001 ) && units == QgsUnitTypes::SquareDegrees )
- || ( qgsDoubleNear( area, 37176087091.5, 0.1 ) && units == QgsUnitTypes::SquareMeters ) );
+ QVERIFY(( qgsDoubleNear( area, 3.0, 0.00000001 ) && units == QgsUnitTypes::AreaSquareDegrees )
+ || ( qgsDoubleNear( area, 37176087091.5, 0.1 ) && units == QgsUnitTypes::AreaSquareMeters ) );
da.setEllipsoid( "WGS84" );
area = da.measureArea( polygon.data() );
units = da.areaUnits();
QgsDebugMsg( QString( "measured %1 in %2" ).arg( area ).arg( QgsUnitTypes::toString( units ) ) );
- QVERIFY(( qgsDoubleNear( area, 3.0, 0.00000001 ) && units == QgsUnitTypes::SquareDegrees )
- || ( qgsDoubleNear( area, 37176087091.5, 0.1 ) && units == QgsUnitTypes::SquareMeters ) );
+ QVERIFY(( qgsDoubleNear( area, 3.0, 0.00000001 ) && units == QgsUnitTypes::AreaSquareDegrees )
+ || ( qgsDoubleNear( area, 37176087091.5, 0.1 ) && units == QgsUnitTypes::AreaSquareMeters ) );
da.setEllipsoidalMode( true );
area = da.measureArea( polygon.data() );
@@ -301,10 +301,10 @@ void TestQgsDistanceArea::measureAreaAndUnits()
QgsDebugMsg( QString( "measured %1 in %2" ).arg( area ).arg( QgsUnitTypes::toString( units ) ) );
// should always be in Meters Squared
QGSCOMPARENEAR( area, 37416879192.9, 0.1 );
- QCOMPARE( units, QgsUnitTypes::SquareMeters );
+ QCOMPARE( units, QgsUnitTypes::AreaSquareMeters );
// test converting the resultant area
- area = da.convertAreaMeasurement( area, QgsUnitTypes::SquareMiles );
+ area = da.convertAreaMeasurement( area, QgsUnitTypes::AreaSquareMiles );
QGSCOMPARENEAR( area, 14446.7378, 0.001 );
// now try with a source CRS which is in feet
@@ -327,10 +327,10 @@ void TestQgsDistanceArea::measureAreaAndUnits()
units = da.areaUnits();
QgsDebugMsg( QString( "measured %1 in %2" ).arg( area ).arg( QgsUnitTypes::toString( units ) ) );
QGSCOMPARENEAR( area, 2000000, 0.001 );
- QCOMPARE( units, QgsUnitTypes::SquareFeet );
+ QCOMPARE( units, QgsUnitTypes::AreaSquareFeet );
// test converting the resultant area
- area = da.convertAreaMeasurement( area, QgsUnitTypes::SquareYards );
+ area = da.convertAreaMeasurement( area, QgsUnitTypes::AreaSquareYards );
QGSCOMPARENEAR( area, 222222.2222, 0.001 );
da.setEllipsoidalMode( true );
@@ -339,10 +339,10 @@ void TestQgsDistanceArea::measureAreaAndUnits()
units = da.areaUnits();
QgsDebugMsg( QString( "measured %1 in %2" ).arg( area ).arg( QgsUnitTypes::toString( units ) ) );
QGSCOMPARENEAR( area, 184149.37, 1.0 );
- QCOMPARE( units, QgsUnitTypes::SquareMeters );
+ QCOMPARE( units, QgsUnitTypes::AreaSquareMeters );
// test converting the resultant area
- area = da.convertAreaMeasurement( area, QgsUnitTypes::SquareYards );
+ area = da.convertAreaMeasurement( area, QgsUnitTypes::AreaSquareYards );
QgsDebugMsg( QString( "measured %1 in sq yrds" ).arg( area ) );
QGSCOMPARENEAR( area, 220240.8172549, 0.00001 );
}
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
index 625f3ca00b6..f2c968e5887 100644
--- a/tests/src/core/testqgsexpression.cpp
+++ b/tests/src/core/testqgsexpression.cpp
@@ -1746,10 +1746,10 @@ class TestQgsExpression: public QObject
double expected = 1005640568.0;
QVERIFY( qgsDoubleNear( vArea.toDouble(), expected, 1.0 ) );
// units should not be converted if no geometry calculator set
- expArea.setAreaUnits( QgsUnitTypes::SquareFeet );
+ expArea.setAreaUnits( QgsUnitTypes::AreaSquareFeet );
vArea = expArea.evaluate( &context );
QVERIFY( qgsDoubleNear( vArea.toDouble(), expected, 1.0 ) );
- expArea.setAreaUnits( QgsUnitTypes::SquareNauticalMiles );
+ expArea.setAreaUnits( QgsUnitTypes::AreaSquareNauticalMiles );
vArea = expArea.evaluate( &context );
QVERIFY( qgsDoubleNear( vArea.toDouble(), expected, 1.0 ) );
@@ -1760,13 +1760,13 @@ class TestQgsExpression: public QObject
expected = 1009089817.0;
QVERIFY( qgsDoubleNear( vArea.toDouble(), expected, 1.0 ) );
// test unit conversion
- expArea2.setAreaUnits( QgsUnitTypes::SquareMeters ); //default units should be square meters
+ expArea2.setAreaUnits( QgsUnitTypes::AreaSquareMeters ); //default units should be square meters
vArea = expArea2.evaluate( &context );
QVERIFY( qgsDoubleNear( vArea.toDouble(), expected, 1.0 ) );
- expArea2.setAreaUnits( QgsUnitTypes::UnknownAreaUnit ); //unknown units should not be converted
+ expArea2.setAreaUnits( QgsUnitTypes::AreaUnknownUnit ); //unknown units should not be converted
vArea = expArea2.evaluate( &context );
QVERIFY( qgsDoubleNear( vArea.toDouble(), expected, 1.0 ) );
- expArea2.setAreaUnits( QgsUnitTypes::SquareMiles );
+ expArea2.setAreaUnits( QgsUnitTypes::AreaSquareMiles );
expected = 389.6117565069;
vArea = expArea2.evaluate( &context );
QVERIFY( qgsDoubleNear( vArea.toDouble(), expected, 0.001 ) );
@@ -1777,10 +1777,10 @@ class TestQgsExpression: public QObject
expected = 128282.086;
QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
// units should not be converted if no geometry calculator set
- expPerimeter.setDistanceUnits( Qgis::Feet );
+ expPerimeter.setDistanceUnits( QgsUnitTypes::DistanceFeet );
vPerimeter = expPerimeter.evaluate( &context );
QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
- expPerimeter.setDistanceUnits( Qgis::NauticalMiles );
+ expPerimeter.setDistanceUnits( QgsUnitTypes::DistanceNauticalMiles );
vPerimeter = expPerimeter.evaluate( &context );
QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
@@ -1791,13 +1791,13 @@ class TestQgsExpression: public QObject
expected = 128289.074;
QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
// test unit conversion
- expPerimeter2.setDistanceUnits( Qgis::Meters ); //default units should be meters
+ expPerimeter2.setDistanceUnits( QgsUnitTypes::DistanceMeters ); //default units should be meters
vPerimeter = expPerimeter2.evaluate( &context );
QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
- expPerimeter2.setDistanceUnits( Qgis::UnknownUnit ); //unknown units should not be converted
+ expPerimeter2.setDistanceUnits( QgsUnitTypes::DistanceUnknownUnit ); //unknown units should not be converted
vPerimeter = expPerimeter2.evaluate( &context );
QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
- expPerimeter2.setDistanceUnits( Qgis::Feet );
+ expPerimeter2.setDistanceUnits( QgsUnitTypes::DistanceFeet );
expected = 420895.9120735;
vPerimeter = expPerimeter2.evaluate( &context );
QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
@@ -1813,10 +1813,10 @@ class TestQgsExpression: public QObject
expected = 26930.637;
QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
// units should not be converted if no geometry calculator set
- expLength.setDistanceUnits( Qgis::Feet );
+ expLength.setDistanceUnits( QgsUnitTypes::DistanceFeet );
vLength = expLength.evaluate( &context );
QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
- expLength.setDistanceUnits( Qgis::NauticalMiles );
+ expLength.setDistanceUnits( QgsUnitTypes::DistanceNauticalMiles );
vLength = expLength.evaluate( &context );
QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
@@ -1827,13 +1827,13 @@ class TestQgsExpression: public QObject
expected = 26932.156;
QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
// test unit conversion
- expLength2.setDistanceUnits( Qgis::Meters ); //default units should be meters
+ expLength2.setDistanceUnits( QgsUnitTypes::DistanceMeters ); //default units should be meters
vLength = expLength2.evaluate( &context );
QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
- expLength2.setDistanceUnits( Qgis::UnknownUnit ); //unknown units should not be converted
+ expLength2.setDistanceUnits( QgsUnitTypes::DistanceUnknownUnit ); //unknown units should not be converted
vLength = expLength2.evaluate( &context );
QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
- expLength2.setDistanceUnits( Qgis::Feet );
+ expLength2.setDistanceUnits( QgsUnitTypes::DistanceFeet );
expected = 88360.0918635;
vLength = expLength2.evaluate( &context );
QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
index 25d33e37eac..00be5982552 100644
--- a/tests/src/core/testqgslegendrenderer.cpp
+++ b/tests/src/core/testqgslegendrenderer.cpp
@@ -304,7 +304,7 @@ void TestQgsLegendRenderer::testMapUnits()
QgsMarkerSymbolV2* sym = new QgsMarkerSymbolV2();
sym->setColor( Qt::red );
sym->setSize( 100 );
- sym->setSizeUnit( QgsSymbolV2::MapUnit );
+ sym->setSizeUnit( QgsUnitTypes::RenderMapUnits );
QgsCategorizedSymbolRendererV2* catRenderer = dynamic_cast( mVL3->rendererV2() );
QVERIFY( catRenderer );
catRenderer->updateCategorySymbol( 0, sym );
@@ -312,13 +312,13 @@ void TestQgsLegendRenderer::testMapUnits()
sym = new QgsMarkerSymbolV2();
sym->setColor( Qt::green );
sym->setSize( 300 );
- sym->setSizeUnit( QgsSymbolV2::MapUnit );
+ sym->setSizeUnit( QgsUnitTypes::RenderMapUnits );
catRenderer->updateCategorySymbol( 1, sym );
sym = new QgsMarkerSymbolV2();
sym->setColor( Qt::blue );
sym->setSize( 5 );
- sym->setSizeUnit( QgsSymbolV2::MM );
+ sym->setSizeUnit( QgsUnitTypes::RenderMillimeters );
catRenderer->updateCategorySymbol( 2, sym );
QgsLayerTreeGroup* root = new QgsLayerTreeGroup();
diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp
index 93b8a48e0a1..0ece2961c56 100644
--- a/tests/src/core/testqgspainteffect.cpp
+++ b/tests/src/core/testqgspainteffect.cpp
@@ -440,8 +440,8 @@ void TestQgsPaintEffect::dropShadow()
QCOMPARE( effect->offsetAngle(), 77 );
effect->setOffsetDistance( 9.7 );
QCOMPARE( effect->offsetDistance(), 9.7 );
- effect->setOffsetUnit( QgsSymbolV2::MapUnit );
- QCOMPARE( effect->offsetUnit(), QgsSymbolV2::MapUnit );
+ effect->setOffsetUnit( QgsUnitTypes::RenderMapUnits );
+ QCOMPARE( effect->offsetUnit(), QgsUnitTypes::RenderMapUnits );
effect->setOffsetMapUnitScale( QgsMapUnitScale( 1.0, 2.0 ) );
QCOMPARE( effect->offsetMapUnitScale().minScale, 1.0 );
QCOMPARE( effect->offsetMapUnitScale().maxScale, 2.0 );
@@ -535,8 +535,8 @@ void TestQgsPaintEffect::glow()
QCOMPARE( effect->blurLevel(), 6 );
effect->setSpread( 7.8 );
QCOMPARE( effect->spread(), 7.8 );
- effect->setSpreadUnit( QgsSymbolV2::MapUnit );
- QCOMPARE( effect->spreadUnit(), QgsSymbolV2::MapUnit );
+ effect->setSpreadUnit( QgsUnitTypes::RenderMapUnits );
+ QCOMPARE( effect->spreadUnit(), QgsUnitTypes::RenderMapUnits );
effect->setSpreadMapUnitScale( QgsMapUnitScale( 1.0, 2.0 ) );
QCOMPARE( effect->spreadMapUnitScale().minScale, 1.0 );
QCOMPARE( effect->spreadMapUnitScale().maxScale, 2.0 );
@@ -841,7 +841,7 @@ void TestQgsPaintEffect::mapUnits()
QgsOuterGlowEffect* effect = new QgsOuterGlowEffect();
effect->setColor( QColor( 255, 0, 0 ) );
effect->setSpread( 3 );
- effect->setSpreadUnit( QgsSymbolV2::MapUnit );
+ effect->setSpreadUnit( QgsUnitTypes::RenderMapUnits );
renderer->setPaintEffect( effect );
lineLayer->setRendererV2( renderer );
diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp
index 7f272d5a53f..a8ae721fba5 100644
--- a/tests/src/core/testqgsproject.cpp
+++ b/tests/src/core/testqgsproject.cpp
@@ -92,37 +92,37 @@ void TestQgsProject::testProjectUnits()
//first set a default QGIS distance unit
QSettings s;
- s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
+ s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceFeet ) );
QgsProject* prj = QgsProject::instance();
// new project should inherit QGIS default distance unit
prj->clear();
- QCOMPARE( prj->distanceUnits(), Qgis::Feet );
+ QCOMPARE( prj->distanceUnits(), QgsUnitTypes::DistanceFeet );
//changing default QGIS unit should not affect existing project
- s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( Qgis::NauticalMiles ) );
- QCOMPARE( prj->distanceUnits(), Qgis::Feet );
+ s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceNauticalMiles ) );
+ QCOMPARE( prj->distanceUnits(), QgsUnitTypes::DistanceFeet );
//test setting new units for project
- prj->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::NauticalMiles ) );
- QCOMPARE( prj->distanceUnits(), Qgis::NauticalMiles );
+ prj->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::DistanceNauticalMiles ) );
+ QCOMPARE( prj->distanceUnits(), QgsUnitTypes::DistanceNauticalMiles );
// AREA
//first set a default QGIS area unit
- s.setValue( "/qgis/measure/areaunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::SquareYards ) );
+ s.setValue( "/qgis/measure/areaunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaSquareYards ) );
// new project should inherit QGIS default area unit
prj->clear();
- QCOMPARE( prj->areaUnits(), QgsUnitTypes::SquareYards );
+ QCOMPARE( prj->areaUnits(), QgsUnitTypes::AreaSquareYards );
//changing default QGIS unit should not affect existing project
- s.setValue( "/qgis/measure/areaunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::Acres ) );
- QCOMPARE( prj->areaUnits(), QgsUnitTypes::SquareYards );
+ s.setValue( "/qgis/measure/areaunits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaAcres ) );
+ QCOMPARE( prj->areaUnits(), QgsUnitTypes::AreaSquareYards );
//test setting new units for project
- prj->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::Acres ) );
- QCOMPARE( prj->areaUnits(), QgsUnitTypes::Acres );
+ prj->writeEntry( "Measurement", "/AreaUnits", QgsUnitTypes::encodeUnit( QgsUnitTypes::AreaAcres ) );
+ QCOMPARE( prj->areaUnits(), QgsUnitTypes::AreaAcres );
}
void TestQgsProject::variablesChanged()
diff --git a/tests/src/core/testqgsrasterfill.cpp b/tests/src/core/testqgsrasterfill.cpp
index c8744e80f6f..74d0f7ac836 100644
--- a/tests/src/core/testqgsrasterfill.cpp
+++ b/tests/src/core/testqgsrasterfill.cpp
@@ -137,7 +137,7 @@ void TestQgsRasterFill::init()
{
mRasterFill->setImageFilePath( mTestDataDir + QLatin1String( "sample_image.png" ) );
mRasterFill->setWidth( 30.0 );
- mRasterFill->setWidthUnit( QgsSymbolV2::Pixel );
+ mRasterFill->setWidthUnit( QgsUnitTypes::RenderPixels );
mRasterFill->setCoordinateMode( QgsRasterFillSymbolLayer::Feature );
mRasterFill->setAlpha( 1.0 );
mRasterFill->setOffset( QPointF( 0, 0 ) );
@@ -182,7 +182,7 @@ void TestQgsRasterFill::offset()
void TestQgsRasterFill::width()
{
mReport += "Raster fill width
\n";
- mRasterFill->setWidthUnit( QgsSymbolV2::MM );
+ mRasterFill->setWidthUnit( QgsUnitTypes::RenderMillimeters );
mRasterFill->setWidth( 5.0 );
bool result = imageCheck( "rasterfill_width" );
QVERIFY( result );
diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp
index 1dd4b1a6d15..143bcff03b5 100644
--- a/tests/src/core/testqgsshapeburst.cpp
+++ b/tests/src/core/testqgsshapeburst.cpp
@@ -184,7 +184,7 @@ void TestQgsShapeburst::shapeburstMaxDistanceMm()
mReport += "Shapeburst symbol renderer maximum distance MM
\n";
mShapeburstFill->setUseWholeShape( false );
mShapeburstFill->setMaxDistance( 3 );
- mShapeburstFill->setDistanceUnit( QgsSymbolV2::MM );
+ mShapeburstFill->setDistanceUnit( QgsUnitTypes::RenderMillimeters );
QVERIFY( imageCheck( "shapeburst_maxdistance_mm" ) );
mShapeburstFill->setUseWholeShape( true );
}
@@ -194,10 +194,10 @@ void TestQgsShapeburst::shapeburstMaxDistanceMapUnits()
mReport += "Shapeburst symbol renderer maximum distance map units
\n";
mShapeburstFill->setUseWholeShape( false );
mShapeburstFill->setMaxDistance( 10 );
- mShapeburstFill->setDistanceUnit( QgsSymbolV2::MapUnit );
+ mShapeburstFill->setDistanceUnit( QgsUnitTypes::RenderMapUnits );
QVERIFY( imageCheck( "shapeburst_maxdistance_mapunit" ) );
mShapeburstFill->setUseWholeShape( true );
- mShapeburstFill->setDistanceUnit( QgsSymbolV2::MM );
+ mShapeburstFill->setDistanceUnit( QgsUnitTypes::RenderMillimeters );
}
void TestQgsShapeburst::shapeburstIgnoreRings()
diff --git a/tests/src/python/test_qgsatlascomposition.py b/tests/src/python/test_qgsatlascomposition.py
index 19245502b47..d0e1862a9a9 100644
--- a/tests/src/python/test_qgsatlascomposition.py
+++ b/tests/src/python/test_qgsatlascomposition.py
@@ -22,7 +22,7 @@ import tempfile
from qgis.testing import start_app, unittest
from utilities import unitTestDataPath
from qgis.PyQt.QtCore import QFileInfo, QRectF, qWarning
-from qgis.core import Qgis, QgsVectorLayer, QgsMapLayerRegistry, QgsMapSettings, QgsCoordinateReferenceSystem, \
+from qgis.core import QgsUnitTypes, QgsVectorLayer, QgsMapLayerRegistry, QgsMapSettings, QgsCoordinateReferenceSystem, \
QgsComposition, QgsFillSymbolV2, QgsSingleSymbolRendererV2, QgsComposerLabel, QgsComposerMap, QgsFontUtils, \
QgsRectangle, QgsComposerLegend, QgsFeature, QgsGeometry, QgsPoint, QgsRendererCategoryV2, QgsCategorizedSymbolRendererV2, QgsMarkerSymbolV2
from qgscompositionchecker import QgsCompositionChecker
@@ -48,7 +48,7 @@ class TestQgsAtlasComposition(unittest.TestCase):
layerStringList.append(mVectorLayer.id())
self.mapSettings.setLayers(layerStringList)
self.mapSettings.setCrsTransformEnabled(True)
- self.mapSettings.setMapUnits(Qgis.Meters)
+ self.mapSettings.setMapUnits(QgsUnitTypes.DistanceMeters)
# select epsg:2154
crs = QgsCoordinateReferenceSystem()
diff --git a/tests/src/python/test_qgsdistancearea.py b/tests/src/python/test_qgsdistancearea.py
index 2c9f7ec61da..f3669dbd1f6 100644
--- a/tests/src/python/test_qgsdistancearea.py
+++ b/tests/src/python/test_qgsdistancearea.py
@@ -18,7 +18,6 @@ from qgis.core import (QgsGeometry,
QgsPoint,
QgsDistanceArea,
QgsCoordinateReferenceSystem,
- Qgis,
QgsUnitTypes
)
@@ -171,16 +170,16 @@ class TestQgsDistanceArea(unittest.TestCase):
units = da.lengthUnits()
print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
- assert ((abs(distance - 2.23606797) < 0.00000001 and units == Qgis.Degrees) or
- (abs(distance - 248.52) < 0.01 and units == Qgis.Meters))
+ assert ((abs(distance - 2.23606797) < 0.00000001 and units == QgsUnitTypes.DistanceDegrees) or
+ (abs(distance - 248.52) < 0.01 and units == QgsUnitTypes.DistanceMeters))
da.setEllipsoid("WGS84")
distance = da.measureLine(QgsPoint(1, 1), QgsPoint(2, 3))
units = da.lengthUnits()
print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
- assert ((abs(distance - 2.23606797) < 0.00000001 and units == Qgis.Degrees) or
- (abs(distance - 248.52) < 0.01 and units == Qgis.Meters))
+ assert ((abs(distance - 2.23606797) < 0.00000001 and units == QgsUnitTypes.DistanceDegrees) or
+ (abs(distance - 248.52) < 0.01 and units == QgsUnitTypes.DistanceMeters))
da.setEllipsoidalMode(True)
distance = da.measureLine(QgsPoint(1, 1), QgsPoint(2, 3))
@@ -189,10 +188,10 @@ class TestQgsDistanceArea(unittest.TestCase):
print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
# should always be in Meters
self.assertAlmostEqual(distance, 247555.57, delta=0.01)
- self.assertEqual(units, Qgis.Meters)
+ self.assertEqual(units, QgsUnitTypes.DistanceMeters)
# test converting the resultant length
- distance = da.convertLengthMeasurement(distance, Qgis.NauticalMiles)
+ distance = da.convertLengthMeasurement(distance, QgsUnitTypes.DistanceNauticalMiles)
self.assertAlmostEqual(distance, 133.669, delta=0.01)
# now try with a source CRS which is in feet
@@ -203,10 +202,10 @@ class TestQgsDistanceArea(unittest.TestCase):
units = da.lengthUnits()
print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
self.assertAlmostEqual(distance, 2.23606797, delta=0.000001)
- self.assertEqual(units, Qgis.Feet)
+ self.assertEqual(units, QgsUnitTypes.DistanceFeet)
# test converting the resultant length
- distance = da.convertLengthMeasurement(distance, Qgis.Meters)
+ distance = da.convertLengthMeasurement(distance, QgsUnitTypes.DistanceMeters)
self.assertAlmostEqual(distance, 0.6815, delta=0.001)
da.setEllipsoidalMode(True)
@@ -215,10 +214,10 @@ class TestQgsDistanceArea(unittest.TestCase):
units = da.lengthUnits()
print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
self.assertAlmostEqual(distance, 0.67953772, delta=0.000001)
- self.assertEqual(units, Qgis.Meters)
+ self.assertEqual(units, QgsUnitTypes.DistanceMeters)
# test converting the resultant length
- distance = da.convertLengthMeasurement(distance, Qgis.Feet)
+ distance = da.convertLengthMeasurement(distance, QgsUnitTypes.DistanceFeet)
self.assertAlmostEqual(distance, 2.2294, delta=0.001)
def testAreaMeasureAndUnits(self):
@@ -245,16 +244,16 @@ class TestQgsDistanceArea(unittest.TestCase):
units = da.areaUnits()
print("measured {} in {}".format(area, QgsUnitTypes.toString(units)))
- assert ((abs(area - 3.0) < 0.00000001 and units == QgsUnitTypes.SquareDegrees) or
- (abs(area - 37176087091.5) < 0.1 and units == QgsUnitTypes.SquareMeters))
+ assert ((abs(area - 3.0) < 0.00000001 and units == QgsUnitTypes.AreaSquareDegrees) or
+ (abs(area - 37176087091.5) < 0.1 and units == QgsUnitTypes.AreaSquareMeters))
da.setEllipsoid("WGS84")
area = da.measureArea(polygon)
units = da.areaUnits()
print("measured {} in {}".format(area, QgsUnitTypes.toString(units)))
- assert ((abs(area - 3.0) < 0.00000001 and units == QgsUnitTypes.SquareDegrees) or
- (abs(area - 37176087091.5) < 0.1 and units == QgsUnitTypes.SquareMeters))
+ assert ((abs(area - 3.0) < 0.00000001 and units == QgsUnitTypes.AreaSquareDegrees) or
+ (abs(area - 37176087091.5) < 0.1 and units == QgsUnitTypes.AreaSquareMeters))
da.setEllipsoidalMode(True)
area = da.measureArea(polygon)
@@ -263,10 +262,10 @@ class TestQgsDistanceArea(unittest.TestCase):
print("measured {} in {}".format(area, QgsUnitTypes.toString(units)))
# should always be in Meters Squared
self.assertAlmostEqual(area, 37416879192.9, delta=0.1)
- self.assertEqual(units, QgsUnitTypes.SquareMeters)
+ self.assertEqual(units, QgsUnitTypes.AreaSquareMeters)
# test converting the resultant area
- area = da.convertAreaMeasurement(area, QgsUnitTypes.SquareMiles)
+ area = da.convertAreaMeasurement(area, QgsUnitTypes.AreaSquareMiles)
self.assertAlmostEqual(area, 14446.7378, delta=0.001)
# now try with a source CRS which is in feet
@@ -282,10 +281,10 @@ class TestQgsDistanceArea(unittest.TestCase):
units = da.areaUnits()
print("measured {} in {}".format(area, QgsUnitTypes.toString(units)))
self.assertAlmostEqual(area, 2000000, delta=0.001)
- self.assertEqual(units, QgsUnitTypes.SquareFeet)
+ self.assertEqual(units, QgsUnitTypes.AreaSquareFeet)
# test converting the resultant area
- area = da.convertAreaMeasurement(area, QgsUnitTypes.SquareYards)
+ area = da.convertAreaMeasurement(area, QgsUnitTypes.AreaSquareYards)
self.assertAlmostEqual(area, 222222.2222, delta=0.001)
da.setEllipsoidalMode(True)
@@ -294,42 +293,42 @@ class TestQgsDistanceArea(unittest.TestCase):
units = da.areaUnits()
print("measured {} in {}".format(area, QgsUnitTypes.toString(units)))
self.assertAlmostEqual(area, 184149.37, delta=1.0)
- self.assertEqual(units, QgsUnitTypes.SquareMeters)
+ self.assertEqual(units, QgsUnitTypes.AreaSquareMeters)
# test converting the resultant area
- area = da.convertAreaMeasurement(area, QgsUnitTypes.SquareYards)
+ area = da.convertAreaMeasurement(area, QgsUnitTypes.AreaSquareYards)
self.assertAlmostEqual(area, 220240.8172549, delta=1.0)
def testFormatDistance(self):
"""Test formatting distances"""
QLocale.setDefault(QLocale.c())
- self.assertEqual(QgsDistanceArea.formatDistance(45, 3, Qgis.Meters), u'45.000 m')
- self.assertEqual(QgsDistanceArea.formatDistance(1300, 1, Qgis.Meters, False), u'1.3 km')
- self.assertEqual(QgsDistanceArea.formatDistance(.005, 1, Qgis.Meters, False), u'5.0 mm')
- self.assertEqual(QgsDistanceArea.formatDistance(.05, 1, Qgis.Meters, False), u'5.0 cm')
- self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Kilometers, True), u'1.500 km')
- self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Kilometers, False), u'1.500 km')
- self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, Qgis.Kilometers, True), u'0.500 km')
- self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, Qgis.Kilometers, False), u'500.000 m')
- self.assertEqual(QgsDistanceArea.formatDistance(6000, 0, Qgis.Feet, True), u'6,000 ft')
- self.assertEqual(QgsDistanceArea.formatDistance(6000, 3, Qgis.Feet, False), u'1.136 mi')
- self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Feet, True), u'300 ft')
- self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Feet, False), u'300 ft')
- self.assertEqual(QgsDistanceArea.formatDistance(3000, 0, Qgis.Yards, True), u'3,000 yd')
- self.assertEqual(QgsDistanceArea.formatDistance(3000, 3, Qgis.Yards, False), u'1.705 mi')
- self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Yards, True), u'300 yd')
- self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Yards, False), u'300 yd')
- self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Miles, True), u'1.500 mi')
- self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Miles, False), u'1.500 mi')
- self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, Qgis.Miles, True), u'0.500 mi')
- self.assertEqual(QgsDistanceArea.formatDistance(0.5, 0, Qgis.Miles, False), u'2,640 ft')
- self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, Qgis.NauticalMiles, True), u'0.5 NM')
- self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, Qgis.NauticalMiles, False), u'0.5 NM')
- self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, Qgis.NauticalMiles, True), u'1.5 NM')
- self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, Qgis.NauticalMiles, False), u'1.5 NM')
- self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, Qgis.Degrees, True), u'1.5 degrees')
- self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, Qgis.Degrees, False), u'1.0 degree')
- self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, Qgis.UnknownUnit, False), u'1.0')
+ self.assertEqual(QgsDistanceArea.formatDistance(45, 3, QgsUnitTypes.DistanceMeters), u'45.000 m')
+ self.assertEqual(QgsDistanceArea.formatDistance(1300, 1, QgsUnitTypes.DistanceMeters, False), u'1.3 km')
+ self.assertEqual(QgsDistanceArea.formatDistance(.005, 1, QgsUnitTypes.DistanceMeters, False), u'5.0 mm')
+ self.assertEqual(QgsDistanceArea.formatDistance(.05, 1, QgsUnitTypes.DistanceMeters, False), u'5.0 cm')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QgsUnitTypes.DistanceKilometers, True), u'1.500 km')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QgsUnitTypes.DistanceKilometers, False), u'1.500 km')
+ self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, QgsUnitTypes.DistanceKilometers, True), u'0.500 km')
+ self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, QgsUnitTypes.DistanceKilometers, False), u'500.000 m')
+ self.assertEqual(QgsDistanceArea.formatDistance(6000, 0, QgsUnitTypes.DistanceFeet, True), u'6,000 ft')
+ self.assertEqual(QgsDistanceArea.formatDistance(6000, 3, QgsUnitTypes.DistanceFeet, False), u'1.136 mi')
+ self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QgsUnitTypes.DistanceFeet, True), u'300 ft')
+ self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QgsUnitTypes.DistanceFeet, False), u'300 ft')
+ self.assertEqual(QgsDistanceArea.formatDistance(3000, 0, QgsUnitTypes.DistanceYards, True), u'3,000 yd')
+ self.assertEqual(QgsDistanceArea.formatDistance(3000, 3, QgsUnitTypes.DistanceYards, False), u'1.705 mi')
+ self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QgsUnitTypes.DistanceYards, True), u'300 yd')
+ self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QgsUnitTypes.DistanceYards, False), u'300 yd')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QgsUnitTypes.DistanceMiles, True), u'1.500 mi')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QgsUnitTypes.DistanceMiles, False), u'1.500 mi')
+ self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, QgsUnitTypes.DistanceMiles, True), u'0.500 mi')
+ self.assertEqual(QgsDistanceArea.formatDistance(0.5, 0, QgsUnitTypes.DistanceMiles, False), u'2,640 ft')
+ self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, QgsUnitTypes.DistanceNauticalMiles, True), u'0.5 NM')
+ self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, QgsUnitTypes.DistanceNauticalMiles, False), u'0.5 NM')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, QgsUnitTypes.DistanceNauticalMiles, True), u'1.5 NM')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, QgsUnitTypes.DistanceNauticalMiles, False), u'1.5 NM')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, QgsUnitTypes.DistanceDegrees, True), u'1.5 degrees')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, QgsUnitTypes.DistanceDegrees, False), u'1.0 degree')
+ self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, QgsUnitTypes.DistanceUnknownUnit, False), u'1.0')
QLocale.setDefault(QLocale.system())
if __name__ == '__main__':
diff --git a/tests/src/python/test_qgsmapunitscale.py b/tests/src/python/test_qgsmapunitscale.py
index 30eb8bb35dc..ec3162e3ded 100644
--- a/tests/src/python/test_qgsmapunitscale.py
+++ b/tests/src/python/test_qgsmapunitscale.py
@@ -14,7 +14,7 @@ __revision__ = '$Format:%H$'
import qgis # NOQA
-from qgis.core import (QgsMapUnitScale, QgsRenderContext, QgsSymbolLayerV2Utils, QgsSymbolV2, QgsMapSettings, QgsRectangle)
+from qgis.core import (QgsMapUnitScale, QgsRenderContext, QgsSymbolLayerV2Utils, QgsSymbolV2, QgsMapSettings, QgsRectangle, QgsUnitTypes)
from qgis.PyQt.QtCore import QSize
from qgis.testing import unittest
@@ -135,32 +135,32 @@ class PyQgsMapUnitScale(unittest.TestCase):
# start with no min/max scale
c = QgsMapUnitScale()
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.MapUnit, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(sf, 0.5, places=5)
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.MM, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(sf, 11.8110236, places=5)
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.Pixel, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(sf, 1.0, places=5)
# minimum scale greater than the renderer scale, so should be limited to minScale
c.minScale = 1 / 150000000.0
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.MapUnit, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(sf, 3.89250455, places=5)
# only conversion from mapunits should be affected
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.MM, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(sf, 11.8110236, places=5)
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.Pixel, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(sf, 1.0, places=5)
c.minScale = 0
# maximum scale less than the renderer scale, so should be limited to maxScale
c.maxScale = 1 / 350000000.0
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.MapUnit, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(sf, 0.5, places=5)
# only conversion from mapunits should be affected
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.MM, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(sf, 11.8110236, places=5)
- sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsSymbolV2.Pixel, c)
+ sf = QgsSymbolLayerV2Utils.lineWidthScaleFactor(r, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(sf, 1.0, places=5)
def testConvertToPainterUnits(self):
@@ -177,34 +177,34 @@ class PyQgsMapUnitScale(unittest.TestCase):
# start with no min/max scale
c = QgsMapUnitScale()
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(size, 1.0, places=5)
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 23.622047, places=5)
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 2.0, places=5)
# minimum size greater than the calculated size, so size should be limited to minSizeMM
c.minSizeMM = 5
c.minSizeMMEnabled = True
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(size, 59.0551181, places=5)
# only conversion from mapunits should be affected
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 23.622047, places=5)
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 2.0, places=5)
c.minSizeMMEnabled = False
# maximum size less than the calculated size, so size should be limited to maxSizeMM
c.maxSizeMM = 0.1
c.maxSizeMMEnabled = True
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(size, 1.0, places=5)
# only conversion from mapunits should be affected
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 23.622047, places=5)
- size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToPainterUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 2.0, places=5)
def testConvertToMapUnits(self):
@@ -221,56 +221,56 @@ class PyQgsMapUnitScale(unittest.TestCase):
# start with no min/max scale
c = QgsMapUnitScale()
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertEqual(size, 2.0)
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 47.244094, places=5)
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 4.0, places=5)
# minimum size greater than the calculated size, so size should be limited to minSizeMM
c.minSizeMM = 5
c.minSizeMMEnabled = True
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(size, 118.1102362, places=5)
# only conversion from mapunits should be affected
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 47.244094, places=5)
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 4.0, places=5)
c.minSizeMMEnabled = False
# maximum size less than the calculated size, so size should be limited to maxSizeMM
c.maxSizeMM = 0.05
c.maxSizeMMEnabled = True
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(size, 1.1811023622047245, places=5)
# only conversion from mapunits should be affected
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 47.244094, places=5)
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 4.0, places=5)
c.maxSizeMMEnabled = False
# test with minimum scale set
c.minScale = 1 / 150000000.0
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(size, 15.57001821, places=5)
# only conversion from mapunits should be affected
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 47.244094, places=5)
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 4.0, places=5)
c.minScale = 0
# test with maximum scale set
c.maxScale = 1 / 1550000000.0
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MapUnit, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(size, 1.50677595625, places=5)
# only conversion from mapunits should be affected
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.MM, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(size, 47.244094, places=5)
- size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsSymbolV2.Pixel, c)
+ size = QgsSymbolLayerV2Utils.convertToMapUnits(r, 2, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(size, 4.0, places=5)
c.maxScale = 0
@@ -288,32 +288,32 @@ class PyQgsMapUnitScale(unittest.TestCase):
# start with no min/max scale
c = QgsMapUnitScale()
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.MapUnit, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(sf, 0.5, places=5)
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.MM, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(sf, 11.8110236, places=5)
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.Pixel, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(sf, 1.0, places=5)
# minimum scale greater than the renderer scale, so should be limited to minScale
c.minScale = 1 / 150000000.0
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.MapUnit, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(sf, 3.8925045, places=5)
# only conversion from mapunits should be affected
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.MM, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(sf, 11.811023, places=5)
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.Pixel, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(sf, 1.0, places=5)
c.minScale = 0
# maximum scale less than the renderer scale, so should be limited to maxScale
c.maxScale = 1 / 350000000.0
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.MapUnit, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(sf, 0.5, places=5)
# only conversion from mapunits should be affected
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.MM, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(sf, 11.8110236, places=5)
- sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsSymbolV2.Pixel, c)
+ sf = QgsSymbolLayerV2Utils.pixelSizeScaleFactor(r, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(sf, 1.0, places=5)
def testMapUnitScaleFactor(self):
@@ -328,11 +328,11 @@ class PyQgsMapUnitScale(unittest.TestCase):
# renderer scale should be about 1:291937841
c = QgsMapUnitScale()
- sf = QgsSymbolLayerV2Utils.mapUnitScaleFactor(r, QgsSymbolV2.MapUnit, c)
+ sf = QgsSymbolLayerV2Utils.mapUnitScaleFactor(r, QgsUnitTypes.RenderMapUnits, c)
self.assertAlmostEqual(sf, 1.0, places=5)
- sf = QgsSymbolLayerV2Utils.mapUnitScaleFactor(r, QgsSymbolV2.MM, c)
+ sf = QgsSymbolLayerV2Utils.mapUnitScaleFactor(r, QgsUnitTypes.RenderMillimeters, c)
self.assertAlmostEqual(sf, 23.622047, places=5)
- sf = QgsSymbolLayerV2Utils.mapUnitScaleFactor(r, QgsSymbolV2.Pixel, c)
+ sf = QgsSymbolLayerV2Utils.mapUnitScaleFactor(r, QgsUnitTypes.RenderPixels, c)
self.assertAlmostEqual(sf, 2.0, places=5)
def testEncodeDecode(self):
diff --git a/tests/src/python/test_qgssymbollayerv2.py b/tests/src/python/test_qgssymbollayerv2.py
index e00a73d9326..55c7ad4da73 100644
--- a/tests/src/python/test_qgssymbollayerv2.py
+++ b/tests/src/python/test_qgssymbollayerv2.py
@@ -54,6 +54,7 @@ from qgis.core import (QgsCentroidFillSymbolLayerV2,
QgsShapeburstFillSymbolLayerV2,
QgsArrowSymbolLayer,
QgsSymbolV2,
+ QgsUnitTypes
)
from qgis.testing import start_app, unittest
from utilities import unitTestDataPath
@@ -383,7 +384,7 @@ class TestQgsSymbolLayerV2(unittest.TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
assert mExpectedValue == mValue, mMessage
- mExpectedValue = QgsSymbolV2.MapUnit
+ mExpectedValue = QgsUnitTypes.RenderMapUnits
mGradientLayer.setOffsetUnit(mExpectedValue)
mValue = mGradientLayer.offsetUnit()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
diff --git a/tests/src/python/test_qgssymbolv2.py b/tests/src/python/test_qgssymbolv2.py
index 0867ad21375..dfc803468c7 100644
--- a/tests/src/python/test_qgssymbolv2.py
+++ b/tests/src/python/test_qgssymbolv2.py
@@ -41,7 +41,8 @@ from qgis.core import (QgsGeometry,
Qgis,
QgsMapSettings,
QgsRenderChecker,
- QgsSimpleMarkerSymbolLayerV2
+ QgsSimpleMarkerSymbolLayerV2,
+ QgsUnitTypes
)
from qgis.testing import unittest, start_app
@@ -250,22 +251,22 @@ class TestQgsMarkerSymbolV2(unittest.TestCase):
markerSymbol = QgsMarkerSymbolV2()
markerSymbol.deleteSymbolLayer(0)
markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10))
- self.assertEqual(markerSymbol.sizeUnit(), QgsSymbolV2.MM)
- markerSymbol.setSizeUnit(QgsSymbolV2.MapUnit)
- self.assertEqual(markerSymbol.sizeUnit(), QgsSymbolV2.MapUnit)
- self.assertEqual(markerSymbol.symbolLayer(0).sizeUnit(), QgsSymbolV2.MapUnit)
+ self.assertEqual(markerSymbol.sizeUnit(), QgsUnitTypes.RenderMillimeters)
+ markerSymbol.setSizeUnit(QgsUnitTypes.RenderMapUnits)
+ self.assertEqual(markerSymbol.sizeUnit(), QgsUnitTypes.RenderMapUnits)
+ self.assertEqual(markerSymbol.symbolLayer(0).sizeUnit(), QgsUnitTypes.RenderMapUnits)
# add additional layers
markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10))
markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 30))
# should now be mixed size units
- self.assertEqual(markerSymbol.sizeUnit(), QgsSymbolV2.Mixed)
- markerSymbol.setSizeUnit(QgsSymbolV2.Pixel)
- self.assertEqual(markerSymbol.sizeUnit(), QgsSymbolV2.Pixel)
+ self.assertEqual(markerSymbol.sizeUnit(), QgsUnitTypes.RenderUnknownUnit)
+ markerSymbol.setSizeUnit(QgsUnitTypes.RenderPixels)
+ self.assertEqual(markerSymbol.sizeUnit(), QgsUnitTypes.RenderPixels)
# all layers should have size unit set
- self.assertEqual(markerSymbol.symbolLayer(0).sizeUnit(), QgsSymbolV2.Pixel)
- self.assertEqual(markerSymbol.symbolLayer(1).sizeUnit(), QgsSymbolV2.Pixel)
- self.assertEqual(markerSymbol.symbolLayer(2).sizeUnit(), QgsSymbolV2.Pixel)
+ self.assertEqual(markerSymbol.symbolLayer(0).sizeUnit(), QgsUnitTypes.RenderPixels)
+ self.assertEqual(markerSymbol.symbolLayer(1).sizeUnit(), QgsUnitTypes.RenderPixels)
+ self.assertEqual(markerSymbol.symbolLayer(2).sizeUnit(), QgsUnitTypes.RenderPixels)
def testSizeMapUnitScale(self):
# test sizeMapUnitScale and setSizeMapUnitScale
diff --git a/tests/src/python/test_qgsunittypes.py b/tests/src/python/test_qgsunittypes.py
index aed139e7610..da0d050cbdb 100644
--- a/tests/src/python/test_qgsunittypes.py
+++ b/tests/src/python/test_qgsunittypes.py
@@ -17,7 +17,6 @@ import qgis # NOQA
from qgis.testing import unittest
from qgis.core import (
QgsUnitTypes,
- Qgis,
QgsSymbolV2
)
from qgis.PyQt.QtCore import QLocale
@@ -31,14 +30,14 @@ class TestQgsUnitTypes(unittest.TestCase):
def testDistanceUnitType(self):
"""Test QgsUnitTypes::unitType() """
- expected = {Qgis.Meters: QgsUnitTypes.Standard,
- Qgis.Kilometers: QgsUnitTypes.Standard,
- Qgis.Feet: QgsUnitTypes.Standard,
- Qgis.Yards: QgsUnitTypes.Standard,
- Qgis.Miles: QgsUnitTypes.Standard,
- Qgis.Degrees: QgsUnitTypes.Geographic,
- Qgis.UnknownUnit: QgsUnitTypes.UnknownType,
- Qgis.NauticalMiles: QgsUnitTypes.Standard
+ expected = {QgsUnitTypes.DistanceMeters: QgsUnitTypes.Standard,
+ QgsUnitTypes.DistanceKilometers: QgsUnitTypes.Standard,
+ QgsUnitTypes.DistanceFeet: QgsUnitTypes.Standard,
+ QgsUnitTypes.DistanceYards: QgsUnitTypes.Standard,
+ QgsUnitTypes.DistanceMiles: QgsUnitTypes.Standard,
+ QgsUnitTypes.DistanceDegrees: QgsUnitTypes.Geographic,
+ QgsUnitTypes.DistanceUnknownUnit: QgsUnitTypes.UnknownType,
+ QgsUnitTypes.DistanceNauticalMiles: QgsUnitTypes.Standard
}
for t in expected.keys():
@@ -46,14 +45,14 @@ class TestQgsUnitTypes(unittest.TestCase):
def testEncodeDecodeDistanceUnits(self):
"""Test encoding and decoding distance units"""
- units = [Qgis.Meters,
- Qgis.Kilometers,
- Qgis.Feet,
- Qgis.Yards,
- Qgis.Miles,
- Qgis.Degrees,
- Qgis.UnknownUnit,
- Qgis.NauticalMiles]
+ units = [QgsUnitTypes.DistanceMeters,
+ QgsUnitTypes.DistanceKilometers,
+ QgsUnitTypes.DistanceFeet,
+ QgsUnitTypes.DistanceYards,
+ QgsUnitTypes.DistanceMiles,
+ QgsUnitTypes.DistanceDegrees,
+ QgsUnitTypes.DistanceUnknownUnit,
+ QgsUnitTypes.DistanceNauticalMiles]
for u in units:
res, ok = QgsUnitTypes.decodeDistanceUnit(QgsUnitTypes.encodeUnit(u))
@@ -63,23 +62,23 @@ class TestQgsUnitTypes(unittest.TestCase):
# Test decoding bad units
res, ok = QgsUnitTypes.decodeDistanceUnit('bad')
self.assertFalse(ok)
- self.assertEqual(res, Qgis.UnknownUnit)
+ self.assertEqual(res, QgsUnitTypes.DistanceUnknownUnit)
# Test that string is cleaned before decoding
res, ok = QgsUnitTypes.decodeDistanceUnit(' FeEt ')
assert ok
- self.assertEqual(res, Qgis.Feet)
+ self.assertEqual(res, QgsUnitTypes.DistanceFeet)
def testDistanceUnitsToFromString(self):
"""Test converting distance units to and from translated strings"""
- units = [Qgis.Meters,
- Qgis.Kilometers,
- Qgis.Feet,
- Qgis.Yards,
- Qgis.Miles,
- Qgis.Degrees,
- Qgis.UnknownUnit,
- Qgis.NauticalMiles]
+ units = [QgsUnitTypes.DistanceMeters,
+ QgsUnitTypes.DistanceKilometers,
+ QgsUnitTypes.DistanceFeet,
+ QgsUnitTypes.DistanceYards,
+ QgsUnitTypes.DistanceMiles,
+ QgsUnitTypes.DistanceDegrees,
+ QgsUnitTypes.DistanceUnknownUnit,
+ QgsUnitTypes.DistanceNauticalMiles]
for u in units:
res, ok = QgsUnitTypes.stringToDistanceUnit(QgsUnitTypes.toString(u))
@@ -89,26 +88,26 @@ class TestQgsUnitTypes(unittest.TestCase):
# Test converting bad strings
res, ok = QgsUnitTypes.stringToDistanceUnit('bad')
self.assertFalse(ok)
- self.assertEqual(res, Qgis.UnknownUnit)
+ self.assertEqual(res, QgsUnitTypes.DistanceUnknownUnit)
# Test that string is cleaned before conversion
- res, ok = QgsUnitTypes.stringToDistanceUnit(' {} '.format(QgsUnitTypes.toString(Qgis.Feet).upper()))
- print(' {} '.format(QgsUnitTypes.toString(Qgis.Feet).upper()))
+ res, ok = QgsUnitTypes.stringToDistanceUnit(' {} '.format(QgsUnitTypes.toString(QgsUnitTypes.DistanceFeet).upper()))
+ print(' {} '.format(QgsUnitTypes.toString(QgsUnitTypes.DistanceFeet).upper()))
assert ok
- self.assertEqual(res, Qgis.Feet)
+ self.assertEqual(res, QgsUnitTypes.DistanceFeet)
def testAreaUnitType(self):
"""Test QgsUnitTypes::unitType() for area units """
- expected = {QgsUnitTypes.SquareMeters: QgsUnitTypes.Standard,
- QgsUnitTypes.SquareKilometers: QgsUnitTypes.Standard,
- QgsUnitTypes.SquareFeet: QgsUnitTypes.Standard,
- QgsUnitTypes.SquareYards: QgsUnitTypes.Standard,
- QgsUnitTypes.SquareMiles: QgsUnitTypes.Standard,
- QgsUnitTypes.Hectares: QgsUnitTypes.Standard,
- QgsUnitTypes.Acres: QgsUnitTypes.Standard,
- QgsUnitTypes.SquareNauticalMiles: QgsUnitTypes.Standard,
- QgsUnitTypes.SquareDegrees: QgsUnitTypes.Geographic,
- QgsUnitTypes.UnknownAreaUnit: QgsUnitTypes.UnknownType,
+ expected = {QgsUnitTypes.AreaSquareMeters: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaSquareKilometers: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaSquareFeet: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaSquareYards: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaSquareMiles: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaHectares: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaAcres: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaSquareNauticalMiles: QgsUnitTypes.Standard,
+ QgsUnitTypes.AreaSquareDegrees: QgsUnitTypes.Geographic,
+ QgsUnitTypes.AreaUnknownUnit: QgsUnitTypes.UnknownType,
}
for t in expected.keys():
@@ -116,16 +115,16 @@ class TestQgsUnitTypes(unittest.TestCase):
def testEncodeDecodeAreaUnits(self):
"""Test encoding and decoding area units"""
- units = [QgsUnitTypes.SquareMeters,
- QgsUnitTypes.SquareKilometers,
- QgsUnitTypes.SquareFeet,
- QgsUnitTypes.SquareYards,
- QgsUnitTypes.SquareMiles,
- QgsUnitTypes.Hectares,
- QgsUnitTypes.Acres,
- QgsUnitTypes.SquareNauticalMiles,
- QgsUnitTypes.SquareDegrees,
- QgsUnitTypes.UnknownAreaUnit]
+ units = [QgsUnitTypes.AreaSquareMeters,
+ QgsUnitTypes.AreaSquareKilometers,
+ QgsUnitTypes.AreaSquareFeet,
+ QgsUnitTypes.AreaSquareYards,
+ QgsUnitTypes.AreaSquareMiles,
+ QgsUnitTypes.AreaHectares,
+ QgsUnitTypes.AreaAcres,
+ QgsUnitTypes.AreaSquareNauticalMiles,
+ QgsUnitTypes.AreaSquareDegrees,
+ QgsUnitTypes.AreaUnknownUnit]
for u in units:
res, ok = QgsUnitTypes.decodeAreaUnit(QgsUnitTypes.encodeUnit(u))
@@ -135,25 +134,25 @@ class TestQgsUnitTypes(unittest.TestCase):
# Test decoding bad units
res, ok = QgsUnitTypes.decodeAreaUnit('bad')
self.assertFalse(ok)
- self.assertEqual(res, QgsUnitTypes.UnknownAreaUnit)
+ self.assertEqual(res, QgsUnitTypes.AreaUnknownUnit)
# Test that string is cleaned before decoding
res, ok = QgsUnitTypes.decodeAreaUnit(' Ha ')
assert ok
- self.assertEqual(res, QgsUnitTypes.Hectares)
+ self.assertEqual(res, QgsUnitTypes.AreaHectares)
def testAreaUnitsToFromString(self):
"""Test converting area units to and from translated strings"""
- units = [QgsUnitTypes.SquareMeters,
- QgsUnitTypes.SquareKilometers,
- QgsUnitTypes.SquareFeet,
- QgsUnitTypes.SquareYards,
- QgsUnitTypes.SquareMiles,
- QgsUnitTypes.Hectares,
- QgsUnitTypes.Acres,
- QgsUnitTypes.SquareNauticalMiles,
- QgsUnitTypes.SquareDegrees,
- QgsUnitTypes.UnknownAreaUnit]
+ units = [QgsUnitTypes.AreaSquareMeters,
+ QgsUnitTypes.AreaSquareKilometers,
+ QgsUnitTypes.AreaSquareFeet,
+ QgsUnitTypes.AreaSquareYards,
+ QgsUnitTypes.AreaSquareMiles,
+ QgsUnitTypes.AreaHectares,
+ QgsUnitTypes.AreaAcres,
+ QgsUnitTypes.AreaSquareNauticalMiles,
+ QgsUnitTypes.AreaSquareDegrees,
+ QgsUnitTypes.AreaUnknownUnit]
for u in units:
res, ok = QgsUnitTypes.stringToAreaUnit(QgsUnitTypes.toString(u))
@@ -163,48 +162,47 @@ class TestQgsUnitTypes(unittest.TestCase):
# Test converting bad strings
res, ok = QgsUnitTypes.stringToAreaUnit('bad')
self.assertFalse(ok)
- self.assertEqual(res, QgsUnitTypes.UnknownAreaUnit)
+ self.assertEqual(res, QgsUnitTypes.AreaUnknownUnit)
# Test that string is cleaned before conversion
- res, ok = QgsUnitTypes.stringToAreaUnit(' {} '.format(QgsUnitTypes.toString(QgsUnitTypes.SquareMiles).upper()))
+ res, ok = QgsUnitTypes.stringToAreaUnit(' {} '.format(QgsUnitTypes.toString(QgsUnitTypes.AreaSquareMiles).upper()))
assert ok
- self.assertEqual(res, QgsUnitTypes.SquareMiles)
+ self.assertEqual(res, QgsUnitTypes.AreaSquareMiles)
- @unittest.skip("enable for 3.0")
- def testEncodeDecodeSymbolUnits(self):
- """Test encoding and decoding symbol units"""
- units = [QgsSymbolV2.MM,
- QgsSymbolV2.MapUnit,
- QgsSymbolV2.Pixel,
- QgsSymbolV2.Percentage]
+ def testEncodeDecodeRenderUnits(self):
+ """Test encoding and decoding render units"""
+ units = [QgsUnitTypes.RenderMillimeters,
+ QgsUnitTypes.RenderMapUnits,
+ QgsUnitTypes.RenderPixels,
+ QgsUnitTypes.RenderPercentage]
for u in units:
- res, ok = QgsUnitTypes.decodeSymbolUnit(QgsUnitTypes.encodeUnit(u))
+ res, ok = QgsUnitTypes.decodeRenderUnit(QgsUnitTypes.encodeUnit(u))
assert ok
self.assertEqual(res, u)
# Test decoding bad units
- res, ok = QgsUnitTypes.decodeSymbolUnit('bad')
+ res, ok = QgsUnitTypes.decodeRenderUnit('bad')
self.assertFalse(ok)
# default units should be MM
- self.assertEqual(res, QgsSymbolV2.MM)
+ self.assertEqual(res, QgsUnitTypes.RenderMillimeters)
# Test that string is cleaned before decoding
- res, ok = QgsUnitTypes.decodeSymbolUnit(' PiXeL ')
+ res, ok = QgsUnitTypes.decodeRenderUnit(' PiXeL ')
assert ok
- self.assertEqual(res, QgsSymbolV2.Pixel)
+ self.assertEqual(res, QgsUnitTypes.RenderPixels)
def testFromUnitToUnitFactor(self):
"""Test calculation of conversion factor between units"""
- expected = {Qgis.Meters: {Qgis.Meters: 1.0, Qgis.Kilometers: 0.001, Qgis.Feet: 3.28083989501, Qgis.Yards: 1.0936133, Qgis.Miles: 0.00062136931818182, Qgis.Degrees: 0.00000898315, Qgis.NauticalMiles: 0.000539957},
- Qgis.Kilometers: {Qgis.Meters: 1000.0, Qgis.Kilometers: 1.0, Qgis.Feet: 3280.8398950, Qgis.Yards: 1093.6132983, Qgis.Miles: 0.62137121212119317271, Qgis.Degrees: 0.0089832, Qgis.NauticalMiles: 0.53995682073432482717},
- Qgis.Feet: {Qgis.Meters: 0.3048, Qgis.Kilometers: 0.0003048, Qgis.Feet: 1.0, Qgis.Yards: 0.3333333, Qgis.Miles: 0.00018939375, Qgis.Degrees: 2.73806498599629E-06, Qgis.NauticalMiles: 0.000164579},
- Qgis.Yards: {Qgis.Meters: 0.9144, Qgis.Kilometers: 0.0009144, Qgis.Feet: 3.0, Qgis.Yards: 1.0, Qgis.Miles: 0.000568182, Qgis.Degrees: 0.0000082, Qgis.NauticalMiles: 0.0004937366590756},
- Qgis.Degrees: {Qgis.Meters: 111319.49079327358, Qgis.Kilometers: 111.3194908, Qgis.Feet: 365221.4264871, Qgis.Yards: 121740.4754957, Qgis.Miles: 69.1707247, Qgis.Degrees: 1.0, Qgis.NauticalMiles: 60.1077164},
- Qgis.Miles: {Qgis.Meters: 1609.3440000, Qgis.Kilometers: 1.6093440, Qgis.Feet: 5280.0000000, Qgis.Yards: 1760.0000000, Qgis.Miles: 1.0, Qgis.Degrees: 0.0144570, Qgis.NauticalMiles: 0.8689762},
- Qgis.NauticalMiles: {Qgis.Meters: 1852.0, Qgis.Kilometers: 1.8520000, Qgis.Feet: 6076.1154856, Qgis.Yards: 2025.3718285, Qgis.Miles: 1.1507794, Qgis.Degrees: 0.0166367990650, Qgis.NauticalMiles: 1.0},
- Qgis.UnknownUnit: {Qgis.Meters: 1.0, Qgis.Kilometers: 1.0, Qgis.Feet: 1.0, Qgis.Yards: 1.0, Qgis.Miles: 1.0, Qgis.Degrees: 1.0, Qgis.NauticalMiles: 1.0}
+ expected = {QgsUnitTypes.DistanceMeters: {QgsUnitTypes.DistanceMeters: 1.0, QgsUnitTypes.DistanceKilometers: 0.001, QgsUnitTypes.DistanceFeet: 3.28083989501, QgsUnitTypes.DistanceYards: 1.0936133, QgsUnitTypes.DistanceMiles: 0.00062136931818182, QgsUnitTypes.DistanceDegrees: 0.00000898315, QgsUnitTypes.DistanceNauticalMiles: 0.000539957},
+ QgsUnitTypes.DistanceKilometers: {QgsUnitTypes.DistanceMeters: 1000.0, QgsUnitTypes.DistanceKilometers: 1.0, QgsUnitTypes.DistanceFeet: 3280.8398950, QgsUnitTypes.DistanceYards: 1093.6132983, QgsUnitTypes.DistanceMiles: 0.62137121212119317271, QgsUnitTypes.DistanceDegrees: 0.0089832, QgsUnitTypes.DistanceNauticalMiles: 0.53995682073432482717},
+ QgsUnitTypes.DistanceFeet: {QgsUnitTypes.DistanceMeters: 0.3048, QgsUnitTypes.DistanceKilometers: 0.0003048, QgsUnitTypes.DistanceFeet: 1.0, QgsUnitTypes.DistanceYards: 0.3333333, QgsUnitTypes.DistanceMiles: 0.00018939375, QgsUnitTypes.DistanceDegrees: 2.73806498599629E-06, QgsUnitTypes.DistanceNauticalMiles: 0.000164579},
+ QgsUnitTypes.DistanceYards: {QgsUnitTypes.DistanceMeters: 0.9144, QgsUnitTypes.DistanceKilometers: 0.0009144, QgsUnitTypes.DistanceFeet: 3.0, QgsUnitTypes.DistanceYards: 1.0, QgsUnitTypes.DistanceMiles: 0.000568182, QgsUnitTypes.DistanceDegrees: 0.0000082, QgsUnitTypes.DistanceNauticalMiles: 0.0004937366590756},
+ QgsUnitTypes.DistanceDegrees: {QgsUnitTypes.DistanceMeters: 111319.49079327358, QgsUnitTypes.DistanceKilometers: 111.3194908, QgsUnitTypes.DistanceFeet: 365221.4264871, QgsUnitTypes.DistanceYards: 121740.4754957, QgsUnitTypes.DistanceMiles: 69.1707247, QgsUnitTypes.DistanceDegrees: 1.0, QgsUnitTypes.DistanceNauticalMiles: 60.1077164},
+ QgsUnitTypes.DistanceMiles: {QgsUnitTypes.DistanceMeters: 1609.3440000, QgsUnitTypes.DistanceKilometers: 1.6093440, QgsUnitTypes.DistanceFeet: 5280.0000000, QgsUnitTypes.DistanceYards: 1760.0000000, QgsUnitTypes.DistanceMiles: 1.0, QgsUnitTypes.DistanceDegrees: 0.0144570, QgsUnitTypes.DistanceNauticalMiles: 0.8689762},
+ QgsUnitTypes.DistanceNauticalMiles: {QgsUnitTypes.DistanceMeters: 1852.0, QgsUnitTypes.DistanceKilometers: 1.8520000, QgsUnitTypes.DistanceFeet: 6076.1154856, QgsUnitTypes.DistanceYards: 2025.3718285, QgsUnitTypes.DistanceMiles: 1.1507794, QgsUnitTypes.DistanceDegrees: 0.0166367990650, QgsUnitTypes.DistanceNauticalMiles: 1.0},
+ QgsUnitTypes.DistanceUnknownUnit: {QgsUnitTypes.DistanceMeters: 1.0, QgsUnitTypes.DistanceKilometers: 1.0, QgsUnitTypes.DistanceFeet: 1.0, QgsUnitTypes.DistanceYards: 1.0, QgsUnitTypes.DistanceMiles: 1.0, QgsUnitTypes.DistanceDegrees: 1.0, QgsUnitTypes.DistanceNauticalMiles: 1.0}
}
for from_unit in expected.keys():
@@ -217,7 +215,7 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.toString(from_unit),
QgsUnitTypes.toString(to_unit)))
#test conversion to unknown units
- res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, Qgis.UnknownUnit)
+ res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, QgsUnitTypes.DistanceUnknownUnit)
self.assertAlmostEqual(res,
1.0,
msg='got {:.7f}, expected 1.0 when converting from {} to unknown units'.format(res, expected_factor,
@@ -226,15 +224,15 @@ class TestQgsUnitTypes(unittest.TestCase):
def testAreaFromUnitToUnitFactor(self):
"""Test calculation of conversion factor between areal units"""
- expected = {QgsUnitTypes.SquareMeters: {QgsUnitTypes.SquareMeters: 1.0, QgsUnitTypes.SquareKilometers: 1e-6, QgsUnitTypes.SquareFeet: 10.7639104, QgsUnitTypes.SquareYards: 1.19599, QgsUnitTypes.SquareMiles: 3.86102e-7, QgsUnitTypes.Hectares: 0.0001, QgsUnitTypes.Acres: 0.000247105, QgsUnitTypes.SquareNauticalMiles: 2.91553e-7, QgsUnitTypes.SquareDegrees: 0.000000000080697, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.SquareKilometers: {QgsUnitTypes.SquareMeters: 1e6, QgsUnitTypes.SquareKilometers: 1, QgsUnitTypes.SquareFeet: 10763910.4167097, QgsUnitTypes.SquareYards: 1195990.04630108, QgsUnitTypes.SquareMiles: 0.386102158, QgsUnitTypes.Hectares: 100, QgsUnitTypes.Acres: 247.105381467, QgsUnitTypes.SquareNauticalMiles: 0.291553349598, QgsUnitTypes.SquareDegrees: 0.000080697034968, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.SquareFeet: {QgsUnitTypes.SquareMeters: 0.092903, QgsUnitTypes.SquareKilometers: 9.2903e-8, QgsUnitTypes.SquareFeet: 1.0, QgsUnitTypes.SquareYards: 0.11111111111, QgsUnitTypes.SquareMiles: 3.58701e-8, QgsUnitTypes.Hectares: 9.2903e-6, QgsUnitTypes.Acres: 2.29568e-5, QgsUnitTypes.SquareNauticalMiles: 2.70862e-8, QgsUnitTypes.SquareDegrees: 0.000000000007497, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.SquareYards: {QgsUnitTypes.SquareMeters: 0.836127360, QgsUnitTypes.SquareKilometers: 8.36127e-7, QgsUnitTypes.SquareFeet: 9.0, QgsUnitTypes.SquareYards: 1.0, QgsUnitTypes.SquareMiles: 3.22831e-7, QgsUnitTypes.Hectares: 8.3612736E-5, QgsUnitTypes.Acres: 0.00020661157, QgsUnitTypes.SquareNauticalMiles: 2.43776e-7, QgsUnitTypes.SquareDegrees: 0.000000000067473, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.SquareMiles: {QgsUnitTypes.SquareMeters: 2589988.110336, QgsUnitTypes.SquareKilometers: 2.589988110, QgsUnitTypes.SquareFeet: 27878400, QgsUnitTypes.SquareYards: 3097600, QgsUnitTypes.SquareMiles: 1.0, QgsUnitTypes.Hectares: 258.998811, QgsUnitTypes.Acres: 640, QgsUnitTypes.SquareNauticalMiles: 0.75511970898, QgsUnitTypes.SquareDegrees: 0.000209004361107, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.Hectares: {QgsUnitTypes.SquareMeters: 10000, QgsUnitTypes.SquareKilometers: 0.01, QgsUnitTypes.SquareFeet: 107639.1041670972, QgsUnitTypes.SquareYards: 11959.9004630, QgsUnitTypes.SquareMiles: 0.00386102, QgsUnitTypes.Hectares: 1.0, QgsUnitTypes.Acres: 2.471053814, QgsUnitTypes.SquareNauticalMiles: 0.00291553, QgsUnitTypes.SquareDegrees: 0.000000806970350, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.Acres: {QgsUnitTypes.SquareMeters: 4046.8564224, QgsUnitTypes.SquareKilometers: 0.00404686, QgsUnitTypes.SquareFeet: 43560, QgsUnitTypes.SquareYards: 4840, QgsUnitTypes.SquareMiles: 0.0015625, QgsUnitTypes.Hectares: 0.404685642, QgsUnitTypes.Acres: 1.0, QgsUnitTypes.SquareNauticalMiles: 0.00117987, QgsUnitTypes.SquareDegrees: 0.000000326569314, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.SquareNauticalMiles: {QgsUnitTypes.SquareMeters: 3429904, QgsUnitTypes.SquareKilometers: 3.4299040, QgsUnitTypes.SquareFeet: 36919179.39391434, QgsUnitTypes.SquareYards: 4102131.04376826, QgsUnitTypes.SquareMiles: 1.324293337, QgsUnitTypes.Hectares: 342.9904000000, QgsUnitTypes.Acres: 847.54773631, QgsUnitTypes.SquareNauticalMiles: 1.0, QgsUnitTypes.SquareDegrees: 0.000276783083025, QgsUnitTypes.UnknownAreaUnit: 1.0},
- QgsUnitTypes.SquareDegrees: {QgsUnitTypes.SquareMeters: 12392029030.5, QgsUnitTypes.SquareKilometers: 12392.029030499, QgsUnitTypes.SquareFeet: 133386690365.5682220, QgsUnitTypes.SquareYards: 14820743373.9520263, QgsUnitTypes.SquareMiles: 4784.5891573967, QgsUnitTypes.Hectares: 1239202.903050, QgsUnitTypes.Acres: 3062137.060733889, QgsUnitTypes.SquareNauticalMiles: 3612.93757215, QgsUnitTypes.SquareDegrees: 1.0, QgsUnitTypes.UnknownAreaUnit: 1.0}}
+ expected = {QgsUnitTypes.AreaSquareMeters: {QgsUnitTypes.AreaSquareMeters: 1.0, QgsUnitTypes.AreaSquareKilometers: 1e-6, QgsUnitTypes.AreaSquareFeet: 10.7639104, QgsUnitTypes.AreaSquareYards: 1.19599, QgsUnitTypes.AreaSquareMiles: 3.86102e-7, QgsUnitTypes.AreaHectares: 0.0001, QgsUnitTypes.AreaAcres: 0.000247105, QgsUnitTypes.AreaSquareNauticalMiles: 2.91553e-7, QgsUnitTypes.AreaSquareDegrees: 0.000000000080697, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaSquareKilometers: {QgsUnitTypes.AreaSquareMeters: 1e6, QgsUnitTypes.AreaSquareKilometers: 1, QgsUnitTypes.AreaSquareFeet: 10763910.4167097, QgsUnitTypes.AreaSquareYards: 1195990.04630108, QgsUnitTypes.AreaSquareMiles: 0.386102158, QgsUnitTypes.AreaHectares: 100, QgsUnitTypes.AreaAcres: 247.105381467, QgsUnitTypes.AreaSquareNauticalMiles: 0.291553349598, QgsUnitTypes.AreaSquareDegrees: 0.000080697034968, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaSquareFeet: {QgsUnitTypes.AreaSquareMeters: 0.092903, QgsUnitTypes.AreaSquareKilometers: 9.2903e-8, QgsUnitTypes.AreaSquareFeet: 1.0, QgsUnitTypes.AreaSquareYards: 0.11111111111, QgsUnitTypes.AreaSquareMiles: 3.58701e-8, QgsUnitTypes.AreaHectares: 9.2903e-6, QgsUnitTypes.AreaAcres: 2.29568e-5, QgsUnitTypes.AreaSquareNauticalMiles: 2.70862e-8, QgsUnitTypes.AreaSquareDegrees: 0.000000000007497, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaSquareYards: {QgsUnitTypes.AreaSquareMeters: 0.836127360, QgsUnitTypes.AreaSquareKilometers: 8.36127e-7, QgsUnitTypes.AreaSquareFeet: 9.0, QgsUnitTypes.AreaSquareYards: 1.0, QgsUnitTypes.AreaSquareMiles: 3.22831e-7, QgsUnitTypes.AreaHectares: 8.3612736E-5, QgsUnitTypes.AreaAcres: 0.00020661157, QgsUnitTypes.AreaSquareNauticalMiles: 2.43776e-7, QgsUnitTypes.AreaSquareDegrees: 0.000000000067473, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaSquareMiles: {QgsUnitTypes.AreaSquareMeters: 2589988.110336, QgsUnitTypes.AreaSquareKilometers: 2.589988110, QgsUnitTypes.AreaSquareFeet: 27878400, QgsUnitTypes.AreaSquareYards: 3097600, QgsUnitTypes.AreaSquareMiles: 1.0, QgsUnitTypes.AreaHectares: 258.998811, QgsUnitTypes.AreaAcres: 640, QgsUnitTypes.AreaSquareNauticalMiles: 0.75511970898, QgsUnitTypes.AreaSquareDegrees: 0.000209004361107, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaHectares: {QgsUnitTypes.AreaSquareMeters: 10000, QgsUnitTypes.AreaSquareKilometers: 0.01, QgsUnitTypes.AreaSquareFeet: 107639.1041670972, QgsUnitTypes.AreaSquareYards: 11959.9004630, QgsUnitTypes.AreaSquareMiles: 0.00386102, QgsUnitTypes.AreaHectares: 1.0, QgsUnitTypes.AreaAcres: 2.471053814, QgsUnitTypes.AreaSquareNauticalMiles: 0.00291553, QgsUnitTypes.AreaSquareDegrees: 0.000000806970350, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaAcres: {QgsUnitTypes.AreaSquareMeters: 4046.8564224, QgsUnitTypes.AreaSquareKilometers: 0.00404686, QgsUnitTypes.AreaSquareFeet: 43560, QgsUnitTypes.AreaSquareYards: 4840, QgsUnitTypes.AreaSquareMiles: 0.0015625, QgsUnitTypes.AreaHectares: 0.404685642, QgsUnitTypes.AreaAcres: 1.0, QgsUnitTypes.AreaSquareNauticalMiles: 0.00117987, QgsUnitTypes.AreaSquareDegrees: 0.000000326569314, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaSquareNauticalMiles: {QgsUnitTypes.AreaSquareMeters: 3429904, QgsUnitTypes.AreaSquareKilometers: 3.4299040, QgsUnitTypes.AreaSquareFeet: 36919179.39391434, QgsUnitTypes.AreaSquareYards: 4102131.04376826, QgsUnitTypes.AreaSquareMiles: 1.324293337, QgsUnitTypes.AreaHectares: 342.9904000000, QgsUnitTypes.AreaAcres: 847.54773631, QgsUnitTypes.AreaSquareNauticalMiles: 1.0, QgsUnitTypes.AreaSquareDegrees: 0.000276783083025, QgsUnitTypes.AreaUnknownUnit: 1.0},
+ QgsUnitTypes.AreaSquareDegrees: {QgsUnitTypes.AreaSquareMeters: 12392029030.5, QgsUnitTypes.AreaSquareKilometers: 12392.029030499, QgsUnitTypes.AreaSquareFeet: 133386690365.5682220, QgsUnitTypes.AreaSquareYards: 14820743373.9520263, QgsUnitTypes.AreaSquareMiles: 4784.5891573967, QgsUnitTypes.AreaHectares: 1239202.903050, QgsUnitTypes.AreaAcres: 3062137.060733889, QgsUnitTypes.AreaSquareNauticalMiles: 3612.93757215, QgsUnitTypes.AreaSquareDegrees: 1.0, QgsUnitTypes.AreaUnknownUnit: 1.0}}
for from_unit in expected.keys():
for to_unit in expected[from_unit].keys():
@@ -246,7 +244,7 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.toString(from_unit),
QgsUnitTypes.toString(to_unit)))
#test conversion to unknown units
- res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, QgsUnitTypes.UnknownAreaUnit)
+ res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, QgsUnitTypes.AreaUnknownUnit)
self.assertAlmostEqual(res,
1.0,
msg='got {:.7f}, expected 1.0 when converting from {} to unknown units'.format(res, expected_factor,
@@ -254,14 +252,14 @@ class TestQgsUnitTypes(unittest.TestCase):
def testDistanceToAreaUnit(self):
"""Test distanceToAreaUnit conversion"""
- expected = {Qgis.Meters: QgsUnitTypes.SquareMeters,
- Qgis.Kilometers: QgsUnitTypes.SquareKilometers,
- Qgis.Feet: QgsUnitTypes.SquareFeet,
- Qgis.Yards: QgsUnitTypes.SquareYards,
- Qgis.Miles: QgsUnitTypes.SquareMiles,
- Qgis.Degrees: QgsUnitTypes.SquareDegrees,
- Qgis.UnknownUnit: QgsUnitTypes.UnknownAreaUnit,
- Qgis.NauticalMiles: QgsUnitTypes.SquareNauticalMiles
+ expected = {QgsUnitTypes.DistanceMeters: QgsUnitTypes.AreaSquareMeters,
+ QgsUnitTypes.DistanceKilometers: QgsUnitTypes.AreaSquareKilometers,
+ QgsUnitTypes.DistanceFeet: QgsUnitTypes.AreaSquareFeet,
+ QgsUnitTypes.DistanceYards: QgsUnitTypes.AreaSquareYards,
+ QgsUnitTypes.DistanceMiles: QgsUnitTypes.AreaSquareMiles,
+ QgsUnitTypes.DistanceDegrees: QgsUnitTypes.AreaSquareDegrees,
+ QgsUnitTypes.DistanceUnknownUnit: QgsUnitTypes.AreaUnknownUnit,
+ QgsUnitTypes.DistanceNauticalMiles: QgsUnitTypes.AreaSquareNauticalMiles
}
for t in expected.keys():
@@ -270,12 +268,12 @@ class TestQgsUnitTypes(unittest.TestCase):
def testEncodeDecodeAngleUnits(self):
"""Test encoding and decoding angle units"""
units = [QgsUnitTypes.AngleDegrees,
- QgsUnitTypes.Radians,
- QgsUnitTypes.Gon,
- QgsUnitTypes.MinutesOfArc,
- QgsUnitTypes.SecondsOfArc,
- QgsUnitTypes.Turn,
- QgsUnitTypes.UnknownAngleUnit]
+ QgsUnitTypes.AngleRadians,
+ QgsUnitTypes.AngleGon,
+ QgsUnitTypes.AngleMinutesOfArc,
+ QgsUnitTypes.AngleSecondsOfArc,
+ QgsUnitTypes.AngleTurn,
+ QgsUnitTypes.AngleUnknownUnit]
for u in units:
res, ok = QgsUnitTypes.decodeAngleUnit(QgsUnitTypes.encodeUnit(u))
@@ -285,22 +283,22 @@ class TestQgsUnitTypes(unittest.TestCase):
# Test decoding bad units
res, ok = QgsUnitTypes.decodeAngleUnit('bad')
self.assertFalse(ok)
- self.assertEqual(res, QgsUnitTypes.UnknownAngleUnit)
+ self.assertEqual(res, QgsUnitTypes.AngleUnknownUnit)
# Test that string is cleaned before decoding
res, ok = QgsUnitTypes.decodeAngleUnit(' MoA ')
assert ok
- self.assertEqual(res, QgsUnitTypes.MinutesOfArc)
+ self.assertEqual(res, QgsUnitTypes.AngleMinutesOfArc)
def testAngleToString(self):
"""Test converting angle unit to string"""
units = [QgsUnitTypes.AngleDegrees,
- QgsUnitTypes.Radians,
- QgsUnitTypes.Gon,
- QgsUnitTypes.MinutesOfArc,
- QgsUnitTypes.SecondsOfArc,
- QgsUnitTypes.Turn,
- QgsUnitTypes.UnknownAngleUnit]
+ QgsUnitTypes.AngleRadians,
+ QgsUnitTypes.AngleGon,
+ QgsUnitTypes.AngleMinutesOfArc,
+ QgsUnitTypes.AngleSecondsOfArc,
+ QgsUnitTypes.AngleTurn,
+ QgsUnitTypes.AngleUnknownUnit]
dupes = set()
@@ -314,12 +312,12 @@ class TestQgsUnitTypes(unittest.TestCase):
def testAngleFromUnitToUnitFactor(self):
"""Test calculation of conversion factor between angular units"""
- expected = {QgsUnitTypes.AngleDegrees: {QgsUnitTypes.AngleDegrees: 1.0, QgsUnitTypes.Radians: 0.0174533, QgsUnitTypes.Gon: 1.1111111, QgsUnitTypes.MinutesOfArc: 60, QgsUnitTypes.SecondsOfArc: 3600, QgsUnitTypes.Turn: 0.00277777777778},
- QgsUnitTypes.Radians: {QgsUnitTypes.AngleDegrees: 57.2957795, QgsUnitTypes.Radians: 1.0, QgsUnitTypes.Gon: 63.6619772, QgsUnitTypes.MinutesOfArc: 3437.7467708, QgsUnitTypes.SecondsOfArc: 206264.8062471, QgsUnitTypes.Turn: 0.159154943092},
- QgsUnitTypes.Gon: {QgsUnitTypes.AngleDegrees: 0.9000000, QgsUnitTypes.Radians: 0.015707968623450838802, QgsUnitTypes.Gon: 1.0, QgsUnitTypes.MinutesOfArc: 54.0000000, QgsUnitTypes.SecondsOfArc: 3240.0000000, QgsUnitTypes.Turn: 0.0025},
- QgsUnitTypes.MinutesOfArc: {QgsUnitTypes.AngleDegrees: 0.016666672633390722247, QgsUnitTypes.Radians: 0.00029088831280398030638, QgsUnitTypes.Gon: 0.018518525464057963154, QgsUnitTypes.MinutesOfArc: 1.0, QgsUnitTypes.SecondsOfArc: 60.0, QgsUnitTypes.Turn: 4.62962962962963e-05},
- QgsUnitTypes.SecondsOfArc: {QgsUnitTypes.AngleDegrees: 0.00027777787722304257169, QgsUnitTypes.Radians: 4.848138546730629518e-6, QgsUnitTypes.Gon: 0.0003086420910674814405, QgsUnitTypes.MinutesOfArc: 0.016666672633325253783, QgsUnitTypes.SecondsOfArc: 1.0, QgsUnitTypes.Turn: 7.71604938271605e-07},
- QgsUnitTypes.Turn: {QgsUnitTypes.AngleDegrees: 360.0, QgsUnitTypes.Radians: 6.2831853071795, QgsUnitTypes.Gon: 400.0, QgsUnitTypes.MinutesOfArc: 21600, QgsUnitTypes.SecondsOfArc: 1296000, QgsUnitTypes.Turn: 1}
+ expected = {QgsUnitTypes.AngleDegrees: {QgsUnitTypes.AngleDegrees: 1.0, QgsUnitTypes.AngleRadians: 0.0174533, QgsUnitTypes.AngleGon: 1.1111111, QgsUnitTypes.AngleMinutesOfArc: 60, QgsUnitTypes.AngleSecondsOfArc: 3600, QgsUnitTypes.AngleTurn: 0.00277777777778},
+ QgsUnitTypes.AngleRadians: {QgsUnitTypes.AngleDegrees: 57.2957795, QgsUnitTypes.AngleRadians: 1.0, QgsUnitTypes.AngleGon: 63.6619772, QgsUnitTypes.AngleMinutesOfArc: 3437.7467708, QgsUnitTypes.AngleSecondsOfArc: 206264.8062471, QgsUnitTypes.AngleTurn: 0.159154943092},
+ QgsUnitTypes.AngleGon: {QgsUnitTypes.AngleDegrees: 0.9000000, QgsUnitTypes.AngleRadians: 0.015707968623450838802, QgsUnitTypes.AngleGon: 1.0, QgsUnitTypes.AngleMinutesOfArc: 54.0000000, QgsUnitTypes.AngleSecondsOfArc: 3240.0000000, QgsUnitTypes.AngleTurn: 0.0025},
+ QgsUnitTypes.AngleMinutesOfArc: {QgsUnitTypes.AngleDegrees: 0.016666672633390722247, QgsUnitTypes.AngleRadians: 0.00029088831280398030638, QgsUnitTypes.AngleGon: 0.018518525464057963154, QgsUnitTypes.AngleMinutesOfArc: 1.0, QgsUnitTypes.AngleSecondsOfArc: 60.0, QgsUnitTypes.AngleTurn: 4.62962962962963e-05},
+ QgsUnitTypes.AngleSecondsOfArc: {QgsUnitTypes.AngleDegrees: 0.00027777787722304257169, QgsUnitTypes.AngleRadians: 4.848138546730629518e-6, QgsUnitTypes.AngleGon: 0.0003086420910674814405, QgsUnitTypes.AngleMinutesOfArc: 0.016666672633325253783, QgsUnitTypes.AngleSecondsOfArc: 1.0, QgsUnitTypes.AngleTurn: 7.71604938271605e-07},
+ QgsUnitTypes.AngleTurn: {QgsUnitTypes.AngleDegrees: 360.0, QgsUnitTypes.AngleRadians: 6.2831853071795, QgsUnitTypes.AngleGon: 400.0, QgsUnitTypes.AngleMinutesOfArc: 21600, QgsUnitTypes.AngleSecondsOfArc: 1296000, QgsUnitTypes.AngleTurn: 1}
}
for from_unit in expected.keys():
@@ -332,7 +330,7 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.toString(from_unit),
QgsUnitTypes.toString(to_unit)))
#test conversion to unknown units
- res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, QgsUnitTypes.UnknownAngleUnit)
+ res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, QgsUnitTypes.AngleUnknownUnit)
self.assertAlmostEqual(res,
1.0,
msg='got {:.7f}, expected 1.0 when converting from {} to unknown units'.format(res, expected_factor,
@@ -341,12 +339,12 @@ class TestQgsUnitTypes(unittest.TestCase):
def testFormatAngle(self):
"""Test formatting angles"""
self.assertEqual(QgsUnitTypes.formatAngle(45, 3, QgsUnitTypes.AngleDegrees), u'45.000°')
- self.assertEqual(QgsUnitTypes.formatAngle(1, 2, QgsUnitTypes.Radians), '1.00 rad')
- self.assertEqual(QgsUnitTypes.formatAngle(1, 0, QgsUnitTypes.Gon), u'1 gon')
- self.assertEqual(QgsUnitTypes.formatAngle(1.11111111, 4, QgsUnitTypes.MinutesOfArc), u'1.1111′')
- self.assertEqual(QgsUnitTypes.formatAngle(1.99999999, 2, QgsUnitTypes.SecondsOfArc), u'2.00″')
- self.assertEqual(QgsUnitTypes.formatAngle(1, 2, QgsUnitTypes.Turn), u'1.00 tr')
- self.assertEqual(QgsUnitTypes.formatAngle(1, 2, QgsUnitTypes.UnknownAngleUnit), u'1.00')
+ self.assertEqual(QgsUnitTypes.formatAngle(1, 2, QgsUnitTypes.AngleRadians), '1.00 rad')
+ self.assertEqual(QgsUnitTypes.formatAngle(1, 0, QgsUnitTypes.AngleGon), u'1 gon')
+ self.assertEqual(QgsUnitTypes.formatAngle(1.11111111, 4, QgsUnitTypes.AngleMinutesOfArc), u'1.1111′')
+ self.assertEqual(QgsUnitTypes.formatAngle(1.99999999, 2, QgsUnitTypes.AngleSecondsOfArc), u'2.00″')
+ self.assertEqual(QgsUnitTypes.formatAngle(1, 2, QgsUnitTypes.AngleTurn), u'1.00 tr')
+ self.assertEqual(QgsUnitTypes.formatAngle(1, 2, QgsUnitTypes.AngleUnknownUnit), u'1.00')
if __name__ == "__main__":
unittest.main()
diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
index e571d9c18b9..f656f5982bf 100644
--- a/tests/src/python/test_qgsvectorlayer.py
+++ b/tests/src/python/test_qgsvectorlayer.py
@@ -1269,7 +1269,7 @@ class TestQgsVectorLayer(unittest.TestCase):
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCRSID", srs.srsid())
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCrs", srs.authid())
QgsProject.instance().writeEntry("Measure", "/Ellipsoid", "WGS84")
- QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(Qgis.Meters))
+ QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.DistanceMeters))
idx = temp_layer.addExpressionField('$length', QgsField('length', QVariant.Double)) # NOQA
@@ -1279,7 +1279,7 @@ class TestQgsVectorLayer(unittest.TestCase):
self.assertAlmostEqual(f['length'], expected, 3)
# change project length unit, check calculation respects unit
- QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(Qgis.Feet))
+ QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.DistanceFeet))
f = next(temp_layer.getFeatures())
expected = 88360.0918635
self.assertAlmostEqual(f['length'], expected, 3)
@@ -1299,7 +1299,7 @@ class TestQgsVectorLayer(unittest.TestCase):
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCRSID", srs.srsid())
QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCrs", srs.authid())
QgsProject.instance().writeEntry("Measure", "/Ellipsoid", "WGS84")
- QgsProject.instance().writeEntry("Measurement", "/AreaUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.SquareMeters))
+ QgsProject.instance().writeEntry("Measurement", "/AreaUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.AreaSquareMeters))
idx = temp_layer.addExpressionField('$area', QgsField('area', QVariant.Double)) # NOQA
@@ -1309,7 +1309,7 @@ class TestQgsVectorLayer(unittest.TestCase):
self.assertAlmostEqual(f['area'], expected, delta=1.0)
# change project area unit, check calculation respects unit
- QgsProject.instance().writeEntry("Measurement", "/AreaUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.SquareMiles))
+ QgsProject.instance().writeEntry("Measurement", "/AreaUnits", QgsUnitTypes.encodeUnit(QgsUnitTypes.AreaSquareMiles))
f = next(temp_layer.getFeatures())
expected = 389.6117565069
self.assertAlmostEqual(f['area'], expected, 3)