[composer] Small fixes to attribute table column model

qgis · May 16, 2014 · bae196b · bae196b
1 parent eb5627c
commit bae196b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/core/composer/qgscomposerattributetablemodel.cpp b/src/core/composer/qgscomposerattributetablemodel.cpp
@@ -37,18 +37,34 @@ QgsComposerAttributeTableColumnModel::~QgsComposerAttributeTableColumnModel()
 QModelIndex QgsComposerAttributeTableColumnModel::index( int row, int column, const QModelIndex &parent ) const
 {
   Q_UNUSED( parent );
-  if ( row < 0 || row >= mComposerTable->columns()->length() )
+  if ( row < 0 || row >= rowCount()
+       || column < 0 || column >= columnCount() )
   {
     //invalid row
     return QModelIndex();
   }
 
-  return createIndex( row, column, ( *mComposerTable->columns() )[row] );
+  if ( hasIndex( row, column, parent ) )
+  {
+    if (( *mComposerTable->columns() )[row] )
+    {
+      return createIndex( row, column, ( *mComposerTable->columns() )[row] );
+    }
+  }
+  return QModelIndex();
+}
+
+QModelIndex QgsComposerAttributeTableColumnModel::parent( const QModelIndex &child ) const
+{
+  Q_UNUSED( child );
+  return QModelIndex();
 }
 
 int QgsComposerAttributeTableColumnModel::rowCount( const QModelIndex &parent ) const
 {
-  Q_UNUSED( parent );
+  if ( parent.isValid() )
+    return 0;
+
   return mComposerTable->columns()->length();
 }
 

diff --git a/src/core/composer/qgscomposerattributetablemodel.h b/src/core/composer/qgscomposerattributetablemodel.h
@@ -57,6 +57,7 @@ class CORE_EXPORT QgsComposerAttributeTableColumnModel: public QAbstractTableMod
     bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() );
     bool insertRows( int row, int count, const QModelIndex &parent = QModelIndex() );
     QModelIndex index( int row, int column, const QModelIndex &parent ) const;
+    QModelIndex parent( const QModelIndex &child ) const;
 
     /**Moves the specified row up or down in the model. Used for rearranging the attribute tables
      * columns.