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

[fixes #897] Permanently enable stage button

Browse Source
This commit is contained in:
Sibo Van Gool 2021-08-11 20:26:10 +02:00
parent 3d7fb20ae9
commit 30bb320d67
4 changed files with 141 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,6 +273,7 @@ pref.dlg.ttip.DefaultMach1 = <HTML><b>This setting will take effect the next tim
pref.dlg.ttip.DefaultMach2 = To change the CP Mach number during this session use Tools->Component Analysis. pref.dlg.ttip.DefaultMach2 = To change the CP Mach number during this session use Tools->Component Analysis.
pref.dlg.lbl.Positiontoinsert = Position to insert new body components: pref.dlg.lbl.Positiontoinsert = Position to insert new body components:
pref.dlg.lbl.PositiontoinsertStages = Position to insert new stages:
pref.dlg.lbl.Confirmdeletion = Confirm deletion of simulations. pref.dlg.lbl.Confirmdeletion = Confirm deletion of simulations.
pref.dlg.checkbox.Runsimulations = Run out-dated simulations when you open the simulation tab. pref.dlg.checkbox.Runsimulations = Run out-dated simulations when you open the simulation tab.
pref.dlg.checkbox.Updateestimates = Update estimated flight parameters in design window pref.dlg.checkbox.Updateestimates = Update estimated flight parameters in design window
@ -684,8 +685,10 @@ compaddbuttons.MassComponent = Mass\nComponent
compaddbuttons.MassComponents = Mass Components compaddbuttons.MassComponents = Mass Components
compaddbuttons.Donotaskmeagain = Do not ask me again compaddbuttons.Donotaskmeagain = Do not ask me again
compaddbuttons.Selectcomppos = Select component position compaddbuttons.Selectcomppos = Select component position
compaddbuttons.Selectstagepos = Select stage position
compaddbuttons.lbl.Youcanchange = You can change the default operation in the preferences. compaddbuttons.lbl.Youcanchange = You can change the default operation in the preferences.
compaddbuttons.lbl.insertcomp = Insert the component after the current component or as the last component? compaddbuttons.lbl.insertcomp = Insert the component after the current component or as the last component?
compaddbuttons.lbl.insertstage = Insert the stage after the current stage or as the last stage?
compaddbuttons.askPosition.Inserthere = Insert here compaddbuttons.askPosition.Inserthere = Insert here
compaddbuttons.askPosition.Addtotheend = Add to the end compaddbuttons.askPosition.Addtotheend = Add to the end
compaddbuttons.askPosition.Cancel = Cancel compaddbuttons.askPosition.Cancel = Cancel

1
core/src/net/sf/openrocket/startup/Preferences.java
View File

@ -40,6 +40,7 @@ public abstract class Preferences implements ChangeSource {
* There are other strings out there in the source as well. * There are other strings out there in the source as well.
*/ */
public static final String BODY_COMPONENT_INSERT_POSITION_KEY = "BodyComponentInsertPosition"; public static final String BODY_COMPONENT_INSERT_POSITION_KEY = "BodyComponentInsertPosition";
public static final String STAGE_INSERT_POSITION_KEY = "StageInsertPosition";
public static final String USER_THRUST_CURVES_KEY = "UserThrustCurves"; public static final String USER_THRUST_CURVES_KEY = "UserThrustCurves";
public static final String DEFAULT_MACH_NUMBER = "DefaultMachNumber"; public static final String DEFAULT_MACH_NUMBER = "DefaultMachNumber";

14
swing/src/net/sf/openrocket/gui/dialogs/preferences/DesignPreferencesPanel.java
View File

@ -33,6 +33,20 @@ public class DesignPreferencesPanel extends PreferencesPanel {
.get("pref.dlg.PrefChoiseSelector3"))), .get("pref.dlg.PrefChoiseSelector3"))),
"wrap para, growx, sg combos"); "wrap para, growx, sg combos");
// // Position to insert new stages:
this.add(new JLabel(trans.get("pref.dlg.lbl.PositiontoinsertStages")),
"gapright para");
this.add(
new JComboBox<Object>(new PrefChoiceSelector(
Preferences.STAGE_INSERT_POSITION_KEY,
// // Always ask
// // Insert in middle
// // Add to end
trans.get("pref.dlg.PrefChoiseSelector1"), trans
.get("pref.dlg.PrefChoiseSelector2"), trans
.get("pref.dlg.PrefChoiseSelector3"))),
"wrap para, growx, sg combos");
// Font size of information in panel window // Font size of information in panel window
this.add(new JLabel(trans.get("pref.dlg.lbl.Rocketinfofontsize")), this.add(new JLabel(trans.get("pref.dlg.lbl.Rocketinfofontsize")),
"gapright para"); "gapright para");

