Added selection of display attributes and aliases to composer table item

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12709 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/app/CMakeLists.txt

@@ -73,6 +73,7 @@ SET(QGIS_APP_SRCS
   qgsvectorlayerproperties.cpp
   qgsquerybuilder.cpp
 
+  composer/qgsattributeselectiondialog.cpp
   composer/qgscomposer.cpp
   composer/qgscomposerarrowwidget.cpp
   composer/qgscomposeritemwidget.cpp

src/app/composer/qgsattributeselectiondialog.cpp

@@ -0,0 +1,144 @@
+/***************************************************************************
+                         qgsattributeselectiondialog.cpp
+                         -------------------------------
+    begin                : January 2010
+    copyright            : (C) 2010 by Marco Hugentobler
+    email                : marco at hugis dot net
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsattributeselectiondialog.h"
+#include "qgsvectorlayer.h"
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+
+QgsAttributeSelectionDialog::QgsAttributeSelectionDialog(const QgsVectorLayer* vLayer, const QSet<int>& enabledAttributes, const QMap<int, QString>& aliasMap, \
+                                                         QWidget * parent, Qt::WindowFlags f): QDialog(parent, f), mVectorLayer(vLayer)
+{
+    if( vLayer )
+    {
+        mGridLayout = new QGridLayout(this);
+        QLabel* attributeLabel = new QLabel(QString("<b>") + tr("Attribute") + QString("</b>"), this );
+        attributeLabel->setTextFormat(Qt::RichText);
+        mGridLayout->addWidget(attributeLabel, 0, 0);
+        QLabel* aliasLabel = new QLabel(QString("<b>") + tr("Alias") + QString("</b>"), this );
+        aliasLabel->setTextFormat(Qt::RichText);
+        mGridLayout->addWidget(aliasLabel, 0, 1);
+
+        QgsFieldMap fieldMap = vLayer->pendingFields();
+        QgsFieldMap::const_iterator fieldIt = fieldMap.constBegin();
+        int layoutRowCounter = 1;
+        for(; fieldIt != fieldMap.constEnd(); ++fieldIt)
+        {
+            QCheckBox* attributeCheckBox = new QCheckBox(fieldIt.value().name(), this);
+            if( enabledAttributes.size() < 1 || enabledAttributes.contains(fieldIt.key()) )
+            {
+                attributeCheckBox->setCheckState(Qt::Checked);
+            }
+            else
+            {
+                attributeCheckBox->setCheckState(Qt::Unchecked);
+            }
+            mGridLayout->addWidget(attributeCheckBox, layoutRowCounter, 0);
+
+            QLineEdit* attributeLineEdit = new QLineEdit(this);
+            QMap<int, QString>::const_iterator aliasIt = aliasMap.find( fieldIt.key() );
+            if(aliasIt != aliasMap.constEnd())
+            {
+                attributeLineEdit->setText(aliasIt.value());
+            }
+            mGridLayout->addWidget(attributeLineEdit, layoutRowCounter, 1);
+            ++layoutRowCounter;
+        }
+
+        QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+        QObject::connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+        QObject::connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+        mGridLayout->addWidget( buttonBox, layoutRowCounter, 0, 3, 1);
+    }
+}
+
+QgsAttributeSelectionDialog::~QgsAttributeSelectionDialog()
+{
+
+}
+
+QSet<int> QgsAttributeSelectionDialog::enabledAttributes() const
+{
+    QSet<int> result;
+    if(!mGridLayout || !mVectorLayer)
+    {
+        return result;
+    }
+
+    for( int i = 1; i < mGridLayout->rowCount(); ++i)
+    {
+        bool boxChecked = false;
+        QLayoutItem* checkBoxItem = mGridLayout->itemAtPosition(i, 0);
+        if(checkBoxItem)
+        {
+            QWidget* checkBoxWidget = checkBoxItem->widget();
+            if(checkBoxWidget)
+            {
+                QCheckBox* checkBox = dynamic_cast<QCheckBox*>(checkBoxWidget);
+                if(checkBox)
+                {
+                    if(checkBox->checkState() == Qt::Checked)
+                    {
+                        result.insert(mVectorLayer->fieldNameIndex(checkBox->text()));
+                    }
+                }
+            }
+        }
+    }
+
+    return result;
+}
+
+QMap<int, QString> QgsAttributeSelectionDialog::aliasMap() const
+{
+    QMap<int, QString> result;
+    if(!mGridLayout || !mVectorLayer)
+    {
+        return result;
+    }
+
+    for( int i = 1; i < mGridLayout->rowCount(); ++i)
+    {
+        QLayoutItem* lineEditItem = mGridLayout->itemAtPosition(i, 1);
+        QLayoutItem* checkBoxItem = mGridLayout->itemAtPosition(i, 0);
+        if(lineEditItem && checkBoxItem)
+        {
+            QWidget* lineEditWidget = lineEditItem->widget();
+            QWidget* checkBoxWidget = checkBoxItem->widget();
+            if(lineEditWidget)
+            {
+                QLineEdit* lineEdit = dynamic_cast<QLineEdit*>(lineEditWidget);
+                QCheckBox* checkBox = dynamic_cast<QCheckBox*>(checkBoxWidget);
+                if(lineEdit)
+                {
+                    QString aliasText = lineEdit->text();
+                    if(!aliasText.isEmpty())
+                    {
+                        //insert into map
+                        int fieldIndex = mVectorLayer->fieldNameIndex( checkBox->text() );
+                        result.insert(fieldIndex, aliasText);
+                    }
+                }
+            }
+        }
+    }
+    return result;
+}
+

src/app/composer/qgsattributeselectiondialog.h

@@ -0,0 +1,45 @@
+/***************************************************************************
+                         qgsattributeselectiondialog.h
+                         -----------------------------
+    begin                : January 2010
+    copyright            : (C) 2010 by Marco Hugentobler
+    email                : marco at hugis dot net
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSATTRIBUTESELECTIONDIALOG_H
+#define QGSATTRIBUTESELECTIONDIALOG_H
+
+#include <QDialog>
+#include <QMap>
+#include <QSet>
+
+class QGridLayout;
+class QgsVectorLayer;
+
+/**A dialog to select what attributes to display (in the table item) and with the possibility to set different aliases*/
+class QgsAttributeSelectionDialog: public QDialog
+{
+    public:
+        QgsAttributeSelectionDialog(const QgsVectorLayer* vLayer, const QSet<int>& enabledAttributes, const QMap<int, QString>& aliasMap, QWidget * parent = 0, Qt::WindowFlags f = 0);
+        ~QgsAttributeSelectionDialog();
+
+        /**Returns indices of selected attributes*/
+        QSet<int> enabledAttributes() const;
+        /**Returns alias map (alias might be different than for vector layer)*/
+        QMap<int, QString> aliasMap() const;
+
+    private:
+        const QgsVectorLayer* mVectorLayer;
+        QGridLayout* mGridLayout;
+};
+
+#endif // QGSATTRIBUTESELECTIONDIALOG_H

src/app/composer/qgscomposertablewidget.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgscomposertablewidget.h"
+#include "qgsattributeselectiondialog.h"
 #include "qgscomposeritemwidget.h"
 #include "qgscomposertable.h"
 #include "qgscomposermap.h"
@@ -95,6 +96,23 @@ void QgsComposerTableWidget::on_mLayerComboBox_currentIndexChanged( int index )
   }
 }
 
