X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FLogicExecuter.java;h=77a093522219ef31a6a6cde5a7c83b08559ab150;hb=26eb7899013bc52e4501ee97422d79d6e1ea2b9c;hp=eb67f8dc13d61b5e4f81ce70ad873a793356452f;hpb=e7a86660ec5342ff4a7a9056b3e4b1d05a1ed63c;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
index eb67f8dc..77a09352 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
@@ -43,15 +43,16 @@ public class LogicExecuter
 				{
 					// always execute to keep timeline from "hanging behind" for too long
 					long current = tf.getAsLong();
-					timeline.executeUntil(timeline.laterThan(current), current + 10);
+					timeline.executeUntil(timeline.laterThan(current), System.currentTimeMillis() + 10);
+					long nextEventTime = timeline.nextEventTime();
 					long sleepTime;
 					if (timeline.hasNext())
-						sleepTime = timeline.nextEventTime() - current;
+						sleepTime = tf.simulTimeDeltaToRealTimeMillis(nextEventTime - current);
 					else
 						sleepTime = 10000;
 					try
 					{
-						nextExecSimulTime.set(current + sleepTime);
+						nextExecSimulTime.set(nextEventTime);
 						if (sleepTime > 0)
 							Thread.sleep(sleepTime);
 
@@ -130,9 +131,9 @@ public class LogicExecuter
 		return isPaused.get();
 	}
 
-	public void setSpeedPercentage(int percentage)
+	public void setSpeedFactor(double factor)
 	{
-		tf.setSpeedPercentage(percentage);
+		tf.setSpeedFactor(factor);
 	}
 
 	private void waitForIsRunning(boolean expectedState)