@ohif/app 3.8.0-beta.69 → 3.8.0-beta.70
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/{121.bundle.a8fc45e3d88d0a8b82a8.js → 121.bundle.21827fec690c01ee9ab3.js} +2 -2
- package/dist/{155.bundle.54abbf46ae8db7fb6925.js → 155.bundle.0dabe8513b605b01ac3d.js} +148 -88
- package/dist/{2.bundle.336bb9e4a86312bb7cdb.js → 2.bundle.04dbbf67a52fe109749c.js} +2 -2
- package/dist/{295.bundle.41d7b63be6a7d726b87e.js → 295.bundle.3a0d5062d65296c4bf5d.js} +2 -2
- package/dist/{41.bundle.5c10b930100f5f2398ca.js → 41.bundle.6ec0794a483e9a30eb94.js} +61 -27
- package/dist/{425.bundle.358660fda0b7db1f4096.js → 425.bundle.ffcdde2143a5757926b9.js} +2 -2
- package/dist/{448.bundle.ffeda5f113709be15f2e.js → 448.bundle.9177b9d909654efbc8d5.js} +2 -2
- package/dist/{530.bundle.632dcb0d4f5266058c8b.js → 530.bundle.566bfd08dccb4cf6d98b.js} +1 -1
- package/dist/{544.bundle.df7870b43d7aa1faed39.js → 544.bundle.1110b24e96863d719a95.js} +2 -2
- package/dist/{574.bundle.3020ab733b8f07ec50a5.js → 574.bundle.83afbc7922736fc6846d.js} +2 -2
- package/dist/{594.bundle.9e9a467e6ebbbf236d31.js → 594.bundle.ffeebda1bb9a81182a80.js} +2 -2
- package/dist/{595.bundle.cc6c09ed6f90f7651f57.js → 595.bundle.1c1a50c4ff87763b786a.js} +90 -16
- package/dist/{724.bundle.196f9249c7be5d3a341e.js → 724.bundle.eada9d6c23678a5a2947.js} +20 -12
- package/dist/{862.bundle.27cb716917daad6afddc.js → 862.bundle.959ef65b18c1d3b5e2b4.js} +6 -4
- package/dist/{889.bundle.c0159b08addb30199945.js → 889.bundle.67c6e5f988c9b1d289ef.js} +2 -2
- package/dist/{90.bundle.df1afba885ad224de549.js → 90.bundle.f41c8c4fc78cdfd4de30.js} +4 -4
- package/dist/app.bundle.css +1 -1
- package/dist/{app.bundle.52480152e53de62fa936.js → app.bundle.e21e5afd46fb064cb5de.js} +1787 -7
- package/dist/index.html +1 -1
- package/dist/sw.js +1 -1
- package/package.json +17 -17
- /package/dist/{164.bundle.5c4a698355bf39321296.js → 164.bundle.0b1a2be351543c1433e8.js} +0 -0
- /package/dist/{188.bundle.84af46f98eb5eef59a02.js → 188.bundle.81e83b073b6fd4ae0058.js} +0 -0
- /package/dist/{297.bundle.81d63bb0b66d63df6d86.js → 297.bundle.194d8985ab974839b5b6.js} +0 -0
- /package/dist/{559.bundle.b4ad3430881d340909c5.js → 559.bundle.4f111410af43324629ca.js} +0 -0
- /package/dist/{699.bundle.4318be073b24b7861e2f.js → 699.bundle.db05df7b8e2ad605e928.js} +0 -0
- /package/dist/{726.bundle.2bdb443d1b5620d74e6e.js → 726.bundle.c8de818cf1a3ff0cf7d2.js} +0 -0
- /package/dist/{905.bundle.d0f3e4560d6f9f9d5857.js → 905.bundle.eb821474b36b96b897f9.js} +0 -0
- /package/dist/{907.bundle.54a013a2c2a71264e019.js → 907.bundle.ca904d9747480a0e4bf1.js} +0 -0
- /package/dist/{939.bundle.84ee0b844023d924a22b.js → 939.bundle.9d93b2e47c52338747a2.js} +0 -0
- /package/dist/{961.bundle.5ecfb2604c71e8cead46.js → 961.bundle.65967b1a4af002af1d1d.js} +0 -0
|
@@ -17,8 +17,8 @@ var react = __webpack_require__(41766);
|
|
|
17
17
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
18
18
|
var prop_types = __webpack_require__(11374);
|
|
19
19
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
20
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
21
|
-
var src = __webpack_require__(
|
|
20
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
21
|
+
var src = __webpack_require__(48804);
|
|
22
22
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
|
|
23
23
|
|
|
24
24
|
const RESPONSE = {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[155,481],{
|
|
3
3
|
|
|
4
|
-
/***/
|
|
4
|
+
/***/ 219:
|
|
5
5
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
6
6
|
|
|
7
7
|
|
|
@@ -20,8 +20,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
|
20
20
|
var es = __webpack_require__(57593);
|
|
21
21
|
// EXTERNAL MODULE: ../../../node_modules/@xstate/react/es/index.js + 8 modules
|
|
22
22
|
var react_es = __webpack_require__(6835);
|
|
23
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
24
|
-
var src = __webpack_require__(
|
|
23
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
24
|
+
var src = __webpack_require__(48804);
|
|
25
25
|
;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js
|
|
26
26
|
|
|
27
27
|
const RESPONSE = {
|
|
@@ -53,10 +53,27 @@ const machineConfiguration = {
|
|
|
53
53
|
off: {
|
|
54
54
|
type: 'final'
|
|
55
55
|
},
|
|
56
|
+
labellingOnly: {
|
|
57
|
+
on: {
|
|
58
|
+
TRACK_SERIES: [{
|
|
59
|
+
target: 'promptLabelAnnotation',
|
|
60
|
+
actions: ['setPreviousState']
|
|
61
|
+
}, {
|
|
62
|
+
target: 'off'
|
|
63
|
+
}]
|
|
64
|
+
}
|
|
65
|
+
},
|
|
56
66
|
idle: {
|
|
57
67
|
entry: 'clearContext',
|
|
58
68
|
on: {
|
|
59
|
-
TRACK_SERIES:
|
|
69
|
+
TRACK_SERIES: [{
|
|
70
|
+
target: 'promptLabelAnnotation',
|
|
71
|
+
cond: 'isLabelOnMeasure',
|
|
72
|
+
actions: ['setPreviousState']
|
|
73
|
+
}, {
|
|
74
|
+
target: 'promptBeginTracking',
|
|
75
|
+
actions: ['setPreviousState']
|
|
76
|
+
}],
|
|
60
77
|
// Unused? We may only do PROMPT_HYDRATE_SR now?
|
|
61
78
|
SET_TRACKED_SERIES: [{
|
|
62
79
|
target: 'tracking',
|
|
@@ -82,6 +99,9 @@ const machineConfiguration = {
|
|
|
82
99
|
target: 'tracking',
|
|
83
100
|
actions: ['setTrackedStudyAndSeries', 'setIsDirty'],
|
|
84
101
|
cond: 'shouldSetStudyAndSeries'
|
|
102
|
+
}, {
|
|
103
|
+
target: 'labellingOnly',
|
|
104
|
+
cond: 'isLabelOnMeasureAndShouldKillMachine'
|
|
85
105
|
}, {
|
|
86
106
|
target: 'off',
|
|
87
107
|
cond: 'shouldKillMachine'
|
|
@@ -96,6 +116,10 @@ const machineConfiguration = {
|
|
|
96
116
|
tracking: {
|
|
97
117
|
on: {
|
|
98
118
|
TRACK_SERIES: [{
|
|
119
|
+
target: 'promptLabelAnnotation',
|
|
120
|
+
cond: 'isLabelOnMeasure',
|
|
121
|
+
actions: ['setPreviousState']
|
|
122
|
+
}, {
|
|
99
123
|
target: 'promptTrackNewStudy',
|
|
100
124
|
cond: 'isNewStudy'
|
|
101
125
|
}, {
|
|
@@ -224,6 +248,29 @@ const machineConfiguration = {
|
|
|
224
248
|
target: 'idle'
|
|
225
249
|
}
|
|
226
250
|
}
|
|
251
|
+
},
|
|
252
|
+
promptLabelAnnotation: {
|
|
253
|
+
invoke: {
|
|
254
|
+
src: 'promptLabelAnnotation',
|
|
255
|
+
onDone: [{
|
|
256
|
+
target: 'labellingOnly',
|
|
257
|
+
cond: 'wasLabellingOnly'
|
|
258
|
+
}, {
|
|
259
|
+
target: 'promptBeginTracking',
|
|
260
|
+
cond: 'wasIdle'
|
|
261
|
+
}, {
|
|
262
|
+
target: 'promptTrackNewStudy',
|
|
263
|
+
cond: 'wasTrackingAndIsNewStudy'
|
|
264
|
+
}, {
|
|
265
|
+
target: 'promptTrackNewSeries',
|
|
266
|
+
cond: 'wasTrackingAndIsNewSeries'
|
|
267
|
+
}, {
|
|
268
|
+
target: 'tracking',
|
|
269
|
+
cond: 'wasTracking'
|
|
270
|
+
}, {
|
|
271
|
+
target: 'off'
|
|
272
|
+
}]
|
|
273
|
+
}
|
|
227
274
|
}
|
|
228
275
|
},
|
|
229
276
|
strict: true
|
|
@@ -304,7 +351,12 @@ const defaultOptions = {
|
|
|
304
351
|
removeTrackedSeries: (0,es/* assign */.kp)((ctx, evt) => ({
|
|
305
352
|
prevTrackedSeries: ctx.trackedSeries.slice().filter(ser => ser !== evt.SeriesInstanceUID),
|
|
306
353
|
trackedSeries: ctx.trackedSeries.slice().filter(ser => ser !== evt.SeriesInstanceUID)
|
|
307
|
-
}))
|
|
354
|
+
})),
|
|
355
|
+
setPreviousState: (0,es/* assign */.kp)((ctx, evt, meta) => {
|
|
356
|
+
return {
|
|
357
|
+
prevState: meta.state.value
|
|
358
|
+
};
|
|
359
|
+
})
|
|
308
360
|
},
|
|
309
361
|
guards: {
|
|
310
362
|
// We set dirty any time we performan an action that:
|
|
@@ -330,6 +382,21 @@ const defaultOptions = {
|
|
|
330
382
|
evt.SeriesInstanceUID === undefined || ctx.trackedSeries.includes(evt.SeriesInstanceUID)
|
|
331
383
|
);
|
|
332
384
|
},
|
|
385
|
+
wasLabellingOnly: (ctx, evt, condMeta) => {
|
|
386
|
+
return ctx.prevState === 'labellingOnly';
|
|
387
|
+
},
|
|
388
|
+
wasIdle: (ctx, evt, condMeta) => {
|
|
389
|
+
return ctx.prevState === 'idle';
|
|
390
|
+
},
|
|
391
|
+
wasTracking: (ctx, evt, condMeta) => {
|
|
392
|
+
return ctx.prevState === 'tracking';
|
|
393
|
+
},
|
|
394
|
+
wasTrackingAndIsNewStudy: (ctx, evt, condMeta) => {
|
|
395
|
+
return ctx.prevState === 'tracking' && !ctx.ignoredSeries.includes(evt.data.SeriesInstanceUID) && ctx.trackedStudy !== evt.data.StudyInstanceUID;
|
|
396
|
+
},
|
|
397
|
+
wasTrackingAndIsNewSeries: (ctx, evt, condMeta) => {
|
|
398
|
+
return ctx.prevState === 'tracking' && !ctx.ignoredSeries.includes(evt.data.SeriesInstanceUID) && !ctx.trackedSeries.includes(evt.data.SeriesInstanceUID);
|
|
399
|
+
},
|
|
333
400
|
shouldKillMachine: (ctx, evt) => evt.data && evt.data.userResponse === RESPONSE.NO_NEVER,
|
|
334
401
|
shouldAddSeries: (ctx, evt) => evt.data && evt.data.userResponse === RESPONSE.ADD_SERIES,
|
|
335
402
|
shouldSetStudyAndSeries: (ctx, evt) => evt.data && evt.data.userResponse === RESPONSE.SET_STUDY_AND_SERIES,
|
|
@@ -369,11 +436,13 @@ function promptBeginTracking({
|
|
|
369
436
|
const {
|
|
370
437
|
uiViewportDialogService
|
|
371
438
|
} = servicesManager.services;
|
|
439
|
+
// When the state change happens after a promise, the state machine sends the retult in evt.data;
|
|
440
|
+
// In case of direct transition to the state, the state machine sends the data in evt;
|
|
372
441
|
const {
|
|
373
442
|
viewportId,
|
|
374
443
|
StudyInstanceUID,
|
|
375
444
|
SeriesInstanceUID
|
|
376
|
-
} = evt;
|
|
445
|
+
} = evt.data || evt;
|
|
377
446
|
return new Promise(async function (resolve, reject) {
|
|
378
447
|
let promptResult = await _askTrackMeasurements(uiViewportDialogService, viewportId);
|
|
379
448
|
resolve({
|
|
@@ -439,11 +508,13 @@ function promptTrackNewSeries({
|
|
|
439
508
|
const {
|
|
440
509
|
UIViewportDialogService
|
|
441
510
|
} = servicesManager.services;
|
|
511
|
+
// When the state change happens after a promise, the state machine sends the retult in evt.data;
|
|
512
|
+
// In case of direct transition to the state, the state machine sends the data in evt;
|
|
442
513
|
const {
|
|
443
514
|
viewportId,
|
|
444
515
|
StudyInstanceUID,
|
|
445
516
|
SeriesInstanceUID
|
|
446
|
-
} = evt;
|
|
517
|
+
} = evt.data || evt;
|
|
447
518
|
return new Promise(async function (resolve, reject) {
|
|
448
519
|
let promptResult = await _askShouldAddMeasurements(UIViewportDialogService, viewportId);
|
|
449
520
|
if (promptResult === promptTrackNewSeries_RESPONSE.CREATE_REPORT) {
|
|
@@ -542,11 +613,13 @@ function promptTrackNewStudy({
|
|
|
542
613
|
const {
|
|
543
614
|
UIViewportDialogService
|
|
544
615
|
} = servicesManager.services;
|
|
616
|
+
// When the state change happens after a promise, the state machine sends the retult in evt.data;
|
|
617
|
+
// In case of direct transition to the state, the state machine sends the data in evt;
|
|
545
618
|
const {
|
|
546
619
|
viewportId,
|
|
547
620
|
StudyInstanceUID,
|
|
548
621
|
SeriesInstanceUID
|
|
549
|
-
} = evt;
|
|
622
|
+
} = evt.data || evt;
|
|
550
623
|
return new Promise(async function (resolve, reject) {
|
|
551
624
|
let promptResult = await promptTrackNewStudy_askTrackMeasurements(UIViewportDialogService, viewportId);
|
|
552
625
|
if (promptResult === promptTrackNewStudy_RESPONSE.SET_STUDY_AND_SERIES) {
|
|
@@ -835,6 +908,40 @@ function hydrateStructuredReport({
|
|
|
835
908
|
/* harmony default export */ const TrackedMeasurementsContext_hydrateStructuredReport = (hydrateStructuredReport);
|
|
836
909
|
// EXTERNAL MODULE: ./state/index.js + 1 modules
|
|
837
910
|
var state = __webpack_require__(15575);
|
|
911
|
+
;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptLabelAnnotation.js
|
|
912
|
+
function promptLabelAnnotation({
|
|
913
|
+
servicesManager,
|
|
914
|
+
extensionManager
|
|
915
|
+
}, ctx, evt) {
|
|
916
|
+
const {
|
|
917
|
+
measurementService,
|
|
918
|
+
customizationService
|
|
919
|
+
} = servicesManager.services;
|
|
920
|
+
const {
|
|
921
|
+
viewportId,
|
|
922
|
+
StudyInstanceUID,
|
|
923
|
+
SeriesInstanceUID,
|
|
924
|
+
measurementId
|
|
925
|
+
} = evt;
|
|
926
|
+
const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.common');
|
|
927
|
+
const {
|
|
928
|
+
showLabelAnnotationPopup
|
|
929
|
+
} = utilityModule.exports;
|
|
930
|
+
return new Promise(async function (resolve) {
|
|
931
|
+
const labelConfig = customizationService.get('measurementLabels');
|
|
932
|
+
const measurement = measurementService.getMeasurement(measurementId);
|
|
933
|
+
const value = await showLabelAnnotationPopup(measurement, servicesManager.services.uiDialogService, labelConfig);
|
|
934
|
+
measurementService.update(measurementId, {
|
|
935
|
+
...value
|
|
936
|
+
}, true);
|
|
937
|
+
resolve({
|
|
938
|
+
StudyInstanceUID,
|
|
939
|
+
SeriesInstanceUID,
|
|
940
|
+
viewportId
|
|
941
|
+
});
|
|
942
|
+
});
|
|
943
|
+
}
|
|
944
|
+
/* harmony default export */ const TrackedMeasurementsContext_promptLabelAnnotation = (promptLabelAnnotation);
|
|
838
945
|
;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx
|
|
839
946
|
|
|
840
947
|
|
|
@@ -849,6 +956,7 @@ var state = __webpack_require__(15575);
|
|
|
849
956
|
|
|
850
957
|
|
|
851
958
|
|
|
959
|
+
|
|
852
960
|
const TrackedMeasurementsContext = /*#__PURE__*/react.createContext();
|
|
853
961
|
TrackedMeasurementsContext.displayName = 'TrackedMeasurementsContext';
|
|
854
962
|
const useTrackedMeasurements = () => (0,react.useContext)(TrackedMeasurementsContext);
|
|
@@ -876,7 +984,8 @@ function TrackedMeasurementsContextProvider({
|
|
|
876
984
|
} = viewportGrid;
|
|
877
985
|
const {
|
|
878
986
|
measurementService,
|
|
879
|
-
displaySetService
|
|
987
|
+
displaySetService,
|
|
988
|
+
customizationService
|
|
880
989
|
} = servicesManager.services;
|
|
881
990
|
const machineOptions = Object.assign({}, defaultOptions);
|
|
882
991
|
machineOptions.actions = Object.assign({}, machineOptions.actions, {
|
|
@@ -973,8 +1082,22 @@ function TrackedMeasurementsContextProvider({
|
|
|
973
1082
|
servicesManager,
|
|
974
1083
|
extensionManager,
|
|
975
1084
|
appConfig
|
|
1085
|
+
}),
|
|
1086
|
+
promptLabelAnnotation: TrackedMeasurementsContext_promptLabelAnnotation.bind(null, {
|
|
1087
|
+
servicesManager,
|
|
1088
|
+
extensionManager
|
|
976
1089
|
})
|
|
977
1090
|
});
|
|
1091
|
+
machineOptions.guards = Object.assign({}, machineOptions.guards, {
|
|
1092
|
+
isLabelOnMeasure: (ctx, evt, condMeta) => {
|
|
1093
|
+
const labelConfig = customizationService.get('measurementLabels');
|
|
1094
|
+
return labelConfig?.labelOnMeasure;
|
|
1095
|
+
},
|
|
1096
|
+
isLabelOnMeasureAndShouldKillMachine: (ctx, evt, condMeta) => {
|
|
1097
|
+
const labelConfig = customizationService.get('measurementLabels');
|
|
1098
|
+
return evt.data && evt.data.userResponse === RESPONSE.NO_NEVER && labelConfig?.labelOnMeasure;
|
|
1099
|
+
}
|
|
1100
|
+
});
|
|
978
1101
|
|
|
979
1102
|
// TODO: IMPROVE
|
|
980
1103
|
// - Add measurement_updated to cornerstone; debounced? (ext side, or consumption?)
|
|
@@ -1091,8 +1214,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
1091
1214
|
"default": () => (/* binding */ measurement_tracking_src)
|
|
1092
1215
|
});
|
|
1093
1216
|
|
|
1094
|
-
// EXTERNAL MODULE: ../../../extensions/measurement-tracking/src/getContextModule.tsx +
|
|
1095
|
-
var getContextModule = __webpack_require__(
|
|
1217
|
+
// EXTERNAL MODULE: ../../../extensions/measurement-tracking/src/getContextModule.tsx + 13 modules
|
|
1218
|
+
var getContextModule = __webpack_require__(219);
|
|
1096
1219
|
// EXTERNAL MODULE: ../../../node_modules/react/index.js
|
|
1097
1220
|
var react = __webpack_require__(41766);
|
|
1098
1221
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
@@ -1104,8 +1227,8 @@ var dist = __webpack_require__(37396);
|
|
|
1104
1227
|
var es = __webpack_require__(80619);
|
|
1105
1228
|
// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
|
|
1106
1229
|
var src = __webpack_require__(85073);
|
|
1107
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
1108
|
-
var ui_src = __webpack_require__(
|
|
1230
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
1231
|
+
var ui_src = __webpack_require__(48804);
|
|
1109
1232
|
;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx
|
|
1110
1233
|
|
|
1111
1234
|
|
|
@@ -1814,7 +1937,8 @@ function PanelMeasurementTableTracking({
|
|
|
1814
1937
|
const {
|
|
1815
1938
|
measurementService,
|
|
1816
1939
|
uiDialogService,
|
|
1817
|
-
displaySetService
|
|
1940
|
+
displaySetService,
|
|
1941
|
+
customizationService
|
|
1818
1942
|
} = servicesManager.services;
|
|
1819
1943
|
const [trackedMeasurements, sendTrackedMeasurementsEvent] = (0,getContextModule/* useTrackedMeasurements */.B)();
|
|
1820
1944
|
const {
|
|
@@ -1914,84 +2038,20 @@ function PanelMeasurementTableTracking({
|
|
|
1914
2038
|
uid,
|
|
1915
2039
|
isActive
|
|
1916
2040
|
}) => {
|
|
1917
|
-
const measurement = measurementService.getMeasurement(uid);
|
|
1918
2041
|
jumpToImage({
|
|
1919
2042
|
uid,
|
|
1920
2043
|
isActive
|
|
1921
2044
|
});
|
|
1922
|
-
const
|
|
1923
|
-
|
|
1924
|
-
|
|
1925
|
-
|
|
1926
|
-
|
|
1927
|
-
|
|
1928
|
-
|
|
1929
|
-
|
|
1930
|
-
|
|
1931
|
-
|
|
1932
|
-
}, true);
|
|
1933
|
-
}
|
|
1934
|
-
}
|
|
1935
|
-
uiDialogService.dismiss({
|
|
1936
|
-
id: 'enter-annotation'
|
|
1937
|
-
});
|
|
1938
|
-
};
|
|
1939
|
-
uiDialogService.create({
|
|
1940
|
-
id: 'enter-annotation',
|
|
1941
|
-
centralize: true,
|
|
1942
|
-
isDraggable: false,
|
|
1943
|
-
showOverlay: true,
|
|
1944
|
-
content: ui_src/* Dialog */.lG,
|
|
1945
|
-
contentProps: {
|
|
1946
|
-
title: 'Annotation',
|
|
1947
|
-
noCloseButton: true,
|
|
1948
|
-
value: {
|
|
1949
|
-
label: measurement.label || ''
|
|
1950
|
-
},
|
|
1951
|
-
body: ({
|
|
1952
|
-
value,
|
|
1953
|
-
setValue
|
|
1954
|
-
}) => {
|
|
1955
|
-
const onChangeHandler = event => {
|
|
1956
|
-
event.persist();
|
|
1957
|
-
setValue(value => ({
|
|
1958
|
-
...value,
|
|
1959
|
-
label: event.target.value
|
|
1960
|
-
}));
|
|
1961
|
-
};
|
|
1962
|
-
const onKeyPressHandler = event => {
|
|
1963
|
-
if (event.key === 'Enter') {
|
|
1964
|
-
onSubmitHandler({
|
|
1965
|
-
value,
|
|
1966
|
-
action: {
|
|
1967
|
-
id: 'save'
|
|
1968
|
-
}
|
|
1969
|
-
});
|
|
1970
|
-
}
|
|
1971
|
-
};
|
|
1972
|
-
return /*#__PURE__*/react.createElement(ui_src/* Input */.pd, {
|
|
1973
|
-
label: "Enter your annotation",
|
|
1974
|
-
labelClassName: "text-white grow text-[14px] leading-[1.2]",
|
|
1975
|
-
autoFocus: true,
|
|
1976
|
-
id: "annotation",
|
|
1977
|
-
className: "border-primary-main bg-black",
|
|
1978
|
-
type: "text",
|
|
1979
|
-
value: value.label,
|
|
1980
|
-
onChange: onChangeHandler,
|
|
1981
|
-
onKeyPress: onKeyPressHandler
|
|
1982
|
-
});
|
|
1983
|
-
},
|
|
1984
|
-
actions: [{
|
|
1985
|
-
id: 'cancel',
|
|
1986
|
-
text: 'Cancel',
|
|
1987
|
-
type: ui_src/* ButtonEnums.type */.Ny.NW.secondary
|
|
1988
|
-
}, {
|
|
1989
|
-
id: 'save',
|
|
1990
|
-
text: 'Save',
|
|
1991
|
-
type: ui_src/* ButtonEnums.type */.Ny.NW.primary
|
|
1992
|
-
}],
|
|
1993
|
-
onSubmit: onSubmitHandler
|
|
1994
|
-
}
|
|
2045
|
+
const labelConfig = customizationService.get('measurementLabels');
|
|
2046
|
+
const measurement = measurementService.getMeasurement(uid);
|
|
2047
|
+
const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.common');
|
|
2048
|
+
const {
|
|
2049
|
+
showLabelAnnotationPopup
|
|
2050
|
+
} = utilityModule.exports;
|
|
2051
|
+
showLabelAnnotationPopup(measurement, uiDialogService, labelConfig).then(val => {
|
|
2052
|
+
measurementService.update(uid, {
|
|
2053
|
+
...val
|
|
2054
|
+
}, true);
|
|
1995
2055
|
});
|
|
1996
2056
|
};
|
|
1997
2057
|
const onMeasurementItemClickHandler = ({
|
|
@@ -315,8 +315,8 @@ function getHangingProtocolModule() {
|
|
|
315
315
|
|
|
316
316
|
// EXTERNAL MODULE: ./state/index.js + 1 modules
|
|
317
317
|
var state = __webpack_require__(15575);
|
|
318
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
319
|
-
var ui_src = __webpack_require__(
|
|
318
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
319
|
+
var ui_src = __webpack_require__(48804);
|
|
320
320
|
// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 78 modules
|
|
321
321
|
var default_src = __webpack_require__(54090);
|
|
322
322
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
@@ -19,8 +19,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
|
19
19
|
var react = __webpack_require__(41766);
|
|
20
20
|
// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
|
|
21
21
|
var es = __webpack_require__(80619);
|
|
22
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
23
|
-
var src = __webpack_require__(
|
|
22
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
23
|
+
var src = __webpack_require__(48804);
|
|
24
24
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
|
|
25
25
|
function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
|
|
26
26
|
const {
|
|
@@ -26,7 +26,7 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/mode-longi
|
|
|
26
26
|
const id = package_namespaceObject.UU;
|
|
27
27
|
|
|
28
28
|
;// CONCATENATED MODULE: ../../../modes/longitudinal/src/initToolGroups.js
|
|
29
|
-
function initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, toolGroupId) {
|
|
29
|
+
function initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, toolGroupId, modeLabelConfig) {
|
|
30
30
|
const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
|
|
31
31
|
const {
|
|
32
32
|
toolNames,
|
|
@@ -57,15 +57,25 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
|
|
|
57
57
|
}, {
|
|
58
58
|
toolName: toolNames.ArrowAnnotate,
|
|
59
59
|
configuration: {
|
|
60
|
-
getTextCallback: (callback, eventDetails) =>
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
60
|
+
getTextCallback: (callback, eventDetails) => {
|
|
61
|
+
if (modeLabelConfig) {
|
|
62
|
+
callback(' ');
|
|
63
|
+
} else {
|
|
64
|
+
commandsManager.runCommand('arrowTextCallback', {
|
|
65
|
+
callback,
|
|
66
|
+
eventDetails
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
},
|
|
70
|
+
changeTextCallback: (data, eventDetails, callback) => {
|
|
71
|
+
if (modeLabelConfig === undefined) {
|
|
72
|
+
commandsManager.runCommand('arrowTextCallback', {
|
|
73
|
+
callback,
|
|
74
|
+
data,
|
|
75
|
+
eventDetails
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
}
|
|
69
79
|
}
|
|
70
80
|
}, {
|
|
71
81
|
toolName: toolNames.Bidirectional
|
|
@@ -154,7 +164,7 @@ function initSRToolGroup(extensionManager, toolGroupService) {
|
|
|
154
164
|
const toolGroupId = 'SRToolGroup';
|
|
155
165
|
toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
|
|
156
166
|
}
|
|
157
|
-
function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
|
|
167
|
+
function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, modeLabelConfig) {
|
|
158
168
|
const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
|
|
159
169
|
const {
|
|
160
170
|
toolNames,
|
|
@@ -185,15 +195,25 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
|
|
|
185
195
|
}, {
|
|
186
196
|
toolName: toolNames.ArrowAnnotate,
|
|
187
197
|
configuration: {
|
|
188
|
-
getTextCallback: (callback, eventDetails) =>
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
198
|
+
getTextCallback: (callback, eventDetails) => {
|
|
199
|
+
if (modeLabelConfig) {
|
|
200
|
+
callback('');
|
|
201
|
+
} else {
|
|
202
|
+
commandsManager.runCommand('arrowTextCallback', {
|
|
203
|
+
callback,
|
|
204
|
+
eventDetails
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
},
|
|
208
|
+
changeTextCallback: (data, eventDetails, callback) => {
|
|
209
|
+
if (modeLabelConfig === undefined) {
|
|
210
|
+
commandsManager.runCommand('arrowTextCallback', {
|
|
211
|
+
callback,
|
|
212
|
+
data,
|
|
213
|
+
eventDetails
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
}
|
|
197
217
|
}
|
|
198
218
|
}, {
|
|
199
219
|
toolName: toolNames.Bidirectional
|
|
@@ -261,10 +281,10 @@ function initVolume3DToolGroup(extensionManager, toolGroupService) {
|
|
|
261
281
|
};
|
|
262
282
|
toolGroupService.createToolGroupAndAddTools('volume3d', tools);
|
|
263
283
|
}
|
|
264
|
-
function initToolGroups(extensionManager, toolGroupService, commandsManager) {
|
|
265
|
-
initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default');
|
|
266
|
-
initSRToolGroup(extensionManager, toolGroupService);
|
|
267
|
-
initMPRToolGroup(extensionManager, toolGroupService, commandsManager);
|
|
284
|
+
function initToolGroups(extensionManager, toolGroupService, commandsManager, modeLabelConfig) {
|
|
285
|
+
initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default', modeLabelConfig);
|
|
286
|
+
initSRToolGroup(extensionManager, toolGroupService, commandsManager);
|
|
287
|
+
initMPRToolGroup(extensionManager, toolGroupService, commandsManager, modeLabelConfig);
|
|
268
288
|
initVolume3DToolGroup(extensionManager, toolGroupService);
|
|
269
289
|
}
|
|
270
290
|
/* harmony default export */ const src_initToolGroups = (initToolGroups);
|
|
@@ -658,11 +678,11 @@ function modeFactory({
|
|
|
658
678
|
/**
|
|
659
679
|
* Lifecycle hooks
|
|
660
680
|
*/
|
|
661
|
-
onModeEnter: ({
|
|
681
|
+
onModeEnter: function ({
|
|
662
682
|
servicesManager,
|
|
663
683
|
extensionManager,
|
|
664
684
|
commandsManager
|
|
665
|
-
})
|
|
685
|
+
}) {
|
|
666
686
|
const {
|
|
667
687
|
measurementService,
|
|
668
688
|
toolbarService,
|
|
@@ -671,8 +691,22 @@ function modeFactory({
|
|
|
671
691
|
} = servicesManager.services;
|
|
672
692
|
measurementService.clearMeasurements();
|
|
673
693
|
|
|
694
|
+
// customizationService.addModeCustomizations([
|
|
695
|
+
// {
|
|
696
|
+
// id: 'measurementLabels',
|
|
697
|
+
// labelOnMeasure: true,
|
|
698
|
+
// exclusive: true,
|
|
699
|
+
// items: [
|
|
700
|
+
// { value: 'Head', label: 'Head' },
|
|
701
|
+
// { value: 'Shoulder', label: 'Shoulder' },
|
|
702
|
+
// { value: 'Knee', label: 'Knee' },
|
|
703
|
+
// { value: 'Toe', label: 'Toe' },
|
|
704
|
+
// ],
|
|
705
|
+
// },
|
|
706
|
+
// ]);
|
|
707
|
+
|
|
674
708
|
// Init Default and SR ToolGroups
|
|
675
|
-
src_initToolGroups(extensionManager, toolGroupService, commandsManager);
|
|
709
|
+
src_initToolGroups(extensionManager, toolGroupService, commandsManager, this.labelConfig);
|
|
676
710
|
toolbarService.addButtons([...src_toolbarButtons, ...src_moreTools]);
|
|
677
711
|
toolbarService.createButtonSection('primary', ['MeasurementTools', 'Zoom', 'Pan', 'TrackballRotate', 'WindowLevel', 'Capture', 'Layout', 'Crosshairs', 'MoreTools']);
|
|
678
712
|
customizationService.addModeCustomizations([{
|
|
@@ -723,8 +723,8 @@ var react = __webpack_require__(41766);
|
|
|
723
723
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
724
724
|
var prop_types = __webpack_require__(11374);
|
|
725
725
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
726
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
727
|
-
var src = __webpack_require__(
|
|
726
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
727
|
+
var src = __webpack_require__(48804);
|
|
728
728
|
// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
|
|
729
729
|
var core_src = __webpack_require__(85073);
|
|
730
730
|
// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
|
|
@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
14
14
|
|
|
15
15
|
// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
|
|
16
16
|
var src = __webpack_require__(85073);
|
|
17
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
18
|
-
var ui_src = __webpack_require__(
|
|
17
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
18
|
+
var ui_src = __webpack_require__(48804);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/toolbarButtons.ts
|
|
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
|
|
@@ -14,7 +14,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14
14
|
/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80619);
|
|
15
15
|
/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(85073);
|
|
16
16
|
/* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(74334);
|
|
17
|
-
/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
|
17
|
+
/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(48804);
|
|
18
18
|
/* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(77089);
|
|
19
19
|
/* harmony import */ var _state__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15575);
|
|
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); }
|
|
@@ -22,8 +22,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
|
22
22
|
// EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
|
|
23
23
|
var lodash_debounce = __webpack_require__(14771);
|
|
24
24
|
var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
|
|
25
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
26
|
-
var src = __webpack_require__(
|
|
25
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
26
|
+
var src = __webpack_require__(48804);
|
|
27
27
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
|
|
28
28
|
// extracted by mini-css-extract-plugin
|
|
29
29
|
|
|
@@ -25,8 +25,8 @@ var esm = __webpack_require__(20767);
|
|
|
25
25
|
var dist_esm = __webpack_require__(50719);
|
|
26
26
|
// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
|
|
27
27
|
var src = __webpack_require__(85073);
|
|
28
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
29
|
-
var ui_src = __webpack_require__(
|
|
28
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
29
|
+
var ui_src = __webpack_require__(48804);
|
|
30
30
|
// EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
|
|
31
31
|
var state = __webpack_require__(71353);
|
|
32
32
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.css
|
|
@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
12
12
|
"default": () => (/* binding */ basic_dev_mode_src)
|
|
13
13
|
});
|
|
14
14
|
|
|
15
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
16
|
-
var src = __webpack_require__(
|
|
15
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
|
|
16
|
+
var src = __webpack_require__(48804);
|
|
17
17
|
// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
|
|
18
18
|
var core_src = __webpack_require__(85073);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js
|