From f0fe96fb195c8ea3405bbe1f1914ef771ad17eb4 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Thu, 23 Feb 2017 12:02:45 +0100
Subject: [PATCH] Add WebWorker configuration to StandaloneViewer. Fix issue
 with displaySet sorting

---
 .../client/components/viewer/viewer.js        |  2 ++
 .../StandaloneViewer/client/config.js         | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 StandaloneViewer/StandaloneViewer/client/config.js

diff --git a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js
index f0d52c6a6..4cb4ad7cb 100644
--- a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js
+++ b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js
@@ -52,6 +52,8 @@ Template.viewer.onCreated(() => {
     ViewerData[contentId].studyInstanceUids = [];
     instance.data.studies.forEach(study => {
         study.selected = true;
+        const studyMetadata = new OHIF.metadata.StudyMetadata(study);
+        study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
         OHIF.viewer.Studies.insert(study);
         ViewerData[contentId].studyInstanceUids.push(study.studyInstanceUid);
     });
diff --git a/StandaloneViewer/StandaloneViewer/client/config.js b/StandaloneViewer/StandaloneViewer/client/config.js
new file mode 100644
index 000000000..ce8c5a6fd
--- /dev/null
+++ b/StandaloneViewer/StandaloneViewer/client/config.js
@@ -0,0 +1,21 @@
+import { Meteor } from 'meteor/meteor';
+import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone';
+
+Meteor.startup(function() {
+	const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1);
+    const config = {
+	    maxWebWorkers: maxWebWorkers,	
+    	startWebWorkersOnDemand: true,
+        webWorkerPath : Meteor.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'),
+        taskConfiguration: {
+            'decodeTask' : {
+		        loadCodecsOnStartup : true,
+		        initializeCodecsOnStartup: false,
+                codecsPath: Meteor.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'),
+                usePDFJS: false
+            }
+        }
+    };
+
+    cornerstoneWADOImageLoader.webWorkerManager.initialize(config);
+});
\ No newline at end of file