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

fix: 🐛 Fix RT Panel hide/show and Fix looping load errors (#1877)

Browse Source 
* fix: 🐛 Fix RT Panel hide/show

* Prevent infinite loop by persisting load errors on displaySet.

* fix: 🐛 Fix infinite error messages

* Fix unit tests.

* comment out reamining MRSTUDY line
This commit is contained in:
James Petts 2020-07-13 13:51:33 +01:00 committed by GitHub
parent 6121bdcf63
commit e7cc735c03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 127 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/dicom-rt/src/OHIFDicomRTStructSopClassHandler.js
View File

@ -14,7 +14,7 @@ const OHIFDicomRTStructSopClassHandler = {
id: 'OHIFDicomRTStructSopClassHandler', id: 'OHIFDicomRTStructSopClassHandler',
type: MODULE_TYPES.SOP_CLASS_HANDLER, type: MODULE_TYPES.SOP_CLASS_HANDLER,
sopClassUIDs, sopClassUIDs,
getDisplaySetFromSeries: function ( getDisplaySetFromSeries: function(
series, series,
study, study,
dicomWebClient, dicomWebClient,
@ -67,13 +67,14 @@ const OHIFDicomRTStructSopClassHandler = {
} }
} }
rtStructDisplaySet.load = function (referencedDisplaySet, studies) { rtStructDisplaySet.load = function(referencedDisplaySet, studies) {
return loadRTStruct( return loadRTStruct(
rtStructDisplaySet, rtStructDisplaySet,
referencedDisplaySet, referencedDisplaySet,
studies studies
).catch(error => { ).catch(error => {
rtStructDisplaySet.isLoaded = false; rtStructDisplaySet.isLoaded = false;
rtStructDisplaySet.loadError = true;
throw new Error(error); throw new Error(error);
}); });
}; };

136
extensions/dicom-rt/src/components/RTPanel/RTPanel.js
View File

@ -38,7 +38,7 @@ const RTPanel = ({
isOpen, isOpen,
onContourItemClick, onContourItemClick,
activeContexts = [], activeContexts = [],
contexts = {} contexts = {},
}) => { }) => {
const isVTK = () => activeContexts.includes(contexts.VTK); const isVTK = () => activeContexts.includes(contexts.VTK);
const isCornerstone = () => activeContexts.includes(contexts.CORNERSTONE); const isCornerstone = () => activeContexts.includes(contexts.CORNERSTONE);
@ -76,7 +76,10 @@ const RTPanel = ({
document.addEventListener('extensiondicomrtrtloaded', updateStructureSets); document.addEventListener('extensiondicomrtrtloaded', updateStructureSets);
return () => { return () => {
document.removeEventListener('extensiondicomrtrtloaded', updateStructureSets); document.removeEventListener(
'extensiondicomrtrtloaded',
updateStructureSets
);
}; };
}, []); }, []);
@ -89,7 +92,9 @@ const RTPanel = ({
activeViewport.SeriesInstanceUID activeViewport.SeriesInstanceUID
); );
const studyMetadata = studyMetadataManager.get(activeViewport.StudyInstanceUID); const studyMetadata = studyMetadataManager.get(
activeViewport.StudyInstanceUID
);
const referencedDisplaysets = studyMetadata.getDerivedDatasets({ const referencedDisplaysets = studyMetadata.getDerivedDatasets({
referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID, referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID,
Modality: 'RTSTRUCT', Modality: 'RTSTRUCT',
@ -100,7 +105,7 @@ const RTPanel = ({
setState({ setState({
referencedDisplaysets, referencedDisplaysets,
selectedSet: defaultSet, selectedSet: defaultSet,
sets: viewportSets sets: viewportSets,
}); });
} else { } else {
setState(DEFAULT_STATE); setState(DEFAULT_STATE);
@ -116,7 +121,10 @@ const RTPanel = ({
setShowSettings(showSettings && !isOpen); setShowSettings(showSettings && !isOpen);
}, [isOpen]); }, [isOpen]);
const toContourItem = ({ ROINumber, ROIName, RTROIObservations, colorArray, visible }, loadedSet) => { const toContourItem = (
{ ROINumber, ROIName, RTROIObservations, colorArray, visible },
loadedSet
) => {
let interpretedType = ''; let interpretedType = '';
if (RTROIObservations && RTROIObservations.RTROIInterpretedType) { if (RTROIObservations && RTROIObservations.RTROIInterpretedType) {
interpretedType = `(${RTROIObservations.RTROIInterpretedType})`; interpretedType = `(${RTROIObservations.RTROIInterpretedType})`;
@ -149,14 +157,20 @@ const RTPanel = ({
); );
const frameIndex = imageIds.indexOf(imageId); const frameIndex = imageIds.indexOf(imageId);
const SOPInstanceUID = cornerstone.metaData.get('SOPInstanceUID', imageId); const SOPInstanceUID = cornerstone.metaData.get(
const StudyInstanceUID = cornerstone.metaData.get('StudyInstanceUID', imageId); 'SOPInstanceUID',
imageId
);
const StudyInstanceUID = cornerstone.metaData.get(
'StudyInstanceUID',
imageId
);
onContourItemClick({ onContourItemClick({
StudyInstanceUID, StudyInstanceUID,
SOPInstanceUID, SOPInstanceUID,
frameIndex, frameIndex,
activeViewportIndex: activeIndex activeViewportIndex: activeIndex,
}); });
} }
}} }}
@ -166,7 +180,10 @@ const RTPanel = ({
visible={visible} visible={visible}
onVisibilityChange={() => { onVisibilityChange={() => {
const module = cornerstoneTools.getModule('rtstruct'); const module = cornerstoneTools.getModule('rtstruct');
module.setters.toggleROIContour(state.selectedSet.SeriesInstanceUID, ROINumber); module.setters.toggleROIContour(
state.selectedSet.SeriesInstanceUID,
ROINumber
);
}} }}
/> />
); );
@ -202,49 +219,70 @@ const RTPanel = ({
onClick={() => setShowSettings(true)} onClick={() => setShowSettings(true)}
/> />
</div> </div>
{!state.referencedDisplaysets.length && <LoadingIndicator expand height="70px" width="70px" />} {!state.referencedDisplaysets.length && (
{state.sets && state.referencedDisplaysets.map(displaySet => { <LoadingIndicator expand height="70px" width="70px" />
const { SeriesInstanceUID, metadata, isLoaded } = displaySet; )}
{state.sets &&
state.referencedDisplaysets.map(displaySet => {
const { SeriesInstanceUID, metadata, isLoaded } = displaySet;
const module = cornerstoneTools.getModule('rtstruct'); const module = cornerstoneTools.getModule('rtstruct');
const sets = module.getters.structuresSetsWhichReferenceSeriesInstanceUid(viewports[activeIndex].SeriesInstanceUID); const sets = module.getters.structuresSetsWhichReferenceSeriesInstanceUid(
viewports[activeIndex].SeriesInstanceUID
);
const loadedSet = sets.find(set => set.SeriesInstanceUID === SeriesInstanceUID); const loadedSet = sets.find(
return ( set => set.SeriesInstanceUID === SeriesInstanceUID
<PanelSection );
key={SeriesInstanceUID} return (
title={metadata.StructureSetLabel} <PanelSection
loading={!isLoaded || !loadedSet} key={SeriesInstanceUID}
visible={isLoaded && loadedSet.visible} title={metadata.StructureSetLabel}
hideVisibleButton={!isLoaded} loading={!isLoaded || !loadedSet}
expanded={isLoaded && loadedSet.SeriesInstanceUID === state.selectedSet.SeriesInstanceUID} visible={isLoaded && loadedSet.visible}
onVisibilityChange={newVisibility => { hideVisibleButton={!isLoaded}
const module = cornerstoneTools.getModule('rtstruct'); expanded={
loadedSet.ROIContours.forEach(({ ROINumber }) => { isLoaded &&
module.setters.toggleROIContour(loadedSet.SeriesInstanceUID, ROINumber); loadedSet.SeriesInstanceUID ===
}); state.selectedSet.SeriesInstanceUID
const sets = module.getters.structuresSetsWhichReferenceSeriesInstanceUid(viewports[activeIndex].SeriesInstanceUID);
setState(state => ({ ...state, sets }));
refreshViewport();
}}
onExpandChange={async () => {
if (!isLoaded) {
await displaySet.load(viewports[activeIndex], studies);
const module = cornerstoneTools.getModule('rtstruct');
const sets = module.getters.structuresSetsWhichReferenceSeriesInstanceUid(viewports[activeIndex].SeriesInstanceUID);
const selectedSet = sets.find(set => set.SeriesInstanceUID === SeriesInstanceUID);
setState(state => ({ ...state, selectedSet, sets }));
} }
}} onVisibilityChange={newVisibility => {
> const module = cornerstoneTools.getModule('rtstruct');
<ScrollableArea>
<TableList headless> if (newVisibility) {
{isLoaded && loadedSet.ROIContours.map(c => toContourItem(c, loadedSet))} module.setters.showStructureSet(loadedSet.SeriesInstanceUID);
</TableList> } else {
</ScrollableArea> module.setters.hideStructureSet(loadedSet.SeriesInstanceUID);
</PanelSection> }
); const sets = module.getters.structuresSetsWhichReferenceSeriesInstanceUid(
})} viewports[activeIndex].SeriesInstanceUID
);
setState(state => ({ ...state, sets }));
refreshViewport();
}}
onExpandChange={async () => {
if (!isLoaded) {
await displaySet.load(viewports[activeIndex], studies);
const module = cornerstoneTools.getModule('rtstruct');
const sets = module.getters.structuresSetsWhichReferenceSeriesInstanceUid(
viewports[activeIndex].SeriesInstanceUID
);
const selectedSet = sets.find(
set => set.SeriesInstanceUID === SeriesInstanceUID
);
setState(state => ({ ...state, selectedSet, sets }));
}
}}
>
<ScrollableArea>
<TableList headless>
{isLoaded &&
loadedSet.ROIContours.map(c => toContourItem(c, loadedSet))}
</TableList>
</ScrollableArea>
</PanelSection>
);
})}
</div> </div>
); );
}; };

