- Implemented a DampingMoment simulation listener example

[debian/openrocket] / core / src / net / sf / openrocket / simulation / FlightDataType.java

diff --git a/core/src/net/sf/openrocket/simulation/FlightDataType.java b/core/src/net/sf/openrocket/simulation/FlightDataType.java
index 6a95c3045d53e3db01ddc8310054428346b27159..adb4b51bc88eae89612fce7ed2df8b03833b89b5 100644 (file)
--- a/core/src/net/sf/openrocket/simulation/FlightDataType.java
+++ b/core/src/net/sf/openrocket/simulation/FlightDataType.java
@@ -71,6 +71,9 @@ public class FlightDataType implements Comparable<FlightDataType> {
        //// Longitude
        public static final FlightDataType TYPE_LONGITUDE = newType(trans.get("FlightDataType.TYPE_LONGITUDE"), "\u03bb", UnitGroup.UNITS_ANGLE, 37);
        
+       //// Gravity
+       public static final FlightDataType TYPE_GRAVITY = newType(trans.get("FlightDataType.TYPE_GRAVITY"), "g", UnitGroup.UNITS_ACCELERATION, 38);
+       
        //// Angular motion
        //// Angle of attack
        public static final FlightDataType TYPE_AOA = newType(trans.get("FlightDataType.TYPE_AOA"), "\u03b1", UnitGroup.UNITS_ANGLE, 40);
@@ -85,16 +88,18 @@ public class FlightDataType implements Comparable<FlightDataType> {
        //// Stability information
        //// Mass
        public static final FlightDataType TYPE_MASS = newType(trans.get("FlightDataType.TYPE_MASS"), "m", UnitGroup.UNITS_MASS, 50);
+       //// Propellant mass
+       public static final FlightDataType TYPE_PROPELLANT_MASS = newType(trans.get("FlightDataType.TYPE_PROPELLANT_MASS"), "mp", UnitGroup.UNITS_MASS, 51);
        //// Longitudinal moment of inertia
-       public static final FlightDataType TYPE_LONGITUDINAL_INERTIA = newType(trans.get("FlightDataType.TYPE_LONGITUDINAL_INERTIA"), "Il", UnitGroup.UNITS_INERTIA, 51);
+       public static final FlightDataType TYPE_LONGITUDINAL_INERTIA = newType(trans.get("FlightDataType.TYPE_LONGITUDINAL_INERTIA"), "Il", UnitGroup.UNITS_INERTIA, 52);
        //// Rotational moment of inertia
-       public static final FlightDataType TYPE_ROTATIONAL_INERTIA = newType(trans.get("FlightDataType.TYPE_ROTATIONAL_INERTIA"), "Ir", UnitGroup.UNITS_INERTIA, 52);
+       public static final FlightDataType TYPE_ROTATIONAL_INERTIA = newType(trans.get("FlightDataType.TYPE_ROTATIONAL_INERTIA"), "Ir", UnitGroup.UNITS_INERTIA, 53);
        //// CP location
-       public static final FlightDataType TYPE_CP_LOCATION = newType(trans.get("FlightDataType.TYPE_CP_LOCATION"), "Cp", UnitGroup.UNITS_LENGTH, 53);
+       public static final FlightDataType TYPE_CP_LOCATION = newType(trans.get("FlightDataType.TYPE_CP_LOCATION"), "Cp", UnitGroup.UNITS_LENGTH, 54);
        //// CG location
-       public static final FlightDataType TYPE_CG_LOCATION = newType(trans.get("FlightDataType.TYPE_CG_LOCATION"), "Cg", UnitGroup.UNITS_LENGTH, 54);
+       public static final FlightDataType TYPE_CG_LOCATION = newType(trans.get("FlightDataType.TYPE_CG_LOCATION"), "Cg", UnitGroup.UNITS_LENGTH, 55);
        //// Stability margin calibers
-       public static final FlightDataType TYPE_STABILITY = newType(trans.get("FlightDataType.TYPE_STABILITY"), "S", UnitGroup.UNITS_COEFFICIENT, 55);
+       public static final FlightDataType TYPE_STABILITY = newType(trans.get("FlightDataType.TYPE_STABILITY"), "S", UnitGroup.UNITS_COEFFICIENT, 56);
        
        
        //// Characteristic numbers
@@ -169,7 +174,7 @@ public class FlightDataType implements Comparable<FlightDataType> {
        //// Air temperature
        public static final FlightDataType TYPE_AIR_TEMPERATURE = newType(trans.get("FlightDataType.TYPE_AIR_TEMPERATURE"), "T", UnitGroup.UNITS_TEMPERATURE, 111);
        //// Air pressure
-       public static final FlightDataType TYPE_AIR_PRESSURE = newType(trans.get("FlightDataType.TYPE_AIR_PRESSURE"), "p", UnitGroup.UNITS_PRESSURE, 112);
+       public static final FlightDataType TYPE_AIR_PRESSURE = newType(trans.get("FlightDataType.TYPE_AIR_PRESSURE"), "P", UnitGroup.UNITS_PRESSURE, 112);
        //// Speed of sound
        public static final FlightDataType TYPE_SPEED_OF_SOUND = newType(trans.get("FlightDataType.TYPE_SPEED_OF_SOUND"), "Vs", UnitGroup.UNITS_VELOCITY, 113);
        
@@ -194,12 +199,14 @@ public class FlightDataType implements Comparable<FlightDataType> {
                TYPE_VELOCITY_XY, 
                TYPE_ACCELERATION_XY, 
                TYPE_LATITUDE, 
-               TYPE_LONGITUDE, 
+               TYPE_LONGITUDE,
+               TYPE_GRAVITY,
                TYPE_AOA,
                TYPE_ROLL_RATE,
                TYPE_PITCH_RATE,
                TYPE_YAW_RATE,
                TYPE_MASS,
+               TYPE_PROPELLANT_MASS,
                TYPE_LONGITUDINAL_INERTIA,
                TYPE_ROTATIONAL_INERTIA,
                TYPE_CP_LOCATION,
@@ -262,8 +269,8 @@ public class FlightDataType implements Comparable<FlightDataType> {
                if (type != null) {
                        // found it from symbol
                        
-                       // if name was not give (empty string), can use the one we found name
-                       if ( s.equals("") || s == null ){
+                       // if name was not given (empty string), can use the one we found
+                       if ( s == null || s.isEmpty()){
                                s = type.getName();
                        }
                        if ( u == null ){
@@ -272,14 +279,19 @@ public class FlightDataType implements Comparable<FlightDataType> {
                        
                        // if something has changed, then we need to remove the old one
                        // otherwise, just return what we found
-                       if ( !u.equals(type.getUnitGroup()) ||
-                                !s.equals(type.getName())
-                               )
+                       if ( !u.equals(type.getUnitGroup()) )
                           {
                                oldPriority = type.priority;
-                               
                                EXISTING_TYPES.remove(type);
-                               log.info("Something changed with the type "+type.getName()+", removed old version.");
+                               log.info("Unitgroup of type "+type.getName() + 
+                                                ", has changed from "+type.getUnitGroup().toString() + 
+                                                " to "+u.toString() +
+                                                ". Removing old version.");
+                       }
+                       else if (!s.equals(type.getName())) {
+                               oldPriority = type.priority;
+                               EXISTING_TYPES.remove(type);
+                               log.info("Name of type "+type.getName()+", has changed to "+s+". Removing old version.");
                        }
                        else{
                                return type;