Ensure all model proxy caches are flushed before access

This fixes a defect where station detail changes are not saved. The Qt sort and filter proxy models utilize an item cache that must be flushed by callig submit() before accessing the underlying model if the proxy model has been used for updates. Also separated the item model candidate key filter from the implementation internals of the foreign key item delegate so that candidate key filtered models can be used directly as view models. Make the insert new station details band combo box use a candidate key filtered item model to avoid constraint violations. Constraint is zero or one station records per band. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5161 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2026-06-08 08:54:41 -04:00 · 2015-04-06 01:57:47 +00:00
parent fdc02e34d4
commit dad4863e84
10 changed files with 1260 additions and 1181 deletions
@@ -1,77 +1,32 @@
-#include "ForeignKeyDelegate.hpp"
-
-#include <QComboBox>
-#include <QSortFilterProxyModel>
-
-class CandidateKeyFilter final
-  : public QSortFilterProxyModel
-{
-public:
-  explicit CandidateKeyFilter (QAbstractItemModel const * referencing_model
-                               , QAbstractItemModel * referenced_model
-                               , int referenced_key_column
-                               , int referencing_key_role
-                               , int referenced_key_role)
-    : QSortFilterProxyModel {nullptr} // ForeignKeyDelegate owns us
-    , referencing_ {referencing_model}
-    , referencing_key_role_ {referencing_key_role}
-    , referenced_key_column_ {referenced_key_column}
-    , referenced_key_role_ {referenced_key_role}
-  {
-    setSourceModel (referenced_model);
-  }
-
-  void set_active_key (QModelIndex const& index)
-  {
-    active_key_ = index;
-    invalidateFilter ();
-  }
-
-protected:
-  bool filterAcceptsRow (int candidate_row, QModelIndex const& candidate_parent) const override
-  {
-    auto candidate_key = sourceModel ()->index (candidate_row, referenced_key_column_, candidate_parent).data (referenced_key_role_);
-
-    // Include the current key.
-    if (candidate_key == active_key_.data (referencing_key_role_))
-      {
-        return true;
-      }
-
-    // Filter out any candidates already in the referencing key rows.
-    return referencing_->match (referencing_->index (0, active_key_.column ()), referencing_key_role_, candidate_key, 1, Qt::MatchExactly).isEmpty ();
-  }
-
-private:
-  QAbstractItemModel const * referencing_;
-  int referencing_key_role_;
-  int referenced_key_column_;
-  int referenced_key_role_;
-  QModelIndex active_key_;
-};
-
-ForeignKeyDelegate::ForeignKeyDelegate (QAbstractItemModel const * referencing_model
-                                        , QAbstractItemModel * referenced_model
-                                        , int referenced_key_column
-                                        , QObject * parent
-                                        , int referencing_key_role
-                                        , int referenced_key_role)
-  : QStyledItemDelegate {parent}
-  , candidate_key_filter_ {new CandidateKeyFilter {referencing_model, referenced_model, referenced_key_column, referencing_key_role, referenced_key_role}}
-{
-}
-
-ForeignKeyDelegate::~ForeignKeyDelegate ()
-{
-}
-
-QWidget * ForeignKeyDelegate::createEditor (QWidget * parent
-                                            , QStyleOptionViewItem const& /* option */
-                                            , QModelIndex const& index) const
-{
-  auto editor = new QComboBox {parent};
-  editor->setFrame (false);
-  candidate_key_filter_->set_active_key (index);
-  editor->setModel (candidate_key_filter_.data ());
-  return editor;
-}
+#include "ForeignKeyDelegate.hpp"
+
+#include <QComboBox>
+
+#include "CandidateKeyFilter.hpp"
+
+ForeignKeyDelegate::ForeignKeyDelegate (QAbstractItemModel const * referencing_model
+                                        , QAbstractItemModel * referenced_model
+                                        , int referencing_key_column
+                                        , int referenced_key_column
+                                        , QObject * parent
+                                        , int referencing_key_role
+                                        , int referenced_key_role)
+  : QStyledItemDelegate {parent}
+  , candidate_key_filter_ {new CandidateKeyFilter {referencing_model, referenced_model, referencing_key_column, referenced_key_column, referencing_key_role, referenced_key_role}}
+{
+}
+
+ForeignKeyDelegate::~ForeignKeyDelegate ()
+{
+}
+
+QWidget * ForeignKeyDelegate::createEditor (QWidget * parent
+                                            , QStyleOptionViewItem const& /* option */
+                                            , QModelIndex const& index) const
+{
+  auto editor = new QComboBox {parent};
+  editor->setFrame (false);
+  candidate_key_filter_->set_active_key (index);
+  editor->setModel (candidate_key_filter_.data ());
+  return editor;
+}