Update default header_type to UInt32

This makes the results more consistent with paraview. It also passes on one additional testcase from pygmsh.
elrnv · Oct 2, 2022 · b40f95b · b40f95b
1 parent aa4f672
commit b40f95b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/assets/box.vtu b/assets/box.vtu
@@ -1 +1 @@
-<VTKFile type="UnstructuredGrid" version="4.2" byte_order="BigEndian"><UnstructuredGrid><Piece NumberOfPoints="8" NumberOfCells="6" NumberOfLines="0" NumberOfStrips="0" NumberOfPolys="0" NumberOfVerts="0"><PointData Scalars="pressure" Vectors="Cd"><DataArray type="Float32" Name="pressure" format="binary" NumberOfComponents="1">AAAAAAAAAAS/AAAAvwAAAD8AAAA/AAAAvwAAAL8AAAA/AAAAPwAAAA==</DataArray><DataArray type="Float32" Name="Cd" format="binary" NumberOfComponents="3">AAAAAAAAAAQ+TMzNAAAAAD+AAAA+TMzNAAAAAD+AAAAAAAAAP4AAAD3MzM0AAAAAP4AAAD3MzM0+TMzNAAAAAD+AAAA+TMzNAAAAAD+AAAAAAAAAP4AAAD3MzM0AAAAAP4AAAD3MzM0=</DataArray><DataArray type="Int32" Name="mtl_id" format="binary" NumberOfComponents="1">AAAAAAAAAAQAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQ==</DataArray></PointData><CellData Scalars="mtl_id"><DataArray type="Int32" Name="mtl_id" format="binary" NumberOfComponents="1">AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</DataArray></CellData><Points><DataArray type="Float64" format="binary" NumberOfComponents="3">AAAAAAAAAAg/4KqqoAAAAL/gAAAAAAAAP+AAAAAAAAC/4KqqoAAAAL/gAAAAAAAAP+AAAAAAAAA/4KqqoAAAAD/gAAAAAAAAP+AAAAAAAAC/4KqqoAAAAD/gAAAAAAAAP+AAAAAAAAC/4KqqoAAAAL/gAAAAAAAAv+AAAAAAAAA/4KqqoAAAAL/gAAAAAAAAv+AAAAAAAAC/4KqqoAAAAD/gAAAAAAAAv+AAAAAAAAA/4KqqoAAAAD/gAAAAAAAAv+AAAAAAAAA=</DataArray></Points><Cells><DataArray type="UInt64" Name="connectivity" format="binary" NumberOfComponents="1">AAAAAAAAAAgAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAMAAAAAAAAAAgAAAAAAAAAEAAAAAAAAAAUAAAAAAAAABwAAAAAAAAAGAAAAAAAAAAYAAAAAAAAABwAAAAAAAAACAAAAAAAAAAMAAAAAAAAABQAAAAAAAAAEAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAHAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAGAAAAAAAAAAM=</DataArray><DataArray type="UInt64" Name="offsets" format="binary" NumberOfComponents="1">AAAAAAAAAAgAAAAAAAAABAAAAAAAAAAIAAAAAAAAAAwAAAAAAAAAEAAAAAAAAAAUAAAAAAAAABg=</DataArray><DataArray type="UInt8" Name="types" format="binary" NumberOfComponents="1">AAAAAAAAAAEHBwcHBwc=</DataArray></Cells></Piece></UnstructuredGrid></VTKFile>
+<VTKFile type="UnstructuredGrid" version="4.2" byte_order="BigEndian" header_type="UInt64"><UnstructuredGrid><Piece NumberOfPoints="8" NumberOfCells="6" NumberOfLines="0" NumberOfStrips="0" NumberOfPolys="0" NumberOfVerts="0"><PointData Scalars="pressure" Vectors="Cd"><DataArray type="Float32" Name="pressure" format="binary" NumberOfComponents="1">AAAAAAAAACC/AAAAvwAAAD8AAAA/AAAAvwAAAL8AAAA/AAAAPwAAAA==</DataArray><DataArray type="Float32" Name="Cd" format="binary" NumberOfComponents="3">AAAAAAAAAGA+TMzNAAAAAD+AAAA+TMzNAAAAAD+AAAAAAAAAP4AAAD3MzM0AAAAAP4AAAD3MzM0+TMzNAAAAAD+AAAA+TMzNAAAAAD+AAAAAAAAAP4AAAD3MzM0AAAAAP4AAAD3MzM0=</DataArray><DataArray type="Int32" Name="mtl_id" format="binary" NumberOfComponents="1">AAAAAAAAACAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQ==</DataArray></PointData><CellData Scalars="mtl_id"><DataArray type="Int32" Name="mtl_id" format="binary" NumberOfComponents="1">AAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</DataArray></CellData><Points><DataArray type="Float64" format="binary" NumberOfComponents="3">AAAAAAAAAMA/4KqqoAAAAL/gAAAAAAAAP+AAAAAAAAC/4KqqoAAAAL/gAAAAAAAAP+AAAAAAAAA/4KqqoAAAAD/gAAAAAAAAP+AAAAAAAAC/4KqqoAAAAD/gAAAAAAAAP+AAAAAAAAC/4KqqoAAAAL/gAAAAAAAAv+AAAAAAAAA/4KqqoAAAAL/gAAAAAAAAv+AAAAAAAAC/4KqqoAAAAD/gAAAAAAAAv+AAAAAAAAA/4KqqoAAAAD/gAAAAAAAAv+AAAAAAAAA=</DataArray></Points><Cells><DataArray type="UInt64" Name="connectivity" format="binary" NumberOfComponents="1">AAAAAAAAAMAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAMAAAAAAAAAAgAAAAAAAAAEAAAAAAAAAAUAAAAAAAAABwAAAAAAAAAGAAAAAAAAAAYAAAAAAAAABwAAAAAAAAACAAAAAAAAAAMAAAAAAAAABQAAAAAAAAAEAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAHAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAGAAAAAAAAAAM=</DataArray><DataArray type="UInt64" Name="offsets" format="binary" NumberOfComponents="1">AAAAAAAAADAAAAAAAAAABAAAAAAAAAAIAAAAAAAAAAwAAAAAAAAAEAAAAAAAAAAUAAAAAAAAABg=</DataArray><DataArray type="UInt8" Name="types" format="binary" NumberOfComponents="1">AAAAAAAAAAYHBwcHBwc=</DataArray></Cells></Piece></UnstructuredGrid></VTKFile>
diff --git a/src/lib.rs b/src/lib.rs
@@ -351,7 +351,7 @@ impl Vtk {
     /// use vtkio::model::*; // import the model definition of a VTK file
     ///
     /// let input: &[u8] = b"\
-    /// <VTKFile type=\"PolyData\" version=\"2.0\" byte_order=\"BigEndian\">\
+    /// <VTKFile type=\"PolyData\" version=\"2.0\" byte_order=\"BigEndian\", header_type=\"UInt64\">\
     ///   <PolyData>\
     ///     <Piece NumberOfPoints=\"3\" NumberOfLines=\"0\" NumberOfStrips=\"0\" NumberOfPolys=\"1\" NumberOfVerts=\"0\">\
     ///       <PointData/>\

diff --git a/src/xml.rs b/src/xml.rs
@@ -1968,7 +1968,7 @@ impl DataArray {
             DataArrayFormat::Binary => {
                 // First byte gives the bytes
                 let bytes = base64::decode(data[0].clone().into_string())?;
-                //eprintln!("{:?}", &bytes[..header_bytes]);
+                // eprintln!("{:?}", &bytes[..header_bytes]);
                 let buf = IOBuffer::from_bytes(
                     &bytes[header_bytes..],
                     scalar_type.into(),
@@ -2768,7 +2768,7 @@ impl TryFrom<VTKFile> for model::Vtk {
 
         let encoding_info = EncodingInfo {
             byte_order,
-            header_type: header_type.unwrap_or(ScalarType::UInt64),
+            header_type: header_type.unwrap_or(ScalarType::UInt32),
             compressor,
             compression_level: 0, // This is meaningless when decoding
         };

diff --git a/tests/pygmsh.rs b/tests/pygmsh.rs
@@ -160,7 +160,7 @@ fn legacy_ascii() -> Result {
     test_ignore_rem!(parse_be(input) => out1);
     let mut outtest = String::new();
     outtest.write_vtk_ne(out1.clone())?;
-    println!("{}", outtest);
+    // println!("{}", outtest);
     test_b!(parse_ne(String::new().write_vtk_ne(out1.clone())?.as_bytes()) => ne(&out1));
     test_b!(parse_ne(Vec::<u8>::new().write_vtk_ne(out1.clone())?) => ne(&out1));
     test_b!(parse_le(Vec::<u8>::new().write_vtk_le(out1.clone())?) => le(&out1));
@@ -176,7 +176,7 @@ fn legacy_binary() -> Result {
     test_ignore_rem!(parse_be(input) => out1);
     let mut outtest = String::new();
     outtest.write_vtk_ne(out1.clone())?;
-    println!("{}", outtest);
+    // println!("{}", outtest);
     test_b!(parse_ne(String::new().write_vtk_ne(out1.clone())?.as_bytes()) => ne(&out1));
     test_b!(parse_ne(Vec::<u8>::new().write_vtk_ne(out1.clone())?) => ne(&out1));
     test_b!(parse_le(Vec::<u8>::new().write_vtk_le(out1.clone())?) => le(&out1));
@@ -258,7 +258,6 @@ fn xml_lzma() -> Result {
 }
 
 #[test]
-#[ignore]
 fn xml_no_compression() -> Result {
     let mut vtu = Vtk::import("./assets/pygmsh/no-compression.vtu")?;
     assert_and_fix_xml_vtu(&mut vtu);