* feat: cs3d working stack viewport and tools (#19) * Squashed everything * fix weird react issue * fix eslint / prettier stuff * thumbnails work now with cpu rendering * feat: use new loadImageToCanvas in cs3d * make jump to measurement work * fix active thumbnail * fix measurement delete * fix window level presets * remove segmentation and sync groups for now * fix the dicom pdf and dicom video * fix cornerstone window assignment for cypress * apply review comments Co-authored-by: Erik <erik.sweed@gmail.com> * feat: cs3d tools and toolGroups (#20) * add more tools to work with cs3d mode * fix hotkeys * add stack manager usage for stach viewports * add image scrollbar * wip viewport overlay * fix toAnnotation schema for tools * fix the unnecessary size change that triggered resize * hanging protocol improvement to allow unmatched errors * study description matching for hanging protocol * fix the displaysetOptions to work * fix handle the active tool when a new viewport is added * fix separate toolGroups for mode * apply review comments * apply review comments * yarn lock * feat: overlay component (#21) * fix default displayset options * add viewport overlay * apply review comments * feat: loading and orientation indicators (#22) * add loading indicator * add orientation marker initial work * apply review comments * fix: orientation markers (#23) * finished the orientation markers * fix various broken cypress tests * apply review comments * update yarn lock * feat: re-working measurement tracking mode with cornerstone3d (#2805) * feat: cs3d working stack viewport and tools (#19) * Squashed everything * fix weird react issue * fix eslint / prettier stuff * thumbnails work now with cpu rendering * feat: use new loadImageToCanvas in cs3d * make jump to measurement work * fix active thumbnail * fix measurement delete * fix window level presets * remove segmentation and sync groups for now * fix the dicom pdf and dicom video * fix cornerstone window assignment for cypress * apply review comments Co-authored-by: Erik <erik.sweed@gmail.com> * feat: Add Measurement tracking mode with cs3D (#2789) * feat: first render for cornerstone3d tracked viewport * make tool active work * wip for SR extension * renamed dicom sr to cornerstone dicom sr * remove cornerstone from dicom pdf and video * move dicom sr logic to sr extension * feat: Add hydration for the length tool * fix SR display tool for length using cs3d * fix default config * fix: various bugs with sr viewport and tracking * fix promptying to continue tracking for when SR is created * feat: add keep trackign of unique identifiers * fix hydration for same imageIds * feat: Add SR toolGroup creation on modeEnter * feat: remove the need for separate mapper for SR hydration * add SR display for ellipse * handle hydration of elliptical ROI tool * remove cornerstone extension * add arrow mapping * feat: Add ArrowAnnotate SR display and hydration * apply review comments * apply review comments * move viewport labels to the viewportData * apply review comments * fix: integration cypress tests with cornerstone3D and add CINE tool (#2795) * fix: integration cypress tests with cornerstone3D * revert to addOrUpdate as it makes more sense * fix local drag and drop * fix tests * move dicomLoaderService to cornerstone extension * fix various import bugs * fix bug for local PT series * fix various unit tests * bump cs3d versions * add angle and magnify tool * bump dependencies to avoid broken peerDeps * feat: add initial work for capture using cs3d * feat: show annotations on the image capture * feat: add svg layer export * feat: Add CINE Tool * feat: remove unnecessary viewport rendering for cine state changes Co-authored-by: Erik Ziegler <erik.sweed@gmail.com> * docs: modify and improve documentation (#2800) * cleanup docs versionings * feat: Add all version explanations * version docs for 3.0 * wip for changing docs * wip for updated docs * add utility module documentation * fix demo with nohoisting of history * add slides and video to resources * apply review comments * fix: drag and drop SR into SR viewport (#2803) * update yarn lock Co-authored-by: Erik <erik.sweed@gmail.com> * update pathnames to match v3-stable * update the e2e pathname * fix: various bugs with regard to tracking workflow (#2811) * fix: various issues with measurement panel * fix: update default tool style for annotations * fix: annotatoin label getting removed * feat: Add backward compatibility for SR hydration with legacy cornerstone * fix: cursors and ellipse ROI max style * fix: ArrowAnnotate SRDisplay * apply review comments * bump package versions * fix: bugin rehydration of SR * fix: e2e tests * fix active viewport thickness and arrowTool ui * add readme for measurement tracking * use uploaded image for readme * add back images * try to fix e2e test * fix: window level presets hotkeys * Update README.md * update yarn lock * feat: volume api and TMTV mode (#2817) * feat: volumeAPI and TMTV mode * feat: use cs3d cache service to obtain viewportData * wip for volume api * wip: fusion viewport * feat: add blend mode option * wip for image scrollbar * fix drag and drop thumbnail * wip for image scrollbar for voluems * fix: element mismatch bug for scroll * feat: Add image scrollbar to volumes * feat: add syncGroups to volume api * feat: add tmtv mode initial setup * feat: add initial image options for the stack viewports * feat: Add custom load strategy for volume viewports via HP * apply review comments fix: Jump presets cs3d (#2812) * feat: Add JumpPreset to OHIF for Cornerstone3D * fix: accessing viewport service from servicesManager feat: volume API and TMTV mode (#2814) * fix: do not display overlays on mip viewports * feat: add optional disableCommands for toggle buttons * fix: toggleCrossharis * feat: config the crosshairs * feat: add PetSUV Panel for changing metadata * feat: initial work for the rectangleROIThreshold panel * wip: measurement service * roi threshold working * feat: Add displayText to segmentations * feat: add remove segmentation * feat: add csv export * feat: add RT export for annotations in tmtv mode * fix: fusion to use pt in tmtv mode and measuremet mappings * fix: various bugs * apply review comments * apply review comments * feat: add fusion color maps * add readme to tmtv mode * Update README.md * fix: try to fix build * fix unit tests * Update README.md * feat: add about to the panel * fix: changing strategy in roi panel * apply review comments * update package versions * wip for stackPrefetch * fix: cornerstone3d hydration and renaming (#2818) * update readme * renamed cornerstone extension * wip for renaming cornerstone3D variables * wip for renaming cornerstone3D variables * wip for fixing bugs for SR viewport * fix: jumpToMeasurement and initial label after hydration * fix: fileName capitalization * feat: use the new prefetch stack in the cs3d (#2820) * feat: use the new prefetch stack in the cs3d * use viewport scroll api for stack viewport * fix cine stop when scrollbar changes * feat: use new prefetch events * fix loading state to not show repeatedly * fix: various bugs for tmtv mode thresholding and new icons (#2823) * feat: make tmtv mode available in worklist * feat: add new icons for tmtv mode * feat: add fusion color icon * fix: parallel scale calculation * fix: bump Cornerstone to get large image support working * fix: Fix issues with CPU viewport flipping, including config files * fix: bump cornerstone to fix magnify tool * fix: Bump Cornerstone version to fix resetCamera issue in StackViewport * ci: Add _headers file to enable CORS headers for Netlify Drag/Drop deploys * fix: WADO-URI was not working. PET Metadata was coming from the wrong place. Fixed some minor React errors * feat(OHIF):Allow modes and extensions to be added after commpile time. (#2838) Also works with the compile time add that the existing cli uses, so that both build types work. Eric and I agreed this doesn't change existing functionality, but is almost entirely build issues/fixes. * bump: dependency versions to fix hydration bugs (#2848) * bump: dcmjs version to fix hydration bugs * try to fix tests * bump dependency versions Co-authored-by: Alireza <ar.sedghi@gmail.com> Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
340 lines
10 KiB
JavaScript
340 lines
10 KiB
JavaScript
describe('OHIF Study Viewer Page', function() {
|
|
before(() => {
|
|
cy.checkStudyRouteInViewer(
|
|
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
|
|
);
|
|
|
|
cy.expectMinimumThumbnails(3);
|
|
});
|
|
|
|
beforeEach(function() {
|
|
cy.initCommonElementsAliases();
|
|
cy.initCornerstoneToolsAliases();
|
|
cy.resetViewport().wait(50);
|
|
});
|
|
|
|
it('checks if series thumbnails are being displayed', function() {
|
|
cy.get('[data-cy="study-browser-thumbnail"]')
|
|
.its('length')
|
|
.should('be.gt', 1);
|
|
});
|
|
|
|
it('drags and drop a series thumbnail into viewport', function() {
|
|
cy.get('[data-cy="study-browser-thumbnail"]:nth-child(2)') //element to be dragged
|
|
.drag('.cornerstone-canvas'); //dropzone element
|
|
|
|
//const expectedText =
|
|
// 'Ser: 2Img: 1 1/13512 x 512Loc: -17.60 mm Thick: 3.00 mm';
|
|
//cy.get('@viewportInfoBottomLeft').should('contain.text', expectedText);
|
|
});
|
|
|
|
it('checks if Series left panel can be hidden/displayed', function() {
|
|
cy.get('@seriesPanel').should('exist');
|
|
cy.get('@seriesPanel').should('be.visible');
|
|
|
|
cy.get('@seriesBtn').click();
|
|
cy.get('@seriesPanel').should('not.exist');
|
|
|
|
cy.get('@seriesBtn').click();
|
|
cy.get('@seriesPanel').should('exist');
|
|
cy.get('@seriesPanel').should('be.visible');
|
|
});
|
|
|
|
it('checks if Measurements right panel can be hidden/displayed', function() {
|
|
cy.get('@measurementsPanel').should('exist');
|
|
cy.get('@measurementsPanel').should('be.visible');
|
|
|
|
cy.get('@measurementsBtn').click();
|
|
cy.get('@measurementsPanel').should('not.exist');
|
|
|
|
cy.get('@measurementsBtn').click();
|
|
cy.get('@measurementsPanel').should('exist');
|
|
cy.get('@measurementsPanel').should('be.visible');
|
|
});
|
|
|
|
/*it('checks if measurement item can be Relabeled under Measurements panel', function() {
|
|
// Add length measurement
|
|
cy.addLengthMeasurement();
|
|
cy.get('[data-cy="measurement-tracking-prompt-begin-tracking"]').should('exist')
|
|
cy.get('[data-cy="measurement-tracking-prompt-begin-tracking"]').should('be.visible')
|
|
cy.get('[data-cy="prompt-begin-tracking-yes"]').click();
|
|
cy.get('.measurementItem').click();
|
|
|
|
// Click "Relabel"
|
|
cy.get('.btnAction', { timeout: 10000 })
|
|
.first()
|
|
.contains('Relabel')
|
|
.click().should('be.visible');
|
|
|
|
// Search for "Bone"
|
|
cy.get('.searchInput').type('Bone');
|
|
|
|
// Select "Bone" Result
|
|
cy.get('.treeInputs > .wrapperLabel')
|
|
.contains('Bone')
|
|
.click();
|
|
|
|
// Confirm Selection
|
|
cy.get('.checkIconWrapper').click();
|
|
|
|
// Verify if 'Bone' label was added
|
|
cy.get('.measurementLocation').should('contain.text', 'Bone');
|
|
|
|
// Remove the measurement we just added
|
|
cy.get('.btnAction')
|
|
.last()
|
|
.contains('Delete')
|
|
.click()
|
|
|
|
// Close panel
|
|
cy.get('@measurementsBtn').click();
|
|
cy.get('@measurementsPanel').should('not.exist');
|
|
});*/
|
|
|
|
/*
|
|
TODO: Not sure why this is failing
|
|
it('checks if Description can be added to measurement item under Measurements panel', () => {
|
|
cy.addLengthMeasurement(); //Adding measurement in the viewport
|
|
cy.get('@measurementsBtn').click();
|
|
cy.get('.measurementItem').click();
|
|
|
|
// Click "Description"
|
|
cy.get('.btnAction')
|
|
.contains('Description')
|
|
.click();
|
|
|
|
// Enter description text
|
|
const descriptionText = 'Adding text for description test';
|
|
cy.get('#description').type(descriptionText);
|
|
|
|
// Confirm
|
|
cy.get('.btn-confirm').click();
|
|
|
|
//Verify if descriptionText was added
|
|
cy.get('.measurementLocation').should('contain.text', descriptionText);
|
|
|
|
// Remove the measurement we just added
|
|
cy.get('.btnAction')
|
|
.last()
|
|
.contains('Delete')
|
|
.click()
|
|
|
|
// Close panel
|
|
cy.get('@measurementsBtn').click();
|
|
cy.get('@measurementsPanel').should('not.be.enabled');
|
|
});
|
|
*/
|
|
|
|
/*it('checks if measurement item can be deleted through the context menu on the viewport', function() {
|
|
cy.addLengthMeasurement([100, 100], [200, 100]); //Adding measurement in the viewport
|
|
|
|
//Right click on measurement annotation
|
|
const [x1, y1] = [150, 100];
|
|
cy.get('@viewport')
|
|
.trigger('mousedown', x1, y1, {
|
|
which: 3,
|
|
})
|
|
.trigger('mouseup', x1, y1, {
|
|
which: 3,
|
|
})
|
|
.wait(300)
|
|
.then(() => {
|
|
//Contextmenu is visible
|
|
cy.get('.ToolContextMenu').should('be.visible');
|
|
});
|
|
|
|
//Click "Delete measurement"
|
|
cy.get('.form-action')
|
|
.contains('Delete measurement')
|
|
.click();
|
|
|
|
//Open measurements menu
|
|
cy.get('@measurementsBtn').click();
|
|
|
|
//Verify measurements was removed from panel
|
|
cy.get('.measurementItem')
|
|
.should('not.exist')
|
|
.log('Annotation successfully removed');
|
|
|
|
//Close panel
|
|
cy.get('@measurementsBtn').click();
|
|
cy.get('@measurementsPanel').should('not.exist');
|
|
});*/
|
|
|
|
/*it('adds relabel and description to measurement item through the context menu on the viewport', function() {
|
|
cy.addLengthMeasurement([100, 100], [200, 100]); //Adding measurement in the viewport
|
|
|
|
// Relabel
|
|
// Right click on measurement annotation
|
|
const [x1, y1] = [150, 100];
|
|
cy.get('@viewport')
|
|
.trigger('mousedown', x1, y1, {
|
|
which: 3,
|
|
})
|
|
.trigger('mouseup', x1, y1, {
|
|
which: 3,
|
|
});
|
|
|
|
// Contextmenu is visible
|
|
cy.get('.ToolContextMenu').should('be.visible');
|
|
|
|
// Click "Relabel"
|
|
cy.get('.form-action')
|
|
.contains('Relabel')
|
|
.click();
|
|
|
|
// Search for "Brain"
|
|
cy.get('.searchInput').type('Brain');
|
|
|
|
// Select "Brain" Result
|
|
cy.get('.treeInputs > .wrapperLabel')
|
|
.contains('Brain')
|
|
.click();
|
|
|
|
// Confirm Selection
|
|
cy.get('.checkIconWrapper').click();
|
|
|
|
// Description
|
|
// Right click on measurement annotation
|
|
cy.get('@viewport')
|
|
.trigger('mousedown', x1, y1, {
|
|
which: 3,
|
|
})
|
|
.trigger('mouseup', x1, y1, {
|
|
which: 3,
|
|
});
|
|
|
|
// Contextmenu is visible
|
|
cy.get('.ToolContextMenu').should('be.visible');
|
|
|
|
// Click "Description"
|
|
cy.get('.form-action')
|
|
.contains('Add Description')
|
|
.click();
|
|
|
|
// Enter description text
|
|
const descriptionText = 'Adding text for description test';
|
|
cy.get('#description').type(descriptionText);
|
|
|
|
// Confirm
|
|
cy.get('.btn-confirm').click();
|
|
|
|
//Open measurements menu
|
|
cy.get('@measurementsBtn').click();
|
|
|
|
// Verify if label was added
|
|
cy.get('.measurementLocation')
|
|
.should('contain.text', 'Brain')
|
|
.log('Relabel added with success');
|
|
|
|
//Verify if descriptionText was added
|
|
cy.get('.measurementLocation')
|
|
.should('contain.text', descriptionText)
|
|
.log('Description added with success');
|
|
|
|
// Close panel
|
|
cy.get('@measurementsBtn').click();
|
|
cy.get('@measurementsPanel').should('not.exist');
|
|
});*/
|
|
|
|
it('scrolls series stack using scrollbar', function() {
|
|
// Workaround implemented based on Cypress issue:
|
|
// https://github.com/cypress-io/cypress/issues/1570#issuecomment-450966053
|
|
const nativeInputValueSetter = Object.getOwnPropertyDescriptor(
|
|
window.HTMLInputElement.prototype,
|
|
'value'
|
|
).set;
|
|
|
|
cy.get('input.imageSlider[type=range]').then($range => {
|
|
// get the DOM node
|
|
const range = $range[0];
|
|
// set the value manually
|
|
nativeInputValueSetter.call(range, 13);
|
|
// now dispatch the event
|
|
range.dispatchEvent(new Event('change', { value: 13, bubbles: true }));
|
|
});
|
|
|
|
/*const expectedText =
|
|
'Ser: 2Img: 13 13/13512 x 512Loc: 18.40 mm Thick: 3.00 mm'; //'Img: 13 13/13';
|
|
cy.get('@viewportInfoBottomLeft').should('contains.text', expectedText);*/
|
|
});
|
|
|
|
it('performs double-click to load thumbnail in active viewport', () => {
|
|
cy.get('[data-cy="study-browser-thumbnail"]:nth-child(2)').dblclick();
|
|
|
|
//const expectedText = 'Ser: 3';
|
|
//cy.get('@viewportInfoBottomLeft').should('contains.text', expectedText);
|
|
});
|
|
|
|
// it('performs right click to zoom', function() {
|
|
// // This is not used to activate the tool, it is used to ensure the
|
|
// // top left viewport info shows the zoom values (it only shows up
|
|
// // when the zoom tool is active)
|
|
// cy.get('@zoomBtn')
|
|
// .click()
|
|
// .then($zoomBtn => {
|
|
// cy.wrap($zoomBtn).should('have.class', 'active');
|
|
// });
|
|
|
|
// //Right click on viewport
|
|
// cy.get('@viewport')
|
|
// .trigger('mousedown', 'top', { buttons: 2 })
|
|
// .trigger('mousemove', 'center', { buttons: 2 })
|
|
// .trigger('mouseup');
|
|
|
|
// const expectedText = 'Zoom:6.65x';
|
|
// cy.get('@viewportInfoTopLeft').should('contains.text', expectedText);
|
|
// });
|
|
|
|
/*it('performs middle click to pan', function() {
|
|
//Get image position from cornerstone and check if y axis was modified
|
|
let cornerstone;
|
|
let currentPan;
|
|
|
|
// TO DO: Replace the cornerstone pan check by Percy snapshot comparison
|
|
cy.window()
|
|
.its('cornerstone')
|
|
.then(c => {
|
|
cornerstone = c;
|
|
currentPan = () =>
|
|
cornerstone.getEnabledElements()[0].viewport.translation;
|
|
});
|
|
|
|
//pan image with middle click
|
|
cy.get('@viewport')
|
|
.trigger('mousedown', 'center', { buttons: 3 })
|
|
.trigger('mousemove', 'bottom', { buttons: 3 })
|
|
.trigger('mouseup', 'bottom')
|
|
.then(() => {
|
|
expect(currentPan().y > 0).to.eq(true);
|
|
});
|
|
});*/
|
|
|
|
/*it('opens About modal and verify the displayed information', function() {
|
|
cy.get('[data-cy="options-dropdown"]')
|
|
.first()
|
|
.click();
|
|
cy.get('[data-cy="about-modal"]')
|
|
.as('aboutOverlay')
|
|
.should('be.visible');
|
|
|
|
//check buttons and links
|
|
cy.get('[data-cy="about-modal"]')
|
|
.should('contains.text', 'Visit the forum')
|
|
.and('contains.text', 'Report an issue')
|
|
.and('contains.text', 'https://github.com/OHIF/Viewers/');
|
|
|
|
//check version number
|
|
cy.get('[data-cy="about-modal"]').then($modal => {
|
|
cy.get('[data-cy="header-version-info"]').should($headerVersionNumber => {
|
|
$headerVersionNumber = $headerVersionNumber.text().substring(1);
|
|
expect($modal).to.contain($headerVersionNumber);
|
|
});
|
|
});
|
|
|
|
//close modal
|
|
cy.get('[data-cy="close-button"]').click();
|
|
cy.get('@aboutOverlay').should('not.exist');
|
|
});*/
|
|
});
|