From 52b582db69e0a5df10a097ff288aaa308a024d08 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 12 Oct 2022 17:29:38 +0200 Subject: [PATCH] Add motor designation to motor selection table --- core/resources/l10n/messages.properties | 1 + .../motor/thrustcurve/ThrustCurveMotorColumns.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index f320aa563..318668bf8 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1696,6 +1696,7 @@ FlightEvent.Type.EXCEPTION = Exception ! ThrustCurveMotorColumns TCurveMotorCol.MANUFACTURER = Manufacturer TCurveMotorCol.COMMON_NAME = Name +TCurveMotorCol.DESIGNATION = Designation TCurveMotorCol.CASEINFO = Case TCurveMotorCol.DIAMETER = Diameter TCurveMotorCol.LENGTH = Length diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java index c502bc817..ad5319cb3 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java @@ -42,6 +42,18 @@ enum ThrustCurveMotorColumns { return new DesignationComparator(); } }, + //// Designation + DESIGNATION("TCurveMotorCol.DESIGNATION") { + @Override + public String getValue(ThrustCurveMotorSet m) { + return m.getDesignation(); + } + + @Override + public Comparator getComparator() { + return new DesignationComparator(); + } + }, //// TotalImpulse TOTAL_IMPULSE("TCurveMotorCol.TOTAL_IMPULSE") { @Override