Big update to custom expression feature.

[debian/openrocket] / core / src / net / sf / openrocket / util / ExpressionParser.java

diff --git a/core/src/net/sf/openrocket/util/ExpressionParser.java b/core/src/net/sf/openrocket/util/ExpressionParser.java
index b180f61928cad3c18f64084ee41e7c33058aff93..d3a3fa62bcaf83a5b05c35f6f67eccd8e400a558 100644 (file)
--- a/core/src/net/sf/openrocket/util/ExpressionParser.java
+++ b/core/src/net/sf/openrocket/util/ExpressionParser.java
@@ -25,7 +25,7 @@ public class ExpressionParser {
                        modified = modify(expression);
                        ExpressionBuilder builder = new ExpressionBuilder(modified);
                        Calculable calc = builder.build();
-                       double n = calc.calculate();
+                       double n = calc.calculate().getDoubleValue();
                        log.debug("Evaluated expression '" + expression + "' (modified='" + modified + "') to " + n);
                        return n;
                } catch (Exception e) {