mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-13 00:03:09 -04:00
Remove obstacle flag for pal Layers as it is kept per feature
This code has been funded by Tuscany Region (Italy) - SITA (CIG: 63526840AE) and commissioned to Gis3W s.a.s.
This commit is contained in:
parent
6cc1f4c2cb
commit
959fbb505c
@ -49,7 +49,6 @@ namespace pal
|
||||
Layer::Layer( const QString &lyrName, Arrangement arrangement, double defaultPriority, bool obstacle, bool active, bool toLabel, Pal *pal, bool displayAll )
|
||||
: mName( lyrName )
|
||||
, pal( pal )
|
||||
, mObstacle( obstacle )
|
||||
, mObstacleType( PolygonInterior )
|
||||
, mActive( active )
|
||||
, mLabelLayer( toLabel )
|
||||
@ -157,9 +156,6 @@ namespace pal
|
||||
|
||||
f->setAlwaysShow( alwaysShow );
|
||||
|
||||
// feature inherits layer setting for acting as an obstacle
|
||||
f->setIsObstacle( mObstacle );
|
||||
|
||||
bool addedFeature = false;
|
||||
|
||||
double geom_size = -1, biggest_size = -1;
|
||||
|
@ -139,19 +139,6 @@ namespace pal
|
||||
*/
|
||||
bool labelLayer() const { return mLabelLayer; }
|
||||
|
||||
/** Sets whether features within the layer will act as obstacles for labels.
|
||||
* @note this property is only effective if the layer is active
|
||||
* @param obstacle set to true if features will act as obstacles
|
||||
* @see setActive
|
||||
* @see obstacle
|
||||
*/
|
||||
void setObstacle( bool obstacle ) { mObstacle = obstacle; }
|
||||
|
||||
/** Returns whether features within the layer act as obstacles for labels.
|
||||
* @see setObstacle
|
||||
*/
|
||||
bool obstacle() const { return mObstacle; }
|
||||
|
||||
/** Returns the obstacle type, which controls how features within the layer
|
||||
* act as obstacles for labels.
|
||||
* @see setObstacleType
|
||||
@ -292,7 +279,6 @@ namespace pal
|
||||
|
||||
double mDefaultPriority;
|
||||
|
||||
bool mObstacle;
|
||||
ObstacleType mObstacleType;
|
||||
bool mActive;
|
||||
bool mLabelLayer;
|
||||
|
Loading…
x
Reference in New Issue
Block a user