@ohif/app 3.7.0-beta.11 → 3.7.0-beta.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{192.bundle.950e5380ea63c6d635d5.js → 192.bundle.5f762ba69769ef923535.js} +2 -2
- package/dist/{199.bundle.f50ffd85a4334de2f5c1.js → 199.bundle.a4bd8952069b17b3d8fb.js} +2 -2
- package/dist/{208.bundle.7f610a302dc54c4924da.js → 208.bundle.1734676233f1f8fcead0.js} +2 -2
- package/dist/{270.bundle.4564621556b0f963a004.js → 270.bundle.cddac4adcfdf8d1082a3.js} +13 -7
- package/dist/{283.bundle.1015e87c3a47b1f1379c.js → 283.bundle.ba2bb891292c4b7e7418.js} +2 -2
- package/dist/{331.bundle.bd0c13931a21d53086c9.js → 331.bundle.af86275686a78739ec4c.js} +27 -13
- package/dist/{351.bundle.0742237651aef9694a65.js → 351.bundle.bbd6e3b383ac731edc94.js} +2 -2
- package/dist/{404.bundle.3d65ff813eead20462d3.js → 404.bundle.91c6794d3955c76a93f8.js} +2 -2
- package/dist/{55.bundle.550a823e75eb608e8d5e.js → 55.bundle.e9bf24eb17d84049c640.js} +2 -2
- package/dist/{569.bundle.c8e771a8d28e237b32be.js → 569.bundle.a014357d3ff0c926d1a8.js} +2 -2
- package/dist/{581.bundle.dc6197189f7c88c27d4c.js → 581.bundle.0b1b8273eb694c11366d.js} +2 -2
- package/dist/{616.bundle.de530ae226dfa5573f6e.js → 616.bundle.d6f12d52b49dce5d20b3.js} +2 -2
- package/dist/{642.bundle.8905e515ce593e57ceb1.js → 642.bundle.fe6fa51ba40a21b17fbf.js} +2 -2
- package/dist/{707.bundle.f774f3e4a687ddd60a32.js → 707.bundle.c875e0967c559d65616c.js} +8 -13
- package/dist/{744.bundle.4c4b884f90eb70482821.js → 744.bundle.47404045b080c55244c0.js} +4 -4
- package/dist/{790.bundle.7327fec7833ceea2784b.js → 790.bundle.20bec15da7ab3ecaa96e.js} +2 -2
- package/dist/{799.bundle.758558e64147e5aad612.js → 799.bundle.f42a53c72bd5e9074d2b.js} +1 -1
- package/dist/{82.bundle.9a0e7f08d4bce18d302f.js → 82.bundle.4f04c4542cbfcd49e4ee.js} +34 -28
- package/dist/{917.bundle.b9983325adf849bff6fd.js → 917.bundle.89cafb960923c8dda5f7.js} +2 -2
- package/dist/{953.bundle.3b0189ebc11cf0946f18.js → 953.bundle.bad442420f62f5ab0c4b.js} +1 -1
- package/dist/{973.bundle.4584df05b320b94cace5.js → 973.bundle.a357832f67c0aa11877e.js} +2 -2
- package/dist/{976.bundle.9cc2382162214ea0af2b.js → 976.bundle.5d8ca68dbf70b191ca7d.js} +2 -2
- package/dist/{984.bundle.119557c018e6371b4628.js → 984.bundle.458ba8b6b4a204997328.js} +4 -4
- package/dist/app-config.js +1 -2
- package/dist/{app.bundle.3d598a4738bdc22950d3.js → app.bundle.cb2eacd0efd6f09ffeda.js} +65 -11
- package/dist/cornerstoneDICOMImageLoader.min.js +1 -1
- package/dist/cornerstoneDICOMImageLoader.min.js.map +1 -1
- package/dist/google.js +1 -1
- package/dist/index.html +1 -1
- package/dist/sw.js +1 -1
- package/package.json +19 -19
- /package/dist/{50.bundle.65ff60818862eda39d12.js → 50.bundle.7c1bf535767bb218e438.js} +0 -0
|
@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
14
14
|
toolbarButtons: () => (/* reexport */ src_toolbarButtons)
|
|
15
15
|
});
|
|
16
16
|
|
|
17
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
18
|
-
var src = __webpack_require__(
|
|
17
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
18
|
+
var src = __webpack_require__(62771);
|
|
19
19
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
20
20
|
var ui_src = __webpack_require__(28619);
|
|
21
21
|
;// CONCATENATED MODULE: ../../../modes/longitudinal/src/toolbarButtons.js
|
|
@@ -22,8 +22,8 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
|
|
|
22
22
|
|
|
23
23
|
// EXTERNAL MODULE: ../../../node_modules/react/index.js
|
|
24
24
|
var react = __webpack_require__(32735);
|
|
25
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
26
|
-
var src = __webpack_require__(
|
|
25
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
26
|
+
var src = __webpack_require__(62771);
|
|
27
27
|
// EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
|
|
28
28
|
var dcmjs_es = __webpack_require__(22737);
|
|
29
29
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/loadRTStruct.js
|
|
@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
12
12
|
"default": () => (/* binding */ basic_test_mode_src)
|
|
13
13
|
});
|
|
14
14
|
|
|
15
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
16
|
-
var src = __webpack_require__(
|
|
15
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
16
|
+
var src = __webpack_require__(62771);
|
|
17
17
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
18
18
|
var ui_src = __webpack_require__(28619);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/toolbarButtons.js
|
|
@@ -8483,6 +8483,7 @@ function _applyShift(viewport, delta) {
|
|
|
8483
8483
|
|
|
8484
8484
|
|
|
8485
8485
|
|
|
8486
|
+
|
|
8486
8487
|
class MIPJumpToClickTool extends base_BaseTool {
|
|
8487
8488
|
constructor(toolProps = {}, defaultToolProps = {
|
|
8488
8489
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -8512,9 +8513,16 @@ class MIPJumpToClickTool extends base_BaseTool {
|
|
|
8512
8513
|
if (!brightestPoint || !brightestPoint.length) {
|
|
8513
8514
|
return;
|
|
8514
8515
|
}
|
|
8515
|
-
const { targetViewportIds } = this.configuration;
|
|
8516
|
-
|
|
8517
|
-
|
|
8516
|
+
const { targetViewportIds, toolGroupId } = this.configuration;
|
|
8517
|
+
const viewports = renderingEngine.getViewports().filter((vp) => {
|
|
8518
|
+
if (targetViewportIds?.indexOf(vp.id) >= 0)
|
|
8519
|
+
return true;
|
|
8520
|
+
const foundToolGroup = ToolGroupManager_getToolGroupForViewport(vp.id, renderingEngine.id);
|
|
8521
|
+
if (toolGroupId && toolGroupId === foundToolGroup?.id)
|
|
8522
|
+
return true;
|
|
8523
|
+
return false;
|
|
8524
|
+
});
|
|
8525
|
+
viewports.forEach((viewport) => {
|
|
8518
8526
|
if (viewport instanceof esm.VolumeViewport) {
|
|
8519
8527
|
jumpToWorld(viewport, brightestPoint);
|
|
8520
8528
|
}
|
|
@@ -16299,7 +16307,6 @@ PlanarFreehandROITool.toolName = 'PlanarFreehandROI';
|
|
|
16299
16307
|
|
|
16300
16308
|
|
|
16301
16309
|
|
|
16302
|
-
|
|
16303
16310
|
class ArrowAnnotateTool extends base_AnnotationTool {
|
|
16304
16311
|
constructor(toolProps = {}, defaultToolProps = {
|
|
16305
16312
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -16646,7 +16653,7 @@ class ArrowAnnotateTool extends base_AnnotationTool {
|
|
|
16646
16653
|
continue;
|
|
16647
16654
|
}
|
|
16648
16655
|
if (!data.handles.textBox.hasMoved) {
|
|
16649
|
-
const canvasTextBoxCoords =
|
|
16656
|
+
const canvasTextBoxCoords = canvasCoordinates[1];
|
|
16650
16657
|
data.handles.textBox.worldPosition =
|
|
16651
16658
|
viewport.canvasToWorld(canvasTextBoxCoords);
|
|
16652
16659
|
}
|
|
@@ -16731,7 +16738,6 @@ ArrowAnnotateTool.toolName = 'ArrowAnnotate';
|
|
|
16731
16738
|
|
|
16732
16739
|
|
|
16733
16740
|
|
|
16734
|
-
|
|
16735
16741
|
class AngleTool extends base_AnnotationTool {
|
|
16736
16742
|
constructor(toolProps = {}, defaultToolProps = {
|
|
16737
16743
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -17064,7 +17070,7 @@ class AngleTool extends base_AnnotationTool {
|
|
|
17064
17070
|
}
|
|
17065
17071
|
const textLines = this._getTextLines(data, targetId);
|
|
17066
17072
|
if (!data.handles.textBox.hasMoved) {
|
|
17067
|
-
const canvasTextBoxCoords =
|
|
17073
|
+
const canvasTextBoxCoords = canvasCoordinates[1];
|
|
17068
17074
|
data.handles.textBox.worldPosition =
|
|
17069
17075
|
viewport.canvasToWorld(canvasTextBoxCoords);
|
|
17070
17076
|
}
|
|
@@ -660,8 +660,8 @@ var prop_types = __webpack_require__(60216);
|
|
|
660
660
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
661
661
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
662
662
|
var src = __webpack_require__(28619);
|
|
663
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
664
|
-
var core_src = __webpack_require__(
|
|
663
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
664
|
+
var core_src = __webpack_require__(62771);
|
|
665
665
|
// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
|
|
666
666
|
var es = __webpack_require__(21572);
|
|
667
667
|
;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelPetSUV.tsx
|
|
@@ -46342,8 +46342,7 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
|
|
|
46342
46342
|
const cfun = volumeActor.getProperty().getRGBTransferFunction(0);
|
|
46343
46343
|
const [lower, upper] = this.VOILUTFunction === 'SIGMOID'
|
|
46344
46344
|
? getVoiFromSigmoidRGBTransferFunction(cfun)
|
|
46345
|
-
:
|
|
46346
|
-
cfun.getRange();
|
|
46345
|
+
: cfun.getRange();
|
|
46347
46346
|
return { volumeId, voiRange: { lower, upper } };
|
|
46348
46347
|
})
|
|
46349
46348
|
.filter(Boolean);
|
|
@@ -46499,8 +46498,8 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
|
|
|
46499
46498
|
const mapper = volumeActor.getMapper();
|
|
46500
46499
|
mapper.setSampleDistance(1.0);
|
|
46501
46500
|
const cfun = ColorTransferFunction/* default.newInstance */.ZP.newInstance();
|
|
46502
|
-
let colormapObj = colormap_getColormap(colormap);
|
|
46503
|
-
const { name
|
|
46501
|
+
let colormapObj = colormap_getColormap(colormap.name);
|
|
46502
|
+
const { name } = colormap;
|
|
46504
46503
|
if (!colormapObj) {
|
|
46505
46504
|
colormapObj = ColorMaps_vtkColorMaps.getPresetByName(name);
|
|
46506
46505
|
}
|
|
@@ -46514,16 +46513,28 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
|
|
|
46514
46513
|
cfun.applyColorMap(colormapObj);
|
|
46515
46514
|
cfun.setMappingRange(range[0], range[1]);
|
|
46516
46515
|
volumeActor.getProperty().setRGBTransferFunction(0, cfun);
|
|
46517
|
-
|
|
46518
|
-
|
|
46519
|
-
|
|
46520
|
-
|
|
46521
|
-
if (!opacityMapping) {
|
|
46516
|
+
}
|
|
46517
|
+
setOpacity(colormap, volumeId) {
|
|
46518
|
+
const applicableVolumeActorInfo = this._getApplicableVolumeActor(volumeId);
|
|
46519
|
+
if (!applicableVolumeActorInfo) {
|
|
46522
46520
|
return;
|
|
46523
46521
|
}
|
|
46524
|
-
|
|
46525
|
-
|
|
46526
|
-
|
|
46522
|
+
const { volumeActor } = applicableVolumeActorInfo;
|
|
46523
|
+
const ofun = PiecewiseFunction/* default.newInstance */.ZP.newInstance();
|
|
46524
|
+
if (typeof colormap.opacity === 'number') {
|
|
46525
|
+
const range = volumeActor
|
|
46526
|
+
.getProperty()
|
|
46527
|
+
.getRGBTransferFunction(0)
|
|
46528
|
+
.getRange();
|
|
46529
|
+
ofun.addPoint(range[0], colormap.opacity);
|
|
46530
|
+
ofun.addPoint(range[1], colormap.opacity);
|
|
46531
|
+
}
|
|
46532
|
+
else {
|
|
46533
|
+
colormap.opacity.forEach(({ opacity, value }) => {
|
|
46534
|
+
ofun.addPoint(value, opacity);
|
|
46535
|
+
});
|
|
46536
|
+
}
|
|
46537
|
+
volumeActor.getProperty().setScalarOpacity(0, ofun);
|
|
46527
46538
|
}
|
|
46528
46539
|
setInvert(invert, volumeId, suppressEvents) {
|
|
46529
46540
|
const applicableVolumeActorInfo = this._getApplicableVolumeActor(volumeId);
|
|
@@ -46598,9 +46609,12 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
|
|
|
46598
46609
|
}
|
|
46599
46610
|
}
|
|
46600
46611
|
setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, } = {}, volumeId, suppressEvents = false) {
|
|
46601
|
-
if (colormap
|
|
46612
|
+
if (colormap?.name) {
|
|
46602
46613
|
this.setColormap(colormap, volumeId, suppressEvents);
|
|
46603
46614
|
}
|
|
46615
|
+
if (colormap?.opacity != null) {
|
|
46616
|
+
this.setOpacity(colormap, volumeId);
|
|
46617
|
+
}
|
|
46604
46618
|
if (voiRange !== undefined) {
|
|
46605
46619
|
this.setVOI(voiRange, volumeId, suppressEvents);
|
|
46606
46620
|
}
|
|
@@ -23,8 +23,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
|
23
23
|
var esm = __webpack_require__(57270);
|
|
24
24
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
|
|
25
25
|
var dist_esm = __webpack_require__(77331);
|
|
26
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
27
|
-
var src = __webpack_require__(
|
|
26
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
27
|
+
var src = __webpack_require__(62771);
|
|
28
28
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
29
29
|
var ui_src = __webpack_require__(28619);
|
|
30
30
|
// EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
|
|
@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
12
12
|
"default": () => (/* binding */ tmtv_src)
|
|
13
13
|
});
|
|
14
14
|
|
|
15
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
16
|
-
var src = __webpack_require__(
|
|
15
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
16
|
+
var src = __webpack_require__(62771);
|
|
17
17
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
18
18
|
var ui_src = __webpack_require__(28619);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../modes/tmtv/src/initToolGroups.js
|
|
@@ -251,8 +251,8 @@ const itemGenerator = props => {
|
|
|
251
251
|
/* harmony default export */ const ViewportOverlay = (generateFromConfig({}));
|
|
252
252
|
// EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
|
|
253
253
|
var dicomweb_client_es = __webpack_require__(75935);
|
|
254
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
255
|
-
var core_src = __webpack_require__(
|
|
254
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
255
|
+
var core_src = __webpack_require__(62771);
|
|
256
256
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/dicomWebClient.ts
|
|
257
257
|
|
|
258
258
|
|
|
@@ -19,8 +19,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
|
19
19
|
var react = __webpack_require__(32735);
|
|
20
20
|
// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
|
|
21
21
|
var es = __webpack_require__(21572);
|
|
22
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
23
|
-
var src = __webpack_require__(
|
|
22
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
23
|
+
var src = __webpack_require__(62771);
|
|
24
24
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
25
25
|
var ui_src = __webpack_require__(28619);
|
|
26
26
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
|
|
@@ -17,8 +17,8 @@ var react = __webpack_require__(32735);
|
|
|
17
17
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
18
18
|
var prop_types = __webpack_require__(60216);
|
|
19
19
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
20
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
21
|
-
var src = __webpack_require__(
|
|
20
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
21
|
+
var src = __webpack_require__(62771);
|
|
22
22
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
23
23
|
var ui_src = __webpack_require__(28619);
|
|
24
24
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
|
|
@@ -24,8 +24,8 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
|
|
|
24
24
|
var react = __webpack_require__(32735);
|
|
25
25
|
// EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/Math.js
|
|
26
26
|
var Core_Math = __webpack_require__(92780);
|
|
27
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
28
|
-
var src = __webpack_require__(
|
|
27
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
28
|
+
var src = __webpack_require__(62771);
|
|
29
29
|
// EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
|
|
30
30
|
var dcmjs_es = __webpack_require__(22737);
|
|
31
31
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.js
|
|
@@ -21,8 +21,8 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-pdf"}')
|
|
|
21
21
|
const id = package_namespaceObject.u2;
|
|
22
22
|
const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-pdf`;
|
|
23
23
|
|
|
24
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
25
|
-
var src = __webpack_require__(
|
|
24
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
25
|
+
var src = __webpack_require__(62771);
|
|
26
26
|
;// CONCATENATED MODULE: ../../../extensions/dicom-pdf/src/getSopClassHandlerModule.js
|
|
27
27
|
|
|
28
28
|
|
|
@@ -38,8 +38,8 @@ var react = __webpack_require__(32735);
|
|
|
38
38
|
var esm = __webpack_require__(77331);
|
|
39
39
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 321 modules
|
|
40
40
|
var dist_esm = __webpack_require__(57270);
|
|
41
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
42
|
-
var src = __webpack_require__(
|
|
41
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
42
|
+
var src = __webpack_require__(62771);
|
|
43
43
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
|
|
44
44
|
var streaming_image_volume_loader_dist_esm = __webpack_require__(28909);
|
|
45
45
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js
|
|
@@ -76,7 +76,7 @@ function initWebWorkers(appConfig) {
|
|
|
76
76
|
initialized = true;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
function initWADOImageLoader(userAuthenticationService, appConfig) {
|
|
79
|
+
function initWADOImageLoader(userAuthenticationService, appConfig, extensionManager) {
|
|
80
80
|
(cornerstoneDICOMImageLoader_min_default()).external.cornerstone = esm;
|
|
81
81
|
(cornerstoneDICOMImageLoader_min_default()).external.dicomParser = (dicomParser_min_default());
|
|
82
82
|
registerVolumeLoader('cornerstoneStreamingImageVolume', streaming_image_volume_loader_dist_esm/* cornerstoneStreamingImageVolumeLoader */.IU);
|
|
@@ -90,18 +90,13 @@ function initWADOImageLoader(userAuthenticationService, appConfig) {
|
|
|
90
90
|
convertFloatPixelDataToInt: false
|
|
91
91
|
},
|
|
92
92
|
beforeSend: function (xhr) {
|
|
93
|
+
//TODO should be removed in the future and request emitted by DicomWebDataSource
|
|
94
|
+
const sourceConfig = extensionManager.getActiveDataSource()?.[0].getConfig() ?? {};
|
|
93
95
|
const headers = userAuthenticationService.getAuthorizationHeader();
|
|
94
|
-
|
|
95
|
-
// Request:
|
|
96
|
-
// JPEG-LS Lossless (1.2.840.10008.1.2.4.80) if available, otherwise accept
|
|
97
|
-
// whatever transfer-syntax the origin server provides.
|
|
98
|
-
// For now we use image/jls and image/x-jls because some servers still use the old type
|
|
99
|
-
// http://dicom.nema.org/medical/dicom/current/output/html/part18.html
|
|
96
|
+
const acceptHeader = src.utils.generateAcceptHeader(sourceConfig.acceptHeader, sourceConfig.requestTransferSyntaxUID, sourceConfig.omitQuotationForMultipartRequest);
|
|
100
97
|
const xhrRequestHeaders = {
|
|
101
|
-
Accept:
|
|
102
|
-
// '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=*',
|
|
98
|
+
Accept: acceptHeader
|
|
103
99
|
};
|
|
104
|
-
|
|
105
100
|
if (headers) {
|
|
106
101
|
Object.assign(xhrRequestHeaders, headers);
|
|
107
102
|
}
|
|
@@ -3254,7 +3249,7 @@ async function init(_ref) {
|
|
|
3254
3249
|
thumbnail: appConfig?.maxNumRequests?.thumbnail || 75,
|
|
3255
3250
|
prefetch: appConfig?.maxNumRequests?.prefetch || 10
|
|
3256
3251
|
};
|
|
3257
|
-
initWADOImageLoader(userAuthenticationService, appConfig);
|
|
3252
|
+
initWADOImageLoader(userAuthenticationService, appConfig, extensionManager);
|
|
3258
3253
|
|
|
3259
3254
|
/* Measurement Service */
|
|
3260
3255
|
this.measurementServiceSource = connectToolsToMeasurementService(servicesManager);
|
|
@@ -621,8 +621,8 @@ function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, vie
|
|
|
621
621
|
});
|
|
622
622
|
}
|
|
623
623
|
/* harmony default export */ const TrackedMeasurementsContext_promptTrackNewStudy = (promptTrackNewStudy);
|
|
624
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
625
|
-
var core_src = __webpack_require__(
|
|
624
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
625
|
+
var core_src = __webpack_require__(62771);
|
|
626
626
|
;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/createReportAsync.tsx
|
|
627
627
|
|
|
628
628
|
|
|
@@ -1242,8 +1242,8 @@ var react = __webpack_require__(32735);
|
|
|
1242
1242
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
1243
1243
|
var prop_types = __webpack_require__(60216);
|
|
1244
1244
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
1245
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
1246
|
-
var src = __webpack_require__(
|
|
1245
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
1246
|
+
var src = __webpack_require__(62771);
|
|
1247
1247
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
1248
1248
|
var ui_src = __webpack_require__(28619);
|
|
1249
1249
|
;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx
|
|
@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
14
14
|
|
|
15
15
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
16
16
|
var src = __webpack_require__(28619);
|
|
17
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
18
|
-
var core_src = __webpack_require__(
|
|
17
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
18
|
+
var core_src = __webpack_require__(62771);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js
|
|
20
20
|
// TODO: torn, can either bake this here; or have to create a whole new button type
|
|
21
21
|
// Only ways that you can pass in a custom React component for render :l
|
|
@@ -11,7 +11,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
11
11
|
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32735);
|
|
12
12
|
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60216);
|
|
13
13
|
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
|
|
14
|
-
/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(
|
|
14
|
+
/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(62771);
|
|
15
15
|
/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28619);
|
|
16
16
|
/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(21572);
|
|
17
17
|
/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(57270);
|
|
@@ -29,8 +29,8 @@ __webpack_require__.d(utils_namespaceObject, {
|
|
|
29
29
|
|
|
30
30
|
// EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
|
|
31
31
|
var dicomweb_client_es = __webpack_require__(75935);
|
|
32
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
33
|
-
var src = __webpack_require__(
|
|
32
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
33
|
+
var src = __webpack_require__(62771);
|
|
34
34
|
// EXTERNAL MODULE: ../../core/src/utils/sortStudy.ts
|
|
35
35
|
var sortStudy = __webpack_require__(87853);
|
|
36
36
|
;// CONCATENATED MODULE: ../../../extensions/default/src/DicomWebDataSource/qido.js
|
|
@@ -999,21 +999,41 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
999
999
|
supportsWildcard,
|
|
1000
1000
|
supportsReject,
|
|
1001
1001
|
staticWado,
|
|
1002
|
-
singlepart
|
|
1002
|
+
singlepart,
|
|
1003
|
+
omitQuotationForMultipartRequest,
|
|
1004
|
+
acceptHeader,
|
|
1005
|
+
requestTransferSyntaxUID
|
|
1003
1006
|
} = dicomWebConfig;
|
|
1004
1007
|
const dicomWebConfigCopy = JSON.parse(JSON.stringify(dicomWebConfig));
|
|
1008
|
+
const getAuthrorizationHeader = () => {
|
|
1009
|
+
const xhrRequestHeaders = {};
|
|
1010
|
+
const authHeaders = userAuthenticationService.getAuthorizationHeader();
|
|
1011
|
+
if (authHeaders && authHeaders.Authorization) {
|
|
1012
|
+
xhrRequestHeaders.Authorization = authHeaders.Authorization;
|
|
1013
|
+
}
|
|
1014
|
+
return xhrRequestHeaders;
|
|
1015
|
+
};
|
|
1016
|
+
const generateWadoHeader = () => {
|
|
1017
|
+
let authorizationHeader = getAuthrorizationHeader();
|
|
1018
|
+
//Generate accept header depending on config params
|
|
1019
|
+
let formattedAcceptHeader = src.utils.generateAcceptHeader(acceptHeader, requestTransferSyntaxUID, omitQuotationForMultipartRequest);
|
|
1020
|
+
return {
|
|
1021
|
+
...authorizationHeader,
|
|
1022
|
+
Accept: formattedAcceptHeader
|
|
1023
|
+
};
|
|
1024
|
+
};
|
|
1005
1025
|
const qidoConfig = {
|
|
1006
1026
|
url: qidoRoot,
|
|
1007
1027
|
staticWado,
|
|
1008
1028
|
singlepart,
|
|
1009
|
-
headers:
|
|
1029
|
+
headers: getAuthrorizationHeader(),
|
|
1010
1030
|
errorInterceptor: src/* errorHandler */.Po.getHTTPErrorHandler()
|
|
1011
1031
|
};
|
|
1012
1032
|
const wadoConfig = {
|
|
1013
1033
|
url: wadoRoot,
|
|
1014
1034
|
staticWado,
|
|
1015
1035
|
singlepart,
|
|
1016
|
-
headers:
|
|
1036
|
+
headers: generateWadoHeader(),
|
|
1017
1037
|
errorInterceptor: src/* errorHandler */.Po.getHTTPErrorHandler()
|
|
1018
1038
|
};
|
|
1019
1039
|
|
|
@@ -1039,10 +1059,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1039
1059
|
studies: {
|
|
1040
1060
|
mapParams: mapParams.bind(),
|
|
1041
1061
|
search: async function (origParams) {
|
|
1042
|
-
|
|
1043
|
-
if (headers) {
|
|
1044
|
-
qidoDicomWebClient.headers = headers;
|
|
1045
|
-
}
|
|
1062
|
+
qidoDicomWebClient.headers = getAuthrorizationHeader();
|
|
1046
1063
|
const {
|
|
1047
1064
|
studyInstanceUid,
|
|
1048
1065
|
seriesInstanceUid,
|
|
@@ -1059,10 +1076,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1059
1076
|
series: {
|
|
1060
1077
|
// mapParams: mapParams.bind(),
|
|
1061
1078
|
search: async function (studyInstanceUid) {
|
|
1062
|
-
|
|
1063
|
-
if (headers) {
|
|
1064
|
-
qidoDicomWebClient.headers = headers;
|
|
1065
|
-
}
|
|
1079
|
+
qidoDicomWebClient.headers = getAuthrorizationHeader();
|
|
1066
1080
|
const results = await seriesInStudy(qidoDicomWebClient, studyInstanceUid);
|
|
1067
1081
|
return processSeriesResults(results);
|
|
1068
1082
|
}
|
|
@@ -1071,10 +1085,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1071
1085
|
|
|
1072
1086
|
instances: {
|
|
1073
1087
|
search: (studyInstanceUid, queryParameters) => {
|
|
1074
|
-
|
|
1075
|
-
if (headers) {
|
|
1076
|
-
qidoDicomWebClient.headers = headers;
|
|
1077
|
-
}
|
|
1088
|
+
qidoDicomWebClient.headers = getAuthrorizationHeader();
|
|
1078
1089
|
search.call(undefined, qidoDicomWebClient, studyInstanceUid, null, queryParameters);
|
|
1079
1090
|
}
|
|
1080
1091
|
}
|
|
@@ -1102,6 +1113,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1102
1113
|
StudyInstanceUID,
|
|
1103
1114
|
BulkDataURI
|
|
1104
1115
|
} = _ref2;
|
|
1116
|
+
qidoDicomWebClient.headers = getAuthrorizationHeader();
|
|
1105
1117
|
const options = {
|
|
1106
1118
|
multipart: false,
|
|
1107
1119
|
BulkDataURI,
|
|
@@ -1121,10 +1133,6 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1121
1133
|
sortFunction,
|
|
1122
1134
|
madeInClient = false
|
|
1123
1135
|
} = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
1124
|
-
const headers = userAuthenticationService.getAuthorizationHeader();
|
|
1125
|
-
if (headers) {
|
|
1126
|
-
wadoDicomWebClient.headers = headers;
|
|
1127
|
-
}
|
|
1128
1136
|
if (!StudyInstanceUID) {
|
|
1129
1137
|
throw new Error('Unable to query for SeriesMetadata without StudyInstanceUID');
|
|
1130
1138
|
}
|
|
@@ -1137,10 +1145,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1137
1145
|
},
|
|
1138
1146
|
store: {
|
|
1139
1147
|
dicom: async (dataset, request) => {
|
|
1140
|
-
|
|
1141
|
-
if (headers) {
|
|
1142
|
-
wadoDicomWebClient.headers = headers;
|
|
1143
|
-
}
|
|
1148
|
+
wadoDicomWebClient.headers = generateWadoHeader();
|
|
1144
1149
|
if (dataset instanceof ArrayBuffer) {
|
|
1145
1150
|
const options = {
|
|
1146
1151
|
datasets: [dataset],
|
|
@@ -1170,7 +1175,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1170
1175
|
},
|
|
1171
1176
|
_retrieveSeriesMetadataSync: async (StudyInstanceUID, filters, sortCriteria, sortFunction, madeInClient) => {
|
|
1172
1177
|
const enableStudyLazyLoad = false;
|
|
1173
|
-
|
|
1178
|
+
wadoDicomWebClient.headers = generateWadoHeader();
|
|
1174
1179
|
// data is all SOPInstanceUIDs
|
|
1175
1180
|
const data = await retrieveStudyMetadata(wadoDicomWebClient, StudyInstanceUID, enableStudyLazyLoad, filters, sortCriteria, sortFunction);
|
|
1176
1181
|
|
|
@@ -1215,6 +1220,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
|
|
|
1215
1220
|
_retrieveSeriesMetadataAsync: async function (StudyInstanceUID, filters, sortCriteria, sortFunction) {
|
|
1216
1221
|
let madeInClient = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
1217
1222
|
const enableStudyLazyLoad = true;
|
|
1223
|
+
wadoDicomWebClient.headers = generateWadoHeader();
|
|
1218
1224
|
// Get Series
|
|
1219
1225
|
const {
|
|
1220
1226
|
preLoadData: seriesSummaryMetadata,
|
|
@@ -2143,8 +2149,8 @@ function ViewerLayout(_ref) {
|
|
|
2143
2149
|
hotkeyDefinitions,
|
|
2144
2150
|
hotkeyDefaults
|
|
2145
2151
|
} = hotkeysManager;
|
|
2146
|
-
const versionNumber = "3.7.0-beta.
|
|
2147
|
-
const commitHash = "
|
|
2152
|
+
const versionNumber = "3.7.0-beta.13";
|
|
2153
|
+
const commitHash = "52f419d188134b88c159648015165551f2aea792";
|
|
2148
2154
|
const menuOptions = [{
|
|
2149
2155
|
title: t('Header:About'),
|
|
2150
2156
|
icon: 'info',
|
|
@@ -21,8 +21,8 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-video"}
|
|
|
21
21
|
const id = package_namespaceObject.u2;
|
|
22
22
|
const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-video`;
|
|
23
23
|
|
|
24
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
25
|
-
var src = __webpack_require__(
|
|
24
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
25
|
+
var src = __webpack_require__(62771);
|
|
26
26
|
;// CONCATENATED MODULE: ../../../extensions/dicom-video/src/getSopClassHandlerModule.js
|
|
27
27
|
|
|
28
28
|
|
|
@@ -12,7 +12,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
12
12
|
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_0__);
|
|
13
13
|
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(32735);
|
|
14
14
|
/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21572);
|
|
15
|
-
/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(
|
|
15
|
+
/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(62771);
|
|
16
16
|
/* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(94709);
|
|
17
17
|
/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(28619);
|
|
18
18
|
/* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(68525);
|
|
@@ -13,8 +13,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
13
13
|
"default": () => (/* binding */ microscopy_src)
|
|
14
14
|
});
|
|
15
15
|
|
|
16
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
17
|
-
var src = __webpack_require__(
|
|
16
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
17
|
+
var src = __webpack_require__(62771);
|
|
18
18
|
;// CONCATENATED MODULE: ../../../modes/microscopy/package.json
|
|
19
19
|
const package_namespaceObject = JSON.parse('{"u2":"@ohif/mode-microscopy"}');
|
|
20
20
|
;// CONCATENATED MODULE: ../../../modes/microscopy/src/id.js
|
|
@@ -22,8 +22,8 @@ const id = package_namespaceObject.u2;
|
|
|
22
22
|
var react = __webpack_require__(32735);
|
|
23
23
|
// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
|
|
24
24
|
var src = __webpack_require__(28619);
|
|
25
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
26
|
-
var core_src = __webpack_require__(
|
|
25
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
26
|
+
var core_src = __webpack_require__(62771);
|
|
27
27
|
// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
|
|
28
28
|
var es = __webpack_require__(21572);
|
|
29
29
|
// EXTERNAL MODULE: ../../../node_modules/mathjs/lib/esm/index.js + 972 modules
|
|
@@ -25,8 +25,8 @@ const id = package_namespaceObject.u2;
|
|
|
25
25
|
const SOPClassHandlerName = 'dicom-sr';
|
|
26
26
|
const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
|
|
27
27
|
|
|
28
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
29
|
-
var src = __webpack_require__(
|
|
28
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
29
|
+
var src = __webpack_require__(62771);
|
|
30
30
|
// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
|
|
31
31
|
var esm = __webpack_require__(88256);
|
|
32
32
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 321 modules
|
|
@@ -1585,8 +1585,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
1585
1585
|
|
|
1586
1586
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
|
|
1587
1587
|
var esm = __webpack_require__(77331);
|
|
1588
|
-
// EXTERNAL MODULE: ../../core/src/index.ts +
|
|
1589
|
-
var src = __webpack_require__(
|
|
1588
|
+
// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
|
|
1589
|
+
var src = __webpack_require__(62771);
|
|
1590
1590
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js
|
|
1591
1591
|
/**
|
|
1592
1592
|
* Extracts the label from the toolData imported from dcmjs. We need to do this
|
package/dist/app-config.js
CHANGED
|
@@ -11,7 +11,6 @@ window.config = {
|
|
|
11
11
|
// some windows systems have issues with more than 3 web workers
|
|
12
12
|
maxNumberOfWebWorkers: 3,
|
|
13
13
|
// below flag is for performance reasons, but it might not work for all servers
|
|
14
|
-
omitQuotationForMultipartRequest: true,
|
|
15
14
|
showWarningMessageForCrossOrigin: true,
|
|
16
15
|
showCPUFallbackMessage: true,
|
|
17
16
|
showLoadingIndicator: true,
|
|
@@ -51,7 +50,6 @@ window.config = {
|
|
|
51
50
|
wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
|
|
52
51
|
qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
|
|
53
52
|
wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
|
|
54
|
-
|
|
55
53
|
qidoSupportsIncludeField: false,
|
|
56
54
|
supportsReject: false,
|
|
57
55
|
imageRendering: 'wadors',
|
|
@@ -68,6 +66,7 @@ window.config = {
|
|
|
68
66
|
enabled: true,
|
|
69
67
|
relativeResolution: 'studies',
|
|
70
68
|
},
|
|
69
|
+
omitQuotationForMultipartRequest: true,
|
|
71
70
|
},
|
|
72
71
|
},
|
|
73
72
|
{
|