fix(ExternalReader): Add support for external readers

Kitware · Jan 26, 2018 · 323064a · 323064a
1 parent 3592696
commit 323064a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Sources/controls/FileLoader/index.js b/Sources/controls/FileLoader/index.js
@@ -27,14 +27,19 @@ export default class FileLoader extends React.Component {
         ReaderFactory.loadFiles(files).then(
           (readers) => {
             for (let i = 0; i < readers.length; i++) {
-              const { reader, sourceType, name } = readers[i];
+              const { reader, sourceType, name, dataset } = readers[i];
               if (reader) {
                 const source = this.props.proxyManager.createProxy(
                   'Sources',
                   'TrivialProducer',
                   { name }
                 );
-                source.setInputAlgorithm(reader, sourceType);
+                if (dataset) {
+                  source.setInputData(dataset, sourceType);
+                } else {
+                  source.setInputAlgorithm(reader, sourceType);
+                }
+
                 this.props.proxyManager.createRepresentationInAllViews(source);
                 this.props.proxyManager.renderAllViews();
               }

diff --git a/Sources/index.js b/Sources/index.js
@@ -15,6 +15,8 @@ import defaultConfig from './config/glanceProxyConfig';
 import MainView from './MainView';
 import ReaderFactory from './io/ReaderFactory';
 
+export const { registerReader } = ReaderFactory;
+
 export function createViewer(container, proxyConfiguration = defaultConfig) {
   const proxyManager = vtkProxyManager.newInstance({ proxyConfiguration });
   const mainView = ReactDOM.render(

diff --git a/Sources/io/ReaderFactory.js b/Sources/io/ReaderFactory.js
@@ -85,8 +85,10 @@ function readFile(file) {
       const reader = vtkReader.newInstance();
       const io = new FileReader();
       io.onload = function onLoad(e) {
-        reader[parseMethod](io.result);
-        resolve({ reader, sourceType, name: file.name });
+        const ds = reader[parseMethod](io.result);
+        Promise.resolve(ds).then((dataset) => {
+          resolve({ dataset, reader, sourceType, name: file.name });
+        });
       };
       io[readMethod](file);
     } else {