Skip to content

Commit

Permalink
Remove obstacle flag for pal Layers as it is kept per feature
Browse files Browse the repository at this point in the history
This code has been funded by Tuscany Region (Italy) - SITA (CIG: 63526840AE) and commissioned to Gis3W s.a.s.
  • Loading branch information
wonder-sk committed Sep 21, 2015
1 parent 6cc1f4c commit 959fbb5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
4 changes: 0 additions & 4 deletions src/core/pal/layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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;
Expand Down
14 changes: 0 additions & 14 deletions src/core/pal/layer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -292,7 +279,6 @@ namespace pal

double mDefaultPriority;

bool mObstacle;
ObstacleType mObstacleType;
bool mActive;
bool mLabelLayer;
Expand Down

0 comments on commit 959fbb5

Please sign in to comment.