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

LT-40: Recalculating text call-outs position when creating measurments without dragging

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-11-25 11:20:12 -02:00
parent 8df077f046
commit 888c337f84
4 changed files with 119 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Packages/ohif-core/client/lib/cornerstone.js
View File

@ -28,7 +28,12 @@ OHIF.cornerstone.pixelToPage = (element, position) => {
return result;
};
OHIF.cornerstone.repositionTextBoxWhileDragging = (eventData, measurementData) => {
OHIF.cornerstone.repositionTextBox = (eventData, measurementData) => {
// Stop here if it's not a measurement creating
if (!measurementData.isCreating) {
return;
}
const element = eventData.element;
const enabledElement = cornerstone.getEnabledElement(element);
const $element = $(element);
@ -96,7 +101,6 @@ OHIF.cornerstone.repositionTextBoxWhileDragging = (eventData, measurementData) =
};
};
const modifiedCallback = () => {
const handles = measurementData.handles;
const textBox = handles.textBox;
@ -205,15 +209,3 @@ OHIF.cornerstone.repositionTextBoxWhileDragging = (eventData, measurementData) =
textBox[toolAxis] = pixelPosition[toolAxis];
}
};
const mouseUpCallback = () => {
$element.off('CornerstoneToolsMeasurementModified', modifiedCallback);
};
$element.one('CornerstoneToolsMouseDrag', () => {
$element.on('CornerstoneToolsMeasurementModified', modifiedCallback);
});
// Using mouseup because sometimes the CornerstoneToolsMouseUp event is not triggered
$element.one('mouseup', mouseUpCallback);
};

5
Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js
View File

@ -44,6 +44,7 @@ import { OHIF } from 'meteor/ohif:core';
function createNewMeasurement(mouseEventData) {
// Create the measurement data for this tool with the end handle activated
const measurementData = {
isCreating: true,
visible: true,
active: true,
handles: {
@ -99,8 +100,6 @@ import { OHIF } from 'meteor/ohif:core';
toolType: 'bidirectional'
};
OHIF.cornerstone.repositionTextBoxWhileDragging(mouseEventData, measurementData);
return measurementData;
}
@ -1040,6 +1039,8 @@ import { OHIF } from 'meteor/ohif:core';
data.handles.textBox.boundingBox = boundingBox;
OHIF.cornerstone.repositionTextBox(eventData, data);
// Draw linked line as dashed
var link = {
start: {},

7
Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
View File

@ -38,6 +38,8 @@ import { toolManager } from 'meteor/ohif:viewerbase';
return;
}
delete measurementData.isCreating;
OHIF.ui.showFormDialog('dialogNonTargetMeasurement', {
position: getPosition(eventData),
title: 'Select Lesion Location',
@ -142,6 +144,7 @@ import { toolManager } from 'meteor/ohif:viewerbase';
// create the measurement data for this tool with the end handle activated
var measurementData = {
isCreating: true,
visible: true,
active: true,
handles: {
@ -178,8 +181,6 @@ import { toolManager } from 'meteor/ohif:viewerbase';
toolType: 'nonTarget'
};
OHIF.cornerstone.repositionTextBoxWhileDragging(mouseEventData, measurementData);
return measurementData;
}
///////// END ACTIVE TOOL ///////
@ -255,6 +256,8 @@ import { toolManager } from 'meteor/ohif:viewerbase';
var boundingBox = cornerstoneTools.drawTextBox(context, 'Non-Target ' + data.measurementNumber, canvasTextLocation.x, canvasTextLocation.y, color);
data.handles.textBox.boundingBox = boundingBox;
OHIF.cornerstone.repositionTextBox(eventData, data);
// Draw linked line as dashed
var link = {
start: {},

2
Packages/ohif-lesiontracker/client/components/measurementLocationDialog/measurementLocationDialog.js
View File

@ -40,6 +40,8 @@ Template.measurementLocationDialog.onCreated(() => {
const timepointApi = instance.data.timepointApi;
const toggleLabel = (measurementData, eventData, doneCallback) => {
delete measurementData.isCreating;
if (OHIF.lesiontracker.removeMeasurementIfInvalid(measurementData, eventData)) {
return;
}