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

remove deprecated BigDataViewer constructors and static methods

parent fa3e1fd2
No related branches found
No related tags found
No related merge requests found
......@@ -695,79 +695,6 @@ public class BigDataViewer
viewer.requestRepaint();
}
/**
* Deprecated, please use {@link #open(String, String, ProgressWriter, ViewerOptions)} instead.
*/
@Deprecated
public BigDataViewer( final String xmlFilename, final String windowTitle, final ProgressWriter progressWriter ) throws SpimDataException
{
this( new XmlIoSpimDataMinimal().load( xmlFilename ), windowTitle, progressWriter );
if ( !tryLoadSettings( xmlFilename ) )
InitializeViewerState.initBrightness( 0.001, 0.999, viewer, setupAssignments );
}
/**
* Deprecated, please use {@link #open(AbstractSpimData, String, ProgressWriter, ViewerOptions)} instead.
*/
@Deprecated
public BigDataViewer( final AbstractSpimData< ? > spimData, final String windowTitle, final ProgressWriter progressWriter )
{
this( new ForDeprecatedConstructors( spimData, windowTitle, progressWriter ) );
viewerFrame.setVisible( true );
InitializeViewerState.initTransform( viewer );
}
@Deprecated
private static class ForDeprecatedConstructors
{
final ArrayList< ConverterSetup > converterSetups;
final ArrayList< SourceAndConverter< ? > > sources;
final AbstractSpimData< ? > spimData;
final int numTimepoints;
final CacheControl cache;
final String windowTitle;
final ProgressWriter progressWriter;
final ViewerOptions options;
private ForDeprecatedConstructors( final AbstractSpimData< ? > spimData, final String windowTitle, final ProgressWriter progressWriter )
{
this.windowTitle = windowTitle;
this.progressWriter = progressWriter;
this.spimData = spimData;
this.options = ViewerOptions.options();
if ( WrapBasicImgLoader.wrapImgLoaderIfNecessary( spimData ) )
{
System.err.println( "WARNING:\nOpening <SpimData> dataset that is not suited for interactive browsing.\nConsider resaving as HDF5 for better performance." );
}
converterSetups = new ArrayList<>();
sources = new ArrayList<>();
initSetups( spimData, converterSetups, sources );
final AbstractSequenceDescription< ?, ?, ? > seq = spimData.getSequenceDescription();
numTimepoints = seq.getTimePoints().size();
cache = ( ( ViewerImgLoader ) seq.getImgLoader() ).getCacheControl();
WrapBasicImgLoader.removeWrapperIfPresent( spimData );
}
}
@Deprecated
private BigDataViewer( final ForDeprecatedConstructors p )
{
this( p.converterSetups, p.sources, p.spimData, p.numTimepoints, p.cache, p.windowTitle, p.progressWriter, p.options );
}
/**
* Deprecated, please use {@link #open(String, String, ProgressWriter, ViewerOptions)} instead.
*/
@Deprecated
public static void view( final String filename, final ProgressWriter progressWriter ) throws SpimDataException
{
open( filename, new File( filename ).getName(), progressWriter, ViewerOptions.options() );
}
public static void main( final String[] args )
{
// final String fn = "http://tomancak-mac-17.mpi-cbg.de:8080/openspim/";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment