Use better expression to string conversion

qgis · Apr 19, 2013 · 99c922d · 99c922d
1 parent bc62fb0
commit 99c922d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp
@@ -47,7 +47,7 @@ QgsExpression* QgsSymbolLayerV2::expression( const QString& property )
 QString QgsSymbolLayerV2::dataDefinedPropertyString( const QString& property ) const
 {
   const QgsExpression* ex = dataDefinedProperty( property );
-  return ex ? ex->dump() : QString();
+  return ex ? ex->expression() : QString();
 }
 
 void QgsSymbolLayerV2::setDataDefinedProperty( const QString& property, const QString& expressionString )
@@ -123,7 +123,7 @@ void QgsSymbolLayerV2::saveDataDefinedProperties( QgsStringMap& stringMap ) cons
   {
     if ( ddIt.value() )
     {
-      stringMap.insert( ddIt.key() + "_expression", ddIt.value()->dump() );
+      stringMap.insert( ddIt.key() + "_expression", ddIt.value()->expression() );
     }
   }
 }
@@ -141,7 +141,7 @@ void QgsSymbolLayerV2::copyDataDefinedProperties( QgsSymbolLayerV2* destLayer )
   {
     if ( ddIt.value() )
     {
-      destLayer->setDataDefinedProperty( ddIt.key(), ddIt.value()->dump() );
+      destLayer->setDataDefinedProperty( ddIt.key(), ddIt.value()->expression() );
     }
   }
 }

diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -2254,7 +2254,7 @@ bool QgsSymbolLayerV2Utils::functionFromSldElement( QDomElement &element, QStrin
   }
   else
   {
-    function = expr->dump();
+    function = expr->expression();
   }
 
   delete expr;

diff --git a/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp b/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp
@@ -138,7 +138,10 @@ void QgsDataDefinedSymbolDialog::expressionButtonClicked()
     }
     else
     {
-      attributeCombo->setItemText( 0, QString() );
+      if ( comboIndex != 0 )
+      {
+        attributeCombo->setItemText( 0, QString() );
+      }
       attributeCombo->setCurrentIndex( comboIndex );
     }
   }