From 2e06b652b3f6de0ff71f70995c2262358a790559 Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Wed, 1 Feb 2017 19:14:41 -0500 Subject: [PATCH] =?UTF-8?q?OHIF-152=20Fix=20hanging=20protocol=20issues=20?= =?UTF-8?q?-=20Replace=20=E2=80=9COHIF.viewerbase.showConfirmDialog?= =?UTF-8?q?=E2=80=9D=20with=20=E2=80=9CViewerbase.dialogUtils.showConfirmD?= =?UTF-8?q?ialog=E2=80=9D=20-=20Check=20the=20length=20of=20the=20filtered?= =?UTF-8?q?=20images=20(instead=20of=20checking=20whether=20it=20is=20unde?= =?UTF-8?q?fined,=20because=20the=20filtered=20images=20is=20returned=20as?= =?UTF-8?q?=20an=20empty=20array=20if=20not=20found)=20to=20find=20the=20d?= =?UTF-8?q?isplay=20set=20in=20protocolEngine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/components/protocolEditor/protocolEditor.js | 3 ++- Packages/ohif-hanging-protocols/client/protocolEngine.js | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js b/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js index b49446c10..abeae75cf 100644 --- a/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js +++ b/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js @@ -5,6 +5,7 @@ import { Random } from 'meteor/random'; import { $ } from 'meteor/jquery'; import { OHIF } from 'meteor/ohif:core'; +import { Viewerbase } from '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.' }; - OHIF.viewerbase.showConfirmDialog(() => { + Viewerbase.dialogUtils.showConfirmDialog(() => { // Remove the Protocol HP.ProtocolStore.removeProtocol(selectedProtocol.id); diff --git a/Packages/ohif-hanging-protocols/client/protocolEngine.js b/Packages/ohif-hanging-protocols/client/protocolEngine.js index c893b050a..2f5f1b49b 100644 --- a/Packages/ohif-hanging-protocols/client/protocolEngine.js +++ b/Packages/ohif-hanging-protocols/client/protocolEngine.js @@ -479,12 +479,14 @@ HP.ProtocolEngine = class ProtocolEngine { }; // Filter imageSet function: filter by InstanceUid - const filterImageSetFn = (imageSet, sopInstanceUid) => { - return imageSet.getData().sopInstanceUid === instance.sopInstanceUid; + const filterImageFn = (image) => { + return image.getData().sopInstanceUid === instance.sopInstanceUid; }; // 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 (displaySet) {