Skip to content
Snippets Groups Projects
Commit 84afddea authored by Jan Kožusznik's avatar Jan Kožusznik
Browse files

fix:iss1098 - update dashboard

parent 412f2103
No related branches found
No related tags found
No related merge requests found
package cz.it4i.fiji.haas_spim_benchmark.ui; package cz.it4i.fiji.haas_spim_benchmark.ui;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cz.it4i.fiji.haas.ui.ObservableValueRegistry; import cz.it4i.fiji.haas.ui.ObservableValueRegistry;
import cz.it4i.fiji.haas.ui.UpdatableObservableValue; import cz.it4i.fiji.haas.ui.UpdatableObservableValue;
import cz.it4i.fiji.haas.ui.UpdatableObservableValue.UpdateStatus; import cz.it4i.fiji.haas.ui.UpdatableObservableValue.UpdateStatus;
import cz.it4i.fiji.haas_java_client.JobState; import cz.it4i.fiji.haas_java_client.JobState;
import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.BenchmarkJob;
import cz.it4i.fiji.haas_spim_benchmark.core.Task; import cz.it4i.fiji.haas_spim_benchmark.core.Task;
import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation; import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation;
public class ObservableTaskRegistry extends ObservableValueRegistry<Task, UpdatableObservableValue<Task>> { public class ObservableTaskRegistry extends ObservableValueRegistry<Task, UpdatableObservableValue<Task>> {
public ObservableTaskRegistry(Consumer<Task> removeConsumer) { private final Supplier<BenchmarkJob> jobSupplier;
public ObservableTaskRegistry(Supplier<BenchmarkJob> jobSupplier,Consumer<Task> removeConsumer) {
super(t -> update(t), t -> t.getComputations().stream().map(tc -> tc.getState()).collect(Collectors.toList()), super(t -> update(t), t -> t.getComputations().stream().map(tc -> tc.getState()).collect(Collectors.toList()),
removeConsumer); removeConsumer);
this.jobSupplier = jobSupplier;
} }
@Override
public void update() {
jobSupplier.get().getTasks();
super.update();
}
@Override @Override
protected UpdatableObservableValue<Task> constructObservableValue(Task task) { protected UpdatableObservableValue<Task> constructObservableValue(Task task) {
return new UpdatableObservableValue<Task>(task, getUpdateFunction(), getStateProvider()); return new UpdatableObservableValue<Task>(task, getUpdateFunction(), getStateProvider());
......
...@@ -118,7 +118,7 @@ public class SPIMPipelineProgressViewController extends BorderPane implements Cl ...@@ -118,7 +118,7 @@ public class SPIMPipelineProgressViewController extends BorderPane implements Cl
JavaFXRoutines.initRootAndController("SPIMPipelineProgressView.fxml", this); JavaFXRoutines.initRootAndController("SPIMPipelineProgressView.fxml", this);
tasks.setPrefWidth(PREFERRED_WIDTH); tasks.setPrefWidth(PREFERRED_WIDTH);
timer = new Timer(); timer = new Timer();
registry = new ObservableTaskRegistry(task -> tasks.getItems().remove(registry.get(task))); registry = new ObservableTaskRegistry(()-> job, task -> tasks.getItems().remove(registry.get(task)));
TableViewContextMenu<ObservableValue<Task>> menu = new TableViewContextMenu<ObservableValue<Task>>(this.tasks); TableViewContextMenu<ObservableValue<Task>> menu = new TableViewContextMenu<ObservableValue<Task>>(this.tasks);
menu.addItem("Open view", (task, columnIndex) -> proof(task, columnIndex), menu.addItem("Open view", (task, columnIndex) -> proof(task, columnIndex),
(x, columnIndex) -> check(x, columnIndex)); (x, columnIndex) -> check(x, columnIndex));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment