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) { protected ParallelStageDTO(ParallelStage theORParallelStage) {
super(theORParallelStage); super(theORParallelStage);
setDetachable(true); setDetachable(1);
setEjected(false); 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) @XmlElement(name = RockSimCommonConstants.AUTO_CALC_RADIAL_ANGLE)
private int autoCalcRadialAngle = 0; private int autoCalcRadialAngle = 0;
@XmlElement(name = RockSimCommonConstants.DETACHABLE) @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) @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) @XmlElementWrapper(name = RockSimCommonConstants.ATTACHED_PARTS)
@XmlElementRefs({ @XmlElementRefs({
@XmlElementRef(name = RockSimCommonConstants.BODY_TUBE, type = BodyTubeDTO.class), @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 // OR should always override the radial angle and distance
setAutoCalcRadialDistance(false); setAutoCalcRadialDistance(false);
setAutoCalcRadialAngle(false); setAutoCalcRadialAngle(false);
setDetachable(false); setDetachable(0);
setEjected(false); setEjected(0);
final double angleOffset = theORPodSet.getAngleOffset(); final double angleOffset = theORPodSet.getAngleOffset();
setRadialAngle(angleOffset); setRadialAngle(angleOffset);
setRadialLoc(theORPodSet.getRadiusMethod().getRadius( setRadialLoc(theORPodSet.getRadiusMethod().getRadius(
@ -152,19 +152,20 @@ public class PodSetDTO extends BasePartDTO implements AttachableParts {
attachedParts.remove(part); attachedParts.remove(part);
} }
public boolean isDetachable() {
return isDetachable; public int getDetachable() {
return detachable;
} }
public void setDetachable(boolean detachable) { public void setDetachable(int detachable) {
isDetachable = detachable; this.detachable = detachable;
} }
public boolean isEjected() { public int getEjected() {
return isEjected; return ejected;
} }
public void setEjected(boolean ejected) { public void setEjected(int ejected) {
isEjected = ejected; this.ejected = ejected;
} }
} }