Browse Source

minor improvements

lookup-tables
Stephan Richter 5 years ago
parent
commit
cba99c16f7
  1. 2
      pom.xml
  2. 1
      resources/translations/Application.de.translation
  3. 5
      src/main/java/de/srsoftware/web4rail/Plan.java
  4. 3
      src/main/java/de/srsoftware/web4rail/Route.java

2
pom.xml

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId>
<version>0.11.22</version>
<version>0.11.23</version>
<name>Web4Rail</name>
<packaging>jar</packaging>
<description>Java Model Railway Control</description>

1
resources/translations/Application.de.translation

@ -50,6 +50,7 @@ editable train properties : veränderliche Zug-Eigenschaften @@ -50,6 +50,7 @@ editable train properties : veränderliche Zug-Eigenschaften
Emergency : Notfall
Firing {} : starte {}
FinishRoute : Route abschließen
Found {} routes. : {} Routen gefunden.
FreeStartBlock : Start-Block freigeben
Hardware settings : Hardware-Einstellungen
Height : Höhe

5
src/main/java/de/srsoftware/web4rail/Plan.java

@ -231,10 +231,7 @@ public class Plan extends BaseClass{ @@ -231,10 +231,7 @@ public class Plan extends BaseClass{
for (Connector con : block.startPoints()) routes.addAll(follow(new Route().begin(block,con.from.inverse()),con));
}
for (Tile tile : tiles.values()) tile.routes().clear();
for (Route route : routes) {
route.complete();
registerRoute(route);
}
for (Route route : routes) registerRoute(route.complete());
return t("Found {} routes.",routes.size());
}

3
src/main/java/de/srsoftware/web4rail/Route.java

@ -309,7 +309,7 @@ public class Route extends BaseClass implements Comparable<Route>{ @@ -309,7 +309,7 @@ public class Route extends BaseClass implements Comparable<Route>{
return name().compareTo(other.name());
}
public void complete() {
public Route complete() {
if (contacts.size()>1) { // mindestens 2 Kontakte: erster Kontakt aktiviert Block, vorletzter Kontakt leitet Bremsung ein
Contact nextToLastContact = contacts.get(contacts.size()-2);
String trigger = nextToLastContact.trigger();
@ -323,6 +323,7 @@ public class Route extends BaseClass implements Comparable<Route>{ @@ -323,6 +323,7 @@ public class Route extends BaseClass implements Comparable<Route>{
}
for (Signal signal : signals) setupActions.add(new SetSignal().set(signal).to(Signal.GO));
startActions.add(new SetSpeed().to(100));
return this;
}
/**

Loading…
Cancel
Save