From f410fbf7e2fa27be17ea7c7b89f70f55d5be0b07 Mon Sep 17 00:00:00 2001
From: joshua <Joshua@qelectrotech.org>
Date: Mon, 7 Jun 2021 21:56:27 +0200
Subject: [PATCH] Remove position section of terminalStripModel

---
 .../TerminalStrip/ui/terminalstripeditor.ui   |  2 +-
 .../TerminalStrip/ui/terminalstripmodel.cpp   | 53 ++++++++++---------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/sources/TerminalStrip/ui/terminalstripeditor.ui b/sources/TerminalStrip/ui/terminalstripeditor.ui
index 34a789b84..f8bee7cfe 100644
--- a/sources/TerminalStrip/ui/terminalstripeditor.ui
+++ b/sources/TerminalStrip/ui/terminalstripeditor.ui
@@ -141,7 +141,7 @@
            <bool>true</bool>
           </attribute>
           <attribute name="verticalHeaderVisible">
-           <bool>false</bool>
+           <bool>true</bool>
           </attribute>
          </widget>
         </item>
diff --git a/sources/TerminalStrip/ui/terminalstripmodel.cpp b/sources/TerminalStrip/ui/terminalstripmodel.cpp
index b81ef3d8d..a66b14c18 100644
--- a/sources/TerminalStrip/ui/terminalstripmodel.cpp
+++ b/sources/TerminalStrip/ui/terminalstripmodel.cpp
@@ -45,7 +45,7 @@ int TerminalStripModel::rowCount(const QModelIndex &parent) const
 int TerminalStripModel::columnCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
-	return 9;
+	return 8;
 }
 
 QVariant TerminalStripModel::data(const QModelIndex &index, int role) const
@@ -57,38 +57,41 @@ QVariant TerminalStripModel::data(const QModelIndex &index, int role) const
 
 	auto rtd = m_real_terminal_data.at(index.row());
 	switch (index.column()) {
-		case 0 : return rtd.pos_;
-		case 1 : return rtd.level_;
-		case 2 : return rtd.label_;
-		case 3 : return rtd.Xref_;
-		case 4 : return rtd.cable_;
-		case 5 : return rtd.cable_wire_;
-		case 6 : return ElementData::translatedTerminalType(rtd.type_);
-		case 7 : return rtd.led_;
-		case 8 : return rtd.conductor_;
+		case 0 : return rtd.level_;
+		case 1 : return rtd.label_;
+		case 2 : return rtd.Xref_;
+		case 3 : return rtd.cable_;
+		case 4 : return rtd.cable_wire_;
+		case 5 : return ElementData::translatedTerminalType(rtd.type_);
+		case 6 : return rtd.led_;
+		case 7 : return rtd.conductor_;
 		default : return QVariant();
 	}
 }
 
 QVariant TerminalStripModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-	if (orientation != Qt::Horizontal ||
-		role != Qt::DisplayRole) {
-		return QVariant();
+	if (role == Qt::DisplayRole)
+	{
+		if (orientation == Qt::Horizontal)
+		{
+			switch (section) {
+				case 0: return tr("Étage");
+				case 1: return tr("Label");
+				case 2: return tr("Référence croisé");
+				case 3: return tr("Câble");
+				case 4: return tr("Couleur / numéro de fil câble");
+				case 5: return tr("Type");
+				case 6: return tr("led");
+				case 7: return tr("Numéro de conducteur");
+				default : return QVariant();
+			}
+		} else {
+			return QString::number(++section);
+		}
 	}
 
-	switch (section) {
-		case 0: return tr("Position");
-		case 1: return tr("Étage");
-		case 2: return tr("Label");
-		case 3: return tr("Référence croisé");
-		case 4: return tr("Câble");
-		case 5: return tr("Couleur / numéro de fil câble");
-		case 6: return tr("Type");
-		case 7: return tr("led");
-		case 8: return tr("Numéro de conducteur");
-		default : return QVariant();
-	}
+	return QVariant();
 }
 
 void TerminalStripModel::fillRealTerminalData()