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

Merge pull request #1387 from hcraigmiller/ParachuteDTO-PresetCD-Error

Browse Source 
Corrected Parachute CD preset error
This commit is contained in:
SiboVG 2022-05-29 08:24:20 +02:00 committed by GitHub
commit f3e4be8a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/net/sf/openrocket/preset/xml/ParachuteDTO.java
View File

@ -28,7 +28,7 @@ public class ParachuteDTO extends BaseComponentDTO {
@XmlElement(name = "PackedLength")
private AnnotatedLengthDTO PackedLength;
@XmlElement(name = "DragCoefficient")
private AnnotatedLengthDTO DragCoefficient;
private AnnotatedLengthDTO dragCoefficient;
@XmlElement(name = "LineCount")
private Integer lineCount;
@XmlElement(name = "LineLength")
@ -87,13 +87,13 @@ public class ParachuteDTO extends BaseComponentDTO {
}
public double getDragCoefficient() {
return DragCoefficient.getValue();
return dragCoefficient.getValue();
}
public void setDragCoefficient(AnnotatedLengthDTO DragCoefficient) {
this.DragCoefficient = DragCoefficient;
this.dragCoefficient = DragCoefficient;
}
public void setDragCoefficient(double DragCoefficient) { this.DragCoefficient = new AnnotatedLengthDTO(DragCoefficient); }
public void setDragCoefficient(double DragCoefficient) { this.dragCoefficient = new AnnotatedLengthDTO(DragCoefficient); }
public Integer getLineCount() {
return lineCount;
@ -173,7 +173,7 @@ public class ParachuteDTO extends BaseComponentDTO {
if ( this.PackedLength != null ) {
props.put(ComponentPreset.PACKED_LENGTH, this.getPackedLength());
}
if ( this.PackedLength != null ) {
if ( this.dragCoefficient != null ) {
props.put(ComponentPreset.PARACHUTE_CD, this.getDragCoefficient());
}
props.put(ComponentPreset.LINE_COUNT, this.getLineCount());