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

DGP - MassObject tweak

Browse Source
This commit is contained in:
Doug Pedrick 2012-01-10 03:35:18 +00:00
parent d6c730cfa4
commit ff2bafb19d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java
View File

@ -7,7 +7,6 @@ import net.sf.openrocket.file.rocksim.RocksimLocationMode;
import net.sf.openrocket.file.rocksim.importt.BaseHandler; import net.sf.openrocket.file.rocksim.importt.BaseHandler;
import net.sf.openrocket.rocketcomponent.ExternalComponent; import net.sf.openrocket.rocketcomponent.ExternalComponent;
import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.MassObject;
import net.sf.openrocket.rocketcomponent.RecoveryDevice; import net.sf.openrocket.rocketcomponent.RecoveryDevice;
import net.sf.openrocket.rocketcomponent.RingComponent; import net.sf.openrocket.rocketcomponent.RingComponent;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
@ -71,7 +70,7 @@ public abstract class BasePartDTO {
setCalcCG(ec.getCG().x * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); setCalcCG(ec.getCG().x * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setCalcMass(ec.getComponentMass() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); setCalcMass(ec.getComponentMass() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS);
setKnownCG(ec.getOverrideCGX() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); setKnownCG(ec.getOverrideCGX() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setKnownMass(ec.getOverrideMass() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); setKnownMass(ec.getMass() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS);
if (! (ec instanceof FinSet)) { if (! (ec instanceof FinSet)) {
setLen(ec.getLength() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); setLen(ec.getLength() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
@ -136,11 +135,6 @@ public abstract class BasePartDTO {
setRadialAngle(rc.getRadialDirection()); setRadialAngle(rc.getRadialDirection());
setRadialLoc(rc.getRadialPosition() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); setRadialLoc(rc.getRadialPosition() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
} }
else if (ec instanceof MassObject) {
MassObject rc = (MassObject)ec;
setRadialAngle(rc.getRadialDirection());
setRadialLoc(rc.getRadialPosition() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
}
} }
public Double getKnownMass() { public Double getKnownMass() {

8
core/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java
View File

@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class MassObjectDTO extends BasePartDTO{ public class MassObjectDTO extends BasePartDTO{
@XmlElement(name = RocksimCommonConstants.TYPE_CODE) @XmlElement(name = RocksimCommonConstants.TYPE_CODE)
private int typeCode = 0; private final int typeCode = 0;
/** /**
* Default constructor. * Default constructor.
@ -31,5 +31,11 @@ public class MassObjectDTO extends BasePartDTO{
*/ */
public MassObjectDTO(MassObject mo) { public MassObjectDTO(MassObject mo) {
super(mo); super(mo);
setRadialAngle(mo.getRadialDirection());
setRadialLoc(mo.getRadialPosition() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setCalcMass(0d);
setCalcCG(0d);
setKnownCG(getXb());
setUseKnownCG(1);
} }
} }