diff --git a/LesionTracker/client/components/init.js b/LesionTracker/client/components/init.js index 9229f0a13..dc2be965e 100644 --- a/LesionTracker/client/components/init.js +++ b/LesionTracker/client/components/init.js @@ -10,7 +10,8 @@ Meteor.startup(function() { }); toolManager.addTool('scaleOverlayTool', { - mouse: cornerstoneTools.scaleOverlayTool + mouse: cornerstoneTools.scaleOverlayTool, + touch: cornerstoneTools.scaleOverlayTool }); toolManager.addTool('deleteLesionKeyboardTool', { @@ -23,5 +24,7 @@ Meteor.startup(function() { states.deactivate.push('nonTarget'); states.activate.push('deleteLesionKeyboardTool'); + + states.enable.push('scaleOverlayTool'); toolManager.setToolDefaultStates(states); }); \ No newline at end of file diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js index 07362ad58..e31996a7f 100644 --- a/LesionTracker/client/components/viewer.js +++ b/LesionTracker/client/components/viewer.js @@ -46,23 +46,8 @@ Template.viewer.onCreated(function() { }, nonTarget: function() { toolManager.setActiveTool("nonTarget"); - }, - scaleOverlayTool: function() { - - // scaleOverlayToolShown property checks visibility of scale overlay tool between tabs - if(ViewerData[contentId].scaleOverlayToolShown === true) { - $('.imageViewerViewport').each(function(index, element) { - cornerstoneTools.scaleOverlayTool.disable(element); - }); - ViewerData[contentId].scaleOverlayToolShown = false; - - }else{ - $('.imageViewerViewport').each(function(index, element) { - cornerstoneTools.scaleOverlayTool.enable(element); - }); - ViewerData[contentId].scaleOverlayToolShown = true; - } } + }; // The hotkey can also be an array (e.g. ["NUMPAD0", "0"]) diff --git a/LesionTracker/client/components/viewerMain/viewerMain.js b/LesionTracker/client/components/viewerMain/viewerMain.js index 412d97788..e198e784f 100644 --- a/LesionTracker/client/components/viewerMain/viewerMain.js +++ b/LesionTracker/client/components/viewerMain/viewerMain.js @@ -39,13 +39,6 @@ Template.viewerMain.helpers({ iconClasses: 'fa fa-bars' }); - buttonData.push({ - id: 'scaleOverlayTool', - title: 'Scale Overlay', - classes: 'imageViewerCommand', - iconClasses: 'fa fa-arrows-h' - }); - buttonData.push({ id: 'length', title: 'Length Measurement', diff --git a/Packages/lesiontracker/lib/clearTools.js b/Packages/lesiontracker/lib/clearTools.js index 7f38768b0..4d178f717 100644 --- a/Packages/lesiontracker/lib/clearTools.js +++ b/Packages/lesiontracker/lib/clearTools.js @@ -1,6 +1,6 @@ clearTools = function() { var patientId = Session.get("patientId"); - var toolTypes = ["lesion", "nonTarget", "biDirectional"]; + var toolTypes = ["lesion", "nonTarget"]; var toolState = cornerstoneTools.globalImageIdSpecificToolStateManager.toolState; var toolStateKeys = Object.keys(toolState).slice(0); diff --git a/Packages/lesiontracker/lib/toggleLesionTrackerTools.js b/Packages/lesiontracker/lib/toggleLesionTrackerTools.js index 2c0a18fab..c1259899d 100644 --- a/Packages/lesiontracker/lib/toggleLesionTrackerTools.js +++ b/Packages/lesiontracker/lib/toggleLesionTrackerTools.js @@ -18,7 +18,7 @@ toggleLesionTrackerTools = function() { activate: ['deleteLesionKeyboardTool'], deactivate: [], enable: [], - disable: ['lesion', 'nonTarget'] + disable: ['lesion', 'nonTarget', 'scaleOverlayTool'] }; toolManager.setToolDefaultStates(toolDefaultStates);