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

Some cleaning

Browse Source
This commit is contained in:
Blottiere Paul 2022-10-12 12:30:54 +02:00
parent cc42f5f33e
commit d624a98aac
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/qgsauxiliarystorage.cpp
View File

@ -30,7 +30,10 @@
#define AS_JOINFIELD QStringLiteral( "ASPK" ) #define AS_JOINFIELD QStringLiteral( "ASPK" )
#define AS_EXTENSION QStringLiteral( "qgd" ) #define AS_EXTENSION QStringLiteral( "qgd" )
#define AS_JOINPREFIX QStringLiteral( "auxiliary_storage_" ) #define AS_JOINPREFIX QStringLiteral( "auxiliary_storage_" )
typedef QVector<QgsPalLayerSettings::Property> PalPropertyList; typedef QVector<QgsPalLayerSettings::Property> PalPropertyList;
typedef QVector<QgsSymbolLayer::Property> SymbolPropertyList;
Q_GLOBAL_STATIC_WITH_ARGS( PalPropertyList, palHiddenProperties, ( Q_GLOBAL_STATIC_WITH_ARGS( PalPropertyList, palHiddenProperties, (
{ {
QgsPalLayerSettings::PositionX, QgsPalLayerSettings::PositionX,
@ -59,7 +62,6 @@ Q_GLOBAL_STATIC_WITH_ARGS( PalPropertyList, palHiddenProperties, (
QgsPalLayerSettings::CalloutDraw, QgsPalLayerSettings::CalloutDraw,
QgsPalLayerSettings::LabelAllParts QgsPalLayerSettings::LabelAllParts
} ) ) } ) )
typedef QVector<QgsSymbolLayer::Property> SymbolPropertyList;
Q_GLOBAL_STATIC_WITH_ARGS( SymbolPropertyList, symbolHiddenProperties, ( Q_GLOBAL_STATIC_WITH_ARGS( SymbolPropertyList, symbolHiddenProperties, (
{ {
QgsSymbolLayer::PropertyAngle, QgsSymbolLayer::PropertyAngle,
@ -365,12 +367,9 @@ int QgsAuxiliaryLayer::createProperty( QgsCallout::Property property, QgsVectorL
bool QgsAuxiliaryLayer::isHiddenProperty( int index ) const bool QgsAuxiliaryLayer::isHiddenProperty( int index ) const
{ {
std::cout << "QgsAuxiliaryLayer::isHiddenProperty 0: " << index << std::endl;
bool hidden = false; bool hidden = false;
const QgsPropertyDefinition def = propertyDefinitionFromIndex( index ); const QgsPropertyDefinition def = propertyDefinitionFromIndex( index );
std::cout << def.origin().toStdString() << std::endl;
if ( def.origin().compare( QLatin1String( "labeling" ) ) == 0 ) if ( def.origin().compare( QLatin1String( "labeling" ) ) == 0 )
{ {
const PalPropertyList &palProps = *palHiddenProperties(); const PalPropertyList &palProps = *palHiddenProperties();