@cornerstonejs/tools 0.7.11 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/dist/cjs/tools/MIPJumpToClickTool.js +6 -2
  2. package/dist/cjs/tools/MIPJumpToClickTool.js.map +1 -1
  3. package/dist/cjs/tools/StackScrollTool.js +2 -2
  4. package/dist/cjs/tools/StackScrollTool.js.map +1 -1
  5. package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +6 -3
  6. package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
  7. package/dist/cjs/tools/WindowLevelTool.js +2 -1
  8. package/dist/cjs/tools/WindowLevelTool.js.map +1 -1
  9. package/dist/cjs/tools/annotation/BidirectionalTool.js +3 -16
  10. package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
  11. package/dist/cjs/tools/annotation/EllipticalROITool.js +16 -25
  12. package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
  13. package/dist/cjs/tools/annotation/LengthTool.js +3 -16
  14. package/dist/cjs/tools/annotation/LengthTool.js.map +1 -1
  15. package/dist/cjs/tools/annotation/ProbeTool.js +23 -27
  16. package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
  17. package/dist/cjs/tools/annotation/RectangleROITool.js +16 -24
  18. package/dist/cjs/tools/annotation/RectangleROITool.js.map +1 -1
  19. package/dist/cjs/tools/base/AnnotationTool.d.ts +1 -0
  20. package/dist/cjs/tools/base/AnnotationTool.js +15 -1
  21. package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
  22. package/dist/cjs/tools/base/BaseTool.d.ts +1 -4
  23. package/dist/cjs/tools/base/BaseTool.js +13 -14
  24. package/dist/cjs/tools/base/BaseTool.js.map +1 -1
  25. package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +2 -5
  26. package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
  27. package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +3 -7
  28. package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
  29. package/dist/cjs/types/JumpToSliceOptions.d.ts +4 -0
  30. package/dist/cjs/types/JumpToSliceOptions.js +3 -0
  31. package/dist/cjs/types/JumpToSliceOptions.js.map +1 -0
  32. package/dist/cjs/types/index.d.ts +2 -1
  33. package/dist/cjs/utilities/index.d.ts +2 -1
  34. package/dist/cjs/utilities/index.js +3 -1
  35. package/dist/cjs/utilities/index.js.map +1 -1
  36. package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js +4 -1
  37. package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
  38. package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.d.ts +2 -2
  39. package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js +5 -3
  40. package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js.map +1 -1
  41. package/dist/cjs/utilities/viewport/jumpToSlice.d.ts +3 -0
  42. package/dist/cjs/utilities/viewport/jumpToSlice.js +20 -0
  43. package/dist/cjs/utilities/viewport/jumpToSlice.js.map +1 -0
  44. package/dist/esm/tools/MIPJumpToClickTool.js +6 -2
  45. package/dist/esm/tools/MIPJumpToClickTool.js.map +1 -1
  46. package/dist/esm/tools/StackScrollTool.js +2 -2
  47. package/dist/esm/tools/StackScrollTool.js.map +1 -1
  48. package/dist/esm/tools/StackScrollToolMouseWheelTool.js +6 -3
  49. package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
  50. package/dist/esm/tools/WindowLevelTool.js +2 -1
  51. package/dist/esm/tools/WindowLevelTool.js.map +1 -1
  52. package/dist/esm/tools/annotation/BidirectionalTool.js +4 -17
  53. package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
  54. package/dist/esm/tools/annotation/EllipticalROITool.js +17 -26
  55. package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
  56. package/dist/esm/tools/annotation/LengthTool.js +4 -17
  57. package/dist/esm/tools/annotation/LengthTool.js.map +1 -1
  58. package/dist/esm/tools/annotation/ProbeTool.js +24 -28
  59. package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
  60. package/dist/esm/tools/annotation/RectangleROITool.js +17 -25
  61. package/dist/esm/tools/annotation/RectangleROITool.js.map +1 -1
  62. package/dist/esm/tools/base/AnnotationTool.d.ts +1 -0
  63. package/dist/esm/tools/base/AnnotationTool.js +16 -2
  64. package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
  65. package/dist/esm/tools/base/BaseTool.d.ts +1 -4
  66. package/dist/esm/tools/base/BaseTool.js +13 -14
  67. package/dist/esm/tools/base/BaseTool.js.map +1 -1
  68. package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +2 -5
  69. package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
  70. package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +3 -7
  71. package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
  72. package/dist/esm/types/JumpToSliceOptions.d.ts +4 -0
  73. package/dist/esm/types/JumpToSliceOptions.js +2 -0
  74. package/dist/esm/types/JumpToSliceOptions.js.map +1 -0
  75. package/dist/esm/types/index.d.ts +2 -1
  76. package/dist/esm/utilities/index.d.ts +2 -1
  77. package/dist/esm/utilities/index.js +2 -1
  78. package/dist/esm/utilities/index.js.map +1 -1
  79. package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js +4 -1
  80. package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
  81. package/dist/esm/utilities/stackScrollTool/scrollThroughStack.d.ts +2 -2
  82. package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js +6 -4
  83. package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js.map +1 -1
  84. package/dist/esm/utilities/viewport/jumpToSlice.d.ts +3 -0
  85. package/dist/esm/utilities/viewport/jumpToSlice.js +18 -0
  86. package/dist/esm/utilities/viewport/jumpToSlice.js.map +1 -0
  87. package/dist/umd/index.js +1 -1
  88. package/dist/umd/index.js.map +1 -1
  89. package/package.json +4 -4