13
extensions/dicom-rt/src/tools/modules/rtStructModule.js
View File

@ -81,7 +81,9 @@ function _setStructureSetVisible(SeriesInstanceUID, visible = true) {
const StructureSet = getStructureSet(SeriesInstanceUID); const StructureSet = getStructureSet(SeriesInstanceUID);
if (StructureSet) { if (StructureSet) {
StructureSet.visible = visible; StructureSet.ROIContours.forEach(ROIContour => {
ROIContour.visible = visible;
});
refreshViewport(); refreshViewport();
} }
@ -154,15 +156,10 @@ function setToggleROIContour(SeriesInstanceUID, ROINumber) {
* Returns an array of StructureSets which reference the given SeriesInstanceUID. * Returns an array of StructureSets which reference the given SeriesInstanceUID.
* @param {string} SeriesInstanceUID The SeriesInstanceUID to check. * @param {string} SeriesInstanceUID The SeriesInstanceUID to check.
*/ */
function getStructuresSetsWhichReferenceSeriesInstanceUid( function getStructuresSetsWhichReferenceSeriesInstanceUid(SeriesInstanceUID) {
SeriesInstanceUID
) {
const { StructureSets } = state; const { StructureSets } = state;
return StructureSets.filter(StructureSet => return StructureSets.filter(StructureSet =>
structureSetReferencesSeriesInstanceUid( structureSetReferencesSeriesInstanceUid(StructureSet, SeriesInstanceUID)
StructureSet,
SeriesInstanceUID
)
); );
} }

1
extensions/dicom-segmentation/src/loadSegmentation.js
View File

@ -41,6 +41,7 @@ export default async function loadSegmentation(
results = _parseSeg(segArrayBuffer, imageIds); results = _parseSeg(segArrayBuffer, imageIds);
} catch (error) { } catch (error) {
segDisplaySet.isLoaded = false; segDisplaySet.isLoaded = false;
segDisplaySet.loadError = true;
reject(error); reject(error);
} }

1
platform/core/src/classes/metadata/StudyMetadata.js
View File

@ -135,6 +135,7 @@ export class StudyMetadata extends Metadata {
study, study,
sopClassUIDs sopClassUIDs
); );
if (displaySet) { if (displaySet) {
displaySet.sopClassModule = true; displaySet.sopClassModule = true;

7
platform/core/src/utils/loadAndCacheDerivedDisplaySets.js
View File

@ -82,12 +82,17 @@ const loadAndCacheDerivedDisplaySets = (referencedDisplaySet, studies) => {
// For each type, see if any are loaded, if not load the most recent. // For each type, see if any are loaded, if not load the most recent.
Object.keys(displaySetsPerModality).forEach(key => { Object.keys(displaySetsPerModality).forEach(key => {
const displaySets = displaySetsPerModality[key]; const displaySets = displaySetsPerModality[key];
const isLoaded = displaySets.some(displaySet => displaySet.isLoaded); const isLoaded = displaySets.some(displaySet => displaySet.isLoaded);
if (isLoaded) { if (isLoaded) {
return; return;
} }
if (displaySets.some(displaySet => displaySet.loadError)) {
return;
}
// find most recent and load it. // find most recent and load it.
let recentDateTime = 0; let recentDateTime = 0;
let recentDisplaySet = displaySets[0]; let recentDisplaySet = displaySets[0];
@ -102,6 +107,8 @@ const loadAndCacheDerivedDisplaySets = (referencedDisplaySet, studies) => {
} }
}); });
recentDisplaySet.isLoading = true;
promises.push(recentDisplaySet.load(referencedDisplaySet, studies)); promises.push(recentDisplaySet.load(referencedDisplaySet, studies));
}); });

