From b3f35cf3e9385be6e3de7bd2b52d94f22bf393ee Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Tue, 9 Aug 2016 15:36:04 -0300 Subject: [PATCH] LT-251: Fixing thumbnails issue --- .../components/toolbarSection/toolbarSection.html | 2 +- .../client/components/toolbarSection/toolbarSection.js | 10 +++++----- Packages/viewerbase/lib/helpers/isDisplaySetActive.js | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html index 88121394c..9a97486d9 100644 --- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html +++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html @@ -5,7 +5,7 @@ {{>roundedButtonGroup leftSidebarToggleButtonData}} - {{> toolbarSectionTools toolbarButtons=toolbarButtons extraToolbarButtons=extraToolbarButtons}} + {{>toolbarSectionTools toolbarButtons=toolbarButtons extraToolbarButtons=extraToolbarButtons}} {{#if splitView}} {{>studySeriesQuickSwitch (clone this side="right" viewportIndex=1)}} diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js index a25ba6f95..d93f930f7 100644 --- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js +++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js @@ -3,14 +3,14 @@ import { OHIF } from 'meteor/ohif:core'; Template.toolbarSection.helpers({ // Returns true if the view shall be split in two viewports splitView() { + // Run this computation every time the viewports are updated + Session.get('LayoutManagerUpdated'); + // Stops here if layout manager is not defined yet if (!window.layoutManager) { return; } - // Run this computation every time the viewports are updated - Session.get('LayoutManagerUpdated'); - return layoutManager.viewportData.length > 1; }, @@ -123,7 +123,7 @@ Template.toolbarSection.helpers({ classes: 'imageViewerTool toolbarSectionButton', svgLink: '/packages/viewerbase/assets/icons.svg#icon-tools-measure-temp' }); - + buttonData.push({ id: 'exTool', title: 'EX Tool', @@ -131,7 +131,7 @@ Template.toolbarSection.helpers({ svgLink: '/packages/viewerbase/assets/icons.svg#icon-tools-measure-temp' }); - return buttonData; + return buttonData; } }); diff --git a/Packages/viewerbase/lib/helpers/isDisplaySetActive.js b/Packages/viewerbase/lib/helpers/isDisplaySetActive.js index 251e0ecc6..6fee1bc61 100644 --- a/Packages/viewerbase/lib/helpers/isDisplaySetActive.js +++ b/Packages/viewerbase/lib/helpers/isDisplaySetActive.js @@ -10,6 +10,7 @@ Template.registerHelper('isDisplaySetActive', (displaySetInstanceUid, viewportIn return; } + console.warn('>>>>test'); let viewportData; if (_.isUndefined(viewportIndex)) { viewportData = layoutManager.viewportData;