[attrtable] hide "hidden" widgets

m-kuhn · m-kuhn · commit 0f0d16af8e2f · 2014-06-20T10:06:22.000+02:00
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -247,15 +247,16 @@ void QgsAttributeTableModel::loadAttributes()
 
   for ( int idx = 0; idx < fields.count(); ++idx )
   {
-    QgsEditorWidgetFactory* widgetFactory = QgsEditorWidgetRegistry::instance()->factory( layer()->editorWidgetV2( idx ) );
-    if ( !widgetFactory || !layer() )
-      continue;
-
-    mWidgetFactories.append( widgetFactory );
-    mWidgetConfigs.append( layer()->editorWidgetV2Config( idx ) );
-    mAttributeWidgetCaches.append( widgetFactory->createCache( layer(), idx, mWidgetConfigs.last() ) );
+    const QString widgetType = layer()->editorWidgetV2( idx );
+    QgsEditorWidgetFactory* widgetFactory = QgsEditorWidgetRegistry::instance()->factory( widgetType );
+    if ( widgetFactory && widgetType != "Hidden" )
+    {
+      mWidgetFactories.append( widgetFactory );
+      mWidgetConfigs.append( layer()->editorWidgetV2Config( idx ) );
+      mAttributeWidgetCaches.append( widgetFactory->createCache( layer(), idx, mWidgetConfigs.last() ) );
 
-    attributes << idx;
+      attributes << idx;
+    }
   }
 
   if ( mFieldCount < attributes.size() )
@@ -503,7 +504,7 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
 
   if ( role == Qt::DisplayRole )
   {
-    return mWidgetFactories[ fieldId ]->representValue( layer(), fieldId, mWidgetConfigs[ fieldId ], mAttributeWidgetCaches[ fieldId ], val );
+    return mWidgetFactories[ index.column()]->representValue( layer(), fieldId, mWidgetConfigs[ index.column()], mAttributeWidgetCaches[ index.column()], val );
   }
 
   return val;
