sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing tests

Browse Source
This commit is contained in:
Nyall Dawson 2016-01-11 16:39:01 +11:00
parent 8b28c040d1
commit 8779091225
5 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/qgspallabeling.sip
View File

@ -467,8 +467,9 @@ class QgsPalLayerSettings
/** Ordered list of predefined label positions for points. Positions earlier /** Ordered list of predefined label positions for points. Positions earlier
* in the list will be prioritised over later positions. Only used when the placement * in the list will be prioritised over later positions. Only used when the placement
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint. * is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
* @note not available in Python bindings
*/ */
QVector< QgsPalLayerSettings::PredefinedPointPosition > predefinedPositionOrder; //QVector< QgsPalLayerSettings::PredefinedPointPosition > predefinedPositionOrder;
/** True if only labels which completely fit within a polygon are allowed. /** True if only labels which completely fit within a polygon are allowed.
*/ */

1
src/core/qgspallabeling.h
View File

@ -456,6 +456,7 @@ class CORE_EXPORT QgsPalLayerSettings
/** Ordered list of predefined label positions for points. Positions earlier /** Ordered list of predefined label positions for points. Positions earlier
* in the list will be prioritised over later positions. Only used when the placement * in the list will be prioritised over later positions. Only used when the placement
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint. * is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
* @note not available in Python bindings
*/ */
QVector< PredefinedPointPosition > predefinedPositionOrder; QVector< PredefinedPointPosition > predefinedPositionOrder;

BIN
tests/testdata/control_images/expected_pal_placement/sp_point_dd_ordered_placement/sp_point_dd_ordered_placement_mask.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 999 B

BIN
tests/testdata/control_images/expected_pal_placement/sp_point_ordered_symbol_bound_offset/sp_point_ordered_symbol_bound_offset_mask.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1004 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
tests/testdata/labeling/pal_features_v3.sqlite vendored
View File

Binary file not shown.