Add legend text for new diagram attributes by default

qgis · May 20, 2015 · 09192ee · 09192ee
1 parent 3487471
commit 09192ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -464,11 +464,22 @@ void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int inde
     mAngleOffsetLabel->hide();
   }
 }
+
+QString QgsDiagramProperties::guessLegendText( const QString& expression )
+{
+  //trim unwanted characters from expression text for legend
+  QString text = expression.mid( expression.startsWith( "\"" ) ? 1 : 0 );
+  if ( text.endsWith( "\"" ) )
+    text.chop( 1 );
+  return text;
+}
+
 void QgsDiagramProperties::addAttribute( QTreeWidgetItem * item )
 {
   QTreeWidgetItem *newItem = new QTreeWidgetItem( mDiagramAttributesTreeWidget );
 
   newItem->setText( 0, item->text( 0 ) );
+  newItem->setText( 2, guessLegendText( item->text( 0 ) ) );
   newItem->setData( 0, Qt::UserRole, item->data( 0, Qt::UserRole ) );
   newItem->setFlags( newItem->flags() & ~Qt::ItemIsDropEnabled );
 
@@ -777,6 +788,7 @@ void QgsDiagramProperties::showAddAttributeExpressionDialog()
       QTreeWidgetItem *newItem = new QTreeWidgetItem( mDiagramAttributesTreeWidget );
 
       newItem->setText( 0, expression );
+      newItem->setText( 2, expression );
       newItem->setData( 0, Qt::UserRole, expression );
       newItem->setFlags( newItem->flags() & ~Qt::ItemIsDropEnabled );
 

diff --git a/src/app/qgsdiagramproperties.h b/src/app/qgsdiagramproperties.h
@@ -54,6 +54,10 @@ class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPr
 
     QgsVectorLayer* mLayer;
 
+  private:
+
+    QString guessLegendText( const QString &expression );
+
 };
 
 #endif // QGSDIAGRAMPROPERTIES_H