Skip to content

Fix typed arrays serialization deserialization #2927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
finetjul merged 2 commits into from
Oct 3, 2023
Merged

Fix typed arrays serialization deserialization #2927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eb7440
fix(getstate): serialize typed arrays as array
bourdaisj Sep 29, 2023
0ede1a2
test(serialization): add test for vtkImageData serialization
bourdaisj Sep 29, 2023
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
11 changes: 7 additions & 4 deletions Sources/Testing/testSerialization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import vtk from 'vtk.js/Sources/vtk';
import macro from 'vtk.js/Sources/macros';

import vtkDataArray from 'vtk.js/Sources/Common/Core/DataArray';
import vtkPoints from 'vtk.js/Sources/Common/Core/Points';
import vtkImageData from 'vtk.js/Sources/Common/DataModel/ImageData';
import vtkLookupTable from 'vtk.js/Sources/Common/Core/LookupTable';
import vtkPoints from 'vtk.js/Sources/Common/Core/Points';
import vtkPolyData from 'vtk.js/Sources/Common/DataModel/PolyData';
import vtkScalarsToColors from 'vtk.js/Sources/Common/Core/ScalarsToColors';

import vtkPolyData from 'vtk.js/Sources/Common/DataModel/PolyData';
import Common from 'vtk.js/Sources/Common';
import Filters from 'vtk.js/Sources/Filters';
import Imaging from 'vtk.js/Sources/Imaging';
Expand All @@ -21,10 +22,11 @@ const { vtkDebugMacro } = macro;

const classToTest = [
'vtkDataArray',
'vtkPoints',
'vtkImageData',
'vtkLookupTable',
'vtkScalarsToColors',
'vtkPoints',
'vtkPolyData',
'vtkScalarsToColors',
];

const SERIALIZABLE_CLASSES = {
Expand Down Expand Up @@ -55,6 +57,7 @@ const SERIALIZABLE_CLASSES = {
},
},
},
vtkImageData,
};

function ignoreMTime(json) {
Expand Down
6 changes: 6 additions & 0 deletions Sources/macros.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ function safeArrays(model) {
});
}

function isTypedArray(value) {
return Object.values(TYPED_ARRAYS).some((ctor) => value instanceof ctor);
}

// ----------------------------------------------------------------------------
// shallow equals
// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -378,6 +382,8 @@ export function obj(publicAPI = {}, model = {}) {
jsonArchive[keyName] = jsonArchive[keyName].getState();
} else if (Array.isArray(jsonArchive[keyName])) {
jsonArchive[keyName] = jsonArchive[keyName].map(getStateArrayMapFunc);
} else if (isTypedArray(jsonArchive[keyName])) {
jsonArchive[keyName] = Array.from(jsonArchive[keyName]);
}
});

Expand Down