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

Refator in ToolManager

Browse Source
This commit is contained in:
Gustavo Lelis 2018-08-22 15:54:28 -03:00
parent 5865f542f8
commit 01739fa70a
1 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Packages/ohif-viewerbase/client/lib/toolManager.js
View File

@ -1,26 +1,21 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session'; import { Session } from 'meteor/session';
import { Random } from 'meteor/random'; import { Random } from 'meteor/random';
import { $ } from 'meteor/jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone'; import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone';
import { getFrameOfReferenceUID } from './getFrameOfReferenceUID';
import { updateCrosshairsSynchronizer } from './updateCrosshairsSynchronizer';
import { crosshairsSynchronizers } from './crosshairsSynchronizers';
import { annotateTextUtils } from './annotateTextUtils';
import { textMarkerUtils } from './textMarkerUtils';
import { isTouchDevice } from './helpers/isTouchDevice';
let activeTool;
let tools = [];
let initialized = false;
let defaultTool = { let defaultTool = {
left: 'wwwc', left: 'wwwc',
right: 'zoom', right: 'zoom',
middle: 'pan' middle: 'pan'
}; };
let activeTool; const buttonNum = {
'left': 1,
let tools = []; 'right': 4,
'middle': 2
let initialized = false; };
/** /**
* Exported "toolManager" Singleton * Exported "toolManager" Singleton
@ -68,6 +63,10 @@ export const toolManager = {
return Object.keys(object).filter(key => object[key] === value); return Object.keys(object).filter(key => object[key] === value);
}, },
getMouseButtonMask(button) {
return buttonNum[button] || undefined;
},
configureLoadProcess() { configureLoadProcess() {
// Whenever CornerstoneImageLoadProgress is fired, identify which viewports // Whenever CornerstoneImageLoadProgress is fired, identify which viewports
// the "in-progress" image is to be displayed in. Then pass the percent complete // the "in-progress" image is to be displayed in. Then pass the percent complete
@ -92,12 +91,20 @@ export const toolManager = {
return tools; return tools;
}, },
setActiveTool(toolName, button = 1) { setActiveTool(toolName, button = 'left') {
let options = {};
const mouseButtonMask = toolManager.getMouseButtonMask(button);
if (mouseButtonMask) {
options = {
mouseButtonMask
}
}
toolManager.setAllToolsPassive(); toolManager.setAllToolsPassive();
toolManager.cTools.setToolActive(toolName, { mouseButtonMask: button }); toolManager.cTools.setToolActive(toolName, options);
// TODO: add the active tool with the correct button // TODO: add the active tool with the correct button
activeTool['left'] = toolName; activeTool[button] = toolName;
// Enable reactivity // Enable reactivity
Session.set('ToolManagerActiveToolUpdated', Random.id()); Session.set('ToolManagerActiveToolUpdated', Random.id());
@ -119,11 +126,11 @@ export const toolManager = {
toolManager.setAllToolsPassive(); toolManager.setAllToolsPassive();
}, },
getNearbyToolData(element, coords, toolTypes) { getNearbyToolData() {
return undefined; return undefined;
}, },
getActiveTool(button) { getActiveTool(button = 'left') {
if (!initialized) { if (!initialized) {
toolManager.init(); toolManager.init();
} }
@ -133,29 +140,14 @@ export const toolManager = {
activeTool = defaultTool; activeTool = defaultTool;
} }
// If button is not defined, we should consider it left
if (!button) {
button = 'left';
}
return activeTool[button]; return activeTool[button];
}, },
setDefaultTool(tool, button) { setDefaultTool(tool, button = 'left') {
// If button is not defined, we should consider it left
if (!button) {
button = 'left';
}
defaultTool[button] = tool; defaultTool[button] = tool;
}, },
getDefaultTool(button) { getDefaultTool(button = 'left') {
// If button is not defined, we should consider it left
if (!button) {
button = 'left';
}
return defaultTool[button]; return defaultTool[button];
}, },