fix: Address weird prefetching issues (#2574)

* fix: Address weird prefetching issues

* bump cornerstoneTools version

* remove debugger

platform/core/package.json

@@ -30,10 +30,10 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage"
   },
   "peerDependencies": {
-    "cornerstone-core": "^2.5.0",
-    "cornerstone-tools": "6.0.0",
+    "cornerstone-core": "^2.6.0",
+    "cornerstone-tools": "6.0.2",
     "cornerstone-math": "0.1.9",
-    "cornerstone-wado-image-loader": "4.0.3",
+    "cornerstone-wado-image-loader": "4.0.4",
     "dicom-parser": "^1.8.9",
     "@ohif/ui": "^1.8.2"
   },

platform/core/src/classes/MetadataProvider.js

@@ -244,7 +244,9 @@ class MetadataProvider {
       case WADO_IMAGE_LOADER_TAGS.IMAGE_PIXEL_MODULE:
         metadata = {
           samplesPerPixel: validNumber(instance.SamplesPerPixel),
-          photometricInterpretation: validNumber(instance.PhotometricInterpretation),
+          photometricInterpretation: validNumber(
+            instance.PhotometricInterpretation
+          ),
           rows: validNumber(instance.Rows),
           columns: validNumber(instance.Columns),
           bitsAllocated: validNumber(instance.BitsAllocated),
@@ -255,23 +257,28 @@ class MetadataProvider {
           pixelAspectRatio: validNumber(instance.PixelAspectRatio),
           smallestPixelValue: validNumber(instance.SmallestPixelValue),
           largestPixelValue: validNumber(instance.LargestPixelValue),
-          redPaletteColorLookupTableDescriptor:
-            validNumber(instance.RedPaletteColorLookupTableDescriptor),
-          greenPaletteColorLookupTableDescriptor:
-            validNumber(instance.GreenPaletteColorLookupTableDescriptor),
-          bluePaletteColorLookupTableDescriptor:
-            validNumber(instance.BluePaletteColorLookupTableDescriptor),
-          redPaletteColorLookupTableData:
-            validNumber(instance.RedPaletteColorLookupTableData),
-          greenPaletteColorLookupTableData:
-            validNumber(instance.GreenPaletteColorLookupTableData),
-          bluePaletteColorLookupTableData:
-            validNumber(instance.BluePaletteColorLookupTableData),
+          redPaletteColorLookupTableDescriptor: validNumber(
+            instance.RedPaletteColorLookupTableDescriptor
+          ),
+          greenPaletteColorLookupTableDescriptor: validNumber(
+            instance.GreenPaletteColorLookupTableDescriptor
+          ),
+          bluePaletteColorLookupTableDescriptor: validNumber(
+            instance.BluePaletteColorLookupTableDescriptor
+          ),
+          redPaletteColorLookupTableData: validNumber(
+            instance.RedPaletteColorLookupTableData
+          ),
+          greenPaletteColorLookupTableData: validNumber(
+            instance.GreenPaletteColorLookupTableData
+          ),
+          bluePaletteColorLookupTableData: validNumber(
+            instance.BluePaletteColorLookupTableData
+          ),
         };
 
         break;
       case WADO_IMAGE_LOADER_TAGS.VOI_LUT_MODULE:
-        debugger
         const { WindowCenter, WindowWidth } = instance;
         if (WindowCenter === undefined || WindowWidth === undefined) {
           return;
@@ -465,7 +472,6 @@ class MetadataProvider {
 
 const metadataProvider = new MetadataProvider();
 
-
 /**
  * Returns the values as an array of javascript numbers
  *
@@ -480,8 +486,6 @@ const validNumber = val => {
   }
 };
 
-
-
 export default metadataProvider;
 
 const WADO_IMAGE_LOADER_TAGS = {

platform/viewer/package.json

@@ -45,7 +45,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "cornerstone-core": "^2.5.0"
+    "cornerstone-core": "^2.6.0"
   },
   "dependencies": {
     "@babel/runtime": "7.7.6",
@@ -59,8 +59,8 @@
     "classnames": "^2.2.6",
     "core-js": "^3.16.1",
     "cornerstone-math": "^0.1.9",
-    "cornerstone-tools": "6.0.0",
-    "cornerstone-wado-image-loader": "4.0.3",
+    "cornerstone-tools": "6.0.2",
+    "cornerstone-wado-image-loader": "4.0.4",
     "dcmjs": "0.16.1",
     "dicom-parser": "^1.8.9",
     "dotenv-webpack": "^1.7.0",