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

Fix the pixel spacing issue with bidirectional tool

Browse Source
This commit is contained in:
Evren Ozkan 2018-04-04 18:08:01 -04:00
parent 2bd1db7710
commit b6092ca759
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,20 @@ export default function(mouseEventData) {
const { element } = mouseEventData; const { element } = mouseEventData;
const $element = $(element); const $element = $(element);
const imagePlane = cornerstone.metaData.get('imagePlaneModule', mouseEventData.image.imageId);
let rowPixelSpacing;
let colPixelSpacing;
if (imagePlane) {
rowPixelSpacing = imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing;
colPixelSpacing = imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing;
} else {
rowPixelSpacing = mouseEventData.image.rowPixelSpacing;
colPixelSpacing = mouseEventData.image.columnPixelSpacing;
}
// LT-29 Disable Target Measurements when pixel spacing is not available // LT-29 Disable Target Measurements when pixel spacing is not available
if (!mouseEventData.image.rowPixelSpacing || !mouseEventData.image.columnPixelSpacing) { if (!rowPixelSpacing || !colPixelSpacing) {
return; return;
} }

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

@ -11,12 +11,25 @@ export default function(event) {
const { element, canvasContext } = eventData; const { element, canvasContext } = eventData;
// if we have no toolData for this element, return immediately as there is nothing to do // if we have no toolData for this element, return immediately as there is nothing to do
const toolData = cornerstoneTools.getToolState(event.currentTarget, toolType); const toolData = cornerstoneTools.getToolState(element, toolType);
if (!toolData) return; if (!toolData) return;
const imagePlane = cornerstone.metaData.get('imagePlaneModule', eventData.image.imageId);
let rowPixelSpacing;
let colPixelSpacing;
if (imagePlane) {
rowPixelSpacing = imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing;
colPixelSpacing = imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing;
} else {
rowPixelSpacing = eventData.image.rowPixelSpacing;
colPixelSpacing = eventData.image.columnPixelSpacing;
}
// LT-29 Disable Target Measurements when pixel spacing is not available // LT-29 Disable Target Measurements when pixel spacing is not available
const { rowPixelSpacing, columnPixelSpacing } = eventData.image; if (!rowPixelSpacing || !colPixelSpacing) {
if (!rowPixelSpacing || !columnPixelSpacing) return; return;
}
// we have tool data for this element - iterate over each one and draw it // we have tool data for this element - iterate over each one and draw it
const context = canvasContext.canvas.getContext('2d'); const context = canvasContext.canvas.getContext('2d');
@ -72,12 +85,12 @@ export default function(event) {
drawSelectedMarker(eventData, data.handles, '#FF9999'); drawSelectedMarker(eventData, data.handles, '#FF9999');
// Calculate the long axis length // Calculate the long axis length
const dx = (start.x - end.x) * (columnPixelSpacing || 1); const dx = (start.x - end.x) * (colPixelSpacing || 1);
const dy = (start.y - end.y) * (rowPixelSpacing || 1); const dy = (start.y - end.y) * (rowPixelSpacing || 1);
let length = Math.sqrt(dx * dx + dy * dy); let length = Math.sqrt(dx * dx + dy * dy);
// Calculate the short axis length // Calculate the short axis length
const wx = (perpendicularStart.x - perpendicularEnd.x) * (columnPixelSpacing || 1); const wx = (perpendicularStart.x - perpendicularEnd.x) * (colPixelSpacing || 1);
const wy = (perpendicularStart.y - perpendicularEnd.y) * (rowPixelSpacing || 1); const wy = (perpendicularStart.y - perpendicularEnd.y) * (rowPixelSpacing || 1);
let width = Math.sqrt(wx * wx + wy * wy); let width = Math.sqrt(wx * wx + wy * wy);
if (!width) { if (!width) {
@ -95,7 +108,7 @@ export default function(event) {
if (data.measurementNumber) { if (data.measurementNumber) {
// Draw the textbox // Draw the textbox
let suffix = ' mm'; let suffix = ' mm';
if (!rowPixelSpacing || !columnPixelSpacing) { if (!rowPixelSpacing || !colPixelSpacing) {
suffix = ' pixels'; suffix = ' pixels';
} }