@cornerstonejs/tools 5.4.1 → 5.4.2

package/dist/esm/tools/displayTools/Labelmap/labelmapActorStyle.js

@@ -11,6 +11,7 @@ import { getSegmentBinding } from '../../../stateManagement/segmentation/helpers
 import { segmentationStyle } from '../../../stateManagement/segmentation/SegmentationStyle.js';
 import { getLabelmapForActorReference } from './volumeLabelmapImageMapper.js';
 const actorTransferFunctions = new WeakMap();
+const lastAppliedLabelmapStyle = new WeakMap();
 const MAX_NUMBER_COLORS = 255;
 function setLabelmapColorAndOpacity(viewportId, labelmapActorEntry, segmentationRepresentation) {
     const { segmentationId } = segmentationRepresentation;
@@ -49,9 +50,6 @@ function setLabelmapColorAndOpacity(viewportId, labelmapActorEntry, segmentation
         type: SegmentationRepresentations.Labelmap,
     });
     const labelmapActor = labelmapActorEntry.actor;
-    const { cfun, ofun } = getOrCreateTransferFunctions(labelmapActor);
-    cfun.removeAllPoints();
-    ofun.removeAllPoints();
     const colorNodes = [
         { x: 0, r: 0, g: 0, b: 0, midpoint: 0.5, sharpness: 1.0 },
     ];
@@ -96,6 +94,41 @@ function setLabelmapColorAndOpacity(viewportId, labelmapActorEntry, segmentation
             });
         }
     });
+    const activeSegmentIndex = getActiveSegmentIndex(segmentationRepresentation.segmentationId);
+    const outlineWidths = new Array(numColors - 1).fill(0);
+    if (renderOutline) {
+        labelValueEntries.forEach(({ labelValue, segmentIndex }) => {
+            if (segmentsHidden.has(segmentIndex)) {
+                return;
+            }
+            outlineWidths[labelValue - 1] =
+                segmentIndex === activeSegmentIndex
+                    ? outlineWidth + activeSegmentOutlineWidthDelta
+                    : outlineWidth;
+        });
+    }
+    const visible = isActiveLabelmap || renderInactiveSegmentations;
+    const useImageSliceProperties = labelmapActorEntry.actorMapper?.renderMode === ActorRenderMode.VTK_IMAGE ||
+        labelmapActorEntry.actorMapper?.renderMode ===
+            ActorRenderMode.VTK_VOLUME_SLICE;
+    const { preLoad } = labelmapActor.get?.('preLoad') || { preLoad: null };
+    const styleSignature = JSON.stringify({
+        colorNodes,
+        opacityNodes,
+        renderOutline,
+        outlineOpacity,
+        outlineWidths,
+        visible,
+        useImageSliceProperties,
+    });
+    const canUseStyleCache = !preLoad;
+    if (canUseStyleCache &&
+        lastAppliedLabelmapStyle.get(labelmapActor) === styleSignature) {
+        return;
+    }
+    const { cfun, ofun } = getOrCreateTransferFunctions(labelmapActor);
+    cfun.removeAllPoints();
+    ofun.removeAllPoints();
     cfun.setNodes(colorNodes);
     ofun.setNodes(opacityNodes);
     ofun.setClamping(false);
