@cornerstonejs/tools 3.30.1 → 3.30.3

package/dist/esm/store/ToolGroupManager/ToolGroup.js

@@ -91,10 +91,7 @@ export default class ToolGroup {
             });
         }
         const toolName = this.getActivePrimaryMouseButtonTool();
-        const runtimeSettings = Settings.getRuntimeSettings();
-        if (runtimeSettings.get('useCursors')) {
-            this.setViewportsCursorByToolName(toolName);
-        }
+        this.setViewportsCursorByToolName(toolName);
         const eventDetail = {
             toolGroupId: this.id,
             viewportId,
@@ -190,18 +187,16 @@ export default class ToolGroup {
         };
         this.toolOptions[toolName] = toolOptions;
         this._toolInstances[toolName].mode = Active;
-        const runtimeSettings = Settings.getRuntimeSettings();
-        const useCursor = runtimeSettings.get('useCursors');
-        if (this._hasMousePrimaryButtonBinding(toolBindingsOptions) && useCursor) {
-            this.setViewportsCursorByToolName(toolName);
-        }
-        else {
+        if (!this._hasMousePrimaryButtonBinding(toolBindingsOptions)) {
             const activeToolIdentifier = this.getActivePrimaryMouseButtonTool();
-            if (!activeToolIdentifier && useCursor) {
+            if (!activeToolIdentifier) {
                 const cursor = MouseCursor.getDefinedCursor('default');
                 this._setCursorForViewports(cursor);
             }
         }
+        else {
+            this.setViewportsCursorByToolName(toolName);
+        }
         if (this._hasMousePrimaryButtonBinding(toolBindingsOptions)) {
             if (this.prevActivePrimaryToolName === null) {
                 this.prevActivePrimaryToolName = toolName;
@@ -331,6 +326,10 @@ export default class ToolGroup {
         return MouseCursor.getDefinedCursor('default');
     }
     _setCursorForViewports(cursor) {
+        const runtimeSettings = Settings.getRuntimeSettings();
+        if (!runtimeSettings.get('useCursors')) {
+            return;
+        }
         this.viewportsInfo.forEach(({ renderingEngineId, viewportId }) => {
             const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
             if (!enabledElement) {

package/dist/esm/tools/segmentation/LabelmapBaseTool.d.ts

@@ -68,6 +68,8 @@ export default class LabelmapBaseTool extends BaseTool {
     constructor(toolProps: any, defaultToolProps: any);
     protected _historyRedoHandler(evt: any): void;
     protected get _previewData(): PreviewData;
+    hasPreviewData(): boolean;
+    shouldResolvePreviewRequests(): boolean;
     createMemo(segmentationId: string, segmentationVoxelManager: any): LabelmapMemo.LabelmapMemo;
     protected createEditData(element: any): EditDataReturnType;
     protected getEditData({ viewport, representationData, segmentsLocked, segmentationId, }: {

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

@@ -54,6 +54,13 @@ export default class LabelmapBaseTool extends BaseTool {
     get _previewData() {
         return LabelmapBaseTool.previewData;
     }
+    hasPreviewData() {
+        return !!this._previewData.preview;
+    }
+    shouldResolvePreviewRequests() {
+        return ((this.mode === 'Active' || this.mode === 'Enabled') &&
+            this.hasPreviewData());
+    }
     createMemo(segmentationId, segmentationVoxelManager) {
         const voxelManagerId = segmentationVoxelManager.id;
         if (this.memo &&
@@ -229,6 +236,10 @@ export default class LabelmapBaseTool extends BaseTool {
         const enabledElement = getEnabledElement(element);
         const results = this.applyActiveStrategyCallback(enabledElement, this.getOperationData(element), StrategyCallbacks.AddPreview);
         _previewData.isDrag = true;
+        if (results?.modified) {
+            _previewData.preview = results;
+            _previewData.element = element;
+        }
         return results;
     }
     rejectPreview(element = this._previewData.element) {

package/dist/esm/tools/segmentation/strategies/BrushStrategy.d.ts

@@ -37,6 +37,7 @@ export type InitializedOperationData = LabelmapToolOperationDataAny & {
         };
     };
     memo?: LabelmapMemo;
+    modified?: boolean;
 };
 export type StrategyFunction = (operationData: InitializedOperationData, ...args: any[]) => unknown;
 export type CompositionInstance = {

package/dist/esm/tools/segmentation/strategies/compositions/preview.js

@@ -18,6 +18,7 @@ export default {
     },
     [StrategyCallbacks.Initialize]: (operationData) => {
         const { segmentIndex, previewColor, previewSegmentIndex } = operationData;
+        operationData.modified = false;
         if (previewSegmentIndex == null || segmentIndex == null) {
             return;
         }
@@ -25,6 +26,7 @@ export default {
         viewportIds?.forEach((viewportId) => {
             setSegmentIndexColor(viewportId, operationData.segmentationId, previewSegmentIndex, previewColor);
         });
+        operationData.modified = true;
     },
     [StrategyCallbacks.AcceptPreview]: (operationData) => {
         const { previewSegmentIndex, segmentationVoxelManager, memo, segmentIndex, centerSegmentIndexInfo, } = operationData || {};

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.30.1";
+export declare const version = "3.30.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.30.1';
+export const version = '3.30.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.30.1",
+  "version": "3.30.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.30.1",
+    "@cornerstonejs/core": "^3.30.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": "1ac2366db0ddd23ef7d269192eb6ce233d32bd2a"
+  "gitHead": "ff959f1bf57c60b727e2cd6563db13b194cbabb0"
 }