Browse Source

minot gui improvement

lookup-tables
Stephan Richter 5 years ago
parent
commit
8fb23eec1a
  1. 2
      pom.xml
  2. 7
      src/main/java/de/srsoftware/web4rail/moving/Train.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>1.2.49</version>
<version>1.2.50</version>
<name>Web4Rail</name>
<packaging>jar</packaging>
<description>Java Model Railway Control</description>

7
src/main/java/de/srsoftware/web4rail/moving/Train.java

@ -99,7 +99,8 @@ public class Train extends BaseClass implements Comparable<Train> { @@ -99,7 +99,8 @@ public class Train extends BaseClass implements Comparable<Train> {
if (waitTime > 100) waitTime /=2;
if (stop) return;
if (isNull(route)) { // may have been set by start action in between
Train.this.start();
Object o = Train.this.start();
if (o instanceof String) plan.stream((String)o);
if (isSet(destination)) Thread.sleep(1000); // limit load on PathFinder
}
} else Thread.sleep(250);
@ -742,11 +743,11 @@ public class Train extends BaseClass implements Comparable<Train> { @@ -742,11 +743,11 @@ public class Train extends BaseClass implements Comparable<Train> {
Context context = new Context(this).block(currentBlock).direction(direction).train(this);
route = PathFinder.chooseRoute(context);
if (isNull(route)) return t("No free routes from {}",currentBlock);
if (!route.lock()) return t("Was not able to lock {}",route);
if (!route.lock()) error = t("Was not able to lock {}",route);
route.set(context);
if (isNull(error) && !route.fireSetupActions()) error = t("Was not able to fire all setup actions of route!");
}
if (direction != route.startDirection) turn();
if (isNull(error) && direction != route.startDirection) turn();
if (isNull(error) && !route.start(this)) error = t("Was not able to assign {} to {}!",this,route);
if (isSet(error)) {

Loading…
Cancel
Save