fix(Proxy): Allow dataset to be removed

Kitware · Jan 24, 2018 · 5632d4a · 5632d4a
1 parent 3a71297
commit 5632d4a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Sources/Proxy/Core/AbstractRepresentationProxy/index.js b/Sources/Proxy/Core/AbstractRepresentationProxy/index.js
@@ -27,7 +27,7 @@ function vtkAbstractRepresentationProxy(publicAPI, model) {
     publicAPI.updateColorByDomain();
   };
 
-  publicAPI.getInputDataSet = () => model.input.getDataset();
+  publicAPI.getInputDataSet = () => model.input ? model.input.getDataset() : null;
 
   publicAPI.getDataArray = (arrayName, arrayLocation) => {
     const [selectedArray, selectedLocation] = publicAPI.getColorBy();

diff --git a/Sources/Proxy/Representations/SliceRepresentationProxy/index.js b/Sources/Proxy/Representations/SliceRepresentationProxy/index.js
@@ -123,7 +123,7 @@ function vtkSliceRepresentationProxy(publicAPI, model) {
     model.mapper[`set${model.slicingMode}Slice`](index);
 
   publicAPI.getSliceIndex = () =>
-    model.mapper[`get${model.slicingMode}Slice`]();
+    model.slicingMode ? model.mapper[`get${model.slicingMode}Slice`]() : 0;
 
   publicAPI.setSlicingMode = (mode) => {
     if (!mode) {
@@ -148,8 +148,12 @@ function vtkSliceRepresentationProxy(publicAPI, model) {
 
   // Used for UI
   publicAPI.getSliceIndexValues = () => {
+    const ds = publicAPI.getInputDataSet();
+    if (!ds) {
+      return [];
+    }
     const values = [];
-    const extent = publicAPI.getInputDataSet().getExtent();
+    const extent = ds.getExtent();
     const axisIndex = 'XYZ'.indexOf(model.slicingMode);
     const endValue = extent[axisIndex * 2 + 1];
     let currentValue = extent[axisIndex * 2];