Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
authorFabian Stemmler <stemmler@in.tum.de>
Thu, 26 Sep 2019 21:49:15 +0000 (23:49 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Thu, 26 Sep 2019 21:49:15 +0000 (23:49 +0200)
1  2 
plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/PauseableTimeFunction.java

@@@ -39,16 -38,9 +39,16 @@@ public class PauseableTimeFunction impl
                                : lastPausedInternalTime + (System.nanoTime() / 1000 - unpausedSysTime) * speedFactor);
        }
  
 +      @Override
 +      public void setTime(long time)
 +      {
 +              lastPausedInternalTime = time;
 +              unpausedSysTime = System.nanoTime() / 1000;
 +      }
 +
        public double getSimulTimeToRealTimeFactor()
        {
-               return 1 / 1000 / speedFactor;
+               return 1 / 1000d / speedFactor;
        }
  
        public void setSpeedFactor(double factor)