@cornerstonejs/tools 0.2.0 → 0.4.3
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/cursors/SVGCursorDescriptor.js +5 -5
- package/dist/cjs/eventDispatchers/keyboardEventHandlers/keyDown.js +1 -1
- package/dist/cjs/eventDispatchers/keyboardEventHandlers/keyDown.js.map +1 -1
- package/dist/cjs/eventDispatchers/keyboardEventHandlers/keyUp.js +1 -1
- package/dist/cjs/eventDispatchers/keyboardEventHandlers/keyUp.js.map +1 -1
- package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseMove.js +9 -0
- package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseMove.js.map +1 -1
- package/dist/cjs/eventDispatchers/shared/customCallbackHandler.js +1 -1
- package/dist/cjs/eventDispatchers/shared/customCallbackHandler.js.map +1 -1
- package/dist/cjs/eventDispatchers/shared/getActiveToolForKeyboardEvent.js +1 -1
- package/dist/cjs/eventDispatchers/shared/getActiveToolForKeyboardEvent.js.map +1 -1
- package/dist/cjs/eventDispatchers/shared/getActiveToolForMouseEvent.js +1 -1
- package/dist/cjs/eventDispatchers/shared/getActiveToolForMouseEvent.js.map +1 -1
- package/dist/cjs/eventDispatchers/shared/getToolsWithModesForMouseEvent.js +1 -1
- package/dist/cjs/eventDispatchers/shared/getToolsWithModesForMouseEvent.js.map +1 -1
- package/dist/cjs/eventListeners/segmentation/segmentationDataModifiedEventListener.js +12 -6
- package/dist/cjs/eventListeners/segmentation/segmentationDataModifiedEventListener.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js +6 -5
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.d.ts +2 -2
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/addSegmentationRepresentations.js +1 -1
- package/dist/cjs/stateManagement/segmentation/addSegmentationRepresentations.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/createNewSegmentationForToolGroup.js +1 -1
- package/dist/cjs/stateManagement/segmentation/createNewSegmentationForToolGroup.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/normalizeSegmentationInput.js +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/normalizeSegmentationInput.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/validateSegmentationInput.js +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/validateSegmentationInput.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentationState.d.ts +2 -2
- package/dist/cjs/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/triggerSegmentationEvents.d.ts +1 -1
- package/dist/cjs/stateManagement/segmentation/triggerSegmentationEvents.js +2 -1
- package/dist/cjs/stateManagement/segmentation/triggerSegmentationEvents.js.map +1 -1
- package/dist/cjs/store/SynchronizerManager/destroySynchronizer.d.ts +2 -0
- package/dist/cjs/store/SynchronizerManager/{destroySynchronizerById.js → destroySynchronizer.js} +3 -3
- package/dist/cjs/store/SynchronizerManager/destroySynchronizer.js.map +1 -0
- package/dist/cjs/store/SynchronizerManager/getSynchronizer.d.ts +3 -0
- package/dist/cjs/store/SynchronizerManager/{getSynchronizerById.js → getSynchronizer.js} +3 -3
- package/dist/cjs/store/SynchronizerManager/getSynchronizer.js.map +1 -0
- package/dist/cjs/store/SynchronizerManager/getSynchronizersForViewport.d.ts +3 -0
- package/dist/cjs/store/SynchronizerManager/{getSynchronizers.js → getSynchronizersForViewport.js} +3 -3
- package/dist/cjs/store/SynchronizerManager/getSynchronizersForViewport.js.map +1 -0
- package/dist/cjs/store/SynchronizerManager/index.d.ts +4 -4
- package/dist/cjs/store/SynchronizerManager/index.js +7 -7
- package/dist/cjs/store/SynchronizerManager/index.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/destroy.js +2 -2
- package/dist/cjs/store/ToolGroupManager/destroy.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/destroyToolGroup.d.ts +2 -0
- package/dist/cjs/store/ToolGroupManager/{destroyToolGroupById.js → destroyToolGroup.js} +3 -3
- package/dist/cjs/store/ToolGroupManager/destroyToolGroup.js.map +1 -0
- package/dist/cjs/store/ToolGroupManager/getToolGroup.d.ts +1 -1
- package/dist/cjs/store/ToolGroupManager/getToolGroup.js +2 -11
- package/dist/cjs/store/ToolGroupManager/getToolGroup.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/getToolGroupForViewport.d.ts +3 -0
- package/dist/cjs/store/ToolGroupManager/getToolGroupForViewport.js +17 -0
- package/dist/cjs/store/ToolGroupManager/getToolGroupForViewport.js.map +1 -0
- package/dist/cjs/store/ToolGroupManager/index.d.ts +3 -3
- package/dist/cjs/store/ToolGroupManager/index.js +5 -5
- package/dist/cjs/store/ToolGroupManager/index.js.map +1 -1
- package/dist/cjs/store/removeEnabledElement.js +4 -4
- package/dist/cjs/store/removeEnabledElement.js.map +1 -1
- package/dist/cjs/tools/annotation/{EllipticalRoiTool.d.ts → EllipticalROITool.d.ts} +6 -6
- package/dist/cjs/tools/annotation/{EllipticalRoiTool.js → EllipticalROITool.js} +14 -14
- package/dist/cjs/tools/annotation/{EllipticalRoiTool.js.map → EllipticalROITool.js.map} +1 -1
- package/dist/cjs/tools/annotation/{RectangleRoiTool.d.ts → RectangleROITool.d.ts} +8 -8
- package/dist/cjs/tools/annotation/{RectangleRoiTool.js → RectangleROITool.js} +14 -14
- package/dist/cjs/tools/annotation/{RectangleRoiTool.js.map → RectangleROITool.js.map} +1 -1
- package/dist/cjs/tools/base/AnnotationTool.d.ts +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js +3 -0
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js +4 -4
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js +1 -1
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js.map +1 -1
- package/dist/cjs/tools/index.d.ts +6 -5
- package/dist/cjs/tools/index.js +11 -9
- package/dist/cjs/tools/index.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.d.ts +17 -0
- package/dist/cjs/tools/segmentation/BrushTool.js +285 -0
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -0
- package/dist/cjs/tools/segmentation/CircleScissorsTool.d.ts +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js +4 -3
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/{esm/tools/segmentation/RectangleRoiStartEndThresholdTool.d.ts → cjs/tools/segmentation/RectangleROIStartEndThresholdTool.d.ts} +4 -4
- package/dist/cjs/tools/segmentation/{RectangleRoiStartEndThresholdTool.js → RectangleROIStartEndThresholdTool.js} +12 -12
- package/dist/cjs/tools/segmentation/{RectangleRoiStartEndThresholdTool.js.map → RectangleROIStartEndThresholdTool.js.map} +1 -1
- package/dist/{esm/tools/segmentation/RectangleRoiThresholdTool.d.ts → cjs/tools/segmentation/RectangleROIThresholdTool.d.ts} +3 -3
- package/dist/cjs/tools/segmentation/{RectangleRoiThresholdTool.js → RectangleROIThresholdTool.js} +12 -12
- package/dist/cjs/tools/segmentation/{RectangleRoiThresholdTool.js.map → RectangleROIThresholdTool.js.map} +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.d.ts +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +7 -6
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.d.ts +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js +4 -3
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/fillCircle.js +5 -2
- package/dist/cjs/tools/segmentation/strategies/fillCircle.js.map +1 -1
- package/dist/cjs/types/EventTypes.d.ts +1 -0
- package/dist/cjs/types/LabelmapTypes.d.ts +1 -1
- package/dist/cjs/types/SegmentationStateTypes.d.ts +6 -5
- package/dist/cjs/utilities/getAnnotationNearPoint.js +1 -1
- package/dist/cjs/utilities/getAnnotationNearPoint.js.map +1 -1
- package/dist/cjs/utilities/getToolsWithModesForElement.js +1 -1
- package/dist/cjs/utilities/getToolsWithModesForElement.js.map +1 -1
- package/dist/cjs/utilities/segmentation/getBoundingBoxUtils.js +3 -3
- package/dist/cjs/utilities/segmentation/getBoundingBoxUtils.js.map +1 -1
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js +2 -2
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/cjs/utilities/triggerSegmentationRender.js +2 -2
- package/dist/cjs/utilities/triggerSegmentationRender.js.map +1 -1
- package/dist/cjs/utilities/viewportFilters/filterViewportsWithToolEnabled.js +1 -1
- package/dist/cjs/utilities/viewportFilters/filterViewportsWithToolEnabled.js.map +1 -1
- package/dist/esm/cursors/SVGCursorDescriptor.js +5 -5
- package/dist/esm/eventDispatchers/keyboardEventHandlers/keyDown.js +1 -1
- package/dist/esm/eventDispatchers/keyboardEventHandlers/keyDown.js.map +1 -1
- package/dist/esm/eventDispatchers/keyboardEventHandlers/keyUp.js +1 -1
- package/dist/esm/eventDispatchers/keyboardEventHandlers/keyUp.js.map +1 -1
- package/dist/esm/eventDispatchers/mouseEventHandlers/mouseMove.js +9 -0
- package/dist/esm/eventDispatchers/mouseEventHandlers/mouseMove.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/customCallbackHandler.js +1 -1
- package/dist/esm/eventDispatchers/shared/customCallbackHandler.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForKeyboardEvent.js +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForKeyboardEvent.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForMouseEvent.js +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForMouseEvent.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/getToolsWithModesForMouseEvent.js +1 -1
- package/dist/esm/eventDispatchers/shared/getToolsWithModesForMouseEvent.js.map +1 -1
- package/dist/esm/eventListeners/segmentation/segmentationDataModifiedEventListener.js +12 -6
- package/dist/esm/eventListeners/segmentation/segmentationDataModifiedEventListener.js.map +1 -1
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.d.ts +2 -2
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/addSegmentationRepresentations.js +2 -2
- package/dist/esm/stateManagement/segmentation/addSegmentationRepresentations.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/createNewSegmentationForToolGroup.js +2 -2
- package/dist/esm/stateManagement/segmentation/createNewSegmentationForToolGroup.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/validateSegmentationInput.js +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/validateSegmentationInput.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationState.d.ts +2 -2
- package/dist/esm/stateManagement/segmentation/segmentationState.js +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/triggerSegmentationEvents.d.ts +1 -1
- package/dist/esm/stateManagement/segmentation/triggerSegmentationEvents.js +2 -1
- package/dist/esm/stateManagement/segmentation/triggerSegmentationEvents.js.map +1 -1
- package/dist/esm/store/SynchronizerManager/destroySynchronizer.d.ts +2 -0
- package/dist/esm/store/SynchronizerManager/{destroySynchronizerById.js → destroySynchronizer.js} +3 -3
- package/dist/esm/store/SynchronizerManager/destroySynchronizer.js.map +1 -0
- package/dist/esm/store/SynchronizerManager/getSynchronizer.d.ts +3 -0
- package/dist/esm/store/SynchronizerManager/getSynchronizer.js +6 -0
- package/dist/esm/store/SynchronizerManager/getSynchronizer.js.map +1 -0
- package/dist/esm/store/SynchronizerManager/getSynchronizersForViewport.d.ts +3 -0
- package/dist/esm/store/SynchronizerManager/{getSynchronizers.js → getSynchronizersForViewport.js} +3 -3
- package/dist/esm/store/SynchronizerManager/getSynchronizersForViewport.js.map +1 -0
- package/dist/esm/store/SynchronizerManager/index.d.ts +4 -4
- package/dist/esm/store/SynchronizerManager/index.js +4 -4
- package/dist/esm/store/SynchronizerManager/index.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/destroy.js +2 -2
- package/dist/esm/store/ToolGroupManager/destroy.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/destroyToolGroup.d.ts +2 -0
- package/dist/esm/store/ToolGroupManager/{destroyToolGroupById.js → destroyToolGroup.js} +3 -3
- package/dist/esm/store/ToolGroupManager/destroyToolGroup.js.map +1 -0
- package/dist/esm/store/ToolGroupManager/getToolGroup.d.ts +1 -1
- package/dist/esm/store/ToolGroupManager/getToolGroup.js +2 -11
- package/dist/esm/store/ToolGroupManager/getToolGroup.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/getToolGroupForViewport.d.ts +3 -0
- package/dist/esm/store/ToolGroupManager/getToolGroupForViewport.js +15 -0
- package/dist/esm/store/ToolGroupManager/getToolGroupForViewport.js.map +1 -0
- package/dist/esm/store/ToolGroupManager/index.d.ts +3 -3
- package/dist/esm/store/ToolGroupManager/index.js +3 -3
- package/dist/esm/store/ToolGroupManager/index.js.map +1 -1
- package/dist/esm/store/removeEnabledElement.js +4 -4
- package/dist/esm/store/removeEnabledElement.js.map +1 -1
- package/dist/esm/tools/annotation/{EllipticalRoiTool.d.ts → EllipticalROITool.d.ts} +6 -6
- package/dist/esm/tools/annotation/{EllipticalRoiTool.js → EllipticalROITool.js} +13 -13
- package/dist/esm/tools/annotation/{EllipticalRoiTool.js.map → EllipticalROITool.js.map} +1 -1
- package/dist/esm/tools/annotation/{RectangleRoiTool.d.ts → RectangleROITool.d.ts} +8 -8
- package/dist/esm/tools/annotation/{RectangleRoiTool.js → RectangleROITool.js} +13 -13
- package/dist/esm/tools/annotation/{RectangleRoiTool.js.map → RectangleROITool.js.map} +1 -1
- package/dist/esm/tools/base/AnnotationTool.d.ts +1 -1
- package/dist/esm/tools/base/AnnotationTool.js +3 -0
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js +5 -5
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.js +2 -2
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.js.map +1 -1
- package/dist/esm/tools/index.d.ts +6 -5
- package/dist/esm/tools/index.js +6 -5
- package/dist/esm/tools/index.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.d.ts +17 -0
- package/dist/esm/tools/segmentation/BrushTool.js +279 -0
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -0
- package/dist/esm/tools/segmentation/CircleScissorsTool.d.ts +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +4 -3
- package/dist/esm/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/{cjs/tools/segmentation/RectangleRoiStartEndThresholdTool.d.ts → esm/tools/segmentation/RectangleROIStartEndThresholdTool.d.ts} +4 -4
- package/dist/esm/tools/segmentation/{RectangleRoiStartEndThresholdTool.js → RectangleROIStartEndThresholdTool.js} +11 -11
- package/dist/esm/tools/segmentation/{RectangleRoiStartEndThresholdTool.js.map → RectangleROIStartEndThresholdTool.js.map} +1 -1
- package/dist/{cjs/tools/segmentation/RectangleRoiThresholdTool.d.ts → esm/tools/segmentation/RectangleROIThresholdTool.d.ts} +3 -3
- package/dist/esm/tools/segmentation/{RectangleRoiThresholdTool.js → RectangleROIThresholdTool.js} +11 -11
- package/dist/esm/tools/segmentation/{RectangleRoiThresholdTool.js.map → RectangleROIThresholdTool.js.map} +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.d.ts +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +7 -6
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.d.ts +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +4 -3
- package/dist/esm/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/fillCircle.js +5 -2
- package/dist/esm/tools/segmentation/strategies/fillCircle.js.map +1 -1
- package/dist/esm/types/EventTypes.d.ts +1 -0
- package/dist/esm/types/LabelmapTypes.d.ts +1 -1
- package/dist/esm/types/SegmentationStateTypes.d.ts +6 -5
- package/dist/esm/utilities/getAnnotationNearPoint.js +1 -1
- package/dist/esm/utilities/getAnnotationNearPoint.js.map +1 -1
- package/dist/esm/utilities/getToolsWithModesForElement.js +1 -1
- package/dist/esm/utilities/getToolsWithModesForElement.js.map +1 -1
- package/dist/esm/utilities/segmentation/getBoundingBoxUtils.js +3 -3
- package/dist/esm/utilities/segmentation/getBoundingBoxUtils.js.map +1 -1
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js +2 -2
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/esm/utilities/triggerSegmentationRender.js +3 -3
- package/dist/esm/utilities/triggerSegmentationRender.js.map +1 -1
- package/dist/esm/utilities/viewportFilters/filterViewportsWithToolEnabled.js +1 -1
- package/dist/esm/utilities/viewportFilters/filterViewportsWithToolEnabled.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +7 -6
- package/dist/cjs/store/SynchronizerManager/destroySynchronizerById.d.ts +0 -2
- package/dist/cjs/store/SynchronizerManager/destroySynchronizerById.js.map +0 -1
- package/dist/cjs/store/SynchronizerManager/getSynchronizerById.d.ts +0 -3
- package/dist/cjs/store/SynchronizerManager/getSynchronizerById.js.map +0 -1
- package/dist/cjs/store/SynchronizerManager/getSynchronizers.d.ts +0 -3
- package/dist/cjs/store/SynchronizerManager/getSynchronizers.js.map +0 -1
- package/dist/cjs/store/ToolGroupManager/destroyToolGroupById.d.ts +0 -2
- package/dist/cjs/store/ToolGroupManager/destroyToolGroupById.js.map +0 -1
- package/dist/cjs/store/ToolGroupManager/getToolGroupById.d.ts +0 -3
- package/dist/cjs/store/ToolGroupManager/getToolGroupById.js +0 -8
- package/dist/cjs/store/ToolGroupManager/getToolGroupById.js.map +0 -1
- package/dist/esm/store/SynchronizerManager/destroySynchronizerById.d.ts +0 -2
- package/dist/esm/store/SynchronizerManager/destroySynchronizerById.js.map +0 -1
- package/dist/esm/store/SynchronizerManager/getSynchronizerById.d.ts +0 -3
- package/dist/esm/store/SynchronizerManager/getSynchronizerById.js +0 -6
- package/dist/esm/store/SynchronizerManager/getSynchronizerById.js.map +0 -1
- package/dist/esm/store/SynchronizerManager/getSynchronizers.d.ts +0 -3
- package/dist/esm/store/SynchronizerManager/getSynchronizers.js.map +0 -1
- package/dist/esm/store/ToolGroupManager/destroyToolGroupById.d.ts +0 -2
- package/dist/esm/store/ToolGroupManager/destroyToolGroupById.js.map +0 -1
- package/dist/esm/store/ToolGroupManager/getToolGroupById.d.ts +0 -3
- package/dist/esm/store/ToolGroupManager/getToolGroupById.js +0 -6
- package/dist/esm/store/ToolGroupManager/getToolGroupById.js.map +0 -1
- package/dist/esm/tsdoc-metadata.json +0 -11
- package/dist/tools.d.ts +0 -3892
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"RectangleROIThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
20
20
|
isDrawing: boolean;
|
|
21
21
|
isHandleOutsideImage: boolean;
|
|
22
22
|
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
23
|
-
|
|
23
|
+
preMouseDownCallback: (evt: EventTypes.MouseDownActivateEventType) => boolean;
|
|
24
24
|
_mouseDragCallback: (evt: EventTypes.MouseDragEventType) => void;
|
|
25
25
|
_mouseUpCallback: (evt: EventTypes.MouseUpEventType | EventTypes.MouseClickEventType) => void;
|
|
26
26
|
_activateDraw: (element: any) => void;
|
|
@@ -9,7 +9,7 @@ const fillRectangle_1 = require("./strategies/fillRectangle");
|
|
|
9
9
|
const eraseRectangle_1 = require("./strategies/eraseRectangle");
|
|
10
10
|
const viewportFilters_1 = require("../../utilities/viewportFilters");
|
|
11
11
|
const enums_1 = require("../../enums");
|
|
12
|
-
const
|
|
12
|
+
const RectangleROITool_1 = __importDefault(require("../annotation/RectangleROITool"));
|
|
13
13
|
const drawingSvg_1 = require("../../drawingSvg");
|
|
14
14
|
const elementCursor_1 = require("../../cursors/elementCursor");
|
|
15
15
|
const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../utilities/triggerAnnotationRenderForViewportIds"));
|
|
@@ -28,7 +28,7 @@ class RectangleScissorsTool extends base_1.BaseTool {
|
|
|
28
28
|
},
|
|
29
29
|
}) {
|
|
30
30
|
super(toolProps, defaultToolProps);
|
|
31
|
-
this.
|
|
31
|
+
this.preMouseDownCallback = (evt) => {
|
|
32
32
|
const eventDetail = evt.detail;
|
|
33
33
|
const { currentPoints, element } = eventDetail;
|
|
34
34
|
const worldPos = currentPoints.world;
|
|
@@ -46,8 +46,8 @@ class RectangleScissorsTool extends base_1.BaseTool {
|
|
|
46
46
|
const segmentIndex = segmentation_1.segmentIndex.getActiveSegmentIndex(toolGroupId);
|
|
47
47
|
const segmentsLocked = segmentation_1.segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
48
48
|
const segmentColor = segmentation_1.segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
49
|
-
const {
|
|
50
|
-
const { volumeId } =
|
|
49
|
+
const { representationData } = (0, segmentationState_1.getSegmentation)(segmentationId);
|
|
50
|
+
const { volumeId } = representationData[type];
|
|
51
51
|
const segmentation = core_1.cache.getVolume(volumeId);
|
|
52
52
|
const annotation = {
|
|
53
53
|
highlighted: true,
|
|
@@ -72,7 +72,7 @@ class RectangleScissorsTool extends base_1.BaseTool {
|
|
|
72
72
|
},
|
|
73
73
|
},
|
|
74
74
|
};
|
|
75
|
-
core_1.Settings.getObjectSettings(annotation,
|
|
75
|
+
core_1.Settings.getObjectSettings(annotation, RectangleROITool_1.default);
|
|
76
76
|
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, RectangleScissorsTool.toolName);
|
|
77
77
|
this.editData = {
|
|
78
78
|
annotation,
|
|
@@ -91,6 +91,7 @@ class RectangleScissorsTool extends base_1.BaseTool {
|
|
|
91
91
|
(0, elementCursor_1.hideElementCursor)(element);
|
|
92
92
|
evt.preventDefault();
|
|
93
93
|
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
|
|
94
|
+
return true;
|
|
94
95
|
};
|
|
95
96
|
this._mouseDragCallback = (evt) => {
|
|
96
97
|
this.isDrawing = true;
|
|
@@ -188,7 +189,7 @@ class RectangleScissorsTool extends base_1.BaseTool {
|
|
|
188
189
|
}
|
|
189
190
|
const { viewport } = enabledElement;
|
|
190
191
|
const { annotation } = this.editData;
|
|
191
|
-
const settings = core_1.Settings.getObjectSettings(annotation,
|
|
192
|
+
const settings = core_1.Settings.getObjectSettings(annotation, RectangleROITool_1.default);
|
|
192
193
|
const toolMetadata = annotation.metadata;
|
|
193
194
|
const annotationUID = annotation.annotationUID;
|
|
194
195
|
const data = annotation.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAK4B;AAG5B,kCAAkC;AAElC,8DAAgE;AAChE,gEAAkE;AAClE,qEAAgF;AAEhF,uCAAoC;AACpC,sFAA6D;AAC7D,iDAA0D;AAC1D,+DAGoC;AAEpC,kIAAyG;AACzG,qEAK2C;AAE3C,4FAAsF;AAStF,MAAqB,qBAAsB,SAAQ,eAAQ;IAmBzD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,mCAAmB;gBAChC,YAAY,EAAE,qCAAoB;aACnC;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAWpC,
|
|
1
|
+
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export default class SphereScissorsTool extends BaseTool {
|
|
|
21
21
|
isDrawing: boolean;
|
|
22
22
|
isHandleOutsideImage: boolean;
|
|
23
23
|
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
24
|
-
|
|
24
|
+
preMouseDownCallback: (evt: EventTypes.MouseDownActivateEventType) => true;
|
|
25
25
|
_mouseDragCallback: (evt: EventTypes.MouseDragEventType) => void;
|
|
26
26
|
_mouseUpCallback: (evt: EventTypes.MouseUpEventType | EventTypes.MouseClickEventType) => void;
|
|
27
27
|
_activateDraw: (element: any) => void;
|
|
@@ -24,7 +24,7 @@ class SphereScissorsTool extends base_1.BaseTool {
|
|
|
24
24
|
},
|
|
25
25
|
}) {
|
|
26
26
|
super(toolProps, defaultToolProps);
|
|
27
|
-
this.
|
|
27
|
+
this.preMouseDownCallback = (evt) => {
|
|
28
28
|
const eventDetail = evt.detail;
|
|
29
29
|
const { currentPoints, element } = eventDetail;
|
|
30
30
|
const worldPos = currentPoints.world;
|
|
@@ -43,8 +43,8 @@ class SphereScissorsTool extends base_1.BaseTool {
|
|
|
43
43
|
const segmentIndex = segmentation_1.segmentIndex.getActiveSegmentIndex(toolGroupId);
|
|
44
44
|
const segmentsLocked = segmentation_1.segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
45
45
|
const segmentColor = segmentation_1.segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
46
|
-
const {
|
|
47
|
-
const { volumeId } =
|
|
46
|
+
const { representationData } = (0, segmentationState_1.getSegmentation)(segmentationId);
|
|
47
|
+
const { volumeId } = representationData[type];
|
|
48
48
|
const segmentation = core_1.cache.getVolume(volumeId);
|
|
49
49
|
this.isDrawing = true;
|
|
50
50
|
const annotation = {
|
|
@@ -86,6 +86,7 @@ class SphereScissorsTool extends base_1.BaseTool {
|
|
|
86
86
|
(0, elementCursor_1.hideElementCursor)(element);
|
|
87
87
|
evt.preventDefault();
|
|
88
88
|
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
|
|
89
|
+
return true;
|
|
89
90
|
};
|
|
90
91
|
this._mouseDragCallback = (evt) => {
|
|
91
92
|
this.isDrawing = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAA6E;AAG7E,kCAAkC;AAGlC,wDAA0D;AAC1D,uCAAoC;AACpC,iDAA8D;AAC9D,+DAGoC;AAEpC,kIAAyG;AACzG,qEAK2C;AAE3C,4FAAsF;AAUtF,MAAqB,kBAAmB,SAAQ,eAAQ;IAoBtD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,6BAAgB;aAC9B;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAWpC,
|
|
1
|
+
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAA6E;AAG7E,kCAAkC;AAGlC,wDAA0D;AAC1D,uCAAoC;AACpC,iDAA8D;AAC9D,+DAGoC;AAEpC,kIAAyG;AACzG,qEAK2C;AAE3C,4FAAsF;AAUtF,MAAqB,kBAAmB,SAAQ,eAAQ;IAoBtD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,6BAAgB;aAC9B;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAWpC,yBAAoB,GAAG,CAAC,GAA0C,EAAQ,EAAE;YAC1E,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAA;YACpC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAA;YAEtC,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAA;YAEpD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YAErB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAA;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;YAEpC,MAAM,gCAAgC,GACpC,iCAAkB,CAAC,mCAAmC,CAAC,WAAW,CAAC,CAAA;YACrE,IAAI,CAAC,gCAAgC,EAAE;gBACrC,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAA;aACF;YAED,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,IAAI,EAAE,GAC3D,gCAAgC,CAAA;YAClC,MAAM,YAAY,GAChB,2BAAsB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;YAC3D,MAAM,cAAc,GAClB,6BAAc,CAAC,gCAAgC,CAAC,cAAc,CAAC,CAAA;YAEjE,MAAM,YAAY,GAAG,gCAAiB,CAAC,uBAAuB,CAC5D,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAA;YAED,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAA;YAG9D,MAAM,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;YAC7C,MAAM,YAAY,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YAE9C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YAGrB,MAAM,UAAU,GAAG;gBACjB,QAAQ,EAAE;oBACR,eAAe,EAAgB,CAAC,GAAG,eAAe,CAAC;oBACnD,MAAM,EAAgB,CAAC,GAAG,MAAM,CAAC;oBACjC,mBAAmB,EAAE,QAAQ,CAAC,sBAAsB,EAAE;oBACtD,iBAAiB,EAAE,EAAE;oBACrB,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;oBACrC,YAAY;iBACb;gBACD,IAAI,EAAE;oBACJ,WAAW,EAAE,IAAI;oBACjB,OAAO,EAAE;wBACP,MAAM,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC;wBACpE,iBAAiB,EAAE,IAAI;qBACxB;oBACD,WAAW,EAAE,EAAE;oBACf,WAAW,EAAE,IAAI;iBAClB;aACF,CAAA;YAED,MAAM,mBAAmB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YAEzC,IAAI,CAAC,QAAQ,GAAG;gBACd,UAAU;gBACV,YAAY;gBACZ,YAAY,EAAE,SAAS;gBACvB,YAAY;gBACZ,cAAc;gBACd,YAAY;gBACZ,cAAc;gBACd,WAAW;gBACX,mBAAmB;gBACnB,WAAW,EAAE,CAAC;gBACd,aAAa,EAAE,KAAK;gBACpB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAChB,CAAA;YAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YAE3B,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAA;YAE1B,GAAG,CAAC,cAAc,EAAE,CAAA;YAEpB,IAAA,+CAAqC,EAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;YAE3E,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;QAED,uBAAkB,GAAG,CAAC,GAAkC,EAAE,EAAE;YAC1D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YACrB,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAC/B,MAAM,EAAE,aAAa,EAAE,GAAG,WAAW,CAAA;YACrC,MAAM,mBAAmB,GAAG,aAAa,CAAC,MAAM,CAAA;YAChD,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;YACpD,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAA;YAGlC,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;YACvE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;YAE3B,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;YAC7D,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;YAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YAE3C,MAAM,YAAY,GAAiB;gBACjC,YAAY,CAAC,CAAC,CAAC;gBACf,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM;aACzB,CAAA;YACD,MAAM,SAAS,GAAiB,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAA;YAC3E,MAAM,UAAU,GAAiB,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;YAC5E,MAAM,WAAW,GAAiB;gBAChC,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM;gBACxB,YAAY,CAAC,CAAC,CAAC;aAChB,CAAA;YAED,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG;gBACpB,aAAa,CAAC,YAAY,CAAC;gBAC3B,aAAa,CAAC,SAAS,CAAC;gBACxB,aAAa,CAAC,UAAU,CAAC;gBACzB,aAAa,CAAC,WAAW,CAAC;aAC3B,CAAA;YAED,UAAU,CAAC,WAAW,GAAG,IAAI,CAAA;YAE7B,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAA;YAE7B,IAAA,+CAAqC,EAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;QAC7E,CAAC,CAAA;QAED,qBAAgB,GAAG,CACjB,GAAiE,EACjE,EAAE;YACF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAE/B,MAAM,EACJ,UAAU,EACV,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,cAAc,GACf,GAAG,IAAI,CAAC,QAAQ,CAAA;YACjB,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;YAC3B,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAA;YAEvD,IAAI,aAAa,IAAI,CAAC,QAAQ,EAAE;gBAC9B,OAAM;aACP;YAED,UAAU,CAAC,WAAW,GAAG,KAAK,CAAA;YAC9B,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAA;YAErC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;YAE7B,IAAA,kCAAkB,EAAC,OAAO,CAAC,CAAA;YAE3B,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;YAEnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;YACpB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;YAEtB,IAAI,QAAQ,YAAY,oBAAa,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;aACvC;YAED,MAAM,aAAa,GAAG;gBACpB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;gBAC3B,MAAM,EAAE,YAAY;gBACpB,YAAY;gBACZ,cAAc;gBACd,cAAc;gBACd,eAAe;gBACf,MAAM;aACP,CAAA;YAED,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;QACzD,CAAC,CAAA;QAKD,kBAAa,GAAG,CAAC,OAAO,EAAE,EAAE;YAC1B,OAAO,CAAC,gBAAgB,CAAC,cAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAChE,OAAO,CAAC,gBAAgB,CAAC,cAAM,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;YACpE,OAAO,CAAC,gBAAgB,CAAC,cAAM,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAIrE,CAAC,CAAA;QAKD,oBAAe,GAAG,CAAC,OAAO,EAAE,EAAE;YAC5B,OAAO,CAAC,mBAAmB,CAAC,cAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACnE,OAAO,CAAC,mBAAmB,CAAC,cAAM,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;YACvE,OAAO,CAAC,mBAAmB,CAAC,cAAM,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAIxE,CAAC,CAAA;QAUD,qBAAgB,GAAG,CACjB,cAAqC,EACrC,gBAAqB,EACf,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,OAAM;aACP;YAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;YACnC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;YAE7C,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;gBAC9C,OAAM;aACP;YAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;YAGpC,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAA;YACxC,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,CAAA;YAE9C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAA;YAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;YAC/B,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;YAEtE,MAAM,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YACnC,MAAM,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAEhC,MAAM,MAAM,GAAG;gBACb,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACrC,CAAA;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YAEzE,MAAM,KAAK,GAAG,OAAO,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAA;YAG7D,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAE;gBAClC,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;gBACnD,OAAM;aACP;YAED,MAAM,SAAS,GAAG,GAAG,CAAA;YACrB,IAAA,uBAAa,EACX,gBAAgB,EAChB,kBAAkB,CAAC,QAAQ,EAC3B,aAAa,EACb,SAAS,EACT,MAAsB,EACtB,MAAM,EACN;gBACE,KAAK;aACN,CACF,CAAA;QACH,CAAC,CAAA;IA9RD,CAAC;;AAlCH,qCAiUC;AAhUQ,2BAAQ,GAAG,eAAe,CAAA"}
|
|
@@ -37,14 +37,17 @@ function fillCircle(enabledElement, operationData, inside = true) {
|
|
|
37
37
|
yRadius: Math.abs(topLeftWorld[1] - bottomRightWorld[1]) / 2,
|
|
38
38
|
zRadius: Math.abs(topLeftWorld[2] - bottomRightWorld[2]) / 2,
|
|
39
39
|
};
|
|
40
|
-
const
|
|
40
|
+
const modifiedSlicesToUse = new Set();
|
|
41
|
+
const callback = ({ value, index, pointIJK }) => {
|
|
41
42
|
if (segmentsLocked.includes(value)) {
|
|
42
43
|
return;
|
|
43
44
|
}
|
|
44
45
|
scalarData[index] = segmentIndex;
|
|
46
|
+
modifiedSlicesToUse.add(pointIJK[2]);
|
|
45
47
|
};
|
|
46
48
|
(0, utilities_1.pointInShapeCallback)(imageData, (pointLPS, pointIJK) => (0, ellipse_1.pointInEllipse)(ellipseObj, pointLPS), callback, boundsIJK);
|
|
47
|
-
|
|
49
|
+
const arrayOfSlices = Array.from(modifiedSlicesToUse);
|
|
50
|
+
(0, triggerSegmentationEvents_1.triggerSegmentationDataModified)(segmentationId, arrayOfSlices);
|
|
48
51
|
}
|
|
49
52
|
function fillInsideCircle(enabledElement, operationData) {
|
|
50
53
|
fillCircle(enabledElement, operationData, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAgC;AAGhC,6DAGwC;AACxC,kEAA2E;AAC3E,2GAAkF;AAClF,+GAAiH;AACjH,kDAAyD;AAazD,SAAS,UAAU,CACjB,cAAqC,EACrC,aAA4B,EAC5B,MAAM,GAAG,IAAI;IAEb,MAAM,EACJ,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EACN,cAAc,EACd,YAAY,EACZ,cAAc,GACf,GAAG,aAAa,CAAA;IACjB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAA;IAChE,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;IAGnC,MAAM,MAAM,GAAG,gBAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,gBAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;IACF,gBAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IAE7C,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAItE,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,GACtC,IAAA,iCAAuB,EAAC,iBAAiB,CAAC,CAAA;IAG5C,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;IAC1D,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAA;IAElE,MAAM,mBAAmB,GAAG;QACZ,IAAA,kCAAwB,EAAC,SAAS,EAAE,YAAY,CAAC;QACjD,IAAA,kCAAwB,EAAC,SAAS,EAAE,gBAAgB,CAAC;KACpE,CAAA;IAED,MAAM,SAAS,GAAG,IAAA,wCAAyB,EAAC,mBAAmB,EAAE,UAAU,CAAC,CAAA;IAE5E,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;KACpE;IAGD,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,MAAsB;QAC9B,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC5D,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC5D,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;KAC7D,CAAA;IAED,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare type LabelmapRenderingConfig = {
|
|
|
13
13
|
cfun?: vtkColorTransferFunction;
|
|
14
14
|
ofun?: vtkPiecewiseFunction;
|
|
15
15
|
};
|
|
16
|
-
export declare type
|
|
16
|
+
export declare type LabelmapSegmentationData = {
|
|
17
17
|
volumeId: string;
|
|
18
18
|
referencedVolumeId?: string;
|
|
19
19
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as Enums from '../enums';
|
|
2
|
-
import type { labelmapConfig,
|
|
2
|
+
import type { labelmapConfig, LabelmapSegmentationData, LabelmapRenderingConfig } from './LabelmapTypes';
|
|
3
3
|
export declare type Color = [number, number, number, number];
|
|
4
4
|
export declare type ColorLut = Array<Color>;
|
|
5
5
|
export declare type RepresentationConfig = {
|
|
@@ -10,7 +10,7 @@ export declare type SegmentationRepresentationConfig = {
|
|
|
10
10
|
representations: RepresentationConfig;
|
|
11
11
|
};
|
|
12
12
|
export declare type SegmentationRepresentationData = {
|
|
13
|
-
LABELMAP?:
|
|
13
|
+
LABELMAP?: LabelmapSegmentationData;
|
|
14
14
|
};
|
|
15
15
|
export declare type Segmentation = {
|
|
16
16
|
segmentationId: string;
|
|
@@ -21,7 +21,7 @@ export declare type Segmentation = {
|
|
|
21
21
|
cachedStats: {
|
|
22
22
|
[key: string]: number;
|
|
23
23
|
};
|
|
24
|
-
|
|
24
|
+
representationData: SegmentationRepresentationData;
|
|
25
25
|
};
|
|
26
26
|
export declare type ToolGroupSpecificRepresentationState = {
|
|
27
27
|
segmentationRepresentationUID: string;
|
|
@@ -36,13 +36,14 @@ export declare type ToolGroupSpecificLabelmapRepresentation = ToolGroupSpecificR
|
|
|
36
36
|
config: LabelmapRenderingConfig;
|
|
37
37
|
};
|
|
38
38
|
export declare type ToolGroupSpecificRepresentation = ToolGroupSpecificLabelmapRepresentation;
|
|
39
|
+
export declare type ToolGroupSpecificRepresentations = Array<ToolGroupSpecificRepresentation>;
|
|
39
40
|
export declare type SegmentationState = {
|
|
40
41
|
colorLut: ColorLut[];
|
|
41
42
|
segmentations: Segmentation[];
|
|
42
43
|
globalConfig: SegmentationRepresentationConfig;
|
|
43
44
|
toolGroups: {
|
|
44
45
|
[key: string]: {
|
|
45
|
-
segmentationRepresentations:
|
|
46
|
+
segmentationRepresentations: ToolGroupSpecificRepresentations;
|
|
46
47
|
config: SegmentationRepresentationConfig;
|
|
47
48
|
};
|
|
48
49
|
};
|
|
@@ -51,7 +52,7 @@ export declare type SegmentationPublicInput = {
|
|
|
51
52
|
segmentationId: string;
|
|
52
53
|
representation: {
|
|
53
54
|
type: Enums.SegmentationRepresentations;
|
|
54
|
-
data:
|
|
55
|
+
data: LabelmapSegmentationData;
|
|
55
56
|
};
|
|
56
57
|
};
|
|
57
58
|
export declare type RepresentationPublicInput = {
|
|
@@ -33,7 +33,7 @@ function getAnnotationNearPoint(element, canvasPoint, proximity = 5) {
|
|
|
33
33
|
exports.getAnnotationNearPoint = getAnnotationNearPoint;
|
|
34
34
|
function getAnnotationNearPointOnEnabledElement(enabledElement, point, proximity) {
|
|
35
35
|
const { renderingEngineId, viewportId } = enabledElement;
|
|
36
|
-
const toolGroup = ToolGroupManager.
|
|
36
|
+
const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
37
37
|
if (!toolGroup) {
|
|
38
38
|
return null;
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAnnotationNearPoint.js","sourceRoot":"","sources":["../../../src/utilities/getAnnotationNearPoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AAKvD,mFAA8E;AAC9E,4EAA6D;AAW7D,SAAS,sBAAsB,CAC7B,OAAoB,EACpB,WAAyB,EACzB,SAAS,GAAG,CAAC;IAIb,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAA;IACjD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;KACpE;IAED,OAAO,sCAAsC,CAC3C,cAAc,EACd,WAAW,EACX,SAAS,CACV,CAAA;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"getAnnotationNearPoint.js","sourceRoot":"","sources":["../../../src/utilities/getAnnotationNearPoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AAKvD,mFAA8E;AAC9E,4EAA6D;AAW7D,SAAS,sBAAsB,CAC7B,OAAoB,EACpB,WAAyB,EACzB,SAAS,GAAG,CAAC;IAIb,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAA;IACjD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;KACpE;IAED,OAAO,sCAAsC,CAC3C,cAAc,EACd,WAAW,EACX,SAAS,CACV,CAAA;AACH,CAAC;AAoFQ,wDAAsB;AAxE/B,SAAS,sCAAsC,CAC7C,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAIjB,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,cAAc,CAAA;IACxD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAA;IAED,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,SAAS,CAAA;IAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,KAAK,GAAG,6BAA6B,CACzC,KAAK,CAAC,IAAI,CAAC,EACX,cAAc,EACd,KAAK,EACL,SAAS,CACV,CAAA;QACD,IAAI,KAAK,EAAE;YACT,OAAO,KAAK,CAAA;SACb;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAyCgC,wFAAsC;AA3BvE,SAAS,6BAA6B,CACpC,IAAoB,EACpB,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAKjB,MAAM,WAAW,GAAG,IAAA,gCAAc,EAChC,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC9B,IAAI,CAAC,WAA+B,CAAC,QAAQ,CAC/C,CAAA;IACD,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE;QACvB,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAA;QAC3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,IACE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC;gBAC/D,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EACnE;gBACA,OAAO,UAAU,CAAA;aAClB;SACF;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -5,7 +5,7 @@ const core_1 = require("@cornerstonejs/core");
|
|
|
5
5
|
function getToolsWithModesForElement(element, modesFilter) {
|
|
6
6
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
7
7
|
const { renderingEngineId, viewportId } = enabledElement;
|
|
8
|
-
const toolGroup = store_1.ToolGroupManager.
|
|
8
|
+
const toolGroup = store_1.ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
9
9
|
if (!toolGroup) {
|
|
10
10
|
return [];
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getToolsWithModesForElement.js","sourceRoot":"","sources":["../../../src/utilities/getToolsWithModesForElement.ts"],"names":[],"mappings":";;AAAA,oCAA2C;AAE3C,8CAAuD;AAavD,SAAwB,2BAA2B,CACjD,OAAoB,EACpB,WAAwB;IAExB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAA;IACjD,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,cAAc,CAAA;IAExD,MAAM,SAAS,GAAG,wBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"getToolsWithModesForElement.js","sourceRoot":"","sources":["../../../src/utilities/getToolsWithModesForElement.ts"],"names":[],"mappings":";;AAAA,oCAA2C;AAE3C,8CAAuD;AAavD,SAAwB,2BAA2B,CACjD,OAAoB,EACpB,WAAwB;IAExB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAA;IACjD,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,cAAc,CAAA;IAExD,MAAM,SAAS,GAAG,wBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAA;IAED,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,EAAE,CAAA;KACV;IAED,MAAM,YAAY,GAAG,EAAE,CAAA;IAEvB,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAE7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;QACtC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QAGnD,IAAI,CAAC,WAAW,EAAE;YAChB,SAAQ;SACT;QAED,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC1C,MAAM,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;YACxD,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAChC;KACF;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AApCD,8CAoCC"}
|
|
@@ -25,11 +25,11 @@ function getBoundingBoxAroundShape(vertices, dimensions) {
|
|
|
25
25
|
if (dimensions) {
|
|
26
26
|
const [width, height, depth] = dimensions;
|
|
27
27
|
xMin = Math.max(0, xMin);
|
|
28
|
-
xMax = Math.min(width, xMax);
|
|
28
|
+
xMax = Math.min(width - 1, xMax);
|
|
29
29
|
yMin = Math.max(0, yMin);
|
|
30
|
-
yMax = Math.min(height, yMax);
|
|
30
|
+
yMax = Math.min(height - 1, yMax);
|
|
31
31
|
zMin = Math.max(0, zMin);
|
|
32
|
-
zMax = Math.min(depth, zMax);
|
|
32
|
+
zMax = Math.min(depth - 1, zMax);
|
|
33
33
|
}
|
|
34
34
|
return [
|
|
35
35
|
[xMin, xMax],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBoundingBoxUtils.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getBoundingBoxUtils.ts"],"names":[],"mappings":";;;AAWA,SAAS,yBAAyB,CAChC,QAAwB,EACxB,UAAyB;IAEzB,IAAI,IAAI,GAAG,QAAQ,CAAA;IACnB,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,IAAI,IAAI,GAAG,QAAQ,CAAA;IACnB,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,IAAI,IAAI,GAAG,QAAQ,CAAA;IACnB,IAAI,IAAI,GAAG,CAAC,CAAA;IAEZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEvB,IAAI,UAAU,EAAE;QACd,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,UAAU,CAAA;QACzC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QACxB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"getBoundingBoxUtils.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getBoundingBoxUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,8 @@ function thresholdVolumeByRange(annotations, referenceVolumes, segmentationRepre
|
|
|
38
38
|
if (!segmentation) {
|
|
39
39
|
throw new Error('No Segmentation Found');
|
|
40
40
|
}
|
|
41
|
-
const { type,
|
|
42
|
-
const { volumeId } =
|
|
41
|
+
const { type, representationData } = segmentation;
|
|
42
|
+
const { volumeId } = representationData[type];
|
|
43
43
|
const segmentationVolume = core_1.cache.getVolume(volumeId);
|
|
44
44
|
const { scalarData, imageData: segmentationImageData } = segmentationVolume;
|
|
45
45
|
const { lowerThreshold, higherThreshold, numSlicesToProject, overwrite } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA2C;AAG3C,kDAGwB;AACxB,+CAAsD;AACtD,4GAA8G;AAE9G,2FAAkE;AAClE,wGAAyF;AAiCzF,SAAS,sBAAsB,CAC7B,WAAwC,EACxC,gBAAsC,EACtC,0BAA2D,EAC3D,OAA8B;IAE9B,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;KAC3E;IAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CACpD,0BAA0B,CAAC,cAAc,CAC1C,CAAA;IACD,MAAM,EAAE,cAAc,EAAE,GAAG,0BAA0B,CAAA;IAErD,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;KACzC;IAED,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ class SegmentationRenderingEngine {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
_triggerRender(toolGroupId) {
|
|
51
|
-
const toolGroup = (0, ToolGroupManager_1.
|
|
51
|
+
const toolGroup = (0, ToolGroupManager_1.getToolGroup)(toolGroupId);
|
|
52
52
|
if (!toolGroup) {
|
|
53
53
|
console.warn(`No tool group found with toolGroupId: ${toolGroupId}`);
|
|
54
54
|
return;
|
|
@@ -67,7 +67,7 @@ class SegmentationRenderingEngine {
|
|
|
67
67
|
function onSegmentationRender(evt) {
|
|
68
68
|
const { element, viewportId, renderingEngineId } = evt.detail;
|
|
69
69
|
element.removeEventListener(core_1.Enums.Events.IMAGE_RENDERED, onSegmentationRender);
|
|
70
|
-
const toolGroup = (0, ToolGroupManager_1.
|
|
70
|
+
const toolGroup = (0, ToolGroupManager_1.getToolGroupForViewport)(viewportId, renderingEngineId);
|
|
71
71
|
const eventDetail = {
|
|
72
72
|
toolGroupId: toolGroup.id,
|
|
73
73
|
viewportId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triggerSegmentationRender.js","sourceRoot":"","sources":["../../../src/utilities/triggerSegmentationRender.ts"],"names":[],"mappings":";;;;;;AAAA,8CAM4B;AAC5B,oCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"triggerSegmentationRender.js","sourceRoot":"","sources":["../../../src/utilities/triggerSegmentationRender.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ function filterViewportsWithToolEnabled(viewports, toolName) {
|
|
|
8
8
|
const viewportsWithToolEnabled = [];
|
|
9
9
|
for (let vp = 0; vp < numViewports; vp++) {
|
|
10
10
|
const viewport = viewports[vp];
|
|
11
|
-
const toolGroup = store_1.ToolGroupManager.
|
|
11
|
+
const toolGroup = store_1.ToolGroupManager.getToolGroupForViewport(viewport.id, viewport.renderingEngineId);
|
|
12
12
|
const hasTool = _toolGroupHasActiveEnabledOrPassiveTool(toolGroup, toolName);
|
|
13
13
|
if (hasTool) {
|
|
14
14
|
viewportsWithToolEnabled.push(viewport);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterViewportsWithToolEnabled.js","sourceRoot":"","sources":["../../../../src/utilities/viewportFilters/filterViewportsWithToolEnabled.ts"],"names":[],"mappings":";;AAEA,uCAA8C;AAC9C,uCAAuC;AAEvC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,iBAAS,CAAA;AAU9C,SAAwB,8BAA8B,CACpD,SAA8D,EAC9D,QAAgB;IAEhB,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAA;IAErC,MAAM,wBAAwB,GAAG,EAAE,CAAA;IAEnC,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,YAAY,EAAE,EAAE,EAAE,EAAE;QACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC,CAAA;QAE9B,MAAM,SAAS,GAAG,wBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"filterViewportsWithToolEnabled.js","sourceRoot":"","sources":["../../../../src/utilities/viewportFilters/filterViewportsWithToolEnabled.ts"],"names":[],"mappings":";;AAEA,uCAA8C;AAC9C,uCAAuC;AAEvC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,iBAAS,CAAA;AAU9C,SAAwB,8BAA8B,CACpD,SAA8D,EAC9D,QAAgB;IAEhB,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAA;IAErC,MAAM,wBAAwB,GAAG,EAAE,CAAA;IAEnC,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,YAAY,EAAE,EAAE,EAAE,EAAE;QACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC,CAAA;QAE9B,MAAM,SAAS,GAAG,wBAAgB,CAAC,uBAAuB,CACxD,QAAQ,CAAC,EAAE,EACX,QAAQ,CAAC,iBAAiB,CAC3B,CAAA;QAED,MAAM,OAAO,GAAG,uCAAuC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QAE5E,IAAI,OAAO,EAAE;YACX,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SACxC;KACF;IAED,OAAO,wBAAwB,CAAA;AACjC,CAAC;AAxBD,iDAwBC;AAWD,SAAS,uCAAuC,CAC9C,SAAqB,EACrB,QAAgB;IAEhB,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAA;IACjC,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;IAElC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,KAAK,CAAA;KACb;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;IAE1B,OAAO,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,OAAO,CAAA;AAC5E,CAAC"}
|
|
@@ -75,14 +75,14 @@ const DefinedDescriptorsMap = {
|
|
|
75
75
|
y: 32,
|
|
76
76
|
},
|
|
77
77
|
}),
|
|
78
|
-
|
|
78
|
+
CircleROI: extend(BASE, {
|
|
79
79
|
iconContent: `<circle stroke="{{color}}" fill="none" stroke-width="3" cx="16" cy="16" r="14" />`,
|
|
80
80
|
viewBox: {
|
|
81
81
|
x: 32,
|
|
82
82
|
y: 32,
|
|
83
83
|
},
|
|
84
84
|
}),
|
|
85
|
-
|
|
85
|
+
EllipticalROI: extend(BASE, {
|
|
86
86
|
iconContent: `<path stroke="{{color}}" fill="none" stroke-width="3" d="M30.74 15.76C30.74 20.99 24.14 25.23 16
|
|
87
87
|
25.23C7.86 25.23 1.26 20.99 1.26 15.76C1.26 10.54 7.86 6.3 16 6.3C24.14
|
|
88
88
|
6.3 30.74 10.54 30.74 15.76Z" />`,
|
|
@@ -91,7 +91,7 @@ const DefinedDescriptorsMap = {
|
|
|
91
91
|
y: 32,
|
|
92
92
|
},
|
|
93
93
|
}),
|
|
94
|
-
|
|
94
|
+
FreehandROI: extend(BASE, {
|
|
95
95
|
iconContent: `<g fill="{{color}}" stroke="{{color}}" stroke-width="2">
|
|
96
96
|
<ellipse ry="1" rx="1" id="svg_3" cy="4.240343" cx="14.306499"/>
|
|
97
97
|
<line id="svg_4" y2="3.58462" x2="12.242186" y1="3.997482" x1="13.432202"/>
|
|
@@ -129,7 +129,7 @@ const DefinedDescriptorsMap = {
|
|
|
129
129
|
y: 18,
|
|
130
130
|
},
|
|
131
131
|
}),
|
|
132
|
-
|
|
132
|
+
FreehandROISculptor: extend(BASE, {
|
|
133
133
|
iconContent: `<g id="icon-freehand-sculpt" fill="none" stroke-width="1.5" stroke="{{color}}" stroke-linecap="round" stroke-linejoin="round">
|
|
134
134
|
<line id="svg_1" y2="2.559367" x2="10.184807" y1="4.467781" x1="8.81711"/>
|
|
135
135
|
<line id="svg_4" y2="1.493836" x2="11.727442" y1="2.766112" x1="10.089386"/>
|
|
@@ -189,7 +189,7 @@ const DefinedDescriptorsMap = {
|
|
|
189
189
|
y: 1792,
|
|
190
190
|
},
|
|
191
191
|
}),
|
|
192
|
-
|
|
192
|
+
RectangleROI: extend(BASE, {
|
|
193
193
|
iconContent: `<path fill="{{color}}" d="M1312 256h-832q-66 0-113 47t-47 113v832q0 66 47
|
|
194
194
|
113t113 47h832q66 0 113-47t47-113v-832q0-66-47-113t-113-47zm288 160v832q0
|
|
195
195
|
119-84.5 203.5t-203.5 84.5h-832q-119 0-203.5-84.5t-84.5-203.5v-832q0-119
|
|
@@ -6,7 +6,7 @@ export default function keyDown(evt) {
|
|
|
6
6
|
return;
|
|
7
7
|
}
|
|
8
8
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
9
|
-
const toolGroup = ToolGroupManager.
|
|
9
|
+
const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
10
10
|
const toolName = activeTool.getToolName();
|
|
11
11
|
if (Object.keys(toolGroup.toolOptions).includes(toolName)) {
|
|
12
12
|
toolGroup.setViewportsCursorByToolName(toolName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/keyboardEventHandlers/keyDown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,6BAA6B,MAAM,yCAAyC,CAAA;AAQnF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,GAAqB;IAEnD,MAAM,UAAU,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAA;IAErD,IAAI,CAAC,UAAU,EAAE;QACf,OAAM;KACP;IAED,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IAEpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"keyDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/keyboardEventHandlers/keyDown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,6BAA6B,MAAM,yCAAyC,CAAA;AAQnF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,GAAqB;IAEnD,MAAM,UAAU,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAA;IAErD,IAAI,CAAC,UAAU,EAAE;QACf,OAAM;KACP;IAED,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IAEpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAA;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,EAAE,CAAA;IACzC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACzD,SAAS,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAA;KACjD;AACH,CAAC"}
|
|
@@ -7,7 +7,7 @@ export default function keyUp(evt) {
|
|
|
7
7
|
return;
|
|
8
8
|
}
|
|
9
9
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
10
|
-
const toolGroup = ToolGroupManager.
|
|
10
|
+
const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
11
11
|
resetModifierKey();
|
|
12
12
|
const toolName = activeTool.getToolName();
|
|
13
13
|
if (Object.keys(toolGroup.toolOptions).includes(toolName)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyUp.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/keyboardEventHandlers/keyUp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,6BAA6B,MAAM,yCAAyC,CAAA;AAQnF,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAqB;IAEjD,MAAM,UAAU,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAA;IAErD,IAAI,CAAC,UAAU,EAAE;QACf,OAAM;KACP;IAED,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IAEpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"keyUp.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/keyboardEventHandlers/keyUp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,6BAA6B,MAAM,yCAAyC,CAAA;AAQnF,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAqB;IAEjD,MAAM,UAAU,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAA;IAErD,IAAI,CAAC,UAAU,EAAE;QACf,OAAM;KACP;IAED,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IAEpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAA;IAGD,gBAAgB,EAAE,CAAA;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,EAAE,CAAA;IACzC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACzD,SAAS,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAA;KACjD;AACH,CAAC"}
|
|
@@ -15,6 +15,10 @@ export default function mouseMove(evt) {
|
|
|
15
15
|
const eventDetail = evt.detail;
|
|
16
16
|
const { element } = eventDetail;
|
|
17
17
|
const toolsWithAnnotations = filterToolsWithAnnotationsForElement(element, activeAndPassiveTools);
|
|
18
|
+
const toolsWithoutAnnotations = activeAndPassiveTools.filter((tool) => {
|
|
19
|
+
const doesNotHaveAnnotations = !toolsWithAnnotations.some((toolAndAnnotation) => toolAndAnnotation.tool.getToolName() === tool.getToolName());
|
|
20
|
+
return doesNotHaveAnnotations;
|
|
21
|
+
});
|
|
18
22
|
let annotationsNeedToBeRedrawn = false;
|
|
19
23
|
for (const { tool, annotations } of toolsWithAnnotations) {
|
|
20
24
|
if (typeof tool.mouseMoveCallback === 'function') {
|
|
@@ -22,6 +26,11 @@ export default function mouseMove(evt) {
|
|
|
22
26
|
tool.mouseMoveCallback(evt, annotations) || annotationsNeedToBeRedrawn;
|
|
23
27
|
}
|
|
24
28
|
}
|
|
29
|
+
toolsWithoutAnnotations.forEach((tool) => {
|
|
30
|
+
if (typeof tool.mouseMoveCallback === 'function') {
|
|
31
|
+
tool.mouseMoveCallback(evt);
|
|
32
|
+
}
|
|
33
|
+
});
|
|
25
34
|
if (annotationsNeedToBeRedrawn === true) {
|
|
26
35
|
triggerAnnotationRender(element);
|
|
27
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mouseMove.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseMove.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,OAAO,oCAAoC,MAAM,kDAAkD,CAAA;AACnG,OAAO,8BAA8B,MAAM,0CAA0C,CAAA;AACrF,OAAO,uBAAuB,MAAM,yCAAyC,CAAA;AAG7E,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;AASrC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,GAAuB;IAGvD,IAAI,KAAK,CAAC,qBAAqB,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC9D,OAAM;KACP;IAED,MAAM,qBAAqB,GAAG,8BAA8B,CAAC,GAAG,EAAE;QAChE,MAAM;QACN,OAAO;KACR,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAG/B,MAAM,oBAAoB,GAAG,oCAAoC,CAC/D,OAAO,EACP,qBAAqB,CACtB,CAAA;IAED,IAAI,0BAA0B,GAAG,KAAK,CAAA;IAEtC,KAAK,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,oBAAoB,EAAE;QACxD,IAAI,OAAO,IAAI,CAAC,iBAAiB,KAAK,UAAU,EAAE;YAChD,0BAA0B;gBACxB,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,0BAA0B,CAAA;SACzE;KACF;IAGD,IAAI,0BAA0B,KAAK,IAAI,EAAE;QACvC,uBAAuB,CAAC,OAAO,CAAC,CAAA;KACjC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"mouseMove.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseMove.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,OAAO,oCAAoC,MAAM,kDAAkD,CAAA;AACnG,OAAO,8BAA8B,MAAM,0CAA0C,CAAA;AACrF,OAAO,uBAAuB,MAAM,yCAAyC,CAAA;AAG7E,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;AASrC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,GAAuB;IAGvD,IAAI,KAAK,CAAC,qBAAqB,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC9D,OAAM;KACP;IAED,MAAM,qBAAqB,GAAG,8BAA8B,CAAC,GAAG,EAAE;QAChE,MAAM;QACN,OAAO;KACR,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;IAG/B,MAAM,oBAAoB,GAAG,oCAAoC,CAC/D,OAAO,EACP,qBAAqB,CACtB,CAAA;IAED,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACpE,MAAM,sBAAsB,GAAG,CAAC,oBAAoB,CAAC,IAAI,CACvD,CAAC,iBAAiB,EAAE,EAAE,CACpB,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAC9D,CAAA;QAED,OAAO,sBAAsB,CAAA;IAC/B,CAAC,CAAC,CAAA;IAEF,IAAI,0BAA0B,GAAG,KAAK,CAAA;IAEtC,KAAK,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,oBAAoB,EAAE;QACxD,IAAI,OAAO,IAAI,CAAC,iBAAiB,KAAK,UAAU,EAAE;YAChD,0BAA0B;gBACxB,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,0BAA0B,CAAA;SACzE;KACF;IAGD,uBAAuB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,OAAO,IAAI,CAAC,iBAAiB,KAAK,UAAU,EAAE;YAChD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;SAC5B;IACH,CAAC,CAAC,CAAA;IAGF,IAAI,0BAA0B,KAAK,IAAI,EAAE;QACvC,uBAAuB,CAAC,OAAO,CAAC,CAAA;KACjC;AACH,CAAC"}
|
|
@@ -6,7 +6,7 @@ export default function customCallbackHandler(handlerType, customFunction, evt)
|
|
|
6
6
|
return false;
|
|
7
7
|
}
|
|
8
8
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
9
|
-
const toolGroup = ToolGroupManager.
|
|
9
|
+
const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
10
10
|
if (!toolGroup) {
|
|
11
11
|
return false;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customCallbackHandler.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/customCallbackHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAE7C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;AAiB5B,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,WAAmB,EACnB,cAAsB,EACtB,GAAG;IAEH,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO,KAAK,CAAA;KACb;IAED,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"customCallbackHandler.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/customCallbackHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAE7C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;AAiB5B,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,WAAmB,EACnB,cAAsB,EACtB,GAAG;IAEH,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO,KAAK,CAAA;KACb;IAED,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAA;IAED,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,KAAK,CAAA;KACb;IASD,IAAI,UAAU,CAAA;IACd,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAE7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;QACtC,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QAE5C,MAAM,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAExD,IAEE,IAAI,CAAC,IAAI,KAAK,MAAM;YAGpB,OAAO,YAAY,CAAC,cAAc,CAAC,KAAK,UAAU,EAClD;YACA,UAAU,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;YAChD,MAAK;SACN;KACF;IAED,IAAI,CAAC,UAAU,EAAE;QACf,OAAM;KACP;IAED,UAAU,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC"}
|
|
@@ -7,7 +7,7 @@ export default function getActiveToolForKeyboardEvent(evt) {
|
|
|
7
7
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
8
8
|
const mouseButton = getMouseButton();
|
|
9
9
|
const modifierKey = keyEventListener.getModifierKey();
|
|
10
|
-
const toolGroup = ToolGroupManager.
|
|
10
|
+
const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
11
11
|
if (!toolGroup) {
|
|
12
12
|
return null;
|
|
13
13
|
}
|