Include only the columns that are visible for sorting. Should resolve Bug #2611.

apps/opencs/model/world/idtableproxymodel.cpp

@@ -21,6 +21,18 @@ void CSMWorld::IdTableProxyModel::updateColumnMap()
     }
 }
 
+bool CSMWorld::IdTableProxyModel::filterAcceptsColumn (int sourceColumn, const QModelIndex& sourceParent)
+    const
+{
+    int flags =
+        sourceModel()->headerData (sourceColumn, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
+
+    if (flags & CSMWorld::ColumnBase::Flag_Table)
+        return true;
+    else
+        return false;
+}
+
 bool CSMWorld::IdTableProxyModel::filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent)
     const
 {

apps/opencs/model/world/idtableproxymodel.hpp

@@ -24,8 +24,6 @@ namespace CSMWorld
 
             void updateColumnMap();
 
-            bool filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const;
-
         public:
 
             IdTableProxyModel (QObject *parent = 0);
@@ -39,6 +37,10 @@ namespace CSMWorld
         protected:
 
             bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
+
+            virtual bool filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const;
+
+            virtual bool filterAcceptsColumn (int sourceColumn, const QModelIndex& sourceParent) const;
     };
 }