From 3caab55b44dd1338fbe81424f6ea673dcadb91f2 Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Thu, 3 Dec 2015 17:20:12 -0500 Subject: [PATCH] OHIFVIEWER-14 For time points with overlays, the image box display shall default to the first overlay --- LesionTracker/client/components/viewer.js | 13 +++++++++++++ Packages/lesiontracker/package.js | 3 +++ 2 files changed, 16 insertions(+) diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js index 29dc1b671..4119605ca 100644 --- a/LesionTracker/client/components/viewer.js +++ b/LesionTracker/client/components/viewer.js @@ -18,6 +18,9 @@ function resizeViewports() { Template.viewer.onCreated(function() { var self = this; + + var firstMeasurementsActivated = false; + log.info("viewer onCreated"); OHIF = { @@ -141,11 +144,21 @@ Template.viewer.onCreated(function() { // Cornerstone ToolData structure Measurements.find().observe({ added: function (data) { + if (data.toolDataInsertedManually === true) { + + // Activate first measurements in image box as default if exists + if (!firstMeasurementsActivated) { + var templateData = {contentId: Session.get("activeContentId")}; + // Activate measurement + activateLesion(data._id, templateData); + firstMeasurementsActivated = true; + } return; } log.info('Measurement added'); + addMeasurementAsToolData(data); } }); diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js index e7400e55d..9ec7b072d 100644 --- a/Packages/lesiontracker/package.js +++ b/Packages/lesiontracker/package.js @@ -61,6 +61,9 @@ Package.onUse(function (api) { // Library functions api.addFiles('lib/uuid.js', 'client'); + // Export lesionTable function for activate measurements + api.export('activateLesion','client'); + api.export('Measurements', ['client', 'server']); api.export('Timepoints', ['client', 'server']); }); \ No newline at end of file