Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(crosshairs): Autopan causing infinite loop #551

Merged
merged 1 commit into from
Apr 14, 2023
Merged

fix(crosshairs): Autopan causing infinite loop #551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
95 changes: 33 additions & 62 deletions packages/tools/src/tools/CrosshairsTool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,79 +1464,50 @@ class CrosshairsTool extends AnnotationTool {
viewportId: string,
renderingEngine: Types.IRenderingEngine
): void {
// 1. Compute the current world bounding box of the viewport from corner to corner
// 2. Check if the toolCenter is outside of the world bounding box
// 3. If it is outside, pan the viewport to fit in the toolCenter
// 1. Check if the toolCenter is outside the viewport
// 2. If it is outside, pan the viewport to fit in the toolCenter

const viewport = renderingEngine.getViewport(viewportId);
const { clientWidth, clientHeight } = viewport.canvas;
const topLefWorld = viewport.canvasToWorld([0, 0]);
const bottomRightWorld = viewport.canvasToWorld([
clientWidth,
clientHeight,
]);
const topRightWorld = viewport.canvasToWorld([clientWidth, 0]);
const bottomLeftWorld = viewport.canvasToWorld([0, clientHeight]);

// find the minimum and maximum world coordinates in each x,y,z
const minX = Math.min(
topLefWorld[0],
bottomRightWorld[0],
topRightWorld[0],
bottomLeftWorld[0]
);
const maxX = Math.max(
topLefWorld[0],
bottomRightWorld[0],
topRightWorld[0],
bottomLeftWorld[0]
);
const minY = Math.min(
topLefWorld[1],
bottomRightWorld[1],
topRightWorld[1],
bottomLeftWorld[1]
);
const maxY = Math.max(
topLefWorld[1],
bottomRightWorld[1],
topRightWorld[1],
bottomLeftWorld[1]
);
const minZ = Math.min(
topLefWorld[2],
bottomRightWorld[2],
topRightWorld[2],
bottomLeftWorld[2]
);
const maxZ = Math.max(
topLefWorld[2],
bottomRightWorld[2],
topRightWorld[2],
bottomLeftWorld[2]
);

const toolCenterCanvas = viewport.worldToCanvas(this.toolCenter);

// pan the viewport to fit the toolCenter in the direction
// that is out of bounds
let deltaPointsWorld;
const pan = this.configuration.autoPan.panSize;

if (this.toolCenter[0] < minX - EPSILON) {
deltaPointsWorld = [minX - this.toolCenter[0] + pan, 0, 0];
} else if (this.toolCenter[0] > maxX + EPSILON) {
deltaPointsWorld = [maxX - this.toolCenter[0] - pan, 0, 0];
} else if (this.toolCenter[1] < minY - EPSILON) {
deltaPointsWorld = [0, minY - this.toolCenter[1] + pan, 0];
} else if (this.toolCenter[1] > maxY + EPSILON) {
deltaPointsWorld = [0, maxY - this.toolCenter[1] - pan, 0];
} else if (this.toolCenter[2] < minZ - EPSILON) {
deltaPointsWorld = [0, 0, minZ - this.toolCenter[2] + pan];
} else if (this.toolCenter[2] > maxZ + EPSILON) {
deltaPointsWorld = [0, 0, maxZ - this.toolCenter[2] - pan];
} else {
const visiblePointCanvas = <Types.Point2>[
toolCenterCanvas[0],
toolCenterCanvas[1],
];

if (toolCenterCanvas[0] < 0) {
visiblePointCanvas[0] = pan;
} else if (toolCenterCanvas[0] > clientWidth) {
visiblePointCanvas[0] = clientWidth - pan;
}

if (toolCenterCanvas[1] < 0) {
visiblePointCanvas[1] = pan;
} else if (toolCenterCanvas[1] > clientHeight) {
visiblePointCanvas[1] = clientHeight - pan;
}

if (
visiblePointCanvas[0] === toolCenterCanvas[0] &&
visiblePointCanvas[1] === toolCenterCanvas[1]
) {
return;
}

const visiblePointWorld = viewport.canvasToWorld(visiblePointCanvas);

const deltaPointsWorld = [
visiblePointWorld[0] - this.toolCenter[0],
visiblePointWorld[1] - this.toolCenter[1],
visiblePointWorld[2] - this.toolCenter[2],
];

const camera = viewport.getCamera();
const { focalPoint, position } = camera;

Expand Down