Simulation speed now can be edited via a text field

[Mograsim.git] / plugins / net.mograsim.logic.core / src / net / mograsim / logic / core / timeline / PauseableTimeFunction.java

diff --git a/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java b/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java
index 4a99310..b1bfcf3 100644 (file)
--- a/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java
+++ b/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java
@@ -1,5 +1,8 @@
 package net.mograsim.logic.core.timeline;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.LongSupplier;
 
 public class PauseableTimeFunction implements LongSupplier
@@ -8,6 +11,8 @@ public class PauseableTimeFunction implements LongSupplier
        private long unpausedSysTime = 0, lastPausedInternalTime = 0;
        private double speedFactor = 1;
 
+       private final List<Consumer<Double>> simulTimeToRealTimeFactorChangedListeners = new ArrayList<>();
+
        public void pause()
        {
                if (!paused)
@@ -22,7 +27,7 @@ public class PauseableTimeFunction implements LongSupplier
                if (paused)
                {
                        paused = false;
-                       unpausedSysTime = System.currentTimeMillis();
+                       unpausedSysTime = System.nanoTime() / 1000;
                }
        }
 
@@ -30,26 +35,36 @@ public class PauseableTimeFunction implements LongSupplier
        public long getAsLong()
        {
                return (long) (paused ? lastPausedInternalTime
-                               : lastPausedInternalTime + (System.currentTimeMillis() - unpausedSysTime) * speedFactor);
+                               : lastPausedInternalTime + (System.nanoTime() / 1000 - unpausedSysTime) * speedFactor);
        }
 
-       public long simulTimeDeltaToRealTimeMillis(long simulTime)
+       public double getSimulTimeToRealTimeFactor()
        {
-               return paused ? -1 : (long) (simulTime / speedFactor);
+               return 1 / 1000d / speedFactor;
        }
 
        public void setSpeedFactor(double factor)
        {
                if (factor <= 0)
-                       throw new IllegalArgumentException("time factor can't be smaller than 1");
+                       throw new IllegalArgumentException("time factor can't be less than or equal to 0");
                if (!paused)
                {
                        pause();
                        unpause();
                }
                this.speedFactor = factor;
+               callSimulTimeToRealTimeFactorChangedListeners(getSimulTimeToRealTimeFactor());
        }
 
+       //@formatter:off
+       public void    addSimulTimeToRealTimeFactorChangedListener(Consumer<Double> listener)
+               {simulTimeToRealTimeFactorChangedListeners.add   (listener);}
+       public void removeSimulTimeToRealTimeFactorChangedListener(Consumer<Double> listener)
+               {simulTimeToRealTimeFactorChangedListeners.remove(listener);}
+       private void  callSimulTimeToRealTimeFactorChangedListeners(double f)
+               {simulTimeToRealTimeFactorChangedListeners.forEach(l -> l.accept(f));}
+       //@formatter:on
+
        public boolean isPaused()
        {
                return paused;