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

minor improvements

Browse Source
This commit is contained in:
Stephan Richter
2021-04-01 22:05:37 +02:00
parent f7c895620a
commit 744fb3eb32
4 changed files with 13 additions and 5 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>1.4.9</version> <version>1.4.10</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

@@ -172,6 +172,7 @@ Falls aktiviert, wird die Strecke anhand von Zug- und Kachel-Länge hinter dem Z
internal contacts : interne Kontakte internal contacts : interne Kontakte
inverted : invertiert inverted : invertiert
Inverts the direction {} is heading to. : Kehrt die Richtung, in welche {} fährt, um. Inverts the direction {} is heading to. : Kehrt die Richtung, in welche {} fährt, um.
{} is not a block! : {} ist kein Block!
{} is off : {} ist Aus {} is off : {} ist Aus
{} is on : {} ist Ein {} is on : {} ist Ein
{} is oriented {} : {} ist {} gerichtet {} is oriented {} : {} ist {} gerichtet

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

@@ -888,7 +888,14 @@ public class Route extends BaseClass {
return true; return true;
} }
public boolean start() { public boolean start() {
if (isNull(context) || context.invalidated()) {
LOG.debug("Invalid context: {}",context);
return false;
}
Train train = context.train();
if (train.direction() != startDirection) train.turn();
if (isSet(startDelay)) sleep(startDelay.random()); if (isSet(startDelay)) sleep(startDelay.random());
return startNow(); return startNow();
} }

6
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -141,6 +141,7 @@ public class Train extends BaseClass implements Comparable<Train> {
case ACTION_QUIT: case ACTION_QUIT:
return train.properties(train.quitAutopilot()); return train.properties(train.quitAutopilot());
case ACTION_REVERSE: case ACTION_REVERSE:
train.quitAutopilot();
return train.reverse().properties(); return train.reverse().properties();
case ACTION_SLOWER10: case ACTION_SLOWER10:
return train.slower(Train.defaultSpeedStep); return train.slower(Train.defaultSpeedStep);
@@ -748,12 +749,11 @@ public class Train extends BaseClass implements Comparable<Train> {
button(t("reverse"), Map.of(ACTION,ACTION_REVERSE)).title(t("Turns the train, as if it went through a loop.")).addTo(directionLi).addTo(propList); button(t("reverse"), Map.of(ACTION,ACTION_REVERSE)).title(t("Turns the train, as if it went through a loop.")).addTo(directionLi).addTo(propList);
Tag dest = new Tag("li").content(t("Destination")+COL); Tag dest = new Tag("li").content(t("Destination")+COL);
if (isNull(destination)) { if (isSet(destination)) {
button(t("Select from plan"),Map.of(ACTION,ACTION_MOVE,ASSIGN,DESTINATION)).addTo(dest);
} else {
link("span",destination,Map.of(REALM,REALM_PLAN,ID,destination.id().toString(),ACTION,ACTION_CLICK)).addTo(dest); link("span",destination,Map.of(REALM,REALM_PLAN,ID,destination.id().toString(),ACTION,ACTION_CLICK)).addTo(dest);
new Button(t("Drop"),Map.of(REALM,REALM_TRAIN,ID,id,ACTION,ACTION_MOVE,DESTINATION,"")).addTo(dest); new Button(t("Drop"),Map.of(REALM,REALM_TRAIN,ID,id,ACTION,ACTION_MOVE,DESTINATION,"")).addTo(dest);
} }
button(t("Select from plan"),Map.of(ACTION,ACTION_MOVE,ASSIGN,DESTINATION)).addTo(dest);
dest.addTo(propList); dest.addTo(propList);
if (isSet(route)) route.link("li", route).addTo(propList); if (isSet(route)) route.link("li", route).addTo(propList);