Skip to content
Snippets Groups Projects
Commit 6b866325 authored by Vojtech Moravec's avatar Vojtech Moravec
Browse files

Add one file, missed in last commit.

parent 1295eb59
Branches
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ package cz.it4i.qcmp.cli; ...@@ -3,6 +3,7 @@ package cz.it4i.qcmp.cli;
import cz.it4i.qcmp.ScifioWrapper; import cz.it4i.qcmp.ScifioWrapper;
import cz.it4i.qcmp.compression.CompressionOptions; import cz.it4i.qcmp.compression.CompressionOptions;
import cz.it4i.qcmp.compression.CompressorDecompressorBase; import cz.it4i.qcmp.compression.CompressorDecompressorBase;
import cz.it4i.qcmp.data.HyperStackDimensions;
import cz.it4i.qcmp.data.Range; import cz.it4i.qcmp.data.Range;
import cz.it4i.qcmp.data.V2i; import cz.it4i.qcmp.data.V2i;
import cz.it4i.qcmp.data.V3i; import cz.it4i.qcmp.data.V3i;
...@@ -178,18 +179,17 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C ...@@ -178,18 +179,17 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C
return; return;
} }
final FileInputData fileInputData = new FileInputData(inputFileArguments[0]);
setInputDataInfo(fileInputData);
// Decompress and Inspect methods doesn't require additional file information. // Decompress and Inspect methods doesn't require additional file information.
if ((method == ProgramMethod.Decompress) || (method == ProgramMethod.InspectFile)) { if ((method == ProgramMethod.Decompress) || (method == ProgramMethod.InspectFile)) {
setInputDataInfo(new FileInputData(inputFileArguments[0], null));
return; return;
} }
// Check if input file exists. // Check if input file exists.
if (!new File(fileInputData.getFilePath()).exists()) { if (!new File(inputFileArguments[0]).exists()) {
parseErrorOccurred = true; parseErrorOccurred = true;
errorBuilder.append("Input file doesn't exist. Provided path: '").append(fileInputData.getFilePath()).append("'\n"); errorBuilder.append("Input file doesn't exist. Provided path: '").append(inputFileArguments[0]).append("'\n");
return; return;
} }
...@@ -215,6 +215,7 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C ...@@ -215,6 +215,7 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C
return; return;
} }
final int imageCount = reader.getImageCount(); final int imageCount = reader.getImageCount();
if (imageCount != 1) { if (imageCount != 1) {
parseErrorOccurred = true; parseErrorOccurred = true;
...@@ -251,11 +252,9 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C ...@@ -251,11 +252,9 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C
return; return;
} }
getInputDataInfo().setDimension(new V3i( setInputDataInfo(new FileInputData(inputFileArguments[0], new HyperStackDimensions((int) planeWidth,
(int) planeWidth, (int) planeHeight,
(int) planeHeight, (int) planeCount)));
(int) planeCount
));
if (inputFileArguments.length > 1) { if (inputFileArguments.length > 1) {
parseInputFilePlaneOptions(errorBuilder, inputFileArguments, 1); parseInputFilePlaneOptions(errorBuilder, inputFileArguments, 1);
...@@ -272,10 +271,10 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C ...@@ -272,10 +271,10 @@ public class CompressionOptionsCLIParser extends CompressionOptions implements C
return; return;
} }
getInputDataInfo().setDataLoaderType(InputData.DataLoaderType.RawDataLoader); getInputDataInfo().setDataLoaderType(InputData.DataLoaderType.RawDataLoader);
final Optional<V3i> parsedImageDims = ParseUtils.tryParseV3i(inputFileArguments[1], 'x');
if (parsedImageDims.isPresent()) { final Optional<HyperStackDimensions> parsedDatasetDims = ParseUtils.tryParseHyperStackDimensions(inputFileArguments[1], 'x');
getInputDataInfo().setDimension(parsedImageDims.get()); if (parsedDatasetDims.isPresent()) {
setInputDataInfo(new FileInputData(inputFileArguments[0], parsedDatasetDims.get()));
} else { } else {
parseErrorOccurred = true; parseErrorOccurred = true;
errorBuilder.append("Failed to parse image dimensions of format DxDxD. Got: ") errorBuilder.append("Failed to parse image dimensions of format DxDxD. Got: ")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment