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

Added optional Thickness element/property.

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-26 18:18:55 +00:00
parent c71049a88d
commit b990a5acb2
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/net/sf/openrocket/preset/xml/TransitionDTO.java
View File

@ -38,6 +38,9 @@ public class TransitionDTO extends BaseComponentDTO {
@XmlElement(name = "Length") @XmlElement(name = "Length")
private double length; private double length;
@XmlElement(name = "Thickness")
private Double thickness;
/** /**
@ -63,6 +66,9 @@ public class TransitionDTO extends BaseComponentDTO {
setAftShoulderDiameter(thePreset.get(ComponentPreset.AFT_SHOULDER_DIAMETER)); setAftShoulderDiameter(thePreset.get(ComponentPreset.AFT_SHOULDER_DIAMETER));
setAftShoulderLength(thePreset.get(ComponentPreset.AFT_SHOULDER_LENGTH)); setAftShoulderLength(thePreset.get(ComponentPreset.AFT_SHOULDER_LENGTH));
setLength(thePreset.get(ComponentPreset.LENGTH)); setLength(thePreset.get(ComponentPreset.LENGTH));
if ( thePreset.has(ComponentPreset.THICKNESS)) {
setThickness(thePreset.get(ComponentPreset.THICKNESS));
}
} }
public ShapeDTO getShape() { public ShapeDTO getShape() {
@ -129,7 +135,15 @@ public class TransitionDTO extends BaseComponentDTO {
length = theLength; length = theLength;
} }
public ComponentPreset asComponentPreset(List<MaterialDTO> materials) throws InvalidComponentPresetException { public Double getThickness() {
return thickness;
}
public void setThickness(Double thickness) {
this.thickness = thickness;
}
public ComponentPreset asComponentPreset(List<MaterialDTO> materials) throws InvalidComponentPresetException {
TypedPropertyMap props = new TypedPropertyMap(); TypedPropertyMap props = new TypedPropertyMap();
addProps(props, materials); addProps(props, materials);
props.put(ComponentPreset.SHAPE, shape.getORShape()); props.put(ComponentPreset.SHAPE, shape.getORShape());
@ -141,6 +155,9 @@ public class TransitionDTO extends BaseComponentDTO {
props.put(ComponentPreset.AFT_SHOULDER_LENGTH, this.getAftShoulderLength()); props.put(ComponentPreset.AFT_SHOULDER_LENGTH, this.getAftShoulderLength());
props.put(ComponentPreset.LENGTH, this.getLength()); props.put(ComponentPreset.LENGTH, this.getLength());
props.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION); props.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
if ( thickness != null ) {
props.put(ComponentPreset.THICKNESS, thickness);
}
return ComponentPresetFactory.create(props); return ComponentPresetFactory.create(props);
} }