Merge branch 'master' into dev-react-proxy

This commit is contained in:
Danny Brown authored and GitHub committed 2019-06-18 21:05:13 -04:00
commit 39d844f106
86 files changed
+12853 -6202

No files matched your search

-42
View File
@@ -49,48 +49,6 @@ export default function() {
icon: 'angle-left',
active: false,
},
{
command: 'Bidirectional',
type: 'tool',
text: 'Bidirectional',
icon: 'measure-target',
active: false,
},
{
command: 'Brush',
type: 'tool',
text: 'Brush',
icon: 'circle',
active: false,
},
{
command: 'FreehandMouse',
type: 'tool',
text: 'Freehand',
icon: 'star',
active: false,
},
{
command: 'EllipticalRoi',
type: 'tool',
text: 'EllipticalRoi',
icon: 'oval',
active: false,
},
{
command: 'CircleRoi',
type: 'tool',
text: 'CircleRoi',
icon: 'dot-circle',
active: false,
},
{
command: 'RectangleRoi',
type: 'tool',
text: 'RectangleRoi',
icon: 'square-o',
active: false,
},
{
command: 'reset',
type: 'command',
+10 -4
View File
@@ -5,13 +5,19 @@ import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
* @param {String} baseDirectory
* @param {String} webWorkScriptsPath
*/
export default function(baseDirectory, webWorkScriptsPath) {
export default function initWebWorkers(
baseDirectory = '/',
webWorkScriptsPath = ''
) {
let scriptsPath = `${window.location.protocol}//${
window.location.host
}${baseDirectory}`;
if (webWorkScriptsPath) {
scriptsPath += `/${webWorkScriptsPath}/`;
}${baseDirectory}${webWorkScriptsPath}`;
// Ensure the last character is a slash
if (scriptsPath[scriptsPath.length - 1] !== '/') {
scriptsPath += '/';
}
const config = {
maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1),
startWebWorkersOnDemand: true,