@cornerstonejs/tools 3.28.0 → 4.0.0-beta.3

package/dist/esm/tools/segmentation/SegmentLabelTool.js

@@ -1,12 +1,11 @@
 import { getEnabledElement } from '@cornerstonejs/core';
-import { config as segmentationConfig } from '../../stateManagement/segmentation';
 import { BaseTool } from '../base';
 import { triggerSegmentationModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { getActiveSegmentation } from '../../stateManagement/segmentation/activeSegmentation';
 import { getSegmentIndexAtWorldPoint } from '../../utilities/segmentation';
 import { state } from '../../store/state';
-import { drawTextBox as drawTextBoxSvg } from '../../drawingSvg';
+import { drawLinkedTextBox as drawLinkedTextBoxSvg } from '../../drawingSvg';
 class SegmentLabelTool extends BaseTool {
     constructor(toolProps = {
         data: {
@@ -91,14 +90,13 @@ class SegmentLabelTool extends BaseTool {
             viewport,
         });
         const segment = activeSegmentation.segments[hoveredSegmentIndex];
-        const color = segmentationConfig.color.getSegmentIndexColor(viewport.id, segmentationId, hoveredSegmentIndex);
         const label = segment?.label;
         const canvasCoordinates = viewport.worldToCanvas(worldPoint);
         this._editData = {
             hoveredSegmentIndex,
             hoveredSegmentLabel: label,
             canvasCoordinates,
-            color,
+            worldPoint,
         };
         if (!hoveredSegmentIndex || hoveredSegmentIndex === 0) {
             return;
@@ -113,18 +111,12 @@ class SegmentLabelTool extends BaseTool {
             return;
         }
         const { viewport } = enabledElement;
-        const { hoveredSegmentIndex, hoveredSegmentLabel, canvasCoordinates, color, } = this._editData;
+        const { hoveredSegmentIndex, hoveredSegmentLabel, canvasCoordinates, worldPoint, } = this._editData;
         if (!hoveredSegmentIndex) {
             return;
         }
-        const offset = -15;
-        const textBoxPosition = [
-            canvasCoordinates[0] + offset,
-            canvasCoordinates[1] + offset,
-        ];
-        const boundingBox = drawTextBoxSvg(svgDrawingHelper, 'segmentSelectLabelAnnotation', 'segmentSelectLabelTextBox', [hoveredSegmentLabel ?? '(unnamed segment)'], textBoxPosition, {
-            color: `rgba(${color[0]}, ${color[1]}, ${color[2]}, ${color[3]})`,
-        });
+        const textBoxPosition = viewport.worldToCanvas(worldPoint);
+        const boundingBox = drawLinkedTextBoxSvg(svgDrawingHelper, 'segmentSelectLabelAnnotation', 'segmentSelectLabelTextBox', [hoveredSegmentLabel ? hoveredSegmentLabel : '(unnamed segment)'], textBoxPosition, [canvasCoordinates], {}, {});
         const left = canvasCoordinates[0];
         const top = canvasCoordinates[1];
         const { width, height } = boundingBox;

package/dist/esm/utilities/stackPrefetch/stackContextPrefetch.js

@@ -1,7 +1,6 @@
-import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, } from '@cornerstonejs/core';
+import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, } from '@cornerstonejs/core';
 import { addToolState, getToolState } from './state';
 import { getStackData, requestType, priority, clearFromImageIds, getPromiseRemovedHandler, } from './stackPrefetchUtils';
-const { imageRetrieveMetadataProvider } = utilities;
 let configuration = {
     maxImagesToPrefetch: Infinity,
     minBefore: 2,
@@ -104,13 +103,9 @@ function prefetch(element) {
             }
         }
     }
-    const requestFn = (imageId, options) => {
-        const { retrieveOptions = {} } = metaData.get(imageRetrieveMetadataProvider.IMAGE_RETRIEVE_CONFIGURATION, imageId, 'stack');
-        return imageLoader.loadAndCacheImage(imageId, {
-            ...options,
-            retrieveOptions: retrieveOptions?.default || Object.values(retrieveOptions)?.[0] || {},
-        });
-    };
+    const requestFn = (imageId, options) => imageLoader
+        .loadAndCacheImage(imageId, options)
+        .then(() => doneCallback(imageId));
     stackPrefetch.indicesToRequest.forEach((imageIdIndex) => {
         const imageId = stack.imageIds[imageIdIndex];
         const options = {

package/dist/esm/utilities/stackPrefetch/stackPrefetch.js

@@ -1,7 +1,6 @@
-import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, } from '@cornerstonejs/core';
+import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, getConfiguration as getCoreConfiguration, } from '@cornerstonejs/core';
 import { addToolState, getToolState } from './state';
 import { getStackData, requestType, priority, getPromiseRemovedHandler, nearestIndex, range, } from './stackPrefetchUtils';
-const { imageRetrieveMetadataProvider } = utilities;
 let configuration = {
     maxImagesToPrefetch: Infinity,
     preserveExistingPool: true,
@@ -87,13 +86,7 @@ function prefetch(element) {
             imageIdsToPrefetch.push(imageId);
         }
     }
-    const requestFn = (imageId, options) => {
-        const { retrieveOptions = {} } = metaData.get(imageRetrieveMetadataProvider.IMAGE_RETRIEVE_CONFIGURATION, imageId, 'stack');
-        return imageLoader.loadAndCacheImage(imageId, {
-            ...options,
-            retrieveOptions: retrieveOptions?.default || Object.values(retrieveOptions)?.[0] || {},
-        });
-    };
+    const requestFn = (imageId, options) => imageLoader.loadAndCacheImage(imageId, options);
     imageIdsToPrefetch.forEach((imageId) => {
         const options = {
             requestType,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.28.0";
+export declare const version = "4.0.0-beta.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.28.0';
+export const version = '4.0.0-beta.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.28.0",
+  "version": "4.0.0-beta.3",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.28.0",
+    "@cornerstonejs/core": "^4.0.0-beta.3",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "5de47cea0535069b995801d4d88a53e355914152"
+  "gitHead": "31e0bdf0464c1671e8ead3146b7cd19b5a4681a8"
 }