23
platform/viewer/cypress/integration/common/OHIFRoutes.spec.js
View File

@ -5,17 +5,18 @@ describe('OHIF Routes', function() {
cy.openStudyList(); cy.openStudyList();
}); });
it('checks TEST json url study route', function() { // TODO -> Bring back when testJSON is hosted again.
cy.visit( // it('checks TEST json url study route', function() {
'/viewer?url=https://ohif-viewer.s3.eu-central-1.amazonaws.com/JSON/testJSON.json' // cy.visit(
); // '/viewer?url=https://ohif-viewer.s3.eu-central-1.amazonaws.com/JSON/testJSON.json'
// );
cy.server(); // cy.server();
cy.route('GET', '**/MRStudy/**').as('getTESTStudy'); // cy.route('GET', '**/ MRStudy; /**').as('getTESTStudy');
cy.wait('@getTESTStudy.all'); // cy.wait('@getTESTStudy.all');
cy.get('@getTESTStudy').should($route => { // cy.get('@getTESTStudy').should($route => {
expect($route.status).to.be.eq(200); // expect($route.status).to.be.eq(200);
}); // });
}); // });
}); });

12
platform/viewer/cypress/integration/common/OHIFStudyList.spec.js
View File

@ -38,12 +38,12 @@ describe('OHIF Study List', function() {
}); });
it('searches Accession with exact string', function() { it('searches Accession with exact string', function() {
cy.get('@AccessionNumber').type('fpcben98890'); cy.get('@AccessionNumber').type('0000481914');
//Wait result list to be displayed //Wait result list to be displayed
cy.waitStudyList(); cy.waitStudyList();
cy.get('@searchResult').should($list => { cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1); expect($list.length).to.be.eq(1);
expect($list).to.contain('fpcben98890'); expect($list).to.contain('0000481914');
}); });
}); });
@ -53,7 +53,7 @@ describe('OHIF Study List', function() {
cy.waitStudyList(); cy.waitStudyList();
cy.get('@searchResult').should($list => { cy.get('@searchResult').should($list => {
// TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯ // TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯
expect($list.length).to.be.eq(15); expect($list.length).to.be.eq(9);
expect($list).to.contain('MR'); expect($list).to.contain('MR');
}); });
}); });
@ -149,18 +149,18 @@ describe('OHIF Study List', function() {
cy.waitStudyList(); cy.waitStudyList();
cy.get('@searchResult').should($list => { cy.get('@searchResult').should($list => {
// TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯ // TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯
expect($list.length).to.be.eq(15); expect($list.length).to.be.eq(9);
expect($list).to.contain('MR'); expect($list).to.contain('MR');
}); });
}); });
it('searches Accession with exact string', function() { it('searches Accession with exact string', function() {
cy.get('@accessionModalityDescription').type('fpcben98890'); cy.get('@accessionModalityDescription').type('0000481914');
//Wait result list to be displayed //Wait result list to be displayed
cy.waitStudyList(); cy.waitStudyList();
cy.get('@searchResult').should($list => { cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1); expect($list.length).to.be.eq(1);
expect($list).to.contain('fpcben98890'); expect($list).to.contain('0000481914');
}); });
}); });

