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

removed tick lists and tick time functionality

Browse source
This commit is contained in:
fros4943 2008-10-28 12:58:32 +00:00
parent 59012007b9
commit 237de606b1
1 changed files with 3 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: CreateSimDialog.java,v 1.11 2008/10/03 13:54:27 fros4943 Exp $ * $Id: CreateSimDialog.java,v 1.12 2008/10/28 12:58:32 fros4943 Exp $
*/ */
package se.sics.cooja.dialogs; package se.sics.cooja.dialogs;
@ -129,9 +129,6 @@ public class CreateSimDialog extends JDialog {
// Set simulation time // Set simulation time
myDialog.simulationTime.setValue(new Integer(simulationToConfigure.getSimulationTime())); myDialog.simulationTime.setValue(new Integer(simulationToConfigure.getSimulationTime()));
// Set tick time
myDialog.tickTime.setValue(new Integer(simulationToConfigure.getTickTime()));
// Select radio medium // Select radio medium
if (simulationToConfigure.getRadioMedium() != null) { if (simulationToConfigure.getRadioMedium() != null) {
Class<? extends RadioMedium> radioMediumClass = Class<? extends RadioMedium> radioMediumClass =
@ -151,9 +148,6 @@ public class CreateSimDialog extends JDialog {
// Set random seed // Set random seed
myDialog.randomSeed.setValue(new Long(simulationToConfigure.getRandomSeed())); myDialog.randomSeed.setValue(new Long(simulationToConfigure.getRandomSeed()));
// Set number of tick lists
myDialog.tickLists.setValue(new Integer(simulationToConfigure.getNrTickLists()));
// Set delayed mote startup time // Set delayed mote startup time
myDialog.delayedStartup.setValue(new Integer(simulationToConfigure.getDelayedMoteStartupTime())); myDialog.delayedStartup.setValue(new Integer(simulationToConfigure.getDelayedMoteStartupTime()));
@ -325,32 +319,11 @@ public class CreateSimDialog extends JDialog {
advancedBox.add(horizBox); advancedBox.add(horizBox);
advancedBox.add(Box.createRigidArea(new Dimension(0,5))); advancedBox.add(Box.createRigidArea(new Dimension(0,5)));
// Tick time
horizBox = Box.createHorizontalBox();
horizBox.setMaximumSize(new Dimension(Integer.MAX_VALUE,LABEL_HEIGHT));
horizBox.setAlignmentX(Component.LEFT_ALIGNMENT);
label = new JLabel("Simulation tick time (ms)");
label.setPreferredSize(new Dimension(LABEL_WIDTH,LABEL_HEIGHT));
numberField = new JFormattedTextField(integerFormat);
numberField.setValue(new Integer(1));
numberField.setColumns(4);
numberField.setEnabled(false); /* Disabled: Almost never used */
tickTime = numberField;
horizBox.add(label);
horizBox.add(Box.createHorizontalStrut(150));
horizBox.add(numberField);
horizBox.setToolTipText("Simulated time increase each simulation loop");
advancedBox.add(horizBox);
advancedBox.add(Box.createRigidArea(new Dimension(0,5)));
// Delayed startup // Delayed startup
horizBox = Box.createHorizontalBox(); horizBox = Box.createHorizontalBox();
horizBox.setMaximumSize(new Dimension(Integer.MAX_VALUE,LABEL_HEIGHT)); horizBox.setMaximumSize(new Dimension(Integer.MAX_VALUE,LABEL_HEIGHT));
horizBox.setAlignmentX(Component.LEFT_ALIGNMENT); horizBox.setAlignmentX(Component.LEFT_ALIGNMENT);
label = new JLabel("Mote startup delay (max, ms)"); label = new JLabel("Random startup (max, ms)");
label.setPreferredSize(new Dimension(LABEL_WIDTH,LABEL_HEIGHT)); label.setPreferredSize(new Dimension(LABEL_WIDTH,LABEL_HEIGHT));
numberField = new JFormattedTextField(integerFormat); numberField = new JFormattedTextField(integerFormat);
@ -383,7 +356,7 @@ public class CreateSimDialog extends JDialog {
horizBox.add(label); horizBox.add(label);
horizBox.add(Box.createHorizontalStrut(150)); horizBox.add(Box.createHorizontalStrut(150));
horizBox.add(numberField); horizBox.add(numberField);
horizBox.setToolTipText("Delay between each simulated time step"); horizBox.setToolTipText("Delay between each simulated millisecond. Controls simulation speed.");
advancedBox.add(horizBox); advancedBox.add(horizBox);
advancedBox.add(Box.createVerticalStrut(5)); advancedBox.add(Box.createVerticalStrut(5));
@ -410,28 +383,6 @@ public class CreateSimDialog extends JDialog {
advancedBox.add(horizBox); advancedBox.add(horizBox);
advancedBox.add(Box.createVerticalStrut(5)); advancedBox.add(Box.createVerticalStrut(5));
// Tick lists
horizBox = Box.createHorizontalBox();
horizBox.setMaximumSize(new Dimension(Integer.MAX_VALUE,LABEL_HEIGHT));
horizBox.setAlignmentX(Component.LEFT_ALIGNMENT);
label = new JLabel("Number of tick lists");
label.setPreferredSize(new Dimension(LABEL_WIDTH,LABEL_HEIGHT));
numberField = new JFormattedTextField(integerFormat);
numberField.setValue(new Integer(1));
numberField.setColumns(4);
numberField.setEnabled(false); /* Disabled: Almost never used */
tickLists = numberField;
horizBox.add(label);
horizBox.add(Box.createHorizontalStrut(150));
horizBox.add(numberField);
horizBox.setToolTipText("<html>Number of tick lists.<p>Every simulated mote belongs to a tick list, and each simulated loop only one list is allowed to act.<br>If the number of tick lists is 1, all motes are tick every simulation time increase.</html>");
advancedBox.add(horizBox);
advancedBox.add(Box.createVerticalGlue());
vertBox.add(advancedBox); vertBox.add(advancedBox);
vertBox.add(Box.createVerticalGlue()); vertBox.add(Box.createVerticalGlue());
@ -452,7 +403,6 @@ public class CreateSimDialog extends JDialog {
} else if (e.getActionCommand().equals("create")) { } else if (e.getActionCommand().equals("create")) {
mySimulation.setDelayTime(((Number) delayTime.getValue()).intValue()); mySimulation.setDelayTime(((Number) delayTime.getValue()).intValue());
mySimulation.setSimulationTime(((Number) simulationTime.getValue()).intValue()); mySimulation.setSimulationTime(((Number) simulationTime.getValue()).intValue());
mySimulation.setTickTime(((Number) tickTime.getValue()).intValue());
mySimulation.setTitle(title.getText()); mySimulation.setTitle(title.getText());
String currentRadioMediumDescription = (String) radioMediumBox.getSelectedItem(); String currentRadioMediumDescription = (String) radioMediumBox.getSelectedItem();
@ -473,7 +423,6 @@ public class CreateSimDialog extends JDialog {
} }
mySimulation.setRandomSeed(((Number) randomSeed.getValue()).longValue()); mySimulation.setRandomSeed(((Number) randomSeed.getValue()).longValue());
mySimulation.setNrTickLists(((Number) tickLists.getValue()).intValue());
mySimulation.setDelayedMoteStartupTime(((Number) delayedStartup.getValue()).intValue()); mySimulation.setDelayedMoteStartupTime(((Number) delayedStartup.getValue()).intValue());
dispose(); dispose();