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

Added buttons to the edit and plot dialogs to switch to the other one.

Browse Source
This commit is contained in:
kruland2607 2013-05-27 16:54:09 -05:00
parent 9a43a01663
commit 02f3f48f3a
4 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/net/sf/openrocket/document/Simulation.java
View File

@ -374,7 +374,21 @@ public class Simulation implements ChangeSource, Cloneable {
return simulatedData; return simulatedData;
} }
/**
* Return true if this simulation contains plotable flight data.
*
* @return
*/
public boolean hasSimulationData() {
FlightData data = getSimulatedData();
if (data == null) {
return false;
}
if (data.getBranchCount() == 0) {
return false;
}
return true;
}
/** /**
* Returns a copy of this simulation suitable for cut/copy/paste operations. * Returns a copy of this simulation suitable for cut/copy/paste operations.

2
core/src/net/sf/openrocket/gui/main/SimulationPanel.java
View File

@ -228,7 +228,7 @@ public class SimulationPanel extends JPanel {
Simulation sim = document.getSimulations().get(selected); Simulation sim = document.getSimulations().get(selected);
if (sim.getSimulatedData() == null || sim.getSimulatedData().getBranchCount() == 0) { if (!sim.hasSimulationData()) {
new SimulationRunDialog(SwingUtilities.getWindowAncestor( new SimulationRunDialog(SwingUtilities.getWindowAncestor(
SimulationPanel.this), document, sim).setVisible(true); SimulationPanel.this), document, sim).setVisible(true);
} }

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

@ -149,11 +149,28 @@ public class SimulationEditDialog extends JDialog {
mainPanel.add(tabbedPane, "spanx, grow, wrap"); mainPanel.add(tabbedPane, "spanx, grow, wrap");
// Buttons //// Open Plot button
mainPanel.add(new JPanel(), "spanx, split, growx"); JButton button = new JButton("<<Plot");
button.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
SimulationEditDialog.this.dispose();
SimulationPlotExportDialog plot = new SimulationPlotExportDialog(SimulationEditDialog.this.parentWindow,
SimulationEditDialog.this.document, SimulationEditDialog.this.simulation[0]);
plot.setVisible(true);
}
});
mainPanel.add(button, "spanx, split 3, align left");
if (sims.length == 1 && sims[0].hasSimulationData()) {
button.setVisible(true);
} else {
button.setVisible(false);
}
//// Run simulation button //// Run simulation button
JButton button = new JButton(trans.get("simedtdlg.but.runsimulation")); button = new JButton(trans.get("simedtdlg.but.runsimulation"));
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -162,7 +179,7 @@ public class SimulationEditDialog extends JDialog {
SimulationRunDialog.runSimulations(parentWindow, SimulationEditDialog.this.document, simulation); SimulationRunDialog.runSimulations(parentWindow, SimulationEditDialog.this.document, simulation);
} }
}); });
mainPanel.add(button, "gapright para"); mainPanel.add(button, " align right, tag ok");
//// Close button //// Close button
JButton close = new JButton(trans.get("dlg.but.close")); JButton close = new JButton(trans.get("dlg.but.close"));
@ -173,7 +190,7 @@ public class SimulationEditDialog extends JDialog {
SimulationEditDialog.this.dispose(); SimulationEditDialog.this.dispose();
} }
}); });
mainPanel.add(close, ""); mainPanel.add(close, "tag ok");
this.add(mainPanel); this.add(mainPanel);

18
core/src/net/sf/openrocket/gui/simulation/SimulationPlotExportDialog.java
View File

@ -24,7 +24,7 @@ public class SimulationPlotExportDialog extends JDialog {
private final Simulation simulation; private final Simulation simulation;
private static final Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();
public SimulationPlotExportDialog(Window parent, OpenRocketDocument document, Simulation s) { public SimulationPlotExportDialog(Window parent, final OpenRocketDocument document, Simulation s) {
//// Plot/Export simulation //// Plot/Export simulation
super(parent, trans.get("simedtdlg.title.Editsim"), JDialog.ModalityType.DOCUMENT_MODAL); super(parent, trans.get("simedtdlg.title.Editsim"), JDialog.ModalityType.DOCUMENT_MODAL);
this.parentWindow = parent; this.parentWindow = parent;
@ -49,6 +49,21 @@ public class SimulationPlotExportDialog extends JDialog {
mainPanel.add(tabbedPane, "grow, wrap"); mainPanel.add(tabbedPane, "grow, wrap");
JButton button = new JButton("<<Edit");
button.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
SimulationPlotExportDialog.this.dispose();
SimulationEditDialog edit = new SimulationEditDialog(SimulationPlotExportDialog.this.parentWindow,
document, SimulationPlotExportDialog.this.simulation);
edit.setVisible(true);
}
});
mainPanel.add(button, "spanx, split 3, align left");
JButton ok = new JButton(trans.get("dlg.but.ok")); JButton ok = new JButton(trans.get("dlg.but.ok"));
ok.addActionListener(new ActionListener() { ok.addActionListener(new ActionListener() {
@Override @Override
@ -87,5 +102,4 @@ public class SimulationPlotExportDialog extends JDialog {
GUIUtil.setDisposableDialogOptions(this, close); GUIUtil.setDisposableDialogOptions(this, close);
} }
} }