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

bugfixes

Browse Source
This commit is contained in:
Stephan Richter
2020-10-28 10:15:01 +01:00
parent 1d8a5d65b9
commit 7444579702
4 changed files with 15 additions and 9 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.6.11</version> <version>0.6.12</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>

5
resources/css/style.css
View File

@@ -68,7 +68,8 @@ svg.occupied rect:not(.sig_a):not(.sig_b){
} }
svg text{ svg text{
font-size: 50px; font-size: 38px;
font-family: sans-serif;
} }
svg .block{ svg .block{
@@ -217,4 +218,4 @@ fieldset{
ul{ ul{
clear: both; clear: both;
} }

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

@@ -139,6 +139,7 @@ public class Route implements Constants{
public void contact(Contact contact) { public void contact(Contact contact) {
LOG.debug("{} on {} activated {}.",train,this,contact); LOG.debug("{} on {} activated {}.",train,this,contact);
Vector<Action> actions = triggers.get(contact.trigger()); Vector<Action> actions = triggers.get(contact.trigger());
if (actions == null) return;
for (Action action : actions) { for (Action action : actions) {
try { try {
action.fire(contact.plan()); action.fire(contact.plan());

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

@@ -312,16 +312,16 @@ public class Train implements Constants {
new Input(ACTION,ACTION_UPDATE).hideIn(form); new Input(ACTION,ACTION_UPDATE).hideIn(form);
new Input(REALM,REALM_TRAIN).hideIn(form); new Input(REALM,REALM_TRAIN).hideIn(form);
new Input(ID,id).hideIn(form); new Input(ID,id).hideIn(form);
new Input(NAME,name).addTo(fieldset); new Input(NAME,name).addTo(form);
new Checkbox(PUSH_PULL, t("Push-pull train"), pushPull).addTo(fieldset); new Checkbox(PUSH_PULL, t("Push-pull train"), pushPull).addTo(form);
new Button(t("save")).addTo(form).addTo(fieldset); new Button(t("save")).addTo(form).addTo(fieldset);
new Button(t("Turn"), "train("+id+",'"+ACTION_TURN+"')").addTo(fieldset).addTo(window); new Button(t("Turn"), "train("+id+",'"+ACTION_TURN+"')").addTo(fieldset).addTo(window);
Tag propList = new Tag("ul"); Tag propList = new Tag("ul").clazz("proplist");
Tag locoProp = new Tag("li").content(t("Locomotives:")); Tag locoProp = new Tag("li").content(t("Locomotives:"));
Tag locoList = new Tag("ul"); Tag locoList = new Tag("ul").clazz("locolist");
for (Locomotive loco : this.locos) loco.link("li").addTo(locoList); for (Locomotive loco : this.locos) loco.link("li").addTo(locoList);
@@ -333,8 +333,12 @@ public class Train implements Constants {
for (Locomotive loco : Locomotive.list()) { for (Locomotive loco : Locomotive.list()) {
if (!this.locos.contains(loco)) select.addOption(loco.id(), loco); if (!this.locos.contains(loco)) select.addOption(loco.id(), loco);
} }
select.addTo(addLocoForm); if (!select.children().isEmpty()) {
new Button(t("add")).addTo(addLocoForm).addTo(new Tag("li")).addTo(locoList).addTo(locoProp).addTo(propList); select.addTo(addLocoForm);
new Button(t("add")).addTo(addLocoForm);
addLocoForm.addTo(new Tag("li")).addTo(locoList);
}
locoList.addTo(locoProp).addTo(propList);
if (block != null) { if (block != null) {
new Tag("li").content(t("Current location: {}",block)).addTo(propList); new Tag("li").content(t("Current location: {}",block)).addTo(propList);