* feat: add initial sop class handler for SEG * feat: move segmentation service * update segmentation service methods * fix: viewport data structure * feat: Add initial render for the DICOM SEG for each displaySet * fix: various wrong architectural dependencies between services * feat: initial separate SEG display in each viewport * feat: refactore viewport action bar * initial work for SEG hydration * fix: various bugs regarding drag and dropping different viewports * fix: rendering issues for multiple seg displaysets * fix: bugs for thumbnail and hydration * feat: fix the initial segment color * update after rebase * feat: initial design for the segmentation group table * feat: initial new design for the segmentation panel * feat: segmentation panel * feat: make segmentation appear on all related viewports * fix: segmentation load bug based on functional groups * initial work for segmentation crosshairs * fix: various stylings and functionality * fix: various stylings for the seg panel * fix: overflow styles * feat: add more ui components * feat: added segmentation config * feat: add jump to segment * feat: add jump to segment for DICOM SEG viewport * fix: bugs after rebase * feat: jump in segmentation viewport * fix: mpr support for seg * feat: add more icons * feat: new icons * feat: add new side panel * feat: add segmentation config * feat: add loading indicator to ohif * feat: make hanging protocols follow matching rules for viewports * feat: enhance drag and drop to be hanging protocol aware * fix: mpr restore previous layout * fix: crosshairs toggle * fix: add auth headers to the dicom loader via dicomwebclient * fix: bug for crosshairs toggle in mpr * fix: seg viewport reusing old toolGroup * feat: add loading animation with lottie * fix: various bugs for Segmentation hydration in mpr * feat: change outline alpha to outline opacity * feat: loading indicator for seg viewport * fix: various segmentation group styles * fix: local mode for seg * feat: add animation for the highlight * fix: loading indicatro to show segment indices * feat: enhance modality drop down ui * fix: panels * fix: download form * fix: layout shift in loading indicator * fix: loading indicator to have correct values * fix: update software number * fix: image jump between MPR and default * fix: segmentation cleanup and cine service cleanup * fix: segmentation toolgroup clena up * fix: highlight interval should not trigger again * fix: issue with multiframe sorting * rename: change onSeriesChange to onArrowsClick * fix: buttons for tmtv and layout shift * fix: various bugs wrt crosshairs * fix: crosshairs re init on reset camera * fix: middle slice calculation different from cs middle reset camera * fix: reset camera should reset viewport camera * fix: loading segments in MPR mode * fix: tmtv hp back to before * fix: layout shift * feat: orientation markers for volume viewport * fix: capture for volume viewports * fix: memory leak for back to worklist * fix: loading bar bg color * fix: side panel for only one panel * fix: react select style in production * fix: various styling for segmentation groups * fix: various ui styles * feat: add new segmentation config styles * fix: hover state for segmentation item * fix: side panel layout shift * temp add panels * try to fix scrollbar for thimbnail * fix: scroll not appearing for side panels * feat: changed styles for scrollbar * feat: add cpu fallback warning * fix: webworker destroy * fix: select styles * fix: orientation marker color and position * fix: capture screenshot for volume viewports * fix: hide segment visibility on mpr * fix: reloading an already loaded seg displayset * feat: add is equal * fix: mpr jump to measurements * apply review comments * fix: optimization for the segmentation load * fix: remove unnecessary context menu and hp service reset * fix: segmentation service wrt brush settings * feat: initial work for the stack synchronization * fix: add validateDisplaySetSelectorsForNewDisplaySets to make sure drag and drop can follow requirements * fix: various react proptypes * fix: thumbnails for the tmtv and change default props to default params * feat: make showing loading indicator configurable and add docs * bump versions and add more docs * fix demo * update cornerstone versions * apply review comments * feat: add reference lines * fix build * fix unit tests * add reference lines icon * fix: e2e tests * fix static wado config * docs: add segmentation service docs * fix: docker build * fix: keep camera and bump versions * Try re-enabling minification to fix deploy previews Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>
95 lines
3.1 KiB
JavaScript
95 lines
3.1 KiB
JavaScript
import * as cornerstone from '@cornerstonejs/core';
|
|
import { volumeLoader } from '@cornerstonejs/core';
|
|
import { cornerstoneStreamingImageVolumeLoader } from '@cornerstonejs/streaming-image-volume-loader';
|
|
import cornerstoneWADOImageLoader, {
|
|
webWorkerManager,
|
|
} from 'cornerstone-wado-image-loader';
|
|
import dicomParser from 'dicom-parser';
|
|
import { errorHandler } from '@ohif/core';
|
|
|
|
const { registerVolumeLoader } = volumeLoader;
|
|
|
|
let initialized = false;
|
|
|
|
function initWebWorkers(appConfig) {
|
|
const config = {
|
|
maxWebWorkers: Math.min(
|
|
Math.max(navigator.hardwareConcurrency - 1, 1),
|
|
appConfig.maxNumberOfWebWorkers
|
|
),
|
|
startWebWorkersOnDemand: true,
|
|
taskConfiguration: {
|
|
decodeTask: {
|
|
initializeCodecsOnStartup: false,
|
|
usePDFJS: false,
|
|
strict: false,
|
|
},
|
|
},
|
|
};
|
|
|
|
if (!initialized) {
|
|
cornerstoneWADOImageLoader.webWorkerManager.initialize(config);
|
|
initialized = true;
|
|
}
|
|
}
|
|
|
|
export default function initWADOImageLoader(
|
|
UserAuthenticationService,
|
|
appConfig
|
|
) {
|
|
cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
|
|
cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
|
|
|
|
registerVolumeLoader(
|
|
'cornerstoneStreamingImageVolume',
|
|
cornerstoneStreamingImageVolumeLoader
|
|
);
|
|
|
|
cornerstoneWADOImageLoader.configure({
|
|
decodeConfig: {
|
|
// !! IMPORTANT !!
|
|
// We should set this flag to false, since, by default cornerstone-wado-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.
|
|
convertFloatPixelDataToInt: false,
|
|
},
|
|
beforeSend: function(xhr) {
|
|
const headers = UserAuthenticationService.getAuthorizationHeader();
|
|
|
|
// Request:
|
|
// JPEG-LS Lossless (1.2.840.10008.1.2.4.80) if available, otherwise accept
|
|
// whatever transfer-syntax the origin server provides.
|
|
// For now we use image/jls and image/x-jls because some servers still use the old type
|
|
// http://dicom.nema.org/medical/dicom/current/output/html/part18.html
|
|
const xhrRequestHeaders = {
|
|
Accept: appConfig.omitQuotationForMultipartRequest
|
|
? 'multipart/related; type=application/octet-stream'
|
|
: 'multipart/related; type="application/octet-stream"',
|
|
// 'multipart/related; type="image/x-jls", multipart/related; type="image/jls"; transfer-syntax="1.2.840.10008.1.2.4.80", multipart/related; type="image/x-jls", multipart/related; type="application/octet-stream"; transfer-syntax=*',
|
|
};
|
|
|
|
if (headers && headers.Authorization) {
|
|
xhrRequestHeaders.Authorization = headers.Authorization;
|
|
}
|
|
|
|
return xhrRequestHeaders;
|
|
},
|
|
errorInterceptor: error => {
|
|
errorHandler.getHTTPErrorHandler(error);
|
|
},
|
|
});
|
|
|
|
initWebWorkers(appConfig);
|
|
}
|
|
|
|
export function destroy() {
|
|
// Note: we don't want to call .terminate on the webWorkerManager since
|
|
// that resets the config
|
|
const webWorkers = webWorkerManager.webWorkers;
|
|
for (let i = 0; i < webWorkers.length; i++) {
|
|
webWorkers[i].worker.terminate();
|
|
}
|
|
webWorkers.length = 0;
|
|
}
|