projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added preferences for mouse button assignments
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
LogicExecuter.java
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
eb67f8d
..
c106121
100644
(file)
--- 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
@@
-41,17
+41,17
@@
public class LogicExecuter
{
while (shouldBeRunningLive.get())
{
{
while (shouldBeRunningLive.get())
{
- // always execute to keep timeline from "hanging behind" for too long
long current = tf.getAsLong();
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())
long sleepTime;
if (timeline.hasNext())
- sleepTime =
timeline.nextEventTime() - current
;
+ sleepTime =
(long) ((nextEventTime - current) * tf.getSimulTimeToRealTimeFactor())
;
else
sleepTime = 10000;
try
{
else
sleepTime = 10000;
try
{
- nextExecSimulTime.set(
current + sleep
Time);
+ nextExecSimulTime.set(
nextEvent
Time);
if (sleepTime > 0)
Thread.sleep(sleepTime);
if (sleepTime > 0)
Thread.sleep(sleepTime);
@@
-81,6
+81,8
@@
public class LogicExecuter
if (Timeline.timeCmp(event.getTiming(), nextExecSimulTime.get()) < 0)
simulationThread.interrupt();
});
if (Timeline.timeCmp(event.getTiming(), nextExecSimulTime.get()) < 0)
simulationThread.interrupt();
});
+ // not optimal; but we don't expect this to happen very often
+ tf.addSimulTimeToRealTimeFactorChangedListener(d -> simulationThread.interrupt());
}
public void executeNextStep()
}
public void executeNextStep()
@@
-130,9
+132,9
@@
public class LogicExecuter
return isPaused.get();
}
return isPaused.get();
}
- public void setSpeed
Percentage(int percentage
)
+ public void setSpeed
Factor(double factor
)
{
{
- tf.setSpeed
Percentage(percentage
);
+ tf.setSpeed
Factor(factor
);
}
private void waitForIsRunning(boolean expectedState)
}
private void waitForIsRunning(boolean expectedState)