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

Fine-tune SimulationEditDialog

Browse Source
This commit is contained in:
Sampo Niskanen 2013-06-13 16:54:01 +03:00
parent 92ae04f85a
commit 0114448ea8
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,6 +386,10 @@ simedtdlg.IntensityDesc.High = High
simedtdlg.IntensityDesc.Veryhigh = Very high simedtdlg.IntensityDesc.Veryhigh = Very high
simedtdlg.IntensityDesc.Extreme = Extreme simedtdlg.IntensityDesc.Extreme = Extreme
SimulationEditDialog.btn.plot = Plot
SimulationEditDialog.btn.edit = Edit
SimulationEditDialog.btn.simulateAndPlot = Simulate & Plot
GeodeticComputationStrategy.flat.name = Flat Earth GeodeticComputationStrategy.flat.name = Flat Earth
GeodeticComputationStrategy.flat.desc = Perform computations with a flat Earth approximation. Sufficient for low-altitude flights. GeodeticComputationStrategy.flat.desc = Perform computations with a flat Earth approximation. Sufficient for low-altitude flights.
GeodeticComputationStrategy.spherical.name = Spherical approximation GeodeticComputationStrategy.spherical.name = Spherical approximation

22
core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java
View File

@ -108,8 +108,10 @@ public class SimulationEditDialog extends JDialog {
JPanel simEditPanel = new JPanel(new MigLayout("fill")); JPanel simEditPanel = new JPanel(new MigLayout("fill"));
if (isSingleEdit()) { if (isSingleEdit()) {
JPanel panel = new JPanel(new MigLayout("fill, ins 0"));
//// Simulation name: //// Simulation name:
simEditPanel.add(new JLabel(trans.get("simedtdlg.lbl.Simname") + " "), "span, split 2, shrink"); panel.add(new JLabel(trans.get("simedtdlg.lbl.Simname") + " "), "growx 0, gapright para");
final JTextField field = new JTextField(simulation[0].getName()); final JTextField field = new JTextField(simulation[0].getName());
field.getDocument().addDocumentListener(new DocumentListener() { field.getDocument().addDocumentListener(new DocumentListener() {
@Override @Override
@ -136,14 +138,14 @@ public class SimulationEditDialog extends JDialog {
} }
}); });
simEditPanel.add(field, "shrinky, growx, wrap"); panel.add(field, "growx, wrap");
//// Flight selector //// Flight selector
//// Flight configuration: //// Flight configuration:
JLabel label = new JLabel(trans.get("simedtdlg.lbl.Flightcfg")); JLabel label = new JLabel(trans.get("simedtdlg.lbl.Flightcfg"));
//// Select the motor configuration to use. //// Select the motor configuration to use.
label.setToolTipText(trans.get("simedtdlg.lbl.ttip.Flightcfg")); label.setToolTipText(trans.get("simedtdlg.lbl.ttip.Flightcfg"));
simEditPanel.add(label, "span, split 2, shrink"); panel.add(label, "growx 0, gapright para");
JComboBox combo = new JComboBox(new FlightConfigurationModel(configuration)); JComboBox combo = new JComboBox(new FlightConfigurationModel(configuration));
//// Select the motor configuration to use. //// Select the motor configuration to use.
@ -154,7 +156,7 @@ public class SimulationEditDialog extends JDialog {
conditions.setMotorConfigurationID(configuration.getFlightConfigurationID()); conditions.setMotorConfigurationID(configuration.getFlightConfigurationID());
} }
}); });
simEditPanel.add(combo, "split 2, shrink"); panel.add(combo, "span, split");
//// Edit button //// Edit button
JButton button = new JButton(trans.get("simedtdlg.but.FlightcfgEdit")); JButton button = new JButton(trans.get("simedtdlg.but.FlightcfgEdit"));
@ -165,7 +167,11 @@ public class SimulationEditDialog extends JDialog {
configDialog.setVisible(true); configDialog.setVisible(true);
} }
}); });
simEditPanel.add(button, "shrink, align left, wrap"); panel.add(button, "align left");
panel.add(new JPanel(), "growx, wrap");
simEditPanel.add(panel, "growx, wrap");
} }
JTabbedPane tabbedPane = new JTabbedPane(); JTabbedPane tabbedPane = new JTabbedPane();
@ -180,7 +186,7 @@ public class SimulationEditDialog extends JDialog {
//// Open Plot button //// Open Plot button
JButton button = new JButton("<<Plot"); JButton button = new JButton(trans.get("SimulationEditDialog.btn.plot") + " >>");
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@Override @Override
@ -197,7 +203,7 @@ public class SimulationEditDialog extends JDialog {
} }
//// Run simulation button //// Run simulation button
button = new JButton(trans.get("simedtdlg.but.runsimulation")); button = new JButton(trans.get("SimulationEditDialog.btn.simulateAndPlot"));
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -246,7 +252,7 @@ public class SimulationEditDialog extends JDialog {
plotExportPanel.add(tabbedPane, "grow, wrap"); plotExportPanel.add(tabbedPane, "grow, wrap");
JButton button = new JButton("<<Edit"); JButton button = new JButton("<< " + trans.get("SimulationEditDialog.btn.edit"));
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@Override @Override