From b866e6e6c750c1183ac411108dc27f2eea5b0c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=ADzio=20Salgado?= Date: Mon, 23 Jan 2017 19:31:18 -0200 Subject: [PATCH] Removing ohif-cornerstone as a dependency for ohif-viewerbase. It should be added in the Viewer level. Avoiding error on temp measurements --- .../ohif-measurements/both/configuration/measurements.js | 6 +++++- Packages/ohif-viewerbase/package.js | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Packages/ohif-measurements/both/configuration/measurements.js b/Packages/ohif-measurements/both/configuration/measurements.js index e32512b4a..29cbc8c2f 100644 --- a/Packages/ohif-measurements/both/configuration/measurements.js +++ b/Packages/ohif-measurements/both/configuration/measurements.js @@ -201,7 +201,11 @@ class MeasurementApi { measurements.forEach(measurement => { delete measurement._id; - this.tools[measurement.toolType].insert(measurement); + // @TODO: check if this conditional is ok, because is throwing + // an error for temp measurements -> measurement.toolType is undefined + if(measurement.toolType && this.tools[measurement.toolType]) { + this.tools[measurement.toolType].insert(measurement); + } }); }); diff --git a/Packages/ohif-viewerbase/package.js b/Packages/ohif-viewerbase/package.js index 060a6db02..7aebf54cc 100644 --- a/Packages/ohif-viewerbase/package.js +++ b/Packages/ohif-viewerbase/package.js @@ -18,7 +18,6 @@ Package.onUse(function(api) { // Our custom packages api.use('ohif:design'); api.use('ohif:core'); - api.use('ohif:cornerstone'); api.use('ohif:log'); const assets = [