+void QgsComposerTableWidget::on_mAttributesPushButton_clicked()
+{
+  if ( !mComposerTable )
+  {
+    return;
+  }
+
+  QgsAttributeSelectionDialog d( mComposerTable->vectorLayer(), mComposerTable->displayAttributes(), mComposerTable->fieldAliasMap(), 0 );
+  if ( d.exec() == QDialog::Accepted )
+  {
+    //change displayAttributes and aliases
+    mComposerTable->setDisplayAttributes( d.enabledAttributes() );
+    mComposerTable->setFieldAliasMap( d.aliasMap() );
+    mComposerTable->update();
+  }
+}
+
 void QgsComposerTableWidget::on_mComposerMapComboBox_currentIndexChanged( int index )
 {
   if ( !mComposerTable )

src/app/composer/qgscomposertablewidget.h

@@ -39,6 +39,7 @@ class QgsComposerTableWidget: public QWidget, private Ui::QgsComposerTableWidget
 
   private slots:
     void on_mLayerComboBox_currentIndexChanged( int index );
+    void on_mAttributesPushButton_clicked();
     void on_mComposerMapComboBox_currentIndexChanged( int index );
     void on_mMaximumColumnsSpinBox_valueChanged( int i );
     void on_mMarginSpinBox_valueChanged( double d );