Add cable management: drawing, cores, numbering, cross-references and cable list

Cables are drawn line objects (toolbar button next to the auto break/reconnect button, click-move-click, right click cancels), not components. The type comes from a CSV catalog following the material list pattern (designation, cores, core colours, editable through the entry dialog with "Nouvelle entrée" / "Modifier l'entrée"). Each core is bound to the wire its colour label stands on, and the cable reference is generated per core and written into the Conductor entry via Conductor::setCableReference(label, cable uuid, slot). The conductor entry is where it has to live because the terminal strip plan (Klemmenplan) consumes it in the next step. Numbering: "Cables" rule under Programmeinstellungen/Neues Projekt/Nummerierung auto (mirrored in project properties), literal "W" fallback without a rule, French gate dialog when no rule exists, Nummerierung menu with the renumber dialog (preferred axis, per-folio counter, rule and counter state written back, hand-typed names ask, whole-project scope). Also included: label block and under-line texts with per-text font and alignment plus the material-list cell margins, free-core placement and right-click removal, claim questions for wires of other cables, multi-selection drag as one undo step, type change with confirmation, cross-references for type "Cable" (%f-%l%c, own font, clickable links in exported PDFs), report propagation of the cable definition, Listes menu (table of contents, material list, terminal strip manager, terminal generator plugin, cable list), cable list with freely selectable columns (installation/localisation of cable, start and end, Blatt start/end, length, used cores...), CSV export dialog with column pick and preview in the Projekt menu, script API (addTable kind "cable_list", exportCableList) and a unit test for the type catalog.
2026-10-11 06:34:14 +02:00 · 2026-10-08 15:56:00 +02:00
parent 1ca13ce62d
commit bf9b34398d
108 changed files with 18482 additions and 293 deletions
@@ -25,6 +25,7 @@
 #include "ui_selectautonumw.h"

 #include <QMessageBox>
