Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Check-Cyz2Json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ jobs:
if [ "${{ matrix.os }}" == "macos-latest" ]; then
export DYLD_FALLBACK_LIBRARY_PATH=$(dirname $dll_path)
fi
dotnet $dll_path "$file" --imaging-set-information --image-processing --output $exmpl_path/"$bn".json
dotnet $dll_path "$file" --imaging-set-information --image-processing --output $exmpl_path/"$bn".json --version
echo "File successfully converted !"
7 changes: 6 additions & 1 deletion Cyz2Json/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static void Main(string[] args)
var outputOption = new Option<FileInfo>( name: "--output", description: "JSON output file");
var rawOption = new Option<bool>( name: "--raw", description: "Do not apply the moving weighted average filtering algorithm to pulse shapes. Export raw, unsmoothed data.");
var metadatagreedyOption = new Option<bool>( name: "--metadatagreedy", description: "Save all possible measurement settings with your file (default: true)", getDefaultValue: () => true);
var versionOption = new Option<bool>( name: "-V", description: "Display version information");
var versionOption = new Option<bool>( name: "--version", description: "Display version information");
var setInformationOption = new Option<bool>( name: "--imaging-set-information", description: "Export set information for imaging" );
var setDefinitionOverride = new Option<FileInfo>( name: "--imaging-set-definition", description: "File with set definitions, overrides the definitions stored in the file." ).ExistingOnly();

Expand Down Expand Up @@ -116,6 +116,11 @@ static void Main(string[] args)
MarginBase=imgMarginBase, MarginPercentage=imgMarginPercentage, ExtendObjectDetection=imgExtendObjectDetection};


if (version)
{
HandleVersion();
return;
}
Convert(input, output, raw, metadatagreedy, setInformation, setDefinitionFile, imgOpts);
}
foreach (ParseError parseError in parseResult.Errors)
Expand Down