Skip to content

Commit a7f8ad2

Browse files
committed
Fix #234
Update dependencies (bdv-image-loaders)
1 parent 6af3483 commit a7f8ad2

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108

109109
<!-- bdv playground related dependencies -->
110110
<bigdataviewer-playground.version>0.11.2</bigdataviewer-playground.version>
111-
<bigdataviewer-image-loaders.version>0.10.5-SNAPSHOT</bigdataviewer-image-loaders.version>
111+
<bigdataviewer-image-loaders.version>0.10.5</bigdataviewer-image-loaders.version>
112112
<bigdataviewer-biop-tools.version>0.12.0</bigdataviewer-biop-tools.version>
113113
<bigdataviewer-selector.version>0.2.8</bigdataviewer-selector.version>
114114

src/main/java/ch/epfl/biop/atlas/aligner/MultiSlicePositioner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ public boolean loadState(File stateFileAbba) {
11121112
return legacyLoadState(stateFileAbba);
11131113
}
11141114

1115-
boolean emptyState = this.slices.size()==0;
1115+
boolean emptyState = this.slices.isEmpty();
11161116
// TODO : add a clock as an overlay
11171117
getSlices().forEach(SliceSources::waitForEndOfTasks);
11181118
// We prepare the loading of the state, so that's a task:

src/main/java/ch/epfl/biop/atlas/aligner/gui/bdv/BdvMultislicePositionerView.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,7 @@
139139
import java.nio.file.Files;
140140
import java.nio.file.Paths;
141141
import java.text.DecimalFormat;
142-
import java.util.ArrayList;
143-
import java.util.HashSet;
144-
import java.util.List;
145-
import java.util.Map;
146-
import java.util.Optional;
147-
import java.util.Set;
142+
import java.util.*;
148143
import java.util.concurrent.ConcurrentHashMap;
149144
import java.util.concurrent.atomic.AtomicBoolean;
150145
import java.util.function.BiConsumer;
@@ -1058,9 +1053,11 @@ public void saveState(File stateFileIn) {
10581053

10591054
// Ok, let's save the view File
10601055

1061-
//serializeView(viewFile);
1062-
List<SliceGuiState.State> states = new ArrayList<>();
1063-
guiState.forEachSlice(sliceState -> states.add(new SliceGuiState.State(sliceState)));
1056+
List<SliceGuiState.State> states = new ArrayList<>(Collections.nCopies(msp.getSlices().size(), null));
1057+
1058+
guiState.forEachSlice(sliceState ->
1059+
states.set(sliceState.slice.getIndex(), new SliceGuiState.State(sliceState))
1060+
);
10641061
ViewState vs = new ViewState();
10651062
vs.slicesStates = states;
10661063
vs.showInfo = showSliceInfo;
@@ -2455,7 +2452,7 @@ void deleted(SliceSources slice) {
24552452

24562453
//synchronized
24572454
int nSlices() {
2458-
return sliceGuiState.values().size();
2455+
return sliceGuiState.size();
24592456
}
24602457

24612458
//synchronized

0 commit comments

Comments
 (0)