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

Merge pull request #1404 from SiboVG/issue-move-simbutt

Browse Source 
Move series selection in sim plot to the beginning
This commit is contained in:
SiboVG 2022-06-03 14:27:53 +02:00 committed by GitHub
commit 3148a25217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
swing/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java
View File

@ -84,6 +84,26 @@ public class SimulationPlotDialog extends JDialog {
}); });
panel.add(check, "split, left"); panel.add(check, "split, left");
//// Add series selection box
ArrayList<String> stages = new ArrayList<String>();
stages.add("All");
stages.addAll(Util.generateSeriesLabels(simulation));
final JComboBox<String> stageSelection = new JComboBox<>(stages.toArray(new String[0]));
stageSelection.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
int selectedStage = stageSelection.getSelectedIndex() - 1;
myPlot.setShowBranch(selectedStage);
}
});
if (stages.size() > 2) {
// Only show the combo box if there are at least 3 entries (ie, "All", "Main", and one other one)
panel.add(stageSelection, "gapleft rel");
}
//// Zoom in button //// Zoom in button
JButton button = new SelectColorButton(Icons.ZOOM_IN); JButton button = new SelectColorButton(Icons.ZOOM_IN);
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@ -134,29 +154,6 @@ public class SimulationPlotDialog extends JDialog {
}); });
panel.add(button, "gapleft rel"); panel.add(button, "gapleft rel");
//// Add series selection box
ArrayList<String> stages = new ArrayList<String>();
stages.add("All");
stages.addAll(Util.generateSeriesLabels(simulation));
final JComboBox stageSelection = new JComboBox(stages.toArray(new String[0]));
stageSelection.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
int selectedStage = stageSelection.getSelectedIndex() - 1;
myPlot.setShowBranch(selectedStage);
}
});
if (stages.size() > 2) {
// Only show the combo box if there are at least 3 entries (ie, "All", "Main", and one other one
panel.add(stageSelection, "gapleft rel");
}
//// Spacer for layout to push close button to the right.
panel.add(new JPanel(), "growx");
//// Close button //// Close button
button = new SelectColorButton(trans.get("dlg.but.close")); button = new SelectColorButton(trans.get("dlg.but.close"));
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@ -165,7 +162,7 @@ public class SimulationPlotDialog extends JDialog {
SimulationPlotDialog.this.dispose(); SimulationPlotDialog.this.dispose();
} }
}); });
panel.add(button, "right"); panel.add(button, "gapbefore push, right");
this.setLocationByPlatform(true); this.setLocationByPlatform(true);
this.pack(); this.pack();