feat(Matrix): add getMatrixElement, setMatrixElement

When used in the browser, the image.direction loses the methods getElement and getElement. These can
be used instead.

Author: thewtex

src/itkgetMatrixElement.js

@@ -0,0 +1,5 @@
+const getMatrixElement = (matrix, row, column) => {
+  return matrix.data[column + row * matrix.columns]
+}
+
+module.exports = getMatrixElement

src/itksetMatrixElement.js

@@ -0,0 +1,9 @@
+const Matrix = require('./itkMatrix.js')
+
+const setMatrixElement = (matrix, row, column, value) => {
+  let newMatrix = new Matrix(matrix)
+  newMatrix.data[column + row * newMatrix.columns] = value
+  return newMatrix
+}
+
+module.exports = setMatrixElement

test/Browser/itkreadImageFileTest.js

@@ -5,6 +5,8 @@ const readImageFile = require('itkreadImageFile.js')
 const IntTypes = require('itkIntTypes.js')
 const PixelTypes = require('itkPixelTypes.js')
 
+const getMatrixElement = require('itkgetMatrixElement.js')
+
 const cthead1SmallBase64DataURI = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAHdElNRQfhBQYVKw8AZTNIAAADdklEQVQ4y2WTa2wUVRiGp6W7O3POnLmc2VrstokJlrBIUBJigjfSICVCCAo/QKM/FFNRIESJQKAws3M7M2f20t3GthRKQQq0kkoXMIq9oFwCXkg0UpMakGLgR9EmJF4TNOvZhRBb31+TvM955/vO+T6Ou69pAgSwKCCAEPc/lYUhFEUkMgH2ESmbYocEEUmKLIQqBKmEgUlERQhAPhyJiDMXPFZZDmRGoP8Q5TwC4ciMpatfXE9zmT2NVRVIQiLi76cDUVRDT/m72zLUc/Srv+gNCi8jhCrupvMAQIWf1zJx58pRj7g7h/sduunhiIIkUAJ4AUBZ0LZev3TondmeS42TuaYms6kOapJUalYQAAKxt+j4qD3yxvMZ0z47NLi/ydhWA7GMinWyAH6G1Wwe/OdUz6dz33T35dPdIxdIYrPGK0qxTnYrobVtjm+3pNvPxGu9/dTRgw8/e89et0AKF1uFItS2u7ZP7fr4K3H19VbP94me/T6fXRifM6+a/QKC6N5+PWGYZhVeNn9pzvUoTVnt3/QEz81dUTONgwjis4UzvS2Z5JbY9JlPdxmEuFZzX9va0yu5WlXmRAlWd3Tmjg980vXBprJZbYPtza0dXw40ZleeP1ZbrWKOXXpsu7Grb3gnsY/27B46+e3ElVuF3w+sm7Pki2VAUxkAo1t0a7TL8YnVPZxy6KG9fX/+2qu/+9DARoAVBiDYaHjnfc/3nHOdicA1Em6WpnOdG/I6zwCA5PCzrn6uw6VO99gBnRBKGUyIMfz3BgmrHHta8cEdu04dN6wjPwy6FinaTNT8emKNzGrgBEmJLLf7T6Tf/60wpFP2oKToB/bNr+pVTWHjghQxZuTzW51C4aIZENdj8gMv+1f3I7iYwPEqrFu+z1/zzI3vHN/ziEd9P0haV39aXxXFRaBMRrCu9Vjj5o/S5C4QBCnjws+pJ9SoqpZmRlqyeNWlPa922El22PMCl5if38q9FGV+CeAaFuK4OZY5nLRoksnsPX19nL5do2GsREoAlCtr68lo4VoXNROWdXD8j7GUNV96AMPye5MtYgU/ujF/887tHy+PXLt9o9/asUipvDfWpc1QNFWKPfla8PHI5Ysnsua2l2dH1Un7WS6rKlamxx9f/MKKhkX1syoxmLqcUMVRDTNMlZGkilPsUrOsJ6wxRSel/wuAkzbenLRf4gAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0wNS0wNlQxNzoyNjozNC0wNDowMORO/MMAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMDUtMDZUMTc6MjY6MzQtMDQ6MDCVE0R/AAAAAElFTkSuQmCC'
 const byteString = window.atob(cthead1SmallBase64DataURI.split(',')[1])
 const mimeString = cthead1SmallBase64DataURI.split(',')[0].split(':')[1].split(';')[0]
