From 5935c027b1439d2878a2a8e866a89e069b6ef6f6 Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Fri, 10 Jun 2016 17:37:07 -0400 Subject: [PATCH] Check study instances whether they have image data based on sopClassUid or rows (JPEG and PNG images do not have sopClassUid) in layoutManager as well --- Packages/viewerbase/lib/layoutManager.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Packages/viewerbase/lib/layoutManager.js b/Packages/viewerbase/lib/layoutManager.js index d056deb6c..85fb2da00 100644 --- a/Packages/viewerbase/lib/layoutManager.js +++ b/Packages/viewerbase/lib/layoutManager.js @@ -51,7 +51,9 @@ LayoutManager = class LayoutManager { // TODO: Change this when we add PDF and MPEG support // See https://ohiforg.atlassian.net/browse/LT-227 var firstInstance = series.instances[0]; - if (!firstInstance.rows) { + + // All imaging modalities must have a valid value for sopClassUid or rows + if (!firstInstance || (!isImage(firstInstance.sopClassUid) && !firstInstance.rows)) { currentViewportData = {}; } else { currentViewportData = {