Test branch for #143

cornerstonejs · Dec 8, 2017 · fc80696 · fc80696
1 parent 688312c
commit fc80696
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/dist/cornerstoneWADOImageLoader.js b/dist/cornerstoneWADOImageLoader.js
diff --git a/dist/cornerstoneWADOImageLoader.js.map b/dist/cornerstoneWADOImageLoader.js.map
diff --git a/dist/cornerstoneWADOImageLoader.min.js b/dist/cornerstoneWADOImageLoader.min.js
diff --git a/dist/cornerstoneWADOImageLoader.min.js.map b/dist/cornerstoneWADOImageLoader.min.js.map
diff --git a/dist/cornerstoneWADOImageLoaderWebWorker.js.map b/dist/cornerstoneWADOImageLoaderWebWorker.js.map
diff --git a/dist/cornerstoneWADOImageLoaderWebWorker.min.js.map b/dist/cornerstoneWADOImageLoaderWebWorker.min.js.map
diff --git a/examples/cornerstone.min.js b/examples/cornerstone.min.js
diff --git a/examples/cornerstone.min.js.map b/examples/cornerstone.min.js.map
diff --git a/src/imageLoader/createImage.js b/src/imageLoader/createImage.js
@@ -174,18 +174,18 @@ function createImage (imageId, pixelData, transferSyntax, options) {
         image.voiLUT = voiLutModule.voiLUTSequence[0];
       }
 
+      if (image.color) {
+        image.windowWidth = 255;
+        image.windowCenter = 127;
+      }
+
       // set the ww/wc to cover the dynamic range of the image if no values are supplied
       if (image.windowCenter === undefined || image.windowWidth === undefined) {
-        if (image.color) {
-          image.windowWidth = 255;
-          image.windowCenter = 128;
-        } else {
-          const maxVoi = image.maxPixelValue * image.slope + image.intercept;
-          const minVoi = image.minPixelValue * image.slope + image.intercept;
-
-          image.windowWidth = maxVoi - minVoi;
-          image.windowCenter = (maxVoi + minVoi) / 2;
-        }
+        const maxVoi = image.maxPixelValue * image.slope + image.intercept;
+        const minVoi = image.minPixelValue * image.slope + image.intercept;
+
+        image.windowWidth = maxVoi - minVoi;
+        image.windowCenter = (maxVoi + minVoi) / 2;
       }
       resolve(image);
     }, reject);