Commit 3b485572 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

started read cameras with timeout

parent 2d439266

src/main/java/com/elphel/imagej/calibration/Aberration_Calibration.java

+1 −1
Original line number Diff line number Diff line
@@ -9661,7 +9661,7 @@ if (MORE_BUTTONS) { 
		LENS_DISTORTIONS.stopEachSeries= false; // will not ask for confirmation after done

		LENS_DISTORTIONS.lambda=LENS_DISTORTIONS.fittingStrategy.lambdas[0];

		Distortions distortions_dbg = LENS_DISTORTIONS;

		LENS_DISTORTIONS.LevenbergMarquardt(

		LENS_DISTORTIONS.LevenbergMarquardt( // Index 0 out of bounds for length 0

				false, // skip dialog

				false, // new: dry_run use it here?

				true);

src/main/java/com/elphel/imagej/readers/ImagejJp4TiffMulti.java

+16 −0
Original line number Diff line number Diff line
@@ -51,6 +51,22 @@ public class ImagejJp4TiffMulti { 
			final boolean scale,

			final String std) throws IOException, FormatException  // std - include non-elphel properties with prefix std

	{

		return 	getMultiImages(

				urls,

				imps,

				0.0, // final double timeout_sec,

				scale,

				std);

	}

	

	

	public ImagePlus [] getMultiImages(

			final String [] urls,

			final ImagePlus [] imps,

			final double timeout_sec,

			final boolean scale,

			final String std) throws IOException, FormatException  // std - include non-elphel properties with prefix std

	{

//		final ImagePlus [] imps = new ImagePlus [urls.length];

		LOGGER.error("Please ignore 'File has length 0 and may be corrupt' - caused by bioformat reading memory file");

   		final Thread[] threads = newThreadArray(MAX_THREADS);