@cornerstonejs/tools 2.5.0 → 2.5.2

package/dist/esm/stateManagement/annotation/annotationLocking.js

@@ -1,6 +1,6 @@
 import { eventTarget, triggerEvent } from '@cornerstonejs/core';
 import { Events } from '../../enums';
-import { getAnnotation } from './getAnnotation';
+import { getAnnotation } from './annotationState';
 const globalLockedAnnotationUIDsSet = new Set();
 function setAnnotationLocked(annotationUID, locked = true) {
     const detail = makeEventDetail();

package/dist/esm/stateManagement/annotation/annotationSelection.js

@@ -1,6 +1,6 @@
 import { eventTarget, triggerEvent } from '@cornerstonejs/core';
 import { Events } from '../../enums';
-import { getAnnotation } from './getAnnotation';
+import { getAnnotation } from './annotationState';
 const selectedAnnotationUIDs = new Set();
 function setAnnotationSelected(annotationUID, selected = true, preserveSelected = false) {
     if (selected) {

package/dist/esm/stateManagement/annotation/annotationState.d.ts

@@ -1,10 +1,9 @@
 import type { Annotations, Annotation } from '../../types/AnnotationTypes';
-import type { AnnotationGroupSelector } from '../../types';
-import { getAnnotation } from './getAnnotation';
-declare function getAnnotationManager(): import("./FrameOfReferenceSpecificAnnotationManager").default;
-declare function setAnnotationManager(annotationManager: any): void;
-declare function resetAnnotationManager(): void;
+import type { AnnotationGroupSelector, IAnnotationManager } from '../../types';
+declare function getAnnotationManager(): any;
+declare function setAnnotationManager(annotationManager: IAnnotationManager): void;
 declare function getAnnotations(toolName: string, annotationGroupSelector: AnnotationGroupSelector): Annotations;
+declare function getAnnotation(annotationUID: string): Annotation;
 declare function getAllAnnotations(): Annotations;
 declare function clearParentAnnotation(annotation: Annotation): void;
 declare function addChildAnnotation(parentAnnotation: Annotation, childAnnotation: Annotation): void;
@@ -16,4 +15,4 @@ declare function removeAnnotation(annotationUID: string): void;
 declare function removeAllAnnotations(): void;
 declare function removeAnnotations(toolName: string, annotationGroupSelector: AnnotationGroupSelector): void;
 declare function invalidateAnnotation(annotation: Annotation): void;
-export { getAllAnnotations, getAnnotations, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, getNumberOfAnnotations, addAnnotation, removeAnnotation, removeAnnotations, removeAllAnnotations, setAnnotationManager, getAnnotationManager, resetAnnotationManager, invalidateAnnotation, getAnnotation, };
+export { getAllAnnotations, getAnnotations, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, getNumberOfAnnotations, addAnnotation, removeAnnotation, removeAnnotations, removeAllAnnotations, setAnnotationManager, getAnnotationManager, invalidateAnnotation, getAnnotation, };

package/dist/esm/stateManagement/annotation/annotationState.js

@@ -1,36 +1,21 @@
 import { utilities as csUtils } from '@cornerstonejs/core';
-import { defaultFrameOfReferenceSpecificAnnotationManager } from './FrameOfReferenceSpecificAnnotationManager';
-import { getAnnotation } from './getAnnotation';
 import { triggerAnnotationAddedForElement, triggerAnnotationAddedForFOR, triggerAnnotationRemoved, } from './helpers/state';
-import { checkAndSetAnnotationLocked } from './annotationLocking';
-import { checkAndDefineCachedStatsProperty, checkAndDefineTextBoxProperty, } from './utilities/defineProperties';
-import { checkAndSetAnnotationVisibility } from './annotationVisibility';
-let defaultManager = defaultFrameOfReferenceSpecificAnnotationManager;
-const preprocessingFn = (annotation) => {
-    annotation = checkAndDefineTextBoxProperty(annotation);
-    annotation = checkAndDefineCachedStatsProperty(annotation);
-    const uid = annotation.annotationUID;
-    const isLocked = checkAndSetAnnotationLocked(uid);
-    annotation.isLocked = isLocked;
-    const isVisible = checkAndSetAnnotationVisibility(uid);
-    annotation.isVisible = isVisible;
-    return annotation;
-};
-defaultManager.setPreprocessingFn(preprocessingFn);
+let defaultManager;
 function getAnnotationManager() {
     return defaultManager;
 }
 function setAnnotationManager(annotationManager) {
     defaultManager = annotationManager;
 }
-function resetAnnotationManager() {
-    defaultManager = defaultFrameOfReferenceSpecificAnnotationManager;
-}
 function getAnnotations(toolName, annotationGroupSelector) {
     const manager = getAnnotationManager();
     const groupKey = manager.getGroupKey(annotationGroupSelector);
     return manager.getAnnotations(groupKey, toolName);
 }
+function getAnnotation(annotationUID) {
+    const manager = getAnnotationManager();
+    return manager.getAnnotation(annotationUID);
+}
 function getAllAnnotations() {
     const manager = getAnnotationManager();
     return manager.getAllAnnotations();
@@ -130,4 +115,4 @@ function invalidateAnnotation(annotation) {
             : undefined;
     }
 }
-export { getAllAnnotations, getAnnotations, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, getNumberOfAnnotations, addAnnotation, removeAnnotation, removeAnnotations, removeAllAnnotations, setAnnotationManager, getAnnotationManager, resetAnnotationManager, invalidateAnnotation, getAnnotation, };
+export { getAllAnnotations, getAnnotations, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, getNumberOfAnnotations, addAnnotation, removeAnnotation, removeAnnotations, removeAllAnnotations, setAnnotationManager, getAnnotationManager, invalidateAnnotation, getAnnotation, };

package/dist/esm/stateManagement/annotation/annotationVisibility.js

@@ -1,7 +1,7 @@
 import { eventTarget, triggerEvent } from '@cornerstonejs/core';
 import { Events } from '../../enums';
 import { isAnnotationSelected, deselectAnnotation, } from './annotationSelection';
-import { getAnnotation } from './getAnnotation';
+import { getAnnotation } from './annotationState';
 const globalHiddenAnnotationUIDsSet = new Set();
 function setAnnotationVisibility(annotationUID, visible = true) {
     const detail = makeEventDetail();

package/dist/esm/stateManagement/annotation/index.d.ts

@@ -1,8 +1,27 @@
 import * as config from './config';
 import * as locking from './annotationLocking';
 import * as selection from './annotationSelection';
-import * as state from './annotationState';
+import * as annotationState from './annotationState';
 import * as visibility from './annotationVisibility';
 import FrameOfReferenceSpecificAnnotationManager from './FrameOfReferenceSpecificAnnotationManager';
 import AnnotationGroup from './AnnotationGroup';
+import { resetAnnotationManager } from './resetAnnotationManager';
+declare const state: {
+    resetAnnotationManager: typeof resetAnnotationManager;
+    getAllAnnotations: typeof annotationState.getAllAnnotations;
+    getAnnotations: typeof annotationState.getAnnotations;
+    getParentAnnotation: typeof annotationState.getParentAnnotation;
+    getChildAnnotations: typeof annotationState.getChildAnnotations;
+    clearParentAnnotation: typeof annotationState.clearParentAnnotation;
+    addChildAnnotation: typeof annotationState.addChildAnnotation;
+    getNumberOfAnnotations: typeof annotationState.getNumberOfAnnotations;
+    addAnnotation: typeof annotationState.addAnnotation;
+    removeAnnotation: typeof annotationState.removeAnnotation;
+    removeAnnotations: typeof annotationState.removeAnnotations;
+    removeAllAnnotations: typeof annotationState.removeAllAnnotations;
+    setAnnotationManager: typeof annotationState.setAnnotationManager;
+    getAnnotationManager: typeof annotationState.getAnnotationManager;
+    invalidateAnnotation: typeof annotationState.invalidateAnnotation;
+    getAnnotation: typeof annotationState.getAnnotation;
+};
 export { config, locking, selection, state, visibility, FrameOfReferenceSpecificAnnotationManager, AnnotationGroup, };

package/dist/esm/stateManagement/annotation/index.js

@@ -1,8 +1,13 @@
 import * as config from './config';
 import * as locking from './annotationLocking';
 import * as selection from './annotationSelection';
-import * as state from './annotationState';
+import * as annotationState from './annotationState';
 import * as visibility from './annotationVisibility';
 import FrameOfReferenceSpecificAnnotationManager from './FrameOfReferenceSpecificAnnotationManager';
 import AnnotationGroup from './AnnotationGroup';
+import { resetAnnotationManager } from './resetAnnotationManager';
+const state = {
+    ...annotationState,
+    resetAnnotationManager,
+};
 export { config, locking, selection, state, visibility, FrameOfReferenceSpecificAnnotationManager, AnnotationGroup, };

package/dist/esm/stateManagement/annotation/resetAnnotationManager.d.ts

@@ -0,0 +1 @@
+export declare function resetAnnotationManager(): void;

package/dist/esm/stateManagement/annotation/resetAnnotationManager.js

@@ -0,0 +1,21 @@
+import { checkAndDefineCachedStatsProperty, checkAndDefineTextBoxProperty, } from './utilities/defineProperties';
+import { checkAndSetAnnotationLocked } from './annotationLocking';
+import { checkAndSetAnnotationVisibility } from './annotationVisibility';
+import { defaultFrameOfReferenceSpecificAnnotationManager } from './FrameOfReferenceSpecificAnnotationManager';
+import { setAnnotationManager } from './annotationState';
+const defaultManager = defaultFrameOfReferenceSpecificAnnotationManager;
+const preprocessingFn = (annotation) => {
+    annotation = checkAndDefineTextBoxProperty(annotation);
+    annotation = checkAndDefineCachedStatsProperty(annotation);
+    const uid = annotation.annotationUID;
+    const isLocked = checkAndSetAnnotationLocked(uid);
+    annotation.isLocked = isLocked;
+    const isVisible = checkAndSetAnnotationVisibility(uid);
+    annotation.isVisible = isVisible;
+    return annotation;
+};
+defaultManager.setPreprocessingFn(preprocessingFn);
+setAnnotationManager(defaultManager);
+export function resetAnnotationManager() {
+    setAnnotationManager(defaultManager);
+}

package/dist/esm/stateManagement/index.d.ts

@@ -13,6 +13,6 @@ import { clearParentAnnotation } from './annotation/annotationState';
 import { addChildAnnotation } from './annotation/annotationState';
 import { setAnnotationManager } from './annotation/annotationState';
 import { getAnnotationManager } from './annotation/annotationState';
-import { resetAnnotationManager } from './annotation/annotationState';
+import { resetAnnotationManager } from './annotation/resetAnnotationManager';
 import { invalidateAnnotation } from './annotation/annotationState';
 export { FrameOfReferenceSpecificAnnotationManager, defaultFrameOfReferenceSpecificAnnotationManager, annotationLocking, annotationSelection, getAnnotations, addAnnotation, getNumberOfAnnotations, removeAnnotation, getAnnotation, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, setAnnotationManager, getAnnotationManager, resetAnnotationManager, invalidateAnnotation };

package/dist/esm/stateManagement/index.js

@@ -1,5 +1,6 @@
 import FrameOfReferenceSpecificAnnotationManager, { defaultFrameOfReferenceSpecificAnnotationManager, } from './annotation/FrameOfReferenceSpecificAnnotationManager';
 import * as annotationLocking from './annotation/annotationLocking';
 import * as annotationSelection from './annotation/annotationSelection';
-import { getAnnotations, addAnnotation, removeAnnotation, getAnnotation, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, getNumberOfAnnotations, setAnnotationManager, getAnnotationManager, resetAnnotationManager, invalidateAnnotation, } from './annotation/annotationState';
+import { getAnnotations, addAnnotation, removeAnnotation, getAnnotation, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, getNumberOfAnnotations, setAnnotationManager, getAnnotationManager, invalidateAnnotation, } from './annotation/annotationState';
+import { resetAnnotationManager } from './annotation/resetAnnotationManager';
 export { FrameOfReferenceSpecificAnnotationManager, defaultFrameOfReferenceSpecificAnnotationManager, annotationLocking, annotationSelection, getAnnotations, addAnnotation, getNumberOfAnnotations, removeAnnotation, getAnnotation, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, setAnnotationManager, getAnnotationManager, resetAnnotationManager, invalidateAnnotation, };

package/dist/esm/stateManagement/segmentation/events/triggerSegmentationRepresentationModified.js

@@ -6,5 +6,5 @@ export function triggerSegmentationRepresentationModified(viewportId, segmentati
         type,
         viewportId,
     };
-    triggerEvent(eventTarget, Events.SEGMENTATION_REPRESENTATION_ADDED, eventDetail);
+    triggerEvent(eventTarget, Events.SEGMENTATION_REPRESENTATION_MODIFIED, eventDetail);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -104,7 +104,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.5.0",
+    "@cornerstonejs/core": "^2.5.2",
     "@kitware/vtk.js": "32.1.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -123,5 +123,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "e93ccb2022cd1e695f551aef666072b0cbb60952"
+  "gitHead": "01d0c22a5d558298d531f20595bea3dc1304482a"
 }

package/dist/esm/stateManagement/annotation/getAnnotation.d.ts

@@ -1,2 +0,0 @@
-import type { Annotation } from '../../types';
-export declare function getAnnotation(annotationUID: string): Annotation;

package/dist/esm/stateManagement/annotation/getAnnotation.js

@@ -1,6 +0,0 @@
-import { defaultFrameOfReferenceSpecificAnnotationManager } from './FrameOfReferenceSpecificAnnotationManager';
-export function getAnnotation(annotationUID) {
-    const manager = defaultFrameOfReferenceSpecificAnnotationManager;
-    const annotation = manager.getAnnotation(annotationUID);
-    return annotation;
-}