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

Merge pull request #1762 from SiboVG/issue-1761

Browse Source 
[#1761] Fix Transition/Nose cone shape parameter resetting
This commit is contained in:
Sibo Van Gool 2022-10-21 15:59:01 +02:00 committed by GitHub
commit 3f55f5c67d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/rocketcomponent/Transition.java
View File

@ -257,7 +257,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
if (type == null) { if (type == null) {
throw new IllegalArgumentException("setType called with null argument"); throw new IllegalArgumentException("setType called with null argument");
} }
if ((this.type == type) && (this.clipped == type.isClippable()) && (this.shapeParameter == type.defaultParameter()))
if (this.type == type)
return; return;
this.type = type; this.type = type;
this.clipped = type.isClippable(); this.clipped = type.isClippable();
@ -687,6 +688,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
if ( preset.has(ComponentPreset.SHAPE) ) { if ( preset.has(ComponentPreset.SHAPE) ) {
Shape s = preset.get(ComponentPreset.SHAPE); Shape s = preset.get(ComponentPreset.SHAPE);
this.setType(s); this.setType(s);
this.setClipped(s.canClip);
this.setShapeParameter(s.defaultParameter());
} }
if ( preset.has(ComponentPreset.AFT_OUTER_DIAMETER) ) { if ( preset.has(ComponentPreset.AFT_OUTER_DIAMETER) ) {
double outerDiameter = preset.get(ComponentPreset.AFT_OUTER_DIAMETER); double outerDiameter = preset.get(ComponentPreset.AFT_OUTER_DIAMETER);

8
swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java
View File

@ -78,13 +78,13 @@ public class TransitionConfig extends RocketComponentConfig {
checkbox.setToolTipText(trans.get("TransitionCfg.checkbox.Clipped.ttip")); checkbox.setToolTipText(trans.get("TransitionCfg.checkbox.Clipped.ttip"));
panel.add(checkbox, "wrap"); panel.add(checkbox, "wrap");
order.add(checkbox); order.add(checkbox);
//// Shape parameter:
this.shapeLabel = new JLabel(trans.get("TransitionCfg.lbl.Shapeparam"));
panel.add(shapeLabel);
} }
{ {
//// Shape parameter:
this.shapeLabel = new JLabel(trans.get("TransitionCfg.lbl.Shapeparam"));
panel.add(shapeLabel);
final DoubleModel shapeModel = new DoubleModel(component, "ShapeParameter"); final DoubleModel shapeModel = new DoubleModel(component, "ShapeParameter");
this.shapeSpinner = new JSpinner(shapeModel.getSpinnerModel()); this.shapeSpinner = new JSpinner(shapeModel.getSpinnerModel());