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

Add warning for subcomponents that mass/CG/CD is overridden by parent

Browse Source
This commit is contained in:
SiboVG 2022-11-08 16:51:39 +01:00
parent 4e1c0f15fb
commit a3776ddec0
1 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
View File

@ -355,6 +355,7 @@ public class RocketComponentConfig extends JPanel {
//// Override the mass, center of gravity, or drag coeficient of the component //// Override the mass, center of gravity, or drag coeficient of the component
JCheckBox check; JCheckBox check;
JCheckBox checkSub;
BooleanModel bm; BooleanModel bm;
UnitSelector us; UnitSelector us;
BasicSlider bs; BasicSlider bs;
@ -371,15 +372,27 @@ public class RocketComponentConfig extends JPanel {
////// Override subcomponents ////// Override subcomponents
BooleanModel bmSubcomp = new BooleanModel(component, "SubcomponentsOverriddenMass"); BooleanModel bmSubcomp = new BooleanModel(component, "SubcomponentsOverriddenMass");
check = new JCheckBox(bmSubcomp); checkSub = new JCheckBox(bmSubcomp);
check.setText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents")); checkSub.setText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents"));
Font smallFont = check.getFont(); Font smallFont = checkSub.getFont();
smallFont = smallFont.deriveFont(smallFont.getSize2D() - 1); smallFont = smallFont.deriveFont(smallFont.getSize2D() - 1);
check.setFont(smallFont); checkSub.setFont(smallFont);
check.setToolTipText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents.Mass.ttip")); checkSub.setToolTipText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents.Mass.ttip"));
bm.addEnableComponent(check, true); bm.addEnableComponent(checkSub, true);
checkboxes.add(check, "gapleft 25lp, wrap"); checkboxes.add(checkSub, "gapleft 25lp, wrap");
order.add(check); order.add(checkSub);
////// Mass overridden by
if (component.getMassOverriddenBy() != null) {
StyledLabel labelMassOverriddenBy = new StyledLabel(
String.format(trans.get("RocketCompCfg.lbl.MassOverriddenBy"), component.getMassOverriddenBy().getName()),
0, StyledLabel.Style.BOLD);
labelMassOverriddenBy.setFontColor(net.sf.openrocket.util.Color.DARK_RED.toAWTColor());
labelMassOverriddenBy.setToolTipText(
String.format(trans.get("RocketCompCfg.lbl.MassOverriddenBy.ttip"), component.getMassOverriddenBy().getName()));
checkboxes.add(labelMassOverriddenBy, "gapleft 25lp, wrap");
check.setEnabled(false);
}
panel.add(checkboxes, "growx 1, gapright 20lp"); panel.add(checkboxes, "growx 1, gapright 20lp");
@ -413,13 +426,25 @@ public class RocketComponentConfig extends JPanel {
////// Override subcomponents ////// Override subcomponents
bmSubcomp = new BooleanModel(component, "SubcomponentsOverriddenCG"); bmSubcomp = new BooleanModel(component, "SubcomponentsOverriddenCG");
check = new JCheckBox(bmSubcomp); checkSub = new JCheckBox(bmSubcomp);
check.setText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents")); checkSub.setText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents"));
check.setFont(smallFont); checkSub.setFont(smallFont);
check.setToolTipText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents.CG.ttip")); checkSub.setToolTipText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents.CG.ttip"));
bm.addEnableComponent(check, true); bm.addEnableComponent(checkSub, true);
checkboxes.add(check, "gapleft 25lp, wrap"); checkboxes.add(checkSub, "gapleft 25lp, wrap");
order.add(check); order.add(checkSub);
////// CG overridden by
if (component.getCGOverriddenBy() != null) {
StyledLabel labelCGOverriddenBy = new StyledLabel(
String.format(trans.get("RocketCompCfg.lbl.CGOverriddenBy"), component.getCGOverriddenBy().getName()),
0, StyledLabel.Style.BOLD);
labelCGOverriddenBy.setFontColor(net.sf.openrocket.util.Color.DARK_RED.toAWTColor());
labelCGOverriddenBy.setToolTipText(
String.format(trans.get("RocketCompCfg.lbl.CGOverriddenBy.ttip"), component.getCGOverriddenBy().getName()));
checkboxes.add(labelCGOverriddenBy, "gapleft 25lp, wrap");
check.setEnabled(false);
}
panel.add(checkboxes, "growx 1, gapright 20lp"); panel.add(checkboxes, "growx 1, gapright 20lp");
@ -484,13 +509,25 @@ public class RocketComponentConfig extends JPanel {
////// Override subcomponents ////// Override subcomponents
bmSubcomp = new BooleanModel(component, "SubcomponentsOverriddenCD"); bmSubcomp = new BooleanModel(component, "SubcomponentsOverriddenCD");
check = new JCheckBox(bmSubcomp); checkSub = new JCheckBox(bmSubcomp);
check.setText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents")); checkSub.setText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents"));
check.setFont(smallFont); checkSub.setFont(smallFont);
check.setToolTipText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents.CD.ttip")); checkSub.setToolTipText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents.CD.ttip"));
bm.addEnableComponent(check, true); bm.addEnableComponent(checkSub, true);
checkboxes.add(check, "gapleft 25lp, wrap"); checkboxes.add(checkSub, "gapleft 25lp, wrap");
order.add(check); order.add(checkSub);
////// CG overridden by
if (component.getCDOverriddenBy() != null) {
StyledLabel labelCDOverriddenBy = new StyledLabel(
String.format(trans.get("RocketCompCfg.lbl.CDOverriddenBy"), component.getCDOverriddenBy().getName()),
0, StyledLabel.Style.BOLD);
labelCDOverriddenBy.setFontColor(net.sf.openrocket.util.Color.DARK_RED.toAWTColor());
labelCDOverriddenBy.setToolTipText(
String.format(trans.get("RocketCompCfg.lbl.CDOverriddenBy"), component.getCDOverriddenBy().getName()));
checkboxes.add(labelCDOverriddenBy, "gapleft 25lp, wrap");
check.setEnabled(false);
}
panel.add(checkboxes, "growx 1, gapright 20lp"); panel.add(checkboxes, "growx 1, gapright 20lp");