implemented small delay between setting signal to go and start of train. various GUI improvements

This commit is contained in:
Stephan Richter
2021-01-02 13:56:17 +01:00
parent 0b3ae425c0
commit d3c3051605
16 changed files with 173 additions and 69 deletions

View File

@@ -2,6 +2,7 @@ package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -305,7 +306,9 @@ public abstract class Block extends StretchableTile{
if (isNull(exclude)) exclude = new Vector<Block>();
Select select = new Select(Block.class.getSimpleName());
new Tag("option").attr("value","0").content(t("unset")).addTo(select);
for (Block block : BaseClass.listElements(Block.class)) {
List<Block> blocks = BaseClass.listElements(Block.class);
Collections.sort(blocks, (b1,b2) -> b1.name.compareTo(b2.name));
for (Block block : blocks) {
if (exclude.contains(block)) continue;
Tag opt = select.addOption(block.id(), block);
if (block == preselected) opt.attr("selected", "selected");

View File

@@ -44,6 +44,14 @@ public abstract class Signal extends Tile {
super();
}
public HashSet<Integer> addresses(){
HashSet<Integer> list = new HashSet<Integer>();
for (HashSet<int[]> commands : aspects.values()) {
for (int[] data : commands) list.add(data[0]);
}
return list;
}
@Override
protected Vector<String> classes() {
Vector<String> classes = super.classes();