From 2ab025d512c0cd43e923684931f2d48ecd5bd174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Mon, 9 Jul 2018 15:56:27 +0200
Subject: [PATCH] feat: iss1106
correspondence of names with MICCAI paper
Conflicts:
haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
---
.../fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java | 4 +---
.../cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml | 6 +++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
index 247b9961..bd243f78 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
@@ -135,9 +135,7 @@ public class BenchmarkSPIMControl extends BorderPane implements CloseableControl
menu.addItem("Job dashboard", job -> openJobDetailsWindow(job.getValue()),
job -> JavaFXRoutines.notNullValue(job, j -> true));
-
- menu.addItem("Open working directory", j -> open(j.getValue()), x -> JavaFXRoutines.notNullValue(x, j -> true));
-
+ menu.addItem("Open job subdirectory", j -> open(j.getValue()), x -> JavaFXRoutines.notNullValue(x, j -> true));
menu.addSeparator();
menu.addItem("Upload data", job -> executeWSCallAsync("Uploading data", p -> job.getValue().startUpload()),
diff --git a/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml b/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
index c1111847..ef88f5a5 100644
--- a/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
+++ b/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
@@ -36,10 +36,10 @@
</RadioButton>
<RadioButton maxHeight="1.7976931348623157E308" mnemonicParsing="false" toggleGroup="$tg_inputDataLocation">
<graphic>
- <Label maxHeight="1.7976931348623157E308" text="Job working directory" />
+ <Label maxHeight="1.7976931348623157E308" text="Job subdirectory" />
</graphic>
<tooltip>
- <Tooltip text="Job working directory will be used as location for input data. Data and config.yaml will be needed to copy into it." />
+ <Tooltip text="Local job subdirectory will be used as location for input data. Data and config.yaml will be needed to copy into it." />
</tooltip>
</RadioButton>
<RadioButton fx:id="rb_ownInput" mnemonicParsing="false" toggleGroup="$tg_inputDataLocation">
@@ -74,7 +74,7 @@
<ToggleGroup fx:id="tg_outputDataLocation" />
</toggleGroup>
<graphic>
- <Label maxHeight="1.7976931348623157E308" text="Job working directory" />
+ <Label maxHeight="1.7976931348623157E308" text="Job subdirectory" />
</graphic>
</RadioButton>
</children>
--
GitLab