From b57d609a0b4cf8cc5ba966676b5af880de30d230 Mon Sep 17 00:00:00 2001 From: Tobias Pietzsch <tobias.pietzsch@gmail.com> Date: Mon, 16 Feb 2015 22:25:56 +0100 Subject: [PATCH] update parent to pom-bigdataviewer 1.0.10. Fix compile errors --- pom.xml | 2 +- src/main/java/bdv/ij/OpenImagePlusPlugIn.java | 22 ++++++------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index c5c1fc4..b6af041 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>sc.fiji</groupId> <artifactId>pom-bigdataviewer</artifactId> - <version>1.0.9</version> + <version>1.0.10</version> </parent> <artifactId>bigdataviewer_fiji</artifactId> diff --git a/src/main/java/bdv/ij/OpenImagePlusPlugIn.java b/src/main/java/bdv/ij/OpenImagePlusPlugIn.java index 2dd8282..2d9984b 100644 --- a/src/main/java/bdv/ij/OpenImagePlusPlugIn.java +++ b/src/main/java/bdv/ij/OpenImagePlusPlugIn.java @@ -21,7 +21,6 @@ import ij.ImagePlus; import ij.WindowManager; import ij.plugin.PlugIn; import ij.process.LUT; -import mpicbg.spim.data.SpimDataException; import mpicbg.spim.data.generic.sequence.BasicImgLoader; import mpicbg.spim.data.generic.sequence.BasicViewSetup; import mpicbg.spim.data.registration.ViewRegistration; @@ -173,20 +172,13 @@ public class OpenImagePlusPlugIn implements PlugIn final SpimDataMinimal spimData = new SpimDataMinimal( basePath, seq, new ViewRegistrations( registrations ) ); WrapBasicImgLoader.wrapImgLoaderIfNecessary( spimData ); - try - { - final BigDataViewer bdv = new BigDataViewer( spimData, "BigDataViewer", new ProgressWriterIJ() ); - final SetupAssignments sa = bdv.getSetupAssignments(); - final VisibilityAndGrouping vg = bdv.getViewer().getVisibilityAndGrouping(); - if ( imp.isComposite() ) - transferChannelSettings( ( CompositeImage ) imp, sa, vg ); - else if ( imp.getType() == ImagePlus.COLOR_RGB ) - transferSettingsRGB( imp, sa ); - } - catch ( final SpimDataException e ) - { - throw new RuntimeException( e ); - } + final BigDataViewer bdv = new BigDataViewer( spimData, "BigDataViewer", new ProgressWriterIJ() ); + final SetupAssignments sa = bdv.getSetupAssignments(); + final VisibilityAndGrouping vg = bdv.getViewer().getVisibilityAndGrouping(); + if ( imp.isComposite() ) + transferChannelSettings( ( CompositeImage ) imp, sa, vg ); + else if ( imp.getType() == ImagePlus.COLOR_RGB ) + transferSettingsRGB( imp, sa ); } protected void transferChannelSettings( final CompositeImage ci, final SetupAssignments setupAssignments, final VisibilityAndGrouping visibility ) -- GitLab