Table widget : led and type is editable

But not applied yet to the terminal strip

sources/TerminalStrip/ui/terminalstripeditor.cpp

@@ -42,6 +42,7 @@ TerminalStripEditor::TerminalStripEditor(QETProject *project, QWidget *parent) :
 	m_project(project)
 {
 	ui->setupUi(this);
+	ui->m_table_widget->setItemDelegate(new TerminalStripModelDelegate(ui->m_terminal_strip_tw));
 	ui->m_remove_terminal_strip_pb->setDisabled(true);
 	buildTree();
 	ui->m_terminal_strip_tw->expandRecursively(ui->m_terminal_strip_tw->rootIndex());
@@ -391,7 +392,7 @@ void TerminalStripEditor::on_m_dialog_button_box_clicked(QAbstractButton *button
 
 	auto role = ui->m_dialog_button_box->buttonRole(button);
 
-	if (role == QDialogButtonBox::AcceptRole) {
+	if (role == QDialogButtonBox::ApplyRole) {
 		if (m_current_strip)
 		{
 			TerminalStripData data;

sources/TerminalStrip/ui/terminalstripmodel.cpp

@@ -1,4 +1,4 @@
-/*
+/*
         Copyright 2006-2021 The QElectroTech Team
         This file is part of QElectroTech.
 
@@ -18,6 +18,23 @@
 #include "terminalstripmodel.h"
 #include "../terminalstrip.h"
 #include <QDebug>
+#include <QBrush>
+#include <QVector>
+#include <QComboBox>
+#include <QSpinBox>
+
+/**
+ * Some const int who describe what a column contain
+ */
+const int POS_CELL = 0;
+const int LEVEL_CELL = 1;
+const int LABEL_CELL = 2;
+const int XREF_CELL = 3;
+const int CABLE_CELL = 4;
+const int CABLE_WIRE_CELL = 5;
+const int TYPE_CELL = 6;
+const int LED_CELL = 7;
+const int CONDUCTOR_CELL = 8;
 
 /**
  * @brief TerminalStripModel::TerminalStripModel
@@ -50,23 +67,103 @@ int TerminalStripModel::columnCount(const QModelIndex &parent) const
 
 QVariant TerminalStripModel::data(const QModelIndex &index, int role) const
 {
-	if (role != Qt::DisplayRole ||
+	if (index.row() >= m_real_terminal_data.size()) {
-		index.row() >= m_real_terminal_data.size()) {
 		return QVariant();
 	}
 
 	auto rtd = m_real_terminal_data.at(index.row());
-	switch (index.column()) {
+
-		case 0 : return rtd.level_;
+
-		case 1 : return rtd.label_;
+	if (role == Qt::DisplayRole)
-		case 2 : return rtd.Xref_;
+	{
-		case 3 : return rtd.cable_;
+		switch (index.column()) {
-		case 4 : return rtd.cable_wire_;
+			case POS_CELL : return rtd.pos_;
-		case 5 : return ElementData::translatedTerminalType(rtd.type_);
+			case LEVEL_CELL : return rtd.level_;
-		case 6 : return rtd.led_;
+			case LABEL_CELL : return rtd.label_;
-		case 7 : return rtd.conductor_;
+			case XREF_CELL : return rtd.Xref_;
-		default : return QVariant();
+			case CABLE_CELL : return rtd.cable_;
+			case CABLE_WIRE_CELL : return rtd.cable_wire_;
+			case TYPE_CELL : return ElementData::translatedTerminalType(rtd.type_);
+			case CONDUCTOR_CELL : return rtd.conductor_;
+			default : return QVariant();
+		}
 	}
+	else if (role == Qt::EditRole)
+	{
+		switch (index.column()) {
+//			case LEVEL_CELL : return rtd.level_;
+			case LABEL_CELL : return rtd.label_;
+			default: return QVariant();
+
+		}
+	}
+	else if (role == Qt::CheckStateRole &&
+			   index.column() == LED_CELL)
+	{
+		return rtd.led_ ? Qt::Checked : Qt::Unchecked;
+	}
+	else if (role == Qt::BackgroundRole && index.column() <= CONDUCTOR_CELL )
+	{
+		if (m_modified_cell.contains(rtd.m_real_terminal) &&
+			m_modified_cell.value(rtd.m_real_terminal).at(index.column()))
+		{
+			return QBrush(Qt::yellow);
+		}
+	}
+
+	return QVariant();
+}
+
+bool TerminalStripModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+	auto rtd = m_real_terminal_data.at(index.row());
+	bool modified_ = false;
+	int modified_cell = -1;
+	auto column_ = index.column();
+
+	if (column_ == LED_CELL &&
+		role == Qt::CheckStateRole)
+	{
+			rtd.led_ = value.toBool();
+			modified_ = true;
+			modified_cell = LED_CELL;
+	}
+	else if (column_ == TYPE_CELL &&
+			 role == Qt::EditRole)
+	{
+		rtd.type_ = value.value<ElementData::TerminalType>();
+		modified_ = true;
+		modified_cell = TYPE_CELL;
+	}
+//	else if (column_ == LEVEL_CELL &&
+//			 role == Qt::EditRole)
+//	{
+//		rtd.level_ = value.toInt();
+//		modified_ = true;
+//		modified_cell = LEVEL_CELL;
+//	}
+
+		//Set the modification to the terminal data
+	if (modified_)
+	{
+		m_real_terminal_data.replace(index.row(), rtd);
+
+		if (rtd.m_real_terminal)
+		{
+			QVector<bool> vector_;
+			if (m_modified_cell.contains(rtd.m_real_terminal)) {
+				vector_ = m_modified_cell.value(rtd.m_real_terminal);
+			} else {
+				vector_ = QVector<bool>({false, false, false, false, false, false, false, false, false});
+			}
+
+			vector_.replace(modified_cell, true);
+			m_modified_cell.insert(rtd.m_real_terminal, vector_);
+		}
+		return true;
+	}
+
+	return false;
 }
 
 QVariant TerminalStripModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -76,24 +173,38 @@ QVariant TerminalStripModel::headerData(int section, Qt::Orientation orientation
 		if (orientation == Qt::Horizontal)
 		{
 			switch (section) {
-				case 0: return tr("Étage");
+				case POS_CELL: return tr("Position");
-				case 1: return tr("Label");
+				case LEVEL_CELL: return tr("Étage");
-				case 2: return tr("Référence croisé");
+				case LABEL_CELL: return tr("Label");
-				case 3: return tr("Câble");
+				case XREF_CELL: return tr("Référence croisé");
-				case 4: return tr("Couleur / numéro de fil câble");
+				case CABLE_CELL: return tr("Câble");
-				case 5: return tr("Type");
+				case CABLE_WIRE_CELL: return tr("Couleur / numéro de fil câble");
-				case 6: return tr("led");
+				case TYPE_CELL: return tr("Type");
-				case 7: return tr("Numéro de conducteur");
+				case LED_CELL: return tr("led");
+				case CONDUCTOR_CELL: return tr("Numéro de conducteur");
 				default : return QVariant();
 			}
-		} else {
+		} /*else {
 			return QString::number(++section);
-		}
+		}*/
 	}
 
 	return QVariant();
 }
 
+Qt::ItemFlags TerminalStripModel::flags(const QModelIndex &index) const
+{
+	Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+
+	auto c = index.column();
+	if (/*c == LEVEL_CELL || */c == LABEL_CELL || c == TYPE_CELL)
+		flags = flags | Qt::ItemIsEditable;
+	if (c == LED_CELL) {
+		flags = flags | Qt::ItemIsUserCheckable;
+	}
+	return flags;
+}
+
 void TerminalStripModel::fillRealTerminalData()
 {
 	if (m_terminal_strip) {
@@ -102,3 +213,55 @@ void TerminalStripModel::fillRealTerminalData()
 		}
 	}
 }
+
+/***********************************************************
+ * Alittle delegate for add a combobox to edit type
+ * and a spinbox to edit the level of a terminal
+ **********************************************************/
+
+TerminalStripModelDelegate::TerminalStripModelDelegate(QObject *parent) :
+	QStyledItemDelegate(parent)
+{}
+
+QWidget *TerminalStripModelDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+	if (index.column() == TYPE_CELL) {
+		auto qcb = new QComboBox(parent);
+		qcb->setObjectName("terminal_type");
+		qcb->addItem(ElementData::translatedTerminalType(ElementData::TTGeneric),   ElementData::TTGeneric);
+		qcb->addItem(ElementData::translatedTerminalType(ElementData::TTFuse),      ElementData::TTFuse);
+		qcb->addItem(ElementData::translatedTerminalType(ElementData::TTSectional), ElementData::TTSectional);
+		qcb->addItem(ElementData::translatedTerminalType(ElementData::TTDiode),     ElementData::TTDiode);
+		qcb->addItem(ElementData::translatedTerminalType(ElementData::TTGround),    ElementData::TTGround);
+
+		return qcb;
+	}
+//	if (index.column() == LEVEL_CELL) {
+//		auto qsb = new QSpinBox(parent);
+//		qsb->setObjectName("terminal_level");
+//		qsb->setRange(0, 3);
+//		qsb->setValue(index.data(Qt::EditRole).toInt());
+//		return qsb;
+//	}
+
+	return QStyledItemDelegate::createEditor(parent, option, index);
+}
+
+void TerminalStripModelDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+{
+	if (index.isValid())
+	{
+		if (editor->objectName() == QLatin1String("terminal_type"))
+		{
+			if (auto qcb = dynamic_cast<QComboBox *>(editor)) {
+				model->setData(index, qcb->currentData(), Qt::EditRole);
+			}
+		}
+//		else if (editor->objectName() == QLatin1String("terminal_level"))
+//		{
+//			if (auto qsb = dynamic_cast<QSpinBox *>(editor)) {
+//				model->setData(index, qsb->value(), Qt::EditRole);
+//			}
+//		}
+	}
+}

sources/TerminalStrip/ui/terminalstripmodel.h

@@ -21,6 +21,8 @@
 #include <QAbstractTableModel>
 #include <QObject>
 #include <QPointer>
+#include <QStyledItemDelegate>
+
 #include "../terminalstrip.h"
 
 class TerminalStrip;
@@ -34,7 +36,9 @@ class TerminalStripModel : public QAbstractTableModel
         virtual int rowCount    (const QModelIndex &parent = QModelIndex()) const override;
         virtual int columnCount (const QModelIndex &parent = QModelIndex()) const override;
         virtual QVariant data   (const QModelIndex &index, int role = Qt::DisplayRole) const override;
+		virtual bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
 		virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+		virtual Qt::ItemFlags flags (const QModelIndex &index) const override;
 
 	private:
 		void fillRealTerminalData();
@@ -42,6 +46,27 @@ class TerminalStripModel : public QAbstractTableModel
     private:
         QPointer<TerminalStrip> m_terminal_strip;
 		QVector<RealTerminalData> m_real_terminal_data;
+		QHash<QSharedPointer<RealTerminal>, QVector<bool>> m_modified_cell;
+};
+
+class TerminalStripModelDelegate : public QStyledItemDelegate
+{
+	Q_OBJECT
+
+	public:
+		TerminalStripModelDelegate(QObject *parent = Q_NULLPTR);
+
+		QWidget *createEditor(
+				QWidget *parent,
+				const QStyleOptionViewItem &option,
+				const QModelIndex &index) const override;
+		void setModelData(
+				QWidget *editor,
+				QAbstractItemModel *model,
+				const QModelIndex &index) const override;
+
+//	protected:
+//	bool eventFilter(QObject *object, QEvent *event) override;
 };
 
 #endif // TERMINALSTRIPMODEL_H