From 8193562fbd75e0c88c3f59f280a1a7c9af36f118 Mon Sep 17 00:00:00 2001 From: Alireza Date: Mon, 28 Mar 2022 11:32:24 -0400 Subject: [PATCH 1/5] rename roi to ROI --- common/reviews/api/tools.api.md | 26 +++--- .../demo/src/ExampleSegmentationRender.tsx | 8 +- .../src/ExampleToolDisplayConfiguration.tsx | 8 +- packages/demo/src/constants/index.js | 16 ++-- .../src/helpers/getToolDetailForDisplay.js | 4 +- packages/demo/src/initToolGroups.js | 80 +++++++++---------- .../docs/docs/how-to-guides/custom-tools.md | 4 +- packages/docs/docs/introduction/overview.md | 2 +- packages/tools/examples/modifierKeys/index.ts | 8 +- .../examples/stackAnnotationTools/index.ts | 20 ++--- .../tools/src/cursors/SVGCursorDescriptor.ts | 10 +-- packages/tools/src/index.ts | 16 ++-- .../src/tools/annotation/EllipticalRoiTool.ts | 50 ++++++------ .../src/tools/annotation/RectangleRoiTool.ts | 56 ++++++------- packages/tools/src/tools/index.ts | 16 ++-- .../RectangleRoiStartEndThresholdTool.ts | 34 ++++---- .../segmentation/RectangleRoiThresholdTool.ts | 32 ++++---- .../segmentation/RectangleScissorsTool.ts | 6 +- packages/tools/test/EllipseROI_test.js | 26 +++--- packages/tools/test/RectangleROI_test.js | 40 +++++----- packages/tools/test/cpu_EllipseROI_test.js | 18 ++--- packages/tools/test/cpu_RectangleROI_test.js | 30 +++---- 22 files changed, 255 insertions(+), 255 deletions(-) diff --git a/common/reviews/api/tools.api.md b/common/reviews/api/tools.api.md index fbd4855bfe..e112a5185d 100644 --- a/common/reviews/api/tools.api.md +++ b/common/reviews/api/tools.api.md @@ -943,14 +943,14 @@ declare namespace ellipse { } // @public (undocumented) -export class EllipticalRoiTool extends AnnotationTool { +export class EllipticalROITool extends AnnotationTool { constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps); // (undocumented) _activateDraw: (element: any) => void; // (undocumented) _activateModify: (element: any) => void; // (undocumented) - addNewAnnotation: (evt: EventTypes_2.MouseDownActivateEventType) => EllipticalRoiAnnotation; + addNewAnnotation: (evt: EventTypes_2.MouseDownActivateEventType) => EllipticalROIAnnotation; // (undocumented) _calculateCachedStats: (annotation: any, viewport: any, renderingEngine: any, enabledElement: any) => any; // (undocumented) @@ -977,7 +977,7 @@ export class EllipticalRoiTool extends AnnotationTool { // (undocumented) _getTextLines: (data: any, targetId: any) => any[]; // (undocumented) - handleSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: EllipticalRoiAnnotation, handle: ToolHandle, interactionType?: string) => void; + handleSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: EllipticalROIAnnotation, handle: ToolHandle, interactionType?: string) => void; // (undocumented) isDrawing: boolean; // (undocumented) @@ -985,7 +985,7 @@ export class EllipticalRoiTool extends AnnotationTool { // (undocumented) _isInsideVolume: (index1: any, index2: any, dimensions: any) => boolean; // (undocumented) - isPointNearTool: (element: HTMLElement, annotation: EllipticalRoiAnnotation, canvasCoords: Types_2.Point2, proximity: number) => boolean; + isPointNearTool: (element: HTMLElement, annotation: EllipticalROIAnnotation, canvasCoords: Types_2.Point2, proximity: number) => boolean; // (undocumented) mouseDragCallback: any; // (undocumented) @@ -1003,7 +1003,7 @@ export class EllipticalRoiTool extends AnnotationTool { // (undocumented) static toolName: string; // (undocumented) - toolSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: EllipticalRoiAnnotation, interactionType: InteractionTypes) => void; + toolSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: EllipticalROIAnnotation, interactionType: InteractionTypes) => void; // (undocumented) touchDragCallback: any; } @@ -2383,7 +2383,7 @@ declare namespace rectangle { } // @public (undocumented) -export class RectangleRoiStartEndThresholdTool extends RectangleRoiTool { +export class RectangleROIStartEndThresholdTool extends RectangleROITool { constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps); // (undocumented) addNewAnnotation: (evt: EventTypes_2.MouseDownActivateEventType) => { @@ -2422,7 +2422,7 @@ export class RectangleRoiStartEndThresholdTool extends RectangleRoiTool { // (undocumented) _calculateCachedStatsTool(annotation: any, enabledElement: any): any; // (undocumented) - _computeProjectionPoints(annotation: RectangleRoiStartEndThresholdAnnotation, imageVolume: Types_2.IImageVolume): void; + _computeProjectionPoints(annotation: RectangleROIStartEndThresholdAnnotation, imageVolume: Types_2.IImageVolume): void; // (undocumented) editData: { annotation: any; @@ -2446,7 +2446,7 @@ export class RectangleRoiStartEndThresholdTool extends RectangleRoiTool { } // @public (undocumented) -export class RectangleRoiThresholdTool extends RectangleRoiTool { +export class RectangleROIThresholdTool extends RectangleROITool { constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps); // (undocumented) addNewAnnotation: (evt: EventTypes_2.MouseDownActivateEventType) => { @@ -2496,14 +2496,14 @@ export class RectangleRoiThresholdTool extends RectangleRoiTool { } // @public (undocumented) -export class RectangleRoiTool extends AnnotationTool { +export class RectangleROITool extends AnnotationTool { constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps); // (undocumented) _activateDraw: (element: any) => void; // (undocumented) _activateModify: (element: any) => void; // (undocumented) - addNewAnnotation: (evt: EventTypes_2.MouseDownActivateEventType) => RectangleRoiAnnotation; + addNewAnnotation: (evt: EventTypes_2.MouseDownActivateEventType) => RectangleROIAnnotation; // (undocumented) _calculateCachedStats: (annotation: any, viewPlaneNormal: any, viewUp: any, renderingEngine: any, enabledElement: any) => any; // (undocumented) @@ -2531,7 +2531,7 @@ export class RectangleRoiTool extends AnnotationTool { // (undocumented) _getTextLines: (data: any, targetId: string) => any[]; // (undocumented) - handleSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: RectangleRoiAnnotation, handle: ToolHandle, interactionType?: string) => void; + handleSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: RectangleROIAnnotation, handle: ToolHandle, interactionType?: string) => void; // (undocumented) isDrawing: boolean; // (undocumented) @@ -2539,7 +2539,7 @@ export class RectangleRoiTool extends AnnotationTool { // (undocumented) _isInsideVolume: (index1: any, index2: any, dimensions: any) => boolean; // (undocumented) - isPointNearTool: (element: HTMLElement, annotation: RectangleRoiAnnotation, canvasCoords: Types_2.Point2, proximity: number) => boolean; + isPointNearTool: (element: HTMLElement, annotation: RectangleROIAnnotation, canvasCoords: Types_2.Point2, proximity: number) => boolean; // (undocumented) _mouseDragCallback: (evt: EventTypes_2.MouseMoveEventType | EventTypes_2.MouseDragEventType) => void; // (undocumented) @@ -2551,7 +2551,7 @@ export class RectangleRoiTool extends AnnotationTool { // (undocumented) static toolName: string; // (undocumented) - toolSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: RectangleRoiAnnotation, interactionType: InteractionTypes) => void; + toolSelectedCallback: (evt: EventTypes_2.MouseDownEventType, annotation: RectangleROIAnnotation, interactionType: InteractionTypes) => void; } // @public (undocumented) diff --git a/packages/demo/src/ExampleSegmentationRender.tsx b/packages/demo/src/ExampleSegmentationRender.tsx index 6d1e1333f4..ab60ba9717 100644 --- a/packages/demo/src/ExampleSegmentationRender.tsx +++ b/packages/demo/src/ExampleSegmentationRender.tsx @@ -20,7 +20,7 @@ import { WindowLevelTool, PanTool, ZoomTool, - RectangleRoiTool, + RectangleROITool, SegmentationDisplayTool, } from '@cornerstonejs/tools' import * as csTools3d from '@cornerstonejs/tools' @@ -82,8 +82,8 @@ const toolsToUse = [ ] const labelmap1UID = 'boneAndSoftTissue' const labelmap2UID = 'fatTissue' -const RECTANGLE_ROI_THRESHOLD = 'RectangleRoiThreshold' -const RECTANGLE_ROI_THRESHOLD_MANUAL = 'RectangleRoiStartEndThreshold' +const RECTANGLE_ROI_THRESHOLD = 'RectangleROIThreshold' +const RECTANGLE_ROI_THRESHOLD_MANUAL = 'RectangleROIStartEndThreshold' class SegmentationExample extends Component { _elementNodes = null @@ -1174,7 +1174,7 @@ class SegmentationExample extends Component {
{this.getSetToolModes()}
{this.state.segmentationToolActive && (
- {this.state.ptCtLeftClickTool.includes(RectangleRoiTool.toolName) + {this.state.ptCtLeftClickTool.includes(RectangleROITool.toolName) ? this.getThresholdUID() : this.getScissorsUI()} All global segmentations diff --git a/packages/demo/src/ExampleToolDisplayConfiguration.tsx b/packages/demo/src/ExampleToolDisplayConfiguration.tsx index e625a232f4..fe4704856c 100644 --- a/packages/demo/src/ExampleToolDisplayConfiguration.tsx +++ b/packages/demo/src/ExampleToolDisplayConfiguration.tsx @@ -18,9 +18,9 @@ import { WindowLevelTool, LengthTool, BidirectionalTool, - RectangleRoiTool, + RectangleROITool, ProbeTool, - EllipticalRoiTool, + EllipticalROITool, } from '@cornerstonejs/tools' import * as csTools3d from '@cornerstonejs/tools' @@ -53,8 +53,8 @@ class ToolDisplayConfigurationExample extends Component { WindowLevelTool.toolName, LengthTool.toolName, BidirectionalTool.toolName, - RectangleRoiTool.toolName, - EllipticalRoiTool.toolName, + RectangleROITool.toolName, + EllipticalROITool.toolName, ProbeTool.toolName, ] diff --git a/packages/demo/src/constants/index.js b/packages/demo/src/constants/index.js index b16699256c..5b692dcea6 100644 --- a/packages/demo/src/constants/index.js +++ b/packages/demo/src/constants/index.js @@ -3,13 +3,13 @@ import { CrosshairsTool, LengthTool, BidirectionalTool, - RectangleRoiTool, - EllipticalRoiTool, + RectangleROITool, + EllipticalROITool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, - RectangleRoiThresholdTool, - RectangleRoiStartEndThresholdTool, + RectangleROIThresholdTool, + RectangleROIStartEndThresholdTool, BrushTool, } from '@cornerstonejs/tools' @@ -94,8 +94,8 @@ const ANNOTATION_TOOLS = [ CrosshairsTool.toolName, LengthTool.toolName, BidirectionalTool.toolName, - RectangleRoiTool.toolName, - EllipticalRoiTool.toolName, + RectangleROITool.toolName, + EllipticalROITool.toolName, ] // A string helper for the drop down. @@ -103,8 +103,8 @@ const SEGMENTATION_TOOLS = [ RectangleScissorsTool.toolName, CircleScissorsTool.toolName, SphereScissorsTool.toolName, - RectangleRoiThresholdTool.toolName, - RectangleRoiStartEndThresholdTool.toolName, + RectangleROIThresholdTool.toolName, + RectangleROIStartEndThresholdTool.toolName, BrushTool.toolName, ] diff --git a/packages/demo/src/helpers/getToolDetailForDisplay.js b/packages/demo/src/helpers/getToolDetailForDisplay.js index ade3c52971..23d1bd314e 100644 --- a/packages/demo/src/helpers/getToolDetailForDisplay.js +++ b/packages/demo/src/helpers/getToolDetailForDisplay.js @@ -54,13 +54,13 @@ export default function getToolDetailForDisplay(eventDetail) { } } - if (metadata.toolName === RectangleRoiTool.toolName) { + if (metadata.toolName === RectangleROITool.toolName) { detail.stats[`${target}-area`] = stat.area detail.stats[`${target}-mean`] = stat.mean detail.stats[`${target}-std`] = stat.stdDev } - if (metadata.toolName === EllipticalRoiTool.toolName) { + if (metadata.toolName === EllipticalROITool.toolName) { detail.stats[`${target}-area`] = stat.area detail.stats[`${target}-mean`] = stat.mean detail.stats[`${target}-std`] = stat.stdDev diff --git a/packages/demo/src/initToolGroups.js b/packages/demo/src/initToolGroups.js index 8815705552..90cc540a77 100644 --- a/packages/demo/src/initToolGroups.js +++ b/packages/demo/src/initToolGroups.js @@ -24,16 +24,16 @@ const { MIPJumpToClickTool, LengthTool, ProbeTool, - RectangleRoiTool, - EllipticalRoiTool, + RectangleROITool, + EllipticalROITool, BidirectionalTool, CrosshairsTool, RectangleScissorsTool, CircleScissorsTool, BrushTool, SphereScissorsTool, - RectangleRoiThresholdTool, - RectangleRoiStartEndThresholdTool, + RectangleROIThresholdTool, + RectangleROIStartEndThresholdTool, SegmentationDisplayTool, } = csTools3d @@ -235,8 +235,8 @@ function initToolGroups() { csTools3d.addTool(MIPJumpToClickTool) csTools3d.addTool(LengthTool) csTools3d.addTool(ProbeTool) - csTools3d.addTool(RectangleRoiTool) - csTools3d.addTool(EllipticalRoiTool) + csTools3d.addTool(RectangleROITool) + csTools3d.addTool(EllipticalROITool) csTools3d.addTool(BidirectionalTool) csTools3d.addTool(CrosshairsTool) // Segmentation @@ -244,8 +244,8 @@ function initToolGroups() { csTools3d.addTool(CircleScissorsTool) csTools3d.addTool(BrushTool) csTools3d.addTool(SphereScissorsTool) - csTools3d.addTool(RectangleRoiThresholdTool) - csTools3d.addTool(RectangleRoiStartEndThresholdTool) + csTools3d.addTool(RectangleROIThresholdTool) + csTools3d.addTool(RectangleROIStartEndThresholdTool) csTools3d.addTool(SegmentationDisplayTool) const stackCTViewportToolGroup = ToolGroupManager.createToolGroup( @@ -337,14 +337,14 @@ function addToolsToToolGroups({ stackPTViewportToolGroup.addTool(BidirectionalTool.toolName) stackPTViewportToolGroup.addTool(LengthTool.toolName) stackPTViewportToolGroup.addTool(ProbeTool.toolName) - stackPTViewportToolGroup.addTool(RectangleRoiTool.toolName) - stackPTViewportToolGroup.addTool(EllipticalRoiTool.toolName) + stackPTViewportToolGroup.addTool(RectangleROITool.toolName) + stackPTViewportToolGroup.addTool(EllipticalROITool.toolName) stackPTViewportToolGroup.setToolPassive(BidirectionalTool.toolName) stackPTViewportToolGroup.setToolPassive(LengthTool.toolName) stackPTViewportToolGroup.setToolPassive(ProbeTool.toolName) - stackPTViewportToolGroup.setToolPassive(RectangleRoiTool.toolName) - stackPTViewportToolGroup.setToolPassive(EllipticalRoiTool.toolName) + stackPTViewportToolGroup.setToolPassive(RectangleROITool.toolName) + stackPTViewportToolGroup.setToolPassive(EllipticalROITool.toolName) stackPTViewportToolGroup.setToolDisabled(CrosshairsTool.toolName) stackPTViewportToolGroup.setToolActive(StackScrollMouseWheelTool.toolName) @@ -381,8 +381,8 @@ function addToolsToToolGroups({ stackCTViewportToolGroup.addTool(BidirectionalTool.toolName) stackCTViewportToolGroup.addTool(LengthTool.toolName) stackCTViewportToolGroup.addTool(ProbeTool.toolName) - stackCTViewportToolGroup.addTool(RectangleRoiTool.toolName) - stackCTViewportToolGroup.addTool(EllipticalRoiTool.toolName) + stackCTViewportToolGroup.addTool(RectangleROITool.toolName) + stackCTViewportToolGroup.addTool(EllipticalROITool.toolName) stackCTViewportToolGroup.setToolActive(WindowLevelTool.toolName, { bindings: [ @@ -393,8 +393,8 @@ function addToolsToToolGroups({ }) stackCTViewportToolGroup.setToolPassive(BidirectionalTool.toolName) stackCTViewportToolGroup.setToolPassive(ProbeTool.toolName) - stackCTViewportToolGroup.setToolPassive(RectangleRoiTool.toolName) - stackCTViewportToolGroup.setToolPassive(EllipticalRoiTool.toolName) + stackCTViewportToolGroup.setToolPassive(RectangleROITool.toolName) + stackCTViewportToolGroup.setToolPassive(EllipticalROITool.toolName) stackCTViewportToolGroup.setToolDisabled(CrosshairsTool.toolName) stackCTViewportToolGroup.setToolPassive(LengthTool.toolName) @@ -431,8 +431,8 @@ function addToolsToToolGroups({ stackDXViewportToolGroup.addTool(BidirectionalTool.toolName) stackDXViewportToolGroup.addTool(LengthTool.toolName) stackDXViewportToolGroup.addTool(ProbeTool.toolName) - stackDXViewportToolGroup.addTool(RectangleRoiTool.toolName) - stackDXViewportToolGroup.addTool(EllipticalRoiTool.toolName) + stackDXViewportToolGroup.addTool(RectangleROITool.toolName) + stackDXViewportToolGroup.addTool(EllipticalROITool.toolName) stackDXViewportToolGroup.setToolActive(WindowLevelTool.toolName, { bindings: [ @@ -444,8 +444,8 @@ function addToolsToToolGroups({ stackDXViewportToolGroup.setToolPassive(BidirectionalTool.toolName) stackDXViewportToolGroup.setToolPassive(LengthTool.toolName) stackDXViewportToolGroup.setToolPassive(ProbeTool.toolName) - stackDXViewportToolGroup.setToolPassive(RectangleRoiTool.toolName) - stackDXViewportToolGroup.setToolPassive(EllipticalRoiTool.toolName) + stackDXViewportToolGroup.setToolPassive(RectangleROITool.toolName) + stackDXViewportToolGroup.setToolPassive(EllipticalROITool.toolName) stackDXViewportToolGroup.setToolDisabled(CrosshairsTool.toolName) stackDXViewportToolGroup.setToolActive(StackScrollMouseWheelTool.toolName) @@ -478,10 +478,10 @@ function addToolsToToolGroups({ // @TODO: This kills the volumeId and tool configuration ctSceneToolGroup.addTool(StackScrollTool.toolName) ctSceneToolGroup.addTool(RectangleScissorsTool.toolName) - ctSceneToolGroup.addTool(RectangleRoiThresholdTool.toolName) + ctSceneToolGroup.addTool(RectangleROIThresholdTool.toolName) ctSceneToolGroup.addTool(SegmentationDisplayTool.toolName) ctSceneToolGroup.setToolEnabled(SegmentationDisplayTool.toolName) - ctSceneToolGroup.addTool(RectangleRoiStartEndThresholdTool.toolName) + ctSceneToolGroup.addTool(RectangleROIStartEndThresholdTool.toolName) ctSceneToolGroup.addTool(CircleScissorsTool.toolName) ctSceneToolGroup.addTool(SphereScissorsTool.toolName) ctSceneToolGroup.addTool(WindowLevelTool.toolName) @@ -494,8 +494,8 @@ function addToolsToToolGroups({ ctSceneToolGroup.addTool(BidirectionalTool.toolName) ctSceneToolGroup.addTool(LengthTool.toolName) ctSceneToolGroup.addTool(ProbeTool.toolName) - ctSceneToolGroup.addTool(RectangleRoiTool.toolName) - ctSceneToolGroup.addTool(EllipticalRoiTool.toolName) + ctSceneToolGroup.addTool(RectangleROITool.toolName) + ctSceneToolGroup.addTool(EllipticalROITool.toolName) ctSceneToolGroup.addTool(CrosshairsTool.toolName, { getReferenceLineColor, getReferenceLineControllable, @@ -506,8 +506,8 @@ function addToolsToToolGroups({ ctSceneToolGroup.setToolPassive(BidirectionalTool.toolName) ctSceneToolGroup.setToolPassive(LengthTool.toolName) ctSceneToolGroup.setToolPassive(ProbeTool.toolName) - ctSceneToolGroup.setToolPassive(RectangleRoiTool.toolName) - ctSceneToolGroup.setToolPassive(EllipticalRoiTool.toolName) + ctSceneToolGroup.setToolPassive(RectangleROITool.toolName) + ctSceneToolGroup.setToolPassive(EllipticalROITool.toolName) ctSceneToolGroup.setToolDisabled(CrosshairsTool.toolName) ctSceneToolGroup.setToolActive(StackScrollMouseWheelTool.toolName) @@ -547,8 +547,8 @@ function addToolsToToolGroups({ prostateSceneToolGroup.addTool(BidirectionalTool.toolName) prostateSceneToolGroup.addTool(LengthTool.toolName) prostateSceneToolGroup.addTool(ProbeTool.toolName) - prostateSceneToolGroup.addTool(RectangleRoiTool.toolName) - prostateSceneToolGroup.addTool(EllipticalRoiTool.toolName) + prostateSceneToolGroup.addTool(RectangleROITool.toolName) + prostateSceneToolGroup.addTool(EllipticalROITool.toolName) prostateSceneToolGroup.addTool(CrosshairsTool.toolName, { getReferenceLineColor, getReferenceLineControllable, @@ -559,8 +559,8 @@ function addToolsToToolGroups({ prostateSceneToolGroup.setToolPassive(BidirectionalTool.toolName) prostateSceneToolGroup.setToolPassive(LengthTool.toolName) prostateSceneToolGroup.setToolPassive(ProbeTool.toolName) - prostateSceneToolGroup.setToolPassive(RectangleRoiTool.toolName) - prostateSceneToolGroup.setToolPassive(EllipticalRoiTool.toolName) + prostateSceneToolGroup.setToolPassive(RectangleROITool.toolName) + prostateSceneToolGroup.setToolPassive(EllipticalROITool.toolName) prostateSceneToolGroup.setToolDisabled(CrosshairsTool.toolName) prostateSceneToolGroup.setToolActive(StackScrollMouseWheelTool.toolName) @@ -590,19 +590,19 @@ function addToolsToToolGroups({ if (ptSceneToolGroup) { // Set up PT Scene tools ptSceneToolGroup.addTool(RectangleScissorsTool.toolName) - ptSceneToolGroup.addTool(RectangleRoiThresholdTool.toolName) + ptSceneToolGroup.addTool(RectangleROIThresholdTool.toolName) ptSceneToolGroup.addTool(BrushTool.toolName) ptSceneToolGroup.addTool(SegmentationDisplayTool.toolName) ptSceneToolGroup.setToolEnabled(SegmentationDisplayTool.toolName) - ptSceneToolGroup.addTool(RectangleRoiStartEndThresholdTool.toolName) + ptSceneToolGroup.addTool(RectangleROIStartEndThresholdTool.toolName) ptSceneToolGroup.addTool(CircleScissorsTool.toolName) ptSceneToolGroup.addTool(SphereScissorsTool.toolName) ptSceneToolGroup.addTool(BidirectionalTool.toolName) ptSceneToolGroup.addTool(LengthTool.toolName) ptSceneToolGroup.addTool(WindowLevelTool.toolName) ptSceneToolGroup.addTool(ProbeTool.toolName) - ptSceneToolGroup.addTool(RectangleRoiTool.toolName) - ptSceneToolGroup.addTool(EllipticalRoiTool.toolName) + ptSceneToolGroup.addTool(RectangleROITool.toolName) + ptSceneToolGroup.addTool(EllipticalROITool.toolName) ptSceneToolGroup.addTool(CrosshairsTool.toolName, { getReferenceLineColor, getReferenceLineControllable, @@ -615,8 +615,8 @@ function addToolsToToolGroups({ ptSceneToolGroup.addTool(StackScrollMouseWheelTool.toolName) ptSceneToolGroup.setToolPassive(ProbeTool.toolName) ptSceneToolGroup.setToolPassive(LengthTool.toolName) - ptSceneToolGroup.setToolPassive(RectangleRoiTool.toolName) - ptSceneToolGroup.setToolPassive(EllipticalRoiTool.toolName) + ptSceneToolGroup.setToolPassive(RectangleROITool.toolName) + ptSceneToolGroup.setToolPassive(EllipticalROITool.toolName) ptSceneToolGroup.setToolPassive(BidirectionalTool.toolName) ptSceneToolGroup.setToolDisabled(CrosshairsTool.toolName) @@ -655,10 +655,10 @@ function addToolsToToolGroups({ volumeId: ptVolumeId, }) fusionSceneToolGroup.addTool(ProbeTool.toolName, { volumeId: ptVolumeId }) - fusionSceneToolGroup.addTool(RectangleRoiTool.toolName, { + fusionSceneToolGroup.addTool(RectangleROITool.toolName, { volumeId: ptVolumeId, }) - fusionSceneToolGroup.addTool(EllipticalRoiTool.toolName, { + fusionSceneToolGroup.addTool(EllipticalROITool.toolName, { volumeId: ptVolumeId, }) fusionSceneToolGroup.addTool(ZoomTool.toolName) @@ -676,8 +676,8 @@ function addToolsToToolGroups({ fusionSceneToolGroup.setToolPassive(BidirectionalTool.toolName) fusionSceneToolGroup.setToolPassive(LengthTool.toolName) fusionSceneToolGroup.setToolPassive(ProbeTool.toolName) - fusionSceneToolGroup.setToolPassive(RectangleRoiTool.toolName) - fusionSceneToolGroup.setToolPassive(EllipticalRoiTool.toolName) + fusionSceneToolGroup.setToolPassive(RectangleROITool.toolName) + fusionSceneToolGroup.setToolPassive(EllipticalROITool.toolName) fusionSceneToolGroup.setToolDisabled(CrosshairsTool.toolName) fusionSceneToolGroup.setToolActive(StackScrollMouseWheelTool.toolName) diff --git a/packages/docs/docs/how-to-guides/custom-tools.md b/packages/docs/docs/how-to-guides/custom-tools.md index 320d47d97b..b0bb4b10ca 100644 --- a/packages/docs/docs/how-to-guides/custom-tools.md +++ b/packages/docs/docs/how-to-guides/custom-tools.md @@ -43,10 +43,10 @@ that's called when a mouse event is not captured. This allows the active tool to create Annotations for the interaction. Example `AnnotationTool`s include: - Bidirectional -- EllipticalRoi +- EllipticalROI - Length - Probe -- RectangleRoi +- RectangleROI ## Next steps diff --git a/packages/docs/docs/introduction/overview.md b/packages/docs/docs/introduction/overview.md index e08aaef1b3..db181a220a 100644 --- a/packages/docs/docs/introduction/overview.md +++ b/packages/docs/docs/introduction/overview.md @@ -45,7 +45,7 @@ In addition, you can: - activate certain tools on certain viewports with ToolGroups (e.g., on scroll activate slice scrolling on CT Axial viewport but volume rotation for PT MIP viewport) - measure distances between two points using the Length tool - measure length and width using bidirectional line tools -- calculate statistics such as mean, standard deviation of a region of interest using Rectangle/Elliptical Roi Tool +- calculate statistics such as mean, standard deviation of a region of interest using Rectangle/Elliptical ROI Tool - use crosshairs to find corresponding points in images of different viewports and navigate slices using reference lines - assign different tools to be activated while holding a specific modifier key (e.g. shift, ctrl, alt) - create your own custom tools diff --git a/packages/tools/examples/modifierKeys/index.ts b/packages/tools/examples/modifierKeys/index.ts index e677b73839..682c2cbac6 100644 --- a/packages/tools/examples/modifierKeys/index.ts +++ b/packages/tools/examples/modifierKeys/index.ts @@ -9,7 +9,7 @@ import * as cornerstoneTools from '@cornerstonejs/tools' const { WindowLevelTool, LengthTool, - RectangleRoiTool, + RectangleROITool, BidirectionalTool, ToolGroupManager, Enums: csToolsEnums, @@ -56,7 +56,7 @@ async function run() { // Add tools to Cornerstone3D cornerstoneTools.addTool(WindowLevelTool) cornerstoneTools.addTool(LengthTool) - cornerstoneTools.addTool(RectangleRoiTool) + cornerstoneTools.addTool(RectangleROITool) cornerstoneTools.addTool(BidirectionalTool) // Define a tool group, which defines how mouse events map to tool commands for @@ -66,7 +66,7 @@ async function run() { // Add the tools to the tool group toolGroup.addTool(WindowLevelTool.toolName) toolGroup.addTool(LengthTool.toolName) - toolGroup.addTool(RectangleRoiTool.toolName) + toolGroup.addTool(RectangleROITool.toolName) toolGroup.addTool(BidirectionalTool.toolName) // TODO Why doesn't this work? @@ -88,7 +88,7 @@ async function run() { }, ], }) - toolGroup.setToolActive(RectangleRoiTool.toolName, { + toolGroup.setToolActive(RectangleROITool.toolName, { bindings: [ { mouseButton: MouseBindings.Primary, // Ctrl + Left Click diff --git a/packages/tools/examples/stackAnnotationTools/index.ts b/packages/tools/examples/stackAnnotationTools/index.ts index e4240466c8..e13ed9d393 100644 --- a/packages/tools/examples/stackAnnotationTools/index.ts +++ b/packages/tools/examples/stackAnnotationTools/index.ts @@ -10,8 +10,8 @@ import * as cornerstoneTools from '@cornerstonejs/tools' const { LengthTool, ProbeTool, - RectangleRoiTool, - EllipticalRoiTool, + RectangleROITool, + EllipticalROITool, BidirectionalTool, ToolGroupManager, Enums: csToolsEnums, @@ -49,8 +49,8 @@ const toolGroupId = 'STACK_TOOL_GROUP_ID' const toolsNames = [ LengthTool.toolName, ProbeTool.toolName, - RectangleRoiTool.toolName, - EllipticalRoiTool.toolName, + RectangleROITool.toolName, + EllipticalROITool.toolName, BidirectionalTool.toolName, ] let selectedToolName = toolsNames[0] @@ -86,8 +86,8 @@ async function run() { // Add tools to Cornerstone3D cornerstoneTools.addTool(LengthTool) cornerstoneTools.addTool(ProbeTool) - cornerstoneTools.addTool(RectangleRoiTool) - cornerstoneTools.addTool(EllipticalRoiTool) + cornerstoneTools.addTool(RectangleROITool) + cornerstoneTools.addTool(EllipticalROITool) cornerstoneTools.addTool(BidirectionalTool) // Define a tool group, which defines how mouse events map to tool commands for @@ -97,8 +97,8 @@ async function run() { // Add the tools to the tool group toolGroup.addTool(LengthTool.toolName) toolGroup.addTool(ProbeTool.toolName) - toolGroup.addTool(RectangleRoiTool.toolName) - toolGroup.addTool(EllipticalRoiTool.toolName) + toolGroup.addTool(RectangleROITool.toolName) + toolGroup.addTool(EllipticalROITool.toolName) toolGroup.addTool(BidirectionalTool.toolName) // Set the initial state of the tools, here we set one tool active on left click. @@ -113,8 +113,8 @@ async function run() { // We set all the other tools passive here, this means that any state is rendered, and editable // But aren't actively being drawn (see the toolModes example for information) toolGroup.setToolPassive(ProbeTool.toolName) - toolGroup.setToolPassive(RectangleRoiTool.toolName) - toolGroup.setToolPassive(EllipticalRoiTool.toolName) + toolGroup.setToolPassive(RectangleROITool.toolName) + toolGroup.setToolPassive(EllipticalROITool.toolName) toolGroup.setToolPassive(BidirectionalTool.toolName) // Get Cornerstone imageIds and fetch metadata into RAM diff --git a/packages/tools/src/cursors/SVGCursorDescriptor.ts b/packages/tools/src/cursors/SVGCursorDescriptor.ts index b0d97ad54d..09dceb41f6 100644 --- a/packages/tools/src/cursors/SVGCursorDescriptor.ts +++ b/packages/tools/src/cursors/SVGCursorDescriptor.ts @@ -86,14 +86,14 @@ const DefinedDescriptorsMap = { y: 32, }, }), - CircleRoi: extend(BASE, { + CircleROI: extend(BASE, { iconContent: ``, viewBox: { x: 32, y: 32, }, }), - EllipticalRoi: extend(BASE, { + EllipticalROI: extend(BASE, { iconContent: ``, @@ -102,7 +102,7 @@ const DefinedDescriptorsMap = { y: 32, }, }), - FreehandRoi: extend(BASE, { + FreehandROI: extend(BASE, { iconContent: ` @@ -140,7 +140,7 @@ const DefinedDescriptorsMap = { y: 18, }, }), - FreehandRoiSculptor: extend(BASE, { + FreehandROISculptor: extend(BASE, { iconContent: ` @@ -200,7 +200,7 @@ const DefinedDescriptorsMap = { y: 1792, }, }), - RectangleRoi: extend(BASE, { + RectangleROI: extend(BASE, { iconContent: ` tg.id === toolGroupId ) @@ -22,4 +22,4 @@ function destroyToolGroupById(toolGroupId: string): void { } } -export default destroyToolGroupById +export default destroyToolGroup diff --git a/packages/tools/src/store/ToolGroupManager/getToolGroupById.ts b/packages/tools/src/store/ToolGroupManager/getToolGroup.ts similarity index 77% rename from packages/tools/src/store/ToolGroupManager/getToolGroupById.ts rename to packages/tools/src/store/ToolGroupManager/getToolGroup.ts index b0a016a3a6..b9b917451c 100644 --- a/packages/tools/src/store/ToolGroupManager/getToolGroupById.ts +++ b/packages/tools/src/store/ToolGroupManager/getToolGroup.ts @@ -7,8 +7,8 @@ import { IToolGroup } from '../../types' * @returns The tool group that has the same id as the tool group id that was * passed in. */ -function getToolGroupById(toolGroupId: string): IToolGroup | undefined { +function getToolGroup(toolGroupId: string): IToolGroup | undefined { return state.toolGroups.find((s) => s.id === toolGroupId) } -export default getToolGroupById +export default getToolGroup diff --git a/packages/tools/src/store/ToolGroupManager/index.ts b/packages/tools/src/store/ToolGroupManager/index.ts index 8ad309e8e5..9508b610e5 100644 --- a/packages/tools/src/store/ToolGroupManager/index.ts +++ b/packages/tools/src/store/ToolGroupManager/index.ts @@ -1,15 +1,15 @@ import createToolGroup from './createToolGroup' -import destroyToolGroupById from './destroyToolGroupById' +import destroyToolGroup from './destroyToolGroup' import destroy from './destroy' -import getToolGroupById from './getToolGroupById' +import getToolGroup from './getToolGroup' import getToolGroupForViewport from './getToolGroupForViewport' import getAllToolGroups from './getAllToolGroups' export { createToolGroup, destroy, - destroyToolGroupById, - getToolGroupById, + destroyToolGroup, + getToolGroup, getToolGroupForViewport, getAllToolGroups, } diff --git a/packages/tools/src/tools/displayTools/Labelmap/labelmapDisplay.ts b/packages/tools/src/tools/displayTools/Labelmap/labelmapDisplay.ts index 2aeeaa98c3..da2b4f2e51 100644 --- a/packages/tools/src/tools/displayTools/Labelmap/labelmapDisplay.ts +++ b/packages/tools/src/tools/displayTools/Labelmap/labelmapDisplay.ts @@ -10,7 +10,7 @@ import { import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState' import Representations from '../../../enums/SegmentationRepresentations' -import { getToolGroupById } from '../../../store/ToolGroupManager' +import { getToolGroup } from '../../../store/ToolGroupManager' import type { labelmapConfig } from '../../../types/LabelmapTypes' import { RepresentationPublicInput, @@ -292,7 +292,7 @@ function _removeLabelmapFromToolGroupViewports( toolGroupId: string, segmentationRepresentationUID: string ): void { - const toolGroup = getToolGroupById(toolGroupId) + const toolGroup = getToolGroup(toolGroupId) if (toolGroup === undefined) { throw new Error(`ToolGroup with ToolGroupId ${toolGroupId} does not exist`) @@ -315,7 +315,7 @@ async function _addLabelmapToToolGroupViewports( volumeId: string, segmentationRepresentationUID: string ): Promise { - const toolGroup = getToolGroupById(toolGroupId) as IToolGroup + const toolGroup = getToolGroup(toolGroupId) as IToolGroup const { viewportsInfo } = toolGroup for (const viewportInfo of viewportsInfo) { diff --git a/packages/tools/src/tools/displayTools/SegmentationDisplayTool.ts b/packages/tools/src/tools/displayTools/SegmentationDisplayTool.ts index 70b8621d0a..fd0c1c23e9 100644 --- a/packages/tools/src/tools/displayTools/SegmentationDisplayTool.ts +++ b/packages/tools/src/tools/displayTools/SegmentationDisplayTool.ts @@ -5,7 +5,7 @@ import { getSegmentationRepresentations } from '../../stateManagement/segmentati import { labelmapDisplay } from './Labelmap' import { segmentationConfig } from '../../stateManagement/segmentation' import { triggerSegmentationRepresentationModified } from '../../stateManagement/segmentation/triggerSegmentationEvents' -import { getToolGroupById } from '../../store/ToolGroupManager' +import { getToolGroup } from '../../store/ToolGroupManager' import { PublicToolProps, ToolProps } from '../../types' @@ -100,7 +100,7 @@ export default class SegmentationDisplayTool extends BaseTool { * @param toolGroupId - the toolGroupId */ renderSegmentation = (toolGroupId: string): void => { - const toolGroup = getToolGroupById(toolGroupId) + const toolGroup = getToolGroup(toolGroupId) if (!toolGroup) { return diff --git a/packages/tools/src/utilities/triggerSegmentationRender.ts b/packages/tools/src/utilities/triggerSegmentationRender.ts index e90384f520..129de8af9d 100644 --- a/packages/tools/src/utilities/triggerSegmentationRender.ts +++ b/packages/tools/src/utilities/triggerSegmentationRender.ts @@ -7,7 +7,7 @@ import { } from '@cornerstonejs/core' import { Events as csToolsEvents } from '../enums' import { - getToolGroupById, + getToolGroup, getToolGroupForViewport, } from '../store/ToolGroupManager' @@ -97,7 +97,7 @@ class SegmentationRenderingEngine { } } _triggerRender(toolGroupId) { - const toolGroup = getToolGroupById(toolGroupId) + const toolGroup = getToolGroup(toolGroupId) if (!toolGroup) { console.warn(`No tool group found with toolGroupId: ${toolGroupId}`) diff --git a/packages/tools/test/BidirectionalTool_test.js b/packages/tools/test/BidirectionalTool_test.js index 33210daed3..e754f9cb2e 100644 --- a/packages/tools/test/BidirectionalTool_test.js +++ b/packages/tools/test/BidirectionalTool_test.js @@ -103,7 +103,7 @@ describe('Cornerstone Tools: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/CrosshairsTool_test.js b/packages/tools/test/CrosshairsTool_test.js index 4a9a9bb0be..093650543c 100644 --- a/packages/tools/test/CrosshairsTool_test.js +++ b/packages/tools/test/CrosshairsTool_test.js @@ -122,7 +122,7 @@ describe('Cornerstone Tools: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('volume') + ToolGroupManager.destroyToolGroup('volume') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/EllipseROI_test.js b/packages/tools/test/EllipseROI_test.js index 3109ef04f0..3db2f9eceb 100644 --- a/packages/tools/test/EllipseROI_test.js +++ b/packages/tools/test/EllipseROI_test.js @@ -97,7 +97,7 @@ describe('Ellipse Tool: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { el.parentNode.removeChild(el) @@ -354,7 +354,7 @@ describe('Ellipse Tool: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/LengthTool_test.js b/packages/tools/test/LengthTool_test.js index baad17abe1..6806cef6d4 100644 --- a/packages/tools/test/LengthTool_test.js +++ b/packages/tools/test/LengthTool_test.js @@ -105,7 +105,7 @@ describe('LengthTool:', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { @@ -958,7 +958,7 @@ describe('LengthTool:', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { @@ -1124,7 +1124,7 @@ describe('LengthTool:', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/ProbeTool_test.js b/packages/tools/test/ProbeTool_test.js index 58a38f1c81..90ee2235f1 100644 --- a/packages/tools/test/ProbeTool_test.js +++ b/packages/tools/test/ProbeTool_test.js @@ -95,7 +95,7 @@ describe('Probe Tool: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { @@ -735,7 +735,7 @@ describe('Probe Tool: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/RectangleROI_test.js b/packages/tools/test/RectangleROI_test.js index 6593d1518e..c280088b0b 100644 --- a/packages/tools/test/RectangleROI_test.js +++ b/packages/tools/test/RectangleROI_test.js @@ -95,7 +95,7 @@ describe('Rectangle ROI Tool: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { @@ -828,7 +828,7 @@ describe('Rectangle ROI Tool: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/StackScrollToolMouseWheelTool_test.js b/packages/tools/test/StackScrollToolMouseWheelTool_test.js index 45355943fe..4fe4abead1 100644 --- a/packages/tools/test/StackScrollToolMouseWheelTool_test.js +++ b/packages/tools/test/StackScrollToolMouseWheelTool_test.js @@ -89,7 +89,7 @@ describe('Cornerstone Tools Scroll Wheel: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById(StackScrollTool.toolName) + ToolGroupManager.destroyToolGroup(StackScrollTool.toolName) this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/ToolGroupManager_test.js b/packages/tools/test/ToolGroupManager_test.js index 44d1a6b1cd..5d2a04f8e2 100644 --- a/packages/tools/test/ToolGroupManager_test.js +++ b/packages/tools/test/ToolGroupManager_test.js @@ -118,7 +118,7 @@ describe('ToolGroup Manager: ', () => { this.toolGroup.addViewport(viewportId1, this.renderingEngine.id) - const tg = ToolGroupManager.getToolGroupById('volume1') + const tg = ToolGroupManager.getToolGroup('volume1') expect(tg).toBeDefined() }) }) @@ -147,7 +147,7 @@ describe('ToolGroup Manager: ', () => { afterEach(function () { // Destroy synchronizer manager to test it first since csTools3D also destroy // synchronizers - ToolGroupManager.destroyToolGroupById('volume1') + ToolGroupManager.destroyToolGroup('volume1') csTools3d.destroy() cache.purgeCache() this.renderingEngine.destroy() @@ -188,7 +188,7 @@ describe('ToolGroup Manager: ', () => { this.toolGroup.addViewport(viewportId1, this.renderingEngine.id) - const tg = ToolGroupManager.getToolGroupById('volume1') + const tg = ToolGroupManager.getToolGroup('volume1') expect(tg).toBeDefined() const tg2 = ToolGroupManager.getToolGroupForViewport( @@ -232,19 +232,19 @@ describe('ToolGroup Manager: ', () => { ]) // Remove viewports - let tg = ToolGroupManager.getToolGroupById('volume1') + let tg = ToolGroupManager.getToolGroup('volume1') tg.addViewport(viewportId1, this.renderingEngine.id) expect(tg.viewportsInfo.length).toBe(1) tg.removeViewports(renderingEngineId) - tg = ToolGroupManager.getToolGroupById('volume1') + tg = ToolGroupManager.getToolGroup('volume1') expect(tg.viewportsInfo.length).toBe(0) // tg.addViewport(viewportId1, this.renderingEngine.id) - tg = ToolGroupManager.getToolGroupById('volume1') + tg = ToolGroupManager.getToolGroup('volume1') expect(tg.viewportsInfo.length).toBe(1) tg.removeViewports(renderingEngineId, viewportId2) @@ -280,7 +280,7 @@ describe('ToolGroup Manager: ', () => { this.toolGroup.addViewport(viewportId1, this.renderingEngine.id) // Remove viewports - let tg = ToolGroupManager.getToolGroupById('volume1') + let tg = ToolGroupManager.getToolGroup('volume1') expect(tg.getToolInstance(ProbeTool.toolName).mode).toBe('Active') expect(tg.getToolInstance(LengthTool.toolName)).toBeUndefined() @@ -317,7 +317,7 @@ describe('ToolGroup Manager: ', () => { this.toolGroup.addViewport(viewportId1, this.renderingEngine.id) // Remove viewports - let tg = ToolGroupManager.getToolGroupById('volume1') + let tg = ToolGroupManager.getToolGroup('volume1') tg.setToolActive() tg.setToolPassive() tg.setToolEnabled() diff --git a/packages/tools/test/cpu_BidirectionalTool_test.js b/packages/tools/test/cpu_BidirectionalTool_test.js index 9f6b45d7ea..976830afb8 100644 --- a/packages/tools/test/cpu_BidirectionalTool_test.js +++ b/packages/tools/test/cpu_BidirectionalTool_test.js @@ -108,7 +108,7 @@ describe('Bidirectional Tool (CPU): ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/cpu_EllipseROI_test.js b/packages/tools/test/cpu_EllipseROI_test.js index 1be1c35980..6678dac83f 100644 --- a/packages/tools/test/cpu_EllipseROI_test.js +++ b/packages/tools/test/cpu_EllipseROI_test.js @@ -102,7 +102,7 @@ describe('EllipticalROITool (CPU):', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/cpu_LengthTool_test.js b/packages/tools/test/cpu_LengthTool_test.js index 910c1c97a4..2135b0500a 100644 --- a/packages/tools/test/cpu_LengthTool_test.js +++ b/packages/tools/test/cpu_LengthTool_test.js @@ -107,7 +107,7 @@ describe('Length Tool (CPU):', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/cpu_ProbeTool_test.js b/packages/tools/test/cpu_ProbeTool_test.js index 9dea5327d5..0ef269ee14 100644 --- a/packages/tools/test/cpu_ProbeTool_test.js +++ b/packages/tools/test/cpu_ProbeTool_test.js @@ -101,7 +101,7 @@ describe('ProbeTool (CPU):', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/cpu_RectangleROI_test.js b/packages/tools/test/cpu_RectangleROI_test.js index c09de1f9cb..5f3a149280 100644 --- a/packages/tools/test/cpu_RectangleROI_test.js +++ b/packages/tools/test/cpu_RectangleROI_test.js @@ -100,7 +100,7 @@ describe('RectangleROITool (CPU):', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) imageLoader.unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('stack') + ToolGroupManager.destroyToolGroup('stack') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationConfigController_test.js b/packages/tools/test/segmentationConfigController_test.js index 56d0ba93d3..7c23563837 100644 --- a/packages/tools/test/segmentationConfigController_test.js +++ b/packages/tools/test/segmentationConfigController_test.js @@ -108,7 +108,7 @@ describe('Segmentation Controller --', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById(TOOL_GROUP_ID) + ToolGroupManager.destroyToolGroup(TOOL_GROUP_ID) this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationRectangleScissor_test.js b/packages/tools/test/segmentationRectangleScissor_test.js index 789302a6a8..5021b9e3f6 100644 --- a/packages/tools/test/segmentationRectangleScissor_test.js +++ b/packages/tools/test/segmentationRectangleScissor_test.js @@ -108,7 +108,7 @@ describe('Segmentation Tools --', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('segToolGroup') + ToolGroupManager.destroyToolGroup('segToolGroup') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationRender_test.js b/packages/tools/test/segmentationRender_test.js index 106e02d80c..f996b13bfa 100644 --- a/packages/tools/test/segmentationRender_test.js +++ b/packages/tools/test/segmentationRender_test.js @@ -106,7 +106,7 @@ describe('Segmentation Render -- ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('segToolGroup') + ToolGroupManager.destroyToolGroup('segToolGroup') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationSegmentIndexController_test.js b/packages/tools/test/segmentationSegmentIndexController_test.js index cb2ad09065..6c99b5ff56 100644 --- a/packages/tools/test/segmentationSegmentIndexController_test.js +++ b/packages/tools/test/segmentationSegmentIndexController_test.js @@ -109,7 +109,7 @@ describe('Segmentation Index Controller --', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById(TOOL_GROUP_ID) + ToolGroupManager.destroyToolGroup(TOOL_GROUP_ID) this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationSphereScissor_test.js b/packages/tools/test/segmentationSphereScissor_test.js index 2069ed038f..dbf0d3a13d 100644 --- a/packages/tools/test/segmentationSphereScissor_test.js +++ b/packages/tools/test/segmentationSphereScissor_test.js @@ -110,7 +110,7 @@ describe('Segmentation Tools --', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('segToolGroup') + ToolGroupManager.destroyToolGroup('segToolGroup') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationState_test.js b/packages/tools/test/segmentationState_test.js index 19adfc5506..5e281ab58d 100644 --- a/packages/tools/test/segmentationState_test.js +++ b/packages/tools/test/segmentationState_test.js @@ -94,7 +94,7 @@ describe('Segmentation State -- ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('segToolGroup') + ToolGroupManager.destroyToolGroup('segToolGroup') this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationVisibilityController_test.js b/packages/tools/test/segmentationVisibilityController_test.js index ba32a9e4ac..5fec604ba3 100644 --- a/packages/tools/test/segmentationVisibilityController_test.js +++ b/packages/tools/test/segmentationVisibilityController_test.js @@ -105,7 +105,7 @@ describe('Segmentation Controller --', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById(TOOL_GROUP_ID) + ToolGroupManager.destroyToolGroup(TOOL_GROUP_ID) this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/synchronizerManager_test.js b/packages/tools/test/synchronizerManager_test.js index 9af155b7b3..3f437dfef5 100644 --- a/packages/tools/test/synchronizerManager_test.js +++ b/packages/tools/test/synchronizerManager_test.js @@ -92,7 +92,7 @@ describe('Synchronizer Manager: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('volume1') + ToolGroupManager.destroyToolGroup('volume1') this.DOMElements.forEach((el) => { if (el.parentNode) { @@ -236,7 +236,7 @@ describe('Synchronizer Manager: ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroupById('volume1') + ToolGroupManager.destroyToolGroup('volume1') this.DOMElements.forEach((el) => { if (el.parentNode) { From df116e34d9c8bc21d06df0e863b3acef38762e63 Mon Sep 17 00:00:00 2001 From: Alireza Date: Mon, 28 Mar 2022 11:39:18 -0400 Subject: [PATCH 4/5] rename getSynchronizerById to getSynchronizer --- common/reviews/api/tools.api.md | 16 ++++++++-------- .../volumeViewportSynchronization/index.ts | 5 ++--- ...ynchronizerById.ts => destroySynchronizer.ts} | 4 ++-- ...getSynchronizerById.ts => getSynchronizer.ts} | 4 ++-- ...onizers.ts => getSynchronizersForViewport.ts} | 8 ++++---- .../tools/src/store/SynchronizerManager/index.js | 12 ++++++------ packages/tools/src/store/removeEnabledElement.ts | 8 ++++---- packages/tools/test/synchronizerManager_test.js | 10 +++++----- 8 files changed, 33 insertions(+), 34 deletions(-) rename packages/tools/src/store/SynchronizerManager/{destroySynchronizerById.ts => destroySynchronizer.ts} (86%) rename packages/tools/src/store/SynchronizerManager/{getSynchronizerById.ts => getSynchronizer.ts} (74%) rename packages/tools/src/store/SynchronizerManager/{getSynchronizers.ts => getSynchronizersForViewport.ts} (88%) diff --git a/common/reviews/api/tools.api.md b/common/reviews/api/tools.api.md index ba02e21317..46c04b7caa 100644 --- a/common/reviews/api/tools.api.md +++ b/common/reviews/api/tools.api.md @@ -848,7 +848,7 @@ function destroy_2(): void; function destroy_3(): void; // @public (undocumented) -function destroySynchronizerById(synchronizerId: string): void; +function destroySynchronizer(synchronizerId: string): void; // @public (undocumented) function destroyToolGroup(toolGroupId: string): void; @@ -1299,19 +1299,19 @@ function getState(annotation?: Annotation): AnnotationStyleStates; function getStyle(toolName?: string, annotation?: Record): Settings; // @public (undocumented) -function getSynchronizerById(synchronizerId: string): Synchronizer | void; +function getSynchronizer(synchronizerId: string): Synchronizer | void; // @public (undocumented) -function getSynchronizers(renderingEngineId: string, viewportId: string): Array; +function getSynchronizersForViewport(viewportId: string, renderingEngineId: string): Array; // @public (undocumented) function getTextBoxCoordsCanvas(annotationCanvasPoints: Array): Types_2.Point2; // @public (undocumented) -function getToolGroupForViewport(viewportId: string, renderingEngineId: string): IToolGroup | undefined; +function getToolGroup(toolGroupId: string): IToolGroup | undefined; // @public (undocumented) -function getToolGroup(toolGroupId: string): IToolGroup | undefined; +function getToolGroupForViewport(viewportId: string, renderingEngineId: string): IToolGroup | undefined; // @public (undocumented) function getToolGroupSpecificConfig(toolGroupId: string): SegmentationRepresentationConfig; @@ -3070,10 +3070,10 @@ declare namespace SynchronizerManager { export { createSynchronizer, destroy_2 as destroy, - getSynchronizerById, - getSynchronizers, + getSynchronizer, + getSynchronizersForViewport, getAllSynchronizers, - destroySynchronizerById + destroySynchronizer } } export { SynchronizerManager } diff --git a/packages/tools/examples/volumeViewportSynchronization/index.ts b/packages/tools/examples/volumeViewportSynchronization/index.ts index 9775b7943b..0a9d8728d2 100644 --- a/packages/tools/examples/volumeViewportSynchronization/index.ts +++ b/packages/tools/examples/volumeViewportSynchronization/index.ts @@ -104,7 +104,7 @@ const SynchronizerButtonInfo = [ SynchronizerButtonInfo.forEach(({ viewportLabel, viewportId }) => { addToggleButtonToToolbar(`Camera ${viewportLabel}`, (evt, toggle) => { const synchronizer = - SynchronizerManager.getSynchronizerById(cameraSynchronizerId) + SynchronizerManager.getSynchronizer(cameraSynchronizerId) if (!synchronizer) { return @@ -120,8 +120,7 @@ SynchronizerButtonInfo.forEach(({ viewportLabel, viewportId }) => { SynchronizerButtonInfo.forEach(({ viewportLabel, viewportId }) => { addToggleButtonToToolbar(`VOI ${viewportLabel}`, (evt, toggle) => { - const synchronizer = - SynchronizerManager.getSynchronizerById(voiSynchronizerId) + const synchronizer = SynchronizerManager.getSynchronizer(voiSynchronizerId) if (!synchronizer) { return diff --git a/packages/tools/src/store/SynchronizerManager/destroySynchronizerById.ts b/packages/tools/src/store/SynchronizerManager/destroySynchronizer.ts similarity index 86% rename from packages/tools/src/store/SynchronizerManager/destroySynchronizerById.ts rename to packages/tools/src/store/SynchronizerManager/destroySynchronizer.ts index 72b1a8714d..641c6c4e17 100644 --- a/packages/tools/src/store/SynchronizerManager/destroySynchronizerById.ts +++ b/packages/tools/src/store/SynchronizerManager/destroySynchronizer.ts @@ -9,7 +9,7 @@ import { state } from '../index' * Destroy a synchronizer by its ID. * @param synchronizerId - The id of the synchronizer to destroy. */ -function destroySynchronizerById(synchronizerId: string): void { +function destroySynchronizer(synchronizerId: string): void { const synchronizerIndex = state.synchronizers.findIndex( (sync) => sync.id === synchronizerId ) @@ -22,4 +22,4 @@ function destroySynchronizerById(synchronizerId: string): void { } } -export default destroySynchronizerById +export default destroySynchronizer diff --git a/packages/tools/src/store/SynchronizerManager/getSynchronizerById.ts b/packages/tools/src/store/SynchronizerManager/getSynchronizer.ts similarity index 74% rename from packages/tools/src/store/SynchronizerManager/getSynchronizerById.ts rename to packages/tools/src/store/SynchronizerManager/getSynchronizer.ts index e9c92c06cb..4fcdb7a600 100644 --- a/packages/tools/src/store/SynchronizerManager/getSynchronizerById.ts +++ b/packages/tools/src/store/SynchronizerManager/getSynchronizer.ts @@ -6,8 +6,8 @@ import Synchronizer from './Synchronizer' * @param synchronizerId - The id of the synchronizer to be retrieved. * @returns A synchronizer object. */ -function getSynchronizerById(synchronizerId: string): Synchronizer | void { +function getSynchronizer(synchronizerId: string): Synchronizer | void { return state.synchronizers.find((s) => s.id === synchronizerId) } -export default getSynchronizerById +export default getSynchronizer diff --git a/packages/tools/src/store/SynchronizerManager/getSynchronizers.ts b/packages/tools/src/store/SynchronizerManager/getSynchronizersForViewport.ts similarity index 88% rename from packages/tools/src/store/SynchronizerManager/getSynchronizers.ts rename to packages/tools/src/store/SynchronizerManager/getSynchronizersForViewport.ts index 962c56b675..fe7a207ff9 100644 --- a/packages/tools/src/store/SynchronizerManager/getSynchronizers.ts +++ b/packages/tools/src/store/SynchronizerManager/getSynchronizersForViewport.ts @@ -8,9 +8,9 @@ import Synchronizer from './Synchronizer' * @param viewportId - The Id of the viewport * @returns An array of synchronizers */ -function getSynchronizers( - renderingEngineId: string, - viewportId: string +function getSynchronizersForViewport( + viewportId: string, + renderingEngineId: string ): Array { const synchronizersFilteredByIds = [] @@ -36,4 +36,4 @@ function getSynchronizers( return synchronizersFilteredByIds } -export default getSynchronizers +export default getSynchronizersForViewport diff --git a/packages/tools/src/store/SynchronizerManager/index.js b/packages/tools/src/store/SynchronizerManager/index.js index 93a36be663..6de181bba5 100644 --- a/packages/tools/src/store/SynchronizerManager/index.js +++ b/packages/tools/src/store/SynchronizerManager/index.js @@ -1,15 +1,15 @@ import createSynchronizer from './createSynchronizer' import destroy from './destroy' -import getSynchronizers from './getSynchronizers' -import getSynchronizerById from './getSynchronizerById' +import getSynchronizersForViewport from './getSynchronizersForViewport' +import getSynchronizer from './getSynchronizer' import getAllSynchronizers from './getAllSynchronizers' -import destroySynchronizerById from './destroySynchronizerById' +import destroySynchronizer from './destroySynchronizer' export { createSynchronizer, destroy, - getSynchronizerById, - getSynchronizers, + getSynchronizer, + getSynchronizersForViewport, getAllSynchronizers, - destroySynchronizerById, + destroySynchronizer, } diff --git a/packages/tools/src/store/removeEnabledElement.ts b/packages/tools/src/store/removeEnabledElement.ts index 2045b7a929..a66b83c0d3 100644 --- a/packages/tools/src/store/removeEnabledElement.ts +++ b/packages/tools/src/store/removeEnabledElement.ts @@ -19,7 +19,7 @@ import { state } from './state' import getToolsWithModesForElement from '../utilities/getToolsWithModesForElement' import { ToolModes } from '../enums' import { removeAnnotation } from '../stateManagement' -import getSynchronizers from './SynchronizerManager/getSynchronizers' +import getSynchronizersForViewport from './SynchronizerManager/getSynchronizersForViewport' import getToolGroupForViewport from './ToolGroupManager/getToolGroupForViewport' import { annotationRenderingEngine } from '../utilities/triggerAnnotationRender' @@ -72,9 +72,9 @@ function removeEnabledElement( const _removeViewportFromSynchronizers = (element: HTMLElement) => { const enabledElement = getEnabledElement(element) - const synchronizers = getSynchronizers( - enabledElement.renderingEngineId, - enabledElement.viewportId + const synchronizers = getSynchronizersForViewport( + enabledElement.viewportId, + enabledElement.renderingEngineId ) synchronizers.forEach((sync) => { sync.remove(enabledElement) diff --git a/packages/tools/test/synchronizerManager_test.js b/packages/tools/test/synchronizerManager_test.js index 3f437dfef5..d24496ce13 100644 --- a/packages/tools/test/synchronizerManager_test.js +++ b/packages/tools/test/synchronizerManager_test.js @@ -86,7 +86,7 @@ describe('Synchronizer Manager: ', () => { afterEach(function () { // Destroy synchronizer manager to test it first since csTools3D also destroy // synchronizers - SynchronizerManager.destroySynchronizerById(synchronizerId) + SynchronizerManager.destroySynchronizer(synchronizerId) csTools3d.destroy() cache.purgeCache() this.renderingEngine.destroy() @@ -136,15 +136,15 @@ describe('Synchronizer Manager: ', () => { return } - const synchronizers = SynchronizerManager.getSynchronizers( - renderingEngineId, - viewportId1 + const synchronizers = SynchronizerManager.getSynchronizersForViewport( + viewportId1, + renderingEngineId ) expect(synchronizers.length).toBe(1) const synchronizerById = - SynchronizerManager.getSynchronizerById(synchronizerId) + SynchronizerManager.getSynchronizer(synchronizerId) expect(synchronizerById).toBe(synchronizers[0]) From e33740558643476b6996b38a318b6d0d1d8ee32b Mon Sep 17 00:00:00 2001 From: Alireza Date: Mon, 28 Mar 2022 12:37:51 -0400 Subject: [PATCH 5/5] fix flaky tests --- .../helpers/cpuFallback/rendering/generateLut.ts | 4 ++-- .../tools/test/segmentationConfigController_test.js | 2 +- .../tools/test/segmentationRectangleScissor_test.js | 5 +++-- packages/tools/test/segmentationRender_test.js | 13 +++++++------ .../test/segmentationSegmentIndexController_test.js | 3 +-- .../tools/test/segmentationSphereScissor_test.js | 5 +++-- packages/tools/test/segmentationState_test.js | 7 ++++--- .../test/segmentationVisibilityController_test.js | 3 +-- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/packages/core/src/RenderingEngine/helpers/cpuFallback/rendering/generateLut.ts b/packages/core/src/RenderingEngine/helpers/cpuFallback/rendering/generateLut.ts index 5cc83f85d5..aa6c942844 100644 --- a/packages/core/src/RenderingEngine/helpers/cpuFallback/rendering/generateLut.ts +++ b/packages/core/src/RenderingEngine/helpers/cpuFallback/rendering/generateLut.ts @@ -1,4 +1,4 @@ -import getModalityLUT from './getModalityLUT' +import getModalityLut from './getModalityLut' import getVOILUT from './getVOILut' import { IImage, CPUFallbackLUT } from '../../../../types' @@ -36,7 +36,7 @@ export default function ( const lut = image.cachedLut.lutArray - const mlutfn = getModalityLUT(image.slope, image.intercept, modalityLUT) + const mlutfn = getModalityLut(image.slope, image.intercept, modalityLUT) const vlutfn = getVOILUT(windowWidth, windowCenter, voiLUT) if (invert === true) { diff --git a/packages/tools/test/segmentationConfigController_test.js b/packages/tools/test/segmentationConfigController_test.js index 7c23563837..b0df0419fe 100644 --- a/packages/tools/test/segmentationConfigController_test.js +++ b/packages/tools/test/segmentationConfigController_test.js @@ -44,7 +44,7 @@ const renderingEngineId = utilities.uuidv4() const viewportId1 = 'AXIAL' const AXIAL = 'AXIAL' -const TOOL_GROUP_ID = 'segToolGroup' +const TOOL_GROUP_ID = utilities.uuidv4() function createViewport( renderingEngine, diff --git a/packages/tools/test/segmentationRectangleScissor_test.js b/packages/tools/test/segmentationRectangleScissor_test.js index 5021b9e3f6..1210cc8777 100644 --- a/packages/tools/test/segmentationRectangleScissor_test.js +++ b/packages/tools/test/segmentationRectangleScissor_test.js @@ -42,6 +42,7 @@ const { } = utilities.testUtils const renderingEngineId = utilities.uuidv4() +const TOOL_GROUP_ID = utilities.uuidv4() const viewportId1 = 'AXIAL' const viewportId2 = 'SAGITTAL' @@ -85,7 +86,7 @@ describe('Segmentation Tools --', () => { cache.purgeCache() this.DOMElements = [] - this.segToolGroup = ToolGroupManager.createToolGroup('segToolGroup') + this.segToolGroup = ToolGroupManager.createToolGroup(TOOL_GROUP_ID) this.segToolGroup.addTool(SegmentationDisplayTool.toolName) this.segToolGroup.addTool(RectangleScissorsTool.toolName) this.segToolGroup.setToolEnabled(SegmentationDisplayTool.toolName) @@ -108,7 +109,7 @@ describe('Segmentation Tools --', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroup('segToolGroup') + ToolGroupManager.destroyToolGroup(TOOL_GROUP_ID) this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationRender_test.js b/packages/tools/test/segmentationRender_test.js index f996b13bfa..591f91095a 100644 --- a/packages/tools/test/segmentationRender_test.js +++ b/packages/tools/test/segmentationRender_test.js @@ -41,6 +41,7 @@ const { fakeMetaDataProvider, compareImages, fakeVolumeLoader } = utilities.testUtils const renderingEngineId = utilities.uuidv4() +const TOOL_GROUP_ID = utilities.uuidv4() const viewportId1 = 'AXIAL' const viewportId2 = 'SAGITTAL' @@ -87,7 +88,7 @@ describe('Segmentation Render -- ', () => { cache.purgeCache() this.DOMElements = [] - this.segToolGroup = ToolGroupManager.createToolGroup('segToolGroup') + this.segToolGroup = ToolGroupManager.createToolGroup(TOOL_GROUP_ID) this.segToolGroup.addTool(SegmentationDisplayTool.toolName) this.segToolGroup.setToolEnabled(SegmentationDisplayTool.toolName) this.renderingEngine = new RenderingEngine(renderingEngineId) @@ -106,7 +107,7 @@ describe('Segmentation Render -- ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroup('segToolGroup') + ToolGroupManager.destroyToolGroup(TOOL_GROUP_ID) this.DOMElements.forEach((el) => { if (el.parentNode) { @@ -128,7 +129,7 @@ describe('Segmentation Render -- ', () => { const canvas = vp.getCanvas() const image = canvas.toDataURL('image/png') - expect(evt.detail.toolGroupId).toBe('segToolGroup') + expect(evt.detail.toolGroupId).toBe(TOOL_GROUP_ID) compareImages( image, volumeURI_100_100_10_1_1_1_0_SEG_AX, @@ -206,7 +207,7 @@ describe('Segmentation Render -- ', () => { const image2 = canvas2.toDataURL('image/png') const image3 = canvas3.toDataURL('image/png') - expect(evt.detail.toolGroupId).toBe('segToolGroup') + expect(evt.detail.toolGroupId).toBe(TOOL_GROUP_ID) compareImages( image1, volumeURI_100_100_10_1_1_1_0_SEG_AX, @@ -283,7 +284,7 @@ describe('Segmentation Render -- ', () => { const canvas1 = vp1.getCanvas() const image1 = canvas1.toDataURL('image/png') - expect(evt.detail.toolGroupId).toBe('segToolGroup') + expect(evt.detail.toolGroupId).toBe(TOOL_GROUP_ID) compareImages( image1, volumeURI_100_100_10_1_1_1_0_2SEGs_AX, @@ -366,7 +367,7 @@ describe('Segmentation Render -- ', () => { eventTarget.addEventListener(Events.SEGMENTATION_RENDERED, (evt) => { const canvas1 = vp1.getCanvas() const image1 = canvas1.toDataURL('image/png') - expect(evt.detail.toolGroupId).toBe('segToolGroup') + expect(evt.detail.toolGroupId).toBe(TOOL_GROUP_ID) compareImages( image1, diff --git a/packages/tools/test/segmentationSegmentIndexController_test.js b/packages/tools/test/segmentationSegmentIndexController_test.js index 6c99b5ff56..8fe147d2f6 100644 --- a/packages/tools/test/segmentationSegmentIndexController_test.js +++ b/packages/tools/test/segmentationSegmentIndexController_test.js @@ -43,13 +43,12 @@ const { } = utilities.testUtils const renderingEngineId = utilities.uuidv4() +const TOOL_GROUP_ID = utilities.uuidv4() const viewportId1 = 'AXIAL' const AXIAL = 'AXIAL' -const TOOL_GROUP_ID = 'segToolGroup' - function createViewport( renderingEngine, orientation, diff --git a/packages/tools/test/segmentationSphereScissor_test.js b/packages/tools/test/segmentationSphereScissor_test.js index dbf0d3a13d..9f8dce87da 100644 --- a/packages/tools/test/segmentationSphereScissor_test.js +++ b/packages/tools/test/segmentationSphereScissor_test.js @@ -42,6 +42,7 @@ const { } = utilities.testUtils const renderingEngineId = utilities.uuidv4() +const TOOL_GROUP_ID = utilities.uuidv4() const viewportId1 = 'AXIAL' const viewportId2 = 'SAGITTAL' @@ -87,7 +88,7 @@ describe('Segmentation Tools --', () => { cache.purgeCache() this.DOMElements = [] - this.segToolGroup = ToolGroupManager.createToolGroup('segToolGroup') + this.segToolGroup = ToolGroupManager.createToolGroup(TOOL_GROUP_ID) this.segToolGroup.addTool(SegmentationDisplayTool.toolName) this.segToolGroup.addTool(SphereScissorsTool.toolName) this.segToolGroup.setToolEnabled(SegmentationDisplayTool.toolName) @@ -110,7 +111,7 @@ describe('Segmentation Tools --', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroup('segToolGroup') + ToolGroupManager.destroyToolGroup(TOOL_GROUP_ID) this.DOMElements.forEach((el) => { if (el.parentNode) { diff --git a/packages/tools/test/segmentationState_test.js b/packages/tools/test/segmentationState_test.js index 5e281ab58d..323ca3704d 100644 --- a/packages/tools/test/segmentationState_test.js +++ b/packages/tools/test/segmentationState_test.js @@ -35,6 +35,7 @@ const { SegmentationRepresentations } = csToolsEnums const { fakeMetaDataProvider, fakeVolumeLoader } = utilities.testUtils const renderingEngineId = utilities.uuidv4() +const TOOL_GROUP_ID = utilities.uuidv4() const viewportId = 'VIEWPORT' @@ -75,7 +76,7 @@ describe('Segmentation State -- ', () => { cache.purgeCache() this.DOMElements = [] - this.segToolGroup = ToolGroupManager.createToolGroup('segToolGroup') + this.segToolGroup = ToolGroupManager.createToolGroup(TOOL_GROUP_ID) this.segToolGroup.addTool(SegmentationDisplayTool.toolName) this.segToolGroup.setToolEnabled(SegmentationDisplayTool.toolName) this.renderingEngine = new RenderingEngine(renderingEngineId) @@ -94,7 +95,7 @@ describe('Segmentation State -- ', () => { this.renderingEngine.destroy() metaData.removeProvider(fakeMetaDataProvider) unregisterAllImageLoaders() - ToolGroupManager.destroyToolGroup('segToolGroup') + ToolGroupManager.destroyToolGroup(TOOL_GROUP_ID) this.DOMElements.forEach((el) => { if (el.parentNode) { @@ -131,7 +132,7 @@ describe('Segmentation State -- ', () => { const state = stateManager.getState() - expect(evt.detail.toolGroupId).toBe('segToolGroup') + expect(evt.detail.toolGroupId).toBe(TOOL_GROUP_ID) expect(state).toBeDefined() expect(state.toolGroups).toBeDefined() diff --git a/packages/tools/test/segmentationVisibilityController_test.js b/packages/tools/test/segmentationVisibilityController_test.js index 5fec604ba3..baae83d8b6 100644 --- a/packages/tools/test/segmentationVisibilityController_test.js +++ b/packages/tools/test/segmentationVisibilityController_test.js @@ -39,13 +39,12 @@ const { fakeVolumeLoader, fakeMetaDataProvider, compareImages } = utilities.testUtils const renderingEngineId = utilities.uuidv4() +const TOOL_GROUP_ID = utilities.uuidv4() const viewportId1 = 'AXIAL' const AXIAL = 'AXIAL' -const TOOL_GROUP_ID = 'segToolGroup' - function createViewport( renderingEngine, orientation,