From 9e3556c05c59d20a11ab4bc0cad4228a4e339449 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Fri, 20 Nov 2020 01:16:05 +0100 Subject: [PATCH] added new action SetDisplayText --- pom.xml | 2 +- .../translations/Application.de.translation | 6 ++ .../srsoftware/web4rail/actions/Action.java | 13 ++++ .../web4rail/actions/ConditionalAction.java | 2 +- .../actions/DetermineTrainInBlock.java | 2 +- .../web4rail/actions/SetDisplayText.java | 78 +++++++++++++++++++ .../web4rail/tiles/TextDisplay.java | 16 ++++ 7 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java diff --git a/pom.xml b/pom.xml index 38b9f2c..9063dd1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 1.0.11 + 1.0.12 Web4Rail jar Java Model Railway Control diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index 55546b4..c5323f1 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -35,6 +35,8 @@ Control : Steuerung Control unit : Zentrale Current location\: : Aktueller Ort: [Click here to select block!] : [Hier klicken, um Block auszuwählen!] +[Click here to add condition] : [Hier klicken, um Bedingung hinzuzufügen] +[Click here to select display!] : [Hier klicken, um Anzeige auszuwählen!] [Click here to select train!] : [Hier klicken, um Zug auszuwählen!] click here to setup contact : Hier klicken, um Kontakt auszuwählen click here to setup relay : Hier klicken, um Relais einzurichten @@ -51,6 +53,7 @@ Destination : Ziel Destination\: : Ziel: Destination\: {} from {} : Ziel: {} von {} DetermineTrainInBlock : Zug im Block bestimmen +Determine, which train is in {} : Bestimmen, welcher Zug sich in {} befindet Direction : Richtung Direction\: heading {} : Richtung: nach {} disabled : deaktiviert @@ -119,11 +122,13 @@ Route will only be available, if all conditions are fulfilled. : Route ist nur v Save : speichern Select block\: : Block auswählen: Select contact\: : Kotakt auswählen: +Select display\: : Anzeige auswählen: Select from plan : Auf Plan auswählen Select relay\: : Relais auswählen: Select train\: : Zug auswählen: SendCommand : Kommando senden Send command "{}" to control unit : Kommando „{}“ an Zentrale senden +SetDisplayText : Anzeige-Text setzen SetRelay : Relais schalten SetSignal : Signal stellen SetSignalsToStop : Signale auf Halt stellen @@ -152,6 +157,7 @@ Switch power on : Strom anschalten Tag : Markierung Tags : Markierungen Text to display on clients\: : Text, welcher auf den Clients angezeigt werden soll: +Text to show on display\: : Text, welcher in der Anzeige dargestellt werden soll: Toggle : umschalten Toggle power : Stom umschalten Train : Zug diff --git a/src/main/java/de/srsoftware/web4rail/actions/Action.java b/src/main/java/de/srsoftware/web4rail/actions/Action.java index 11965ca..51fd410 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/Action.java +++ b/src/main/java/de/srsoftware/web4rail/actions/Action.java @@ -40,6 +40,14 @@ public abstract class Action extends BaseClass { public Block block = null; public Direction direction = null; + private Context(Contact c, Route r, Train t, Block b, Direction d) { + contact = c; + route = r; + train = t; + block = b; + direction = d; + } + public Context(Contact c) { contact = c; setRoute(contact.route()); @@ -52,6 +60,10 @@ public abstract class Action extends BaseClass { public Context(Route route) { setRoute(route); } + + protected Context clone() { + return new Context(contact, route, train, block, direction); + } private void setRoute(Route route) { this.route = route; @@ -127,6 +139,7 @@ public abstract class Action extends BaseClass { DetermineTrainInBlock.class, FinishRoute.class, SendCommand.class, + SetDisplayText.class, SetPower.class, SetRelay.class, SetSignal.class, diff --git a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java index 2c4c8dd..632d608 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java +++ b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java @@ -72,7 +72,7 @@ public class ConditionalAction extends Action { for (Condition condition : conditions) { if (!condition.fulfilledBy(context)) return true; } - return actions.fire(context); + return actions.fire(context.clone()); // actions, that happen within the conditional action list must not modify the global context. } @Override diff --git a/src/main/java/de/srsoftware/web4rail/actions/DetermineTrainInBlock.java b/src/main/java/de/srsoftware/web4rail/actions/DetermineTrainInBlock.java index c078e6a..2e37bf0 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/DetermineTrainInBlock.java +++ b/src/main/java/de/srsoftware/web4rail/actions/DetermineTrainInBlock.java @@ -55,7 +55,7 @@ public class DetermineTrainInBlock extends Action { } public String toString() { - return isSet(block) ? t("Determine, which train is in {}",block) : "["+t("click here to setup block")+"]"; + return isSet(block) ? t("Determine, which train is in {}",block) : t("[Click here to select block!]"); }; @Override diff --git a/src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java b/src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java new file mode 100644 index 0000000..4ec9b9e --- /dev/null +++ b/src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java @@ -0,0 +1,78 @@ +package de.srsoftware.web4rail.actions; + +import java.util.HashMap; + +import org.json.JSONObject; + +import de.srsoftware.tools.Tag; +import de.srsoftware.web4rail.Window; +import de.srsoftware.web4rail.tags.Form; +import de.srsoftware.web4rail.tags.Label; +import de.srsoftware.web4rail.tags.Select; +import de.srsoftware.web4rail.tiles.TextDisplay; + +public class SetDisplayText extends TextAction{ + + private TextDisplay display; + private static final String DISPLAY = "display"; + + @Override + public boolean fire(Context context) { + plan.place(display.text(fill(text, context))); + return true; + } + + @Override + public JSONObject json() { + return super.json().put(DISPLAY, display.id()); + } + + @Override + protected Label label() { + return new Label(t("Text to show on display:")+NBSP); + } + + @Override + public Action load(JSONObject json) { + if (json.has(DISPLAY)) { + new Thread() { // load asynchronously, as referred tile may not be available,yet + public void run() { + try { + sleep(1000); + display = (TextDisplay) plan.get(json.getString(DISPLAY), false); + } catch (InterruptedException e) {} + }; + }.start(); + } + return super.load(json); + } + + @Override + public Window properties(HashMap params) { + Window win = super.properties(params); + + Select select = TextDisplay.selector(display, null); + Tag label = select.addTo(new Label(t("Select display:")+NBSP)); + + for (Tag tag : win.children()) { + if (tag instanceof Form) { + tag.children().insertElementAt(label, 1); + break; + } + } + return win; + } + + @Override + public String toString() { + return isNull(display) ? t("[Click here to select display!]") : t("Display \"{}\" on {}.",text,display); + } + + @Override + protected Object update(HashMap params) { + super.update(params); + String displayId = params.get(TextDisplay.class.getSimpleName()); + if (isSet(displayId)) display = (TextDisplay) plan.get(displayId, false); + return properties(params); + } +} diff --git a/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java b/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java index ed6d17c..94be3bd 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java @@ -1,8 +1,10 @@ package de.srsoftware.web4rail.tiles; import java.io.IOException; +import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Vector; import java.util.Map.Entry; import org.json.JSONObject; @@ -11,6 +13,7 @@ import de.srsoftware.tools.Tag; import de.srsoftware.web4rail.tags.Form; import de.srsoftware.web4rail.tags.Input; import de.srsoftware.web4rail.tags.Label; +import de.srsoftware.web4rail.tags.Select; public class TextDisplay extends StretchableTile { private static final String TEXT = "text"; @@ -46,6 +49,19 @@ public class TextDisplay extends StretchableTile { return form; } + public static Select selector(TextDisplay preselected,Collection exclude) { + if (isNull(exclude)) exclude = new Vector(); + Select select = new Select(TextDisplay.class.getSimpleName()); + new Tag("option").attr("value","0").content(t("unset")).addTo(select); + for (Tile tile : plan.tiles.values()) { + if (!(tile instanceof TextDisplay)) continue; + if (exclude.contains(tile)) continue; + Tag opt = select.addOption(tile.id(), tile); + if (tile == preselected) opt.attr("selected", "selected"); + } + return select; + } + @Override protected String stretchType() { return t("Width");