From 6c950a9669f7fbf3c46e48679fa26ee514824156 Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Fri, 21 Feb 2020 16:27:32 -0300 Subject: [PATCH 1/5] fix: Remove Eraser and ROI Window --- extensions/cornerstone/src/init.js | 15 +++++++++------ extensions/cornerstone/src/toolbarModule.js | 20 +------------------- platform/ui/src/elements/Icon/getIcon.js | 4 ---- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/extensions/cornerstone/src/init.js b/extensions/cornerstone/src/init.js index b9764f41e..1aef6b8db 100644 --- a/extensions/cornerstone/src/init.js +++ b/extensions/cornerstone/src/init.js @@ -18,7 +18,7 @@ function fallbackMetaDataProvider(type, imageId) { const wadoRoot = window.store.getState().servers.servers[0].wadoRoot; const wadoRsImageId = `wadors:${wadoRoot}/studies/${qs.studyUID}/series/${ qs.seriesUID - }/instances/${qs.objectUID}/frames/${qs.frame || 1}`; + }/instances/${qs.objectUID}/frames/${qs.frame || 1}`; return cornerstone.metaData.get(type, wadoRsImageId); } @@ -81,7 +81,6 @@ export default function init({ servicesManager, configuration }) { touch: [csTools.PanMultiTouchTool, csTools.ZoomTouchPinchTool], annotations: [ csTools.ArrowAnnotateTool, - csTools.EraserTool, csTools.BidirectionalTool, csTools.LengthTool, csTools.AngleTool, @@ -95,7 +94,6 @@ export default function init({ servicesManager, configuration }) { csTools.PanTool, csTools.ZoomTool, csTools.WwwcTool, - csTools.WwwcRegionTool, csTools.MagnifyTool, csTools.StackScrollTool, csTools.StackScrollMouseWheelTool, @@ -189,7 +187,9 @@ export default function init({ servicesManager, configuration }) { const _initMeasurementService = measurementService => { /* Initialization */ - const { toAnnotation, toMeasurement } = measurementServiceMappingsFactory(measurementService); + const { toAnnotation, toMeasurement } = measurementServiceMappingsFactory( + measurementService + ); const csToolsVer4MeasurementSource = measurementService.createSource( 'CornerstoneTools', '4' @@ -214,7 +214,9 @@ const _initMeasurementService = measurementService => { }; const _connectToolsToMeasurementService = measurementService => { - const csToolsVer4MeasurementSource = _initMeasurementService(measurementService); + const csToolsVer4MeasurementSource = _initMeasurementService( + measurementService + ); const { id: sourceId, addOrUpdate, @@ -242,7 +244,8 @@ const _connectToolsToMeasurementService = measurementService => { ); console.log('Mapped annotation:', annotation); } - }); + } + ); measurementService.subscribe( MEASUREMENT_UPDATED, diff --git a/extensions/cornerstone/src/toolbarModule.js b/extensions/cornerstone/src/toolbarModule.js index 283d2e926..199891c20 100644 --- a/extensions/cornerstone/src/toolbarModule.js +++ b/extensions/cornerstone/src/toolbarModule.js @@ -130,15 +130,6 @@ const definitions = [ commandName: 'setToolActive', commandOptions: { toolName: 'Magnify' }, }, - { - id: 'WwwcRegion', - label: 'ROI Window', - icon: 'stop', - // - type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE, - commandName: 'setToolActive', - commandOptions: { toolName: 'WwwcRegion' }, - }, { id: 'DragProbe', label: 'Probe', @@ -215,15 +206,6 @@ const definitions = [ commandName: 'setToolActive', commandOptions: { toolName: 'Bidirectional' }, }, - { - id: 'Eraser', - label: 'Eraser', - icon: 'eraser', - // - type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE, - commandName: 'setToolActive', - commandOptions: { toolName: 'Eraser' }, - }, { id: 'Download', label: 'Download', @@ -245,7 +227,7 @@ const definitions = [ type: TOOLBAR_BUTTON_TYPES.COMMAND, commandName: 'setCornerstoneLayout', context: 'ACTIVE_VIEWPORT::VTK', - } + }, ]; export default { diff --git a/platform/ui/src/elements/Icon/getIcon.js b/platform/ui/src/elements/Icon/getIcon.js index 8ed965221..9a4bc8370 100644 --- a/platform/ui/src/elements/Icon/getIcon.js +++ b/platform/ui/src/elements/Icon/getIcon.js @@ -30,7 +30,6 @@ import edit from './icons/edit.svg'; import ellipseCircle from './icons/ellipse-circle.svg'; import ellipseH from './icons/ellipse-h.svg'; import ellipseV from './icons/ellipse-v.svg'; -import eraser from './icons/eraser.svg'; import exclamationCircle from './icons/exclamation-circle.svg'; import exclamationTriangle from './icons/exclamation-triangle.svg'; import fastBackward from './icons/fast-backward.svg'; @@ -73,7 +72,6 @@ import squareO from './icons/square-o.svg'; import star from './icons/star.svg'; import stepBackward from './icons/step-backward.svg'; import stepForward from './icons/step-forward.svg'; -import stop from './icons/stop.svg'; import sun from './icons/sun.svg'; import th from './icons/th.svg'; import thLarge from './icons/th-large.svg'; @@ -114,7 +112,6 @@ const ICONS = { 'create-comment': createComment, 'create-screen-capture': createScreenCapture, edit, - eraser, 'fast-backward': fastBackward, 'fast-forward': fastForward, 'object-group': objectGroup, @@ -134,7 +131,6 @@ const ICONS = { 'lock-alt': lockAlt, 'step-backward': stepBackward, 'step-forward': stepForward, - stop, 'th-large': thLarge, 'th-list': thList, sun, From 2910d38668bbef6699f4250c7ca70bcf297c001d Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Fri, 21 Feb 2020 16:56:30 -0300 Subject: [PATCH 2/5] Remove E2E test for Eraser tool --- .../common/OHIFCornerstoneToolbar.spec.js | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/platform/viewer/cypress/integration/common/OHIFCornerstoneToolbar.spec.js b/platform/viewer/cypress/integration/common/OHIFCornerstoneToolbar.spec.js index b4c624a08..4f487f921 100644 --- a/platform/viewer/cypress/integration/common/OHIFCornerstoneToolbar.spec.js +++ b/platform/viewer/cypress/integration/common/OHIFCornerstoneToolbar.spec.js @@ -421,44 +421,6 @@ describe('OHIF Cornerstone Toolbar', () => { }); }); - it('checks if Eraser tool will remove the measurements added in the viewport', () => { - //Add measurements in the viewport - cy.addLengthMeasurement(); - cy.addAngleMeasurement(); - - //Verify if measurement annotation was added into the measurements panel - cy.get('@measurementsBtn').click(); - cy.get('.measurementItem') - .its('length') - .should('be.eq', 2); - cy.get('@measurementsBtn') - .click() - .wait(2000); - //cy.isNotInViewport('@measurementsPanel'); //TO DO: check this intermittent behaviour - - //Click More button - cy.get('@moreBtn').click(); - //Verify if overlay is displayed - cy.get('.tooltip-toolbar-overlay') - .should('be.visible') - .then(() => { - //Click Eraser button - cy.get('[data-cy="eraser"]').click({ force: true }); - }); - - //Erase measurement #1 and Verify if it was removed from the measurements panel - const [x1, y1] = [150, 100]; - cy.get('@viewport').click(x1, y1, { force: true }); - cy.get('.measurementItem') - .its('length') - .should('be.eq', 1); - - //Erase measurement #2 and Verify if it was removed from the measurements panel - const [x2, y2] = [180, 390]; - cy.get('@viewport').click(x2, y2, { force: true }); - cy.get('.measurementItem').should('not.exist'); - }); - it('check if Invert tool will change the colors of the image in the viewport', () => { // Click on More button cy.get('@moreBtn').click(); From d0340062949b18beb1f631f3bd15cf153415aba5 Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Wed, 4 Mar 2020 12:13:14 -0300 Subject: [PATCH 3/5] unremove ROI Window --- extensions/cornerstone/src/toolbarModule.js | 9 +++++++++ platform/ui/src/elements/Icon/getIcon.js | 2 ++ 2 files changed, 11 insertions(+) diff --git a/extensions/cornerstone/src/toolbarModule.js b/extensions/cornerstone/src/toolbarModule.js index 199891c20..801466f9b 100644 --- a/extensions/cornerstone/src/toolbarModule.js +++ b/extensions/cornerstone/src/toolbarModule.js @@ -130,6 +130,15 @@ const definitions = [ commandName: 'setToolActive', commandOptions: { toolName: 'Magnify' }, }, + { + id: 'WwwcRegion', + label: 'ROI Window', + icon: 'stop', + // + type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE, + commandName: 'setToolActive', + commandOptions: { toolName: 'WwwcRegion' }, + }, { id: 'DragProbe', label: 'Probe', diff --git a/platform/ui/src/elements/Icon/getIcon.js b/platform/ui/src/elements/Icon/getIcon.js index 9a4bc8370..010af637c 100644 --- a/platform/ui/src/elements/Icon/getIcon.js +++ b/platform/ui/src/elements/Icon/getIcon.js @@ -34,6 +34,7 @@ import exclamationCircle from './icons/exclamation-circle.svg'; import exclamationTriangle from './icons/exclamation-triangle.svg'; import fastBackward from './icons/fast-backward.svg'; import fastForward from './icons/fast-forward.svg'; +import stop from './icons/stop.svg'; import info from './icons/info.svg'; import inlineEdit from './icons/inline-edit.svg'; import level from './icons/level.svg'; @@ -131,6 +132,7 @@ const ICONS = { 'lock-alt': lockAlt, 'step-backward': stepBackward, 'step-forward': stepForward, + stop, 'th-large': thLarge, 'th-list': thList, sun, From e16088960503bb07a08623585200845bb7fee1df Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Wed, 4 Mar 2020 12:56:04 -0300 Subject: [PATCH 4/5] add ROI Window --- extensions/cornerstone/src/init.js | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/cornerstone/src/init.js b/extensions/cornerstone/src/init.js index 1aef6b8db..e678f5292 100644 --- a/extensions/cornerstone/src/init.js +++ b/extensions/cornerstone/src/init.js @@ -95,6 +95,7 @@ export default function init({ servicesManager, configuration }) { csTools.ZoomTool, csTools.WwwcTool, csTools.MagnifyTool, + csTools.WwwcRegionTool, csTools.StackScrollTool, csTools.StackScrollMouseWheelTool, csTools.OverlayTool, From b880663818ccd0efe5097fbc6cc88b54a3475d8b Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Wed, 4 Mar 2020 12:57:27 -0300 Subject: [PATCH 5/5] add ROI Window --- extensions/cornerstone/src/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/cornerstone/src/init.js b/extensions/cornerstone/src/init.js index e678f5292..4f35f8b35 100644 --- a/extensions/cornerstone/src/init.js +++ b/extensions/cornerstone/src/init.js @@ -94,8 +94,8 @@ export default function init({ servicesManager, configuration }) { csTools.PanTool, csTools.ZoomTool, csTools.WwwcTool, - csTools.MagnifyTool, csTools.WwwcRegionTool, + csTools.MagnifyTool, csTools.StackScrollTool, csTools.StackScrollMouseWheelTool, csTools.OverlayTool,