@@ -1,4 +1,4 @@
1
- import { utilities, getEnabledElement, VolumeViewport, } from '@cornerstonejs/core';
1
+ import { utilities, getEnabledElement, VolumeViewport, StackViewport, cache, } from '@cornerstonejs/core';
2
2
  import { vec4, vec2 } from 'gl-matrix';
3
3
  import BaseTool from './BaseTool';
4
4
  import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
@@ -56,7 +56,8 @@ class AnnotationTool extends BaseTool {
56
56
  return;
57
57
  }
58
58
  toolSpecificAnnotations.forEach((annotation) => {
59
- if (annotation.metadata.referencedImageId === imageURI) {
59
+ const referencedImageURI = utilities.imageIdToURI(annotation.metadata.referencedImageId);
60
+ if (referencedImageURI === imageURI) {
60
61
  annotation.invalidated = true;
61
62
  annotation.data.cachedStats = {};
62
63
  annotation.data.handles.points = annotation.data.handles.points.map((point) => {
@@ -118,6 +119,19 @@ class AnnotationTool extends BaseTool {
118
119
  }
119
120
  data.handles.activeHandleIndex = null;
120
121
  }
122
+ getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp) {
123
+ const targetId = this.getTargetId(viewport);
124
+ let referencedImageId;
125
+ if (viewport instanceof StackViewport) {
126
+ referencedImageId = targetId.split('imageId:')[1];
127
+ }
128
+ else {
129
+ const volumeId = targetId.split('volumeId:')[1];
130
+ const imageVolume = cache.getVolume(volumeId);
131
+ referencedImageId = utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal, viewUp);
132
+ }
133
+ return referencedImageId;
134
+ }
121
135
  getStyle(settings, property, annotation) {
122
136
  return getStyleProperty(settings, property, getState(annotation), this.mode);
123
137
  }
@@ -1 +1 @@
1
- {"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
@@ -25,10 +25,7 @@ declare abstract class BaseTool implements IBaseTool {
25
25
  setConfiguration(newConfiguration: Record<string, any>): void;
26
26
  setActiveStrategy(strategyName: string): void;
27
27
  private getTargetVolumeId;
28
- protected getTargetIdViewportAndImage(targetId: string, renderingEngine: Types.IRenderingEngine): {
29
- viewport: Types.IViewport;
30
- image: Types.IImageData;
31
- };
28
+ protected getTargetIdImage(targetId: string, renderingEngine: Types.IRenderingEngine): Types.IImageData | Types.CPUIImageData | Types.IImageVolume;
32
29
  protected getTargetId(viewport: Types.IViewport): string | undefined;
33
30
  }
34
31
  export default BaseTool;
@@ -30,9 +30,6 @@ class BaseTool {
30
30
  this.setConfiguration({ activeStrategy: strategyName });
31
31
  }
32
32
  getTargetVolumeId(viewport) {
33
- if (!(viewport instanceof VolumeViewport)) {
34
- throw new Error('getTargetVolumeId: viewport must be a VolumeViewport');
35
- }
36
33
  if (this.configuration.volumeId) {
37
34
  return this.configuration.volumeId;
38
35
  }
@@ -42,25 +39,27 @@ class BaseTool {
42
39
  }
43
40
  return actors[0].uid;
44
41
  }
45
- getTargetIdViewportAndImage(targetId, renderingEngine) {
46
- let image, viewport;
47
- if (targetId.startsWith('stackTarget')) {
48
- const coloneIndex = targetId.indexOf(':');
49
- const viewportId = targetId.substring(coloneIndex + 1);
50
- viewport = renderingEngine.getViewport(viewportId);
51
- image = viewport.getImageData();
42
+ getTargetIdImage(targetId, renderingEngine) {
43
+ if (targetId.startsWith('imageId:')) {
44
+ const imageId = targetId.split('imageId:')[1];
45
+ const viewports = renderingEngine.getStackViewports();
46
+ const viewport = viewports.find((viewport) => viewport.hasImageId(imageId));
47
+ return viewport.getImageData();
48
+ }
49
+ else if (targetId.startsWith('volumeId:')) {
50
+ const volumeId = targetId.split('volumeId:')[1];
51
+ return cache.getVolume(volumeId);
52
52
  }
53
53
  else {
54
- image = cache.getVolume(targetId);
54
+ throw new Error('getTargetIdImage: targetId must start with "imageId:" or "volumeId:"');
55
55
  }
56
- return { image, viewport };
57
56
  }
58
57
  getTargetId(viewport) {
59
58
  if (viewport instanceof StackViewport) {
60
- return `stackTarget:${viewport.id}`;
59
+ return `imageId:${viewport.getCurrentImageId()}`;
61
60
  }
62
61
  else if (viewport instanceof VolumeViewport) {
63
- return this.getTargetVolumeId(viewport);
62
+ return `volumeId:${this.getTargetVolumeId(viewport)}`;
64
63
  }
65
64
  else {
66
65
  throw new Error('getTargetId: viewport must be a StackViewport or VolumeViewport');
@@ -1 +1 @@
1
- {"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
@@ -30,15 +30,12 @@ export default class RectangleROIStartEndThresholdTool extends RectangleROITool
30
30
  throw new Error('Stack Viewport Not implemented');
31
31
  }
32
32
  else {
33
- volumeId = this.getTargetId(viewport);
33
+ const targetId = this.getTargetId(viewport);
34
+ volumeId = targetId.split('volumeId:')[1];
34
35
  imageVolume = cache.getVolume(volumeId);
35
36
  referencedImageId = csUtils.getClosestImageId(imageVolume, worldPos, viewPlaneNormal, viewUp);
36
37
  }
37
38
  if (referencedImageId) {
38
- const colonIndex = referencedImageId.indexOf(':');
39
- referencedImageId = referencedImageId.substring(colonIndex + 1);
40
- }
41
- else {
42
39
  throw new Error('This tool does not work on non-acquisition planes');
43
40
  }
44
41
  const startIndex = viewport.getCurrentImageIdIndex();
@@ -1 +1 @@
1
- {"version":3,"file":"RectangleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIStartEndThresholdTool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RectangleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIStartEndThresholdTool.ts"],"names":[],"mappings":"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"}
@@ -25,20 +25,16 @@ export default class RectangleROIThresholdTool extends RectangleROITool {
25
25
  this.isDrawing = true;
26
26
  const camera = viewport.getCamera();
27
27
  const { viewPlaneNormal, viewUp } = camera;
28
+ const targetId = this.getTargetId(viewport);
28
29
  let referencedImageId, volumeId;
29
30
  if (viewport instanceof StackViewport) {
30
- referencedImageId =
31
- viewport.getCurrentImageId && viewport.getCurrentImageId();
31
+ referencedImageId = targetId.split('imageId:')[1];
32
32
  }
33
33
  else {
34
- volumeId = this.getTargetId(viewport);
34
+ volumeId = targetId.split('volumeId:')[1];
35
35
  const imageVolume = cache.getVolume(volumeId);
36
36
  referencedImageId = csUtils.getClosestImageId(imageVolume, worldPos, viewPlaneNormal, viewUp);
37
37
  }
38
- if (referencedImageId) {
39
- const colonIndex = referencedImageId.indexOf(':');
40
- referencedImageId = referencedImageId.substring(colonIndex + 1);
41
- }
42
38
  const annotation = {
43
39
  highlighted: true,
44
40
  invalidated: true,
@@ -1 +1 @@
1
- {"version":3,"file":"RectangleROIThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIThresholdTool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RectangleROIThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIThresholdTool.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ declare type JumpToSliceOptions = {
2
+ imageIdIndex?: number;
3
+ };
4
+ export default JumpToSliceOptions;
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=JumpToSliceOptions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"JumpToSliceOptions.js","sourceRoot":"","sources":["../../../src/types/JumpToSliceOptions.ts"],"names":[],"mappings":""}
@@ -11,5 +11,6 @@ import type { AnnotationHandle, TextBoxHandle } from './ToolHandle';
11
11
  import type InteractionTypes from './InteractionTypes';
12
12
  import type { ToolProps, PublicToolProps } from './ToolProps';
13
13
  import type { SVGCursorDescriptor, SVGPoint } from './CursorTypes';
14
+ import type JumpToSliceOptions from './JumpToSliceOptions';
14
15
  import type { Color, ColorLUT, RepresentationConfig, SegmentationRepresentationConfig, SegmentationRepresentationData, Segmentation, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
15
- export type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState, ToolSpecificAnnotationTypes, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, };
16
+ export type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState, ToolSpecificAnnotationTypes, JumpToSliceOptions, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, };
@@ -5,6 +5,7 @@ import throttle from './throttle';
5
5
  import isObject from './isObject';
6
6
  import calibrateImageSpacing from './calibrateImageSpacing';
7
7
  import triggerAnnotationRenderForViewportIds from './triggerAnnotationRenderForViewportIds';
8
+ import jumpToSlice from './viewport/jumpToSlice';
8
9
  import pointInShapeCallback from './pointInShapeCallback';
9
10
  import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
10
11
  import * as segmentation from './segmentation';
@@ -14,4 +15,4 @@ import * as planar from './planar';
14
15
  import * as stackScrollTool from './stackScrollTool';
15
16
  import * as viewportFilters from './viewportFilters';
16
17
  import { triggerEvent } from '@cornerstonejs/core';
17
- export { math, planar, viewportFilters, stackScrollTool, drawing, debounce, deepMerge, throttle, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, };
18
+ export { math, planar, viewportFilters, stackScrollTool, drawing, debounce, deepMerge, throttle, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, };
@@ -5,6 +5,7 @@ import throttle from './throttle';
5
5
  import isObject from './isObject';
6
6
  import calibrateImageSpacing from './calibrateImageSpacing';
7
7
  import triggerAnnotationRenderForViewportIds from './triggerAnnotationRenderForViewportIds';
8
+ import jumpToSlice from './viewport/jumpToSlice';
8
9
  import pointInShapeCallback from './pointInShapeCallback';
9
10
  import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
10
11
  import * as segmentation from './segmentation';
@@ -14,5 +15,5 @@ import * as planar from './planar';
14
15
  import * as stackScrollTool from './stackScrollTool';
15
16
  import * as viewportFilters from './viewportFilters';
16
17
  import { triggerEvent } from '@cornerstonejs/core';
17
- export { math, planar, viewportFilters, stackScrollTool, drawing, debounce, deepMerge, throttle, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, };
18
+ export { math, planar, viewportFilters, stackScrollTool, drawing, debounce, deepMerge, throttle, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, };
18
19
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,sCAAsC,GACvC,MAAM,0BAA0B,CAAC;AAGlC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,qCAAqC,MAAM,yCAAyC,CAAC;AAE5F,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AAGlF,OAAO,KAAK,YAAY,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAGrD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EACL,IAAI,EACJ,MAAM,EACN,eAAe,EACf,eAAe,EACf,OAAO,EACP,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,qBAAqB,EACrB,YAAY,EACZ,qCAAqC,EACrC,oBAAoB,EACpB,gCAAgC,EAChC,sBAAsB,EACtB,sCAAsC,GACvC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,sCAAsC,GACvC,MAAM,0BAA0B,CAAC;AAGlC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,qCAAqC,MAAM,yCAAyC,CAAC;AAC5F,OAAO,WAAW,MAAM,wBAAwB,CAAC;AAEjD,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AAGlF,OAAO,KAAK,YAAY,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAGrD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EACL,IAAI,EACJ,MAAM,EACN,eAAe,EACf,eAAe,EACf,OAAO,EACP,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,qBAAqB,EACrB,YAAY,EACZ,qCAAqC,EACrC,oBAAoB,EACpB,gCAAgC,EAChC,sBAAsB,EACtB,sCAAsC,EACtC,WAAW,GACZ,CAAC"}
@@ -6,7 +6,10 @@ export default function filterAnnotationsForDisplay(viewport, annotations) {
6
6
  const colonIndex = imageId.indexOf(':');
7
7
  const imageURI = imageId.substring(colonIndex + 1);
8
8
  return annotations.filter((annotation) => {
9
- return annotation.metadata.referencedImageId === imageURI;
9
+ const imageId = annotation.metadata.referencedImageId;
10
+ const colonIndex = imageId.indexOf(':');
11
+ const referenceImageURI = imageId.substring(colonIndex + 1);
12
+ return referenceImageURI === imageURI;
10
13
  });
11
14
  }
12
15
  else if (viewport instanceof VolumeViewport) {
@@ -1 +1 @@
1
- {"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EAEd,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAS1E,MAAM,CAAC,OAAO,UAAU,2BAA2B,CACjD,QAAyB,EACzB,WAAwB;IAExB,IAAI,QAAQ,YAAY,aAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QAGnD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,OAAO,UAAU,CAAC,QAAQ,CAAC,iBAAiB,KAAK,QAAQ,CAAC;QAC5D,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,cAAc,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,OAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,4BAA4B,CACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC;KACjE;AACH,CAAC"}
1
+ {"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EAEd,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAS1E,MAAM,CAAC,OAAO,UAAU,2BAA2B,CACjD,QAAyB,EACzB,WAAwB;IAExB,IAAI,QAAQ,YAAY,aAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QAOnD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YACtD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC5D,OAAO,iBAAiB,KAAK,QAAQ,CAAC;QACxC,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,cAAc,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,OAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,4BAA4B,CACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC;KACjE;AACH,CAAC"}
@@ -1,2 +1,2 @@
1
- import { MouseDragEventType, MouseWheelEventType } from '../../types/EventTypes';
2
- export default function scrollThroughStack(evt: MouseWheelEventType | MouseDragEventType, deltaFrames: number, volumeId: string, invert?: boolean): void;
1
+ import { Types } from '@cornerstonejs/core';
2
+ export default function scrollThroughStack(viewport: Types.IStackViewport | Types.IVolumeViewport, targetId: string, deltaFrames: number, invert?: boolean): void;
@@ -1,10 +1,8 @@
1
- import { getEnabledElement, StackViewport, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
1
+ import { StackViewport, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
2
2
  import clip from '../clip';
3
3
  import getSliceRange from './getSliceRange';
4
4
  import snapFocalPointToSlice from './snapFocalPointToSlice';
5
- export default function scrollThroughStack(evt, deltaFrames, volumeId, invert = false) {
6
- const { element } = evt.detail;
7
- const { viewport } = getEnabledElement(element);
5
+ export default function scrollThroughStack(viewport, targetId, deltaFrames, invert = false) {
8
6
  const { type: viewportType } = viewport;
9
7
  const camera = viewport.getCamera();
10
8
  const { focalPoint, viewPlaneNormal, position } = camera;
@@ -17,6 +15,10 @@ export default function scrollThroughStack(evt, deltaFrames, volumeId, invert =
17
15
  viewport.setImageIdIndex(newImageIdIndex);
18
16
  }
19
17
  else if (viewport instanceof VolumeViewport) {
18
+ if (!targetId.startsWith('volumeId')) {
19
+ throw new Error(`scrollThroughStack: targetId must start with 'volumeId' if viewport is a VolumeViewport`);
20
+ }
21
+ const volumeId = targetId.split('volumeId:')[1];
20
22
  const { spacingInNormalDirection, imageVolume } = csUtils.getTargetVolumeAndSpacingInNormalDir(viewport, camera, volumeId);
21
23
  if (!imageVolume) {
22
24
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"scrollThroughStack.js","sourceRoot":"","sources":["../../../../src/utilities/stackScrollTool/scrollThroughStack.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAkB5D,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,GAA6C,EAC7C,WAAmB,EACnB,QAAgB,EAChB,MAAM,GAAG,KAAK;IAEd,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;IAElD,IAAI,QAAQ,YAAY,aAAa,EAAE;QAErC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAC9D,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;QACrD,IAAI,eAAe,GAAG,mBAAmB,GAAG,KAAK,CAAC;QAClD,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC;QAE/D,QAAQ,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;KAC3C;SAAM,IAAI,QAAQ,YAAY,cAAc,EAAE;QAE7C,MAAM,EAAE,wBAAwB,EAAE,WAAW,EAAE,GAC7C,OAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE3E,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC3E;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAC9B,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;QAE5E,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,qBAAqB,CAC1D,UAAU,EACV,QAAQ,EACR,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,KAAK,CACN,CAAC;QAEF,QAAQ,CAAC,SAAS,CAAC;YACjB,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,EAAE,CAAC;KACnB;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;KACvE;AACH,CAAC"}
1
+ {"version":3,"file":"scrollThroughStack.js","sourceRoot":"","sources":["../../../../src/utilities/stackScrollTool/scrollThroughStack.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,cAAc,EACd,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAc5D,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,QAAsD,EACtD,QAAgB,EAChB,WAAmB,EACnB,MAAM,GAAG,KAAK;IAEd,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;IAElD,IAAI,QAAQ,YAAY,aAAa,EAAE;QAErC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAC9D,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;QACrD,IAAI,eAAe,GAAG,mBAAmB,GAAG,KAAK,CAAC;QAClD,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC;QAE/D,QAAQ,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;KAC3C;SAAM,IAAI,QAAQ,YAAY,cAAc,EAAE;QAC7C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAGhD,MAAM,EAAE,wBAAwB,EAAE,WAAW,EAAE,GAC7C,OAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE3E,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC3E;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAC9B,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;QAE5E,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,qBAAqB,CAC1D,UAAU,EACV,QAAQ,EACR,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,KAAK,CACN,CAAC;QAEF,QAAQ,CAAC,SAAS,CAAC;YACjB,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,EAAE,CAAC;KACnB;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;KACvE;AACH,CAAC"}
@@ -0,0 +1,3 @@
1
+ import JumpToSliceOptions from '../../types/JumpToSliceOptions';
2
+ declare function jumpToSlice(element: HTMLDivElement, options: JumpToSliceOptions): Promise<string>;
3
+ export default jumpToSlice;
@@ -0,0 +1,18 @@
1
+ import { getEnabledElement, StackViewport } from '@cornerstonejs/core';
2
+ function jumpToSlice(element, options) {
3
+ const { imageIdIndex } = options;
4
+ if (imageIdIndex === undefined) {
5
+ throw new Error('Cannot jump to slice without an imageIdIndex yet');
6
+ }
7
+ const enabledElement = getEnabledElement(element);
8
+ if (!enabledElement) {
9
+ throw new Error('Element has been disabled');
10
+ }
11
+ const { viewport } = enabledElement;
12
+ if (!(viewport instanceof StackViewport)) {
13
+ throw new Error('Cannot scroll to slice on a non-stack viewport yet');
14
+ }
15
+ return viewport.setImageIdIndex(imageIdIndex);
16
+ }
17
+ export default jumpToSlice;
18
+ //# sourceMappingURL=jumpToSlice.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jumpToSlice.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/jumpToSlice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAcvE,SAAS,WAAW,CAClB,OAAuB,EACvB,OAA2B;IAE3B,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACjC,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAC9C;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,IAAI,CAAC,CAAC,QAAQ,YAAY,aAAa,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,OAAO,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC;AAED,eAAe,WAAW,CAAC"}