Merge pull request #50 from Kitware/update_vtkjs

Update vtk.js dependency
Kitware · Mar 28, 2018 · f448f2d · f448f2d
2 parents 22ca9f8 + b575877
commit f448f2d
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 158 deletions.
diff --git a/Sources/config/glanceProxyConfig.js b/Sources/config/glanceProxyConfig.js
@@ -35,6 +35,29 @@ function activateOnCreate(def) {
 
 // ----------------------------------------------------------------------------
 
+function createDefaultView(classFactory, ui) {
+  return activateOnCreate(
+    createProxyDefinition(classFactory, ui, [
+      {
+        type: 'application',
+        link: 'AnnotationOpacity',
+        property: 'annotationOpacity',
+      },
+      {
+        type: 'application',
+        link: 'OrientationAxesVisibility',
+        property: 'orientationAxesVisibility',
+      },
+      {
+        type: 'application',
+        link: 'OrientationAxesPreset',
+        property: 'presetToOrientationAxes',
+      },
+    ])
+  );
+}
+
+// ----------------------------------------------------------------------------
 export default {
   definitions: {
     Proxy: {
@@ -106,71 +129,11 @@ export default {
       Glyph: createProxyDefinition(vtkGlyphRepresentationProxy, proxyUI.Glyph),
     },
     Views: {
-      View3D: activateOnCreate(
-        createProxyDefinition(vtkView, proxyUI.View3D, [
-          { link: 'AnnotationOpacity', property: 'annotationOpacity' },
-          {
-            link: 'OrientationAxesVisibility',
-            property: 'orientationAxesVisibility',
-          },
-          {
-            link: 'OrientationAxesPreset',
-            property: 'presetToOrientationAxes',
-          },
-        ])
-      ),
-      View2D: activateOnCreate(
-        createProxyDefinition(vtk2DView, proxyUI.View2D, [
-          { link: 'AnnotationOpacity', property: 'annotationOpacity' },
-          {
-            link: 'OrientationAxesVisibility',
-            property: 'orientationAxesVisibility',
-          },
-          {
-            link: 'OrientationAxesPreset',
-            property: 'presetToOrientationAxes',
-          },
-        ])
-      ),
-      View2D_X: activateOnCreate(
-        createProxyDefinition(vtk2DView, proxyUI.View2D, [
-          { link: 'AnnotationOpacity', property: 'annotationOpacity' },
-          {
-            link: 'OrientationAxesVisibility',
-            property: 'orientationAxesVisibility',
-          },
-          {
-            link: 'OrientationAxesPreset',
-            property: 'presetToOrientationAxes',
-          },
-        ])
-      ),
-      View2D_Y: activateOnCreate(
-        createProxyDefinition(vtk2DView, proxyUI.View2D, [
-          { link: 'AnnotationOpacity', property: 'annotationOpacity' },
-          {
-            link: 'OrientationAxesVisibility',
-            property: 'orientationAxesVisibility',
-          },
-          {
-            link: 'OrientationAxesPreset',
-            property: 'presetToOrientationAxes',
-          },
-        ])
-      ),
-      View2D_Z: activateOnCreate(
-        createProxyDefinition(vtk2DView, proxyUI.View2D, [
-          { link: 'AnnotationOpacity', property: 'annotationOpacity' },
-          {
-            link: 'OrientationAxesVisibility',
-            property: 'orientationAxesVisibility',
-          },
-          {
-            link: 'OrientationAxesPreset',
-            property: 'presetToOrientationAxes',
-          },
-        ])
-      ),
+      View3D: createDefaultView(vtkView, proxyUI.View3D),
+      View2D: createDefaultView(vtk2DView, proxyUI.View2D),
+      View2D_X: createDefaultView(vtk2DView, proxyUI.View2D),
+      View2D_Y: createDefaultView(vtk2DView, proxyUI.View2D),
+      View2D_Z: createDefaultView(vtk2DView, proxyUI.View2D),
     },
   },
   representations: {

diff --git a/Sources/externals/ITKReader/ITKImageReader.js b/Sources/externals/ITKReader/ITKImageReader.js
diff --git a/Sources/externals/ITKReader/index.js b/Sources/externals/ITKReader/index.js
@@ -1,6 +1,9 @@
+import vtkITKImageReader from 'vtk.js/Sources/IO/Misc/ITKImageReader';
+
 import extensionToIO from 'itk/extensionToIO';
+import readImageArrayBuffer from 'itk/readImageArrayBuffer';
 
-import vtkITKImageReader from './ITKImageReader';
+vtkITKImageReader.setReadImageArrayBufferFromITK(readImageArrayBuffer);
 
 export const extensions = Array.from(
   new Set(Object.keys(extensionToIO).map((ext) => ext.toLowerCase()))
@@ -22,7 +25,6 @@ export function registerToGlance(Glance) {
 
 export default {
   extensions,
-  vtkITKImageReader,
   registerToGlance,
 };