Adds support for a std::map<std::string, T> model.

1 files changed, 55 insertions, 7 deletions

diff --git a/qt_adapter.hpp b/qt_adapter.hpp
index 2843667..6e0de17 100644
--- a/qt_adapter.hpp
+++ b/qt_adapter.hpp
@@ -3,14 +3,16 @@
 #include "fusion_model.hpp"
 #include "boost_any_to_qvariant.hpp"
 #include "meta_types.hpp"
+#include "gui_item_delegate.hpp"
 
 #include <QAbstractTableModel>
 #include <QTableView>
+#include <QVariant>
 #include <QMetaType>
 
 #include <memory>
-
-
+#include <string>
+#include <iostream>
 
 template <typename T>
 struct QtModelType
@@ -24,6 +26,34 @@ struct QtModelType<std::vector<V>>
 	typedef QAbstractTableModel type;
 };
 
+template <typename V>
+struct QtModelType<std::map<std::string, V>>
+{
+	typedef QAbstractTableModel type;
+};
+
+template <typename T>
+struct widget_type {
+	typedef void type;
+};
+
+template <typename T>
+struct widget_type<std::unique_ptr<T>> {
+	typedef typename T::widget type;
+};
+
+template <typename T>
+struct QtWidget : public T {
+	
+	GuiItemDelegate delegate;
+	
+	QtWidget(QWidget* parent = nullptr) 
+	: T(parent)
+	{
+		T::setItemDelegate(&delegate);
+	}
+};
+
 template <typename T, typename Q>
 struct QtAdapter : public Q {
 	
@@ -37,6 +67,7 @@ template <typename T>
 struct QtAdapter<T, QAbstractTableModel> : public QAbstractTableModel
 {
 	typedef QTableView view;
+	typedef QtWidget<view> widget;
 	
 	T model;
 	
@@ -54,16 +85,33 @@ struct QtAdapter<T, QAbstractTableModel> : public QAbstractTableModel
 		return model.column_count();
 	}
 	
-	virtual QVariant data(QModelIndex const& index, int role) const
+	virtual QVariant data(QModelIndex const& index, int role) const override
 	{
 		if(role != Qt::DisplayRole) return QVariant();
 		
-		return to_qvariant<typename T::data_type::value_type>(model.get_cell(index.row(), index.column()), index.column());
+		return to_qvariant<typename T::row_type>(model.get_cell(index.row(), index.column()), index.column());
+	}
+	
+	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::Vertical && T::has_header_v) {
+			return QVariant(QString::fromStdString(model.key(section)));
+		}
+		
+		return QVariant();
 	}
 };
 
-
 template <typename T>
-std::shared_ptr<QtAdapter<T, typename QtModelType<typename T::data_type>::type>> make_qt_adapter(T value) {
-	return std::make_shared<QtAdapter<T, typename QtModelType<typename T::data_type>::type>>(value);
+std::unique_ptr<QtAdapter<T, typename QtModelType<typename T::data_type>::type>> make_qt_adapter(T value) {
+	typedef QtAdapter<T, typename QtModelType<typename T::data_type>::type> type;
+	return std::unique_ptr<type>(new type(value));
 }