vector editing update:

- show mapped value instead of attribute value for value maps in attribute table and identify results.
- alternating background color in identify results
- allow hiding of attributes
- add actions (including edit action) into identify results



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

src/app/attributetable/qgsattributetablemodel.cpp

@@ -34,8 +34,29 @@ QgsAttributeTableModel::QgsAttributeTableModel( QgsVectorLayer *theLayer, QObjec
   mLastRow = NULL;
   mLayer = theLayer;
   mFeatureCount = mLayer->pendingFeatureCount();
-  mFieldCount = mLayer->pendingFields().size();
-  mAttributes = mLayer->pendingAllAttributesList();
+
+  mFieldCount = 0;
+  mAttributes.clear();
+  mValueMaps.clear();
+
+  for ( QgsFieldMap::const_iterator it = theLayer->pendingFields().constBegin(); it != theLayer->pendingFields().end(); it++ )
+  {
+    switch ( mLayer->editType( it.key() ) )
+    {
+      case QgsVectorLayer::Hidden:
+        continue;
+
+      case QgsVectorLayer::ValueMap:
+        mValueMaps.insert( it.key(), &mLayer->valueMap( it.key() ) );
+        break;
+
+      default:
+        break;
+    }
+
+    mFieldCount++;
+    mAttributes << it.key();
+  }
 
   connect( mLayer, SIGNAL( layerModified( bool ) ), this, SLOT( layerModified( bool ) ) );
   //connect(mLayer, SIGNAL(attributeAdded(int)), this, SLOT( attributeAdded(int)));
@@ -173,7 +194,7 @@ void QgsAttributeTableModel::loadLayer()
 // QgsDebugMsg(QString("%1, %2").arg(mFeatureCount).arg(mLayer->pendingFeatureCount() -1));
   }
 
-  mLayer->select( QgsAttributeList(), QgsRectangle(), false );
+  mLayer->select( mAttributes, QgsRectangle(), false );
 
   // preallocate data before inserting
   mRowIdMap.reserve( pendingFeatureCount + 50 );
@@ -187,7 +208,7 @@ void QgsAttributeTableModel::loadLayer()
 
   // not needed when we have featureAdded signal
   mFeatureCount = pendingFeatureCount;
-  mFieldCount = mLayer->pendingFields().size();
+  mFieldCount = mAttributes.size();
 
   if ( ins )
   {
@@ -369,7 +390,7 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
   if ( !mLastRow )
     return QVariant( "ERROR" );
 
-  QVariant &val = ( *mLastRow )[ mAttributes[index.column()] ];
+  const QVariant &val = ( *mLastRow )[ mAttributes[index.column()] ];
 
   if ( val.isNull() )
   {
@@ -384,6 +405,11 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
     }
   }
 
+  if ( role == Qt::DisplayRole && mValueMaps.contains( index.column() ) )
+  {
+    return mValueMaps[ index.column()]->key( val.toString(), QString( "(%1)" ).arg( val.toString() ) );
+  }
+
   // force also numeric data for EditRole to be strings
   // otherwise it creates spinboxes instead of line edits
   // (probably not what we do want)

src/app/attributetable/qgsattributetablemodel.h

@@ -188,6 +188,7 @@ class QgsAttributeTableModel: public QAbstractTableModel
 
     mutable QgsAttributeMap *mLastRow;
     QgsAttributeList mAttributes;
+    QMap< int, const QMap<QString, QVariant> * > mValueMaps;
 
     QList<QgsAttributeTableIdColumnPair> mSortList;
     QHash<int, int> mIdRowMap;

src/app/qgisapp.cpp

@@ -3667,9 +3667,6 @@ void QgisApp::openProject( const QString & fileName )
       {
         QgsDebugMsg( "unable to load project " + fileName );
       }
