deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed a bug with the ScriptRunner plugin

Browse source 
The ScriptRunner plugin started the simulation in GUI and NOGUI mode.
Now the simulation is only started in nogui mode
This commit is contained in:
Andreas Löscher 2014-11-07 13:53:16 +01:00
parent f68bc3a40b
commit 6d61893e09
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/cooja/java/org/contikios/cooja/Cooja.java
View file

@ -1023,7 +1023,7 @@ public class Cooja extends Observable {
int pluginType = pluginClass.getAnnotation(PluginType.class).value();
if (pluginType != PluginType.SIM_PLUGIN && pluginType != PluginType.SIM_STANDARD_PLUGIN
&& pluginType == PluginType.SIM_CONTROL_PLUGIN) {
&& pluginType != PluginType.SIM_CONTROL_PLUGIN) {
continue;
}

12
tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java
View file

@ -274,10 +274,14 @@ public class ScriptRunner extends VisPlugin {
if (script != null) {
updateScript(script);
}
/* start simulation */
simulation.setSpeedLimit(null);
simulation.startSimulation();
}
public void startPlugin() {
/* start simulation */
if (!Cooja.isVisualized()) {
simulation.setSpeedLimit(null);
simulation.startSimulation();
}
}
public void setLinkFile(File source) {