Skip to content

Commit 20507ab

Browse files
committed
Adds overlay helper methods (see #272)
Update bigdataviewer selector
1 parent 9419d44 commit 20507ab

File tree

2 files changed

+36
-11
lines changed

2 files changed

+36
-11
lines changed

pom.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<!-- <scijava.app.directory>C:/Users/nicol/Desktop/fiji-win64-bdv-playground/Fiji.app/</scijava.app.directory> -->
121121

122122
<!-- package version below are not present in the parent pom. A version is needed -->
123-
<bigdataviewer-selector.version>0.2.7</bigdataviewer-selector.version>
123+
<bigdataviewer-selector.version>0.2.8</bigdataviewer-selector.version>
124124
<reflections.version>0.10.2</reflections.version> <!-- for test only -->
125125

126126
<!-- package version below are determined by the parent pom but need to be upgraded or temporarily fixed for bugs -->
@@ -159,7 +159,6 @@
159159
<dependency>
160160
<groupId>sc.fiji</groupId>
161161
<artifactId>bigvolumeviewer</artifactId>
162-
<version>${bigvolumeviewer.version}</version>
163162
</dependency>
164163

165164
<dependency>
@@ -168,21 +167,13 @@
168167
</dependency>
169168

170169
<dependency>
171-
<groupId>net.imglib2</groupId>
170+
<groupId>net.imglib2</groupId>do overlay helper!!!y
172171
<artifactId>imglib2-realtransform</artifactId>
173-
<version>${imglib2-realtransform.version}</version>
174-
</dependency>
175-
176-
<dependency>
177-
<groupId>sc.fiji</groupId>
178-
<artifactId>spim_data</artifactId>
179-
<version>${spim_data.version}</version>
180172
</dependency>
181173

182174
<dependency>
183175
<groupId>sc.fiji</groupId>
184176
<artifactId>bigwarp_fiji</artifactId>
185-
<version>${bigwarp_fiji.version}</version>
186177
</dependency>
187178

188179
<!-- Test dependencies -->

src/main/java/sc/fiji/bdvpg/bdv/BdvHandleHelper.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import bdv.util.BdvHandlePanel;
3737
import bdv.util.BdvOptions;
3838
import bdv.util.BdvOverlay;
39+
import bdv.util.BdvOverlaySource;
3940
import bdv.viewer.Source;
4041
import net.imglib2.FinalInterval;
4142
import net.imglib2.FinalRealInterval;
@@ -581,4 +582,37 @@ public static void removeCard(BdvHandle bdvh, Object key) {
581582
SwingUtilities.invokeLater(() -> bdvh.getCardPanel().removeCard(key));
582583
}
583584

585+
/**
586+
* Helper function that maintains the number of timepoints of a bdv when addinf an overlay
587+
* see
588+
* @param bdvh
589+
* @param overlay
590+
* @param name
591+
* @return
592+
* @param <T>
593+
*/
594+
public static <T extends BdvOverlay> BdvOverlaySource<T> addOverlay(BdvHandle bdvh, T overlay, String name) {
595+
// Store
596+
int nTimepoints = bdvh.getViewerPanel().state().getNumTimepoints();
597+
int currentTimePoint = bdvh.getViewerPanel().state().getCurrentTimepoint();
598+
BdvOverlaySource<T> bos = BdvFunctions.showOverlay(overlay, name, BdvOptions.options().addTo(bdvh));
599+
bdvh.getViewerPanel().state().setNumTimepoints(nTimepoints);
600+
bdvh.getViewerPanel().state().setCurrentTimepoint(currentTimePoint);
601+
return bos;
602+
}
603+
604+
/**
605+
* Helper function that maintains the number of timepoints of a bdv when removing an overlay
606+
* @param overlay
607+
*/
608+
public static void removeOverlay(BdvOverlaySource<?> overlay) {
609+
// Store
610+
BdvHandle bdvh = overlay.getBdvHandle();
611+
int nTimepoints = bdvh.getViewerPanel().state().getNumTimepoints();
612+
int currentTimePoint = bdvh.getViewerPanel().state().getCurrentTimepoint();
613+
overlay.removeFromBdv();
614+
bdvh.getViewerPanel().state().setNumTimepoints(nTimepoints);
615+
bdvh.getViewerPanel().state().setCurrentTimepoint(currentTimePoint);
616+
}
617+
584618
}

0 commit comments

Comments
 (0)