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

Merge pull request #2395 from isaacjones99/issue-2258

Browse Source 
[2258] Changed the static text box in the component analysis dialog to a JSpinner
This commit is contained in:
Joe Pfeiffer 2023-11-17 09:04:36 -07:00 committed by GitHub
commit a0a1ab58de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
View File

@ -49,6 +49,7 @@ import net.sf.openrocket.gui.adaptors.Column;
import net.sf.openrocket.gui.adaptors.ColumnTable; import net.sf.openrocket.gui.adaptors.ColumnTable;
import net.sf.openrocket.gui.adaptors.ColumnTableModel; import net.sf.openrocket.gui.adaptors.ColumnTableModel;
import net.sf.openrocket.gui.adaptors.DoubleModel; import net.sf.openrocket.gui.adaptors.DoubleModel;
import net.sf.openrocket.gui.components.EditableSpinner;
import net.sf.openrocket.gui.components.BasicSlider; import net.sf.openrocket.gui.components.BasicSlider;
import net.sf.openrocket.gui.components.ConfigurationComboBox; import net.sf.openrocket.gui.components.ConfigurationComboBox;
import net.sf.openrocket.gui.components.StageSelector; import net.sf.openrocket.gui.components.StageSelector;
@ -113,7 +114,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
JTable table; JTable table;
JPanel panel = new JPanel(new MigLayout("fill", "[120lp][70lp][]")); JPanel panel = new JPanel(new MigLayout("fill", "[120lp][70lp][50lp][]"));
add(panel); add(panel);
rkt = rocketPanel.getDocument().getRocket(); rkt = rocketPanel.getDocument().getRocket();
@ -134,7 +135,9 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
//// Wind direction: //// Wind direction:
panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.winddir"))); panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.winddir")));
panel.add(new UnitSelector(theta, true), "width 50lp!"); EditableSpinner spinner = new EditableSpinner(theta.getSpinnerModel());
panel.add(spinner, "growx");
panel.add(new UnitSelector(theta));
BasicSlider slider = new BasicSlider(theta.getSliderModel(0, 2 * Math.PI)); BasicSlider slider = new BasicSlider(theta.getSliderModel(0, 2 * Math.PI));
panel.add(slider, "growx, split 2"); panel.add(slider, "growx, split 2");
//// Worst button //// Worst button
@ -165,17 +168,20 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
////Angle of attack: ////Angle of attack:
panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack"))); panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack")));
panel.add(new UnitSelector(aoa, true), "width 50lp!"); panel.add(new EditableSpinner(aoa.getSpinnerModel()), "growx");
panel.add(new UnitSelector(aoa));
panel.add(new BasicSlider(aoa.getSliderModel(0, Math.PI)), "growx, wrap"); panel.add(new BasicSlider(aoa.getSliderModel(0, Math.PI)), "growx, wrap");
//// Mach number: //// Mach number:
panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.machnumber"))); panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.machnumber")));
panel.add(new UnitSelector(mach, true), "width 50lp!"); panel.add(new EditableSpinner(mach.getSpinnerModel()));
panel.add(new UnitSelector(mach));
panel.add(new BasicSlider(mach.getSliderModel(0, 3)), "growx, wrap"); panel.add(new BasicSlider(mach.getSliderModel(0, 3)), "growx, wrap");
//// Roll rate: //// Roll rate:
panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.rollrate"))); panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.rollrate")));
panel.add(new UnitSelector(roll, true), "width 50lp!"); panel.add(new EditableSpinner(roll.getSpinnerModel()), "growx");
panel.add(new UnitSelector(roll));
panel.add(new BasicSlider(roll.getSliderModel(-20 * 2 * Math.PI, 20 * 2 * Math.PI)), panel.add(new BasicSlider(roll.getSliderModel(-20 * 2 * Math.PI, 20 * 2 * Math.PI)),
"growx, wrap"); "growx, wrap");