+#include <QPushButton>

 /**
 	@brief SelectAutonumW::SelectAutonumW
@@ -112,7 +113,11 @@ void SelectAutonumW::setContext(const NumerotationContext &context)
 	else {
 		for (int i=0; i<m_context.size(); ++i) { //build with the content of @context
 			NumPartEditorW *part= new NumPartEditorW(m_context, i, m_edited_type, this);
-			connect(part, &NumPartEditorW::changed, this, [this]() { applyEnable(); });
+			connect(part, &NumPartEditorW::changed, this, [this]() {
+				m_dirty = true;
+				applyEnable();
+				emit contextEdited();
+			});
 			num_part_list_ << part;
 			ui -> editor_layout -> addWidget(part);
 		}
@@ -123,6 +128,9 @@ void SelectAutonumW::setContext(const NumerotationContext &context)
 				ui -> remove_button -> setEnabled (true);

 	applyEnable(false);
+		//Everything the rule held before is read now, so nothing of it
+		//is left to write: what is on show is what there is.
+	m_dirty = false;
 }

 /**
@@ -144,11 +152,17 @@ NumerotationContext SelectAutonumW::toNumContext() const
 void SelectAutonumW::on_add_button_clicked()
 {
 	applyEnable(false);
+	m_dirty = true;
 	NumPartEditorW *part = new NumPartEditorW(m_edited_type, this);
-	connect(part, &NumPartEditorW::changed, this, [this]() { applyEnable(); });
+	connect(part, &NumPartEditorW::changed, this, [this]() {
+		m_dirty = true;
+		applyEnable();
+		emit contextEdited();
+	});
 	num_part_list_ << part;
 	ui -> editor_layout -> addWidget(part);
 	ui -> remove_button -> setEnabled(true);
+	emit contextEdited();
 }

 /**
@@ -159,6 +173,7 @@ void SelectAutonumW::on_remove_button_clicked()
 {
 	//remove if @num_part_list contains more than one item
 	if (num_part_list_.size() > 1) {
+		m_dirty = true;
 		NumPartEditorW *part = num_part_list_.takeLast();
 		// deliberately not disconnecting as not possible to resolve with lambda and will happen automatically when the object "part" is destroyed.
 		delete part;
@@ -167,6 +182,7 @@ void SelectAutonumW::on_remove_button_clicked()
 		}
 	}
 	applyEnable();
+	emit contextEdited();
 }

 /**
@@ -188,6 +204,78 @@ QComboBox *SelectAutonumW::contextComboBox() const
 	return ui->m_comboBox;
 }

+/**
+	@brief SelectAutonumW::setSingleRuleMode
+	@param single true to show this editor as the one and only rule of
+	its kind.
+
+	The row which lists the available numberings -- its label, its combo
+	box and the button which deletes one -- is hidden, so there is
+	nothing to name a rule with and nothing to choose between: the rule
+	being edited is all there is. The combo box itself stays where it is
+	and keeps holding the rule's name, so everything which reads or
+	writes the rule through contextComboBox() carries on untouched; he
+	just cannot see it.
+*/
+void SelectAutonumW::setSingleRuleMode(bool single)
+{
+	m_single_rule = single;
+	ui->label->setVisible(!single);
+	ui->m_comboBox->setVisible(!single);
+	ui->m_remove_pb->setVisible(!single);
+
+		//A single rule has no list to be deleted from, so it needs a
+		//button of its own to get out of the numbering again. It is
+		//only shown when there is really a rule to take away -- see
+		//setRuleRemovable.
+	if (single && !m_rule_remove_pb) {
+		m_rule_remove_pb = new QPushButton(tr("Supprimer la règle"), this);
+		m_rule_remove_pb->setToolTip(tr(
+			"Supprimer la règle de numérotation des câbles : les câbles "
+			"sont à nouveau numérotés comme avant, et la question d'en "
+			"définir une revient au prochain dessin."));
+		m_rule_remove_pb->setObjectName(QStringLiteral("m_rule_remove_pb"));
+		if (ui->m_definition_groupe && ui->m_definition_groupe->layout()) {
+			ui->m_definition_groupe->layout()->addWidget(m_rule_remove_pb);
+		}
+		connect(m_rule_remove_pb, &QPushButton::clicked,
+				this, &SelectAutonumW::removeClicked);
+	}
+	if (m_rule_remove_pb) {
+		m_rule_remove_pb->setVisible(m_single_rule && m_rule_removable);
+	}
+}
+
+/**
+	@brief SelectAutonumW::setRuleRemovable
+	Whether the button which takes the whole rule away is worth showing:
+	it has nothing to do while this editor holds no rule at all, and it
+	would only be a button which does nothing.
+	@param can_remove true when a rule is there to be taken away
+*/
+void SelectAutonumW::setRuleRemovable(bool can_remove)
+{
+	m_rule_removable = can_remove;
+	if (m_rule_remove_pb) {
+		m_rule_remove_pb->setVisible(m_single_rule && can_remove);
+	}
+}
+
+/**
+	@brief SelectAutonumW::isValid
+	@return true when there is at least one variable in the editor and
+	every one of them holds what it needs. An editor which has only just
+	been opened holds an empty rule, and an empty rule is not one.
+*/
+bool SelectAutonumW::isValid()
+{
+	if (num_part_list_.isEmpty()) return false;
+	for (NumPartEditorW *npe : num_part_list_) {
+		if (!npe || !npe->isValid()) return false;
+	}
+	return true;
+}
+
 /**
 	@brief SelectAutonumW::on_buttonBox_clicked
 	Action on button clicked
@@ -252,6 +340,32 @@ void SelectAutonumW::on_buttonBox_clicked(QAbstractButton *button)
 							   ));
 				break;
 			}
+			else if (m_edited_type == 3)
+			{
+				QMessageBox::information (
+							this,
+							tr("Câble Autonumérotation",
+							   "title window"),
+							tr("C'est ici que vous pouvez définir la manière dont seront numérotés les nouveaux câbles.\n"
+							   "-Une numérotation est composée d'une variable minimum.\n"
+							   "-Vous pouvez ajouter ou supprimer une variable de numérotation par le biais des boutons - et +.\n"
+							   "-Une variable de numérotation comprend : un type, une valeur et une incrémentation.\n"
+
+							   "\n-les types \"Chiffre 1\", \"Chiffre 01\" et \"Chiffre 001\", représentent un type numérique défini dans le champ \"Valeur\", "
+							   "qui s'incrémente à chaque nouveau câble de la valeur du champ \"Incrémentation\".\n"
+							   "-\"Chiffre 01\" et \"Chiffre 001\", sont respectivement représentés sur le schéma par deux et trois digits minimum.\n"
+							   "Si le chiffre défini dans le champ Valeur possède moins de digits que le type choisi,"
+							   "celui-ci sera précédé par un ou deux 0 afin de respecter son type.\n"
+
+							   "\n-Le type \"Texte\", représente un texte fixe.\nLe champ \"Incrémentation\" n'est pas utilisé.\n"
+
+							   "\n-Le type \"N° folio\" représente le n° du folio en cours.\nLes autres champs ne sont pas utilisés.\n"
+
+							   "\n-Le type \"Folio\" représente le nom du folio en cours.\nLes autres champs ne sont pas utilisés.",
+							   "help dialog about the cable autonumerotation"
+							   ));
+				break;
+			}
 			else
 			{
 				QMessageBox::information (
@@ -282,6 +396,9 @@ void SelectAutonumW::on_buttonBox_clicked(QAbstractButton *button)
 		case QDialogButtonBox::ApplyRole:
 			applyEnable(false);
 			emit applyPressed();
+				//Whatever was edited is written now, so there is
+				//nothing of it left for a later save to write again.
+			m_dirty = false;
 			break;
 	};
 }