"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/labeling/qgspallabeling.cpp" between
QGIS-final-3_14_15.tar.gz and QGIS-final-3_14_16.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Latest release (3.14.x series).

qgspallabeling.cpp  (QGIS-final-3_14_15):qgspallabeling.cpp  (QGIS-final-3_14_16)
skipping to change at line 70 skipping to change at line 70
#include "qgspainting.h" #include "qgspainting.h"
#include "qgsproject.h" #include "qgsproject.h"
#include "qgsproperty.h" #include "qgsproperty.h"
#include "qgssymbollayerutils.h" #include "qgssymbollayerutils.h"
#include "qgsmaptopixelgeometrysimplifier.h" #include "qgsmaptopixelgeometrysimplifier.h"
#include "qgscurvepolygon.h" #include "qgscurvepolygon.h"
#include "qgsmessagelog.h" #include "qgsmessagelog.h"
#include "qgsgeometrycollection.h" #include "qgsgeometrycollection.h"
#include "callouts/qgscallout.h" #include "callouts/qgscallout.h"
#include "callouts/qgscalloutsregistry.h" #include "callouts/qgscalloutsregistry.h"
#include "qgsvectortilelayer.h"
#include "qgsvectortilebasiclabeling.h"
#include <QMessageBox> #include <QMessageBox>
using namespace pal; using namespace pal;
// ------------- // -------------
/* ND: Default point label position priority. These are set to match variants of the ideal placement priority described /* ND: Default point label position priority. These are set to match variants of the ideal placement priority described
in "Making Maps", Krygier & Wood (2011) (p216), in "Making Maps", Krygier & Wood (2011) (p216),
"Elements of Cartography", Robinson et al (1995) "Elements of Cartography", Robinson et al (1995)
and "Designing Better Maps", Brewer (2005) (p76) and "Designing Better Maps", Brewer (2005) (p76)
skipping to change at line 3532 skipping to change at line 3534
// data defined shadow color? // data defined shadow color?
dataDefinedValEval( DDColor, QgsPalLayerSettings::ShadowColor, exprVal, contex t.expressionContext(), QgsSymbolLayerUtils::encodeColor( shadow.color() ) ); dataDefinedValEval( DDColor, QgsPalLayerSettings::ShadowColor, exprVal, contex t.expressionContext(), QgsSymbolLayerUtils::encodeColor( shadow.color() ) );
// data defined shadow blend mode? // data defined shadow blend mode?
dataDefinedValEval( DDBlendMode, QgsPalLayerSettings::ShadowBlendMode, exprVal , context.expressionContext() ); dataDefinedValEval( DDBlendMode, QgsPalLayerSettings::ShadowBlendMode, exprVal , context.expressionContext() );
} }
// ------------- // -------------
bool QgsPalLabeling::staticWillUseLayer( QgsVectorLayer *layer ) bool QgsPalLabeling::staticWillUseLayer( const QgsMapLayer *layer )
{ {
return layer->labelsEnabled() || layer->diagramsEnabled(); switch ( layer->type() )
{
case QgsMapLayerType::VectorLayer:
{
const QgsVectorLayer *vl = qobject_cast< const QgsVectorLayer * >( layer )
;
return vl->labelsEnabled() || vl->diagramsEnabled();
}
case QgsMapLayerType::VectorTileLayer:
{
const QgsVectorTileLayer *vl = qobject_cast< const QgsVectorTileLayer * >(
layer );
if ( !vl->labeling() )
return false;
if ( const QgsVectorTileBasicLabeling *labeling = dynamic_cast< const QgsV
ectorTileBasicLabeling *>( vl->labeling() ) )
return !labeling->styles().empty();
return false;
}
case QgsMapLayerType::RasterLayer:
case QgsMapLayerType::PluginLayer:
case QgsMapLayerType::MeshLayer:
return false;
}
return false;
} }
bool QgsPalLabeling::geometryRequiresPreparation( const QgsGeometry &geometry, Q gsRenderContext &context, const QgsCoordinateTransform &ct, const QgsGeometry &c lipGeometry, bool mergeLines ) bool QgsPalLabeling::geometryRequiresPreparation( const QgsGeometry &geometry, Q gsRenderContext &context, const QgsCoordinateTransform &ct, const QgsGeometry &c lipGeometry, bool mergeLines )
{ {
if ( geometry.isNull() ) if ( geometry.isNull() )
{ {
return false; return false;
} }
if ( geometry.type() == QgsWkbTypes::LineGeometry && geometry.isMultipart() && mergeLines ) if ( geometry.type() == QgsWkbTypes::LineGeometry && geometry.isMultipart() && mergeLines )
 End of changes. 3 change blocks. 
2 lines changed or deleted 32 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)