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

fix: panel issues and mpr button (IDC2122-IDC2117)

Browse Source
This commit is contained in:
Igor Octaviano 2020-12-10 13:44:44 -03:00 committed by GitHub
parent d282f72d75
commit 32022f51f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,8 @@ const RTPanel = ({
* without subscribing to external events. * without subscribing to external events.
*/ */
useEffect(() => { useEffect(() => {
updateStructureSets();
document.addEventListener('extensiondicomrtrtloaded', updateStructureSets); document.addEventListener('extensiondicomrtrtloaded', updateStructureSets);
return () => { return () => {

7
extensions/dicom-rt/src/loadRTStruct.js
View File

@ -96,6 +96,11 @@ export default async function loadRTStruct(
imageIdSopInstanceUidPairs imageIdSopInstanceUidPairs
); );
const imageId = _getImageId(imageIdSopInstanceUidPairs, sopInstanceUID); const imageId = _getImageId(imageIdSopInstanceUidPairs, sopInstanceUID);
if (!imageId) {
continue;
}
const imageIdSpecificToolData = _getOrCreateImageIdSpecificToolData( const imageIdSpecificToolData = _getOrCreateImageIdSpecificToolData(
toolState, toolState,
imageId, imageId,
@ -294,7 +299,7 @@ const _getImageId = (imageIdSopInstanceUidPairs, sopInstanceUID) => {
imageIdSopInstanceUidPairsEntry.sopInstanceUID === sopInstanceUID imageIdSopInstanceUidPairsEntry.sopInstanceUID === sopInstanceUID
); );
return imageIdSopInstanceUidPairsEntry.imageId; return imageIdSopInstanceUidPairsEntry ? imageIdSopInstanceUidPairsEntry.imageId : null;
}; };
function _getImageIdSopInstanceUidPairsForDisplaySet( function _getImageIdSopInstanceUidPairsForDisplaySet(

10
extensions/vtk/src/toolbarComponents/VTKMPRToolbarButton.js
View File

@ -42,7 +42,10 @@ const _isDisplaySetReconstructable = (viewportSpecificData = {}, activeViewportI
// However, some studies (e.g. https://github.com/OHIF/Viewers/issues/2113) do not have such tags. // However, some studies (e.g. https://github.com/OHIF/Viewers/issues/2113) do not have such tags.
for (let ii = 0; ii < displaySet.numImageFrames; ++ii) { for (let ii = 0; ii < displaySet.numImageFrames; ++ii) {
const imageIdControl = displaySet.images[ii].getImageId() const image = displaySet.images[ii];
if (!image) continue;
const imageIdControl = image.getImageId()
const instanceMetadataControl = cornerstone.metaData.get('instance', imageIdControl) const instanceMetadataControl = cornerstone.metaData.get('instance', imageIdControl)
if (!instanceMetadataControl || if (!instanceMetadataControl ||
@ -59,7 +62,10 @@ const _isDisplaySetReconstructable = (viewportSpecificData = {}, activeViewportI
let zImagePositionPatientControl = instanceMetadataControl.ImagePositionPatient[2]; let zImagePositionPatientControl = instanceMetadataControl.ImagePositionPatient[2];
for (let jj = ii + 1; jj < displaySet.numImageFrames; ++jj) { for (let jj = ii + 1; jj < displaySet.numImageFrames; ++jj) {
const imageId = displaySet.images[jj].getImageId() const image = displaySet.images[jj];
if (!image) continue;
const imageId = image.getImageId()
const instanceMetadata = cornerstone.metaData.get('instance', imageId) const instanceMetadata = cornerstone.metaData.get('instance', imageId)
if (!instanceMetadata || if (!instanceMetadata ||