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

bugfixes

Browse Source
This commit is contained in:
Stephan Richter
2020-12-04 00:56:14 +01:00
parent a45080ca88
commit 237b4e1f8f
4 changed files with 6 additions and 4 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.2.13</version> <version>1.2.14</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>

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

@@ -105,7 +105,9 @@ public class Route extends BaseClass implements Comparable<Route>{
train.setSpeed(0); train.setSpeed(0);
if (aborted) return; if (aborted) return;
long runtime = timestamp2 - timestamp; long runtime = timestamp2 - timestamp;
int newTimeStep = 5*(int) runtime/(startSpeed - ENDSPEED); int quotient = startSpeed - ENDSPEED;
if (quotient<1) quotient = 1;
int newTimeStep = 5*(int) runtime/quotient;
int diff = newTimeStep - timeStep; int diff = newTimeStep - timeStep;
int absDiff = diff < 0 ? -diff : diff; int absDiff = diff < 0 ? -diff : diff;

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

@@ -754,8 +754,8 @@ public class Train extends BaseClass implements Comparable<Train> {
nextRoute = null; nextRoute = null;
} }
if (isSet(route)) { if (isSet(route)) {
route.reset();
route.brakeCancel(); route.brakeCancel();
route.reset();
route = null; route = null;
} }

2
src/main/java/de/srsoftware/web4rail/tiles/StretchableTile.java
View File

@@ -37,7 +37,7 @@ public abstract class StretchableTile extends Tile {
@Override @Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) { protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(stretchType(),new Input(STRETCH_LENGTH, stretch).addTo(new Tag("span")).content(NBSP+t("Tile(s)"))); formInputs.add(stretchType(),new Input(STRETCH_LENGTH, stretch).numeric().addTo(new Tag("span")).content(NBSP+t("Tile(s)")));
return super.properties(preForm, formInputs, postForm); return super.properties(preForm, formInputs, postForm);
} }