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

Merge pull request #745 from teyrana/fix/740-button-save-load

Browse Source 
[fixes #740] Railbuttons now correctly load instance-separation
This commit is contained in:
Daniel Williams 2020-08-14 19:34:24 -04:00 committed by GitHub
commit e90318a7ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/net/sf/openrocket/rocketcomponent/RailButton.java
View File

@ -62,7 +62,7 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
public RailButton(){ public RailButton(){
super(AxialMethod.MIDDLE); super(AxialMethod.MIDDLE);
this.outerDiameter_m = 0.0097; this.outerDiameter_m = 0.0097;
this.totalHeight_m = 0.0097; this.totalHeight_m = 0.0097;
this.innerDiameter_m = 0.008; this.innerDiameter_m = 0.008;
this.flangeHeight_m = 0.002; this.flangeHeight_m = 0.002;
this.setStandoff( 0.002); this.setStandoff( 0.002);
@ -156,21 +156,13 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
public void setOuterDiameter( final double newOD ){ public void setOuterDiameter( final double newOD ){
this.outerDiameter_m = newOD; this.outerDiameter_m = newOD;
// devel
this.innerDiameter_m = newOD*0.8;
this.setInstanceSeparation( newOD*6);
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }
public void setTotalHeight( final double newHeight ) { public void setTotalHeight( final double newHeight ) {
this.totalHeight_m = newHeight; this.totalHeight_m = newHeight;
// devel
this.flangeHeight_m = newHeight*0.25;
this.setStandoff( newHeight*0.25);
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }