StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor improvements

Browse Source
This commit is contained in:
Stephan Richter
2020-11-14 14:05:07 +01:00
parent 81d9f97740
commit cba99c16f7
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

1
resources/translations/Application.de.translation
View File

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

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

@@ -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 (Connector con : block.startPoints()) routes.addAll(follow(new Route().begin(block,con.from.inverse()),con));
} }
for (Tile tile : tiles.values()) tile.routes().clear(); for (Tile tile : tiles.values()) tile.routes().clear();
for (Route route : routes) { for (Route route : routes) registerRoute(route.complete());
route.complete();
registerRoute(route);
}
return t("Found {} routes.",routes.size()); return t("Found {} routes.",routes.size());
} }

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

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