Merge branch 'master' into harmonize-manipulator-use-in-widgets

Author: finetjul

Sources/Common/Core/CellArray/index.js

@@ -18,7 +18,12 @@ function extractCellSizes(cellArray) {
 }
 
 function getNumberOfCells(cellArray) {
-  return extractCellSizes(cellArray).length;
+  let cellId = 0;
+  for (let cellArrayIndex = 0; cellArrayIndex < cellArray.length; ) {
+    cellArrayIndex += cellArray[cellArrayIndex] + 1;
+    cellId++;
+  }
+  return cellId;
 }
 
 // ----------------------------------------------------------------------------
@@ -43,8 +48,11 @@ function vtkCellArray(publicAPI, model) {
       return model.numberOfCells;
     }
 
-    model.cellSizes = extractCellSizes(model.values);
-    model.numberOfCells = model.cellSizes.length;
+    if (model.cellSizes) {
+      model.numberOfCells = model.cellSizes.length;
+    } else {
+      model.numberOfCells = getNumberOfCells(model.values);
+    }
     return model.numberOfCells;
   };
 

Sources/IO/XML/XMLImageDataReader/index.js

@@ -20,6 +20,10 @@ function vtkXMLImageDataReader(publicAPI, model) {
       .getAttribute('Spacing')
       .split(' ')
       .map((t) => Number(t));
+    const direction = imageDataElem
+      .getAttribute('Direction')
+      ?.split(' ')
+      .map((t) => Number(t));
     const pieces = imageDataElem.getElementsByTagName('Piece');
     const nbPieces = pieces.length;
 
@@ -30,7 +34,12 @@ function vtkXMLImageDataReader(publicAPI, model) {
         .getAttribute('Extent')
         .split(' ')
         .map((t) => Number(t));
-      const imageData = vtkImageData.newInstance({ origin, spacing, extent });
+      const imageData = vtkImageData.newInstance({
+        origin,
+        spacing,
+        direction,
+        extent,
+      });
 
       // Fill data
       vtkXMLReader.processFieldData(

Sources/IO/XML/XMLImageDataReader/test/testXMLImageDataReader.js

@@ -0,0 +1,93 @@
+import test from 'tape-catch';
+import vtkXMLImageDataReader from '../index';
+import vtkMath from '../../../../Common/Core/Math';
+
+test('Test XML data is read correctly', (t) => {
+  const expectedOrigin = [10, 20, 30];
+  const expectedSpacing = [0.5, 1.5, 2.0];
+  const expectedDirection = [-1, 0, 0, 0, 1, 0, 0, 0, -1];
+
+  const fileContent = `
+  <?xml version="1.0"?>
+  <VTKFile type="ImageData" version="0.1" byte_order="LittleEndian" header_type="UInt32" compressor="vtkZLibDataCompressor">
+    <ImageData WholeExtent="0 -1 0 -1 0 -1" Origin="10 20 30" Spacing="0.5 1.5 2.0" Direction="-1 0 0 0 1 0 0 0 -1">
+      <Piece Extent="0 -1 0 -1 0 -1"                                                    >
+        <PointData>
+        </PointData>
+        <CellData>
+        </CellData>
+    </Piece>
+  </ImageData>
+  <AppendedData encoding="base64">
+   _
+  </AppendedData>
+  </VTKFile>
+  `;
+
+  const enc = new TextEncoder();
+  const arrayBuffer = enc.encode(fileContent);
+
+  const reader = vtkXMLImageDataReader.newInstance();
+
+  reader.parseAsArrayBuffer(arrayBuffer);
+  const imageData = reader.getOutputData();
+
+  t.ok(
+    vtkMath.areEquals(imageData.getOrigin(), expectedOrigin),
+    'Make sure the origin is correct.'
+  );
+
+  t.ok(
+    vtkMath.areEquals(imageData.getSpacing(), expectedSpacing),
+    'Make sure the spacing is correct.'
+  );
+
+  t.ok(
+    vtkMath.areEquals(imageData.getDirection(), expectedDirection),
+    'Make sure the direction is correct.'
+  );
+
+  t.end();
+});
+
+test('Test XML data is read when Direction attribute not present', (t) => {
+  const expectedOrigin = [10, 20, 30];
+  const expectedSpacing = [1, 2, 3];
+
+  const fileContent = `
+  <?xml version="1.0"?>
+  <VTKFile type="ImageData" version="0.1" byte_order="LittleEndian" header_type="UInt32" compressor="vtkZLibDataCompressor">
+    <ImageData WholeExtent="0 -1 0 -1 0 -1" Origin="10 20 30" Spacing="1 2 3">
+      <Piece Extent="0 -1 0 -1 0 -1"                                                    >
+        <PointData>
+        </PointData>
+        <CellData>
+        </CellData>
+    </Piece>
+  </ImageData>
+  <AppendedData encoding="base64">
+   _
+  </AppendedData>
+  </VTKFile>
+  `;
+
+  const enc = new TextEncoder();
+  const arrayBuffer = enc.encode(fileContent);
+
+  const reader = vtkXMLImageDataReader.newInstance();
+
+  reader.parseAsArrayBuffer(arrayBuffer);
+  const imageData = reader.getOutputData();
+
+  t.ok(
+    vtkMath.areEquals(imageData.getOrigin(), expectedOrigin),
+    'Make sure the origin is correct.'
+  );
+
+  t.ok(
+    vtkMath.areEquals(imageData.getSpacing(), expectedSpacing),
+    'Make sure the spacing is correct.'
+  );
+
+  t.end();
+});

Sources/IO/XML/XMLImageDataWriter/index.js

@@ -23,6 +23,7 @@ function vtkXMLImageDataWriter(publicAPI, model) {
       WholeExtent: dataObject.getExtent().join(' '),
       Origin: dataObject.getOrigin().join(' '),
       Spacing: dataObject.getSpacing().join(' '),
+      Direction: dataObject.getDirection().join(' '),
     });
 
     const piece = imageData.ele('Piece', {

Sources/IO/XML/XMLImageDataWriter/test/testXMLImageDataWriter.js

@@ -0,0 +1,23 @@
+import test from 'tape-catch';
+import vtkImageDataWriter from '../index';
+import vtkImageData from '../../../../Common/DataModel/ImageData';
+
+test('Test XML writer file content', (t) => {
+  const expectedSubstring =
+    '<ImageData WholeExtent="0 -1 0 -1 0 -1" Origin="10 20 30" Spacing="1 2 3" Direction="-1 0 0 0 1 0 0 0 -1">';
+
+  const imageData = vtkImageData.newInstance();
+  imageData.setOrigin([10, 20, 30]);
+  imageData.setSpacing([1, 2, 3]);
+  imageData.setDirection([-1, 0, 0, 0, 1, 0, 0, 0, -1]);
+
+  const writer = vtkImageDataWriter.newInstance();
+  const fileContents = writer.write(imageData);
+
+  t.ok(
+    fileContents.includes(expectedSubstring),
+    'Make sure the XML file generated is correct.'
+  );
+
+  t.end();
+});

Sources/Interaction/Manipulators/MouseCameraAxisRotateManipulator/index.js

@@ -47,7 +47,7 @@ function vtkMouseCameraAxisRotateManipulator(publicAPI, model) {
     const dx = model.previousPosition.x - position.x;
     const dy = model.previousPosition.y - position.y;
 
-    const size = interactor.getView().getSize();
+    const size = interactor.getView().getViewportSize(renderer);
 
     // Azimuth
     mat4.rotate(

Sources/Interaction/Manipulators/MouseCameraTrackballMultiRotateManipulator/index.js

@@ -26,7 +26,7 @@ function vtkMouseCameraTrackballMultiRotateManipulator(publicAPI, model) {
   let currentManipulator = null;
 
   publicAPI.onButtonDown = (interactor, renderer, position) => {
-    const viewSize = interactor.getView().getSize();
+    const viewSize = interactor.getView().getViewportSize(renderer);
     const viewCenter = [0.5 * viewSize[0], 0.5 * viewSize[1]];
     const rotateRadius = 0.9 * max(viewCenter[0], viewCenter[1]);
     const dist2 =

Sources/Interaction/Manipulators/MouseCameraTrackballPanManipulator/index.js

@@ -39,7 +39,7 @@ function vtkMouseCameraTrackballPanManipulator(publicAPI, model) {
       vtkMath.cross(vpn, up, right);
 
       // These are different because y is flipped.
-      const height = interactor.getView().getSize()[1];
+      const height = interactor.getView().getViewportSize(renderer)[1];
       let dx = (pos.x - lastPos.x) / height;
       let dy = (lastPos.y - pos.y) / height;
 

Sources/Interaction/Manipulators/MouseCameraTrackballRotateManipulator/index.js

@@ -46,7 +46,7 @@ function vtkMouseCameraTrackballRotateManipulator(publicAPI, model) {
     const dx = model.previousPosition.x - position.x;
     const dy = model.previousPosition.y - position.y;
 
-    const size = interactor.getView().getSize();
+    const size = interactor.getView().getViewportSize(renderer);
 
     // Azimuth
     const viewUp = camera.getViewUp();

Sources/Interaction/Manipulators/MouseCameraTrackballZoomManipulator/index.js

@@ -12,7 +12,7 @@ function vtkMouseCameraTrackballZoomManipulator(publicAPI, model) {
 
   publicAPI.onButtonDown = (interactor, renderer, position) => {
     model.previousPosition = position;
-    const size = interactor.getView().getSize();
+    const size = interactor.getView().getViewportSize(renderer);
 
     const camera = renderer.getActiveCamera();
     const direction = model.flipDirection ? -1 : 1;