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
53 changes: 36 additions & 17 deletions Sources/Filters/Imaging/ImageAppendComponents/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import macro from 'vtk.js/Sources/macros';
import vtkBoundingBox from 'vtk.js/Sources/Common/DataModel/BoundingBox';
import vtkDataArray from 'vtk.js/Sources/Common/Core/DataArray';
import vtkImageData from 'vtk.js/Sources/Common/DataModel/ImageData';

Expand All @@ -22,10 +21,11 @@ function vtkImageAppendComponents(publicAPI, model) {
return;
}

const output = outData[0]?.initialize() || vtkImageData.newInstance();
const output = outData[0] || vtkImageData.newInstance();
output.setDimensions(inputs[0].getDimensions());
output.setSpacing(inputs[0].getSpacing());
output.setOrigin(inputs[0].getOrigin());
output.setDirection(inputs[0].getDirection());

const numberOfVoxels =
inputs[0].getDimensions()[0] *
Expand All @@ -37,28 +37,47 @@ function vtkImageAppendComponents(publicAPI, model) {
0
);

const ArrayType = inputs[0]
.getPointData()
.getScalars()
.getData().constructor;
const outValues = new ArrayType(numberOfVoxels * numberOfComponents);
const outArray = vtkDataArray.newInstance({
name: 'Scalars',
numberOfComponents,
values: outValues,
});
output.getPointData().setScalars(outArray);
const inputScalars = inputs[0].getPointData().getScalars();
let outArray = output.getPointData().getScalars();
let outValues = null;
if (outArray != null) {
if (outArray.getDataType() !== inputScalars.getDataType()) {
outArray = null;
} else {
outArray.setNumberOfComponents(numberOfComponents);
outArray.resize(numberOfVoxels);
outValues = outArray.getData();
outArray.modified();
}
}

if (outArray == null) {
const ArrayType = inputScalars.getData().constructor;
outValues = new ArrayType(numberOfVoxels * numberOfComponents);
outArray = vtkDataArray.newInstance({
name: 'Scalars',
numberOfComponents,
values: outValues,
});
output.getPointData().setScalars(outArray);
}

let outComponent = 0;
inputs
.map((input) => input.getPointData().getScalars())
.forEach((inputScalars) => {
const inputNumberOfComponents = inputScalars.getNumberOfComponents();
const inputValues = inputScalars.getData();
for (let i = 0; i < numberOfVoxels; i++) {
for (let c = 0; c < inputNumberOfComponents; c++) {
outValues[i * numberOfComponents + outComponent + c] =
inputValues[i * inputNumberOfComponents + c];
if (inputNumberOfComponents === 1) {
for (let i = 0; i < numberOfVoxels; i++) {
outValues[i * numberOfComponents + outComponent] = inputValues[i];
}
} else {
for (let i = 0; i < numberOfVoxels; i++) {
for (let c = 0; c < inputNumberOfComponents; c++) {
outValues[i * numberOfComponents + outComponent + c] =
inputValues[i * inputNumberOfComponents + c];
}
}
}
outComponent += inputNumberOfComponents;
Expand Down
21 changes: 15 additions & 6 deletions Sources/IO/XML/XMLImageDataReader/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,21 @@ function vtkXMLImageDataReader(publicAPI, model) {
.getAttribute('Extent')
.split(' ')
.map((t) => Number(t));
const imageData = vtkImageData.newInstance({
origin,
spacing,
direction,
extent,
});
let imageData = model.output[outputIndex];
if (imageData != null) {
imageData = model.output[outputIndex];
imageData.setExtent(extent);
imageData.setOrigin(origin);
imageData.setSpacing(spacing);
imageData.setDirection(direction);
} else {
imageData = vtkImageData.newInstance({
origin,
spacing,
direction,
extent,
});
}

// Fill data
vtkXMLReader.processFieldData(
Expand Down
4 changes: 2 additions & 2 deletions Sources/IO/XML/XMLPolyDataReader/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ function vtkXMLPolyDataReader(publicAPI, model) {
const nbPieces = pieces.length;

for (let outputIndex = 0; outputIndex < nbPieces; outputIndex++) {
// Create dataset
const polydata = vtkPolyData.newInstance();
const polydata =
model.output[outputIndex]?.initialize() || vtkPolyData.newInstance();
const piece = pieces[outputIndex];

// Points
Expand Down
Loading