updates for 0.9.4

[debian/openrocket] / src / net / sf / openrocket / file / RASPMotorLoader.java

diff --git a/src/net/sf/openrocket/file/RASPMotorLoader.java b/src/net/sf/openrocket/file/RASPMotorLoader.java
index 558e7cd8e25d1027cc75314c67ee4cc472af16f6..409d2188e68faa0417a661ccb7e462eeaeef9a27 100644 (file)
--- a/src/net/sf/openrocket/file/RASPMotorLoader.java
+++ b/src/net/sf/openrocket/file/RASPMotorLoader.java
@@ -10,7 +10,9 @@ import java.util.List;
 
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.motor.Motor;
+import net.sf.openrocket.motor.MotorDigest;
 import net.sf.openrocket.motor.ThrustCurveMotor;
+import net.sf.openrocket.motor.MotorDigest.DataType;
 import net.sf.openrocket.util.Coordinate;
 
 public class RASPMotorLoader extends MotorLoader {
@@ -195,11 +197,19 @@ public class RASPMotorLoader extends MotorLoader {
                
                designation = removeDelay(designation);
                
+               // Create the motor digest from data available in RASP files
+               MotorDigest motorDigest = new MotorDigest();
+               motorDigest.update(DataType.TIME_ARRAY, timeArray);
+               motorDigest.update(DataType.MASS_SPECIFIC, totalW, totalW-propW);
+               motorDigest.update(DataType.FORCE_PER_TIME, thrustArray);
+               final String digest = motorDigest.getDigest();
+               
+               
                try {
                        
                        return new ThrustCurveMotor(Manufacturer.getManufacturer(manufacturer), 
                                        designation, comment, Motor.Type.UNKNOWN,
-                                       delays, diameter, length, timeArray, thrustArray, cgArray);
+                                       delays, diameter, length, timeArray, thrustArray, cgArray, digest);
                        
                } catch (IllegalArgumentException e) {