Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-12 10:30:09 +00:00
Code Issues Projects Releases Wiki Activity

minor bugfix: simulation speed was not restored correctly

Browse Source
This commit is contained in:
Fredrik Osterlind 2013-08-14 12:54:30 +02:00
parent 9cb2fd8465
commit 0b09084b92
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/cooja/java/se/sics/cooja/Simulation.java
View File

@ -659,7 +659,10 @@ public class Simulation extends Observable implements Runnable {
availableMoteTypes, availableMoteTypes,
moteTypeClassName moteTypeClassName
); );
if (newClass != null && !newClass.equals(moteTypeClassName)) { if (newClass == null) {
throw new MoteType.MoteTypeCreationException("No mote type class selected");
}
if (!newClass.equals(moteTypeClassName)) {
logger.warn("Changing mote type class: " + moteTypeClassName + " -> " + newClass); logger.warn("Changing mote type class: " + moteTypeClassName + " -> " + newClass);
moteTypeClassName = newClass; moteTypeClassName = newClass;
} }
@ -989,7 +992,7 @@ public class Simulation extends Observable implements Runnable {
* @param newSpeedLimit * @param newSpeedLimit
*/ */
public void setSpeedLimit(final Double newSpeedLimit) { public void setSpeedLimit(final Double newSpeedLimit) {
invokeSimulationThread(new Runnable() { Runnable r = new Runnable() {
public void run() { public void run() {
if (newSpeedLimit == null) { if (newSpeedLimit == null) {
speedLimitNone = true; speedLimitNone = true;
@ -1008,7 +1011,14 @@ public class Simulation extends Observable implements Runnable {
Simulation.this.setChanged(); Simulation.this.setChanged();
Simulation.this.notifyObservers(this); Simulation.this.notifyObservers(this);
} }
}); };
if (!isRunning()) {
/* Simulation is stopped, change speed immediately */
r.run();
} else {
/* Change speed from simulation thread */
invokeSimulationThread(r);
}
} }
/** /**