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

Merge pull request from SiboVG/issue-2218

Browse Source 
[] Apply outer/inner diameter preset to tube fin
This commit is contained in:
Sibo Van Gool 2023-05-26 00:24:56 +02:00 committed by GitHub
commit 040f8c9725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
core/src/net/sf/openrocket/rocketcomponent
BodyTube.javaTubeFinSet.java

2
core/src/net/sf/openrocket/rocketcomponent/BodyTube.java

@ -172,8 +172,8 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
@Override @Override
protected void loadFromPreset(ComponentPreset preset) { protected void loadFromPreset(ComponentPreset preset) {
this.autoRadius = false;
if (preset.has(ComponentPreset.OUTER_DIAMETER)) { if (preset.has(ComponentPreset.OUTER_DIAMETER)) {
this.autoRadius = false;
double outerDiameter = preset.get(ComponentPreset.OUTER_DIAMETER); double outerDiameter = preset.get(ComponentPreset.OUTER_DIAMETER);
this.outerRadius = outerDiameter / 2.0; this.outerRadius = outerDiameter / 2.0;
if (preset.has(ComponentPreset.INNER_DIAMETER)) { if (preset.has(ComponentPreset.INNER_DIAMETER)) {

13
core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java

@ -518,6 +518,19 @@ public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, R
} }
@Override
protected void loadFromPreset(ComponentPreset preset) {
super.loadFromPreset(preset);
if (preset.has(ComponentPreset.OUTER_DIAMETER)) {
this.autoRadius = false;
double outerDiameter = preset.get(ComponentPreset.OUTER_DIAMETER);
this.outerRadius = outerDiameter / 2.0;
if (preset.has(ComponentPreset.INNER_DIAMETER)) {
double innerDiameter = preset.get(ComponentPreset.INNER_DIAMETER);
this.thickness = (outerDiameter - innerDiameter) / 2.0;
}
}
}
@Override @Override
public InsideColorComponentHandler getInsideColorComponentHandler() { public InsideColorComponentHandler getInsideColorComponentHandler() {