From e248f9ec7acabe32ba17570ea64b7b339d96b5a7 Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Wed, 2 Dec 2015 11:51:36 -0500 Subject: [PATCH] Bug fixing: visual indicators to indicate active timepoints in viewports in timepoint headers --- .../components/lesionTable/lesionTable.js | 21 +++++++++++-------- Packages/lesiontracker/package.js | 4 +++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.js b/Packages/lesiontracker/components/lesionTable/lesionTable.js index ec6e43a01..bd7acdc7e 100644 --- a/Packages/lesiontracker/components/lesionTable/lesionTable.js +++ b/Packages/lesiontracker/components/lesionTable/lesionTable.js @@ -231,16 +231,19 @@ Tracker.autorun(function () { $("#"+contentId+" .imageViewerViewport").each(function(viewportIndex, element) { var enabledElement = cornerstone.getEnabledElement(element); - var imageId = enabledElement.image.imageId; - var study = cornerstoneTools.metaData.get('study', imageId); - var studyDate = study.studyDate; - var patientId = study.patientId; - loadedStudyDates.patientId = patientId; - // Check studyDate is added before - if (loadedStudyDates.dates.indexOf(studyDate) < 0) { - loadedStudyDates.dates.push(studyDate); - } + if(enabledElement && enabledElement.image){ + var imageId = enabledElement.image.imageId; + var study = cornerstoneTools.metaData.get('study', imageId); + var studyDate = study.studyDate; + var patientId = study.patientId; + loadedStudyDates.patientId = patientId; + // Check studyDate is added before + if (loadedStudyDates.dates.indexOf(studyDate) < 0) { + loadedStudyDates.dates.push(studyDate); + } + + } }); // If study date is loaded into viewport, set timepointLoaded property in Timepoints collection as true diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js index bf74bcc38..e7400e55d 100644 --- a/Packages/lesiontracker/package.js +++ b/Packages/lesiontracker/package.js @@ -47,6 +47,9 @@ Package.onUse(function (api) { api.addFiles('components/studyDateList/studyDateList.styl', 'client'); api.addFiles('components/studyDateList/studyDateList.js', 'client'); + api.addFiles('components/timepointTextDialog/timepointTextDialog.html', 'client'); + api.addFiles('components/timepointTextDialog/timepointTextDialog.styl', 'client'); + // Server functions api.addFiles('server/collections.js', 'server'); api.addFiles('server/removeCollections.js', ['server']); @@ -58,7 +61,6 @@ Package.onUse(function (api) { // Library functions api.addFiles('lib/uuid.js', 'client'); - api.export('Measurements', ['client', 'server']); api.export('Timepoints', ['client', 'server']); }); \ No newline at end of file