7u83
/
OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Pause button works now

This commit is contained in:
7u83 2017-02-05 10:24:18 +01:00
parent 7d0d38c03c
commit 89b6a69516
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/gui/NewMDIApplication.java
View File

@ -460,13 +460,14 @@ public class NewMDIApplication extends javax.swing.JFrame {
void pauseSim(){
Globals.se.timer.pause();
}
void startSim(){
resetSim();
this.startTraders();
Globals.se.timer.setAcceleration((Double)this.accelSpinner.getValue());
Globals.se.timer.setPause(false);
Globals.se.timer.start();
}

22
src/main/java/sesim/Scheduler.java
View File

@ -53,6 +53,7 @@ public class Scheduler extends Thread {
}
public double getAcceleration() {
return this.acceleration;
}
@ -108,9 +109,14 @@ public class Scheduler extends Thread {
public long currentTimeMillis1() {
long diff = System.currentTimeMillis() - last_time_millis;
// diff = 12199999L;
last_time_millis += diff;
if (pause) {
return (long) this.current_time_millis;
}
this.current_time_millis += diff * this.acceleration;
//System.out.printf("Current TM: %f\n", this.current_time_millis);
return (long) this.current_time_millis;
@ -151,12 +157,21 @@ public class Scheduler extends Thread {
private boolean pause = false;
public void pause() {
pause = !pause;
setPause(!pause);
}
public void setPause(boolean val){
pause=val;
synchronized (this) {
this.notify();
}
}
public boolean getPause(){
return pause;
}
public long fireEvent(TimerTask e) {
return e.timerTask();
@ -190,8 +205,9 @@ public class Scheduler extends Thread {
while (it.hasNext()) {
TimerTask e = it.next();
long next_t = this.fireEvent(e);
if (next_t == 0 )
if (next_t == 0) {
next_t++;
}
this.addEvent(e, next_t + t);
}