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

[#2282] Update shoulder diameter when transition diameter changes

Browse Source
This commit is contained in:
SiboVG 2023-08-04 11:28:48 +02:00
parent 2e77780241
commit 985e646df3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
if (doClamping && this.thickness > this.foreRadius && this.thickness > this.aftRadius) if (doClamping && this.thickness > this.foreRadius && this.thickness > this.aftRadius)
this.thickness = Math.max(this.foreRadius, this.aftRadius); this.thickness = Math.max(this.foreRadius, this.aftRadius);
setForeShoulderRadius(getForeShoulderRadius());
clearPreset(); clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }
@ -205,6 +207,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
if (doClamping && this.thickness > this.foreRadius && this.thickness > this.aftRadius) if (doClamping && this.thickness > this.foreRadius && this.thickness > this.aftRadius)
this.thickness = Math.max(this.foreRadius, this.aftRadius); this.thickness = Math.max(this.foreRadius, this.aftRadius);
setAftShoulderRadius(getAftShoulderRadius());
clearPreset(); clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }
@ -398,6 +402,7 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
((Transition) listener).setForeShoulderRadius(foreShoulderRadius); ((Transition) listener).setForeShoulderRadius(foreShoulderRadius);
} }
} }
foreShoulderRadius = Math.min(foreShoulderRadius, getForeRadius());
if (MathUtil.equals(this.foreShoulderRadius, foreShoulderRadius)) if (MathUtil.equals(this.foreShoulderRadius, foreShoulderRadius))
return; return;
@ -471,6 +476,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
} }
} }
aftShoulderRadius = Math.min(aftShoulderRadius, getAftRadius());
if (MathUtil.equals(this.aftShoulderRadius, aftShoulderRadius)) if (MathUtil.equals(this.aftShoulderRadius, aftShoulderRadius))
return; return;
this.aftShoulderRadius = aftShoulderRadius; this.aftShoulderRadius = aftShoulderRadius;