From 6a1e6120c4efc46f1d192b0e5fabc06b780113cc Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Tue, 6 May 2014 15:54:57 +0200 Subject: Made fusion model interface strict and the API now bypasses the QtAdapter and instantiates widgets with models instead of adapters --- fusion_model.hpp | 52 +++++++++++++++++++++++++++++++++----------- main.cpp | 10 +++++---- qt_adapter.hpp | 66 +++++++++++++++++++++++++++++++++++++++----------------- 3 files changed, 92 insertions(+), 36 deletions(-) diff --git a/fusion_model.hpp b/fusion_model.hpp index 3d71f8d..282be11 100644 --- a/fusion_model.hpp +++ b/fusion_model.hpp @@ -16,18 +16,46 @@ private: fusion_model(T); }; -template -struct FusionModelInterface { - - static constexpr bool has_header_h = header_h; - static constexpr bool has_header_v = header_v; - - virtual size_t row_count() const {throw std::runtime_error("\"row_count()\" not implemented for this model");} - virtual size_t column_count() const {throw std::runtime_error("\"column_count()\" not implemented for this model");} - virtual std::string field_name(size_t section) const {throw std::runtime_error("\"field_name(size_t)\" not implemented for this model");} - virtual std::string key(size_t section) const {throw std::runtime_error("\"key(size_t)\" not implemented for this model");} - virtual boost::any get_cell(size_t row, size_t column) const {throw std::runtime_error("\"get_cell(size_t, size_t)\" not implemented for this model");} - virtual void set_cell(size_t row, size_t column, boost::any const& value) {throw std::runtime_error("\"set_cell(size_t, size_t, boost::any const&)\" not implemented for this model");} +template +struct FusionModelWithHeaderH; + +template <> +struct FusionModelWithHeaderH +{ + static constexpr bool has_header_h = false; +}; + +template <> +struct FusionModelWithHeaderH +{ + static constexpr bool has_header_h = true; + + virtual std::string field_name(size_t section) const = 0; +}; + +template +struct FusionModelWithHeaderV; + +template <> +struct FusionModelWithHeaderV +{ + static constexpr bool has_header_v = false; +}; + +template <> +struct FusionModelWithHeaderV +{ + static constexpr bool has_header_v = true; + + virtual std::string key(size_t section) const = 0; +}; + +template +struct FusionModelInterface : public FusionModelWithHeaderH, public FusionModelWithHeaderV { + virtual size_t row_count() const = 0; + virtual size_t column_count() const = 0; + virtual boost::any get_cell(size_t row, size_t column) const = 0; + virtual void set_cell(size_t row, size_t column, boost::any const& value) = 0; }; template diff --git a/main.cpp b/main.cpp index e378fcb..3ff490e 100644 --- a/main.cpp +++ b/main.cpp @@ -42,8 +42,8 @@ struct DataMapping :public fusion_model> { struct CustomDataModelWidget : public WidgetType::type { - CustomDataModelWidget(std::shared_ptr::type> adapter) - : WidgetType::type(adapter) + CustomDataModelWidget(std::shared_ptr model) + : WidgetType::type(model) {} }; @@ -67,11 +67,13 @@ int main() MainWindow w; - auto widget1 = make_qt_widget(model); - auto widget2 = make_qt_widget(mapping); + auto widget1 = std::make_shared(model); + auto widget2 = make_qt_widget(model); + auto widget3 = make_qt_widget(mapping); w.add_widget(widget1.get()); w.add_widget(widget2.get()); + w.add_widget(widget3.get()); int ret = w.show_and_run(); diff --git a/qt_adapter.hpp b/qt_adapter.hpp index c0aba79..dea660f 100644 --- a/qt_adapter.hpp +++ b/qt_adapter.hpp @@ -33,16 +33,28 @@ struct QtModelType> typedef QAbstractTableModel type; }; -template +template +struct QtAdapter : public Q { + + typedef void view; + + QtAdapter(std::shared_ptr) + {} +}; + +template +struct AdapterType; + +template struct QtWidget : public T { GuiItemDelegate delegate; - std::shared_ptr model; + std::shared_ptr::type> model; - QtWidget(std::shared_ptr model, QWidget* parent = nullptr) + QtWidget(std::shared_ptr model, QWidget* parent = nullptr) : T(parent) , delegate() - , model(model) + , model(std::make_shared::type>(model)) { T::setModel(this->model.get()); T::setItemDelegate(&delegate); @@ -50,20 +62,11 @@ struct QtWidget : public T { } }; -template -struct QtAdapter : public Q { - - typedef void view; - - QtAdapter(std::shared_ptr) - {} -}; - template struct QtAdapter : public QAbstractTableModel { typedef QTableView view; - typedef QtWidget> widget; + typedef QtWidget widget; std::shared_ptr model; @@ -102,18 +105,42 @@ struct QtAdapter : public QAbstractTableModel return to_qvariant(model->get_cell(index.row(), index.column()), index.column()); } + template + typename std::enable_if::type get_key(int section) const + { + return QVariant(QString::fromStdString(model->key(section))); + } + + template + typename std::enable_if::type get_key(int section) const + { + return QVariant(); + } + + template + typename std::enable_if::type get_field_name(int section) const + { + return QVariant(QString::fromStdString(model->field_name(section))); + } + + template + typename std::enable_if::type get_field_name(int section) const + { + return QVariant(); + } + virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override { if(role != Qt::DisplayRole) { return QVariant(); } - if(orientation == Qt::Horizontal && T::has_header_h) { - return QVariant(QString::fromStdString(model->field_name(section))); + if(orientation == Qt::Horizontal) { + return get_field_name(section); } - if(orientation == Qt::Vertical && T::has_header_v) { - return QVariant(QString::fromStdString(model->key(section))); + if(orientation == Qt::Vertical) { + return get_key(section); } return QVariant(); @@ -134,7 +161,6 @@ struct WidgetType { template std::shared_ptr::type> make_qt_widget(std::shared_ptr x) { - auto adapter_ptr = std::make_shared::type>(x); - auto widget_ptr = std::make_shared::type>(adapter_ptr); + auto widget_ptr = std::make_shared::type>(x); return widget_ptr; } -- cgit v1.2.3-70-g09d2