@cornerstonejs/tools 0.18.1 → 0.20.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.
- package/dist/cjs/drawingSvg/clearByToolType.js +2 -2
- package/dist/cjs/drawingSvg/clearByToolType.js.map +1 -1
- package/dist/cjs/drawingSvg/draw.js +1 -1
- package/dist/cjs/drawingSvg/draw.js.map +1 -1
- package/dist/cjs/drawingSvg/drawArrow.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawArrow.js.map +1 -1
- package/dist/cjs/drawingSvg/drawCircle.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawCircle.js +3 -3
- package/dist/cjs/drawingSvg/drawCircle.js.map +1 -1
- package/dist/cjs/drawingSvg/drawEllipse.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawEllipse.js +3 -3
- package/dist/cjs/drawingSvg/drawEllipse.js.map +1 -1
- package/dist/cjs/drawingSvg/drawHandles.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawHandles.js +3 -3
- package/dist/cjs/drawingSvg/drawHandles.js.map +1 -1
- package/dist/cjs/drawingSvg/drawLine.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawLine.js +3 -3
- package/dist/cjs/drawingSvg/drawLine.js.map +1 -1
- package/dist/cjs/drawingSvg/drawLink.d.ts +2 -2
- package/dist/cjs/drawingSvg/drawLink.js.map +1 -1
- package/dist/cjs/drawingSvg/drawLinkedTextBox.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawLinkedTextBox.js.map +1 -1
- package/dist/cjs/drawingSvg/drawPolyline.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawPolyline.js +3 -3
- package/dist/cjs/drawingSvg/drawPolyline.js.map +1 -1
- package/dist/cjs/drawingSvg/drawRect.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawRect.js +3 -3
- package/dist/cjs/drawingSvg/drawRect.js.map +1 -1
- package/dist/cjs/drawingSvg/drawTextBox.d.ts +2 -1
- package/dist/cjs/drawingSvg/drawTextBox.js +4 -4
- package/dist/cjs/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/cjs/drawingSvg/getSvgDrawingHelper.d.ts +2 -10
- package/dist/cjs/drawingSvg/getSvgDrawingHelper.js +6 -8
- package/dist/cjs/drawingSvg/getSvgDrawingHelper.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/ToolGroup.d.ts +2 -0
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js +8 -3
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/cjs/tools/CrosshairsTool.d.ts +2 -2
- package/dist/cjs/tools/CrosshairsTool.js +12 -10
- package/dist/cjs/tools/CrosshairsTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollTool.d.ts +3 -1
- package/dist/cjs/tools/StackScrollTool.js +33 -11
- package/dist/cjs/tools/StackScrollTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.d.ts +4 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +17 -9
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/cjs/tools/ZoomTool.d.ts +8 -4
- package/dist/cjs/tools/ZoomTool.js +59 -12
- package/dist/cjs/tools/ZoomTool.js.map +1 -1
- package/dist/cjs/tools/annotation/AngleTool.d.ts +2 -2
- package/dist/cjs/tools/annotation/AngleTool.js +10 -7
- package/dist/cjs/tools/annotation/AngleTool.js.map +1 -1
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.d.ts +2 -2
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js +6 -3
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/cjs/tools/annotation/BidirectionalTool.d.ts +2 -2
- package/dist/cjs/tools/annotation/BidirectionalTool.js +6 -3
- package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/cjs/tools/annotation/DragProbeTool.d.ts +2 -2
- package/dist/cjs/tools/annotation/DragProbeTool.js +5 -2
- package/dist/cjs/tools/annotation/DragProbeTool.js.map +1 -1
- package/dist/cjs/tools/annotation/EllipticalROITool.d.ts +2 -2
- package/dist/cjs/tools/annotation/EllipticalROITool.js +6 -3
- package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/LengthTool.d.ts +2 -2
- package/dist/cjs/tools/annotation/LengthTool.js +6 -3
- package/dist/cjs/tools/annotation/LengthTool.js.map +1 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.d.ts +2 -2
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +5 -3
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/ProbeTool.d.ts +2 -2
- package/dist/cjs/tools/annotation/ProbeTool.js +6 -3
- package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/cjs/tools/annotation/RectangleROITool.d.ts +2 -2
- package/dist/cjs/tools/annotation/RectangleROITool.js +6 -3
- package/dist/cjs/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.d.ts +2 -2
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.d.ts +2 -2
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.d.ts +2 -2
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js +6 -3
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.d.ts +2 -2
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +5 -2
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.d.ts +2 -2
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +6 -3
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.d.ts +2 -2
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +5 -2
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.d.ts +2 -2
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js +6 -3
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/cjs/types/IToolGroup.d.ts +2 -1
- package/dist/cjs/types/JumpToSliceOptions.d.ts +1 -0
- package/dist/cjs/types/SVGDrawingHelper.d.ts +9 -0
- package/dist/cjs/types/SVGDrawingHelper.js +3 -0
- package/dist/cjs/types/SVGDrawingHelper.js.map +1 -0
- package/dist/cjs/types/ScrollOptions.d.ts +1 -0
- package/dist/cjs/types/index.d.ts +2 -1
- package/dist/cjs/utilities/cine/playClip.js +8 -7
- package/dist/cjs/utilities/cine/playClip.js.map +1 -1
- package/dist/cjs/utilities/index.d.ts +3 -2
- package/dist/cjs/utilities/index.js +5 -3
- package/dist/cjs/utilities/index.js.map +1 -1
- package/dist/cjs/utilities/scroll.d.ts +4 -0
- package/dist/cjs/utilities/scroll.js +40 -0
- package/dist/cjs/utilities/scroll.js.map +1 -0
- package/dist/cjs/utilities/stackPrefetch/index.d.ts +2 -0
- package/dist/cjs/utilities/stackPrefetch/index.js +9 -0
- package/dist/cjs/utilities/stackPrefetch/index.js.map +1 -0
- package/dist/cjs/utilities/stackPrefetch/stackPrefetch.d.ts +8 -0
- package/dist/cjs/utilities/stackPrefetch/stackPrefetch.js +232 -0
- package/dist/cjs/utilities/stackPrefetch/stackPrefetch.js.map +1 -0
- package/dist/cjs/utilities/stackPrefetch/state.d.ts +3 -0
- package/dist/cjs/utilities/stackPrefetch/state.js +18 -0
- package/dist/cjs/utilities/stackPrefetch/state.js.map +1 -0
- package/dist/cjs/utilities/triggerAnnotationRender.js +7 -5
- package/dist/cjs/utilities/triggerAnnotationRender.js.map +1 -1
- package/dist/cjs/utilities/viewport/jumpToSlice.d.ts +1 -1
- package/dist/cjs/utilities/viewport/jumpToSlice.js +9 -7
- package/dist/cjs/utilities/viewport/jumpToSlice.js.map +1 -1
- package/dist/esm/drawingSvg/clearByToolType.js +2 -2
- package/dist/esm/drawingSvg/clearByToolType.js.map +1 -1
- package/dist/esm/drawingSvg/draw.js +1 -1
- package/dist/esm/drawingSvg/draw.js.map +1 -1
- package/dist/esm/drawingSvg/drawArrow.d.ts +2 -1
- package/dist/esm/drawingSvg/drawArrow.js.map +1 -1
- package/dist/esm/drawingSvg/drawCircle.d.ts +2 -1
- package/dist/esm/drawingSvg/drawCircle.js +3 -3
- package/dist/esm/drawingSvg/drawCircle.js.map +1 -1
- package/dist/esm/drawingSvg/drawEllipse.d.ts +2 -1
- package/dist/esm/drawingSvg/drawEllipse.js +3 -3
- package/dist/esm/drawingSvg/drawEllipse.js.map +1 -1
- package/dist/esm/drawingSvg/drawHandles.d.ts +2 -1
- package/dist/esm/drawingSvg/drawHandles.js +3 -3
- package/dist/esm/drawingSvg/drawHandles.js.map +1 -1
- package/dist/esm/drawingSvg/drawLine.d.ts +2 -1
- package/dist/esm/drawingSvg/drawLine.js +3 -3
- package/dist/esm/drawingSvg/drawLine.js.map +1 -1
- package/dist/esm/drawingSvg/drawLink.d.ts +2 -2
- package/dist/esm/drawingSvg/drawLink.js.map +1 -1
- package/dist/esm/drawingSvg/drawLinkedTextBox.d.ts +2 -1
- package/dist/esm/drawingSvg/drawLinkedTextBox.js.map +1 -1
- package/dist/esm/drawingSvg/drawPolyline.d.ts +2 -1
- package/dist/esm/drawingSvg/drawPolyline.js +3 -3
- package/dist/esm/drawingSvg/drawPolyline.js.map +1 -1
- package/dist/esm/drawingSvg/drawRect.d.ts +2 -1
- package/dist/esm/drawingSvg/drawRect.js +3 -3
- package/dist/esm/drawingSvg/drawRect.js.map +1 -1
- package/dist/esm/drawingSvg/drawTextBox.d.ts +2 -1
- package/dist/esm/drawingSvg/drawTextBox.js +4 -4
- package/dist/esm/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/esm/drawingSvg/getSvgDrawingHelper.d.ts +2 -10
- package/dist/esm/drawingSvg/getSvgDrawingHelper.js +6 -8
- package/dist/esm/drawingSvg/getSvgDrawingHelper.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/ToolGroup.d.ts +2 -0
- package/dist/esm/store/ToolGroupManager/ToolGroup.js +9 -4
- package/dist/esm/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/esm/tools/CrosshairsTool.d.ts +2 -2
- package/dist/esm/tools/CrosshairsTool.js +12 -10
- package/dist/esm/tools/CrosshairsTool.js.map +1 -1
- package/dist/esm/tools/StackScrollTool.d.ts +3 -1
- package/dist/esm/tools/StackScrollTool.js +34 -12
- package/dist/esm/tools/StackScrollTool.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.d.ts +4 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +17 -9
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/esm/tools/ZoomTool.d.ts +8 -4
- package/dist/esm/tools/ZoomTool.js +59 -12
- package/dist/esm/tools/ZoomTool.js.map +1 -1
- package/dist/esm/tools/annotation/AngleTool.d.ts +2 -2
- package/dist/esm/tools/annotation/AngleTool.js +10 -7
- package/dist/esm/tools/annotation/AngleTool.js.map +1 -1
- package/dist/esm/tools/annotation/ArrowAnnotateTool.d.ts +2 -2
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js +6 -3
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/esm/tools/annotation/BidirectionalTool.d.ts +2 -2
- package/dist/esm/tools/annotation/BidirectionalTool.js +6 -3
- package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/esm/tools/annotation/DragProbeTool.d.ts +2 -2
- package/dist/esm/tools/annotation/DragProbeTool.js +5 -2
- package/dist/esm/tools/annotation/DragProbeTool.js.map +1 -1
- package/dist/esm/tools/annotation/EllipticalROITool.d.ts +2 -2
- package/dist/esm/tools/annotation/EllipticalROITool.js +6 -3
- package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/esm/tools/annotation/LengthTool.d.ts +2 -2
- package/dist/esm/tools/annotation/LengthTool.js +6 -3
- package/dist/esm/tools/annotation/LengthTool.js.map +1 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.d.ts +2 -2
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +5 -3
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/esm/tools/annotation/ProbeTool.d.ts +2 -2
- package/dist/esm/tools/annotation/ProbeTool.js +6 -3
- package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/esm/tools/annotation/RectangleROITool.d.ts +2 -2
- package/dist/esm/tools/annotation/RectangleROITool.js +6 -3
- package/dist/esm/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.d.ts +2 -2
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.d.ts +2 -2
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.d.ts +2 -2
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +6 -3
- package/dist/esm/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.d.ts +2 -2
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +5 -2
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.d.ts +2 -2
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +6 -3
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.d.ts +2 -2
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +5 -2
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.d.ts +2 -2
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +6 -3
- package/dist/esm/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/esm/types/IToolGroup.d.ts +2 -1
- package/dist/esm/types/JumpToSliceOptions.d.ts +1 -0
- package/dist/esm/types/SVGDrawingHelper.d.ts +9 -0
- package/dist/esm/types/SVGDrawingHelper.js +2 -0
- package/dist/esm/types/SVGDrawingHelper.js.map +1 -0
- package/dist/esm/types/ScrollOptions.d.ts +1 -0
- package/dist/esm/types/index.d.ts +2 -1
- package/dist/esm/utilities/cine/playClip.js +8 -7
- package/dist/esm/utilities/cine/playClip.js.map +1 -1
- package/dist/esm/utilities/index.d.ts +3 -2
- package/dist/esm/utilities/index.js +3 -2
- package/dist/esm/utilities/index.js.map +1 -1
- package/dist/esm/utilities/scroll.d.ts +4 -0
- package/dist/esm/utilities/scroll.js +35 -0
- package/dist/esm/utilities/scroll.js.map +1 -0
- package/dist/esm/utilities/stackPrefetch/index.d.ts +2 -0
- package/dist/esm/utilities/stackPrefetch/index.js +3 -0
- package/dist/esm/utilities/stackPrefetch/index.js.map +1 -0
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.d.ts +8 -0
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.js +226 -0
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.js.map +1 -0
- package/dist/esm/utilities/stackPrefetch/state.d.ts +3 -0
- package/dist/esm/utilities/stackPrefetch/state.js +14 -0
- package/dist/esm/utilities/stackPrefetch/state.js.map +1 -0
- package/dist/esm/utilities/triggerAnnotationRender.js +7 -5
- package/dist/esm/utilities/triggerAnnotationRender.js.map +1 -1
- package/dist/esm/utilities/viewport/jumpToSlice.d.ts +1 -1
- package/dist/esm/utilities/viewport/jumpToSlice.js +9 -7
- package/dist/esm/utilities/viewport/jumpToSlice.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.LICENSE.txt +2 -0
- package/dist/umd/index.js.map +1 -1
- package/package.json +4 -4
- package/dist/cjs/utilities/stackScrollTool/index.d.ts +0 -2
- package/dist/cjs/utilities/stackScrollTool/index.js +0 -9
- package/dist/cjs/utilities/stackScrollTool/index.js.map +0 -1
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.d.ts +0 -3
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js +0 -43
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js.map +0 -1
- package/dist/esm/utilities/stackScrollTool/index.d.ts +0 -2
- package/dist/esm/utilities/stackScrollTool/index.js +0 -3
- package/dist/esm/utilities/stackScrollTool/index.js.map +0 -1
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.d.ts +0 -3
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js +0 -37
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js.map +0 -1
|
@@ -177,8 +177,9 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
177
177
|
element.removeEventListener(Events.MOUSE_CLICK, this._mouseUpCallback);
|
|
178
178
|
};
|
|
179
179
|
this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
|
|
180
|
+
let renderStatus = false;
|
|
180
181
|
if (!this.editData) {
|
|
181
|
-
return;
|
|
182
|
+
return renderStatus;
|
|
182
183
|
}
|
|
183
184
|
const { viewport } = enabledElement;
|
|
184
185
|
const { annotation } = this.editData;
|
|
@@ -190,12 +191,14 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
190
191
|
const color = `rgb(${toolMetadata.segmentColor.slice(0, 3)})`;
|
|
191
192
|
if (!viewport.getRenderingEngine()) {
|
|
192
193
|
console.warn('Rendering Engine has been destroyed');
|
|
193
|
-
return;
|
|
194
|
+
return renderStatus;
|
|
194
195
|
}
|
|
195
196
|
const rectangleUID = '0';
|
|
196
197
|
drawRectSvg(svgDrawingHelper, annotationUID, rectangleUID, canvasCoordinates[0], canvasCoordinates[3], {
|
|
197
198
|
color,
|
|
198
199
|
});
|
|
200
|
+
renderStatus = true;
|
|
201
|
+
return renderStatus;
|
|
199
202
|
};
|
|
200
203
|
}
|
|
201
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAG9E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Types } from '@cornerstonejs/core';
|
|
2
2
|
import { BaseTool } from '../base';
|
|
3
|
-
import { PublicToolProps, ToolProps, EventTypes } from '../../types';
|
|
3
|
+
import { PublicToolProps, ToolProps, EventTypes, SVGDrawingHelper } from '../../types';
|
|
4
4
|
export default class SphereScissorsTool extends BaseTool {
|
|
5
5
|
static toolName: string;
|
|
6
6
|
editData: {
|
|
@@ -26,5 +26,5 @@ export default class SphereScissorsTool extends BaseTool {
|
|
|
26
26
|
_mouseUpCallback: (evt: EventTypes.MouseUpEventType | EventTypes.MouseClickEventType) => void;
|
|
27
27
|
_activateDraw: (element: any) => void;
|
|
28
28
|
_deactivateDraw: (element: any) => void;
|
|
29
|
-
renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper:
|
|
29
|
+
renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper) => boolean;
|
|
30
30
|
}
|
|
@@ -162,13 +162,14 @@ export default class SphereScissorsTool extends BaseTool {
|
|
|
162
162
|
element.removeEventListener(Events.MOUSE_CLICK, this._mouseUpCallback);
|
|
163
163
|
};
|
|
164
164
|
this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
|
|
165
|
+
let renderStatus = false;
|
|
165
166
|
if (!this.editData) {
|
|
166
|
-
return;
|
|
167
|
+
return renderStatus;
|
|
167
168
|
}
|
|
168
169
|
const { viewport } = enabledElement;
|
|
169
170
|
const { viewportIdsToRender } = this.editData;
|
|
170
171
|
if (!viewportIdsToRender.includes(viewport.id)) {
|
|
171
|
-
return;
|
|
172
|
+
return renderStatus;
|
|
172
173
|
}
|
|
173
174
|
const { annotation } = this.editData;
|
|
174
175
|
const toolMetadata = annotation.metadata;
|
|
@@ -186,12 +187,14 @@ export default class SphereScissorsTool extends BaseTool {
|
|
|
186
187
|
const color = `rgb(${toolMetadata.segmentColor.slice(0, 3)})`;
|
|
187
188
|
if (!viewport.getRenderingEngine()) {
|
|
188
189
|
console.warn('Rendering Engine has been destroyed');
|
|
189
|
-
return;
|
|
190
|
+
return renderStatus;
|
|
190
191
|
}
|
|
191
192
|
const circleUID = '0';
|
|
192
193
|
drawCircleSvg(svgDrawingHelper, annotationUID, circleUID, center, radius, {
|
|
193
194
|
color,
|
|
194
195
|
});
|
|
196
|
+
renderStatus = true;
|
|
197
|
+
return renderStatus;
|
|
195
198
|
};
|
|
196
199
|
}
|
|
197
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAG9E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Types } from '@cornerstonejs/core';
|
|
1
|
+
import type { Types } from '@cornerstonejs/core';
|
|
2
2
|
import { SetToolBindingsType, ToolOptionsType } from './ISetToolModeOptions';
|
|
3
3
|
export default interface IToolGroup {
|
|
4
4
|
_toolInstances: Record<string, any>;
|
|
@@ -6,6 +6,7 @@ export default interface IToolGroup {
|
|
|
6
6
|
viewportsInfo: Array<Types.IViewportId>;
|
|
7
7
|
toolOptions: Record<string, any>;
|
|
8
8
|
getViewportIds: () => string[];
|
|
9
|
+
getViewportsInfo: () => Array<Types.IViewportId>;
|
|
9
10
|
getToolInstance: {
|
|
10
11
|
(toolName: string): any;
|
|
11
12
|
};
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
declare type SVGDrawingHelper = {
|
|
2
|
+
svgLayerElement: HTMLDivElement;
|
|
3
|
+
svgNodeCacheForCanvas: Record<string, unknown>;
|
|
4
|
+
getSvgNode: (cacheKey: string) => SVGGElement | undefined;
|
|
5
|
+
appendNode: (svgNode: SVGElement, cacheKey: string) => void;
|
|
6
|
+
setNodeTouched: (cacheKey: string) => void;
|
|
7
|
+
clearUntouched: () => void;
|
|
8
|
+
};
|
|
9
|
+
export default SVGDrawingHelper;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SVGDrawingHelper.js","sourceRoot":"","sources":["../../../src/types/SVGDrawingHelper.ts"],"names":[],"mappings":""}
|
|
@@ -15,6 +15,7 @@ import type { SVGCursorDescriptor, SVGPoint } from './CursorTypes';
|
|
|
15
15
|
import type JumpToSliceOptions from './JumpToSliceOptions';
|
|
16
16
|
import type ScrollOptions from './ScrollOptions';
|
|
17
17
|
import type BoundsIJK from './BoundsIJK';
|
|
18
|
+
import type SVGDrawingHelper from './SVGDrawingHelper';
|
|
18
19
|
import type * as CINETypes from './CINETypes';
|
|
19
20
|
import type { Color, ColorLUT, RepresentationConfig, SegmentationRepresentationConfig, SegmentationRepresentationData, Segmentation, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
|
|
20
|
-
export type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState, AnnotationStyle, 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, ScrollOptions, CINETypes, BoundsIJK, };
|
|
21
|
+
export type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState, AnnotationStyle, 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, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, };
|
|
@@ -2,6 +2,8 @@ import { utilities, getEnabledElement, StackViewport, } from '@cornerstonejs/cor
|
|
|
2
2
|
import CINE_EVENTS from './events';
|
|
3
3
|
import { addToolState, getToolState } from './state';
|
|
4
4
|
const { triggerEvent } = utilities;
|
|
5
|
+
const debounced = true;
|
|
6
|
+
const loop = true;
|
|
5
7
|
function playClip(element, playClipOptions) {
|
|
6
8
|
let playClipTimeouts;
|
|
7
9
|
let playClipIsTimeVarying;
|
|
@@ -17,7 +19,7 @@ function playClip(element, playClipOptions) {
|
|
|
17
19
|
throw new Error('playClip: element must be a stack viewport, volume viewport playClip not yet implemented');
|
|
18
20
|
}
|
|
19
21
|
const stackData = {
|
|
20
|
-
|
|
22
|
+
targetImageIdIndex: viewport.getTargetImageIdIndex(),
|
|
21
23
|
imageIds: viewport.getImageIds(),
|
|
22
24
|
};
|
|
23
25
|
let playClipData = getToolState(element);
|
|
@@ -52,7 +54,7 @@ function playClip(element, playClipOptions) {
|
|
|
52
54
|
playClipIsTimeVarying = isTimeVarying;
|
|
53
55
|
}
|
|
54
56
|
const playClipAction = () => {
|
|
55
|
-
let newImageIdIndex = stackData.
|
|
57
|
+
let newImageIdIndex = stackData.targetImageIdIndex;
|
|
56
58
|
const imageCount = stackData.imageIds.length;
|
|
57
59
|
if (playClipData.reverse) {
|
|
58
60
|
newImageIdIndex--;
|
|
@@ -75,10 +77,9 @@ function playClip(element, playClipOptions) {
|
|
|
75
77
|
if (newImageIdIndex < 0) {
|
|
76
78
|
newImageIdIndex = imageCount - 1;
|
|
77
79
|
}
|
|
78
|
-
if (newImageIdIndex !== stackData.
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
});
|
|
80
|
+
if (newImageIdIndex !== stackData.targetImageIdIndex) {
|
|
81
|
+
const delta = newImageIdIndex - stackData.targetImageIdIndex;
|
|
82
|
+
viewport.scroll(delta, debounced, loop);
|
|
82
83
|
}
|
|
83
84
|
};
|
|
84
85
|
if (playClipTimeouts &&
|
|
@@ -86,7 +87,7 @@ function playClip(element, playClipOptions) {
|
|
|
86
87
|
playClipIsTimeVarying) {
|
|
87
88
|
playClipData.usingFrameTimeVector = true;
|
|
88
89
|
playClipData.intervalId = window.setTimeout(function playClipTimeoutHandler() {
|
|
89
|
-
playClipData.intervalId = window.setTimeout(playClipTimeoutHandler, playClipTimeouts[stackData.
|
|
90
|
+
playClipData.intervalId = window.setTimeout(playClipTimeoutHandler, playClipTimeouts[stackData.targetImageIdIndex]);
|
|
90
91
|
playClipAction();
|
|
91
92
|
}, 0);
|
|
92
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playClip.js","sourceRoot":"","sources":["../../../../src/utilities/cine/playClip.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,iBAAiB,EACjB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,WAAW,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGrD,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"playClip.js","sourceRoot":"","sources":["../../../../src/utilities/cine/playClip.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,16 @@ import triggerAnnotationRenderForViewportIds from './triggerAnnotationRenderForV
|
|
|
9
9
|
import jumpToSlice from './viewport/jumpToSlice';
|
|
10
10
|
import pointInShapeCallback from './pointInShapeCallback';
|
|
11
11
|
import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
|
|
12
|
+
import scroll from './scroll';
|
|
12
13
|
import * as segmentation from './segmentation';
|
|
13
14
|
import * as drawing from './drawing';
|
|
14
15
|
import * as math from './math';
|
|
15
16
|
import * as planar from './planar';
|
|
16
|
-
import * as stackScrollTool from './stackScrollTool';
|
|
17
17
|
import * as viewportFilters from './viewportFilters';
|
|
18
18
|
import * as orientation from './orientation';
|
|
19
19
|
import * as cine from './cine';
|
|
20
20
|
import * as boundingBox from './boundingBox';
|
|
21
21
|
import * as rectangleROITool from './rectangleROITool';
|
|
22
|
+
import * as stackPrefetch from './stackPrefetch';
|
|
22
23
|
import { triggerEvent } from '@cornerstonejs/core';
|
|
23
|
-
export { math, planar, viewportFilters,
|
|
24
|
+
export { math, planar, viewportFilters, drawing, debounce, deepMerge, throttle, orientation, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, cine, clip, boundingBox, rectangleROITool, stackPrefetch, scroll, };
|
|
@@ -9,16 +9,17 @@ import triggerAnnotationRenderForViewportIds from './triggerAnnotationRenderForV
|
|
|
9
9
|
import jumpToSlice from './viewport/jumpToSlice';
|
|
10
10
|
import pointInShapeCallback from './pointInShapeCallback';
|
|
11
11
|
import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
|
|
12
|
+
import scroll from './scroll';
|
|
12
13
|
import * as segmentation from './segmentation';
|
|
13
14
|
import * as drawing from './drawing';
|
|
14
15
|
import * as math from './math';
|
|
15
16
|
import * as planar from './planar';
|
|
16
|
-
import * as stackScrollTool from './stackScrollTool';
|
|
17
17
|
import * as viewportFilters from './viewportFilters';
|
|
18
18
|
import * as orientation from './orientation';
|
|
19
19
|
import * as cine from './cine';
|
|
20
20
|
import * as boundingBox from './boundingBox';
|
|
21
21
|
import * as rectangleROITool from './rectangleROITool';
|
|
22
|
+
import * as stackPrefetch from './stackPrefetch';
|
|
22
23
|
import { triggerEvent } from '@cornerstonejs/core';
|
|
23
|
-
export { math, planar, viewportFilters,
|
|
24
|
+
export { math, planar, viewportFilters, drawing, debounce, deepMerge, throttle, orientation, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, cine, clip, boundingBox, rectangleROITool, stackPrefetch, scroll, };
|
|
24
25
|
//# 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,IAAI,MAAM,QAAQ,CAAC;AAC1B,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;
|
|
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,IAAI,MAAM,QAAQ,CAAC;AAC1B,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;AAClF,OAAO,MAAM,MAAM,UAAU,CAAC;AAG9B,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,WAAW,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,WAAW,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EACL,IAAI,EACJ,MAAM,EACN,eAAe,EACf,OAAO,EACP,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,qBAAqB,EACrB,YAAY,EACZ,qCAAqC,EACrC,oBAAoB,EACpB,gCAAgC,EAChC,sBAAsB,EACtB,sCAAsC,EACtC,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,MAAM,GACP,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Types, VolumeViewport } from '@cornerstonejs/core';
|
|
2
|
+
import { ScrollOptions } from '../types';
|
|
3
|
+
export default function scroll(viewport: Types.IStackViewport | Types.IVolumeViewport, options: ScrollOptions): void;
|
|
4
|
+
export declare function scrollVolume(viewport: VolumeViewport, volumeId: string, delta: number): void;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { StackViewport, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
|
|
2
|
+
export default function scroll(viewport, options) {
|
|
3
|
+
const { type: viewportType } = viewport;
|
|
4
|
+
const { volumeId, delta } = options;
|
|
5
|
+
if (viewport instanceof StackViewport) {
|
|
6
|
+
viewport.scroll(delta, options.debounceLoading);
|
|
7
|
+
}
|
|
8
|
+
else if (viewport instanceof VolumeViewport) {
|
|
9
|
+
scrollVolume(viewport, volumeId, delta);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
throw new Error(`Not implemented for Viewport Type: ${viewportType}`);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
export function scrollVolume(viewport, volumeId, delta) {
|
|
16
|
+
const camera = viewport.getCamera();
|
|
17
|
+
const { focalPoint, viewPlaneNormal, position } = camera;
|
|
18
|
+
const { spacingInNormalDirection, imageVolume } = csUtils.getTargetVolumeAndSpacingInNormalDir(viewport, camera, volumeId);
|
|
19
|
+
if (!imageVolume) {
|
|
20
|
+
throw new Error(`Could not find image volume with id ${volumeId} in the viewport`);
|
|
21
|
+
}
|
|
22
|
+
const actorEntry = viewport.getActor(imageVolume.volumeId);
|
|
23
|
+
if (!actorEntry) {
|
|
24
|
+
console.warn('No actor found for with actorUID of', imageVolume.volumeId);
|
|
25
|
+
}
|
|
26
|
+
const volumeActor = actorEntry.actor;
|
|
27
|
+
const sliceRange = csUtils.getSliceRange(volumeActor, viewPlaneNormal, focalPoint);
|
|
28
|
+
const { newFocalPoint, newPosition } = csUtils.snapFocalPointToSlice(focalPoint, position, sliceRange, viewPlaneNormal, spacingInNormalDirection, delta);
|
|
29
|
+
viewport.setCamera({
|
|
30
|
+
focalPoint: newFocalPoint,
|
|
31
|
+
position: newPosition,
|
|
32
|
+
});
|
|
33
|
+
viewport.render();
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=scroll.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scroll.js","sourceRoot":"","sources":["../../../src/utilities/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,cAAc,EACd,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAY7B,MAAM,CAAC,OAAO,UAAU,MAAM,CAC5B,QAAsD,EACtD,OAAsB;IAEtB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEpC,IAAI,QAAQ,YAAY,aAAa,EAAE;QACrC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;KACjD;SAAM,IAAI,QAAQ,YAAY,cAAc,EAAE;QAC7C,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;KACzC;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,QAAwB,EACxB,QAAgB,EAChB,KAAa;IAEb,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACzD,MAAM,EAAE,wBAAwB,EAAE,WAAW,EAAE,GAC7C,OAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE3E,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,uCAAuC,QAAQ,kBAAkB,CAClE,CAAC;KACH;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE3D,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;KAC3E;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,KAA0B,CAAC;IAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CACtC,WAAW,EACX,eAAe,EACf,UAAU,CACX,CAAC;IAEF,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAClE,UAAU,EACV,QAAQ,EACR,UAAU,EACV,eAAe,EACf,wBAAwB,EACxB,KAAK,CACN,CAAC;IAEF,QAAQ,CAAC,SAAS,CAAC;QACjB,UAAU,EAAE,aAAa;QACzB,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAC;IACH,QAAQ,CAAC,MAAM,EAAE,CAAC;AACpB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/stackPrefetch/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EACP,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
declare function enable(element: any): void;
|
|
2
|
+
declare function disable(element: any): void;
|
|
3
|
+
declare function getConfiguration(): {
|
|
4
|
+
maxImagesToPrefetch: number;
|
|
5
|
+
preserveExistingPool: boolean;
|
|
6
|
+
};
|
|
7
|
+
declare function setConfiguration(config: any): void;
|
|
8
|
+
export { enable, disable, getConfiguration, setConfiguration };
|
|
@@ -0,0 +1,226 @@
|
|
|
1
|
+
import { getEnabledElement, StackViewport, imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, utilities as csUtils, } from '@cornerstonejs/core';
|
|
2
|
+
import { addToolState, getToolState } from './state';
|
|
3
|
+
const requestType = Enums.RequestType.Prefetch;
|
|
4
|
+
const priority = 0;
|
|
5
|
+
const addToBeginning = true;
|
|
6
|
+
let configuration = {
|
|
7
|
+
maxImagesToPrefetch: Infinity,
|
|
8
|
+
preserveExistingPool: false,
|
|
9
|
+
};
|
|
10
|
+
let resetPrefetchTimeout;
|
|
11
|
+
const resetPrefetchDelay = 10;
|
|
12
|
+
function range(lowEnd, highEnd) {
|
|
13
|
+
lowEnd = Math.round(lowEnd) || 0;
|
|
14
|
+
highEnd = Math.round(highEnd) || 0;
|
|
15
|
+
const arr = [];
|
|
16
|
+
let c = highEnd - lowEnd + 1;
|
|
17
|
+
if (c <= 0) {
|
|
18
|
+
return arr;
|
|
19
|
+
}
|
|
20
|
+
while (c--) {
|
|
21
|
+
arr[c] = highEnd--;
|
|
22
|
+
}
|
|
23
|
+
return arr;
|
|
24
|
+
}
|
|
25
|
+
function nearestIndex(arr, x) {
|
|
26
|
+
let low = 0;
|
|
27
|
+
let high = arr.length - 1;
|
|
28
|
+
arr.forEach((v, idx) => {
|
|
29
|
+
if (v < x) {
|
|
30
|
+
low = Math.max(idx, low);
|
|
31
|
+
}
|
|
32
|
+
else if (v > x) {
|
|
33
|
+
high = Math.min(idx, high);
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
return { low, high };
|
|
37
|
+
}
|
|
38
|
+
function getStackData(element) {
|
|
39
|
+
const enabledElement = getEnabledElement(element);
|
|
40
|
+
if (!enabledElement) {
|
|
41
|
+
throw new Error('stackPrefetch: element must be a valid Cornerstone enabled element');
|
|
42
|
+
}
|
|
43
|
+
const { viewport } = enabledElement;
|
|
44
|
+
if (!(viewport instanceof StackViewport)) {
|
|
45
|
+
throw new Error('stackPrefetch: element must be a StackViewport, VolumeViewport stackPrefetch not yet implemented');
|
|
46
|
+
}
|
|
47
|
+
return {
|
|
48
|
+
currentImageIdIndex: viewport.getCurrentImageIdIndex(),
|
|
49
|
+
imageIds: viewport.getImageIds(),
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
function prefetch(element) {
|
|
53
|
+
const stackPrefetchData = getToolState(element);
|
|
54
|
+
if (!stackPrefetchData) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const stackPrefetch = stackPrefetchData || {};
|
|
58
|
+
const stack = getStackData(element);
|
|
59
|
+
if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
|
|
60
|
+
console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
if (!stackPrefetch.indicesToRequest ||
|
|
64
|
+
!stackPrefetch.indicesToRequest.length) {
|
|
65
|
+
stackPrefetch.enabled = false;
|
|
66
|
+
}
|
|
67
|
+
if (stackPrefetch.enabled === false) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
function removeFromList(imageIdIndex) {
|
|
71
|
+
const index = stackPrefetch.indicesToRequest.indexOf(imageIdIndex);
|
|
72
|
+
if (index > -1) {
|
|
73
|
+
stackPrefetch.indicesToRequest.splice(index, 1);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
stackPrefetchData.indicesToRequest.sort((a, b) => a - b);
|
|
77
|
+
const indicesToRequestCopy = stackPrefetch.indicesToRequest.slice();
|
|
78
|
+
indicesToRequestCopy.forEach(function (imageIdIndex) {
|
|
79
|
+
const imageId = stack.imageIds[imageIdIndex];
|
|
80
|
+
if (!imageId) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
const imageLoadObject = cache.getImageLoadObject(imageId);
|
|
84
|
+
if (imageLoadObject) {
|
|
85
|
+
removeFromList(imageIdIndex);
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
if (!stackPrefetch.indicesToRequest.length) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
if (!configuration.preserveExistingPool) {
|
|
92
|
+
imageLoadPoolManager.clearRequestStack(requestType);
|
|
93
|
+
}
|
|
94
|
+
const nearest = nearestIndex(stackPrefetch.indicesToRequest, stack.currentImageIdIndex);
|
|
95
|
+
let imageId;
|
|
96
|
+
let nextImageIdIndex;
|
|
97
|
+
const preventCache = false;
|
|
98
|
+
function doneCallback(image) {
|
|
99
|
+
console.log('prefetch done: %s', image.imageId);
|
|
100
|
+
const imageIdIndex = stack.imageIds.indexOf(image.imageId);
|
|
101
|
+
removeFromList(imageIdIndex);
|
|
102
|
+
}
|
|
103
|
+
let lowerIndex = nearest.low;
|
|
104
|
+
let higherIndex = nearest.high;
|
|
105
|
+
const imageIdsToPrefetch = [];
|
|
106
|
+
while (lowerIndex >= 0 ||
|
|
107
|
+
higherIndex < stackPrefetch.indicesToRequest.length) {
|
|
108
|
+
const currentIndex = stack.currentImageIdIndex;
|
|
109
|
+
const shouldSkipLower = currentIndex - stackPrefetch.indicesToRequest[lowerIndex] >
|
|
110
|
+
configuration.maxImagesToPrefetch;
|
|
111
|
+
const shouldSkipHigher = stackPrefetch.indicesToRequest[higherIndex] - currentIndex >
|
|
112
|
+
configuration.maxImagesToPrefetch;
|
|
113
|
+
const shouldLoadLower = !shouldSkipLower && lowerIndex >= 0;
|
|
114
|
+
const shouldLoadHigher = !shouldSkipHigher && higherIndex < stackPrefetch.indicesToRequest.length;
|
|
115
|
+
if (!shouldLoadHigher && !shouldLoadLower) {
|
|
116
|
+
break;
|
|
117
|
+
}
|
|
118
|
+
if (shouldLoadLower) {
|
|
119
|
+
nextImageIdIndex = stackPrefetch.indicesToRequest[lowerIndex--];
|
|
120
|
+
imageId = stack.imageIds[nextImageIdIndex];
|
|
121
|
+
imageIdsToPrefetch.push(imageId);
|
|
122
|
+
}
|
|
123
|
+
if (shouldLoadHigher) {
|
|
124
|
+
nextImageIdIndex = stackPrefetch.indicesToRequest[higherIndex++];
|
|
125
|
+
imageId = stack.imageIds[nextImageIdIndex];
|
|
126
|
+
imageIdsToPrefetch.push(imageId);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
const requestFn = (imageId, options) => imageLoader.loadAndCacheImage(imageId, options);
|
|
130
|
+
imageIdsToPrefetch.forEach((imageId) => {
|
|
131
|
+
const scalingParameters = csUtils.getScalingParameters(imageId);
|
|
132
|
+
const options = {
|
|
133
|
+
targetBuffer: {
|
|
134
|
+
type: 'Float32Array',
|
|
135
|
+
offset: null,
|
|
136
|
+
length: null,
|
|
137
|
+
},
|
|
138
|
+
preScale: {
|
|
139
|
+
scalingParameters,
|
|
140
|
+
},
|
|
141
|
+
requestType,
|
|
142
|
+
};
|
|
143
|
+
imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), requestType, {
|
|
144
|
+
imageId,
|
|
145
|
+
}, priority);
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
function getPromiseRemovedHandler(element) {
|
|
149
|
+
return function (e) {
|
|
150
|
+
const eventData = e.detail;
|
|
151
|
+
let stackData;
|
|
152
|
+
try {
|
|
153
|
+
stackData = getStackData(element);
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
if (!stackData || !stackData.imageIds || stackData.imageIds.length === 0) {
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
const stack = stackData;
|
|
162
|
+
const imageIdIndex = stack.imageIds.indexOf(eventData.imageId);
|
|
163
|
+
if (imageIdIndex < 0) {
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
const stackPrefetchData = getToolState(element);
|
|
167
|
+
if (!stackPrefetchData ||
|
|
168
|
+
!stackPrefetchData.data ||
|
|
169
|
+
!stackPrefetchData.data.length) {
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
stackPrefetchData.indicesToRequest.push(imageIdIndex);
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
function onImageUpdated(e) {
|
|
176
|
+
clearTimeout(resetPrefetchTimeout);
|
|
177
|
+
resetPrefetchTimeout = setTimeout(function () {
|
|
178
|
+
const element = e.target;
|
|
179
|
+
try {
|
|
180
|
+
prefetch(element);
|
|
181
|
+
}
|
|
182
|
+
catch (error) {
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
}, resetPrefetchDelay);
|
|
186
|
+
}
|
|
187
|
+
function enable(element) {
|
|
188
|
+
const stack = getStackData(element);
|
|
189
|
+
if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
|
|
190
|
+
console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
const stackPrefetchData = {
|
|
194
|
+
indicesToRequest: range(0, stack.imageIds.length - 1),
|
|
195
|
+
enabled: true,
|
|
196
|
+
direction: 1,
|
|
197
|
+
};
|
|
198
|
+
const indexOfCurrentImage = stackPrefetchData.indicesToRequest.indexOf(stack.currentImageIdIndex);
|
|
199
|
+
stackPrefetchData.indicesToRequest.splice(indexOfCurrentImage, 1);
|
|
200
|
+
addToolState(element, stackPrefetchData);
|
|
201
|
+
prefetch(element);
|
|
202
|
+
element.removeEventListener(Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
|
|
203
|
+
element.addEventListener(Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
|
|
204
|
+
const promiseRemovedHandler = getPromiseRemovedHandler(element);
|
|
205
|
+
eventTarget.removeEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
|
|
206
|
+
eventTarget.addEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
|
|
207
|
+
}
|
|
208
|
+
function disable(element) {
|
|
209
|
+
clearTimeout(resetPrefetchTimeout);
|
|
210
|
+
element.removeEventListener(Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
|
|
211
|
+
const promiseRemovedHandler = getPromiseRemovedHandler(element);
|
|
212
|
+
eventTarget.removeEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
|
|
213
|
+
const stackPrefetchData = getToolState(element);
|
|
214
|
+
if (stackPrefetchData && stackPrefetchData.data.length) {
|
|
215
|
+
stackPrefetchData.enabled = false;
|
|
216
|
+
imageLoadPoolManager.clearRequestStack(requestType);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
function getConfiguration() {
|
|
220
|
+
return configuration;
|
|
221
|
+
}
|
|
222
|
+
function setConfiguration(config) {
|
|
223
|
+
configuration = config;
|
|
224
|
+
}
|
|
225
|
+
export { enable, disable, getConfiguration, setConfiguration };
|
|
226
|
+
//# sourceMappingURL=stackPrefetch.js.map
|