@@ -103,7 +136,6 @@ function setLabelmapColorAndOpacity(viewportId, labelmapActorEntry, segmentation
     const labelmapMapper = actorMapper?.mapper
         ? actorMapper.mapper
         : labelmapActor.getMapper();
-    const { preLoad } = labelmapActor.get?.('preLoad') || { preLoad: null };
     if (preLoad) {
         preLoad({ cfun, ofun, actor: labelmapActor });
     }
@@ -112,9 +144,7 @@ function setLabelmapColorAndOpacity(viewportId, labelmapActorEntry, segmentation
         labelmapActor.getProperty().setScalarOpacity(0, ofun);
         labelmapActor.getProperty().setInterpolationTypeToNearest();
     }
-    if (labelmapActorEntry.actorMapper?.renderMode === ActorRenderMode.VTK_IMAGE ||
-        labelmapActorEntry.actorMapper?.renderMode ===
-            ActorRenderMode.VTK_VOLUME_SLICE) {
+    if (useImageSliceProperties) {
         const imageSlice = labelmapActor;
         imageSlice.setForceTranslucent(true);
         imageSlice.setForceOpaque(false);
@@ -123,33 +153,24 @@ function setLabelmapColorAndOpacity(viewportId, labelmapActorEntry, segmentation
     if (renderOutline) {
         labelmapActor.getProperty().setUseLabelOutline(renderOutline);
         labelmapActor.getProperty().setLabelOutlineOpacity(outlineOpacity);
-        const activeSegmentIndex = getActiveSegmentIndex(segmentationRepresentation.segmentationId);
-        const outlineWidths = new Array(numColors - 1).fill(0);
-        labelValueEntries.forEach(({ labelValue, segmentIndex }) => {
-            const isHidden = segmentsHidden.has(segmentIndex);
-            if (isHidden) {
-                return;
-            }
-            outlineWidths[labelValue - 1] =
-                segmentIndex === activeSegmentIndex
-                    ? outlineWidth + activeSegmentOutlineWidthDelta
-                    : outlineWidth;
-        });
         labelmapActor.getProperty().setLabelOutlineThickness(outlineWidths);
         labelmapActor.modified();
         labelmapActor.getProperty().modified();
         labelmapMapper?.modified?.();
     }
     else {
-        labelmapActor
-            .getProperty()
-            .setLabelOutlineThickness(new Array(numColors - 1).fill(0));
+        labelmapActor.getProperty().setLabelOutlineThickness(outlineWidths);
     }
-    const visible = isActiveLabelmap || renderInactiveSegmentations;
     labelmapActor.setVisibility(visible);
     labelmapActor.modified();
     labelmapActor.getProperty().modified();
     labelmapMapper?.modified?.();
+    if (canUseStyleCache) {
+        lastAppliedLabelmapStyle.set(labelmapActor, styleSignature);
+    }
+    else {
+        lastAppliedLabelmapStyle.delete(labelmapActor);
+    }
 }
 function getOrCreateTransferFunctions(actor) {
     const existing = actorTransferFunctions.get(actor);

package/dist/esm/utilities/voi/colorbar/ColorbarCanvas.js

@@ -141,14 +141,18 @@ class ColorbarCanvas {
         const range = this._showFullImageRange ? this._imageRange : { ...voiRange };
         let previousColorPoint = undefined;
         let currentColorPoint = getColorPoint(0);
+        const minPosition = rgbPoints[0];
+        const maxPosition = rgbPoints[rgbPoints.length - 4];
+        const colormapRange = maxPosition - minPosition;
         const incRawPixelValue = (range.upper - range.lower) / (maxValue - 1);
         let rawPixelValue = range.lower;
         for (let i = 0; i < maxValue; i++) {
             const tVoiRange = (rawPixelValue - voiRange.lower) /
                 Math.abs(voiRange.upper - voiRange.lower);
+            const tColormapPosition = minPosition + tVoiRange * colormapRange;
             if (currentColorPoint) {
                 for (let i = currentColorPoint.index; i < colorsCount; i++) {
-                    if (tVoiRange <= currentColorPoint.position) {
+                    if (tColormapPosition <= currentColorPoint.position) {
                         break;
                     }
                     previousColorPoint = currentColorPoint;
@@ -163,7 +167,7 @@ class ColorbarCanvas {
                 normColor = [...previousColorPoint.color];
             }
             else {
-                const tColorRange = (tVoiRange - previousColorPoint.position) /
+                const tColorRange = (tColormapPosition - previousColorPoint.position) /
                     (currentColorPoint.position - previousColorPoint.position);
                 normColor = interpolateVec3(previousColorPoint.color, currentColorPoint.color, tColorRange);
             }

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.4.1";
+export declare const version = "5.4.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.4.1';
+export const version = '5.4.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -126,11 +126,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.4.1",
+    "@cornerstonejs/core": "5.4.2",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.4.1",
+    "@cornerstonejs/core": "5.4.2",
     "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -149,5 +149,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "2a6a97cfa5353f69116de006aa59f5d6e5624511"
+  "gitHead": "34e073e17bd1da9dbee6f422100042fa90e4ddf7"
 }