Use better expression to string conversion

mhugent · mhugent · commit 99c922de7175 · 2013-04-19T15:21:08.000+02:00
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 );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ QgsExpression* QgsSymbolLayerV2::expression( const QString& property )`
`47`	`47`	`QString QgsSymbolLayerV2::dataDefinedPropertyString( const QString& property ) const`
`48`	`48`	`{`
`49`	`49`	`const QgsExpression* ex = dataDefinedProperty( property );`
`50`		`- return ex ? ex->dump() : QString();`
	`50`	`+ return ex ? ex->expression() : QString();`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`void QgsSymbolLayerV2::setDataDefinedProperty( const QString& property, const QString& expressionString )`
`@@ -123,7 +123,7 @@ void QgsSymbolLayerV2::saveDataDefinedProperties( QgsStringMap& stringMap ) cons`
`123`	`123`	`{`
`124`	`124`	`if ( ddIt.value() )`
`125`	`125`	`{`
`126`		`- stringMap.insert( ddIt.key() + "_expression", ddIt.value()->dump() );`
	`126`	`+ stringMap.insert( ddIt.key() + "_expression", ddIt.value()->expression() );`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -141,7 +141,7 @@ void QgsSymbolLayerV2::copyDataDefinedProperties( QgsSymbolLayerV2* destLayer )`
`141`	`141`	`{`
`142`	`142`	`if ( ddIt.value() )`
`143`	`143`	`{`
`144`		`- destLayer->setDataDefinedProperty( ddIt.key(), ddIt.value()->dump() );`
	`144`	`+ destLayer->setDataDefinedProperty( ddIt.key(), ddIt.value()->expression() );`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2254,7 +2254,7 @@ bool QgsSymbolLayerV2Utils::functionFromSldElement( QDomElement &element, QStrin`
`2254`	`2254`	`}`
`2255`	`2255`	`else`
`2256`	`2256`	`{`
`2257`		`- function = expr->dump();`
	`2257`	`+ function = expr->expression();`
`2258`	`2258`	`}`
`2259`	`2259`
`2260`	`2260`	`delete expr;`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,10 @@ void QgsDataDefinedSymbolDialog::expressionButtonClicked()`
`138`	`138`	`}`
`139`	`139`	`else`
`140`	`140`	`{`
`141`		`- attributeCombo->setItemText( 0, QString() );`
	`141`	`+ if ( comboIndex != 0 )`
	`142`	`+ {`
	`143`	`+ attributeCombo->setItemText( 0, QString() );`
	`144`	`+ }`
`142`	`145`	`attributeCombo->setCurrentIndex( comboIndex );`
`143`	`146`	`}`
`144`	`147`	`}`