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

LT-28: Bug fixing: scale overlay tool position is set while moving the image

Browse Source
This commit is contained in:
Aysel Afsar 2016-01-07 11:03:13 -05:00
parent d87f436ada
commit e80af970aa
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Packages/lesiontracker/client/compatibility/scaleOverlayTool.js
View File

@ -199,8 +199,8 @@
canvasBounds = { canvasBounds = {
left: canvasBounds.left + hReduction, left: canvasBounds.left + hReduction,
top: canvasBounds.top + vReduction, top: canvasBounds.top + vReduction,
right: canvasBounds.left + hReduction + canvasBounds.width - 2 * hReduction, right: (canvasBounds.left + hReduction) + (canvasBounds.width - 2 * hReduction),
bottom: canvasBounds.top + vReduction + canvasBounds.height - 2 * vReduction, bottom: (canvasBounds.top + vReduction) + (canvasBounds.height - 2 * vReduction),
width: canvasBounds.width - 2 * hReduction, width: canvasBounds.width - 2 * hReduction,
height: canvasBounds.height - 2 * vReduction height: canvasBounds.height - 2 * vReduction
}; };
@ -220,8 +220,8 @@
imageBounds = { imageBounds = {
left: imageBounds.left + hReduction, left: imageBounds.left + hReduction,
top: imageBounds.top + vReduction, top: imageBounds.top + vReduction,
right: imageBounds.left + hReduction + imageBounds.width - 2 * hReduction, right: (imageBounds.left + hReduction) + (imageBounds.width - 2 * hReduction),
bottom: imageBounds.top + vReduction + imageBounds.height - 2 * vReduction, bottom: (imageBounds.top + vReduction) + (imageBounds.height - 2 * vReduction),
width: imageBounds.width - 2 * hReduction, width: imageBounds.width - 2 * hReduction,
height: imageBounds.height - 2 * vReduction height: imageBounds.height - 2 * vReduction
@ -234,8 +234,8 @@
function getStartPointOfImage(eventData, canvasSize, imageSize) { function getStartPointOfImage(eventData, canvasSize, imageSize) {
// TODO: Start point must come from cornerstone! // TODO: Start point must come from cornerstone!
var startPoint= {}; var startPoint= {};
startPoint.x = (canvasSize.width - imageSize.width) / 2 + eventData.enabledElement.viewport.translation.x; startPoint.x = (canvasSize.width - imageSize.width) / 2 + eventData.viewport.translation.x * eventData.viewport.scale;
startPoint.y = (canvasSize.height - imageSize.height) / 2 + eventData.enabledElement.viewport.translation.y; startPoint.y = (canvasSize.height - imageSize.height) / 2 + eventData.viewport.translation.y * eventData.viewport.scale;
return startPoint; return startPoint;
@ -243,14 +243,22 @@
function onImageRendered(e, eventData) { function onImageRendered(e, eventData) {
// Check whether pixel spacing is defined
if (!eventData.image.rowPixelSpacing || !eventData.image.columnPixelSpacing) {
return;
}
var viewport = cornerstone.getViewport(eventData.enabledElement.element); var viewport = cornerstone.getViewport(eventData.enabledElement.element);
if (!viewport) { if (!viewport) {
console.log("viewport is null"); return;
} }
console.log(eventData);
var canvasSize = { width: eventData.enabledElement.canvas.width, height: eventData.enabledElement.canvas.height}; var canvasSize = { width: eventData.enabledElement.canvas.width, height: eventData.enabledElement.canvas.height};
var imageSize = {width: eventData.enabledElement.image.width , height: eventData.enabledElement.image.height}; var imageSize = {width: eventData.enabledElement.image.width , height: eventData.enabledElement.image.height};
// Distance between intervals is 10mm
var intervalScale = viewport.scale * 10.0; var intervalScale = viewport.scale * 10.0;
if (!canvasSize.width || !canvasSize.height || !imageSize.width || !imageSize.height ) { if (!canvasSize.width || !canvasSize.height || !imageSize.width || !imageSize.height ) {
@ -260,24 +268,22 @@
imageSize.width = imageSize.width * viewport.scale; imageSize.width = imageSize.width * viewport.scale;
imageSize.height = imageSize.height * viewport.scale; imageSize.height = imageSize.height * viewport.scale;
// 0.1 and 0.05 gives margin to horizontal and vertical lines
var hscaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.1, 0.05); var hscaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.1, 0.05);
var vScaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.05, 0.1); var vscaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.05, 0.1);
console.log(hscaleBounds);
console.log(vScaleBounds);
var config = { var config = {
width: imageSize.width, width: imageSize.width,
height: imageSize.height, height: imageSize.height,
hscaleBounds: hscaleBounds, hscaleBounds: hscaleBounds,
vscaleBounds: vScaleBounds, vscaleBounds: vscaleBounds,
minorTick: intervalScale, minorTick: intervalScale,
majorTick: 5 * intervalScale, majorTick: 5 * intervalScale,
minorTickLength: 12.5, minorTickLength: 12.5,
majorTickLength: 25, majorTickLength: 25,
verticalLine: { verticalLine: {
start: {x: vScaleBounds.right , y: vScaleBounds.top}, start: {x: vscaleBounds.right , y: vscaleBounds.top},
end: {x: vScaleBounds.right, y: vScaleBounds.bottom} end: {x: vscaleBounds.right, y: vscaleBounds.bottom}
}, },
horizontalLine: { horizontalLine: {
start: {x: hscaleBounds.left, y: hscaleBounds.bottom}, start: {x: hscaleBounds.left, y: hscaleBounds.bottom},