X-Git-Url: https://git.gag.com/?p=debian%2Fopenrocket;a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fsimulation%2Fcustomexpression%2FRangeExpression.java;h=1667b61e9a1695fee2ea4df06410836f20539bdb;hp=83b5e6c506dce15c80891c087c3c005cdef1eff3;hb=c482637086621542ea78ba8818f315dce0a11dc2;hpb=c322e9329373aa7f0b071663874327da7e650082 diff --git a/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java b/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java index 83b5e6c5..1667b61e 100644 --- a/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java +++ b/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java @@ -40,7 +40,6 @@ public class RangeExpression extends CustomExpression { this.expression = variableType+startTime+endTime; // this is used just for generating the hash log.info("New range expression, "+startTime + " to "+endTime); - } /* @@ -73,7 +72,9 @@ public class RangeExpression extends CustomExpression { } // From the given datatype, get the time and function values and make an interpolator - FlightDataType type = getType(); + + //Note: must get in a way that flight data system will figure out units. Otherwise there will be a type conflict when we get the new data. + FlightDataType type = FlightDataType.getType(null, getSymbol(), null); List data = status.getFlightData().get(type); List time = status.getFlightData().get(FlightDataType.TYPE_TIME);