125
swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
View File

@ -122,7 +122,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
//// Component Assembly Components: //// Component Assembly Components:
addButtonGroup(row, addButtonGroup(row,
new ComponentButton(AxialStage.class, trans.get("compaddbuttons.AxialStage")), new StageButton(AxialStage.class, trans.get("compaddbuttons.AxialStage")),
new ComponentButton(ParallelStage.class, trans.get("compaddbuttons.ParallelStage")), new ComponentButton(ParallelStage.class, trans.get("compaddbuttons.ParallelStage")),
new ComponentButton(PodSet.class, trans.get("compaddbuttons.Pods"))); new ComponentButton(PodSet.class, trans.get("compaddbuttons.Pods")));
row++; row++;
@ -627,7 +627,128 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
} }
/**
* A class suitable for the Stage component.
* If a stage component or any of its subcomponents is selected and there is already a stage after the
* selected stage or parent stage, then a popup window will ask whether the user wants to insert the stage
* at the end or between the two stages.
* In any other case, the new stage will be added to the end of the component tree
*/
private class StageButton extends ComponentButton {
public StageButton(String text) {
super(text);
}
public StageButton(String text, Icon enabled, Icon disabled) {
super(text, enabled, disabled);
}
public StageButton(Class<? extends RocketComponent> c, String text) {
super(c, text);
}
@Override
public boolean isAddable(RocketComponent c) {
return true;
}
@Override
public Pair<RocketComponent, Integer> getAdditionPosition(RocketComponent c) {
if (c == null || c instanceof Rocket) {
// Add to the end
return new Pair<RocketComponent, Integer>(document.getRocket(), null);
}
RocketComponent parentStage = null;
if (c instanceof AxialStage)
parentStage = c;
else {
parentStage = c.getStage();
}
if (parentStage == null) {
throw new BugException("Component " + c.getComponentName() + " has no parent stage");
}
// Check whether to insert between or at the end.
// 0 = ask, 1 = in between, 2 = at the end
int pos = Application.getPreferences().getChoice(Preferences.STAGE_INSERT_POSITION_KEY, 2, 0);
if (pos == 0) {
if (document.getRocket().getChildPosition(parentStage) == document.getRocket().getChildCount() - 1)
pos = 2; // Selected component is the last component
else
pos = askPosition();
}
switch (pos) {
case 0:
// Cancel
return null;
case 1:
// Insert after current stage
return new Pair<RocketComponent, Integer>(document.getRocket(), document.getRocket().getChildPosition(parentStage) + 1);
case 2:
// Insert at the end
return new Pair<RocketComponent, Integer>(document.getRocket(), null);
default:
Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos);
return null;
}
}
private int askPosition() {
//// Insert here
//// Add to the end
//// Cancel
Object[] options = { trans.get("compaddbuttons.askPosition.Inserthere"),
trans.get("compaddbuttons.askPosition.Addtotheend"),
trans.get("compaddbuttons.askPosition.Cancel") };
JPanel panel = new JPanel(new MigLayout());
//// Do not ask me again
JCheckBox check = new JCheckBox(trans.get("compaddbuttons.Donotaskmeagain"));
panel.add(check, "wrap");
//// You can change the default operation in the preferences.
panel.add(new StyledLabel(trans.get("compaddbuttons.lbl.Youcanchange"), -2));
int sel = JOptionPane.showOptionDialog(null, // parent component
//// Insert the component after the current component or as the last component?
new Object[] {
trans.get("compaddbuttons.lbl.insertstage"),
panel },
//// Select component position
trans.get("compaddbuttons.Selectstagepos"), // title
JOptionPane.DEFAULT_OPTION, // default selections
JOptionPane.QUESTION_MESSAGE, // dialog type
null, // icon
options, // options
options[0]); // initial value
switch (sel) {
case JOptionPane.CLOSED_OPTION:
case 2:
// Cancel
return 0;
case 0:
// Insert
sel = 1;
break;
case 1:
// Add
sel = 2;
break;
default:
Application.getExceptionHandler().handleErrorCondition("ERROR: JOptionPane returned " + sel);
return 0;
}
if (check.isSelected()) {
// Save the preference
Application.getPreferences().putInt(Preferences.STAGE_INSERT_POSITION_KEY, sel);
}
return sel;
}
}
///////// Scrolling functionality ///////// Scrolling functionality