@ohif/app 3.9.0-beta.97 → 3.9.0-beta.99
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/{1169.bundle.4622fde2805592aad5d0.js → 1169.bundle.787863a90ed935004d9d.js} +2 -1
- package/dist/{4842.bundle.1b232342e7e700742059.js → 1841.bundle.b644430a7b443b715aee.js} +11 -11
- package/dist/1841.css +3 -0
- package/dist/{2119.bundle.42a066761f9648557161.js → 2119.bundle.112adcabafef89bc3d13.js} +3 -3
- package/dist/2173.css +3 -0
- package/dist/{2650.bundle.feb3b241748314884ae4.js → 2650.bundle.74fd325955c61b0311ec.js} +793 -30
- package/dist/{3117.bundle.463d5fa4671a93939d36.js → 3117.bundle.d76671aced0d2669817a.js} +2 -562
- package/dist/{962.bundle.a5e0e219e6a463f2a1a3.js → 3846.bundle.559405e95050bff1bdb8.js} +111 -75
- package/dist/{3962.bundle.6c110c24e87c62a817cb.js → 3962.bundle.bbb70fcdf211b7044025.js} +2 -2
- package/dist/{4210.bundle.af8f4c27351c2d6dc75d.js → 4210.bundle.a41a375b496c7019fbd9.js} +3 -3
- package/dist/{7360.bundle.88f041783ea798a60ea5.js → 4566.bundle.ec9936198e788f67bd79.js} +1210 -776
- package/dist/{5888.bundle.b67736899c284930bfa8.js → 5888.bundle.345f92c3ccc69e0c4543.js} +4 -6
- package/dist/{6552.bundle.54ecc19f95ce5243b196.js → 6552.bundle.87f348d1180c24315677.js} +36 -24
- package/dist/{3482.bundle.aa952f86899eb5f22c74.js → 6558.bundle.b68e53ad9d4cfabea140.js} +44 -52
- package/dist/6558.css +3 -0
- package/dist/{6904.bundle.da0d83fcd48a48cfaac1.js → 6904.bundle.2daa01969c25260fb947.js} +51 -29
- package/dist/79.css +1 -1
- package/dist/{818.bundle.b6027359846cc90e32ff.js → 818.bundle.54e9bb8d6df15d139927.js} +10 -0
- package/dist/{8714.bundle.36331faa35db985a786c.js → 8714.bundle.9915effb1c16f334a69b.js} +17 -5
- package/dist/{3497.bundle.512610422a2862584c55.js → 896.bundle.0300bc2ea91c7160248d.js} +1 -560
- package/dist/{8993.bundle.23cd5f8560800a97d798.js → 8993.bundle.fc59969a3dfc25255a3a.js} +735 -26
- package/dist/{8999.bundle.0a61abf261eaa323419b.js → 8999.bundle.e936840b7caf9dae422e.js} +3 -3
- package/dist/{9579.bundle.f9c9be0c5ab6cddbde3d.js → 9579.bundle.8bb193d6ff0f63a19c72.js} +11 -2
- package/dist/{7913.bundle.bcbd3bafa43246d0fb74.js → 9788.bundle.a2f2b48921c47b54853c.js} +18 -24
- package/dist/9788.css +3 -0
- package/dist/{app.bundle.026daba867eeb7d10f23.js → app.bundle.21e229cd4d308d88ddf4.js} +5242 -3796
- package/dist/app.bundle.css +13 -13
- package/dist/cornerstoneDICOMImageLoader.min.js +1 -1
- package/dist/cornerstoneDICOMImageLoader.min.js.map +1 -1
- package/dist/index.html +1 -1
- package/dist/{polySeg.bundle.0a70e65fe89169ec7508.js → polySeg.bundle.229cf4761a5e2c225748.js} +3 -3
- package/dist/{suv-peak-worker.bundle.54d68bc1808ad3d77994.js → suv-peak-worker.bundle.48128a064ed28e623bf8.js} +1 -1
- package/dist/sw.js +1 -1
- package/package.json +20 -20
- package/dist/3482.css +0 -1
- /package/dist/{153.bundle.58a735e094a8af425d10.js → 153.bundle.3727289b597308e3295f.js} +0 -0
- /package/dist/{2791.bundle.073fde538803e404155c.js → 2791.bundle.7874c31472a55a7b35a7.js} +0 -0
- /package/dist/{4353.bundle.e88d3b2a1495618e1d12.js → 4353.bundle.e7f048a0002dc3bb19fb.js} +0 -0
- /package/dist/{4978.bundle.3b4386fcee0e64e54519.js → 4978.bundle.6474620f33562f3418f8.js} +0 -0
- /package/dist/{6591.bundle.d204abeff39c8ea88cb6.js → 6591.bundle.1c29e66a86ab07463109.js} +0 -0
- /package/dist/{7246.bundle.fda15f28260db1db90ef.js → 7246.bundle.cbc90a04abb3d771d7ba.js} +0 -0
- /package/dist/{7376.bundle.178e472339e39bb6ffa9.js → 7376.bundle.b31063489283cc2c5e16.js} +0 -0
- /package/dist/{7502.bundle.80f73ad7179ab62f3d14.js → 7502.bundle.6f9c7545a4ed24158417.js} +0 -0
- /package/dist/{79.bundle.422d9ccbaaefa6b0a039.js → 79.bundle.4f6930aeb7bab27b8b42.js} +0 -0
- /package/dist/{8944.bundle.48cc9e9e9cc8d8908233.js → 8944.bundle.0cc6d2a5df7aa2de1c81.js} +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[
|
|
2
|
+
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[3846],{
|
|
3
3
|
|
|
4
4
|
/***/ 34:
|
|
5
5
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
@@ -723,7 +723,7 @@ const useViewportActionCornersContext = () => (0,react__WEBPACK_IMPORTED_MODULE_
|
|
|
723
723
|
|
|
724
724
|
/***/ }),
|
|
725
725
|
|
|
726
|
-
/***/
|
|
726
|
+
/***/ 83846:
|
|
727
727
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
728
728
|
|
|
729
729
|
// ESM COMPAT FLAG
|
|
@@ -731,6 +731,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
731
731
|
|
|
732
732
|
// EXPORTS
|
|
733
733
|
__webpack_require__.d(__webpack_exports__, {
|
|
734
|
+
Enums: () => (/* reexport */ enums),
|
|
734
735
|
ImageOverlayViewerTool: () => (/* reexport */ tools_ImageOverlayViewerTool),
|
|
735
736
|
Types: () => (/* reexport */ types_namespaceObject),
|
|
736
737
|
"default": () => (/* binding */ cornerstone_src),
|
|
@@ -744,6 +745,15 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
744
745
|
toolNames: () => (/* reexport */ toolNames)
|
|
745
746
|
});
|
|
746
747
|
|
|
748
|
+
// NAMESPACE OBJECT: ../../../extensions/cornerstone/src/enums.ts
|
|
749
|
+
var enums_namespaceObject = {};
|
|
750
|
+
__webpack_require__.r(enums_namespaceObject);
|
|
751
|
+
__webpack_require__.d(enums_namespaceObject, {
|
|
752
|
+
CORNERSTONE_3D_TOOLS_SOURCE_NAME: () => (CORNERSTONE_3D_TOOLS_SOURCE_NAME),
|
|
753
|
+
CORNERSTONE_3D_TOOLS_SOURCE_VERSION: () => (CORNERSTONE_3D_TOOLS_SOURCE_VERSION),
|
|
754
|
+
Z: () => (enums)
|
|
755
|
+
});
|
|
756
|
+
|
|
747
757
|
// NAMESPACE OBJECT: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/index.ts
|
|
748
758
|
var utils_namespaceObject = {};
|
|
749
759
|
__webpack_require__.r(utils_namespaceObject);
|
|
@@ -768,6 +778,14 @@ var esm = __webpack_require__(12651);
|
|
|
768
778
|
var dist_esm = __webpack_require__(93725);
|
|
769
779
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
|
|
770
780
|
var streaming_image_volume_loader_dist_esm = __webpack_require__(15793);
|
|
781
|
+
;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/enums.ts
|
|
782
|
+
const CORNERSTONE_3D_TOOLS_SOURCE_NAME = 'Cornerstone3DTools';
|
|
783
|
+
const CORNERSTONE_3D_TOOLS_SOURCE_VERSION = '0.1';
|
|
784
|
+
const Enums = {
|
|
785
|
+
CORNERSTONE_3D_TOOLS_SOURCE_NAME,
|
|
786
|
+
CORNERSTONE_3D_TOOLS_SOURCE_VERSION
|
|
787
|
+
};
|
|
788
|
+
/* harmony default export */ const enums = (Enums);
|
|
771
789
|
// EXTERNAL MODULE: ../../core/src/index.ts + 74 modules
|
|
772
790
|
var src = __webpack_require__(84793);
|
|
773
791
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js
|
|
@@ -1506,7 +1524,8 @@ const toolNames = {
|
|
|
1506
1524
|
};
|
|
1507
1525
|
|
|
1508
1526
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/constants/supportedTools.js
|
|
1509
|
-
|
|
1527
|
+
const supportedTools = ['Length', 'EllipticalROI', 'CircleROI', 'Bidirectional', 'ArrowAnnotate', 'Angle', 'CobbAngle', 'Probe', 'RectangleROI', 'PlanarFreehandROI', 'SplineROI', 'LivewireContour', 'UltrasoundDirectionalTool', 'SCOORD3DPoint'];
|
|
1528
|
+
/* harmony default export */ const constants_supportedTools = (supportedTools);
|
|
1510
1529
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js
|
|
1511
1530
|
|
|
1512
1531
|
|
|
@@ -1578,7 +1597,7 @@ const Length = {
|
|
|
1578
1597
|
referencedImageId,
|
|
1579
1598
|
FrameOfReferenceUID
|
|
1580
1599
|
} = metadata;
|
|
1581
|
-
const validToolType =
|
|
1600
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
1582
1601
|
if (!validToolType) {
|
|
1583
1602
|
throw new Error('Tool not supported');
|
|
1584
1603
|
}
|
|
@@ -1815,7 +1834,7 @@ const Bidirectional = {
|
|
|
1815
1834
|
referencedImageId,
|
|
1816
1835
|
FrameOfReferenceUID
|
|
1817
1836
|
} = metadata;
|
|
1818
|
-
const validToolType =
|
|
1837
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
1819
1838
|
if (!validToolType) {
|
|
1820
1839
|
throw new Error('Tool not supported');
|
|
1821
1840
|
}
|
|
@@ -2008,7 +2027,7 @@ const EllipticalROI = {
|
|
|
2008
2027
|
referencedImageId,
|
|
2009
2028
|
FrameOfReferenceUID
|
|
2010
2029
|
} = metadata;
|
|
2011
|
-
const validToolType =
|
|
2030
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
2012
2031
|
if (!validToolType) {
|
|
2013
2032
|
throw new Error('Tool not supported');
|
|
2014
2033
|
}
|
|
@@ -2213,7 +2232,7 @@ const CircleROI = {
|
|
|
2213
2232
|
referencedImageId,
|
|
2214
2233
|
FrameOfReferenceUID
|
|
2215
2234
|
} = metadata;
|
|
2216
|
-
const validToolType =
|
|
2235
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
2217
2236
|
if (!validToolType) {
|
|
2218
2237
|
throw new Error('Tool not supported');
|
|
2219
2238
|
}
|
|
@@ -2423,7 +2442,7 @@ const ArrowAnnotate_Length = {
|
|
|
2423
2442
|
referencedImageId,
|
|
2424
2443
|
FrameOfReferenceUID
|
|
2425
2444
|
} = metadata;
|
|
2426
|
-
const validToolType =
|
|
2445
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
2427
2446
|
if (!validToolType) {
|
|
2428
2447
|
throw new Error('Tool not supported');
|
|
2429
2448
|
}
|
|
@@ -2552,7 +2571,7 @@ const CobbAngle = {
|
|
|
2552
2571
|
referencedImageId,
|
|
2553
2572
|
FrameOfReferenceUID
|
|
2554
2573
|
} = metadata;
|
|
2555
|
-
const validToolType =
|
|
2574
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
2556
2575
|
if (!validToolType) {
|
|
2557
2576
|
throw new Error('Tool not supported');
|
|
2558
2577
|
}
|
|
@@ -2735,7 +2754,7 @@ const Angle = {
|
|
|
2735
2754
|
referencedImageId,
|
|
2736
2755
|
FrameOfReferenceUID
|
|
2737
2756
|
} = metadata;
|
|
2738
|
-
const validToolType =
|
|
2757
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
2739
2758
|
if (!validToolType) {
|
|
2740
2759
|
throw new Error('Tool not supported');
|
|
2741
2760
|
}
|
|
@@ -2923,7 +2942,7 @@ const PlanarFreehandROI = {
|
|
|
2923
2942
|
referencedImageId,
|
|
2924
2943
|
FrameOfReferenceUID
|
|
2925
2944
|
} = metadata;
|
|
2926
|
-
const validToolType =
|
|
2945
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
2927
2946
|
if (!validToolType) {
|
|
2928
2947
|
throw new Error(`Tool ${toolName} not supported`);
|
|
2929
2948
|
}
|
|
@@ -3050,7 +3069,7 @@ function PlanarFreehandROI_getDisplayText(annotation, displaySet, customizationS
|
|
|
3050
3069
|
const {
|
|
3051
3070
|
SeriesNumber
|
|
3052
3071
|
} = displaySet;
|
|
3053
|
-
if (SeriesNumber) {
|
|
3072
|
+
if (SeriesNumber !== undefined) {
|
|
3054
3073
|
displayTextArray.push(`S: ${SeriesNumber}${instanceText}${frameText}`);
|
|
3055
3074
|
}
|
|
3056
3075
|
const stats = data.cachedStats[`imageId:${metadata.referencedImageId}`] || Array.from(Object.values(data.cachedStats))[0];
|
|
@@ -3114,7 +3133,7 @@ const RectangleROI = {
|
|
|
3114
3133
|
referencedImageId,
|
|
3115
3134
|
FrameOfReferenceUID
|
|
3116
3135
|
} = metadata;
|
|
3117
|
-
const validToolType =
|
|
3136
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
3118
3137
|
if (!validToolType) {
|
|
3119
3138
|
throw new Error('Tool not supported');
|
|
3120
3139
|
}
|
|
@@ -3332,7 +3351,7 @@ const SplineROI = {
|
|
|
3332
3351
|
referencedImageId,
|
|
3333
3352
|
FrameOfReferenceUID
|
|
3334
3353
|
} = metadata;
|
|
3335
|
-
const validToolType =
|
|
3354
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
3336
3355
|
if (!validToolType) {
|
|
3337
3356
|
throw new Error(`Tool ${toolName} not supported`);
|
|
3338
3357
|
}
|
|
@@ -3463,7 +3482,7 @@ function SplineROI_getDisplayText(annotation, displaySet, customizationService)
|
|
|
3463
3482
|
const {
|
|
3464
3483
|
SeriesNumber
|
|
3465
3484
|
} = displaySet;
|
|
3466
|
-
if (SeriesNumber) {
|
|
3485
|
+
if (SeriesNumber !== undefined) {
|
|
3467
3486
|
displayTextArray.push(`S: ${SeriesNumber}${instanceText}${frameText}`);
|
|
3468
3487
|
}
|
|
3469
3488
|
const stats = data.cachedStats[`imageId:${metadata.referencedImageId}`];
|
|
@@ -3535,7 +3554,7 @@ const LivewireContour = {
|
|
|
3535
3554
|
referencedImageId,
|
|
3536
3555
|
FrameOfReferenceUID
|
|
3537
3556
|
} = metadata;
|
|
3538
|
-
const validToolType =
|
|
3557
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
3539
3558
|
if (!validToolType) {
|
|
3540
3559
|
throw new Error(`Tool ${toolName} not supported`);
|
|
3541
3560
|
}
|
|
@@ -3650,7 +3669,7 @@ function LivewireContour_getDisplayText(annotation, displaySet, customizationSer
|
|
|
3650
3669
|
const {
|
|
3651
3670
|
SeriesNumber
|
|
3652
3671
|
} = displaySet;
|
|
3653
|
-
if (SeriesNumber) {
|
|
3672
|
+
if (SeriesNumber !== undefined) {
|
|
3654
3673
|
displayText.push(`S: ${SeriesNumber}${instanceText}${frameText}`);
|
|
3655
3674
|
}
|
|
3656
3675
|
if (area) {
|
|
@@ -3679,8 +3698,7 @@ const Probe = {
|
|
|
3679
3698
|
*/
|
|
3680
3699
|
toMeasurement: (csToolsEventDetail, displaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
|
|
3681
3700
|
const {
|
|
3682
|
-
annotation
|
|
3683
|
-
viewportId
|
|
3701
|
+
annotation
|
|
3684
3702
|
} = csToolsEventDetail;
|
|
3685
3703
|
const {
|
|
3686
3704
|
metadata,
|
|
@@ -3688,7 +3706,7 @@ const Probe = {
|
|
|
3688
3706
|
annotationUID
|
|
3689
3707
|
} = annotation;
|
|
3690
3708
|
if (!metadata || !data) {
|
|
3691
|
-
console.warn('
|
|
3709
|
+
console.warn('Probe tool: Missing metadata or data');
|
|
3692
3710
|
return null;
|
|
3693
3711
|
}
|
|
3694
3712
|
const {
|
|
@@ -3696,7 +3714,7 @@ const Probe = {
|
|
|
3696
3714
|
referencedImageId,
|
|
3697
3715
|
FrameOfReferenceUID
|
|
3698
3716
|
} = metadata;
|
|
3699
|
-
const validToolType =
|
|
3717
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
3700
3718
|
if (!validToolType) {
|
|
3701
3719
|
throw new Error('Tool not supported');
|
|
3702
3720
|
}
|
|
@@ -3871,7 +3889,7 @@ const UltrasoundDirectional = {
|
|
|
3871
3889
|
referencedImageId,
|
|
3872
3890
|
FrameOfReferenceUID
|
|
3873
3891
|
} = metadata;
|
|
3874
|
-
const validToolType =
|
|
3892
|
+
const validToolType = constants_supportedTools.includes(toolName);
|
|
3875
3893
|
if (!validToolType) {
|
|
3876
3894
|
throw new Error('Tool not supported');
|
|
3877
3895
|
}
|
|
@@ -4213,12 +4231,15 @@ const measurementServiceMappingsFactory = (measurementService, displaySetService
|
|
|
4213
4231
|
|
|
4214
4232
|
|
|
4215
4233
|
|
|
4234
|
+
|
|
4235
|
+
const {
|
|
4236
|
+
CORNERSTONE_3D_TOOLS_SOURCE_NAME: initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_NAME,
|
|
4237
|
+
CORNERSTONE_3D_TOOLS_SOURCE_VERSION: initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_VERSION
|
|
4238
|
+
} = enums_namespaceObject;
|
|
4216
4239
|
const {
|
|
4217
4240
|
removeAnnotation
|
|
4218
4241
|
} = dist_esm.annotation.state;
|
|
4219
4242
|
const csToolsEvents = dist_esm.Enums.Events;
|
|
4220
|
-
const CORNERSTONE_3D_TOOLS_SOURCE_NAME = 'Cornerstone3DTools';
|
|
4221
|
-
const CORNERSTONE_3D_TOOLS_SOURCE_VERSION = '0.1';
|
|
4222
4243
|
const initMeasurementService = (measurementService, displaySetService, cornerstoneViewportService, customizationService) => {
|
|
4223
4244
|
/* Initialization */
|
|
4224
4245
|
const {
|
|
@@ -4236,7 +4257,7 @@ const initMeasurementService = (measurementService, displaySetService, cornersto
|
|
|
4236
4257
|
Probe,
|
|
4237
4258
|
UltrasoundDirectional
|
|
4238
4259
|
} = measurementServiceMappings_measurementServiceMappingsFactory(measurementService, displaySetService, cornerstoneViewportService, customizationService);
|
|
4239
|
-
const csTools3DVer1MeasurementSource = measurementService.createSource(
|
|
4260
|
+
const csTools3DVer1MeasurementSource = measurementService.createSource(initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_NAME, initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
|
|
4240
4261
|
|
|
4241
4262
|
/* Mappings */
|
|
4242
4263
|
measurementService.addMapping(csTools3DVer1MeasurementSource, 'Length', Length.matchingCriteria, Length.toAnnotation, Length.toMeasurement);
|
|
@@ -4271,7 +4292,7 @@ const connectToolsToMeasurementService = servicesManager => {
|
|
|
4271
4292
|
customizationService
|
|
4272
4293
|
} = servicesManager.services;
|
|
4273
4294
|
const csTools3DVer1MeasurementSource = initMeasurementService(measurementService, displaySetService, cornerstoneViewportService, customizationService);
|
|
4274
|
-
connectMeasurementServiceToTools(measurementService, cornerstoneViewportService
|
|
4295
|
+
connectMeasurementServiceToTools(measurementService, cornerstoneViewportService);
|
|
4275
4296
|
const {
|
|
4276
4297
|
annotationToMeasurement,
|
|
4277
4298
|
remove
|
|
@@ -4293,7 +4314,7 @@ const connectToolsToMeasurementService = servicesManager => {
|
|
|
4293
4314
|
if (csToolsEvent.type === completedEvt && toolName === toolNames.CalibrationLine) {
|
|
4294
4315
|
// show modal to input the measurement (mm)
|
|
4295
4316
|
onCompletedCalibrationLine(servicesManager, csToolsEvent).then(() => {
|
|
4296
|
-
console.log('
|
|
4317
|
+
console.log('Calibration applied.');
|
|
4297
4318
|
}, () => true).finally(() => {
|
|
4298
4319
|
// we don't need the calibration line lingering around, remove the
|
|
4299
4320
|
// annotation from the display
|
|
@@ -4310,7 +4331,7 @@ const connectToolsToMeasurementService = servicesManager => {
|
|
|
4310
4331
|
annotationToMeasurement(toolName, annotationAddedEventDetail);
|
|
4311
4332
|
}
|
|
4312
4333
|
} catch (error) {
|
|
4313
|
-
console.warn('Failed to
|
|
4334
|
+
console.warn('Failed to add measurement:', error);
|
|
4314
4335
|
}
|
|
4315
4336
|
}
|
|
4316
4337
|
function updateMeasurement(csToolsEvent) {
|
|
@@ -4352,7 +4373,7 @@ const connectToolsToMeasurementService = servicesManager => {
|
|
|
4352
4373
|
addedSelectedAnnotationUIDs.forEach(annotationUID => measurementService.setMeasurementSelected(annotationUID, true));
|
|
4353
4374
|
}
|
|
4354
4375
|
} catch (error) {
|
|
4355
|
-
console.warn('Failed to select
|
|
4376
|
+
console.warn('Failed to select/unselect measurements:', error);
|
|
4356
4377
|
}
|
|
4357
4378
|
}
|
|
4358
4379
|
|
|
@@ -4364,20 +4385,15 @@ const connectToolsToMeasurementService = servicesManager => {
|
|
|
4364
4385
|
*/
|
|
4365
4386
|
function removeMeasurement(csToolsEvent) {
|
|
4366
4387
|
try {
|
|
4367
|
-
|
|
4368
|
-
|
|
4369
|
-
|
|
4370
|
-
|
|
4371
|
-
annotationUID
|
|
4372
|
-
}
|
|
4373
|
-
} = annotationRemovedEventDetail;
|
|
4374
|
-
const measurement = measurementService.getMeasurement(annotationUID);
|
|
4375
|
-
if (measurement) {
|
|
4376
|
-
console.log('~~ removeEvt', csToolsEvent);
|
|
4377
|
-
remove(annotationUID, annotationRemovedEventDetail);
|
|
4388
|
+
const annotationRemovedEventDetail = csToolsEvent.detail;
|
|
4389
|
+
const {
|
|
4390
|
+
annotation: {
|
|
4391
|
+
annotationUID
|
|
4378
4392
|
}
|
|
4379
|
-
}
|
|
4380
|
-
|
|
4393
|
+
} = annotationRemovedEventDetail;
|
|
4394
|
+
const measurement = measurementService.getMeasurement(annotationUID);
|
|
4395
|
+
if (measurement) {
|
|
4396
|
+
remove(annotationUID, annotationRemovedEventDetail);
|
|
4381
4397
|
}
|
|
4382
4398
|
} catch (error) {
|
|
4383
4399
|
console.warn('Failed to remove measurement:', error);
|
|
@@ -4398,14 +4414,13 @@ const connectToolsToMeasurementService = servicesManager => {
|
|
|
4398
4414
|
esm.eventTarget.addEventListener(selectionEvt, selectMeasurement);
|
|
4399
4415
|
return csTools3DVer1MeasurementSource;
|
|
4400
4416
|
};
|
|
4401
|
-
const connectMeasurementServiceToTools = (measurementService, cornerstoneViewportService
|
|
4417
|
+
const connectMeasurementServiceToTools = (measurementService, cornerstoneViewportService) => {
|
|
4402
4418
|
const {
|
|
4403
4419
|
MEASUREMENT_REMOVED,
|
|
4404
4420
|
MEASUREMENTS_CLEARED,
|
|
4405
4421
|
MEASUREMENT_UPDATED,
|
|
4406
4422
|
RAW_MEASUREMENT_ADDED
|
|
4407
4423
|
} = measurementService.EVENTS;
|
|
4408
|
-
const csTools3DVer1MeasurementSource = measurementService.getSource(CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
|
|
4409
4424
|
measurementService.subscribe(MEASUREMENTS_CLEARED, ({
|
|
4410
4425
|
measurements
|
|
4411
4426
|
}) => {
|
|
@@ -4417,7 +4432,7 @@ const connectMeasurementServiceToTools = (measurementService, cornerstoneViewpor
|
|
|
4417
4432
|
uid,
|
|
4418
4433
|
source
|
|
4419
4434
|
} = measurement;
|
|
4420
|
-
if (source.name !==
|
|
4435
|
+
if (source.name !== initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_NAME) {
|
|
4421
4436
|
continue;
|
|
4422
4437
|
}
|
|
4423
4438
|
removeAnnotation(uid);
|
|
@@ -4428,7 +4443,7 @@ const connectMeasurementServiceToTools = (measurementService, cornerstoneViewpor
|
|
|
4428
4443
|
measurement,
|
|
4429
4444
|
notYetUpdatedAtSource
|
|
4430
4445
|
}) => {
|
|
4431
|
-
if (source.name !==
|
|
4446
|
+
if (source.name !== initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_NAME) {
|
|
4432
4447
|
return;
|
|
4433
4448
|
}
|
|
4434
4449
|
if (notYetUpdatedAtSource === false) {
|
|
@@ -4463,7 +4478,7 @@ const connectMeasurementServiceToTools = (measurementService, cornerstoneViewpor
|
|
|
4463
4478
|
data,
|
|
4464
4479
|
dataSource
|
|
4465
4480
|
}) => {
|
|
4466
|
-
if (source.name !==
|
|
4481
|
+
if (source.name !== initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_NAME) {
|
|
4467
4482
|
return;
|
|
4468
4483
|
}
|
|
4469
4484
|
const {
|
|
@@ -4520,7 +4535,7 @@ const connectMeasurementServiceToTools = (measurementService, cornerstoneViewpor
|
|
|
4520
4535
|
source,
|
|
4521
4536
|
measurement: removedMeasurementId
|
|
4522
4537
|
}) => {
|
|
4523
|
-
if (source?.name && source.name !==
|
|
4538
|
+
if (source?.name && source.name !== initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_NAME) {
|
|
4524
4539
|
return;
|
|
4525
4540
|
}
|
|
4526
4541
|
removeAnnotation(removedMeasurementId);
|
|
@@ -8118,7 +8133,7 @@ const fourUp = {
|
|
|
8118
8133
|
protocolMatchingRules: [],
|
|
8119
8134
|
imageLoadStrategy: 'interleaveCenter',
|
|
8120
8135
|
displaySetSelectors: {
|
|
8121
|
-
|
|
8136
|
+
activeDisplaySet: {
|
|
8122
8137
|
seriesMatchingRules: [{
|
|
8123
8138
|
weight: 1,
|
|
8124
8139
|
attribute: 'isReconstructable',
|
|
@@ -8160,7 +8175,7 @@ const fourUp = {
|
|
|
8160
8175
|
}]
|
|
8161
8176
|
},
|
|
8162
8177
|
displaySets: [{
|
|
8163
|
-
id: '
|
|
8178
|
+
id: 'activeDisplaySet'
|
|
8164
8179
|
}]
|
|
8165
8180
|
}, {
|
|
8166
8181
|
viewportOptions: {
|
|
@@ -8172,7 +8187,7 @@ const fourUp = {
|
|
|
8172
8187
|
}
|
|
8173
8188
|
},
|
|
8174
8189
|
displaySets: [{
|
|
8175
|
-
id: '
|
|
8190
|
+
id: 'activeDisplaySet',
|
|
8176
8191
|
options: {
|
|
8177
8192
|
displayPreset: {
|
|
8178
8193
|
CT: 'CT-Bone',
|
|
@@ -8200,7 +8215,7 @@ const fourUp = {
|
|
|
8200
8215
|
}]
|
|
8201
8216
|
},
|
|
8202
8217
|
displaySets: [{
|
|
8203
|
-
id: '
|
|
8218
|
+
id: 'activeDisplaySet'
|
|
8204
8219
|
}]
|
|
8205
8220
|
}, {
|
|
8206
8221
|
viewportOptions: {
|
|
@@ -8221,7 +8236,7 @@ const fourUp = {
|
|
|
8221
8236
|
}]
|
|
8222
8237
|
},
|
|
8223
8238
|
displaySets: [{
|
|
8224
|
-
id: '
|
|
8239
|
+
id: 'activeDisplaySet'
|
|
8225
8240
|
}]
|
|
8226
8241
|
}]
|
|
8227
8242
|
}]
|
|
@@ -8240,7 +8255,7 @@ const main3D = {
|
|
|
8240
8255
|
protocolMatchingRules: [],
|
|
8241
8256
|
imageLoadStrategy: 'interleaveCenter',
|
|
8242
8257
|
displaySetSelectors: {
|
|
8243
|
-
|
|
8258
|
+
activeDisplaySet: {
|
|
8244
8259
|
seriesMatchingRules: [{
|
|
8245
8260
|
weight: 1,
|
|
8246
8261
|
attribute: 'isReconstructable',
|
|
@@ -8294,7 +8309,7 @@ const main3D = {
|
|
|
8294
8309
|
}
|
|
8295
8310
|
},
|
|
8296
8311
|
displaySets: [{
|
|
8297
|
-
id: '
|
|
8312
|
+
id: 'activeDisplaySet',
|
|
8298
8313
|
options: {
|
|
8299
8314
|
displayPreset: {
|
|
8300
8315
|
CT: 'CT-Bone',
|
|
@@ -8322,7 +8337,7 @@ const main3D = {
|
|
|
8322
8337
|
}]
|
|
8323
8338
|
},
|
|
8324
8339
|
displaySets: [{
|
|
8325
|
-
id: '
|
|
8340
|
+
id: 'activeDisplaySet'
|
|
8326
8341
|
}]
|
|
8327
8342
|
}, {
|
|
8328
8343
|
viewportOptions: {
|
|
@@ -8343,7 +8358,7 @@ const main3D = {
|
|
|
8343
8358
|
}]
|
|
8344
8359
|
},
|
|
8345
8360
|
displaySets: [{
|
|
8346
|
-
id: '
|
|
8361
|
+
id: 'activeDisplaySet'
|
|
8347
8362
|
}]
|
|
8348
8363
|
}, {
|
|
8349
8364
|
viewportOptions: {
|
|
@@ -8364,7 +8379,7 @@ const main3D = {
|
|
|
8364
8379
|
}]
|
|
8365
8380
|
},
|
|
8366
8381
|
displaySets: [{
|
|
8367
|
-
id: '
|
|
8382
|
+
id: 'activeDisplaySet'
|
|
8368
8383
|
}]
|
|
8369
8384
|
}]
|
|
8370
8385
|
}]
|
|
@@ -8505,7 +8520,7 @@ const mprAnd3DVolumeViewport = {
|
|
|
8505
8520
|
protocolMatchingRules: [],
|
|
8506
8521
|
imageLoadStrategy: 'interleaveCenter',
|
|
8507
8522
|
displaySetSelectors: {
|
|
8508
|
-
|
|
8523
|
+
activeDisplaySet: {
|
|
8509
8524
|
seriesMatchingRules: [{
|
|
8510
8525
|
weight: 1,
|
|
8511
8526
|
attribute: 'isReconstructable',
|
|
@@ -8555,7 +8570,7 @@ const mprAnd3DVolumeViewport = {
|
|
|
8555
8570
|
}]
|
|
8556
8571
|
},
|
|
8557
8572
|
displaySets: [{
|
|
8558
|
-
id: '
|
|
8573
|
+
id: 'activeDisplaySet'
|
|
8559
8574
|
}]
|
|
8560
8575
|
}, {
|
|
8561
8576
|
viewportOptions: {
|
|
@@ -8567,7 +8582,7 @@ const mprAnd3DVolumeViewport = {
|
|
|
8567
8582
|
}
|
|
8568
8583
|
},
|
|
8569
8584
|
displaySets: [{
|
|
8570
|
-
id: '
|
|
8585
|
+
id: 'activeDisplaySet',
|
|
8571
8586
|
options: {
|
|
8572
8587
|
displayPreset: {
|
|
8573
8588
|
CT: 'CT-Bone',
|
|
@@ -8595,7 +8610,7 @@ const mprAnd3DVolumeViewport = {
|
|
|
8595
8610
|
}]
|
|
8596
8611
|
},
|
|
8597
8612
|
displaySets: [{
|
|
8598
|
-
id: '
|
|
8613
|
+
id: 'activeDisplaySet'
|
|
8599
8614
|
}]
|
|
8600
8615
|
}, {
|
|
8601
8616
|
viewportOptions: {
|
|
@@ -8616,7 +8631,7 @@ const mprAnd3DVolumeViewport = {
|
|
|
8616
8631
|
}]
|
|
8617
8632
|
},
|
|
8618
8633
|
displaySets: [{
|
|
8619
|
-
id: '
|
|
8634
|
+
id: 'activeDisplaySet'
|
|
8620
8635
|
}]
|
|
8621
8636
|
}]
|
|
8622
8637
|
}]
|
|
@@ -8635,7 +8650,7 @@ const only3D = {
|
|
|
8635
8650
|
protocolMatchingRules: [],
|
|
8636
8651
|
imageLoadStrategy: 'interleaveCenter',
|
|
8637
8652
|
displaySetSelectors: {
|
|
8638
|
-
|
|
8653
|
+
activeDisplaySet: {
|
|
8639
8654
|
seriesMatchingRules: [{
|
|
8640
8655
|
weight: 1,
|
|
8641
8656
|
attribute: 'isReconstructable',
|
|
@@ -8668,7 +8683,7 @@ const only3D = {
|
|
|
8668
8683
|
}
|
|
8669
8684
|
},
|
|
8670
8685
|
displaySets: [{
|
|
8671
|
-
id: '
|
|
8686
|
+
id: 'activeDisplaySet',
|
|
8672
8687
|
options: {
|
|
8673
8688
|
displayPreset: {
|
|
8674
8689
|
CT: 'CT-Bone',
|
|
@@ -8694,7 +8709,7 @@ const primary3D = {
|
|
|
8694
8709
|
protocolMatchingRules: [],
|
|
8695
8710
|
imageLoadStrategy: 'interleaveCenter',
|
|
8696
8711
|
displaySetSelectors: {
|
|
8697
|
-
|
|
8712
|
+
activeDisplaySet: {
|
|
8698
8713
|
seriesMatchingRules: [{
|
|
8699
8714
|
weight: 1,
|
|
8700
8715
|
attribute: 'isReconstructable',
|
|
@@ -8748,7 +8763,7 @@ const primary3D = {
|
|
|
8748
8763
|
}
|
|
8749
8764
|
},
|
|
8750
8765
|
displaySets: [{
|
|
8751
|
-
id: '
|
|
8766
|
+
id: 'activeDisplaySet',
|
|
8752
8767
|
options: {
|
|
8753
8768
|
displayPreset: {
|
|
8754
8769
|
CT: 'CT-Bone',
|
|
@@ -8776,7 +8791,7 @@ const primary3D = {
|
|
|
8776
8791
|
}]
|
|
8777
8792
|
},
|
|
8778
8793
|
displaySets: [{
|
|
8779
|
-
id: '
|
|
8794
|
+
id: 'activeDisplaySet'
|
|
8780
8795
|
}]
|
|
8781
8796
|
}, {
|
|
8782
8797
|
viewportOptions: {
|
|
@@ -8797,7 +8812,7 @@ const primary3D = {
|
|
|
8797
8812
|
}]
|
|
8798
8813
|
},
|
|
8799
8814
|
displaySets: [{
|
|
8800
|
-
id: '
|
|
8815
|
+
id: 'activeDisplaySet'
|
|
8801
8816
|
}]
|
|
8802
8817
|
}, {
|
|
8803
8818
|
viewportOptions: {
|
|
@@ -8818,7 +8833,7 @@ const primary3D = {
|
|
|
8818
8833
|
}]
|
|
8819
8834
|
},
|
|
8820
8835
|
displaySets: [{
|
|
8821
|
-
id: '
|
|
8836
|
+
id: 'activeDisplaySet'
|
|
8822
8837
|
}]
|
|
8823
8838
|
}]
|
|
8824
8839
|
}]
|
|
@@ -8837,7 +8852,7 @@ const primaryAxial = {
|
|
|
8837
8852
|
protocolMatchingRules: [],
|
|
8838
8853
|
imageLoadStrategy: 'interleaveCenter',
|
|
8839
8854
|
displaySetSelectors: {
|
|
8840
|
-
|
|
8855
|
+
activeDisplaySet: {
|
|
8841
8856
|
seriesMatchingRules: [{
|
|
8842
8857
|
weight: 1,
|
|
8843
8858
|
attribute: 'isReconstructable',
|
|
@@ -8895,7 +8910,7 @@ const primaryAxial = {
|
|
|
8895
8910
|
}]
|
|
8896
8911
|
},
|
|
8897
8912
|
displaySets: [{
|
|
8898
|
-
id: '
|
|
8913
|
+
id: 'activeDisplaySet'
|
|
8899
8914
|
}]
|
|
8900
8915
|
}, {
|
|
8901
8916
|
viewportOptions: {
|
|
@@ -8916,7 +8931,7 @@ const primaryAxial = {
|
|
|
8916
8931
|
}]
|
|
8917
8932
|
},
|
|
8918
8933
|
displaySets: [{
|
|
8919
|
-
id: '
|
|
8934
|
+
id: 'activeDisplaySet'
|
|
8920
8935
|
}]
|
|
8921
8936
|
}, {
|
|
8922
8937
|
viewportOptions: {
|
|
@@ -8937,7 +8952,7 @@ const primaryAxial = {
|
|
|
8937
8952
|
}]
|
|
8938
8953
|
},
|
|
8939
8954
|
displaySets: [{
|
|
8940
|
-
id: '
|
|
8955
|
+
id: 'activeDisplaySet'
|
|
8941
8956
|
}]
|
|
8942
8957
|
}]
|
|
8943
8958
|
}]
|
|
@@ -12836,6 +12851,15 @@ class CornerstoneCacheService {
|
|
|
12836
12851
|
}
|
|
12837
12852
|
}
|
|
12838
12853
|
const displaySet = nonOverlayDisplaySets[0];
|
|
12854
|
+
if (displaySet.load && displaySet.load instanceof Function) {
|
|
12855
|
+
const {
|
|
12856
|
+
userAuthenticationService
|
|
12857
|
+
} = this.servicesManager.services;
|
|
12858
|
+
const headers = userAuthenticationService.getAuthorizationHeader();
|
|
12859
|
+
await displaySet.load({
|
|
12860
|
+
headers
|
|
12861
|
+
});
|
|
12862
|
+
}
|
|
12839
12863
|
let stackImageIds = this.stackImageIds.get(displaySet.displaySetInstanceUID);
|
|
12840
12864
|
if (!stackImageIds) {
|
|
12841
12865
|
stackImageIds = this._getCornerstoneStackImageIds(displaySet, dataSource);
|
|
@@ -13457,7 +13481,7 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
|
|
|
13457
13481
|
return {
|
|
13458
13482
|
id: positionPresentationId,
|
|
13459
13483
|
viewportType: viewportInfo.getViewportType(),
|
|
13460
|
-
viewReference: csViewport.getViewReference(),
|
|
13484
|
+
viewReference: csViewport instanceof esm.VolumeViewport3D ? null : csViewport.getViewReference(),
|
|
13461
13485
|
position: csViewport.getViewPresentation({
|
|
13462
13486
|
pan: true,
|
|
13463
13487
|
zoom: true
|
|
@@ -13600,6 +13624,14 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
|
|
|
13600
13624
|
setViewportData(viewportId, viewportData, publicViewportOptions, publicDisplaySetOptions, presentations) {
|
|
13601
13625
|
const renderingEngine = this.getRenderingEngine();
|
|
13602
13626
|
|
|
13627
|
+
// if not valid viewportData then return early
|
|
13628
|
+
if (viewportData.viewportType === esm.Enums.ViewportType.STACK) {
|
|
13629
|
+
// check if imageIds is valid
|
|
13630
|
+
if (!viewportData.data[0].imageIds?.length) {
|
|
13631
|
+
return;
|
|
13632
|
+
}
|
|
13633
|
+
}
|
|
13634
|
+
|
|
13603
13635
|
// This is the old viewportInfo, which may have old options but we might be
|
|
13604
13636
|
// using its viewport (same viewportId as the new viewportInfo)
|
|
13605
13637
|
const viewportInfo = this.viewportsById.get(viewportId);
|
|
@@ -13824,6 +13856,9 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
|
|
|
13824
13856
|
properties.colormap = colormap ?? properties.colormap;
|
|
13825
13857
|
}
|
|
13826
13858
|
this._handleOverlays(viewport);
|
|
13859
|
+
if (!imageIds?.length) {
|
|
13860
|
+
return;
|
|
13861
|
+
}
|
|
13827
13862
|
return viewport.setStack(imageIds, initialImageIndexToUse).then(() => {
|
|
13828
13863
|
viewport.setProperties({
|
|
13829
13864
|
...properties
|
|
@@ -15373,6 +15408,7 @@ function src_extends() { return src_extends = Object.assign ? Object.assign.bind
|
|
|
15373
15408
|
|
|
15374
15409
|
|
|
15375
15410
|
|
|
15411
|
+
|
|
15376
15412
|
|
|
15377
15413
|
|
|
15378
15414
|
const {
|
|
@@ -1073,8 +1073,8 @@ PanelGenerateImage.propTypes = {
|
|
|
1073
1073
|
}).isRequired
|
|
1074
1074
|
}).isRequired
|
|
1075
1075
|
};
|
|
1076
|
-
// EXTERNAL MODULE: ../../ui-next/src/index.ts +
|
|
1077
|
-
var ui_next_src = __webpack_require__(
|
|
1076
|
+
// EXTERNAL MODULE: ../../ui-next/src/index.ts + 2459 modules
|
|
1077
|
+
var ui_next_src = __webpack_require__(90071);
|
|
1078
1078
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dynamic-volume/src/panels/DynamicDataPanel.tsx
|
|
1079
1079
|
|
|
1080
1080
|
|
|
@@ -315,8 +315,8 @@ function getHangingProtocolModule() {
|
|
|
315
315
|
|
|
316
316
|
// EXTERNAL MODULE: ./state/index.js + 1 modules
|
|
317
317
|
var state = __webpack_require__(52490);
|
|
318
|
-
// EXTERNAL MODULE: ../../ui-next/src/index.ts +
|
|
319
|
-
var ui_next_src = __webpack_require__(
|
|
318
|
+
// EXTERNAL MODULE: ../../ui-next/src/index.ts + 2459 modules
|
|
319
|
+
var ui_next_src = __webpack_require__(90071);
|
|
320
320
|
// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
|
|
321
321
|
var ui_src = __webpack_require__(50395);
|
|
322
322
|
// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 99 modules
|
|
@@ -1408,7 +1408,7 @@ const commandsModule = ({
|
|
|
1408
1408
|
const promptResult = await (0,default_src.createReportDialogPrompt)(uiDialogService, {
|
|
1409
1409
|
extensionManager
|
|
1410
1410
|
});
|
|
1411
|
-
if (promptResult.action !== 1 && promptResult.value) {
|
|
1411
|
+
if (promptResult.action !== 1 && !promptResult.value) {
|
|
1412
1412
|
return;
|
|
1413
1413
|
}
|
|
1414
1414
|
const segmentation = segmentationService.getSegmentation(segmentationId);
|