TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix base URL usage for web workers

Browse Source
This commit is contained in:
Erik Ziegler 2018-12-17 23:08:26 +01:00
parent 4a3a0aa394
commit 09ac6ee347
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OHIFViewer-react/src/config.js
View File

@ -7,10 +7,12 @@ import Hammer from 'hammerjs';
import OHIF from 'ohif-core'; import OHIF from 'ohif-core';
import sha from './sha.js'; import sha from './sha.js';
import version from './version.js'; import version from './version.js';
import { homepage } from '../package.json';
window.info = { window.info = {
sha, sha,
version version,
homepage
}; };
cornerstoneTools.external.cornerstone = cornerstone; cornerstoneTools.external.cornerstone = cornerstone;
@ -21,16 +23,25 @@ cornerstoneTools.init();
cornerstoneWADOImageLoader.external.cornerstone = cornerstone; cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
cornerstoneWADOImageLoader.external.dicomParser = dicomParser; cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
// TODO: find a better way to get app root URL other than window.location.origin // TODO: Is there a better way to guess ROOT_URL?
let ROOT_URL = homepage;
// If the page we are on is not a subset of the expected homepage
// provided in the package.json file, we might be doing local development.
// In this case, set the base URL to the current location's origin.
if (homepage.includes(window.location.origin) === false) {
ROOT_URL = window.location.origin;
}
const config = { const config = {
maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1), maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1),
startWebWorkersOnDemand: true, startWebWorkersOnDemand: true,
webWorkerPath: window.location.origin + '/cornerstoneWADOImageLoaderWebWorker.min.js', webWorkerPath: ROOT_URL + '/cornerstoneWADOImageLoaderWebWorker.min.js',
taskConfiguration: { taskConfiguration: {
decodeTask: { decodeTask: {
loadCodecsOnStartup: true, loadCodecsOnStartup: true,
initializeCodecsOnStartup: false, initializeCodecsOnStartup: false,
codecsPath: window.location.origin + '/cornerstoneWADOImageLoaderCodecs.min.js', codecsPath: ROOT_URL + '/cornerstoneWADOImageLoaderCodecs.min.js',
usePDFJS: false, usePDFJS: false,
strict: false strict: false
} }