Merge branch 'feature/general-tab-contact-count' into feature/per-type-contact-budget

# Conflicts:
#	sources/ui/elementpropertieswidget.cpp

sources/contactusage.h

@@ -29,6 +29,12 @@
 	rules can be unit tested on their own. MasterElement::contactUsage()
 	is the thin wrapper that feeds it the linked elements.
 
+	This counts contacts, which is what tells you how many contacts an
+	auxiliary block must provide. It is deliberately not the count that
+	MasterElement::isFull() uses: a master's max_slaves is a number of
+	slots, and a slave fills exactly one slot however many contacts it
+	carries.
+
 	Two rules are easy to get wrong, and both live here so that every
 	caller gets them right:
 	 - a slave stands for as many contacts as its "number" kind

sources/qetgraphicsitem/masterelement.cpp

@@ -314,8 +314,11 @@ bool MasterElement::isFull() const
 		return false;
 	}
 
-	// Return true if the contacts already used reached or exceeded the limit
-	return contactUsage().total() >= max_slaves;
+		// max_slaves is a number of slots, not of contacts: it sizes the
+		// element's contact group table, and a slave occupies exactly one
+		// group however many contacts that group stands for. So the slots
+		// in use are the linked elements, not the contacts they carry.
+	return connected_elements.size() >= max_slaves;
 }
 
 /**

sources/ui/elementpropertieswidget.cpp

@@ -390,18 +390,16 @@ QWidget *ElementPropertiesWidget::generalWidget()
 				? QString(tr("Nombre maximum de contacts esclaves définis : non défini\n"))
 				: QString(tr("Nombre maximum de contacts esclaves définis : %1\n")).arg(max_slaves);
 
-			//Counted in contacts rather than in linked elements, so that a
-			//slave standing for several contacts is reported as the number
-			//of contacts it actually uses.
+			//Left as a count of linked elements: the line above is a number
+			//of slots, and a slave fills one slot however many contacts it
+			//carries, so the two stay in the same unit.
+		description_string += QString(tr("Nombre de contacts esclaves utilisés : %1\n")).arg(m_element->linkedElements().count());
+
+			//The breakdown below is in contacts, not slots: it answers how
+			//many contacts an auxiliary block must provide.
 		const MasterElement *master =
 				static_cast<const MasterElement *>(m_element.data());
-		const ContactUsage usage = master->contactUsage();
-
-		description_string += QString(tr("Nombre de contacts esclaves utilisés : %1\n")).arg(usage.total());
-
-			//The breakdown is what tells you which auxiliary block would
-			//satisfy this coil, so it is only worth printing once there is
-			//something to break down.
+		const ContactUsage usage    = master->contactUsage();
 		const ContactUsage capacity = master->contactCapacity();
 
 		if (capacity.total() > 0)
@@ -410,7 +408,7 @@ QWidget *ElementPropertiesWidget::generalWidget()
 				//only what has been used but what it has to offer. A type
 				//used beyond what is declared shows as e.g. "1/0", which
 				//is the point: it says this contact does not fit the part.
-			description_string += QString(tr("    NO : %1/%2, NC : %3/%4, inverseurs : %5/%6, autres : %7/%8\n"))
+			description_string += QString(tr("    Contacts : NO : %1/%2, NC : %3/%4, inverseurs : %5/%6, autres : %7/%8\n"))
 					.arg(usage.no).arg(capacity.no)
 					.arg(usage.nc).arg(capacity.nc)
 					.arg(usage.sw).arg(capacity.sw)
@@ -419,7 +417,7 @@ QWidget *ElementPropertiesWidget::generalWidget()
 		else if (usage.total() > 0)
 		{
 				//No declared groups, so a plain count of what is in use.
-			description_string += QString(tr("    NO : %1, NC : %2, inverseurs : %3, autres : %4\n"))
+			description_string += QString(tr("    Contacts : NO : %1, NC : %2, inverseurs : %3, autres : %4\n"))
 					.arg(usage.no)
 					.arg(usage.nc)
 					.arg(usage.sw)