From c3f970cd2eece044ecb4e93b2a7ad29648449b8d Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Wed, 22 Feb 2017 11:19:29 -0500 Subject: [PATCH] Update cornerstoneWADOImageLoader to v0.14.2 --- .../client/cornerstoneWADOImageLoader.js | 10 +++++----- .../public/js/cornerstoneWADOImageLoaderCodecs.es5.js | 2 +- .../js/cornerstoneWADOImageLoaderWebWorker.es5.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Packages/ohif-cornerstone/client/cornerstoneWADOImageLoader.js b/Packages/ohif-cornerstone/client/cornerstoneWADOImageLoader.js index 0d1f54243..57ead9a85 100644 --- a/Packages/ohif-cornerstone/client/cornerstoneWADOImageLoader.js +++ b/Packages/ohif-cornerstone/client/cornerstoneWADOImageLoader.js @@ -1,4 +1,4 @@ -/*! cornerstone-wado-image-loader - v0.14.1 - 2017-02-11 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWADOImageLoader */ +/*! cornerstone-wado-image-loader - v0.14.2 - 2017-02-22 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWADOImageLoader */ // // This is a cornerstone image loader for WADO-URI requests. // @@ -92,11 +92,11 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){ // if the dataset for this url is already loaded, use it if(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.isLoaded(parsedImageId.url)) { - return loadDataSetFromPromise(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(parsedImageId.url, loader), imageId, parsedImageId.frame, parsedImageId.url, options); + return loadDataSetFromPromise(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(parsedImageId.url, loader, imageId), imageId, parsedImageId.frame, parsedImageId.url, options); } // load the dataSet via the dataSetCacheManager - return loadDataSetFromPromise(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(parsedImageId.url, loader), imageId, parsedImageId.frame, parsedImageId.url, options); + return loadDataSetFromPromise(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(parsedImageId.url, loader, imageId), imageId, parsedImageId.frame, parsedImageId.url, options); } // register dicomweb and wadouri image loader prefixes @@ -1197,7 +1197,7 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){ // loads the dicom dataset from the wadouri sp - function load(uri, loadRequest) { + function load(uri, loadRequest, imageId) { loadRequest = loadRequest || cornerstoneWADOImageLoader.internal.xhrRequest; @@ -1219,7 +1219,7 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){ //console.log('loading ' + uri); // This uri is not loaded or being loaded, load it via an xhrRequest - var promise = loadRequest(uri); + var promise = loadRequest(uri, imageId); promises[uri] = promise; // handle success and failure of the XHR request load diff --git a/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js b/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js index 2586cdc3d..a93768442 100644 --- a/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js +++ b/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js @@ -1,4 +1,4 @@ -/*! cornerstone-wado-image-loader - v0.14.1 - 2017-02-11 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWADOImageLoader */ +/*! cornerstone-wado-image-loader - v0.14.2 - 2017-02-22 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWADOImageLoader */ /*! CharLS.js - v2.0.1 - 2016-06-08 | (c) 2016 Chris Hafey | https://github.com/chafey/charls */ var CharLS = function(Module) { Module = Module || {}; diff --git a/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js b/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js index 8d42bc5f0..7df6e4569 100644 --- a/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js +++ b/Packages/ohif-cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js @@ -1,4 +1,4 @@ -/*! cornerstone-wado-image-loader - v0.14.1 - 2017-02-11 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWADOImageLoader */ +/*! cornerstone-wado-image-loader - v0.14.2 - 2017-02-22 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWADOImageLoader */ cornerstoneWADOImageLoaderWebWorker = { registerTaskHandler : undefined