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
6 changes: 3 additions & 3 deletions .github/workflows/mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

# MegaLinter
- name: MegaLinter
id: ml
# You can override MegaLinter flavor used to have faster performances
# More info at https://megalinter.io/flavors/
uses: oxsecurity/megalinter/flavors/dotnet@v6
uses: oxsecurity/megalinter/flavors/dotnet@v7
env:
# All available variables are described in documentation
# https://megalinter.io/configuration/
Expand All @@ -38,7 +38,7 @@ jobs:
# Upload MegaLinter artifacts
- name: Archive production artifacts
if: ${{ success() || failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: MegaLinter reports
path: |
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 3.15)

project(CZICheck
VERSION 0.6.0
VERSION 0.6.1
HOMEPAGE_URL "https://github.com/ZEISS/czicheck"
DESCRIPTION "CZICheck is a validator for CZI-documents")

Expand Down
20,694 changes: 10,920 additions & 9,774 deletions CZICheck/checkers/schema/ZEN/flatten/ImageMetadata.xsd

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion CZICheck/resultgathererfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ std::unique_ptr<IResultGatherer> CreateResultGatherer(const CCmdLineOptions& opt
throw std::invalid_argument("Unknown output encoding format");
}
}

2 changes: 1 addition & 1 deletion Test/CZICheckSamples/differentpixeltypeinchannel.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/differentpixeltypeinchannel.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@
<AggregatedResult>WARN</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/duplicate_coordinates.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/duplicate_coordinates.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
4 changes: 2 additions & 2 deletions Test/CZICheckSamples/edf-missing-texture.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Test "Basic semantic checks of the XML-metadata" : OK
Test "validate the XML-metadata against XSD-schema" :
(101,22): no declaration found for element 'RotationCenter'
(105,15): element 'RotationCenter' is not allowed for content model 'All(SessionMatrix?,HolderZeissName?,HolderZeissId?,HolderCwsId?,SessionCount?,SessionRotationAtStart?,CustomAttributes?)'
(112,21): no declaration found for element 'LookupTables'
<3 more findings omitted>
(188,29): attribute 'Id' is not declared for element 'Scaling'
<1 more finding omitted>
FAIL
Test "check if subblocks at pyramid-layer 0 of different scenes are overlapping" : OK
Test "SubBlock-Segments in SubBlockDirectory are valid and valid content" : OK
Expand Down
12 changes: 1 addition & 11 deletions Test/CZICheckSamples/edf-missing-texture.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@
"description": "(105,15): element 'RotationCenter' is not allowed for content model 'All(SessionMatrix?,HolderZeissName?,HolderZeissId?,HolderCwsId?,SessionCount?,SessionRotationAtStart?,CustomAttributes?)'",
"details": ""
},
{
"severity": "FATAL",
"description": "(112,21): no declaration found for element 'LookupTables'",
"details": ""
},
{
"severity": "FATAL",
"description": "(113,12): element 'LookupTables' is not allowed for content model 'All(SizeX?,SizeY?,SizeC?,SizeZ?,SizeT?,SizeH?,SizeR?,SizeV?,SizeS?,SizeI?,SizeM?,SizeB?,PixelType?,ComponentBitCount?,OriginalScanData?,AcquisitionDateAndTime?,AcquisitionDuration?,OriginalCompressionMethod?,OriginalEncodingQuality?,OriginalCompressionParameters?,CurrentCompressionParameters?,Dimensions?,MicroscopeRef?,MicroscopeSettings?,ObjectiveSettings?,TubeLenses?,Specimen?,Session?,SpatialRelations?,CustomAttributes?)'",
"details": ""
},
{
"severity": "FATAL",
"description": "(188,29): attribute 'Id' is not declared for element 'Scaling'",
Expand Down Expand Up @@ -125,6 +115,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
12 changes: 1 addition & 11 deletions Test/CZICheckSamples/edf-missing-texture.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,6 @@
<Description>(105,15): element 'RotationCenter' is not allowed for content model 'All(SessionMatrix?,HolderZeissName?,HolderZeissId?,HolderCwsId?,SessionCount?,SessionRotationAtStart?,CustomAttributes?)'</Description>
<Details></Details>
</Finding>
<Finding>
<Severity>FATAL</Severity>
<Description>(112,21): no declaration found for element 'LookupTables'</Description>
<Details></Details>
</Finding>
<Finding>
<Severity>FATAL</Severity>
<Description>(113,12): element 'LookupTables' is not allowed for content model 'All(SizeX?,SizeY?,SizeC?,SizeZ?,SizeT?,SizeH?,SizeR?,SizeV?,SizeS?,SizeI?,SizeM?,SizeB?,PixelType?,ComponentBitCount?,OriginalScanData?,AcquisitionDateAndTime?,AcquisitionDuration?,OriginalCompressionMethod?,OriginalEncodingQuality?,OriginalCompressionParameters?,CurrentCompressionParameters?,Dimensions?,MicroscopeRef?,MicroscopeSettings?,ObjectiveSettings?,TubeLenses?,Specimen?,Session?,SpatialRelations?,CustomAttributes?)'</Description>
<Details></Details>
</Finding>
<Finding>
<Severity>FATAL</Severity>
<Description>(188,29): attribute 'Id' is not declared for element 'Scaling'</Description>
Expand Down Expand Up @@ -112,6 +102,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
4 changes: 2 additions & 2 deletions Test/CZICheckSamples/edf-superfluous.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Test "Basic semantic checks of the XML-metadata" : OK
Test "validate the XML-metadata against XSD-schema" :
(121,22): no declaration found for element 'RotationCenter'
(125,15): element 'RotationCenter' is not allowed for content model 'All(SessionMatrix?,HolderZeissName?,HolderZeissId?,HolderCwsId?,SessionCount?,SessionRotationAtStart?,CustomAttributes?)'
(139,21): no declaration found for element 'LookupTables'
<3 more findings omitted>
(222,29): attribute 'Id' is not declared for element 'Scaling'
<1 more finding omitted>
FAIL
Test "check if subblocks at pyramid-layer 0 of different scenes are overlapping" : OK
Test "SubBlock-Segments in SubBlockDirectory are valid and valid content" : OK
Expand Down
12 changes: 1 addition & 11 deletions Test/CZICheckSamples/edf-superfluous.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@
"description": "(125,15): element 'RotationCenter' is not allowed for content model 'All(SessionMatrix?,HolderZeissName?,HolderZeissId?,HolderCwsId?,SessionCount?,SessionRotationAtStart?,CustomAttributes?)'",
"details": ""
},
{
"severity": "FATAL",
"description": "(139,21): no declaration found for element 'LookupTables'",
"details": ""
},
{
"severity": "FATAL",
"description": "(140,12): element 'LookupTables' is not allowed for content model 'All(SizeX?,SizeY?,SizeC?,SizeZ?,SizeT?,SizeH?,SizeR?,SizeV?,SizeS?,SizeI?,SizeM?,SizeB?,PixelType?,ComponentBitCount?,OriginalScanData?,AcquisitionDateAndTime?,AcquisitionDuration?,OriginalCompressionMethod?,OriginalEncodingQuality?,OriginalCompressionParameters?,CurrentCompressionParameters?,Dimensions?,MicroscopeRef?,MicroscopeSettings?,ObjectiveSettings?,TubeLenses?,Specimen?,Session?,SpatialRelations?,CustomAttributes?)'",
"details": ""
},
{
"severity": "FATAL",
"description": "(222,29): attribute 'Id' is not declared for element 'Scaling'",
Expand Down Expand Up @@ -125,6 +115,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
12 changes: 1 addition & 11 deletions Test/CZICheckSamples/edf-superfluous.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,6 @@
<Description>(125,15): element 'RotationCenter' is not allowed for content model 'All(SessionMatrix?,HolderZeissName?,HolderZeissId?,HolderCwsId?,SessionCount?,SessionRotationAtStart?,CustomAttributes?)'</Description>
<Details></Details>
</Finding>
<Finding>
<Severity>FATAL</Severity>
<Description>(139,21): no declaration found for element 'LookupTables'</Description>
<Details></Details>
</Finding>
<Finding>
<Severity>FATAL</Severity>
<Description>(140,12): element 'LookupTables' is not allowed for content model 'All(SizeX?,SizeY?,SizeC?,SizeZ?,SizeT?,SizeH?,SizeR?,SizeV?,SizeS?,SizeI?,SizeM?,SizeB?,PixelType?,ComponentBitCount?,OriginalScanData?,AcquisitionDateAndTime?,AcquisitionDuration?,OriginalCompressionMethod?,OriginalEncodingQuality?,OriginalCompressionParameters?,CurrentCompressionParameters?,Dimensions?,MicroscopeRef?,MicroscopeSettings?,ObjectiveSettings?,TubeLenses?,Specimen?,Session?,SpatialRelations?,CustomAttributes?)'</Description>
<Details></Details>
</Finding>
<Finding>
<Severity>FATAL</Severity>
<Description>(222,29): attribute 'Id' is not declared for element 'Scaling'</Description>
Expand Down Expand Up @@ -112,6 +102,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/inconsistent_coordinates.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/inconsistent_coordinates.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/invalid_componentbitcount.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/invalid_componentbitcount.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@
<AggregatedResult>WARN</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@
<AggregatedResult>WARN</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/negative_plane_start_index.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/negative_plane_start_index.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@
<AggregatedResult>WARN</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/overlapping_scenes.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/overlapping_scenes.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,6 @@
<AggregatedResult>FAIL</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/positive_plane_start_index.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/positive_plane_start_index.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@
<AggregatedResult>WARN</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/sparse_planes.txt.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,6 @@
],
"output_version": {
"command": "CZICheck",
"version": "0.6.0"
"version": "0.6.1"
}
}
2 changes: 1 addition & 1 deletion Test/CZICheckSamples/sparse_planes.txt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@
<AggregatedResult>WARN</AggregatedResult>
<OutputVersion>
<Command>CZICheck</Command>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
</OutputVersion>
</TestResults>
Loading
Loading