-      else
-      {
-      }
     }
     catch ( QgsIOException & io_exception )
     {

src/app/qgsattributedialog.cpp

@@ -43,7 +43,8 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
 
   const QgsFieldMap &theFieldMap = vl->pendingFields();
 
-  if ( theFieldMap.isEmpty() ) return;
+  if ( theFieldMap.isEmpty() )
+    return;
 
   QgsAttributeMap myAttributes = mpFeature->attributeMap();
   //
@@ -64,8 +65,6 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
   mypScrollArea->setWidgetResizable( true );
   QGridLayout * mypInnerLayout = new QGridLayout( mypInnerFrame );
 
-
-
   int index = 0;
   for ( QgsAttributeMap::const_iterator it = myAttributes.begin();
         it != myAttributes.end();
@@ -77,6 +76,10 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
     QString myFieldName = vl->attributeDisplayName( it.key() );
     int myFieldType = field.type();
 
+    QWidget *myWidget = QgsAttributeEditor::createAttributeEditor( 0, vl, it.key(), it.value() );
+    if ( !myWidget )
+      continue;
+
     QLabel * mypLabel = new QLabel();
     mypInnerLayout->addWidget( mypLabel, index, 0 );
     if ( myFieldType == QVariant::Int )
@@ -93,9 +96,8 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
       mypLabel->setText( myFieldName + tr( " (txt)" ) );
     }
 
-    QWidget *myWidget = QgsAttributeEditor::createAttributeEditor( 0, vl, it.key(), it.value() );
-
     mypInnerLayout->addWidget( myWidget, index, 1 );
+    mpIndizes << it.key();
     mpWidgets << myWidget;
     ++index;
   }
@@ -124,8 +126,9 @@ void QgsAttributeDialog::accept()
   {
     QVariant value;
 
-    if ( QgsAttributeEditor::retrieveValue( mpWidgets.value( myIndex ), mLayer, it.key(), value ) )
-      mpFeature->changeAttribute( it.key(), value );
+    int idx = mpIndizes.value( myIndex );
+    if ( QgsAttributeEditor::retrieveValue( mpWidgets.value( myIndex ), mLayer, idx, value ) )
+      mpFeature->changeAttribute( idx, value );
 
     ++myIndex;
   }

src/app/qgsattributedialog.h

@@ -55,6 +55,7 @@ class QgsAttributeDialog: public QDialog, private Ui::QgsAttributeDialogBase
   private:
     QString mSettingsPath;
     QList<QWidget *> mpWidgets;
+    QList<int> mpIndizes;
     QgsVectorLayer *mLayer;
     QgsFeature *  mpFeature;
 

src/app/qgsattributeeditor.cpp

@@ -228,6 +228,10 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QgsVectorLa
     }
     break;
 
+    case QgsVectorLayer::Hidden:
+      myWidget = NULL;
+      break;
+
     case QgsVectorLayer::FileName:
     {
       QLineEdit *le = new QLineEdit();
@@ -252,6 +256,9 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QgsVectorLa
 
 bool QgsAttributeEditor::retrieveValue( QWidget *widget, QgsVectorLayer *vl, int idx, QVariant &value )
 {
+  if ( !widget )
+    return false;
+
   const QgsField &theField = vl->pendingFields()[idx];
   QgsVectorLayer::EditType editType = vl->editType( idx );
   bool modified = false;
@@ -349,6 +356,9 @@ bool QgsAttributeEditor::retrieveValue( QWidget *widget, QgsVectorLayer *vl, int
 
 bool QgsAttributeEditor::setValue( QWidget *editor, QgsVectorLayer *vl, int idx, const QVariant &value )
 {
+  if ( !editor )
+    return false;
+
   QgsVectorLayer::EditType editType = vl->editType( idx );
   const QgsField &field = vl->pendingFields()[idx];
   QVariant::Type myFieldType = field.type();
@@ -362,7 +372,8 @@ bool QgsAttributeEditor::setValue( QWidget *editor, QgsVectorLayer *vl, int idx,
       QComboBox *cb = dynamic_cast<QComboBox *>( editor );
       if ( cb == NULL )
         return false;
-      int idx = cb->findText( value.toString() );
+
+      int idx = cb->findData( value );
       if ( idx < 0 )
         return false;
 

src/app/qgsattributetypedialog.cpp

@@ -226,6 +226,10 @@ void QgsAttributeTypeDialog::setPageForEditType( QgsVectorLayer::EditType editTy
       setPage( 7 );
       break;
 
+    case QgsVectorLayer::Hidden:
+      setPage( 8 );
+      break;
+
     case QgsVectorLayer::LineEdit:
       setPage( 0 );
       break;
@@ -501,6 +505,9 @@ void QgsAttributeTypeDialog::accept()
     case 7:
       mEditType = QgsVectorLayer::Immutable;
       break;
+    case 8:
+      mEditType = QgsVectorLayer::Hidden;
+      break;
     default:
       mEditType = QgsVectorLayer::LineEdit;
   }