feat(dicomImageLoader): replace wado image loader with the new library (#3339)
* use new dicom image loader instead of cswil new dicom image loader fails update dicom image loader update yarn lock modify webpack * update webpack * fix webpack * update package versions * update package versions
This commit is contained in:
1 parent
66863281c4
commit
eea0ed487b
16 files changed
+80
-93
No files matched your search
@@ -34,7 +34,11 @@
|
||||
"peerDependencies": {
|
||||
"@ohif/core": "^3.0.0",
|
||||
"@ohif/ui": "^2.0.0",
|
||||
"cornerstone-wado-image-loader": "^4.13.0",
|
||||
"@cornerstonejs/dicom-image-loader": "^0.4.0",
|
||||
"@cornerstonejs/codec-charls": "^1.2.3",
|
||||
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
|
||||
"@cornerstonejs/codec-openjpeg": "^1.2.2",
|
||||
"@cornerstonejs/codec-openjph": "^2.4.2",
|
||||
"dcmjs": "^0.29.5",
|
||||
"dicom-parser": "^1.8.9",
|
||||
"hammerjs": "^2.0.8",
|
||||
@@ -50,8 +54,8 @@
|
||||
"@babel/runtime": "^7.20.13",
|
||||
"@cornerstonejs/adapters": "^0.6.0",
|
||||
"@cornerstonejs/core": "^0.42.2",
|
||||
"@cornerstonejs/streaming-image-volume-loader": "^0.16.2",
|
||||
"@cornerstonejs/tools": "^0.63.2",
|
||||
"@cornerstonejs/streaming-image-volume-loader": "^0.18.0",
|
||||
"@cornerstonejs/tools": "^0.65.0",
|
||||
"@kitware/vtk.js": "26.5.6",
|
||||
"html2canvas": "^1.4.1",
|
||||
"lodash.debounce": "4.0.8",
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import * as cornerstone from '@cornerstonejs/core';
|
||||
import { volumeLoader } from '@cornerstonejs/core';
|
||||
import { cornerstoneStreamingImageVolumeLoader } from '@cornerstonejs/streaming-image-volume-loader';
|
||||
import cornerstoneWADOImageLoader, {
|
||||
import dicomImageLoader, {
|
||||
webWorkerManager,
|
||||
} from 'cornerstone-wado-image-loader';
|
||||
} from '@cornerstonejs/dicom-image-loader';
|
||||
import dicomParser from 'dicom-parser';
|
||||
import { errorHandler } from '@ohif/core';
|
||||
|
||||
@@ -28,7 +28,7 @@ function initWebWorkers(appConfig) {
|
||||
};
|
||||
|
||||
if (!initialized) {
|
||||
cornerstoneWADOImageLoader.webWorkerManager.initialize(config);
|
||||
dicomImageLoader.webWorkerManager.initialize(config);
|
||||
initialized = true;
|
||||
}
|
||||
}
|
||||
@@ -37,18 +37,18 @@ export default function initWADOImageLoader(
|
||||
userAuthenticationService,
|
||||
appConfig
|
||||
) {
|
||||
cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
|
||||
cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
|
||||
dicomImageLoader.external.cornerstone = cornerstone;
|
||||
dicomImageLoader.external.dicomParser = dicomParser;
|
||||
|
||||
registerVolumeLoader(
|
||||
'cornerstoneStreamingImageVolume',
|
||||
cornerstoneStreamingImageVolumeLoader
|
||||
);
|
||||
|
||||
cornerstoneWADOImageLoader.configure({
|
||||
dicomImageLoader.configure({
|
||||
decodeConfig: {
|
||||
// !! IMPORTANT !!
|
||||
// We should set this flag to false, since, by default cornerstone-wado-image-loader
|
||||
// We should set this flag to false, since, by default @cornerstonejs/dicom-image-loader
|
||||
// will convert everything to integers (to be able to work with cornerstone-2d).
|
||||
// Until the default is set to true (which is the case for cornerstone3D),
|
||||
// we should set this flag to false.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { imageLoader } from '@cornerstonejs/core';
|
||||
import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
|
||||
import dicomImageLoader from '@cornerstonejs/dicom-image-loader';
|
||||
import { api } from 'dicomweb-client';
|
||||
import { DICOMWeb, errorHandler } from '@ohif/core';
|
||||
|
||||
@@ -114,7 +114,7 @@ class DicomLoaderService {
|
||||
}
|
||||
|
||||
if (!someInvalidStrings(imageId)) {
|
||||
return cornerstoneWADOImageLoader.wadouri.loadFileRequest(imageId);
|
||||
return dicomImageLoader.wadouri.loadFileRequest(imageId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user