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

OHIF-152 Fix hanging protocol issues

Browse Source 
- Replace “OHIF.viewerbase.showConfirmDialog” with “Viewerbase.dialogUtils.showConfirmDialog”
- Check the length of the filtered images (instead of checking whether it is undefined, because the filtered images is returned as an empty array if not found) to find the display set in protocolEngine
This commit is contained in:
Evren Ozkan 2017-02-01 19:14:41 -05:00
parent dff42c0360
commit 2e06b652b3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js
View File

@ -5,6 +5,7 @@ import { Random } from 'meteor/random';
import { $ } from 'meteor/jquery'; import { $ } from 'meteor/jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase';
import 'meteor/ohif:viewerbase'; import 'meteor/ohif:viewerbase';
/** /**
@ -372,7 +373,7 @@ Template.protocolEditor.events({
text: 'Are you sure you would like to remove this Protocol? This cannot be reversed.' text: 'Are you sure you would like to remove this Protocol? This cannot be reversed.'
}; };
OHIF.viewerbase.showConfirmDialog(() => { Viewerbase.dialogUtils.showConfirmDialog(() => {
// Remove the Protocol // Remove the Protocol
HP.ProtocolStore.removeProtocol(selectedProtocol.id); HP.ProtocolStore.removeProtocol(selectedProtocol.id);

8
Packages/ohif-hanging-protocols/client/protocolEngine.js
View File

@ -479,12 +479,14 @@ HP.ProtocolEngine = class ProtocolEngine {
}; };
// Filter imageSet function: filter by InstanceUid // Filter imageSet function: filter by InstanceUid
const filterImageSetFn = (imageSet, sopInstanceUid) => { const filterImageFn = (image) => {
return imageSet.getData().sopInstanceUid === instance.sopInstanceUid; return image.getData().sopInstanceUid === instance.sopInstanceUid;
}; };
// Find the displaySet // Find the displaySet
const displaySet = study.displaySets.find(ds => ds.images.filter(imageSet => filterImageSetFn)); const displaySet = study.displaySets.find(ds => {
return ds.images.filter(filterImageFn).length > 0;
});
// If the instance was found, set the displaySet ID // If the instance was found, set the displaySet ID
if (displaySet) { if (displaySet) {