@vitessce/spatial-accelerated 4.0.0-test.0 → 4.0.0-test.2

package/dist/index.js

@@ -10440,7 +10440,8 @@ function _requestBufferToRequestObjects(buffer, k, optsForWeighting) {
     }
     counts.set(packed, (counts.get(packed) || 0) + weight);
   }
-  const requests = [...counts.entries()].sort((a, b) => b[1] - a[1]).slice(0, k).map(([packed]) => ({
+  const sorted = Array.from(counts.entries()).toSorted((a, b) => b[1] - a[1]);
+  const requests = sorted.slice(0, k).map(([packed]) => ({
     x: packed >> 22 & 1023,
     y: packed >> 12 & 1023,
     z: packed & 4095
@@ -11112,6 +11113,10 @@ class VolumeDataManager {
    * the center of the render target.
    */
   async processRequestData(buffer, optsForWeighting) {
+    if (this.initStatus !== INIT_STATUS.COMPLETE) {
+      log.debug("processRequestData: not yet initialized, skipping");
+      return;
+    }
     if (this.isBusy) {
       log.debug("processRequestData: already busy, skipping");
       return;
@@ -13998,6 +14003,7 @@ function VolumeView(props) {
     geometrySize: [1, 1, 1]
   });
   const is3D = spatialRenderingMode === "3D";
+  const [dmInitComplete, setDmInitComplete] = useState(false);
   const screenSceneRef = useRef(null);
   const screenCameraRef = useRef(null);
   const screenQuadRef = useRef(null);
@@ -14073,6 +14079,7 @@ function VolumeView(props) {
     const initializeDataManager = async () => {
       if (dataManager.initStatus === INIT_STATUS.COMPLETE) {
         log.debug("dataManager already initialized, skipping");
+        setDmInitComplete(true);
         return;
       }
       dataManager.initImages(images, imageLayerScopes);
@@ -14085,6 +14092,7 @@ function VolumeView(props) {
       renderManager.setZarrUniforms(dataManager.zarrStore, dataManager.PT);
       renderManager.setChannelMapping(dataManager.channels.colorMappings);
       log.debug("rm.uniforms", renderManager.uniforms);
+      setDmInitComplete(true);
       invalidate();
     };
     initializeDataManager();
@@ -14094,7 +14102,7 @@ function VolumeView(props) {
   }, [dataManager, renderManager, images, imageLayerScopes]);
   useEffect(() => {
     const on3D = spatialRenderingMode === "3D";
-    if (on3D && dataManager && renderManager) {
+    if (on3D && dataManager && renderManager && dmInitComplete) {
       logWithColor("useEffect spatialRenderingMode");
       const propsForRenderManager = {
         images,
@@ -14128,7 +14136,7 @@ function VolumeView(props) {
         }
       }
     }
-  }, [dataManager, renderManager, images, imageLayerScopes, imageLayerCoordination, imageChannelScopesByLayer, imageChannelCoordination, spatialRenderingMode]);
+  }, [dataManager, renderManager, images, imageLayerScopes, imageLayerCoordination, imageChannelScopesByLayer, imageChannelCoordination, spatialRenderingMode, dmInitComplete]);
   const RENDER_PRIORITY = 1;
   useFrame((state, delta, xrFrame) => {
     if (!mrtRef.current || !dataManager || !renderManager) {
@@ -14184,6 +14192,7 @@ function VolumeView(props) {
     }, 300);
   });
   useEffect(() => {
+    if (!dmInitComplete) return;
     logWithColor("useEffect firstImageLayerChannelCoordination");
     setIsInteracting(true);
     log.debug("something about channels changed");
@@ -14193,7 +14202,7 @@ function VolumeView(props) {
     interactionTimeoutRef.current = setTimeout(() => {
       setIsInteracting(false);
     }, 300);
-  }, [dataManager, firstImageLayerChannelCoordination, renderManager, setIsInteracting]);
+  }, [dataManager, firstImageLayerChannelCoordination, renderManager, setIsInteracting, dmInitComplete]);
   const stopLoading = useEventCallback(() => {
     if (dataManager) {
       dataManager.stopLoading();

package/dist-tsc/VolumeDataManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VolumeDataManager.d.ts","sourceRoot":"","sources":["../src/VolumeDataManager.js"],"names":[],"mappings":"AA8DA,yEAaC;AACD,8EAeC;AAED;;;;GAIG;AACH,kDAHW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,8BAC1B,MAAM;;;;;;;;;;;;;EAyHhB;AAMD,kFAaC;AAqBD;;;;;;EA2DC;AAKD;;;;;;;EAuDC;;;;;;;AAzDD,4CAA6C;AA6D7C;IACE,0BAgLC;IAjKG,QAAyB;IAa3B,cAAwB;IAyBxB,sBAA+B;IAC/B,wBAA2B;IAC3B,iCAAmC;IAenC;;;;;MAKC;IAED;;;;;;;;;;;;MAcC;IAED,8BAAmB;IACnB,8BAAmB;IAEnB;;;;;;MAMC;IAED;;;;;;;;;MAiBC;IAQD,2BAAiC;IAYjC,gBAAmB;IAGnB,oBAAuD;IACvD,gBAAwD;IACxD,gBAAmB;IACnB,sBAAsB;IAGtB,aAAmD;IAGnD,gBAAkB;IAElB,sBAAwB;IACxB,wBAA2B;IAC3B,kBAAkB;IAClB,UAAW;IACX,uBAA0B;IAC1B,yBAA4B;IAE5B,sBAAyB;IAGzB,mBAAyC;IACzC,eAAqB;IAGrB;;;;;;;;;;aAA8B;IAG9B,4BAA4B;IAC5B,6BAA6B;IAK/B;;;OAGG;IACH,sBAFa,MAAM,CAiBlB;IAED;;OAEG;IACH,oBAQC;IAED;;OAEG;IACH,uBASC;IAED;;OAEG;IACH,qCAeC;IAED;;OAEG;IACH,yCAqCC;IAED;;OAEG;IACH,qBAMC;IAED;;OAEG;IACH,uCAIC;IAED,qDAIC;IAFC,YAAoB;IACpB,sBAAwC;IAG1C;;;;;OAKG;IACH,mBAFa,OAAO,CAAC,MAAM,CAAC,CA8S3B;IAjQG,kBAAmD;IAmQvD;;;;;;;;OAQG;IACH,mBAkBC;IAGD,6BAMC;IAED,wCAqHC;IAED;;;;;OAKG;IAqBH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,uBAFa,MAAM,CAUlB;IAED,+BAQC;IAED,kCASC;IAED,gCASC;IAED;;;;;;;;;OASG;IACH,iBARW,MAAM,iBACN,MAAM,iBACN,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC,CA+B/B;IAED;;;;;;;;;;;OAWG;IACH,2BATW,UAAU,oBAGlB;QAAiC,KAAK,EAA9B,MAAM;QACmB,MAAM,EAA/B,MAAM;QACmB,eAAe,EAAxC,MAAM;KAGhB,iBAiCA;IAGD,6CA0DC;IAGD,gCAcC;IAED,yCAmDC;IAGD,+DAqBC;IAKD;;;;OAIG;IACH,oBAHW,MAAM,GACJ;QAAE,OAAO,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAA;KAAE,EAAE,CAyClC;IAKD,uDA6LC;IAKD,oDAwDC;IAKD,kBAWC;CACF;8BAlwDM,OAAO"}
+{"version":3,"file":"VolumeDataManager.d.ts","sourceRoot":"","sources":["../src/VolumeDataManager.js"],"names":[],"mappings":"AA8DA,yEAaC;AACD,8EAeC;AAED;;;;GAIG;AACH,kDAHW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,8BAC1B,MAAM;;;;;;;;;;;;;EAyHhB;AAMD,kFAaC;AAqBD;;;;;;EA2DC;AAKD;;;;;;;EAuDC;;;;;;;AAzDD,4CAA6C;AA6D7C;IACE,0BAgLC;IAjKG,QAAyB;IAa3B,cAAwB;IAyBxB,sBAA+B;IAC/B,wBAA2B;IAC3B,iCAAmC;IAenC;;;;;MAKC;IAED;;;;;;;;;;;;MAcC;IAED,8BAAmB;IACnB,8BAAmB;IAEnB;;;;;;MAMC;IAED;;;;;;;;;MAiBC;IAQD,2BAAiC;IAYjC,gBAAmB;IAGnB,oBAAuD;IACvD,gBAAwD;IACxD,gBAAmB;IACnB,sBAAsB;IAGtB,aAAmD;IAGnD,gBAAkB;IAElB,sBAAwB;IACxB,wBAA2B;IAC3B,kBAAkB;IAClB,UAAW;IACX,uBAA0B;IAC1B,yBAA4B;IAE5B,sBAAyB;IAGzB,mBAAyC;IACzC,eAAqB;IAGrB;;;;;;;;;;aAA8B;IAG9B,4BAA4B;IAC5B,6BAA6B;IAK/B;;;OAGG;IACH,sBAFa,MAAM,CAiBlB;IAED;;OAEG;IACH,oBAQC;IAED;;OAEG;IACH,uBASC;IAED;;OAEG;IACH,qCAeC;IAED;;OAEG;IACH,yCAqCC;IAED;;OAEG;IACH,qBAMC;IAED;;OAEG;IACH,uCAIC;IAED,qDAIC;IAFC,YAAoB;IACpB,sBAAwC;IAG1C;;;;;OAKG;IACH,mBAFa,OAAO,CAAC,MAAM,CAAC,CA8S3B;IAjQG,kBAAmD;IAmQvD;;;;;;;;OAQG;IACH,mBAkBC;IAGD,6BAMC;IAED,wCAqHC;IAED;;;;;OAKG;IAqBH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,uBAFa,MAAM,CAUlB;IAED,+BAQC;IAED,kCASC;IAED,gCASC;IAED;;;;;;;;;OASG;IACH,iBARW,MAAM,iBACN,MAAM,iBACN,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC,CA+B/B;IAED;;;;;;;;;;;OAWG;IACH,2BATW,UAAU,oBAGlB;QAAiC,KAAK,EAA9B,MAAM;QACmB,MAAM,EAA/B,MAAM;QACmB,eAAe,EAAxC,MAAM;KAGhB,iBAsCA;IAGD,6CA0DC;IAGD,gCAcC;IAED,yCAmDC;IAGD,+DAqBC;IAKD;;;;OAIG;IACH,oBAHW,MAAM,GACJ;QAAE,OAAO,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAA;KAAE,EAAE,CAyClC;IAKD,uDA6LC;IAKD,oDAwDC;IAKD,kBAWC;CACF;8BAvwDM,OAAO"}

package/dist-tsc/VolumeDataManager.js

@@ -306,8 +306,8 @@ export function _requestBufferToRequestObjects(buffer, k, optsForWeighting) {
         counts.set(packed, (counts.get(packed) || 0) + weight);
     }
     // Get the top K (potentially fewer than K) page table requests by weighted count.
-    const requests = [...counts.entries()]
-        .sort((a, b) => b[1] - a[1])
+    const sorted = Array.from(counts.entries()).toSorted((a, b) => b[1] - a[1]);
+    const requests = sorted
         .slice(0, k)
         .map(([packed]) => ({
         x: (packed >> 22) & 0x3FF,
@@ -1108,6 +1108,10 @@ export class VolumeDataManager {
      * the center of the render target.
      */
     async processRequestData(buffer, optsForWeighting) {
+        if (this.initStatus !== INIT_STATUS.COMPLETE) {
+            log.debug('processRequestData: not yet initialized, skipping');
+            return;
+        }
         if (this.isBusy) {
             log.debug('processRequestData: already busy, skipping');
             return;

package/dist-tsc/VolumeView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VolumeView.d.ts","sourceRoot":"","sources":["../src/VolumeView.js"],"names":[],"mappings":"AAkMA,4CA6gBC"}
+{"version":3,"file":"VolumeView.d.ts","sourceRoot":"","sources":["../src/VolumeView.js"],"names":[],"mappings":"AAkMA,4CAihBC"}

package/dist-tsc/VolumeView.js

@@ -179,6 +179,7 @@ export function VolumeView(props) {
     // const [lastRes, setLastRes] = useState(null);
     // const [lastChannels, setLastChannels] = useState([]);
     const is3D = spatialRenderingMode === '3D';
+    const [dmInitComplete, setDmInitComplete] = useState(false);
     // const [loading, setLoading] = useState(false);
     // Add new refs for screen quad setup
     const screenSceneRef = useRef(null);
@@ -277,6 +278,7 @@ export function VolumeView(props) {
         const initializeDataManager = async () => {
             if (dataManager.initStatus === INIT_STATUS.COMPLETE) {
                 log.debug('dataManager already initialized, skipping');
+                setDmInitComplete(true);
                 return;
             }
             // TODO(mark): separate the initialization which depends on gl, from the initialization which depends on images, from the dm.init(firstImageLayer)
@@ -296,6 +298,7 @@ export function VolumeView(props) {
             // if (onInitComplete) {
             //   onInitComplete({ zarrStoreInfo: dm.zarrStore, deviceLimits: dm.deviceLimits });
             // }
+            setDmInitComplete(true);
             invalidate();
         };
         initializeDataManager();
@@ -346,7 +349,7 @@ export function VolumeView(props) {
     // TODO(mark): convert to a useMemo?
     useEffect(() => {
         const on3D = spatialRenderingMode === '3D';
-        if (on3D && dataManager && renderManager) {
+        if (on3D && dataManager && renderManager && dmInitComplete) {
             logWithColor('useEffect spatialRenderingMode');
             // Direct call, no callbacks needed
             const propsForRenderManager = {
@@ -388,7 +391,7 @@ export function VolumeView(props) {
                 }
             }
         }
-    }, [dataManager, renderManager, images, imageLayerScopes, imageLayerCoordination, imageChannelScopesByLayer, imageChannelCoordination, spatialRenderingMode]);
+    }, [dataManager, renderManager, images, imageLayerScopes, imageLayerCoordination, imageChannelScopesByLayer, imageChannelCoordination, spatialRenderingMode, dmInitComplete]);
     // Execute code on every rendered frame.
     // A numerical renderPriority value will cause React Three Fiber
     // to disable automatic rendering altogether.
@@ -514,6 +517,8 @@ export function VolumeView(props) {
     // Set isInteracting while the user is sliding the channel slider
     // for smooth updates.
     useEffect(() => {
+        if (!dmInitComplete)
+            return;
         logWithColor('useEffect firstImageLayerChannelCoordination');
         setIsInteracting(true);
         log.debug('something about channels changed');
@@ -523,7 +528,7 @@ export function VolumeView(props) {
         interactionTimeoutRef.current = setTimeout(() => {
             setIsInteracting(false);
         }, 300);
-    }, [dataManager, firstImageLayerChannelCoordination, renderManager, setIsInteracting]);
+    }, [dataManager, firstImageLayerChannelCoordination, renderManager, setIsInteracting, dmInitComplete]);
     const stopLoading = useEventCallback(() => {
         if (dataManager) {
             dataManager.stopLoading();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/spatial-accelerated",
-  "version": "4.0.0-test.0",
+  "version": "4.0.0-test.2",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -24,16 +24,16 @@
     "plur": "^5.1.0",
     "short-number": "^1.0.6",
     "zarrita": "0.6.1",
-    "@vitessce/constants-internal": "4.0.0-test.0",
-    "@vitessce/gl": "4.0.0-test.0",
-    "@vitessce/legend": "4.0.0-test.0",
-    "@vitessce/sets-utils": "4.0.0-test.0",
-    "@vitessce/utils": "4.0.0-test.0",
-    "@vitessce/tooltip": "4.0.0-test.0",
-    "@vitessce/vit-s": "4.0.0-test.0",
-    "@vitessce/styles": "4.0.0-test.0",
-    "@vitessce/spatial-utils": "4.0.0-test.0",
-    "@vitessce/globals": "4.0.0-test.0"
+    "@vitessce/constants-internal": "4.0.0-test.2",
+    "@vitessce/gl": "4.0.0-test.2",
+    "@vitessce/sets-utils": "4.0.0-test.2",
+    "@vitessce/legend": "4.0.0-test.2",
+    "@vitessce/tooltip": "4.0.0-test.2",
+    "@vitessce/utils": "4.0.0-test.2",
+    "@vitessce/styles": "4.0.0-test.2",
+    "@vitessce/vit-s": "4.0.0-test.2",
+    "@vitessce/spatial-utils": "4.0.0-test.2",
+    "@vitessce/globals": "4.0.0-test.2"
   },
   "devDependencies": {
     "@react-three/fiber": "^9.0.0",

package/src/VolumeDataManager.js

@@ -364,8 +364,8 @@ export function _requestBufferToRequestObjects(buffer, k, optsForWeighting) {
   }
 
   // Get the top K (potentially fewer than K) page table requests by weighted count.
-  const requests = [...counts.entries()]
-    .sort((a, b) => b[1] - a[1])
+  const sorted = Array.from(counts.entries()).toSorted((a, b) => b[1] - a[1]);
+  const requests = sorted
     .slice(0, k)
     .map(([packed]) => ({
       x: (packed >> 22) & 0x3FF,
@@ -1298,6 +1298,11 @@ export class VolumeDataManager {
    * the center of the render target.
    */
   async processRequestData(buffer, optsForWeighting) {
+    if (this.initStatus !== INIT_STATUS.COMPLETE) {
+      log.debug('processRequestData: not yet initialized, skipping');
+      return;
+    }
+
     if (this.isBusy) {
       log.debug('processRequestData: already busy, skipping');
       return;

package/src/VolumeView.js

@@ -229,6 +229,7 @@ export function VolumeView(props) {
   // const [lastRes, setLastRes] = useState(null);
   // const [lastChannels, setLastChannels] = useState([]);
   const is3D = spatialRenderingMode === '3D';
+  const [dmInitComplete, setDmInitComplete] = useState(false);
   // const [loading, setLoading] = useState(false);
 
   // Add new refs for screen quad setup
@@ -356,6 +357,7 @@ export function VolumeView(props) {
     const initializeDataManager = async () => {
       if (dataManager.initStatus === INIT_STATUS.COMPLETE) {
         log.debug('dataManager already initialized, skipping');
+        setDmInitComplete(true);
         return;
       }
       // TODO(mark): separate the initialization which depends on gl, from the initialization which depends on images, from the dm.init(firstImageLayer)
@@ -380,6 +382,7 @@ export function VolumeView(props) {
       //   onInitComplete({ zarrStoreInfo: dm.zarrStore, deviceLimits: dm.deviceLimits });
       // }
 
+      setDmInitComplete(true);
       invalidate();
     };
     initializeDataManager();
@@ -437,7 +440,7 @@ export function VolumeView(props) {
   useEffect(() => {
     const on3D = spatialRenderingMode === '3D';
 
-    if (on3D && dataManager && renderManager) {
+    if (on3D && dataManager && renderManager && dmInitComplete) {
       logWithColor('useEffect spatialRenderingMode');
       // Direct call, no callbacks needed
       const propsForRenderManager = {
@@ -482,7 +485,7 @@ export function VolumeView(props) {
         }
       }
     }
-  }, [dataManager, renderManager, images, imageLayerScopes, imageLayerCoordination, imageChannelScopesByLayer, imageChannelCoordination, spatialRenderingMode]);
+  }, [dataManager, renderManager, images, imageLayerScopes, imageLayerCoordination, imageChannelScopesByLayer, imageChannelCoordination, spatialRenderingMode, dmInitComplete]);
 
 
   // Execute code on every rendered frame.
@@ -629,6 +632,7 @@ export function VolumeView(props) {
   // Set isInteracting while the user is sliding the channel slider
   // for smooth updates.
   useEffect(() => {
+    if (!dmInitComplete) return;
     logWithColor('useEffect firstImageLayerChannelCoordination');
     setIsInteracting(true);
     log.debug('something about channels changed');
@@ -640,7 +644,7 @@ export function VolumeView(props) {
     interactionTimeoutRef.current = setTimeout(() => {
       setIsInteracting(false);
     }, 300);
-  }, [dataManager, firstImageLayerChannelCoordination, renderManager, setIsInteracting]);
+  }, [dataManager, firstImageLayerChannelCoordination, renderManager, setIsInteracting, dmInitComplete]);
 
   const stopLoading = useEventCallback(() => {
     if (dataManager) {