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

fix(bidirectional-tool): Prevent NaN values when using bidirectional tool.

Browse Source
This commit is contained in:
Bruno Alves de Faria 2018-08-22 09:36:38 -03:00 committed by Erik Ziegler
parent 938ce69ce0
commit 3a20f1ecaf
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,10 +65,16 @@ export default function(event) {
color = cornerstoneTools.toolColors.getToolColor(); color = cornerstoneTools.toolColors.getToolColor();
} }
// draw the line // Update the perpendicular handles to draw it correctly
const handleStartCanvas = cornerstone.pixelToCanvas(element, start); updatePerpendicularLineHandles(eventData, data);
const handleEndCanvas = cornerstone.pixelToCanvas(element, end);
const canvasTextLocation = cornerstone.pixelToCanvas(element, textBox); // Draw the line
const { pixelToCanvas } = cornerstone;
const handleStartCanvas = pixelToCanvas(element, start);
const handleEndCanvas = pixelToCanvas(element, end);
const handlePerpendicularStartCanvas = pixelToCanvas(element, perpendicularStart);
const handlePerpendicularEndCanvas = pixelToCanvas(element, perpendicularEnd);
const canvasTextLocation = pixelToCanvas(element, textBox);
context.beginPath(); context.beginPath();
context.strokeStyle = color; context.strokeStyle = color;
@ -78,7 +84,6 @@ export default function(event) {
context.stroke(); context.stroke();
// Draw perpendicular line // Draw perpendicular line
updatePerpendicularLineHandles(eventData, data);
drawPerpendicularLine(context, element, data, color, strokeWidth); drawPerpendicularLine(context, element, data, color, strokeWidth);
// Draw the handles // Draw the handles
@ -144,7 +149,29 @@ export default function(event) {
y: (handleStartCanvas.y + handleEndCanvas.y) / 2, y: (handleStartCanvas.y + handleEndCanvas.y) / 2,
}; };
const points = [ handleStartCanvas, handleEndCanvas, midpointCanvas ]; // Check if the perpendicular line has some length (start and end are not equal)
// Note: this check is needed to prevent NaN value on the intersection result
const { distance } = cornerstoneMath.point;
const lineHasLength = distance(perpendicularLine.start, perpendicularLine.end) > 0;
// Define the lines intersection point
let linesIntersection;
if (lineHasLength) {
// As the line has length, define it as the intersection between the lines
const { intersectLine } = cornerstoneMath.lineSegment;
linesIntersection = intersectLine(longLine, perpendicularLine);
} else {
// As the line has no length, the tool is in its start position
linesIntersection = longLine.start;
}
const points = [
handleStartCanvas,
handleEndCanvas,
handlePerpendicularStartCanvas,
handlePerpendicularEndCanvas,
linesIntersection
];
link.end.x = canvasTextLocation.x; link.end.x = canvasTextLocation.x;
link.end.y = canvasTextLocation.y; link.end.y = canvasTextLocation.y;

2
Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementRemoved.js
View File

@ -30,7 +30,7 @@ export default function({ instance, eventData, tool, toolGroupId, toolGroup }) {
measurementApi.sortMeasurements(baseline.timepointId); measurementApi.sortMeasurements(baseline.timepointId);
// Repaint the images on all viewports without the removed measurements // Repaint the images on all viewports without the removed measurements
_.each($('.imageViewerViewport'), element => cornerstone.updateImage(element)); _.each($('.imageViewerViewport:not(.empty)'), element => cornerstone.updateImage(element));
// Notify that viewer suffered changes // Notify that viewer suffered changes
if (tool.toolGroup !== 'temp') { if (tool.toolGroup !== 'temp') {