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

fix: Address weird prefetching issues (#2574)

Browse Source 
* fix: Address weird prefetching issues

* bump cornerstoneTools version

* remove debugger
This commit is contained in:
Erik Ziegler 2021-10-04 09:27:50 +02:00 committed by GitHub
parent 1ec40d943d
commit ef06b7683f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/cornerstone/package.json
View File

@ -31,10 +31,10 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "^0.50.0", "@ohif/core": "^0.50.0",
"@ohif/ui": "^0.50.0", "@ohif/ui": "^0.50.0",
"cornerstone-core": "2.5.0", "cornerstone-core": "2.6.0",
"cornerstone-math": "0.1.9", "cornerstone-math": "0.1.9",
"cornerstone-tools": "5.1.2", "cornerstone-tools": "6.0.2",
"cornerstone-wado-image-loader": "4.0.3", "cornerstone-wado-image-loader": "4.0.4",
"dcmjs": "0.16.1", "dcmjs": "0.16.1",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
@ -47,6 +47,6 @@
"@babel/runtime": "7.7.6", "@babel/runtime": "7.7.6",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"lodash.debounce": "4.0.8", "lodash.debounce": "4.0.8",
"react-cornerstone-viewport": "4.1.1" "react-cornerstone-viewport": "4.1.2"
} }
} }

8
extensions/dicom-sr/package.json
View File

@ -31,16 +31,16 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "^0.50.0", "@ohif/core": "^0.50.0",
"@ohif/ui": "^0.50.0", "@ohif/ui": "^0.50.0",
"cornerstone-core": "^2.5.0", "cornerstone-core": "^2.6.0",
"cornerstone-math": "^0.1.9", "cornerstone-math": "^0.1.9",
"cornerstone-tools": "6.0.0", "cornerstone-tools": "6.0.2",
"cornerstone-wado-image-loader": "4.0.3", "cornerstone-wado-image-loader": "4.0.4",
"dcmjs": "0.16.1", "dcmjs": "0.16.1",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^17.0.2", "react": "^17.0.2",
"react-cornerstone-viewport": "4.1.1" "react-cornerstone-viewport": "4.1.2"
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "7.7.6", "@babel/runtime": "7.7.6",

6
extensions/measurement-tracking/package.json
View File

@ -29,12 +29,12 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "^0.50.0", "@ohif/core": "^0.50.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"cornerstone-core": "^2.5.0", "cornerstone-core": "^2.6.0",
"cornerstone-tools": "6.0.0", "cornerstone-tools": "6.0.2",
"dcmjs": "0.16.1", "dcmjs": "0.16.1",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^16.13.1", "react": "^16.13.1",
"react-cornerstone-viewport": "^4.1.1", "react-cornerstone-viewport": "^4.1.2",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"webpack": "^5.50.0", "webpack": "^5.50.0",
"webpack-merge": "^5.7.3" "webpack-merge": "^5.7.3"

2
package.json
View File

