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

new feature on clicking tiles: actions of tile now skipped, when shift is pressed during click

Browse Source
This commit is contained in:
Stephan Richter
2021-02-10 14:00:01 +01:00
parent 8ffbbf1109
commit b41ae2b314
19 changed files with 214 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/srsoftware/web4rail/actions/Action.java
View File

@@ -61,7 +61,7 @@ public abstract class Action extends BaseClass {
SetContextTrain.class,
SetDisplayText.class,
SetPower.class,
SetRelay.class,
SetRelayOrSwitch.class,
SetSignal.class,
SetSpeed.class,
SetTurnout.class,

93
src/main/java/de/srsoftware/web4rail/actions/SetRelay.java
View File

@@ -1,93 +0,0 @@
package de.srsoftware.web4rail.actions;
import java.util.HashMap;
import java.util.List;
import org.json.JSONObject;
import de.srsoftware.web4rail.Application;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
import de.srsoftware.web4rail.tiles.Relay;
public class SetRelay extends Action {
public SetRelay(BaseClass parent) {
super(parent);
}
private Relay relay = null;
private boolean state = false;
@Override
public boolean fire(Context context) {
if (isNull(relay)) return false;
relay.state(state);
return true;
}
@Override
public JSONObject json() {
JSONObject json = super.json();
if (isSet(relay)) {
json.put(RELAY, relay.id());
json.put(Relay.STATE, state);
}
return json;
}
@Override
public Action load(JSONObject json) {
super.load(json);
if (json.has(RELAY)) {
String relayId = json.getString(RELAY);
relay = BaseClass.get(new Id(relayId));
if (isNull(relay)) Application.threadPool.execute(new Thread() { // if relay not loaded, yet: wait one sec and try again
public void run() {
try {
sleep(1000);
} catch (InterruptedException e) {}
relay = BaseClass.get(new Id(relayId));
};
});
}
if (json.has(Relay.STATE)) state = json.getBoolean(Relay.STATE);
return this;
}
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(t("Select relay"),Relay.selector(relay,null));
Select state = new Select(Relay.STATE);
state.addOption(true,isNull(relay)?Relay.DEFAULT_LABEL_A:relay.stateLabelA);
state.addOption(false,isNull(relay)?Relay.DEFAULT_LABEL_B:relay.stateLabelB);
formInputs.add(t("Select state"),state);
return super.properties(preForm, formInputs, postForm);
}
@Override
protected void removeChild(BaseClass child) {
if (child == relay) relay = null;
super.removeChild(child);
}
public String toString() {
if (isNull(relay)) return "["+t("click here to setup relay")+"]";
return t("Set {} to {}",relay,state?relay.stateLabelA:relay.stateLabelB);
};
@Override
protected Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params);
Id relayId = new Id(params.get(Relay.class.getSimpleName()));
relay = BaseClass.get(relayId);
String st = params.get(Relay.STATE);
if (isSet(st)) state = st.equals("true");
return context().properties();
}
}

131
src/main/java/de/srsoftware/web4rail/actions/SetRelayOrSwitch.java Normal file
View File

@@ -0,0 +1,131 @@
package de.srsoftware.web4rail.actions;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Application;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
import de.srsoftware.web4rail.tiles.Relay;
import de.srsoftware.web4rail.tiles.Switch;
import de.srsoftware.web4rail.tiles.Tile;
public class SetRelayOrSwitch extends Action {
private static final String SWITCH = "switch";
public SetRelayOrSwitch(BaseClass parent) {
super(parent);
}
private Tile relayOrSwitch = null;
private boolean state = false;
@Override
public boolean fire(Context context) {
if (isNull(relayOrSwitch)) return false;
if (relayOrSwitch instanceof Relay) ((Relay)relayOrSwitch).state(state);
if (relayOrSwitch instanceof Switch) ((Switch)relayOrSwitch).state(state);
return true;
}
@Override
public JSONObject json() {
JSONObject json = super.json();
if (relayOrSwitch instanceof Relay) {
json.put(RELAY, relayOrSwitch.id());
json.put(STATE, state);
}
if (relayOrSwitch instanceof Switch) {
json.put(SWITCH, relayOrSwitch.id());
json.put(STATE, state);
}
return json;
}
@Override
public Action load(JSONObject json) {
super.load(json);
if (json.has(RELAY)) {
String relayId = json.getString(RELAY);
relayOrSwitch = BaseClass.get(new Id(relayId));
if (isNull(relayOrSwitch)) Application.threadPool.execute(new Thread() { // if relay not loaded, yet: wait one sec and try again
public void run() {
try {
sleep(1000);
} catch (InterruptedException e) {}
relayOrSwitch = BaseClass.get(new Id(relayId));
};
});
}
if (json.has(SWITCH)) {
String relayId = json.getString(SWITCH);
relayOrSwitch = BaseClass.get(new Id(relayId));
if (isNull(relayOrSwitch)) Application.threadPool.execute(new Thread() { // if relay not loaded, yet: wait one sec and try again
public void run() {
try {
sleep(1000);
} catch (InterruptedException e) {}
relayOrSwitch = BaseClass.get(new Id(relayId));
};
});
}
if (json.has(STATE)) state = json.getBoolean(STATE);
return this;
}
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
Tag span = new Tag("span");
if (isSet(relayOrSwitch)) span.content(relayOrSwitch+NBSP);
button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,Relay.class.getSimpleName())).addTo(span);
formInputs.add(t("Select relay"),span);
Select state = new Select(Relay.STATE);
if (relayOrSwitch instanceof Relay) {
Relay relay = (Relay) relayOrSwitch;
state.addOption(true,relay.stateLabelA);
state.addOption(false,relay.stateLabelB);
}
if (relayOrSwitch instanceof Switch) {
state.addOption(true,t("On"));
state.addOption(false,t("Off"));
}
formInputs.add(t("Select state"),state);
return super.properties(preForm, formInputs, postForm);
}
@Override
protected void removeChild(BaseClass child) {
if (child == relayOrSwitch) relayOrSwitch = null;
super.removeChild(child);
}
public String toString() {
if (isNull(relayOrSwitch)) return "["+t("click here to setup relay or switch")+"]";
if (relayOrSwitch instanceof Relay) {
Relay relay = (Relay) relayOrSwitch;
return t("Set {} to {}",relayOrSwitch,state?relay.stateLabelA:relay.stateLabelB);
}
return t("Set {} to {}",relayOrSwitch,state?t("On"):t("Off"));
};
@Override
protected Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params);
String tileId = params.get(Relay.class.getSimpleName());
Tile tile = isSet(tileId) ? BaseClass.get(new Id(tileId)) : relayOrSwitch;
if (tile instanceof Relay || tile instanceof Switch) {
relayOrSwitch = tile;
}
String st = params.get(Relay.STATE);
if (isSet(st)) state = st.equals("true");
return context().properties();
}
}