TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LT-307 Reducing the amount of image redraws on tool activation from 52 to 44 (15% improvement)

Browse Source
This commit is contained in:
Emanuel F. Oliveira 2016-11-11 22:22:57 -02:00 committed by Erik Ziegler
parent debc294f33
commit 42c938fb44
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Packages/ohif-lesiontracker/client/tools.js
View File

@ -34,14 +34,23 @@ Meteor.startup(function() {
touch: cornerstoneTools.exToolTouch touch: cornerstoneTools.exToolTouch
}); });
let states = toolManager.getToolDefaultStates(); // Update default state for tools making sure each tool is only inserted once
states.deactivate.push('bidirectional'); let currentDefaultStates = toolManager.getToolDefaultStates();
states.deactivate.push('nonTarget'); let newDefaultStates = {
states.deactivate.push('length'); deactivate: ['bidirectional', 'nonTarget', 'length', 'crTool', 'unTool', 'exTool'],
states.deactivate.push('crTool'); activate: ['deleteLesionKeyboardTool']
states.deactivate.push('unTool'); };
states.deactivate.push('exTool');
for (let state in newDefaultStates) {
newDefaultStates[state].forEach(function(tool) {
let tools = currentDefaultStates[state];
// make sure each tool is only inserted once
if (tools && tools.indexOf(tool) < 0) {
tools.push(tool);
}
});
}
toolManager.setToolDefaultStates(currentDefaultStates);
states.activate.push('deleteLesionKeyboardTool');
toolManager.setToolDefaultStates(states);
}); });

16
Packages/ohif-viewerbase/lib/toolManager.js
View File

@ -171,7 +171,7 @@ toolManager = {
// First, deactivate the current active tool // First, deactivate the current active tool
tools[activeTool].mouse.deactivate(element, 1); tools[activeTool].mouse.deactivate(element, 1);
 
if (tools[activeTool].touch) { if (tools[activeTool].touch) {
tools[activeTool].touch.deactivate(element); tools[activeTool].touch.deactivate(element);
} }
@ -182,15 +182,15 @@ toolManager = {
if (!relevantTools || !relevantTools.length || action === 'disabledToolButtons') { if (!relevantTools || !relevantTools.length || action === 'disabledToolButtons') {
return; return;
} }
relevantTools.forEach(function(toolType) { relevantTools.forEach(function(toolType) {
if ((action === 'activate') || // the currently active tool has already been deactivated and can be skipped
(action === 'deactivate')) { if (action === 'deactivate' && toolType === activeTool) {
tools[toolType].mouse[action](element, 1); return;
} else {
tools[toolType].mouse[action](element);
} }
tools[toolType].mouse[action](
element,
(action === 'activate' || action === 'deactivate' ? 1 : void 0)
);
tools[toolType].touch[action](element); tools[toolType].touch[action](element);
}); });
}); });