Merge pull request #113 from Kitware/hide-actor-when-no-data

fix: removing datasets doesn't inform the representation

Author: floryst

src/core/Algorithm.tsx

@@ -100,6 +100,7 @@ export default function Algorithm(props: AlgorithmProps) {
 
   useUnmount(() => {
     if (algoRef.current) {
+      representation.dataAvailable(false);
       deletionRegistry.markForDeletion(algoRef.current);
       algoRef.current = null;
     }

src/core/Dataset.tsx

@@ -14,11 +14,12 @@ export default function Dataset(props: DatasetProps) {
 
   useEffect(() => {
     if (!dataset) {
+      representation.dataAvailable(false);
       return;
     }
 
     downstream.setInputData(dataset);
-    representation.dataAvailable();
+    representation.dataAvailable(true);
     representation.dataChanged();
   }, [dataset, downstream, representation]);
 

src/core/Geometry2DRepresentation.tsx

@@ -177,8 +177,8 @@ export default forwardRef(function Geometry2DRepresentation(
       dataChanged: () => {
         renderer.requestRender();
       },
-      dataAvailable: () => {
-        setDataAvailable(true);
+      dataAvailable: (available = true) => {
+        setDataAvailable(available);
         representation.dataChanged();
       },
       getActor,

src/core/ImageData.tsx

@@ -98,6 +98,7 @@ export default forwardRef(function PolyData(props: ImageDataProps, fwdRef) {
 
   useUnmount(() => {
     if (imRef.current) {
+      representation.dataAvailable(false);
       deletionRegistry.markForDeletion(imRef.current);
       imRef.current = null;
     }

src/core/PolyData.tsx

@@ -220,6 +220,7 @@ export default forwardRef(function PolyData(props: PolyDataProps, fwdRef) {
 
   useUnmount(() => {
     if (pdRef.current) {
+      representation.dataAvailable(false);
       deletionRegistry.markForDeletion(pdRef.current);
       pdRef.current = null;
     }

src/core/Reader.tsx

@@ -89,9 +89,10 @@ export default function Reader(props: ReaderProps) {
     deletionRegistry.register(reader, () => reader.delete());
     readerRef.current = reader;
     return () => {
+      representation.dataAvailable(false);
       deletionRegistry.markForDeletion(reader);
     };
-  }, [createReader]);
+  }, [createReader, representation]);
 
   // --- url handling --- //
 

src/core/ShareDataSet.tsx

@@ -205,7 +205,7 @@ export function UseDataSet(props: UseDataSetProps) {
   useEffect(() => {
     return share.onDataAvailable(id, (ds) => {
       downstream.setInputData(ds as vtkObject, port);
-      representation.dataAvailable();
+      representation.dataAvailable(!!ds);
     });
   }, [id, port, representation, downstream, share]);
 

src/core/SliceRepresentation.tsx

@@ -277,8 +277,8 @@ export default forwardRef(function SliceRepresentation(
       dataChanged: () => {
         renderer.requestRender();
       },
-      dataAvailable: () => {
-        setDataAvailable(true);
+      dataAvailable: (available = true) => {
+        setDataAvailable(available);
         representation.dataChanged();
       },
       getActor,

src/types.ts

@@ -70,7 +70,7 @@ export interface IView {
 }
 
 export interface IRepresentation {
-  dataAvailable(): void;
+  dataAvailable(available?: boolean): void;
   dataChanged(): void;
   getActor(): vtkProp | null;
   getMapper(): vtkAbstractMapper | null;

usage/src/App.jsx

@@ -40,6 +40,7 @@ const demos = new Map([
     'Tests/SimpleSliceRendering',
     lazy(() => import('./Tests/SimpleSliceRendering')),
   ],
+  ['Tests/RemoveImageData', lazy(() => import('./Tests/RemoveImageData'))],
   [
     'Tests/ChangeInteractorStyle',
     lazy(() => import('./Tests/ChangeInteractorStyle')),