Skip to content
Snippets Groups Projects
Commit b57d609a authored by Tobias Pietzsch's avatar Tobias Pietzsch
Browse files

update parent to pom-bigdataviewer 1.0.10. Fix compile errors

parent 72c2dac0
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>sc.fiji</groupId> <groupId>sc.fiji</groupId>
<artifactId>pom-bigdataviewer</artifactId> <artifactId>pom-bigdataviewer</artifactId>
<version>1.0.9</version> <version>1.0.10</version>
</parent> </parent>
<artifactId>bigdataviewer_fiji</artifactId> <artifactId>bigdataviewer_fiji</artifactId>
......
...@@ -21,7 +21,6 @@ import ij.ImagePlus; ...@@ -21,7 +21,6 @@ import ij.ImagePlus;
import ij.WindowManager; import ij.WindowManager;
import ij.plugin.PlugIn; import ij.plugin.PlugIn;
import ij.process.LUT; import ij.process.LUT;
import mpicbg.spim.data.SpimDataException;
import mpicbg.spim.data.generic.sequence.BasicImgLoader; import mpicbg.spim.data.generic.sequence.BasicImgLoader;
import mpicbg.spim.data.generic.sequence.BasicViewSetup; import mpicbg.spim.data.generic.sequence.BasicViewSetup;
import mpicbg.spim.data.registration.ViewRegistration; import mpicbg.spim.data.registration.ViewRegistration;
...@@ -173,20 +172,13 @@ public class OpenImagePlusPlugIn implements PlugIn ...@@ -173,20 +172,13 @@ public class OpenImagePlusPlugIn implements PlugIn
final SpimDataMinimal spimData = new SpimDataMinimal( basePath, seq, new ViewRegistrations( registrations ) ); final SpimDataMinimal spimData = new SpimDataMinimal( basePath, seq, new ViewRegistrations( registrations ) );
WrapBasicImgLoader.wrapImgLoaderIfNecessary( spimData ); WrapBasicImgLoader.wrapImgLoaderIfNecessary( spimData );
try final BigDataViewer bdv = new BigDataViewer( spimData, "BigDataViewer", new ProgressWriterIJ() );
{ final SetupAssignments sa = bdv.getSetupAssignments();
final BigDataViewer bdv = new BigDataViewer( spimData, "BigDataViewer", new ProgressWriterIJ() ); final VisibilityAndGrouping vg = bdv.getViewer().getVisibilityAndGrouping();
final SetupAssignments sa = bdv.getSetupAssignments(); if ( imp.isComposite() )
final VisibilityAndGrouping vg = bdv.getViewer().getVisibilityAndGrouping(); transferChannelSettings( ( CompositeImage ) imp, sa, vg );
if ( imp.isComposite() ) else if ( imp.getType() == ImagePlus.COLOR_RGB )
transferChannelSettings( ( CompositeImage ) imp, sa, vg ); transferSettingsRGB( imp, sa );
else if ( imp.getType() == ImagePlus.COLOR_RGB )
transferSettingsRGB( imp, sa );
}
catch ( final SpimDataException e )
{
throw new RuntimeException( e );
}
} }
protected void transferChannelSettings( final CompositeImage ci, final SetupAssignments setupAssignments, final VisibilityAndGrouping visibility ) protected void transferChannelSettings( final CompositeImage ci, final SetupAssignments setupAssignments, final VisibilityAndGrouping visibility )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment