sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start with empty ValueMap configuration

Browse Source
This commit is contained in:
Matthias Kuhn 2016-12-05 13:23:58 +01:00
parent d6cc6bdc90
commit 590a51ee8d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/fieldkit/qgsvaluemapfieldkit.cpp
View File

@ -37,7 +37,9 @@ QString QgsValueMapFieldKit::representValue( QgsVectorLayer* layer, int fieldInd
else
valueInternalText = value.toString();
return config.key( valueInternalText, QVariant( QStringLiteral( "(%1)" ).arg( layer->fields().at( fieldIndex ).displayString( value ) ) ).toString() );
QVariantMap map = config.value( QStringLiteral( "map" ) ).toMap();
return map.key( valueInternalText, QVariant( QStringLiteral( "(%1)" ).arg( layer->fields().at( fieldIndex ).displayString( value ) ) ).toString() );
}
QVariant QgsValueMapFieldKit::sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const

11
src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp
View File

@ -39,7 +39,7 @@ QgsValueMapConfigDlg::QgsValueMapConfigDlg( QgsVectorLayer* vl, int fieldIdx, QW
QVariantMap QgsValueMapConfigDlg::config()
{
QVariantMap cfg;
QVariantMap values;
QSettings settings;
//store data to map
@ -57,14 +57,16 @@ QVariantMap QgsValueMapConfigDlg::config()
if ( !vi || vi->text().isNull() )
{
cfg.insert( ks, ks );
values.insert( ks, ks );
}
else
{
cfg.insert( vi->text(), ks );
values.insert( vi->text(), ks );
}
}
QVariantMap cfg;
cfg.insert( QStringLiteral( "map" ), values );
return cfg;
}
@ -77,7 +79,8 @@ void QgsValueMapConfigDlg::setConfig( const QVariantMap& config )
}
int row = 0;
for ( QVariantMap::ConstIterator mit = config.begin(); mit != config.end(); mit++, row++ )
QVariantMap values = config.value( QStringLiteral( "map" ) ).toMap();
for ( QVariantMap::ConstIterator mit = values.begin(); mit != values.end(); mit++, row++ )
{
if ( mit.value().isNull() )
setRow( row, mit.key(), QString() );

6
src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp
View File

@ -58,10 +58,10 @@ void QgsValueMapWidgetWrapper::initWidget( QWidget* editor )
if ( mComboBox )
{
const QVariantMap cfg = config();
QVariantMap::ConstIterator it = cfg.constBegin();
const QVariantMap map = config().value( QStringLiteral( "map" ) ).toMap();
QVariantMap::ConstIterator it = map.constBegin();
while ( it != cfg.constEnd() )
while ( it != map.constEnd() )
{
mComboBox->addItem( it.key(), it.value() );
++it;