DGP - MassObject tweak

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@328 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java
index 9f87a41403029cf5411e86ab371a1224e03e53fc..25aa750023cd3762ea65bf2d6b9eb2968d287b97 100644 (file)
--- a/core/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java
+++ b/core/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java
@@ -7,7 +7,6 @@ import net.sf.openrocket.file.rocksim.RocksimLocationMode;
 import net.sf.openrocket.file.rocksim.importt.BaseHandler;
 import net.sf.openrocket.rocketcomponent.ExternalComponent;
 import net.sf.openrocket.rocketcomponent.FinSet;
-import net.sf.openrocket.rocketcomponent.MassObject;
 import net.sf.openrocket.rocketcomponent.RecoveryDevice;
 import net.sf.openrocket.rocketcomponent.RingComponent;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
@@ -71,7 +70,7 @@ public abstract class BasePartDTO {
         setCalcCG(ec.getCG().x * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
         setCalcMass(ec.getComponentMass() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS);
         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)) {
             setLen(ec.getLength() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
@@ -136,11 +135,6 @@ public abstract class BasePartDTO {
             setRadialAngle(rc.getRadialDirection());
             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() {

diff --git a/core/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java
index de182a9bb1a0f405cb6ee027a578d7a74b7a301b..74a0347dd507857faa3c97cc4c5fc604409ff5ac 100644 (file)
--- a/core/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java
+++ b/core/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java
@@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class MassObjectDTO extends BasePartDTO{
 
     @XmlElement(name = RocksimCommonConstants.TYPE_CODE)
-    private int typeCode = 0;
+    private final int typeCode = 0;
 
     /**
      * Default constructor.
@@ -31,5 +31,11 @@ public class MassObjectDTO extends BasePartDTO{
      */
     public MassObjectDTO(MassObject mo) {
         super(mo);
+        setRadialAngle(mo.getRadialDirection());
+        setRadialLoc(mo.getRadialPosition() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
+        setCalcMass(0d);
+        setCalcCG(0d);
+        setKnownCG(getXb());
+        setUseKnownCG(1);
     }
 }