From 4808ed0b2793fcdfe34610833c30944dba9eefc4 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Fri, 20 Aug 2021 15:05:03 -0600
Subject: [PATCH] Add designation to MotorInformationPanel

Use common name in MotorHolder (used to select specific thrust curve in ThrustCurveMotorSelectionPanel)
---
 core/resources/l10n/messages.properties              |  1 +
 .../gui/dialogs/motor/thrustcurve/MotorHolder.java   |  2 +-
 .../motor/thrustcurve/MotorInformationPanel.java     | 12 ++++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 42429aac9..bf401b330 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1212,6 +1212,7 @@ TCMotorSelPan.lbl.Selectthrustcurve = Select thrust curve:
 TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay:
 TCMotorSelPan.equalsIgnoreCase.None = None
 TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\")
+TCMotorSelPan.lbl.Designation = Designation:
 TCMotorSelPan.lbl.Totalimpulse = Total impulse:
 TCMotorSelPan.lbl.Avgthrust = Avg. thrust:
 TCMotorSelPan.lbl.Maxthrust = Max. thrust:
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java
index bb8113331..6c4fb6353 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java
@@ -22,7 +22,7 @@ class MotorHolder {
 	
 	@Override
 	public String toString() {
-		return motor.getDesignation();
+		return motor.getCommonName();
 	}
 	
 	@Override
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
index 72f3d8562..00d8e278c 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
@@ -50,7 +50,8 @@ class MotorInformationPanel extends JPanel {
 	private List<ThrustCurveMotor> selectedMotorSet;
 	// Selected motor
 	private ThrustCurveMotor selectedMotor;
-	
+
+	private final JLabel designationLabel;
 	private final JLabel totalImpulseLabel;
 	private final JLabel classificationLabel;
 	private final JLabel avgThrustLabel;
@@ -76,8 +77,13 @@ class MotorInformationPanel extends JPanel {
 		super(new MigLayout("fill"));
 		
 		// Thrust curve info
-		//// Total impulse:
 		{
+			//// Designation
+			this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Designation")));
+			designationLabel = new JLabel();
+			this.add(designationLabel, "wrap");
+		
+			//// Total impulse:
 			this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Totalimpulse")));
 			totalImpulseLabel = new JLabel();
 			this.add(totalImpulseLabel, "split");
@@ -223,6 +229,7 @@ class MotorInformationPanel extends JPanel {
 	public void clearData() {
 		selectedMotor = null;
 		selectedMotorSet = null;
+		designationLabel.setText("");
 		totalImpulseLabel.setText("");
 		totalImpulseLabel.setToolTipText(null);
 		classificationLabel.setText("");
@@ -254,6 +261,7 @@ class MotorInformationPanel extends JPanel {
 		this.selectedMotor = selectedMotor;
 
 		// Update thrust curve data
+		designationLabel.setText(selectedMotor.getDesignation());
 		double impulse = selectedMotor.getTotalImpulseEstimate();
 		MotorClass mc = MotorClass.getMotorClass(impulse);
 		totalImpulseLabel.setText(UnitGroup.UNITS_IMPULSE.getDefaultUnit().toStringUnit(impulse));