@@ -25,15 +27,14 @@ test('readImageFile reads a File', t => {
     t.is(image.origin[1], 0.0, 'origin[1]')
     t.is(image.spacing[0], 1.0, 'spacing[0]')
     t.is(image.spacing[1], 1.0, 'spacing[1]')
-    t.is(image.direction, 'aoeu')
-    t.is(image.direction.getElement(0, 0), 1.0, 'direction (0, 0)')
-    t.is(image.direction.getElement(0, 1), 0.0, 'direction (0, 1)')
-    t.is(image.direction.getElement(1, 0), 0.0, 'direction (1, 0)')
-    t.is(image.direction.getElement(1, 1), 1.0, 'direction (1, 1)')
+    t.is(getMatrixElement(image.direction, 0, 0), 1.0, 'direction (0, 0)')
+    t.is(getMatrixElement(image.direction, 0, 1), 0.0, 'direction (0, 1)')
+    t.is(getMatrixElement(image.direction, 1, 0), 0.0, 'direction (1, 0)')
+    t.is(getMatrixElement(image.direction, 1, 1), 1.0, 'direction (1, 1)')
     t.is(image.size[0], 32, 'size[0]')
     t.is(image.size[1], 32, 'size[1]')
     t.is(image.buffer.length, 1024, 'buffer.length')
-    t.is(image.buffer[512], 1024, 'buffer[512]')
+    t.is(image.buffer[512], 12, 'buffer[512]')
     t.end()
   })
 })

test/itkMatrixTest.js

@@ -2,6 +2,8 @@ import test from 'ava'
 import path from 'path'
 
 const Matrix = require(path.resolve(__dirname, '..', 'dist', 'itkMatrix.js'))
+const getMatrixElement = require(path.resolve(__dirname, '..', 'dist', 'itkgetMatrixElement.js'))
+const setMatrixElement = require(path.resolve(__dirname, '..', 'dist', 'itksetMatrixElement.js'))
 
 test('rows should have the same number of rows as passed into the constructor', t => {
   let matrix = new Matrix(2, 3)
@@ -40,6 +42,20 @@ test('setElement() should set elements of the matrix', t => {
   t.is(matrix.data[3], 5.0)
 })
 
+test('setMatrixElement() should set elements of the matrix', t => {
+  let matrix = new Matrix(2, 2)
+  matrix.setIdentity()
+  let newMatrix = null
+  newMatrix = setMatrixElement(matrix, 0, 0, 2.0)
+  newMatrix = setMatrixElement(newMatrix, 0, 1, 3.0)
+  newMatrix = setMatrixElement(newMatrix, 1, 0, 4.0)
+  newMatrix = setMatrixElement(newMatrix, 1, 1, 5.0)
+  t.is(newMatrix.data[0], 2.0)
+  t.is(newMatrix.data[1], 3.0)
+  t.is(newMatrix.data[2], 4.0)
+  t.is(newMatrix.data[3], 5.0)
+})
+
 test('getElement() should get elements of the matrix', t => {
   let matrix = new Matrix(2, 2)
   matrix.setElement(0, 0, 2.0)
@@ -52,6 +68,18 @@ test('getElement() should get elements of the matrix', t => {
   t.is(matrix.getElement(1, 1), 5.0)
 })
 
+test('getMatrixElement() should get elements of the matrix', t => {
+  let matrix = new Matrix(2, 2)
+  matrix.setElement(0, 0, 2.0)
+  matrix.setElement(0, 1, 3.0)
+  matrix.setElement(1, 0, 4.0)
+  matrix.setElement(1, 1, 5.0)
+  t.is(getMatrixElement(matrix, 0, 0), 2.0)
+  t.is(getMatrixElement(matrix, 0, 1), 3.0)
+  t.is(getMatrixElement(matrix, 1, 0), 4.0)
+  t.is(getMatrixElement(matrix, 1, 1), 5.0)
+})
+
 test('passing a Matrix to the constructor should create a copy', t => {
   let matrix = new Matrix(2, 2)
   matrix.setElement(0, 0, 2.0)