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

Fix rotate tool on mobile devices #1385

Merged
merged 5 commits into from
Jul 30, 2021
Merged

Fix rotate tool on mobile devices #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76bce31
Fix - RotateTool for mobile devices
May 21, 2021
45b9ce8
Refactor fix RotateTool
May 21, 2021
65e0f14
Feature - testUnit for RotateTool on mobile devices
May 21, 2021
db7680e
Refactor validation on RotateTool
May 24, 2021
ac7f9e1
Change validation structure
May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/tools/RotateTool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ export default class RotateTool extends BaseTool {
function defaultStrategy(evt) {
const { roundAngles, rotateScale } = this.configuration;
const { element, viewport, startPoints, currentPoints } = evt.detail;
const initialRotation = viewport.initialRotation;

const initialRotation = viewport.initialRotation
? viewport.initialRotation
: viewport.rotation;

// Calculate the center of the image
const rect = element.getBoundingClientRect(element);
Expand Down
19 changes: 19 additions & 0 deletions src/tools/RotateTool.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ const mockEvt = {
},
};

const forMobileMockEvt = {
detail: {
viewport: {
rotation: 50,
initialRotation: undefined,
},
},
};

describe('RotateTool.js', () => {
describe('default values', () => {
it('has a default name of "Rotate"', () => {
Expand Down Expand Up @@ -48,5 +57,15 @@ describe('RotateTool.js', () => {
instantiatedTool.dragCallback(mockEvt);
expect(external.cornerstone.setViewport).toHaveBeenCalled();
});

it('can be created on mobile device', () => {
const instantiatedTool = new RotateTool();

instantiatedTool.applyActiveStrategy = jest.fn();
external.cornerstone.setViewport = jest.fn();

instantiatedTool.dragCallback(forMobileMockEvt);
expect(external.cornerstone.setViewport).toHaveBeenCalled();
});
});
});