Merge pull request #2223 from SiboVG/issue-2218
[#2218] Apply outer/inner diameter preset to tube fin
This commit is contained in:
commit
040f8c9725
core/src/net/sf/openrocket/rocketcomponent
@ -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)) {
|
||||||
|
@ -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() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user