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

RockSim uses 0 for false and 1 for true :')

Browse Source
This commit is contained in:
SiboVG 2024-01-24 18:01:42 +01:00
parent ddb73b5ca1
commit b795fb0eb5
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/file/rocksim/export/ParallelStageDTO.java
View File

@ -19,8 +19,8 @@ public class ParallelStageDTO extends PodSetDTO {
*/
protected ParallelStageDTO(ParallelStage theORParallelStage) {
super(theORParallelStage);
setDetachable(true);
setEjected(false);
setDetachable(1);
setEjected(0);
}
/**

25
core/src/net/sf/openrocket/file/rocksim/export/PodSetDTO.java
View File

@ -32,9 +32,9 @@ public class PodSetDTO extends BasePartDTO implements AttachableParts {
@XmlElement(name = RockSimCommonConstants.AUTO_CALC_RADIAL_ANGLE)
private int autoCalcRadialAngle = 0;
@XmlElement(name = RockSimCommonConstants.DETACHABLE)
private boolean isDetachable = false; // This pod can be ejected during simulations
private int detachable = 0; // This pod can be ejected during simulations (0 = false, 1 = true)
@XmlElement(name = RockSimCommonConstants.REMOVED)
private boolean isEjected = false; // Mark this pod as ejected
private int ejected = 0; // Mark this pod as ejected (0 = false, 1 = true)
@XmlElementWrapper(name = RockSimCommonConstants.ATTACHED_PARTS)
@XmlElementRefs({
@XmlElementRef(name = RockSimCommonConstants.BODY_TUBE, type = BodyTubeDTO.class),
@ -74,8 +74,8 @@ public class PodSetDTO extends BasePartDTO implements AttachableParts {
// OR should always override the radial angle and distance
setAutoCalcRadialDistance(false);
setAutoCalcRadialAngle(false);
setDetachable(false);
setEjected(false);
setDetachable(0);
setEjected(0);
final double angleOffset = theORPodSet.getAngleOffset();
setRadialAngle(angleOffset);
setRadialLoc(theORPodSet.getRadiusMethod().getRadius(
@ -152,19 +152,20 @@ public class PodSetDTO extends BasePartDTO implements AttachableParts {
attachedParts.remove(part);
}
public boolean isDetachable() {
return isDetachable;
public int getDetachable() {
return detachable;
}
public void setDetachable(boolean detachable) {
isDetachable = detachable;
public void setDetachable(int detachable) {
this.detachable = detachable;
}
public boolean isEjected() {
return isEjected;
public int getEjected() {
return ejected;
}
public void setEjected(boolean ejected) {
isEjected = ejected;
public void setEjected(int ejected) {
this.ejected = ejected;
}
}