hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add designation to MotorInformationPanel

Browse Source 
Use common name in MotorHolder (used to select specific thrust curve in ThrustCurveMotorSelectionPanel)
This commit is contained in:
JoePfeiffer 2021-08-20 15:05:03 -06:00
parent 88f5d19185
commit 4808ed0b27
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages.properties
View File

@ -1212,6 +1212,7 @@ TCMotorSelPan.lbl.Selectthrustcurve = Select thrust curve:
TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay: TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay:
TCMotorSelPan.equalsIgnoreCase.None = None TCMotorSelPan.equalsIgnoreCase.None = None
TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\") TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\")
TCMotorSelPan.lbl.Designation = Designation:
TCMotorSelPan.lbl.Totalimpulse = Total impulse: TCMotorSelPan.lbl.Totalimpulse = Total impulse:
TCMotorSelPan.lbl.Avgthrust = Avg. thrust: TCMotorSelPan.lbl.Avgthrust = Avg. thrust:
TCMotorSelPan.lbl.Maxthrust = Max. thrust: TCMotorSelPan.lbl.Maxthrust = Max. thrust:

2
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java
View File

@ -22,7 +22,7 @@ class MotorHolder {
@Override @Override
public String toString() { public String toString() {
return motor.getDesignation(); return motor.getCommonName();
} }
@Override @Override

12
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
View File

@ -50,7 +50,8 @@ class MotorInformationPanel extends JPanel {
private List<ThrustCurveMotor> selectedMotorSet; private List<ThrustCurveMotor> selectedMotorSet;
// Selected motor // Selected motor
private ThrustCurveMotor selectedMotor; private ThrustCurveMotor selectedMotor;
private final JLabel designationLabel;
private final JLabel totalImpulseLabel; private final JLabel totalImpulseLabel;
private final JLabel classificationLabel; private final JLabel classificationLabel;
private final JLabel avgThrustLabel; private final JLabel avgThrustLabel;
@ -76,8 +77,13 @@ class MotorInformationPanel extends JPanel {
super(new MigLayout("fill")); super(new MigLayout("fill"));
// Thrust curve info // 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"))); this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Totalimpulse")));
totalImpulseLabel = new JLabel(); totalImpulseLabel = new JLabel();
this.add(totalImpulseLabel, "split"); this.add(totalImpulseLabel, "split");
@ -223,6 +229,7 @@ class MotorInformationPanel extends JPanel {
public void clearData() { public void clearData() {
selectedMotor = null; selectedMotor = null;
selectedMotorSet = null; selectedMotorSet = null;
designationLabel.setText("");
totalImpulseLabel.setText(""); totalImpulseLabel.setText("");
totalImpulseLabel.setToolTipText(null); totalImpulseLabel.setToolTipText(null);
classificationLabel.setText(""); classificationLabel.setText("");
@ -254,6 +261,7 @@ class MotorInformationPanel extends JPanel {
this.selectedMotor = selectedMotor; this.selectedMotor = selectedMotor;
// Update thrust curve data // Update thrust curve data
designationLabel.setText(selectedMotor.getDesignation());
double impulse = selectedMotor.getTotalImpulseEstimate(); double impulse = selectedMotor.getTotalImpulseEstimate();
MotorClass mc = MotorClass.getMotorClass(impulse); MotorClass mc = MotorClass.getMotorClass(impulse);
totalImpulseLabel.setText(UnitGroup.UNITS_IMPULSE.getDefaultUnit().toStringUnit(impulse)); totalImpulseLabel.setText(UnitGroup.UNITS_IMPULSE.getDefaultUnit().toStringUnit(impulse));