@ohif/app 3.8.0-beta.28 → 3.8.0-beta.29
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/{12.bundle.9143213c69b6d81bb096.js → 12.bundle.abb6ab88fda1125f3b47.js} +9 -11
- package/dist/{125.bundle.253395f320b72180da63.js → 125.bundle.df666cb677e5a8982157.js} +4 -5
- package/dist/{170.bundle.4d78d3772d1acb65fded.js → 170.bundle.57dff48fc09ba5fa844b.js} +50 -69
- package/dist/{181.bundle.87f1df4f401b8023cfd1.js → 181.bundle.ae92b8a551d041d06e90.js} +58 -70
- package/dist/181.css +1 -1
- package/dist/{185.bundle.09cc8eea4e4056374e36.js → 185.bundle.0251703d5b77f265cc11.js} +21 -26
- package/dist/{19.bundle.d6a9a105cb89ce17cc8b.js → 19.bundle.55796dd5a6dfecf02682.js} +112 -127
- package/dist/{199.bundle.6f0caf3db1c473be990d.js → 199.bundle.f62693c1405b52bc6580.js} +18 -20
- package/dist/{202.bundle.a607e9ab460999d8c0c8.js → 202.bundle.0ca2f2479d2578f539b0.js} +9 -1
- package/dist/{220.bundle.f7e1c96c94245e70f2be.js → 223.bundle.d4ac6ef2cfe47a9c4afc.js} +4422 -3671
- package/dist/{23.bundle.e008ad788170f2ed5569.js → 23.bundle.9d989522a6e4fdcb9c72.js} +1 -1
- package/dist/{250.bundle.5634282a01bd6e15b70d.js → 250.bundle.09c69d348a5d965debc8.js} +17 -22
- package/dist/{281.bundle.ed6f4765a49b67b6fa43.js → 281.bundle.a934356f89499eb6ec48.js} +23 -25
- package/dist/{359.bundle.f935bae2cc0ad1065f50.js → 359.bundle.1f2a03766e18f1e3cca4.js} +24 -27
- package/dist/{410.bundle.caba83fcaf6ee8caabe6.js → 410.bundle.b59d9d09407856f9babc.js} +22 -26
- package/dist/{417.bundle.af0a207c29b109f84159.js → 417.bundle.5c66801d23d0e98c00e6.js} +2 -2
- package/dist/{451.bundle.57c21db5d003c75e9d61.js → 451.bundle.68a551a7d1746cf904cb.js} +26 -32
- package/dist/{456.bundle.a2574e369e5fd60c0ed7.js → 456.bundle.475e0e878872ad61e39e.js} +392 -515
- package/dist/{466.bundle.e59923d0514cbfa2482a.js → 466.bundle.667b31151880a262d475.js} +101 -130
- package/dist/{471.bundle.49c8d281adbae4a2c4df.js → 471.bundle.5809b10f75c8fc2f7167.js} +27 -33
- package/dist/{483.bundle.ef869872fd6fd7aa5b6b.js → 483.bundle.775438e850fbee318b63.js} +128 -170
- package/dist/{485.bundle.8667a696ac2eaf99e4fa.js → 485.bundle.5b6c33cc43d8f3470642.js} +1 -1
- package/dist/{506.bundle.c7927979078083de7126.js → 506.bundle.dcae1c16f61651daa74d.js} +13 -18
- package/dist/{530.bundle.a03b6f942ace3e1baa1e.js → 530.bundle.f904325ef4195d69ac0e.js} +10 -3
- package/dist/{26.bundle.c92012465cee00a2a708.js → 566.bundle.4840518afd323372c70f.js} +1136 -442
- package/dist/{613.bundle.dae1b29d8c4912dde32c.js → 613.bundle.d080a15569910ff63fc8.js} +19 -24
- package/dist/{661.bundle.65dd579322b265c6e321.js → 661.bundle.28ef6d8cd035876bd8e2.js} +40 -12
- package/dist/{686.bundle.dccef1f36e4bc79bcc48.js → 686.bundle.62c827fe4f0d054c164e.js} +4 -5
- package/dist/{687.bundle.96fde3d28aaeeeea7b8f.js → 687.bundle.fc36244c7ec3b1146f13.js} +19 -35
- package/dist/{738.bundle.99bc9fe71e5dccd0b0cd.js → 738.bundle.7c78f93180d8405b167c.js} +434 -596
- package/dist/{814.bundle.76638a0bfd57b81339fa.js → 814.bundle.9c9805cd0d54a8ea9697.js} +9 -11
- package/dist/{822.bundle.775a62e1f79c403f3aed.js → 822.bundle.55759fd8e9b0b489cc6b.js} +13 -15
- package/dist/{886.bundle.c8dd3ecc42a4253de278.js → 886.bundle.4496fc7fb83b8c897d20.js} +18 -22
- package/dist/{95.bundle.db9d2d504abc5dd4fdfa.js → 95.bundle.d7a9f450bed3b770504d.js} +3 -3
- package/dist/{965.bundle.39dda96bd5335d372afb.js → 965.bundle.26d8f982af77f304a038.js} +91 -115
- package/dist/{app.bundle.75411c4a0421eb19f478.js → app.bundle.88eb088709ac23e29da0.js} +4643 -5947
- package/dist/app.bundle.css +11 -11
- package/dist/{dicom-microscopy-viewer.bundle.2c146384eb9466d02ff8.js → dicom-microscopy-viewer.bundle.a7d5060eead13771e784.js} +1 -1
- package/dist/index.html +1 -1
- package/dist/sw.js +1 -1
- package/package.json +17 -17
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
(
|
|
2
|
+
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[814],{
|
|
3
3
|
|
|
4
4
|
/***/ 92814:
|
|
5
5
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
@@ -90,11 +90,10 @@ const _getDisplaySetsFromSeries = (instances, servicesManager, extensionManager)
|
|
|
90
90
|
return displaySet;
|
|
91
91
|
});
|
|
92
92
|
};
|
|
93
|
-
function getSopClassHandlerModule(
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
} = _ref;
|
|
93
|
+
function getSopClassHandlerModule({
|
|
94
|
+
servicesManager,
|
|
95
|
+
extensionManager
|
|
96
|
+
}) {
|
|
98
97
|
const getDisplaySetsFromSeries = instances => {
|
|
99
98
|
return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
|
|
100
99
|
};
|
|
@@ -132,11 +131,10 @@ const dicomPDFExtension = {
|
|
|
132
131
|
* @param {object} [configuration={}]
|
|
133
132
|
* @param {object|array} [configuration.csToolsConfig] - Passed directly to `initCornerstoneTools`
|
|
134
133
|
*/
|
|
135
|
-
getViewportModule(
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
} = _ref;
|
|
134
|
+
getViewportModule({
|
|
135
|
+
servicesManager,
|
|
136
|
+
extensionManager
|
|
137
|
+
}) {
|
|
140
138
|
const ExtendedOHIFCornerstonePdfViewport = props => {
|
|
141
139
|
return /*#__PURE__*/react.createElement(OHIFCornerstonePdfViewport, _extends({
|
|
142
140
|
servicesManager: servicesManager,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
(
|
|
2
|
+
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[822],{
|
|
3
3
|
|
|
4
4
|
/***/ 86822:
|
|
5
5
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
@@ -14,9 +14,9 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14
14
|
/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(71771);
|
|
15
15
|
/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(22582);
|
|
16
16
|
/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(69190);
|
|
17
|
-
/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
|
17
|
+
/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(74566);
|
|
18
18
|
/* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41832);
|
|
19
|
-
/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(
|
|
19
|
+
/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(27968);
|
|
20
20
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
21
21
|
|
|
22
22
|
|
|
@@ -145,11 +145,10 @@ function TrackedCornerstoneViewport(props) {
|
|
|
145
145
|
const addedRaw = measurementService.EVENTS.RAW_MEASUREMENT_ADDED;
|
|
146
146
|
const subscriptions = [];
|
|
147
147
|
[added, addedRaw].forEach(evt => {
|
|
148
|
-
subscriptions.push(measurementService.subscribe(evt,
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
} = _ref;
|
|
148
|
+
subscriptions.push(measurementService.subscribe(evt, ({
|
|
149
|
+
source,
|
|
150
|
+
measurement
|
|
151
|
+
}) => {
|
|
153
152
|
const {
|
|
154
153
|
activeViewportId
|
|
155
154
|
} = viewportGridService.getState();
|
|
@@ -216,8 +215,8 @@ function TrackedCornerstoneViewport(props) {
|
|
|
216
215
|
patientAge: PatientAge || '',
|
|
217
216
|
MRN: PatientID || '',
|
|
218
217
|
thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}` : '',
|
|
219
|
-
thicknessUnits: 'mm',
|
|
220
|
-
spacing: SpacingBetweenSlices !== undefined ? `${parseFloat(SpacingBetweenSlices).toFixed(2)}mm` : '',
|
|
218
|
+
thicknessUnits: t('mm'),
|
|
219
|
+
spacing: SpacingBetweenSlices !== undefined ? `${parseFloat(SpacingBetweenSlices).toFixed(2)}${t('mm')}` : '',
|
|
221
220
|
scanner: ManufacturerModelName || ''
|
|
222
221
|
}
|
|
223
222
|
}
|
|
@@ -285,6 +284,9 @@ function _getNextMeasurementUID(direction, servicesManager, trackedMeasurementId
|
|
|
285
284
|
return newTrackedMeasurementId;
|
|
286
285
|
}
|
|
287
286
|
function _getStatusComponent(isTracked) {
|
|
287
|
+
const {
|
|
288
|
+
t
|
|
289
|
+
} = (0,react_i18next__WEBPACK_IMPORTED_MODULE_4__/* .useTranslation */ .$G)('TrackedCornerstoneViewport');
|
|
288
290
|
const trackedIcon = isTracked ? 'status-tracked' : 'status-untracked';
|
|
289
291
|
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("div", {
|
|
290
292
|
className: "relative"
|
|
@@ -301,11 +303,7 @@ function _getStatusComponent(isTracked) {
|
|
|
301
303
|
className: "ml-4 flex"
|
|
302
304
|
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("span", {
|
|
303
305
|
className: "text-common-light text-base"
|
|
304
|
-
}, isTracked ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null,
|
|
305
|
-
className: "font-bold text-white"
|
|
306
|
-
}, " tracked"), " and can be viewed ", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("br", null), ' ', "in the measurement panel") : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, "Measurements for", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("span", {
|
|
307
|
-
className: "font-bold text-white"
|
|
308
|
-
}, " untracked "), "series ", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("br", null), " will not be shown in the ", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("br", null), " measurements panel"))))
|
|
306
|
+
}, isTracked ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, t('Series is tracked and can be viewed in the measurement panel')) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(react__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, t('Measurements for untracked series will not be shown in the measurements panel')))))
|
|
309
307
|
}, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_3__/* .Icon */ .JO, {
|
|
310
308
|
name: trackedIcon,
|
|
311
309
|
className: "text-aqua-pale"
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
(
|
|
2
|
+
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[886],{
|
|
3
3
|
|
|
4
4
|
/***/ 48886:
|
|
5
5
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
@@ -78,10 +78,9 @@ function OHIFCornerstoneSRViewport(props) {
|
|
|
78
78
|
if (!sendTrackedMeasurementsEvent) {
|
|
79
79
|
// if no panels from measurement-tracking extension is used, this code will run
|
|
80
80
|
trackedMeasurements = null;
|
|
81
|
-
sendTrackedMeasurementsEvent = (eventName,
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
} = _ref;
|
|
81
|
+
sendTrackedMeasurementsEvent = (eventName, {
|
|
82
|
+
displaySetInstanceUID
|
|
83
|
+
}) => {
|
|
85
84
|
measurementService.clearMeasurements();
|
|
86
85
|
const {
|
|
87
86
|
SeriesInstanceUIDs
|
|
@@ -135,11 +134,10 @@ function OHIFCornerstoneSRViewport(props) {
|
|
|
135
134
|
// not throwing an error?
|
|
136
135
|
console.warn('More than one SOPClassUID in the same series is not yet supported.');
|
|
137
136
|
}
|
|
138
|
-
_getViewportReferencedDisplaySetData(srDisplaySet, newMeasurementSelected, displaySetService).then(
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
} = _ref2;
|
|
137
|
+
_getViewportReferencedDisplaySetData(srDisplaySet, newMeasurementSelected, displaySetService).then(({
|
|
138
|
+
referencedDisplaySet,
|
|
139
|
+
referencedDisplaySetMetadata
|
|
140
|
+
}) => {
|
|
143
141
|
setMeasurementSelected(newMeasurementSelected);
|
|
144
142
|
setActiveImageDisplaySetData(referencedDisplaySet);
|
|
145
143
|
setReferencedDisplaySetMetadata(referencedDisplaySetMetadata);
|
|
@@ -221,10 +219,9 @@ function OHIFCornerstoneSRViewport(props) {
|
|
|
221
219
|
Cleanup the SR viewport when the viewport is destroyed
|
|
222
220
|
*/
|
|
223
221
|
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
|
|
224
|
-
const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED,
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
} = _ref3;
|
|
222
|
+
const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, ({
|
|
223
|
+
displaySetInstanceUIDs
|
|
224
|
+
}) => {
|
|
228
225
|
const activeViewport = viewports.get(activeViewportId);
|
|
229
226
|
if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
|
|
230
227
|
viewportGridService.setDisplaySetsForViewport({
|
|
@@ -385,14 +382,13 @@ async function _getViewportReferencedDisplaySetData(displaySet, measurementSelec
|
|
|
385
382
|
referencedDisplaySet
|
|
386
383
|
};
|
|
387
384
|
}
|
|
388
|
-
function _getStatusComponent(
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
} = _ref4;
|
|
385
|
+
function _getStatusComponent({
|
|
386
|
+
srDisplaySet,
|
|
387
|
+
viewportId,
|
|
388
|
+
isRehydratable,
|
|
389
|
+
isLocked,
|
|
390
|
+
sendTrackedMeasurementsEvent
|
|
391
|
+
}) {
|
|
396
392
|
const handleMouseUp = () => {
|
|
397
393
|
sendTrackedMeasurementsEvent('HYDRATE_SR', {
|
|
398
394
|
displaySetInstanceUID: srDisplaySet.displaySetInstanceUID,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
(
|
|
2
|
+
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[95],{
|
|
3
3
|
|
|
4
4
|
/***/ 15793:
|
|
5
5
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
12
12
|
|
|
13
13
|
// UNUSED EXPORTS: Enums, StreamingDynamicImageVolume, StreamingImageVolume, cornerstoneStreamingDynamicImageVolumeLoader, helpers
|
|
14
14
|
|
|
15
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js +
|
|
16
|
-
var esm = __webpack_require__(
|
|
15
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 364 modules
|
|
16
|
+
var esm = __webpack_require__(27968);
|
|
17
17
|
// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
|
|
18
18
|
var gl_matrix_esm = __webpack_require__(45451);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/helpers/getVolumeInfo.js
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
(
|
|
2
|
+
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[965],{
|
|
3
3
|
|
|
4
4
|
/***/ 80965:
|
|
5
5
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
@@ -26,8 +26,8 @@ var src = __webpack_require__(22582);
|
|
|
26
26
|
var core_src = __webpack_require__(71771);
|
|
27
27
|
// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
|
|
28
28
|
var es = __webpack_require__(69190);
|
|
29
|
-
// EXTERNAL MODULE: ../../../node_modules/mathjs/lib/esm/index.js +
|
|
30
|
-
var esm = __webpack_require__(
|
|
29
|
+
// EXTERNAL MODULE: ../../../node_modules/mathjs/lib/esm/index.js + 996 modules
|
|
30
|
+
var esm = __webpack_require__(2223);
|
|
31
31
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/coordinateFormatScoord3d2Geometry.js
|
|
32
32
|
|
|
33
33
|
|
|
@@ -414,11 +414,10 @@ class ViewerManager extends core_src/* PubSubService */.hC {
|
|
|
414
414
|
* @param {object} roi.properties - ROI properties
|
|
415
415
|
* @returns {void}
|
|
416
416
|
*/
|
|
417
|
-
updateROIProperties(
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
} = _ref;
|
|
417
|
+
updateROIProperties({
|
|
418
|
+
uid,
|
|
419
|
+
properties
|
|
420
|
+
}) {
|
|
422
421
|
this.viewer.updateROI({
|
|
423
422
|
uid,
|
|
424
423
|
properties
|
|
@@ -617,9 +616,7 @@ const RoiAnnotation_EVENTS = {
|
|
|
617
616
|
* Represents a single annotation for the Microscopy Viewer
|
|
618
617
|
*/
|
|
619
618
|
class RoiAnnotation extends core_src/* PubSubService */.hC {
|
|
620
|
-
constructor(roiGraphic, studyInstanceUID, seriesInstanceUID) {
|
|
621
|
-
let label = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
|
|
622
|
-
let viewState = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
|
|
619
|
+
constructor(roiGraphic, studyInstanceUID, seriesInstanceUID, label = '', viewState = null) {
|
|
623
620
|
super(RoiAnnotation_EVENTS);
|
|
624
621
|
this.uid = roiGraphic.uid;
|
|
625
622
|
this.roiGraphic = roiGraphic;
|
|
@@ -770,6 +767,7 @@ class RoiAnnotation extends core_src/* PubSubService */.hC {
|
|
|
770
767
|
|
|
771
768
|
/* harmony default export */ const utils_RoiAnnotation = (RoiAnnotation);
|
|
772
769
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/services/MicroscopyService.ts
|
|
770
|
+
var _class;
|
|
773
771
|
|
|
774
772
|
|
|
775
773
|
|
|
@@ -1304,21 +1302,16 @@ class MicroscopyService extends core_src/* PubSubService */.hC {
|
|
|
1304
1302
|
* @param {RoiAnnotation} roiAnnotation The instance to be relabelled
|
|
1305
1303
|
* @param {boolean} newAnnotation Whether the annotation is newly drawn (so it deletes on cancel).
|
|
1306
1304
|
*/
|
|
1307
|
-
triggerRelabel(roiAnnotation) {
|
|
1308
|
-
let newAnnotation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
1309
|
-
let onRelabel = arguments.length > 2 ? arguments[2] : undefined;
|
|
1305
|
+
triggerRelabel(roiAnnotation, newAnnotation = false, onRelabel) {
|
|
1310
1306
|
if (!onRelabel) {
|
|
1311
|
-
onRelabel =
|
|
1312
|
-
|
|
1307
|
+
onRelabel = ({
|
|
1308
|
+
label
|
|
1309
|
+
}) => this.managedViewers.forEach(mv => mv.updateROIProperties({
|
|
1310
|
+
uid: roiAnnotation.uid,
|
|
1311
|
+
properties: {
|
|
1313
1312
|
label
|
|
1314
|
-
}
|
|
1315
|
-
|
|
1316
|
-
uid: roiAnnotation.uid,
|
|
1317
|
-
properties: {
|
|
1318
|
-
label
|
|
1319
|
-
}
|
|
1320
|
-
}));
|
|
1321
|
-
};
|
|
1313
|
+
}
|
|
1314
|
+
}));
|
|
1322
1315
|
}
|
|
1323
1316
|
this._broadcastEvent(MicroscopyService_EVENTS.RELABEL, {
|
|
1324
1317
|
roiAnnotation,
|
|
@@ -1354,15 +1347,15 @@ class MicroscopyService extends core_src/* PubSubService */.hC {
|
|
|
1354
1347
|
this.managedViewers.forEach(mv => mv.setROIStyle(uid, styleOptions));
|
|
1355
1348
|
}
|
|
1356
1349
|
}
|
|
1350
|
+
_class = MicroscopyService;
|
|
1357
1351
|
MicroscopyService.REGISTRATION = serviceManager => {
|
|
1358
1352
|
return {
|
|
1359
1353
|
name: 'microscopyService',
|
|
1360
1354
|
altName: 'MicroscopyService',
|
|
1361
|
-
create:
|
|
1362
|
-
|
|
1363
|
-
|
|
1364
|
-
|
|
1365
|
-
return new MicroscopyService(serviceManager);
|
|
1355
|
+
create: ({
|
|
1356
|
+
configuration = {}
|
|
1357
|
+
}) => {
|
|
1358
|
+
return new _class(serviceManager);
|
|
1366
1359
|
}
|
|
1367
1360
|
};
|
|
1368
1361
|
};
|
|
@@ -1382,19 +1375,17 @@ var dcmjs_es = __webpack_require__(67540);
|
|
|
1382
1375
|
* @param {func} callback
|
|
1383
1376
|
* @param {*} isArrowAnnotateInputDialog
|
|
1384
1377
|
*/
|
|
1385
|
-
function callInputDialog(
|
|
1386
|
-
|
|
1387
|
-
|
|
1388
|
-
|
|
1389
|
-
|
|
1390
|
-
|
|
1391
|
-
} = _ref;
|
|
1378
|
+
function callInputDialog({
|
|
1379
|
+
uiDialogService,
|
|
1380
|
+
title = 'Annotation',
|
|
1381
|
+
defaultValue = '',
|
|
1382
|
+
callback = (value, action) => {}
|
|
1383
|
+
}) {
|
|
1392
1384
|
const dialogId = 'microscopy-input-dialog';
|
|
1393
|
-
const onSubmitHandler =
|
|
1394
|
-
|
|
1395
|
-
|
|
1396
|
-
|
|
1397
|
-
} = _ref2;
|
|
1385
|
+
const onSubmitHandler = ({
|
|
1386
|
+
action,
|
|
1387
|
+
value
|
|
1388
|
+
}) => {
|
|
1398
1389
|
switch (action.id) {
|
|
1399
1390
|
case 'save':
|
|
1400
1391
|
callback(value.value, action.id);
|
|
@@ -1433,11 +1424,10 @@ function callInputDialog(_ref) {
|
|
|
1433
1424
|
type: src/* ButtonEnums.type */.LZ.dt.primary
|
|
1434
1425
|
}],
|
|
1435
1426
|
onSubmit: onSubmitHandler,
|
|
1436
|
-
body:
|
|
1437
|
-
|
|
1438
|
-
|
|
1439
|
-
|
|
1440
|
-
} = _ref3;
|
|
1427
|
+
body: ({
|
|
1428
|
+
value,
|
|
1429
|
+
setValue
|
|
1430
|
+
}) => {
|
|
1441
1431
|
return /*#__PURE__*/react.createElement(src/* Input */.II, {
|
|
1442
1432
|
label: "Enter your annotation",
|
|
1443
1433
|
labelClassName: "text-white text-[14px] leading-[1.2]",
|
|
@@ -1485,11 +1475,10 @@ const uid = '2.25.285241207697168520771311899641885187923';
|
|
|
1485
1475
|
*
|
|
1486
1476
|
* @return Comprehensive3DSR dataset
|
|
1487
1477
|
*/
|
|
1488
|
-
function constructSR(metadata,
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
} = _ref;
|
|
1478
|
+
function constructSR(metadata, {
|
|
1479
|
+
SeriesDescription,
|
|
1480
|
+
SeriesNumber
|
|
1481
|
+
}, annotations) {
|
|
1493
1482
|
// Handle malformed data
|
|
1494
1483
|
if (!metadata.SpecimenDescriptionSequence) {
|
|
1495
1484
|
metadata.SpecimenDescriptionSequence = {
|
|
@@ -1931,10 +1920,9 @@ function MicroscopyPanel(props) {
|
|
|
1931
1920
|
*
|
|
1932
1921
|
* @param param0
|
|
1933
1922
|
*/
|
|
1934
|
-
const onMeasurementItemClickHandler =
|
|
1935
|
-
|
|
1936
|
-
|
|
1937
|
-
} = _ref;
|
|
1923
|
+
const onMeasurementItemClickHandler = ({
|
|
1924
|
+
uid
|
|
1925
|
+
}) => {
|
|
1938
1926
|
const roiAnnotation = microscopyService.getAnnotation(uid);
|
|
1939
1927
|
microscopyService.selectAnnotation(roiAnnotation);
|
|
1940
1928
|
microscopyService.focusAnnotation(roiAnnotation, props.activeViewportId);
|
|
@@ -1944,11 +1932,10 @@ function MicroscopyPanel(props) {
|
|
|
1944
1932
|
* Handler for "Edit" action of an annotation item
|
|
1945
1933
|
* @param param0
|
|
1946
1934
|
*/
|
|
1947
|
-
const onMeasurementItemEditHandler =
|
|
1948
|
-
|
|
1949
|
-
|
|
1950
|
-
|
|
1951
|
-
} = _ref2;
|
|
1935
|
+
const onMeasurementItemEditHandler = ({
|
|
1936
|
+
uid,
|
|
1937
|
+
isActive
|
|
1938
|
+
}) => {
|
|
1952
1939
|
props.commandsManager.runCommand('setLabel', {
|
|
1953
1940
|
uid
|
|
1954
1941
|
}, 'MICROSCOPY');
|
|
@@ -2010,12 +1997,11 @@ const connectedMicroscopyPanel = (0,es/* withTranslation */.Zh)(['MicroscopyTabl
|
|
|
2010
1997
|
// - cancel promises when component is destroyed
|
|
2011
1998
|
// - show errors in UI for thumbnails if promise fails
|
|
2012
1999
|
|
|
2013
|
-
function getPanelModule(
|
|
2014
|
-
|
|
2015
|
-
|
|
2016
|
-
|
|
2017
|
-
|
|
2018
|
-
} = _ref;
|
|
2000
|
+
function getPanelModule({
|
|
2001
|
+
commandsManager,
|
|
2002
|
+
extensionManager,
|
|
2003
|
+
servicesManager
|
|
2004
|
+
}) {
|
|
2019
2005
|
const wrappedMeasurementPanel = () => {
|
|
2020
2006
|
const [{
|
|
2021
2007
|
activeViewportId,
|
|
@@ -2043,12 +2029,11 @@ function getPanelModule(_ref) {
|
|
|
2043
2029
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/getCommandsModule.ts
|
|
2044
2030
|
|
|
2045
2031
|
|
|
2046
|
-
function getCommandsModule(
|
|
2047
|
-
|
|
2048
|
-
|
|
2049
|
-
|
|
2050
|
-
|
|
2051
|
-
} = _ref;
|
|
2032
|
+
function getCommandsModule({
|
|
2033
|
+
servicesManager,
|
|
2034
|
+
commandsManager,
|
|
2035
|
+
extensionManager
|
|
2036
|
+
}) {
|
|
2052
2037
|
const {
|
|
2053
2038
|
viewportGridService,
|
|
2054
2039
|
uiDialogService,
|
|
@@ -2056,10 +2041,9 @@ function getCommandsModule(_ref) {
|
|
|
2056
2041
|
} = servicesManager.services;
|
|
2057
2042
|
const actions = {
|
|
2058
2043
|
// Measurement tool commands:
|
|
2059
|
-
deleteMeasurement:
|
|
2060
|
-
|
|
2061
|
-
|
|
2062
|
-
} = _ref2;
|
|
2044
|
+
deleteMeasurement: ({
|
|
2045
|
+
uid
|
|
2046
|
+
}) => {
|
|
2063
2047
|
if (uid) {
|
|
2064
2048
|
const roiAnnotation = microscopyService.getAnnotation(uid);
|
|
2065
2049
|
if (roiAnnotation) {
|
|
@@ -2067,10 +2051,9 @@ function getCommandsModule(_ref) {
|
|
|
2067
2051
|
}
|
|
2068
2052
|
}
|
|
2069
2053
|
},
|
|
2070
|
-
setLabel:
|
|
2071
|
-
|
|
2072
|
-
|
|
2073
|
-
} = _ref3;
|
|
2054
|
+
setLabel: ({
|
|
2055
|
+
uid
|
|
2056
|
+
}) => {
|
|
2074
2057
|
const roiAnnotation = microscopyService.getAnnotation(uid);
|
|
2075
2058
|
callInputDialog({
|
|
2076
2059
|
uiDialogService,
|
|
@@ -2086,11 +2069,10 @@ function getCommandsModule(_ref) {
|
|
|
2086
2069
|
}
|
|
2087
2070
|
});
|
|
2088
2071
|
},
|
|
2089
|
-
setToolActive:
|
|
2090
|
-
|
|
2091
|
-
|
|
2092
|
-
|
|
2093
|
-
} = _ref4;
|
|
2072
|
+
setToolActive: ({
|
|
2073
|
+
toolName,
|
|
2074
|
+
toolGroupId = 'MICROSCOPY'
|
|
2075
|
+
}) => {
|
|
2094
2076
|
const dragPanOnMiddle = ['dragPan', {
|
|
2095
2077
|
bindings: {
|
|
2096
2078
|
mouseButtons: ['middle']
|
|
@@ -2284,11 +2266,10 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
|
|
|
2284
2266
|
};
|
|
2285
2267
|
return [displaySet];
|
|
2286
2268
|
}
|
|
2287
|
-
function getDicomMicroscopySopClassHandler(
|
|
2288
|
-
|
|
2289
|
-
|
|
2290
|
-
|
|
2291
|
-
} = _ref;
|
|
2269
|
+
function getDicomMicroscopySopClassHandler({
|
|
2270
|
+
servicesManager,
|
|
2271
|
+
extensionManager
|
|
2272
|
+
}) {
|
|
2292
2273
|
const getDisplaySetsFromSeries = instances => {
|
|
2293
2274
|
return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
|
|
2294
2275
|
};
|
|
@@ -2311,7 +2292,6 @@ const DCM_CODE_VALUES = {
|
|
|
2311
2292
|
LONG_AXIS: 'G-A185',
|
|
2312
2293
|
ELLIPSE_AREA: 'G-D7FE' // TODO: Remove this
|
|
2313
2294
|
};
|
|
2314
|
-
|
|
2315
2295
|
/* harmony default export */ const dcmCodeValues = (DCM_CODE_VALUES);
|
|
2316
2296
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/toArray.js
|
|
2317
2297
|
function toArray(item) {
|
|
@@ -2573,11 +2553,10 @@ function DicomMicroscopySRSopClassHandler_getDisplaySetsFromSeries(instances, se
|
|
|
2573
2553
|
};
|
|
2574
2554
|
return [displaySet];
|
|
2575
2555
|
}
|
|
2576
|
-
function getDicomMicroscopySRSopClassHandler(
|
|
2577
|
-
|
|
2578
|
-
|
|
2579
|
-
|
|
2580
|
-
} = _ref;
|
|
2556
|
+
function getDicomMicroscopySRSopClassHandler({
|
|
2557
|
+
servicesManager,
|
|
2558
|
+
extensionManager
|
|
2559
|
+
}) {
|
|
2581
2560
|
const getDisplaySetsFromSeries = instances => {
|
|
2582
2561
|
return DicomMicroscopySRSopClassHandler_getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
|
|
2583
2562
|
};
|
|
@@ -2615,13 +2594,12 @@ const MicroscopyViewport = props => {
|
|
|
2615
2594
|
* You ID can be anything you want, but it should be unique.
|
|
2616
2595
|
*/
|
|
2617
2596
|
id: id,
|
|
2618
|
-
async preRegistration(
|
|
2619
|
-
|
|
2620
|
-
|
|
2621
|
-
|
|
2622
|
-
|
|
2623
|
-
|
|
2624
|
-
} = _ref;
|
|
2597
|
+
async preRegistration({
|
|
2598
|
+
servicesManager,
|
|
2599
|
+
commandsManager,
|
|
2600
|
+
configuration = {},
|
|
2601
|
+
appConfig
|
|
2602
|
+
}) {
|
|
2625
2603
|
servicesManager.registerService(MicroscopyService.REGISTRATION(servicesManager));
|
|
2626
2604
|
},
|
|
2627
2605
|
/**
|
|
@@ -2630,12 +2608,11 @@ const MicroscopyViewport = props => {
|
|
|
2630
2608
|
* {name, component} object. Example of a viewport module is the CornerstoneViewport
|
|
2631
2609
|
* that is provided by the Cornerstone extension in OHIF.
|
|
2632
2610
|
*/
|
|
2633
|
-
getViewportModule(
|
|
2634
|
-
|
|
2635
|
-
|
|
2636
|
-
|
|
2637
|
-
|
|
2638
|
-
} = _ref2;
|
|
2611
|
+
getViewportModule({
|
|
2612
|
+
servicesManager,
|
|
2613
|
+
extensionManager,
|
|
2614
|
+
commandsManager
|
|
2615
|
+
}) {
|
|
2639
2616
|
/**
|
|
2640
2617
|
*
|
|
2641
2618
|
* @param props {*}
|
|
@@ -2686,12 +2663,11 @@ const MicroscopyViewport = props => {
|
|
|
2686
2663
|
* Each sop class handler is defined by a { name, sopClassUids, getDisplaySetsFromSeries}.
|
|
2687
2664
|
* Examples include the default sop class handler provided by the default extension
|
|
2688
2665
|
*/
|
|
2689
|
-
getSopClassHandlerModule(
|
|
2690
|
-
|
|
2691
|
-
|
|
2692
|
-
|
|
2693
|
-
|
|
2694
|
-
} = _ref3;
|
|
2666
|
+
getSopClassHandlerModule({
|
|
2667
|
+
servicesManager,
|
|
2668
|
+
commandsManager,
|
|
2669
|
+
extensionManager
|
|
2670
|
+
}) {
|
|
2695
2671
|
return [getDicomMicroscopySopClassHandler({
|
|
2696
2672
|
servicesManager,
|
|
2697
2673
|
extensionManager
|