5
platform/viewer/cypress/integration/visual-regression/PercyCheckOHIFRoutes.spec.js
View File

@ -5,13 +5,15 @@ describe('Visual Regression - OHIF Routes', function() {
cy.openStudyList(); cy.openStudyList();
}); });
/*
// TODO -> Bring back when testJSON is hosted again.
it('checks TEST json url study route', function() { it('checks TEST json url study route', function() {
cy.visit( cy.visit(
'/viewer?url=https://ohif-viewer.s3.eu-central-1.amazonaws.com/JSON/testJSON.json' '/viewer?url=https://ohif-viewer.s3.eu-central-1.amazonaws.com/JSON/testJSON.json'
); );
cy.server(); cy.server();
cy.route('GET', '**/TESTStudy/**').as('getTESTStudy'); cy.route('GET', '**/ TESTStudy; /**').as('getTESTStudy');
cy.wait('@getTESTStudy.all'); cy.wait('@getTESTStudy.all');
cy.get('@getTESTStudy').should($route => { cy.get('@getTESTStudy').should($route => {
@ -20,4 +22,5 @@ describe('Visual Regression - OHIF Routes', function() {
cy.percyCanvasSnapshot('TEST json study route'); cy.percyCanvasSnapshot('TEST json study route');
}); });
*/
}); });

3
platform/viewer/public/config/idc.js
View File

@ -9,11 +9,10 @@ window.config = function(props) {
httpErrorHandler: error => { httpErrorHandler: error => {
// This is 429 when rejected from the public idc sandbox too often. // This is 429 when rejected from the public idc sandbox too often.
console.warn(error.status); console.warn(error.status);
// Could use services manager here to bring up a dialog/modal if needed. // Could use services manager here to bring up a dialog/modal if needed.
console.warn('test, navigate to https://ohif.org/'); console.warn('test, navigate to https://ohif.org/');
window.location = 'https://ohif.org/'; window.location = 'https://ohif.org/';
}, },
healthcareApiEndpoint: 'https://idc-sandbox-002.appspot.com/v1beta1', healthcareApiEndpoint: 'https://proxy-dot-idc-dev.appspot.com/v1beta1',
}; };
}; };