|
@@ -554,7 +554,7 @@ void QgsMapLayer::writeCommonStyle( QDomElement &layerElement, QDomDocument &doc |
|
|
// save categories |
|
|
QMetaEnum metaEnum = QMetaEnum::fromType<QgsMapLayer::StyleCategories>(); |
|
|
QString categoriesKeys( metaEnum.valueToKeys( static_cast<int>( categories ) ) ); |
|
|
layerElement.setAttribute( QStringLiteral( "style_categories" ), categoriesKeys ); |
|
|
layerElement.setAttribute( QStringLiteral( "styleCategories" ), categoriesKeys ); |
|
|
|
|
|
if ( categories.testFlag( Rendering ) ) |
|
|
{ |
|
@@ -1060,17 +1060,7 @@ bool QgsMapLayer::importNamedStyle( QDomDocument &myDocument, QString &myErrorMe |
|
|
} |
|
|
|
|
|
// Get source categories |
|
|
QgsMapLayer::StyleCategories sourceCategories = QgsMapLayer::AllStyleCategories; |
|
|
QMetaEnum metaEnum = QMetaEnum::fromType<QgsMapLayer::StyleCategories>(); |
|
|
QString sourceCategoriesStr( myRoot.attribute( "style_categories", metaEnum.valueToKeys( static_cast<int>( QgsMapLayer::AllStyleCategories ) ) ) ); |
|
|
if ( metaEnum.isValid() ) |
|
|
{ |
|
|
bool ok = false; |
|
|
const char *vs = sourceCategoriesStr.toUtf8().data(); |
|
|
int newValue = metaEnum.keysToValue( vs, &ok ); |
|
|
if ( ok ) |
|
|
sourceCategories = static_cast<QgsMapLayer::StyleCategories>( newValue ); |
|
|
} |
|
|
QgsMapLayer::StyleCategories sourceCategories = QgsXmlUtils::readFlagAttribute( myRoot, QStringLiteral( "styleCategories" ), QgsMapLayer::AllStyleCategories ); |
|
|
|
|
|
//Test for matching geometry type on vector layers when applying, if geometry type is given in the style |
|
|
if ( ( sourceCategories.testFlag( QgsMapLayer::Symbology ) || sourceCategories.testFlag( QgsMapLayer::Symbology3D ) ) && |
|
|