X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fsimulation%2Fcustomexpression%2FCustomExpressionSimulationListener.java;h=243f7b1553f8976a023333fdf95d0c02a351020b;hb=c482637086621542ea78ba8818f315dce0a11dc2;hp=d1ce6e97348bcad4861f4085116d61a9d555f7f6;hpb=c322e9329373aa7f0b071663874327da7e650082;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java
index d1ce6e97..243f7b15 100644
--- a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java
+++ b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java
@@ -3,13 +3,16 @@ package net.sf.openrocket.simulation.customexpression;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sf.openrocket.logging.LogHelper;
 import net.sf.openrocket.simulation.FlightDataBranch;
 import net.sf.openrocket.simulation.SimulationStatus;
 import net.sf.openrocket.simulation.exception.SimulationException;
 import net.sf.openrocket.simulation.listeners.AbstractSimulationListener;
+import net.sf.openrocket.startup.Application;
 
 public class CustomExpressionSimulationListener extends	AbstractSimulationListener {
 
+	private static final LogHelper log = Application.getLogger();
 	private final List<CustomExpression> expressions;
 	
 	public CustomExpressionSimulationListener(List<CustomExpression> expressions) {
@@ -25,10 +28,17 @@ public class CustomExpressionSimulationListener extends	AbstractSimulationListen
 		// Calculate values for custom expressions
 		FlightDataBranch data = status.getFlightData();
 		for (CustomExpression expression : expressions ) {
-			data.setValue(expression.getType(), expression.evaluateDouble(status));
+			double value = expression.evaluateDouble(status);
+			//log.debug("Setting value of custom expression "+expression.toString()+" = "+value);
+			data.setValue(expression.getType(), value);
 		}
 		
 
 	}
 
+	@Override
+	public boolean isSystemListener(){
+		return true;
+	}
+	
 }