@ -53,7 +53,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": "7.7.6", "@babel/runtime": "7.7.6",
"core-js": "^3.2.1", "core-js": "^3.2.1",
"cornerstone-core": "2.5.0", "cornerstone-core": "2.6.0",
"wslink": "^0.1.8" "wslink": "^0.1.8"
}, },
"peerDependencies": { "peerDependencies": {

6
platform/core/package.json
View File

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

38
platform/core/src/classes/MetadataProvider.js
View File

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

6
platform/viewer/package.json
View File

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

32
yarn.lock
View File

@ -6094,28 +6094,28 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
cornerstone-core@2.5.0: cornerstone-core@2.6.0:
version "2.5.0" version "2.6.0"
resolved "https://registry.yarnpkg.com/cornerstone-core/-/cornerstone-core-2.5.0.tgz#1051ffc34420ad7484e61d2f3bdbc41a5ebc1956" resolved "https://registry.yarnpkg.com/cornerstone-core/-/cornerstone-core-2.6.0.tgz#6f7d97fe98ed462254d55557ffa13568592c211c"
integrity sha512-mJzvRJh8J7d5FJutjaL9cT8ZNnmj6l5PHROsyktZq1ojh4vkXfHECQ2izIQu8nmtJ9A6SyQRj4v5Uxn7hijzKw== integrity sha512-3sMy4Q2UZ9H4f2rYRAd3s4cntDutwSZQ3QlcYgsahoUxInb68MdmeLOKe8yyguwRT9LJ4CbgvOr2WsS8dOba4g==
cornerstone-math@0.1.9, cornerstone-math@^0.1.9: cornerstone-math@0.1.9, cornerstone-math@^0.1.9:
version "0.1.9" version "0.1.9"
resolved "https://registry.yarnpkg.com/cornerstone-math/-/cornerstone-math-0.1.9.tgz#7ce5509e8b9f465b01f7c548470725e7569859fc" resolved "https://registry.yarnpkg.com/cornerstone-math/-/cornerstone-math-0.1.9.tgz#7ce5509e8b9f465b01f7c548470725e7569859fc"
integrity sha512-NxdooV73asEQgav1S+0e+a4K+W3CXJdLXyFkVN24qqCtmIpzZzwtw3F9KWPCekzSAJmbhtQ3HicOQj3d4vRtuw== integrity sha512-NxdooV73asEQgav1S+0e+a4K+W3CXJdLXyFkVN24qqCtmIpzZzwtw3F9KWPCekzSAJmbhtQ3HicOQj3d4vRtuw==
cornerstone-tools@6.0.0: cornerstone-tools@6.0.2:
version "6.0.0" version "6.0.2"
resolved "https://registry.yarnpkg.com/cornerstone-tools/-/cornerstone-tools-6.0.0.tgz#6840658f4508e60cd206b17d6e56160367f616f1" resolved "https://registry.yarnpkg.com/cornerstone-tools/-/cornerstone-tools-6.0.2.tgz#6caa22865139c50c31652c9e39dcc611f159d112"
integrity sha512-VU4MrsO2NcQK6CUxuYFdiNvdWjF/NV/fs8jCePazYCoFDDKIYcUM9UmoYXAapFE2mon65p4u9wUAvuIuLeBQwA== integrity sha512-FDBRglsYHh248KZYc0+1/FZZOis9ZVWQZ/glaa0qE6Nvf3ReFr5ApJh7S7FnG9Nui1rhosiGqLpg3+59ouQtPA==
dependencies: dependencies:
"@babel/runtime" "7.1.2" "@babel/runtime" "7.1.2"
cornerstone-math "0.1.9" cornerstone-math "0.1.9"
cornerstone-wado-image-loader@4.0.3: cornerstone-wado-image-loader@4.0.4:
version "4.0.3" version "4.0.4"
resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.0.3.tgz#4848a238af9b10742af6d08e204527acf5260c25" resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.0.4.tgz#4f7f3e3a2e123ab59effe28045394ec24101dc59"
integrity sha512-0KuMC6+hEFsCwVOBH4idKwPpbLdccPzP7i5Ja4q7E/kfwCE71uL8AzHhx96XcLeFN8oR8T+nzv8X6j0lyY32SA== integrity sha512-AdroSRMPPEZLCOeXIrv2kQ0Bz+dr2BQbUR1QN0zOOlsaO2TQQBD+YdgXVqFs5XIAtZSs9+9fSCXlnGc71qLFlA==
dependencies: dependencies:
"@cornerstonejs/codec-charls" "^0.1.1" "@cornerstonejs/codec-charls" "^0.1.1"
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^0.0.7" "@cornerstonejs/codec-libjpeg-turbo-8bit" "^0.0.7"
@ -14717,10 +14717,10 @@ react-cornerstone-viewport@4.0.5:
prop-types "^15.7.2" prop-types "^15.7.2"
react-resize-detector "^4.2.1" react-resize-detector "^4.2.1"
react-cornerstone-viewport@4.1.1: react-cornerstone-viewport@4.1.2:
version "4.1.1" version "4.1.2"
resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-4.1.1.tgz#713536c031b1e1d0d9f58ad80ee34f15998e5759" resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-4.1.2.tgz#1c37645b62b6f4d48f447e2c2c6ba5c295e94f53"
integrity sha512-cJ3D7WglieGxcR49hivORk1YnSCQFbj8HVNj7JFaddix8jMqIkBpmbN5En5+8yM3ujgdj1n66uaLWNoP7JE9Qw== integrity sha512-ys9UHiVjLoDT/RQMvSs/4pgr/vCS+b56pA92RxzzJO30yZA2jvISm5gRO1cbuqlBPlfRHddJTgXHDErI4FAcSQ==
dependencies: dependencies:
classnames "^2.3.1" classnames "^2.3.1"
date-fns "^2.23.0" date-fns "^2.23.0"