implemented automatic brake time learning

This commit is contained in:
Stephan Richter
2020-11-27 23:51:45 +01:00
parent 5b73a909df
commit ba2be67f8f
11 changed files with 230 additions and 15 deletions

View File

@@ -134,12 +134,16 @@ public abstract class Action extends BaseClass {
public static List<Class<? extends Action>> list() {
return List.of(
BrakeStart.class,
BrakeStop.class,
BrakeCancel.class,
ConditionalAction.class,
DelayedAction.class,
DetermineTrainInBlock.class,
FinishRoute.class,
PreserveRoute.class,
SendCommand.class,
SetContextTrain.class,
SetDisplayText.class,
SetPower.class,
SetRelay.class,

View File

@@ -0,0 +1,12 @@
package de.srsoftware.web4rail.actions;
public class BrakeCancel extends Action {
@Override
public boolean fire(Context context) {
if (isNull(context.route)) return false;
context.route.brakeCancel();
return true;
}
}

View File

@@ -0,0 +1,13 @@
package de.srsoftware.web4rail.actions;
public class BrakeStart extends Action {
@Override
public boolean fire(Context context) {
if (isNull(context.route)) return false;
context.route.brakeStart();
LOG.debug("Started brake process...");
return true;
}
}

View File

@@ -0,0 +1,12 @@
package de.srsoftware.web4rail.actions;
public class BrakeStop extends Action {
@Override
public boolean fire(Context context) {
if (isNull(context.route)) return false;
context.route.brakeStop();
return true;
}
}

View File

@@ -0,0 +1,77 @@
package de.srsoftware.web4rail.actions;
import java.util.HashMap;
import org.json.JSONObject;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Button;
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 SetContextTrain extends Action {
private Train train = null;
@Override
public boolean fire(Context context) {
context.train = train;
return true;
}
@Override
public JSONObject json() {
JSONObject json = super.json();
if (isSet(train)) json.put(REALM_TRAIN, train.id);
return json;
}
@Override
public Action load(JSONObject json) {
super.load(json);
if (json.has(REALM_TRAIN)) {
new Thread() { // load asynchronously, as referred tile may not be available,yet
public void run() {
try {
sleep(1000);
int trainId = json.getInt(REALM_TRAIN);
if (isSet(trainId)) train = Train.get(trainId);
} catch (InterruptedException e) {}
};
}.start();
}
return this;
}
@Override
public Window properties(HashMap<String, String> params) {
Window win = super.properties(params);
Form form = new Form("action-prop-form-"+id);
new Input(REALM,REALM_ACTIONS).hideIn(form);
new Input(ID,params.get(ID)).hideIn(form);
new Input(ACTION,ACTION_UPDATE).hideIn(form);
new Input(CONTEXT,params.get(CONTEXT)).hideIn(form);
Select select = Train.selector(train, null);
select.addTo(new Label(t("Select train:")+NBSP)).addTo(form);
new Button(t("Apply"),form).addTo(form).addTo(win);
return win;
}
public String toString() {
return isSet(train) ? t("Set {} as context",train) : "["+t("Click here to select train!")+"]";
};
@Override
protected Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params);
String trainId = params.get(Train.class.getSimpleName());
if (isSet(trainId)) train = Train.get(Integer.parseInt(trainId));
return properties(params);
}
}