@ohif/app 3.13.0-beta.21 → 3.13.0-beta.23
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/{6409.bundle.24edbaa283b7c521b8f7.js → 2075.bundle.a9783d07b48ca241486e.js} +239 -168
- package/dist/{3081.bundle.69c2ed88c1fc66671e82.js → 3081.bundle.4344a3bedb7e70eb5d78.js} +2 -2
- package/dist/{3461.bundle.b1c56af281517014477c.js → 3461.bundle.7127d96c33ad3cd68c11.js} +3 -3
- package/dist/{4287.bundle.571587a1d29d54203175.js → 4287.bundle.c6bd6cf991e2dae32044.js} +111 -35
- package/dist/{5028.bundle.b75c0bb0fa9a490055bd.js → 5028.bundle.5833a530fe9ade4dc787.js} +2 -2
- package/dist/{2031.bundle.a17bc2d85cef3a9fea57.js → 581.bundle.2bb402f7316b6e8c735b.js} +326 -231
- package/dist/{6280.bundle.6574101421b8a4ab6777.js → 6280.bundle.828ccda61aa5c83408a5.js} +425 -567
- package/dist/{2816.bundle.838fa4d72921c026083c.js → 6386.bundle.d1be64fd274877e918d9.js} +30 -58
- package/dist/{8665.bundle.056dcd3e86743de2526c.js → 7537.bundle.5a26371cf1368d0e5cf2.js} +321 -75
- package/dist/{8305.bundle.e621bc861f8c16092e7c.js → 8305.bundle.61e53a1298804bd4bc46.js} +2 -2
- package/dist/{8583.bundle.d0773ead34455cfa28d7.js → 8583.bundle.3bae324bc92e2a4f00e4.js} +2 -2
- package/dist/{9195.bundle.902ab556e8909fa878a1.js → 9195.bundle.e4457f0ed6c34993e3c6.js} +3 -4
- package/dist/{9205.bundle.dca4f040999d069f1cc5.js → 9205.bundle.a37976b4f3ded2cbb2ab.js} +587 -709
- package/dist/{933.bundle.c8f45e1f380ad5a34e07.js → 933.bundle.a6220d057519db0b7651.js} +2 -2
- package/dist/{app.bundle.38dca800f336facdb28b.js → app.bundle.f8d7e7242f341be6acab.js} +282 -81
- package/dist/{compute.bundle.6bc9d64acadd16a85f59.js → compute.bundle.0fa6bd11224eb79e7474.js} +3 -3
- package/dist/index.html +1 -1
- package/dist/{polySeg.bundle.41c40b57dd1b265fb425.js → polySeg.bundle.f15c8d2cc2559db627cf.js} +3 -3
- package/dist/sw.js +1 -1
- package/package.json +21 -21
- /package/dist/{1459.bundle.2f3d935de1ef66d49c9b.js → 1459.bundle.fdfad1e671918501e3d2.js} +0 -0
- /package/dist/{1933.bundle.1b74cba28c11aaa349c1.js → 1933.bundle.f89ae7ae7baa9a38128e.js} +0 -0
- /package/dist/{2018.bundle.330c371c2152bc79a68e.js → 2018.bundle.a517a2a8d4b076b2c684.js} +0 -0
- /package/dist/{213.bundle.83766bfd0ad91206ba20.js → 213.bundle.df5bb838062f6a1aa79c.js} +0 -0
- /package/dist/{2424.bundle.8d41a94526449b9c27f2.js → 2424.bundle.c2786065ba1937631a79.js} +0 -0
- /package/dist/{3138.bundle.536017116b2a48fe8f59.js → 3138.bundle.a33cbe78017b1918c923.js} +0 -0
- /package/dist/{4507.bundle.2943a08dea2a96095e86.js → 4507.bundle.895bc803df58395a221f.js} +0 -0
- /package/dist/{4819.bundle.b817d46688ec00d46826.js → 4819.bundle.e97fa2fed6fb6e421f1a.js} +0 -0
- /package/dist/{5015.bundle.ea7e3b295cd3ef134df2.js → 5015.bundle.eff33bbbbd6ff055c742.js} +0 -0
- /package/dist/{5457.bundle.ea0a729d0bb45314d5ca.js → 5457.bundle.4b2e1e0aaf4f54d8cd1e.js} +0 -0
- /package/dist/{5485.bundle.8248a4caa4411103e190.js → 5485.bundle.70dbc4d41d1b5f299e6e.js} +0 -0
- /package/dist/{6027.bundle.b9a666f05ac57e742979.js → 6027.bundle.77ed34c72d695295cc90.js} +0 -0
- /package/dist/{7431.bundle.e6f5f5835a3c49e2309c.js → 7431.bundle.8ddbd21f7b2b8528a14a.js} +0 -0
- /package/dist/{7639.bundle.2e179ab85c66a6def98f.js → 7639.bundle.9a1d8c0a3624fff53cb9.js} +0 -0
- /package/dist/{8499.bundle.59df69e1919739d6e444.js → 8499.bundle.cca6ef54e2c475fc9f2b.js} +0 -0
- /package/dist/{85.bundle.14430d53b13d7ff9f8a8.js → 85.bundle.aa4e9485c037e1bf2cbc.js} +0 -0
- /package/dist/{8558.bundle.288aabeb7473ee9d7312.js → 8558.bundle.69bda0c8e9b438294401.js} +0 -0
- /package/dist/{9927.bundle.006c8d2dda07109c4749.js → 9927.bundle.006b27903e0450ce2e94.js} +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[
|
|
1
|
+
(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[581],{
|
|
2
2
|
|
|
3
|
-
/***/
|
|
3
|
+
/***/ 80581
|
|
4
4
|
(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
|
|
5
5
|
|
|
6
6
|
"use strict";
|
|
@@ -342,7 +342,7 @@ class MeasurementReport {
|
|
|
342
342
|
const toolClass = hooks.getToolClass ? hooks.getToolClass(measurementGroup, dataset, registeredToolClasses) : registeredToolClasses.find(tc => tc.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue));
|
|
343
343
|
if (toolClass) {
|
|
344
344
|
const measurement = toolClass.getMeasurementData(measurementGroup);
|
|
345
|
-
console.log(
|
|
345
|
+
console.log("=== ".concat(toolClass.toolType, " ==="));
|
|
346
346
|
console.log(measurement);
|
|
347
347
|
measurementData[toolClass.toolType].push(measurement);
|
|
348
348
|
}
|
|
@@ -364,6 +364,60 @@ MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_TOOL_TYPE = {};
|
|
|
364
364
|
|
|
365
365
|
|
|
366
366
|
|
|
367
|
+
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/node_modules/@babel/runtime/helpers/esm/typeof.js
|
|
368
|
+
function _typeof(o) {
|
|
369
|
+
"@babel/helpers - typeof";
|
|
370
|
+
|
|
371
|
+
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
|
|
372
|
+
return typeof o;
|
|
373
|
+
} : function (o) {
|
|
374
|
+
return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
|
|
375
|
+
}, _typeof(o);
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
|
|
379
|
+
|
|
380
|
+
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/node_modules/@babel/runtime/helpers/esm/toPrimitive.js
|
|
381
|
+
|
|
382
|
+
|
|
383
|
+
function toPrimitive(t, r) {
|
|
384
|
+
if ("object" != _typeof(t) || !t) return t;
|
|
385
|
+
var e = t[Symbol.toPrimitive];
|
|
386
|
+
if (void 0 !== e) {
|
|
387
|
+
var i = e.call(t, r || "default");
|
|
388
|
+
if ("object" != _typeof(i)) return i;
|
|
389
|
+
throw new TypeError("@@toPrimitive must return a primitive value.");
|
|
390
|
+
}
|
|
391
|
+
return ("string" === r ? String : Number)(t);
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
|
|
395
|
+
|
|
396
|
+
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js
|
|
397
|
+
|
|
398
|
+
|
|
399
|
+
|
|
400
|
+
function toPropertyKey(t) {
|
|
401
|
+
var i = toPrimitive(t, "string");
|
|
402
|
+
return "symbol" == _typeof(i) ? i : i + "";
|
|
403
|
+
}
|
|
404
|
+
|
|
405
|
+
|
|
406
|
+
|
|
407
|
+
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/node_modules/@babel/runtime/helpers/esm/defineProperty.js
|
|
408
|
+
|
|
409
|
+
|
|
410
|
+
function _defineProperty(e, r, t) {
|
|
411
|
+
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
412
|
+
value: t,
|
|
413
|
+
enumerable: !0,
|
|
414
|
+
configurable: !0,
|
|
415
|
+
writable: !0
|
|
416
|
+
}) : e[r] = t, e;
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
|
|
420
|
+
|
|
367
421
|
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/Cornerstone/cornerstone4Tag.js
|
|
368
422
|
var CORNERSTONE_4_TAG = 'cornerstoneTools@^4.0.0';
|
|
369
423
|
|
|
@@ -374,6 +428,9 @@ var CORNERSTONE_4_TAG = 'cornerstoneTools@^4.0.0';
|
|
|
374
428
|
|
|
375
429
|
|
|
376
430
|
|
|
431
|
+
|
|
432
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
433
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
377
434
|
const {
|
|
378
435
|
Length: TID300Length
|
|
379
436
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -386,8 +443,7 @@ class Length {
|
|
|
386
443
|
NUMGroup,
|
|
387
444
|
SCOORDGroup
|
|
388
445
|
} = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
|
|
389
|
-
const state = {
|
|
390
|
-
...defaultState,
|
|
446
|
+
const state = _objectSpread(_objectSpread({}, defaultState), {}, {
|
|
391
447
|
length: NUMGroup.MeasuredValueSequence.NumericValue,
|
|
392
448
|
toolType: Length.toolType,
|
|
393
449
|
handles: {
|
|
@@ -401,7 +457,7 @@ class Length {
|
|
|
401
457
|
hasBoundingBox: true
|
|
402
458
|
}
|
|
403
459
|
}
|
|
404
|
-
};
|
|
460
|
+
});
|
|
405
461
|
[state.handles.start.x, state.handles.start.y, state.handles.end.x, state.handles.end.y] = SCOORDGroup.GraphicData;
|
|
406
462
|
return state;
|
|
407
463
|
}
|
|
@@ -447,6 +503,9 @@ MeasurementReport.registerTool(Length);
|
|
|
447
503
|
|
|
448
504
|
|
|
449
505
|
|
|
506
|
+
|
|
507
|
+
function FreehandRoi_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
508
|
+
function FreehandRoi_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? FreehandRoi_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : FreehandRoi_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
450
509
|
const {
|
|
451
510
|
Polyline: TID300Polyline
|
|
452
511
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -457,8 +516,7 @@ class FreehandRoi {
|
|
|
457
516
|
SCOORDGroup,
|
|
458
517
|
NUMGroup
|
|
459
518
|
} = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
|
|
460
|
-
const state = {
|
|
461
|
-
...defaultState,
|
|
519
|
+
const state = FreehandRoi_objectSpread(FreehandRoi_objectSpread({}, defaultState), {}, {
|
|
462
520
|
toolType: FreehandRoi.toolType,
|
|
463
521
|
handles: {
|
|
464
522
|
points: [],
|
|
@@ -476,7 +534,7 @@ class FreehandRoi {
|
|
|
476
534
|
},
|
|
477
535
|
color: undefined,
|
|
478
536
|
invalidated: true
|
|
479
|
-
};
|
|
537
|
+
});
|
|
480
538
|
const {
|
|
481
539
|
GraphicData
|
|
482
540
|
} = SCOORDGroup;
|
|
@@ -691,6 +749,9 @@ MeasurementReport.registerTool(Bidirectional);
|
|
|
691
749
|
|
|
692
750
|
|
|
693
751
|
|
|
752
|
+
|
|
753
|
+
function EllipticalRoi_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
754
|
+
function EllipticalRoi_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? EllipticalRoi_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : EllipticalRoi_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
694
755
|
const {
|
|
695
756
|
Ellipse: TID300Ellipse
|
|
696
757
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -741,8 +802,7 @@ class EllipticalRoi {
|
|
|
741
802
|
x: majorAxis[1].x - minorAxisDirection.x * halfMinorAxisLength,
|
|
742
803
|
y: majorAxis[1].y - minorAxisDirection.y * halfMinorAxisLength
|
|
743
804
|
};
|
|
744
|
-
const state = {
|
|
745
|
-
...defaultState,
|
|
805
|
+
const state = EllipticalRoi_objectSpread(EllipticalRoi_objectSpread({}, defaultState), {}, {
|
|
746
806
|
toolType: EllipticalRoi.toolType,
|
|
747
807
|
active: false,
|
|
748
808
|
cachedStats: {
|
|
@@ -772,7 +832,7 @@ class EllipticalRoi {
|
|
|
772
832
|
},
|
|
773
833
|
invalidated: true,
|
|
774
834
|
visible: true
|
|
775
|
-
};
|
|
835
|
+
});
|
|
776
836
|
return state;
|
|
777
837
|
}
|
|
778
838
|
static getTID300RepresentationArguments(tool) {
|
|
@@ -869,6 +929,9 @@ MeasurementReport.registerTool(EllipticalRoi);
|
|
|
869
929
|
|
|
870
930
|
|
|
871
931
|
|
|
932
|
+
|
|
933
|
+
function CircleRoi_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
934
|
+
function CircleRoi_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? CircleRoi_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : CircleRoi_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
872
935
|
const {
|
|
873
936
|
Circle: TID300Circle
|
|
874
937
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -892,8 +955,7 @@ class CircleRoi {
|
|
|
892
955
|
x: GraphicData[2],
|
|
893
956
|
y: GraphicData[3]
|
|
894
957
|
};
|
|
895
|
-
const state = {
|
|
896
|
-
...defaultState,
|
|
958
|
+
const state = CircleRoi_objectSpread(CircleRoi_objectSpread({}, defaultState), {}, {
|
|
897
959
|
toolType: CircleRoi.toolType,
|
|
898
960
|
active: false,
|
|
899
961
|
cachedStats: {
|
|
@@ -903,17 +965,15 @@ class CircleRoi {
|
|
|
903
965
|
perimeter: 0
|
|
904
966
|
},
|
|
905
967
|
handles: {
|
|
906
|
-
end: {
|
|
907
|
-
...end,
|
|
968
|
+
end: CircleRoi_objectSpread(CircleRoi_objectSpread({}, end), {}, {
|
|
908
969
|
highlight: false,
|
|
909
970
|
active: false
|
|
910
|
-
},
|
|
971
|
+
}),
|
|
911
972
|
initialRotation: 0,
|
|
912
|
-
start: {
|
|
913
|
-
...center,
|
|
973
|
+
start: CircleRoi_objectSpread(CircleRoi_objectSpread({}, center), {}, {
|
|
914
974
|
highlight: false,
|
|
915
975
|
active: false
|
|
916
|
-
},
|
|
976
|
+
}),
|
|
917
977
|
textBox: {
|
|
918
978
|
hasMoved: false,
|
|
919
979
|
movesIndependently: false,
|
|
@@ -924,7 +984,7 @@ class CircleRoi {
|
|
|
924
984
|
},
|
|
925
985
|
invalidated: true,
|
|
926
986
|
visible: true
|
|
927
|
-
};
|
|
987
|
+
});
|
|
928
988
|
return state;
|
|
929
989
|
}
|
|
930
990
|
|
|
@@ -987,6 +1047,9 @@ MeasurementReport.registerTool(CircleRoi);
|
|
|
987
1047
|
|
|
988
1048
|
|
|
989
1049
|
|
|
1050
|
+
|
|
1051
|
+
function ArrowAnnotate_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
1052
|
+
function ArrowAnnotate_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ArrowAnnotate_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ArrowAnnotate_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
990
1053
|
const {
|
|
991
1054
|
Point: TID300Point
|
|
992
1055
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -1002,8 +1065,7 @@ class ArrowAnnotate {
|
|
|
1002
1065
|
const {
|
|
1003
1066
|
GraphicData
|
|
1004
1067
|
} = SCOORDGroup;
|
|
1005
|
-
const state = {
|
|
1006
|
-
...defaultState,
|
|
1068
|
+
const state = ArrowAnnotate_objectSpread(ArrowAnnotate_objectSpread({}, defaultState), {}, {
|
|
1007
1069
|
toolType: ArrowAnnotate.toolType,
|
|
1008
1070
|
active: false,
|
|
1009
1071
|
handles: {
|
|
@@ -1031,7 +1093,7 @@ class ArrowAnnotate {
|
|
|
1031
1093
|
},
|
|
1032
1094
|
invalidated: true,
|
|
1033
1095
|
visible: true
|
|
1034
|
-
};
|
|
1096
|
+
});
|
|
1035
1097
|
return state;
|
|
1036
1098
|
}
|
|
1037
1099
|
static getTID300RepresentationArguments(tool) {
|
|
@@ -1044,7 +1106,7 @@ class ArrowAnnotate {
|
|
|
1044
1106
|
} = tool;
|
|
1045
1107
|
const TID300RepresentationArguments = {
|
|
1046
1108
|
points,
|
|
1047
|
-
trackingIdentifierTextValue:
|
|
1109
|
+
trackingIdentifierTextValue: "cornerstoneTools@^4.0.0:ArrowAnnotate",
|
|
1048
1110
|
findingSites: findingSites || []
|
|
1049
1111
|
};
|
|
1050
1112
|
|
|
@@ -1082,6 +1144,9 @@ MeasurementReport.registerTool(ArrowAnnotate);
|
|
|
1082
1144
|
|
|
1083
1145
|
|
|
1084
1146
|
|
|
1147
|
+
|
|
1148
|
+
function CobbAngle_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
1149
|
+
function CobbAngle_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? CobbAngle_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : CobbAngle_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
1085
1150
|
const {
|
|
1086
1151
|
CobbAngle: TID300CobbAngle
|
|
1087
1152
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -1094,8 +1159,7 @@ class CobbAngle {
|
|
|
1094
1159
|
NUMGroup,
|
|
1095
1160
|
SCOORDGroup
|
|
1096
1161
|
} = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
|
|
1097
|
-
const state = {
|
|
1098
|
-
...defaultState,
|
|
1162
|
+
const state = CobbAngle_objectSpread(CobbAngle_objectSpread({}, defaultState), {}, {
|
|
1099
1163
|
rAngle: NUMGroup.MeasuredValueSequence.NumericValue,
|
|
1100
1164
|
toolType: CobbAngle.toolType,
|
|
1101
1165
|
handles: {
|
|
@@ -1117,7 +1181,7 @@ class CobbAngle {
|
|
|
1117
1181
|
hasBoundingBox: true
|
|
1118
1182
|
}
|
|
1119
1183
|
}
|
|
1120
|
-
};
|
|
1184
|
+
});
|
|
1121
1185
|
[state.handles.start.x, state.handles.start.y, state.handles.end.x, state.handles.end.y, state.handles.start2.x, state.handles.start2.y, state.handles.end2.x, state.handles.end2.y] = SCOORDGroup.GraphicData;
|
|
1122
1186
|
return state;
|
|
1123
1187
|
}
|
|
@@ -1167,6 +1231,9 @@ MeasurementReport.registerTool(CobbAngle);
|
|
|
1167
1231
|
|
|
1168
1232
|
|
|
1169
1233
|
|
|
1234
|
+
|
|
1235
|
+
function Angle_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
1236
|
+
function Angle_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? Angle_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : Angle_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
1170
1237
|
const {
|
|
1171
1238
|
Angle: TID300Angle
|
|
1172
1239
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -1181,8 +1248,7 @@ class Angle {
|
|
|
1181
1248
|
NUMGroup,
|
|
1182
1249
|
SCOORDGroup
|
|
1183
1250
|
} = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
|
|
1184
|
-
const state = {
|
|
1185
|
-
...defaultState,
|
|
1251
|
+
const state = Angle_objectSpread(Angle_objectSpread({}, defaultState), {}, {
|
|
1186
1252
|
rAngle: NUMGroup.MeasuredValueSequence.NumericValue,
|
|
1187
1253
|
toolType: Angle.toolType,
|
|
1188
1254
|
handles: {
|
|
@@ -1197,7 +1263,7 @@ class Angle {
|
|
|
1197
1263
|
hasBoundingBox: true
|
|
1198
1264
|
}
|
|
1199
1265
|
}
|
|
1200
|
-
};
|
|
1266
|
+
});
|
|
1201
1267
|
[state.handles.start.x, state.handles.start.y, state.handles.middle.x, state.handles.middle.y, state.handles.middle.x, state.handles.middle.y, state.handles.end.x, state.handles.end.y] = SCOORDGroup.GraphicData;
|
|
1202
1268
|
return state;
|
|
1203
1269
|
}
|
|
@@ -1247,6 +1313,9 @@ MeasurementReport.registerTool(Angle);
|
|
|
1247
1313
|
|
|
1248
1314
|
|
|
1249
1315
|
|
|
1316
|
+
|
|
1317
|
+
function RectangleRoi_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
1318
|
+
function RectangleRoi_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? RectangleRoi_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : RectangleRoi_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
1250
1319
|
const {
|
|
1251
1320
|
Polyline: RectangleRoi_TID300Polyline
|
|
1252
1321
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -1257,8 +1326,7 @@ class RectangleRoi {
|
|
|
1257
1326
|
SCOORDGroup,
|
|
1258
1327
|
NUMGroup
|
|
1259
1328
|
} = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
|
|
1260
|
-
const state = {
|
|
1261
|
-
...defaultState,
|
|
1329
|
+
const state = RectangleRoi_objectSpread(RectangleRoi_objectSpread({}, defaultState), {}, {
|
|
1262
1330
|
toolType: RectangleRoi.toolType,
|
|
1263
1331
|
handles: {
|
|
1264
1332
|
start: {},
|
|
@@ -1278,7 +1346,7 @@ class RectangleRoi {
|
|
|
1278
1346
|
},
|
|
1279
1347
|
color: undefined,
|
|
1280
1348
|
invalidated: true
|
|
1281
|
-
};
|
|
1349
|
+
});
|
|
1282
1350
|
const intermediate = {};
|
|
1283
1351
|
[state.handles.start.x, state.handles.start.y, intermediate.x, intermediate.y, state.handles.end.x, state.handles.end.y] = SCOORDGroup.GraphicData;
|
|
1284
1352
|
return state;
|
|
@@ -1365,7 +1433,7 @@ function getDatasetsFromImages(images, isMultiframe, options) {
|
|
|
1365
1433
|
datasets.push(dataset);
|
|
1366
1434
|
}
|
|
1367
1435
|
}
|
|
1368
|
-
if (options
|
|
1436
|
+
if (options !== null && options !== void 0 && options.SpecificCharacterSet) {
|
|
1369
1437
|
datasets.forEach(dataset => dataset.SpecificCharacterSet = options.SpecificCharacterSet);
|
|
1370
1438
|
}
|
|
1371
1439
|
return getDatasetsFromImages_Normalizer.normalizeToDataset(datasets);
|
|
@@ -2746,22 +2814,22 @@ function getImageIdOfSourceImageBySourceImageSequence(SourceImageSequence, sopUI
|
|
|
2746
2814
|
} = SourceImageSequence;
|
|
2747
2815
|
const baseImageId = sopUIDImageIdIndexMap[ReferencedSOPInstanceUID];
|
|
2748
2816
|
if (!baseImageId) {
|
|
2749
|
-
console.warn(
|
|
2817
|
+
console.warn("No imageId found for SOPInstanceUID: ".concat(ReferencedSOPInstanceUID));
|
|
2750
2818
|
return undefined;
|
|
2751
2819
|
}
|
|
2752
2820
|
if (ReferencedFrameNumber !== undefined) {
|
|
2753
2821
|
if (baseImageId.includes('frames/')) {
|
|
2754
|
-
return baseImageId.replace(/frames\/\d+/,
|
|
2822
|
+
return baseImageId.replace(/frames\/\d+/, "frames/".concat(ReferencedFrameNumber));
|
|
2755
2823
|
} else if (baseImageId.includes('dicomfile:')) {
|
|
2756
2824
|
// dicomfile base 1, despite having frame=
|
|
2757
|
-
return baseImageId.replace(/frame=\d+/,
|
|
2825
|
+
return baseImageId.replace(/frame=\d+/, "frame=".concat(ReferencedFrameNumber));
|
|
2758
2826
|
} else if (baseImageId.includes('frame=')) {
|
|
2759
|
-
return baseImageId.replace(/frame=\d+/,
|
|
2827
|
+
return baseImageId.replace(/frame=\d+/, "frame=".concat(ReferencedFrameNumber - 1));
|
|
2760
2828
|
} else {
|
|
2761
2829
|
if (baseImageId.includes('wadors:')) {
|
|
2762
|
-
return
|
|
2830
|
+
return "".concat(baseImageId, "/frames/").concat(ReferencedFrameNumber);
|
|
2763
2831
|
} else {
|
|
2764
|
-
return
|
|
2832
|
+
return "".concat(baseImageId, "?frame=").concat(ReferencedFrameNumber - 1);
|
|
2765
2833
|
}
|
|
2766
2834
|
}
|
|
2767
2835
|
}
|
|
@@ -2792,7 +2860,8 @@ function isMultiframeImage(imageMetadata) {
|
|
|
2792
2860
|
* @return {String} The corresponding imageId.
|
|
2793
2861
|
*/
|
|
2794
2862
|
function getImageIdOfSourceImagebyGeometry(ReferencedSeriesInstanceUID, FrameOfReferenceUID, PerFrameFunctionalGroup, imageIds, metadataProvider, tolerance) {
|
|
2795
|
-
|
|
2863
|
+
var _PerFrameFunctionalGr;
|
|
2864
|
+
if (!ReferencedSeriesInstanceUID || !((_PerFrameFunctionalGr = PerFrameFunctionalGroup.PlanePositionSequence) !== null && _PerFrameFunctionalGr !== void 0 && (_PerFrameFunctionalGr = _PerFrameFunctionalGr[0]) !== null && _PerFrameFunctionalGr !== void 0 && _PerFrameFunctionalGr.ImagePositionPatient)) {
|
|
2796
2865
|
return undefined;
|
|
2797
2866
|
}
|
|
2798
2867
|
const segFramePosition = PerFrameFunctionalGroup.PlanePositionSequence[0].ImagePositionPatient;
|
|
@@ -2808,7 +2877,8 @@ function getImageIdOfSourceImagebyGeometry(ReferencedSeriesInstanceUID, FrameOfR
|
|
|
2808
2877
|
|
|
2809
2878
|
// For multiframe images, check each frame's position
|
|
2810
2879
|
if (isMultiframe) {
|
|
2811
|
-
|
|
2880
|
+
var _metadataProvider$get;
|
|
2881
|
+
const framePosition = (_metadataProvider$get = metadataProvider.get('imagePlaneModule', imageId)) === null || _metadataProvider$get === void 0 ? void 0 : _metadataProvider$get.imagePositionPatient;
|
|
2812
2882
|
if (framePosition && esm.utilities.isEqual(segFramePosition, framePosition, tolerance)) {
|
|
2813
2883
|
return imageId;
|
|
2814
2884
|
}
|
|
@@ -3057,7 +3127,7 @@ function Segmentation_generateSegmentation(images, labelmaps3DorBrushData) {
|
|
|
3057
3127
|
if (cornerstoneToolsVersion === 3) {
|
|
3058
3128
|
return Segmentation.generateSegmentation(images, labelmaps3DorBrushData, options);
|
|
3059
3129
|
}
|
|
3060
|
-
console.warn(
|
|
3130
|
+
console.warn("No generateSegmentation adapter for cornerstone version ".concat(cornerstoneToolsVersion, ", exiting."));
|
|
3061
3131
|
}
|
|
3062
3132
|
|
|
3063
3133
|
/**
|
|
@@ -3084,7 +3154,7 @@ function Segmentation_generateToolState(imageIds, arrayBuffer, metadataProvider)
|
|
|
3084
3154
|
if (cornerstoneToolsVersion === 3) {
|
|
3085
3155
|
return Segmentation.generateToolState(imageIds, arrayBuffer, metadataProvider);
|
|
3086
3156
|
}
|
|
3087
|
-
console.warn(
|
|
3157
|
+
console.warn("No generateToolState adapter for cornerstone version ".concat(cornerstoneToolsVersion, ", exiting."));
|
|
3088
3158
|
}
|
|
3089
3159
|
|
|
3090
3160
|
/**
|
|
@@ -3103,7 +3173,7 @@ function Segmentation_fillSegmentation(segmentation, inputLabelmaps3D) {
|
|
|
3103
3173
|
if (cornerstoneToolsVersion === 4) {
|
|
3104
3174
|
return Segmentation_4X_Segmentation.fillSegmentation(segmentation, inputLabelmaps3D, options);
|
|
3105
3175
|
}
|
|
3106
|
-
console.warn(
|
|
3176
|
+
console.warn("No generateSegmentation adapter for cornerstone version ".concat(cornerstoneToolsVersion, ", exiting."));
|
|
3107
3177
|
}
|
|
3108
3178
|
|
|
3109
3179
|
|
|
@@ -3146,7 +3216,7 @@ async function ParametricMap_generateToolState(imageIds, arrayBuffer, metadataPr
|
|
|
3146
3216
|
Perpendicular: "orthogonal",
|
|
3147
3217
|
Oblique: "oblique"
|
|
3148
3218
|
};
|
|
3149
|
-
throw new Error(
|
|
3219
|
+
throw new Error("Parametric maps ".concat(orientationText[orientation], " to the acquisition plane of the source data are not yet supported."));
|
|
3150
3220
|
}
|
|
3151
3221
|
const imageIdMaps = imageIds.reduce((acc, curr, index) => {
|
|
3152
3222
|
acc.indices[curr] = index;
|
|
@@ -3192,8 +3262,9 @@ function getPixelData(multiframe) {
|
|
|
3192
3262
|
let TypedArrayClass;
|
|
3193
3263
|
let data;
|
|
3194
3264
|
if (multiframe.PixelData) {
|
|
3265
|
+
var _multiframe$PixelRepr;
|
|
3195
3266
|
const validTypedArrays = multiframe.BitsAllocated === 16 ? [Uint16Array, Int16Array] : [Uint32Array, Int32Array];
|
|
3196
|
-
TypedArrayClass = validTypedArrays[multiframe.PixelRepresentation
|
|
3267
|
+
TypedArrayClass = validTypedArrays[(_multiframe$PixelRepr = multiframe.PixelRepresentation) !== null && _multiframe$PixelRepr !== void 0 ? _multiframe$PixelRepr : 0];
|
|
3197
3268
|
data = multiframe.PixelData;
|
|
3198
3269
|
} else if (multiframe.FloatPixelData) {
|
|
3199
3270
|
TypedArrayClass = Float32Array;
|
|
@@ -3411,14 +3482,14 @@ function scoordToWorld(_ref, scoord) {
|
|
|
3411
3482
|
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/helpers/toPoint3.js
|
|
3412
3483
|
function toPoint3(flatPoints) {
|
|
3413
3484
|
const points = [];
|
|
3414
|
-
if (!flatPoints
|
|
3485
|
+
if (!(flatPoints !== null && flatPoints !== void 0 && flatPoints.length)) {
|
|
3415
3486
|
return points;
|
|
3416
3487
|
}
|
|
3417
3488
|
const {
|
|
3418
3489
|
length: n
|
|
3419
3490
|
} = flatPoints;
|
|
3420
3491
|
if (n % 3 !== 0) {
|
|
3421
|
-
throw new Error(
|
|
3492
|
+
throw new Error("Points array should be divisible by 3 for SCOORD3D, but contents are: ".concat(JSON.stringify(flatPoints), " of length ").concat(n));
|
|
3422
3493
|
}
|
|
3423
3494
|
for (let i = 0; i < n; i += 3) {
|
|
3424
3495
|
points.push([flatPoints[i], flatPoints[i + 1], flatPoints[i + 2]]);
|
|
@@ -3446,6 +3517,10 @@ const CodingScheme = {
|
|
|
3446
3517
|
|
|
3447
3518
|
|
|
3448
3519
|
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/Cornerstone3D/constants/index.js
|
|
3520
|
+
|
|
3521
|
+
|
|
3522
|
+
function constants_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3523
|
+
function constants_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? constants_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : constants_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
3449
3524
|
const NO_IMAGE_ID = 'none';
|
|
3450
3525
|
const CS3D_DESIGNATOR = '99CS3D';
|
|
3451
3526
|
const TEXT_ANNOTATION_POSITION = {
|
|
@@ -3484,13 +3559,12 @@ const metaSRAnnotation = {
|
|
|
3484
3559
|
vr: 'SH'
|
|
3485
3560
|
}
|
|
3486
3561
|
};
|
|
3487
|
-
const metaRTSSContour = {
|
|
3488
|
-
...metaSRAnnotation,
|
|
3562
|
+
const metaRTSSContour = constants_objectSpread(constants_objectSpread({}, metaSRAnnotation), {}, {
|
|
3489
3563
|
ImplementationClassUID: {
|
|
3490
3564
|
Value: [ImplementationClassRtssContours],
|
|
3491
3565
|
vr: 'UI'
|
|
3492
3566
|
}
|
|
3493
|
-
};
|
|
3567
|
+
});
|
|
3494
3568
|
|
|
3495
3569
|
|
|
3496
3570
|
|
|
@@ -3551,6 +3625,7 @@ class LabelData {
|
|
|
3551
3625
|
this.ReferencedSOPSequence = tid300Item.ReferencedSOPSequence;
|
|
3552
3626
|
}
|
|
3553
3627
|
contentItem() {
|
|
3628
|
+
var _handles$textBox;
|
|
3554
3629
|
const contentEntries = this.tid300Item.contentItem();
|
|
3555
3630
|
const {
|
|
3556
3631
|
label,
|
|
@@ -3560,7 +3635,7 @@ class LabelData {
|
|
|
3560
3635
|
contentEntries.push(this.createQualitativeLabel(label));
|
|
3561
3636
|
this.filterCornerstoneFreeText(contentEntries);
|
|
3562
3637
|
}
|
|
3563
|
-
if (handles
|
|
3638
|
+
if (handles !== null && handles !== void 0 && (_handles$textBox = handles.textBox) !== null && _handles$textBox !== void 0 && _handles$textBox.hasMoved) {
|
|
3564
3639
|
contentEntries.push(this.createQualitativeLabelPosition(this.annotation));
|
|
3565
3640
|
}
|
|
3566
3641
|
return contentEntries;
|
|
@@ -3650,7 +3725,10 @@ class LabelData {
|
|
|
3650
3725
|
|
|
3651
3726
|
|
|
3652
3727
|
|
|
3728
|
+
|
|
3653
3729
|
var _MeasurementReport;
|
|
3730
|
+
function MeasurementReport_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3731
|
+
function MeasurementReport_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? MeasurementReport_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : MeasurementReport_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
3654
3732
|
const {
|
|
3655
3733
|
MetadataModules
|
|
3656
3734
|
} = esm.Enums;
|
|
@@ -3719,7 +3797,7 @@ class MeasurementReport_MeasurementReport {
|
|
|
3719
3797
|
finding,
|
|
3720
3798
|
commentGroup
|
|
3721
3799
|
} = defaultState;
|
|
3722
|
-
if (commentGroup
|
|
3800
|
+
if (commentGroup !== null && commentGroup !== void 0 && commentGroup.TextValue) {
|
|
3723
3801
|
return commentGroup.TextValue;
|
|
3724
3802
|
}
|
|
3725
3803
|
const cornersoneFreeTextCodingValue = CodingScheme.codeValues.CORNERSTONEFREETEXT;
|
|
@@ -3748,7 +3826,7 @@ class MeasurementReport_MeasurementReport {
|
|
|
3748
3826
|
ReferencedSOPInstanceUID,
|
|
3749
3827
|
ReferencedFrameNumber = 1
|
|
3750
3828
|
} = ReferencedSOPSequence;
|
|
3751
|
-
const referencedImageId = sopInstanceUIDToImageIdMap[
|
|
3829
|
+
const referencedImageId = sopInstanceUIDToImageIdMap["".concat(ReferencedSOPInstanceUID, ":").concat(ReferencedFrameNumber)];
|
|
3752
3830
|
const imagePlaneModule = metadata.get('imagePlaneModule', referencedImageId);
|
|
3753
3831
|
const annotationUID = MeasurementReport_DicomMetaDictionary.uid();
|
|
3754
3832
|
return {
|
|
@@ -3935,13 +4013,12 @@ class MeasurementReport_MeasurementReport {
|
|
|
3935
4013
|
};
|
|
3936
4014
|
const scoord = spatialGroup.SCOORD3DGroup || spatialGroup.SCOORDGroup;
|
|
3937
4015
|
const worldCoords = scoordToWorld(scoordArgs, scoord);
|
|
3938
|
-
return {
|
|
3939
|
-
...spatialGroup,
|
|
4016
|
+
return MeasurementReport_objectSpread(MeasurementReport_objectSpread({}, spatialGroup), {}, {
|
|
3940
4017
|
is3DMeasurement,
|
|
3941
4018
|
scoordArgs,
|
|
3942
4019
|
scoord,
|
|
3943
4020
|
worldCoords
|
|
3944
|
-
};
|
|
4021
|
+
});
|
|
3945
4022
|
}
|
|
3946
4023
|
static generateReferencedSOPSequence(_ref5) {
|
|
3947
4024
|
let {
|
|
@@ -3982,20 +4059,22 @@ class MeasurementReport_MeasurementReport {
|
|
|
3982
4059
|
return ReferencedSOPSequence;
|
|
3983
4060
|
}
|
|
3984
4061
|
static getImageIdFromVolume(_ref6) {
|
|
4062
|
+
var _toolData$toolTypes$, _referenceToolData$me;
|
|
3985
4063
|
let {
|
|
3986
4064
|
toolData,
|
|
3987
4065
|
toolTypes
|
|
3988
4066
|
} = _ref6;
|
|
3989
|
-
const referenceToolData = toolData
|
|
3990
|
-
const volumeId = referenceToolData
|
|
4067
|
+
const referenceToolData = toolData === null || toolData === void 0 || (_toolData$toolTypes$ = toolData[toolTypes === null || toolTypes === void 0 ? void 0 : toolTypes[0]]) === null || _toolData$toolTypes$ === void 0 || (_toolData$toolTypes$ = _toolData$toolTypes$.data) === null || _toolData$toolTypes$ === void 0 ? void 0 : _toolData$toolTypes$[0];
|
|
4068
|
+
const volumeId = referenceToolData === null || referenceToolData === void 0 || (_referenceToolData$me = referenceToolData.metadata) === null || _referenceToolData$me === void 0 ? void 0 : _referenceToolData$me.volumeId;
|
|
3991
4069
|
const volume = esm.cache.getVolume(volumeId);
|
|
3992
4070
|
if (!volume) {
|
|
3993
|
-
throw new Error(
|
|
4071
|
+
throw new Error("No volume found for ".concat(volumeId));
|
|
3994
4072
|
}
|
|
3995
4073
|
const imageId = volume.imageIds[0];
|
|
3996
4074
|
return imageId;
|
|
3997
4075
|
}
|
|
3998
4076
|
static generateReport(toolState, metadataProvider, options) {
|
|
4077
|
+
var _report$dataset;
|
|
3999
4078
|
let allMeasurementGroups = [];
|
|
4000
4079
|
const sopInstanceUIDsToSeriesInstanceUIDMap = {};
|
|
4001
4080
|
const derivationSourceDatasets = [];
|
|
@@ -4029,21 +4108,20 @@ class MeasurementReport_MeasurementReport {
|
|
|
4029
4108
|
TID1501MeasurementGroups: allMeasurementGroups
|
|
4030
4109
|
}, options);
|
|
4031
4110
|
const report = new MeasurementReport_StructuredReport(derivationSourceDatasets, options);
|
|
4032
|
-
const contentItem = tid1500MeasurementReport.contentItem(derivationSourceDatasets, {
|
|
4033
|
-
...options,
|
|
4111
|
+
const contentItem = tid1500MeasurementReport.contentItem(derivationSourceDatasets, MeasurementReport_objectSpread(MeasurementReport_objectSpread({}, options), {}, {
|
|
4034
4112
|
sopInstanceUIDsToSeriesInstanceUIDMap
|
|
4035
|
-
});
|
|
4113
|
+
}));
|
|
4036
4114
|
report.dataset = Object.assign(report.dataset, contentItem);
|
|
4037
4115
|
report.dataset._meta = _meta;
|
|
4038
4116
|
report.SpecificCharacterSet = 'ISO_IR 192';
|
|
4039
|
-
report.dataset.InstanceNumber
|
|
4117
|
+
(_report$dataset = report.dataset).InstanceNumber || (_report$dataset.InstanceNumber = options.InstanceNumber || 1);
|
|
4040
4118
|
if (options.predecessorImageId) {
|
|
4041
4119
|
Object.assign(report.dataset, metadataProvider.get(MetadataModules.PREDECESSOR_SEQUENCE, options.predecessorImageId));
|
|
4042
4120
|
}
|
|
4043
4121
|
if (is3DSR) {
|
|
4044
4122
|
report.dataset.SOPClassUID = MeasurementReport_DicomMetaDictionary.sopClassUIDsByName.Comprehensive3DSR;
|
|
4045
4123
|
if (!report.dataset.SOPClassUID) {
|
|
4046
|
-
throw new Error(
|
|
4124
|
+
throw new Error("NO sop class defined for Comprehensive3DSR in ".concat(JSON.stringify(MeasurementReport_DicomMetaDictionary.sopClassUIDsByName)));
|
|
4047
4125
|
}
|
|
4048
4126
|
}
|
|
4049
4127
|
return report;
|
|
@@ -4064,21 +4142,23 @@ class MeasurementReport_MeasurementReport {
|
|
|
4064
4142
|
const measurementData = {};
|
|
4065
4143
|
measurementGroups.forEach(measurementGroup => {
|
|
4066
4144
|
try {
|
|
4145
|
+
var _hooks$getToolClass;
|
|
4067
4146
|
const measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
|
|
4068
4147
|
const trackingIdentifierGroup = measurementGroupContentSequence.find(contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER);
|
|
4069
4148
|
const {
|
|
4070
4149
|
TextValue: trackingIdentifierValue
|
|
4071
4150
|
} = trackingIdentifierGroup;
|
|
4072
4151
|
const trackingUniqueIdentifierGroup = measurementGroupContentSequence.find(contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_UNIQUE_IDENTIFIER);
|
|
4073
|
-
const trackingUniqueIdentifierValue = trackingUniqueIdentifierGroup
|
|
4074
|
-
const toolAdapter = hooks
|
|
4152
|
+
const trackingUniqueIdentifierValue = trackingUniqueIdentifierGroup === null || trackingUniqueIdentifierGroup === void 0 ? void 0 : trackingUniqueIdentifierGroup.UID;
|
|
4153
|
+
const toolAdapter = (hooks === null || hooks === void 0 || (_hooks$getToolClass = hooks.getToolClass) === null || _hooks$getToolClass === void 0 ? void 0 : _hooks$getToolClass.call(hooks, measurementGroup, dataset, this.measurementAdapterByToolType)) || this.getAdapterForTrackingIdentifier(trackingIdentifierValue) || this.getAdapterForCodeType(measurementGroup);
|
|
4075
4154
|
if (toolAdapter) {
|
|
4155
|
+
var _toolAdapter$toolType;
|
|
4076
4156
|
const measurement = toolAdapter.getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, metadata, trackingIdentifierValue);
|
|
4077
4157
|
measurement.TrackingUniqueIdentifier = trackingUniqueIdentifierValue;
|
|
4078
4158
|
measurement.predecessorImageId = predecessorImageId;
|
|
4079
|
-
console.log(
|
|
4159
|
+
console.log("=== ".concat(toolAdapter.toolType, " ==="));
|
|
4080
4160
|
console.log(measurement);
|
|
4081
|
-
measurementData[toolAdapter.toolType]
|
|
4161
|
+
measurementData[_toolAdapter$toolType = toolAdapter.toolType] || (measurementData[_toolAdapter$toolType] = []);
|
|
4082
4162
|
measurementData[toolAdapter.toolType].push(measurement);
|
|
4083
4163
|
}
|
|
4084
4164
|
} catch (e) {
|
|
@@ -4092,7 +4172,7 @@ class MeasurementReport_MeasurementReport {
|
|
|
4092
4172
|
const registerName = toolAdapter.toolType;
|
|
4093
4173
|
if (this.measurementAdapterByToolType.has(registerName)) {
|
|
4094
4174
|
if (!replace) {
|
|
4095
|
-
throw new Error(
|
|
4175
|
+
throw new Error("The registered tool name ".concat(registerName, " already exists in adapters, use a different toolType or use replace"));
|
|
4096
4176
|
}
|
|
4097
4177
|
if (typeof replace === 'function') {
|
|
4098
4178
|
replace(this.measurementAdapterByToolType.get(registerName));
|
|
@@ -4144,8 +4224,8 @@ class MeasurementReport_MeasurementReport {
|
|
|
4144
4224
|
}
|
|
4145
4225
|
static getAdaptersForTypes(graphicCode, graphicType, pointCount) {
|
|
4146
4226
|
const adapters = [];
|
|
4147
|
-
appendList(adapters, this.measurementAdaptersByType.get(
|
|
4148
|
-
appendList(adapters, this.measurementAdaptersByType.get(
|
|
4227
|
+
appendList(adapters, this.measurementAdaptersByType.get("".concat(graphicCode, "-").concat(graphicType, "-").concat(pointCount)));
|
|
4228
|
+
appendList(adapters, this.measurementAdaptersByType.get("".concat(graphicCode, "-").concat(graphicType)));
|
|
4149
4229
|
appendList(adapters, this.measurementAdaptersByType.get(graphicCode));
|
|
4150
4230
|
appendList(adapters, this.measurementAdaptersByType.get(graphicType));
|
|
4151
4231
|
return adapters;
|
|
@@ -4172,13 +4252,10 @@ _MeasurementReport.codeValueMatch = (group, code, oldCode) => {
|
|
|
4172
4252
|
_MeasurementReport.generateDerivationSourceDataset = instance => {
|
|
4173
4253
|
const studyTags = copyStudyTags(instance);
|
|
4174
4254
|
const seriesTags = copySeriesTags(instance);
|
|
4175
|
-
return {
|
|
4176
|
-
...studyTags,
|
|
4177
|
-
...seriesTags
|
|
4178
|
-
};
|
|
4255
|
+
return MeasurementReport_objectSpread(MeasurementReport_objectSpread({}, studyTags), seriesTags);
|
|
4179
4256
|
};
|
|
4180
4257
|
function appendList(list, appendList) {
|
|
4181
|
-
if (!appendList
|
|
4258
|
+
if (!(appendList !== null && appendList !== void 0 && appendList.length)) {
|
|
4182
4259
|
return;
|
|
4183
4260
|
}
|
|
4184
4261
|
list.push(...appendList);
|
|
@@ -4200,10 +4277,10 @@ class BaseAdapter3D {
|
|
|
4200
4277
|
let count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
4201
4278
|
let key = code;
|
|
4202
4279
|
if (type) {
|
|
4203
|
-
key =
|
|
4280
|
+
key = "".concat(key).concat(key.length ? "-" : "").concat(type);
|
|
4204
4281
|
}
|
|
4205
4282
|
if (count) {
|
|
4206
|
-
key =
|
|
4283
|
+
key = "".concat(key).concat(key.length ? "-" : "").concat(count);
|
|
4207
4284
|
}
|
|
4208
4285
|
MeasurementReport_MeasurementReport.registerAdapterTypes(this, key);
|
|
4209
4286
|
}
|
|
@@ -4230,7 +4307,7 @@ class BaseAdapter3D {
|
|
|
4230
4307
|
CodeValue: graphicValue,
|
|
4231
4308
|
CodingSchemeDesignator: graphicDesignator
|
|
4232
4309
|
} = conceptNameItem;
|
|
4233
|
-
return
|
|
4310
|
+
return "".concat(graphicDesignator, ":").concat(graphicValue);
|
|
4234
4311
|
}
|
|
4235
4312
|
static getGraphicType(graphicItem) {
|
|
4236
4313
|
return graphicItem.GraphicType;
|
|
@@ -4241,23 +4318,23 @@ class BaseAdapter3D {
|
|
|
4241
4318
|
static init(toolType, representation, options) {
|
|
4242
4319
|
this.toolType = toolType;
|
|
4243
4320
|
if (BaseAdapter3D.toolType) {
|
|
4244
|
-
throw new Error(
|
|
4321
|
+
throw new Error("Base adapter tool type set to ".concat(this.toolType, " while setting ").concat(toolType));
|
|
4245
4322
|
}
|
|
4246
|
-
this.parentType = options
|
|
4323
|
+
this.parentType = options === null || options === void 0 ? void 0 : options.parentType;
|
|
4247
4324
|
this.trackingIdentifiers = new Set();
|
|
4248
4325
|
this.TID300Representation = representation;
|
|
4249
4326
|
if (this.parentType) {
|
|
4250
|
-
this.trackingIdentifierTextValue =
|
|
4251
|
-
const alternateTrackingIdentifier =
|
|
4327
|
+
this.trackingIdentifierTextValue = "".concat(CORNERSTONE_3D_TAG, ":").concat(this.parentType, ":").concat(this.toolType);
|
|
4328
|
+
const alternateTrackingIdentifier = "".concat(CORNERSTONE_3D_TAG, ":").concat(this.toolType);
|
|
4252
4329
|
this.trackingIdentifiers.add(alternateTrackingIdentifier);
|
|
4253
4330
|
} else {
|
|
4254
|
-
this.trackingIdentifierTextValue =
|
|
4331
|
+
this.trackingIdentifierTextValue = "".concat(CORNERSTONE_3D_TAG, ":").concat(toolType);
|
|
4255
4332
|
}
|
|
4256
4333
|
this.trackingIdentifiers.add(this.trackingIdentifierTextValue);
|
|
4257
4334
|
MeasurementReport_MeasurementReport.registerTool(this);
|
|
4258
4335
|
}
|
|
4259
4336
|
static registerLegacy() {
|
|
4260
|
-
this.trackingIdentifiers.add(
|
|
4337
|
+
this.trackingIdentifiers.add("cornerstoneTools@^4.0.0:".concat(this.toolType));
|
|
4261
4338
|
}
|
|
4262
4339
|
static registerSubType(adapter, toolType, replace) {
|
|
4263
4340
|
const subAdapter = Object.create(adapter);
|
|
@@ -4284,7 +4361,7 @@ class BaseAdapter3D {
|
|
|
4284
4361
|
state.annotation.data = {
|
|
4285
4362
|
cachedStats: {},
|
|
4286
4363
|
frameNumber: ReferencedFrameNumber,
|
|
4287
|
-
seriesLevel: trackingIdentifier
|
|
4364
|
+
seriesLevel: (trackingIdentifier === null || trackingIdentifier === void 0 ? void 0 : trackingIdentifier.indexOf(":Series")) > 0
|
|
4288
4365
|
};
|
|
4289
4366
|
return state;
|
|
4290
4367
|
}
|
|
@@ -4325,7 +4402,10 @@ class BaseAdapter3D {
|
|
|
4325
4402
|
|
|
4326
4403
|
|
|
4327
4404
|
|
|
4405
|
+
|
|
4328
4406
|
var _ArrowAnnotate;
|
|
4407
|
+
function Cornerstone3D_ArrowAnnotate_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4408
|
+
function Cornerstone3D_ArrowAnnotate_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? Cornerstone3D_ArrowAnnotate_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : Cornerstone3D_ArrowAnnotate_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4329
4409
|
const {
|
|
4330
4410
|
ArrowAnnotate: TID300ArrowAnnotate
|
|
4331
4411
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -4360,16 +4440,14 @@ class ArrowAnnotate_ArrowAnnotate extends BaseAdapter3D {
|
|
|
4360
4440
|
const secondPoint = ArrowAnnotate_imageToWorldCoords(referencedImageId, [GraphicData[0] + xOffset, GraphicData[1] + yOffset]);
|
|
4361
4441
|
worldCoords.push(secondPoint);
|
|
4362
4442
|
}
|
|
4363
|
-
state.annotation.data = {
|
|
4364
|
-
...state.annotation.data,
|
|
4443
|
+
state.annotation.data = Cornerstone3D_ArrowAnnotate_objectSpread(Cornerstone3D_ArrowAnnotate_objectSpread({}, state.annotation.data), {}, {
|
|
4365
4444
|
text,
|
|
4366
|
-
handles: {
|
|
4367
|
-
...state.annotation.data.handles,
|
|
4445
|
+
handles: Cornerstone3D_ArrowAnnotate_objectSpread(Cornerstone3D_ArrowAnnotate_objectSpread({}, state.annotation.data.handles), {}, {
|
|
4368
4446
|
arrowFirst: true,
|
|
4369
4447
|
points: worldCoords
|
|
4370
|
-
},
|
|
4448
|
+
}),
|
|
4371
4449
|
frameNumber: ReferencedFrameNumber
|
|
4372
|
-
};
|
|
4450
|
+
});
|
|
4373
4451
|
return state;
|
|
4374
4452
|
}
|
|
4375
4453
|
static getTID300RepresentationArguments(tool) {
|
|
@@ -4424,7 +4502,10 @@ _ArrowAnnotate = ArrowAnnotate_ArrowAnnotate;
|
|
|
4424
4502
|
|
|
4425
4503
|
|
|
4426
4504
|
|
|
4505
|
+
|
|
4427
4506
|
var _Bidirectional;
|
|
4507
|
+
function Bidirectional_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4508
|
+
function Bidirectional_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? Bidirectional_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : Bidirectional_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4428
4509
|
const {
|
|
4429
4510
|
Bidirectional: Bidirectional_TID300Bidirectional
|
|
4430
4511
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -4448,17 +4529,15 @@ class Bidirectional_Bidirectional extends BaseAdapter3D {
|
|
|
4448
4529
|
const worldCoords = [];
|
|
4449
4530
|
worldCoords.push(...scoordToWorld(scoordArgs, longAxisScoordGroup));
|
|
4450
4531
|
worldCoords.push(...scoordToWorld(scoordArgs, shortAxisScoordGroup));
|
|
4451
|
-
state.annotation.data = {
|
|
4452
|
-
|
|
4453
|
-
handles: {
|
|
4454
|
-
...state.annotation.data.handles,
|
|
4532
|
+
state.annotation.data = Bidirectional_objectSpread(Bidirectional_objectSpread({}, state.annotation.data), {}, {
|
|
4533
|
+
handles: Bidirectional_objectSpread(Bidirectional_objectSpread({}, state.annotation.data.handles), {}, {
|
|
4455
4534
|
points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]]
|
|
4456
|
-
},
|
|
4535
|
+
}),
|
|
4457
4536
|
frameNumber: ReferencedFrameNumber
|
|
4458
|
-
};
|
|
4537
|
+
});
|
|
4459
4538
|
if (referencedImageId) {
|
|
4460
4539
|
state.annotation.data.cachedStats = {
|
|
4461
|
-
[
|
|
4540
|
+
["imageId:".concat(referencedImageId)]: {
|
|
4462
4541
|
length: longAxisNUMGroup.MeasuredValueSequence.NumericValue,
|
|
4463
4542
|
width: shortAxisNUMGroup.MeasuredValueSequence.NumericValue,
|
|
4464
4543
|
unit: longAxisNUMGroup.MeasuredValueSequence.MeasurementUnitsCodeSequence.CodeValue,
|
|
@@ -4511,7 +4590,7 @@ class Bidirectional_Bidirectional extends BaseAdapter3D {
|
|
|
4511
4590
|
length,
|
|
4512
4591
|
width,
|
|
4513
4592
|
unit
|
|
4514
|
-
} = cachedStats[
|
|
4593
|
+
} = cachedStats["imageId:".concat(referencedImageId)] || {};
|
|
4515
4594
|
return {
|
|
4516
4595
|
longAxis: {
|
|
4517
4596
|
point1: longAxisStartImage,
|
|
@@ -4547,7 +4626,10 @@ _Bidirectional = Bidirectional_Bidirectional;
|
|
|
4547
4626
|
|
|
4548
4627
|
|
|
4549
4628
|
|
|
4629
|
+
|
|
4550
4630
|
var _Angle;
|
|
4631
|
+
function Cornerstone3D_Angle_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4632
|
+
function Cornerstone3D_Angle_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? Cornerstone3D_Angle_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : Cornerstone3D_Angle_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4551
4633
|
const {
|
|
4552
4634
|
CobbAngle: Angle_TID300CobbAngle
|
|
4553
4635
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -4561,22 +4643,21 @@ class Angle_Angle extends BaseAdapter3D {
|
|
|
4561
4643
|
ReferencedFrameNumber
|
|
4562
4644
|
} = MeasurementReport_MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
|
|
4563
4645
|
const cachedStats = referencedImageId ? {
|
|
4564
|
-
[
|
|
4646
|
+
["imageId:".concat(referencedImageId)]: {
|
|
4565
4647
|
angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
|
|
4566
4648
|
}
|
|
4567
4649
|
} : {};
|
|
4568
|
-
state.annotation.data = {
|
|
4569
|
-
|
|
4570
|
-
handles: {
|
|
4571
|
-
...state.annotation.data.handles,
|
|
4650
|
+
state.annotation.data = Cornerstone3D_Angle_objectSpread(Cornerstone3D_Angle_objectSpread({}, state.annotation.data), {}, {
|
|
4651
|
+
handles: Cornerstone3D_Angle_objectSpread(Cornerstone3D_Angle_objectSpread({}, state.annotation.data.handles), {}, {
|
|
4572
4652
|
points: [worldCoords[0], worldCoords[1], worldCoords[3]]
|
|
4573
|
-
},
|
|
4653
|
+
}),
|
|
4574
4654
|
cachedStats,
|
|
4575
4655
|
frameNumber: ReferencedFrameNumber
|
|
4576
|
-
};
|
|
4656
|
+
});
|
|
4577
4657
|
return state;
|
|
4578
4658
|
}
|
|
4579
4659
|
static getTID300RepresentationArguments(tool) {
|
|
4660
|
+
var _cachedStats;
|
|
4580
4661
|
let is3DMeasurement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
4581
4662
|
const {
|
|
4582
4663
|
data,
|
|
@@ -4599,7 +4680,7 @@ class Angle_Angle extends BaseAdapter3D {
|
|
|
4599
4680
|
const point2 = toScoord(scoordProps, handles.points[1]);
|
|
4600
4681
|
const point3 = toScoord(scoordProps, handles.points[1]);
|
|
4601
4682
|
const point4 = toScoord(scoordProps, handles.points[2]);
|
|
4602
|
-
const angle = cachedStats[
|
|
4683
|
+
const angle = (_cachedStats = cachedStats["imageId:".concat(referencedImageId)]) === null || _cachedStats === void 0 ? void 0 : _cachedStats.angle;
|
|
4603
4684
|
return {
|
|
4604
4685
|
point1,
|
|
4605
4686
|
point2,
|
|
@@ -4629,7 +4710,10 @@ _Angle = Angle_Angle;
|
|
|
4629
4710
|
|
|
4630
4711
|
|
|
4631
4712
|
|
|
4713
|
+
|
|
4632
4714
|
var _CobbAngle;
|
|
4715
|
+
function Cornerstone3D_CobbAngle_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4716
|
+
function Cornerstone3D_CobbAngle_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? Cornerstone3D_CobbAngle_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : Cornerstone3D_CobbAngle_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4633
4717
|
const {
|
|
4634
4718
|
CobbAngle: CobbAngle_TID300CobbAngle
|
|
4635
4719
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -4642,17 +4726,15 @@ class CobbAngle_CobbAngle extends BaseAdapter3D {
|
|
|
4642
4726
|
worldCoords,
|
|
4643
4727
|
ReferencedFrameNumber
|
|
4644
4728
|
} = MeasurementReport_MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, CobbAngle_CobbAngle.toolType);
|
|
4645
|
-
state.annotation.data = {
|
|
4646
|
-
|
|
4647
|
-
handles: {
|
|
4648
|
-
...state.annotation.data.handles,
|
|
4729
|
+
state.annotation.data = Cornerstone3D_CobbAngle_objectSpread(Cornerstone3D_CobbAngle_objectSpread({}, state.annotation.data), {}, {
|
|
4730
|
+
handles: Cornerstone3D_CobbAngle_objectSpread(Cornerstone3D_CobbAngle_objectSpread({}, state.annotation.data.handles), {}, {
|
|
4649
4731
|
points: [worldCoords[0], worldCoords[1], worldCoords[2], worldCoords[3]]
|
|
4650
|
-
},
|
|
4732
|
+
}),
|
|
4651
4733
|
frameNumber: ReferencedFrameNumber
|
|
4652
|
-
};
|
|
4734
|
+
});
|
|
4653
4735
|
if (referencedImageId) {
|
|
4654
4736
|
state.annotation.data.cachedStats = {
|
|
4655
|
-
[
|
|
4737
|
+
["imageId:".concat(referencedImageId)]: {
|
|
4656
4738
|
angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
|
|
4657
4739
|
}
|
|
4658
4740
|
};
|
|
@@ -4682,7 +4764,7 @@ class CobbAngle_CobbAngle extends BaseAdapter3D {
|
|
|
4682
4764
|
const [point1, point2, point3, point4] = points;
|
|
4683
4765
|
const {
|
|
4684
4766
|
angle
|
|
4685
|
-
} = cachedStats[
|
|
4767
|
+
} = cachedStats["imageId:".concat(referencedImageId)] || {};
|
|
4686
4768
|
return {
|
|
4687
4769
|
point1,
|
|
4688
4770
|
point2,
|
|
@@ -4711,9 +4793,10 @@ function extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID) {
|
|
|
4711
4793
|
if (MeasurementGroup.ContentSequence) {
|
|
4712
4794
|
MeasurementGroup.ContentSequence.forEach(item => {
|
|
4713
4795
|
if (item.ValueType === "NUM" && item.ConceptNameCodeSequence) {
|
|
4796
|
+
var _item$MeasuredValueSe, _item$MeasuredValueSe2;
|
|
4714
4797
|
const codeMeaning = item.ConceptNameCodeSequence.CodeMeaning;
|
|
4715
|
-
const numericValue = item.MeasuredValueSequence
|
|
4716
|
-
const unitCode = item.MeasuredValueSequence
|
|
4798
|
+
const numericValue = (_item$MeasuredValueSe = item.MeasuredValueSequence) === null || _item$MeasuredValueSe === void 0 ? void 0 : _item$MeasuredValueSe.NumericValue;
|
|
4799
|
+
const unitCode = (_item$MeasuredValueSe2 = item.MeasuredValueSequence) === null || _item$MeasuredValueSe2 === void 0 || (_item$MeasuredValueSe2 = _item$MeasuredValueSe2.MeasurementUnitsCodeSequence) === null || _item$MeasuredValueSe2 === void 0 ? void 0 : _item$MeasuredValueSe2.CodeValue;
|
|
4717
4800
|
if (numericValue !== undefined && referencedSOPInstanceUID) {
|
|
4718
4801
|
if (!numGroupsBySOPInstanceUID[referencedSOPInstanceUID]) {
|
|
4719
4802
|
numGroupsBySOPInstanceUID[referencedSOPInstanceUID] = {};
|
|
@@ -4772,7 +4855,7 @@ function restoreAdditionalMetrics(numGroups) {
|
|
|
4772
4855
|
additionalMetrics[category] = unit;
|
|
4773
4856
|
}
|
|
4774
4857
|
} else {
|
|
4775
|
-
additionalMetrics[
|
|
4858
|
+
additionalMetrics["".concat(metricKey, "Unit")] = unit;
|
|
4776
4859
|
}
|
|
4777
4860
|
}
|
|
4778
4861
|
additionalMetrics.modalityUnit = modalityUnit;
|
|
@@ -4789,7 +4872,10 @@ function restoreAdditionalMetrics(numGroups) {
|
|
|
4789
4872
|
|
|
4790
4873
|
|
|
4791
4874
|
|
|
4875
|
+
|
|
4792
4876
|
var _CircleROI;
|
|
4877
|
+
function CircleROI_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4878
|
+
function CircleROI_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? CircleROI_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : CircleROI_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4793
4879
|
const {
|
|
4794
4880
|
Circle: CircleROI_TID300Circle
|
|
4795
4881
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -4805,22 +4891,19 @@ class CircleROI extends BaseAdapter3D {
|
|
|
4805
4891
|
const referencedSOPInstanceUID = state.sopInstanceUid;
|
|
4806
4892
|
const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
|
|
4807
4893
|
const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
|
|
4808
|
-
state.annotation.data = {
|
|
4809
|
-
|
|
4810
|
-
handles: {
|
|
4811
|
-
...state.annotation.data.handles,
|
|
4894
|
+
state.annotation.data = CircleROI_objectSpread(CircleROI_objectSpread({}, state.annotation.data), {}, {
|
|
4895
|
+
handles: CircleROI_objectSpread(CircleROI_objectSpread({}, state.annotation.data.handles), {}, {
|
|
4812
4896
|
points: worldCoords
|
|
4813
|
-
},
|
|
4897
|
+
}),
|
|
4814
4898
|
frameNumber: ReferencedFrameNumber
|
|
4815
|
-
};
|
|
4899
|
+
});
|
|
4816
4900
|
if (referencedImageId) {
|
|
4817
4901
|
state.annotation.data.cachedStats = {
|
|
4818
|
-
[
|
|
4902
|
+
["imageId:".concat(referencedImageId)]: CircleROI_objectSpread({
|
|
4819
4903
|
area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
|
|
4820
4904
|
radius: 0,
|
|
4821
|
-
perimeter: 0
|
|
4822
|
-
|
|
4823
|
-
}
|
|
4905
|
+
perimeter: 0
|
|
4906
|
+
}, restoreAdditionalMetrics(measurementNUMGroups))
|
|
4824
4907
|
};
|
|
4825
4908
|
}
|
|
4826
4909
|
return state;
|
|
@@ -4856,7 +4939,7 @@ class CircleROI extends BaseAdapter3D {
|
|
|
4856
4939
|
modalityUnit,
|
|
4857
4940
|
radiusUnit,
|
|
4858
4941
|
areaUnit
|
|
4859
|
-
} = cachedStats[
|
|
4942
|
+
} = cachedStats["imageId:".concat(referencedImageId)] || {};
|
|
4860
4943
|
const perimeter = 2 * Math.PI * radius;
|
|
4861
4944
|
return {
|
|
4862
4945
|
area,
|
|
@@ -4894,7 +4977,10 @@ _CircleROI = CircleROI;
|
|
|
4894
4977
|
|
|
4895
4978
|
|
|
4896
4979
|
|
|
4980
|
+
|
|
4897
4981
|
var _EllipticalROI;
|
|
4982
|
+
function EllipticalROI_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4983
|
+
function EllipticalROI_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? EllipticalROI_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : EllipticalROI_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4898
4984
|
const {
|
|
4899
4985
|
Ellipse: EllipticalROI_TID300Ellipse
|
|
4900
4986
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -4910,19 +4996,16 @@ class EllipticalROI extends BaseAdapter3D {
|
|
|
4910
4996
|
const referencedSOPInstanceUID = state.sopInstanceUid;
|
|
4911
4997
|
const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
|
|
4912
4998
|
const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
|
|
4913
|
-
state.annotation.data = {
|
|
4914
|
-
|
|
4915
|
-
handles: {
|
|
4916
|
-
...state.annotation.data.handles,
|
|
4999
|
+
state.annotation.data = EllipticalROI_objectSpread(EllipticalROI_objectSpread({}, state.annotation.data), {}, {
|
|
5000
|
+
handles: EllipticalROI_objectSpread(EllipticalROI_objectSpread({}, state.annotation.data.handles), {}, {
|
|
4917
5001
|
points: worldCoords
|
|
4918
|
-
},
|
|
5002
|
+
}),
|
|
4919
5003
|
frameNumber: ReferencedFrameNumber
|
|
4920
|
-
};
|
|
5004
|
+
});
|
|
4921
5005
|
state.annotation.data.cachedStats = referencedImageId ? {
|
|
4922
|
-
[
|
|
4923
|
-
area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
|
|
4924
|
-
|
|
4925
|
-
}
|
|
5006
|
+
["imageId:".concat(referencedImageId)]: EllipticalROI_objectSpread({
|
|
5007
|
+
area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
|
|
5008
|
+
}, restoreAdditionalMetrics(measurementNUMGroups))
|
|
4926
5009
|
} : {};
|
|
4927
5010
|
return state;
|
|
4928
5011
|
}
|
|
@@ -4974,7 +5057,7 @@ class EllipticalROI extends BaseAdapter3D {
|
|
|
4974
5057
|
stdDev,
|
|
4975
5058
|
modalityUnit,
|
|
4976
5059
|
areaUnit
|
|
4977
|
-
} = cachedStats[
|
|
5060
|
+
} = cachedStats["imageId:".concat(referencedImageId)] || {};
|
|
4978
5061
|
const convertedPoints = points.map(point => toScoord(scoordProps, point));
|
|
4979
5062
|
return {
|
|
4980
5063
|
area,
|
|
@@ -5006,7 +5089,10 @@ _EllipticalROI.init("EllipticalROI", EllipticalROI_TID300Ellipse);
|
|
|
5006
5089
|
|
|
5007
5090
|
|
|
5008
5091
|
|
|
5092
|
+
|
|
5009
5093
|
var _RectangleROI;
|
|
5094
|
+
function RectangleROI_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
5095
|
+
function RectangleROI_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? RectangleROI_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : RectangleROI_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5010
5096
|
const {
|
|
5011
5097
|
Polyline: RectangleROI_TID300Polyline
|
|
5012
5098
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -5017,6 +5103,7 @@ class RectangleROI extends BaseAdapter3D {
|
|
|
5017
5103
|
return this.getGraphicType(graphicItem) === "POLYLINE" && (pointsCount === 4 || pointsCount === 5);
|
|
5018
5104
|
}
|
|
5019
5105
|
static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata) {
|
|
5106
|
+
var _areaGroup$MeasuredVa, _areaGroup$MeasuredVa2;
|
|
5020
5107
|
const {
|
|
5021
5108
|
state,
|
|
5022
5109
|
worldCoords,
|
|
@@ -5029,21 +5116,18 @@ class RectangleROI extends BaseAdapter3D {
|
|
|
5029
5116
|
const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
|
|
5030
5117
|
const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
|
|
5031
5118
|
const cachedStats = referencedImageId ? {
|
|
5032
|
-
[
|
|
5033
|
-
area: areaGroup
|
|
5034
|
-
areaUnit: areaGroup
|
|
5035
|
-
|
|
5036
|
-
}
|
|
5119
|
+
["imageId:".concat(referencedImageId)]: RectangleROI_objectSpread({
|
|
5120
|
+
area: (areaGroup === null || areaGroup === void 0 || (_areaGroup$MeasuredVa = areaGroup.MeasuredValueSequence) === null || _areaGroup$MeasuredVa === void 0 || (_areaGroup$MeasuredVa = _areaGroup$MeasuredVa[0]) === null || _areaGroup$MeasuredVa === void 0 ? void 0 : _areaGroup$MeasuredVa.NumericValue) || 0,
|
|
5121
|
+
areaUnit: areaGroup === null || areaGroup === void 0 || (_areaGroup$MeasuredVa2 = areaGroup.MeasuredValueSequence) === null || _areaGroup$MeasuredVa2 === void 0 || (_areaGroup$MeasuredVa2 = _areaGroup$MeasuredVa2[0]) === null || _areaGroup$MeasuredVa2 === void 0 || (_areaGroup$MeasuredVa2 = _areaGroup$MeasuredVa2.MeasurementUnitsCodeSequence) === null || _areaGroup$MeasuredVa2 === void 0 ? void 0 : _areaGroup$MeasuredVa2.CodeValue
|
|
5122
|
+
}, restoreAdditionalMetrics(measurementNUMGroups))
|
|
5037
5123
|
} : {};
|
|
5038
|
-
state.annotation.data = {
|
|
5039
|
-
|
|
5040
|
-
handles: {
|
|
5041
|
-
...state.annotation.data.handles,
|
|
5124
|
+
state.annotation.data = RectangleROI_objectSpread(RectangleROI_objectSpread({}, state.annotation.data), {}, {
|
|
5125
|
+
handles: RectangleROI_objectSpread(RectangleROI_objectSpread({}, state.annotation.data.handles), {}, {
|
|
5042
5126
|
points: [points[0], points[1], points[3], points[2]]
|
|
5043
|
-
},
|
|
5127
|
+
}),
|
|
5044
5128
|
cachedStats,
|
|
5045
5129
|
frameNumber: ReferencedFrameNumber
|
|
5046
|
-
};
|
|
5130
|
+
});
|
|
5047
5131
|
return state;
|
|
5048
5132
|
}
|
|
5049
5133
|
static getTID300RepresentationArguments(tool) {
|
|
@@ -5070,7 +5154,7 @@ class RectangleROI extends BaseAdapter3D {
|
|
|
5070
5154
|
stdDev,
|
|
5071
5155
|
areaUnit,
|
|
5072
5156
|
modalityUnit
|
|
5073
|
-
} = data.cachedStats[
|
|
5157
|
+
} = data.cachedStats["imageId:".concat(referencedImageId)] || {};
|
|
5074
5158
|
return {
|
|
5075
5159
|
points: [corners[0], corners[1], corners[3], corners[2], corners[0]],
|
|
5076
5160
|
area,
|
|
@@ -5104,7 +5188,10 @@ _RectangleROI = RectangleROI;
|
|
|
5104
5188
|
|
|
5105
5189
|
|
|
5106
5190
|
|
|
5191
|
+
|
|
5107
5192
|
var _Length;
|
|
5193
|
+
function Length_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
5194
|
+
function Length_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? Length_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : Length_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5108
5195
|
const {
|
|
5109
5196
|
Length: Length_TID300Length
|
|
5110
5197
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -5119,21 +5206,19 @@ class Length_Length extends BaseAdapter3D {
|
|
|
5119
5206
|
ReferencedFrameNumber
|
|
5120
5207
|
} = MeasurementReport_MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
|
|
5121
5208
|
const cachedStats = referencedImageId ? {
|
|
5122
|
-
[
|
|
5209
|
+
["imageId:".concat(referencedImageId)]: {
|
|
5123
5210
|
length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
|
|
5124
5211
|
unit: NUMGroup.MeasuredValueSequence.MeasurementUnitsCodeSequence.CodeValue
|
|
5125
5212
|
}
|
|
5126
5213
|
} : {};
|
|
5127
|
-
state.annotation.data = {
|
|
5128
|
-
|
|
5129
|
-
handles: {
|
|
5130
|
-
...state.annotation.data.handles,
|
|
5214
|
+
state.annotation.data = Length_objectSpread(Length_objectSpread({}, state.annotation.data), {}, {
|
|
5215
|
+
handles: Length_objectSpread(Length_objectSpread({}, state.annotation.data.handles), {}, {
|
|
5131
5216
|
points: [worldCoords[0], worldCoords[1]],
|
|
5132
5217
|
activeHandleIndex: 0
|
|
5133
|
-
},
|
|
5218
|
+
}),
|
|
5134
5219
|
cachedStats,
|
|
5135
5220
|
frameNumber: ReferencedFrameNumber
|
|
5136
|
-
};
|
|
5221
|
+
});
|
|
5137
5222
|
return state;
|
|
5138
5223
|
}
|
|
5139
5224
|
static getTID300RepresentationArguments(tool) {
|
|
@@ -5159,7 +5244,7 @@ class Length_Length extends BaseAdapter3D {
|
|
|
5159
5244
|
const point2 = toScoord(scoordProps, handles.points[1]);
|
|
5160
5245
|
const {
|
|
5161
5246
|
length: distance
|
|
5162
|
-
} = cachedStats[
|
|
5247
|
+
} = cachedStats["imageId:".concat(referencedImageId)] || {};
|
|
5163
5248
|
return {
|
|
5164
5249
|
point1,
|
|
5165
5250
|
point2,
|
|
@@ -5190,7 +5275,10 @@ var gl_matrix_esm = __webpack_require__(3823);
|
|
|
5190
5275
|
|
|
5191
5276
|
|
|
5192
5277
|
|
|
5278
|
+
|
|
5193
5279
|
var _PlanarFreehandROI;
|
|
5280
|
+
function PlanarFreehandROI_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
5281
|
+
function PlanarFreehandROI_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? PlanarFreehandROI_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : PlanarFreehandROI_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5194
5282
|
const {
|
|
5195
5283
|
Polyline: PlanarFreehandROI_TID300Polyline
|
|
5196
5284
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -5216,24 +5304,21 @@ class PlanarFreehandROI extends BaseAdapter3D {
|
|
|
5216
5304
|
const referencedSOPInstanceUID = state.sopInstanceUid;
|
|
5217
5305
|
const allNUMGroups = extractAllNUMGroups(MeasurementGroup, referencedSOPInstanceUID);
|
|
5218
5306
|
const measurementNUMGroups = allNUMGroups[referencedSOPInstanceUID] || {};
|
|
5219
|
-
state.annotation.data = {
|
|
5220
|
-
...state.annotation.data,
|
|
5307
|
+
state.annotation.data = PlanarFreehandROI_objectSpread(PlanarFreehandROI_objectSpread({}, state.annotation.data), {}, {
|
|
5221
5308
|
contour: {
|
|
5222
5309
|
polyline: worldCoords,
|
|
5223
5310
|
closed: !isOpenContour
|
|
5224
5311
|
},
|
|
5225
|
-
handles: {
|
|
5226
|
-
...state.annotation.data.handles,
|
|
5312
|
+
handles: PlanarFreehandROI_objectSpread(PlanarFreehandROI_objectSpread({}, state.annotation.data.handles), {}, {
|
|
5227
5313
|
points
|
|
5228
|
-
},
|
|
5314
|
+
}),
|
|
5229
5315
|
frameNumber: ReferencedFrameNumber
|
|
5230
|
-
};
|
|
5316
|
+
});
|
|
5231
5317
|
if (referencedImageId) {
|
|
5232
5318
|
state.annotation.data.cachedStats = {
|
|
5233
|
-
[
|
|
5234
|
-
area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
|
|
5235
|
-
|
|
5236
|
-
}
|
|
5319
|
+
["imageId:".concat(referencedImageId)]: PlanarFreehandROI_objectSpread({
|
|
5320
|
+
area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
|
|
5321
|
+
}, restoreAdditionalMetrics(measurementNUMGroups))
|
|
5237
5322
|
};
|
|
5238
5323
|
}
|
|
5239
5324
|
return state;
|
|
@@ -5272,12 +5357,12 @@ class PlanarFreehandROI extends BaseAdapter3D {
|
|
|
5272
5357
|
max,
|
|
5273
5358
|
stdDev,
|
|
5274
5359
|
length
|
|
5275
|
-
} = data.cachedStats[
|
|
5360
|
+
} = data.cachedStats["imageId:".concat(referencedImageId)] || {};
|
|
5276
5361
|
return {
|
|
5277
5362
|
points,
|
|
5278
5363
|
area,
|
|
5279
5364
|
areaUnit,
|
|
5280
|
-
perimeter: perimeter
|
|
5365
|
+
perimeter: perimeter !== null && perimeter !== void 0 ? perimeter : length,
|
|
5281
5366
|
modalityUnit,
|
|
5282
5367
|
mean,
|
|
5283
5368
|
max,
|
|
@@ -5303,7 +5388,10 @@ _PlanarFreehandROI.init("PlanarFreehandROI", PlanarFreehandROI_TID300Polyline);
|
|
|
5303
5388
|
|
|
5304
5389
|
|
|
5305
5390
|
|
|
5391
|
+
|
|
5306
5392
|
var _Probe;
|
|
5393
|
+
function Probe_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
5394
|
+
function Probe_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? Probe_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : Probe_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5307
5395
|
const {
|
|
5308
5396
|
Point: Probe_TID300Point
|
|
5309
5397
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -5313,6 +5401,7 @@ class Probe extends BaseAdapter3D {
|
|
|
5313
5401
|
return this.getGraphicType(graphicItem) === "POINT" && this.getPointsCount(graphicItem) <= 2;
|
|
5314
5402
|
}
|
|
5315
5403
|
static getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, _trackingIdentifier) {
|
|
5404
|
+
var _NUMGroup$MeasuredVal, _NUMGroup$MeasuredVal2;
|
|
5316
5405
|
const {
|
|
5317
5406
|
state,
|
|
5318
5407
|
NUMGroup,
|
|
@@ -5321,20 +5410,18 @@ class Probe extends BaseAdapter3D {
|
|
|
5321
5410
|
ReferencedFrameNumber
|
|
5322
5411
|
} = MeasurementReport_MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
|
|
5323
5412
|
const cachedStats = referencedImageId ? {
|
|
5324
|
-
[
|
|
5325
|
-
value: NUMGroup
|
|
5413
|
+
["imageId:".concat(referencedImageId)]: {
|
|
5414
|
+
value: (_NUMGroup$MeasuredVal = NUMGroup === null || NUMGroup === void 0 || (_NUMGroup$MeasuredVal2 = NUMGroup.MeasuredValueSequence) === null || _NUMGroup$MeasuredVal2 === void 0 ? void 0 : _NUMGroup$MeasuredVal2.NumericValue) !== null && _NUMGroup$MeasuredVal !== void 0 ? _NUMGroup$MeasuredVal : null
|
|
5326
5415
|
}
|
|
5327
5416
|
} : {};
|
|
5328
|
-
state.annotation.data = {
|
|
5329
|
-
|
|
5330
|
-
handles: {
|
|
5331
|
-
...state.annotation.data.handles,
|
|
5417
|
+
state.annotation.data = Probe_objectSpread(Probe_objectSpread({}, state.annotation.data), {}, {
|
|
5418
|
+
handles: Probe_objectSpread(Probe_objectSpread({}, state.annotation.data.handles), {}, {
|
|
5332
5419
|
points: worldCoords
|
|
5333
|
-
},
|
|
5420
|
+
}),
|
|
5334
5421
|
cachedStats,
|
|
5335
5422
|
frameNumber: ReferencedFrameNumber,
|
|
5336
5423
|
invalidated: true
|
|
5337
|
-
};
|
|
5424
|
+
});
|
|
5338
5425
|
return state;
|
|
5339
5426
|
}
|
|
5340
5427
|
static getTID300RepresentationArguments(tool) {
|
|
@@ -5386,7 +5473,10 @@ _Probe = Probe;
|
|
|
5386
5473
|
|
|
5387
5474
|
|
|
5388
5475
|
|
|
5476
|
+
|
|
5389
5477
|
var _UltrasoundDirectional;
|
|
5478
|
+
function UltrasoundDirectional_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
5479
|
+
function UltrasoundDirectional_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? UltrasoundDirectional_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : UltrasoundDirectional_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5390
5480
|
const {
|
|
5391
5481
|
Length: UltrasoundDirectional_TID300Length
|
|
5392
5482
|
} = dcmjs_es/* utilities */.BF.TID300;
|
|
@@ -5400,14 +5490,12 @@ class UltrasoundDirectional extends BaseAdapter3D {
|
|
|
5400
5490
|
worldCoords,
|
|
5401
5491
|
ReferencedFrameNumber
|
|
5402
5492
|
} = MeasurementReport_MeasurementReport.getSetupMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, metadata, this.toolType);
|
|
5403
|
-
state.annotation.data = {
|
|
5404
|
-
|
|
5405
|
-
handles: {
|
|
5406
|
-
...state.annotation.data.handles,
|
|
5493
|
+
state.annotation.data = UltrasoundDirectional_objectSpread(UltrasoundDirectional_objectSpread({}, state.annotation.data), {}, {
|
|
5494
|
+
handles: UltrasoundDirectional_objectSpread(UltrasoundDirectional_objectSpread({}, state.annotation.data.handles), {}, {
|
|
5407
5495
|
points: worldCoords
|
|
5408
|
-
},
|
|
5496
|
+
}),
|
|
5409
5497
|
frameNumber: ReferencedFrameNumber
|
|
5410
|
-
};
|
|
5498
|
+
});
|
|
5411
5499
|
return state;
|
|
5412
5500
|
}
|
|
5413
5501
|
static getTID300RepresentationArguments(tool, is3DMeasurement) {
|
|
@@ -5455,6 +5543,9 @@ _UltrasoundDirectional.init("UltrasoundDirectionalTool", UltrasoundDirectional_T
|
|
|
5455
5543
|
|
|
5456
5544
|
|
|
5457
5545
|
|
|
5546
|
+
|
|
5547
|
+
function generateSegmentation_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
5548
|
+
function generateSegmentation_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? generateSegmentation_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : generateSegmentation_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5458
5549
|
const {
|
|
5459
5550
|
MetadataModules: generateSegmentation_MetadataModules
|
|
5460
5551
|
} = esm.Enums;
|
|
@@ -5468,7 +5559,7 @@ function generateSegmentation_generateSegmentation(images, labelmaps, metadata)
|
|
|
5468
5559
|
let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
|
|
5469
5560
|
const segmentation = _createMultiframeSegmentationFromReferencedImages(images, metadata, options);
|
|
5470
5561
|
const segmentationResult = fillSegmentation(segmentation, labelmaps, options);
|
|
5471
|
-
const predecessorImageId = options
|
|
5562
|
+
const predecessorImageId = options === null || options === void 0 ? void 0 : options.predecessorImageId;
|
|
5472
5563
|
if (predecessorImageId) {
|
|
5473
5564
|
const predecessor = metadata.get(generateSegmentation_MetadataModules.PREDECESSOR_SEQUENCE, predecessorImageId);
|
|
5474
5565
|
Object.assign(segmentationResult, predecessor);
|
|
@@ -5476,7 +5567,7 @@ function generateSegmentation_generateSegmentation(images, labelmaps, metadata)
|
|
|
5476
5567
|
return segmentationResult;
|
|
5477
5568
|
}
|
|
5478
5569
|
function _createMultiframeSegmentationFromReferencedImages(images, metadata, options) {
|
|
5479
|
-
const studyImageId = options
|
|
5570
|
+
const studyImageId = (options === null || options === void 0 ? void 0 : options.predecessorImageId) || images[0].imageId;
|
|
5480
5571
|
const studyData = metadata.get(generateSegmentation_MetadataModules.STUDY_DATA, studyImageId);
|
|
5481
5572
|
const datasets = images.map(image => {
|
|
5482
5573
|
const {
|
|
@@ -5484,17 +5575,14 @@ function _createMultiframeSegmentationFromReferencedImages(images, metadata, opt
|
|
|
5484
5575
|
} = image;
|
|
5485
5576
|
const seriesData = metadata.get(generateSegmentation_MetadataModules.SERIES_DATA, imageId);
|
|
5486
5577
|
const imageData = metadata.get(generateSegmentation_MetadataModules.IMAGE_DATA, imageId);
|
|
5487
|
-
return {
|
|
5488
|
-
...studyData,
|
|
5489
|
-
...seriesData,
|
|
5490
|
-
...imageData,
|
|
5578
|
+
return generateSegmentation_objectSpread(generateSegmentation_objectSpread(generateSegmentation_objectSpread(generateSegmentation_objectSpread({}, studyData), seriesData), imageData), {}, {
|
|
5491
5579
|
PixelData: image.voxelManager.getScalarData(),
|
|
5492
5580
|
BitsAllocated: 16,
|
|
5493
5581
|
_vrMap: {
|
|
5494
5582
|
PixelData: 'OW'
|
|
5495
5583
|
},
|
|
5496
5584
|
_meta: {}
|
|
5497
|
-
};
|
|
5585
|
+
});
|
|
5498
5586
|
});
|
|
5499
5587
|
const isSingleNonMultiFrame = datasets.length === 1 && !(datasets[0].NumberOfFrames > 1);
|
|
5500
5588
|
if (isSingleNonMultiFrame) {
|
|
@@ -5508,14 +5596,15 @@ function _createMultiframeSegmentationFromReferencedImages(images, metadata, opt
|
|
|
5508
5596
|
if (!multiframe) {
|
|
5509
5597
|
throw new Error('Failed to normalize the multiframe dataset, the data is not multi-frame.');
|
|
5510
5598
|
}
|
|
5511
|
-
multiframe.SharedFunctionalGroupsSequence
|
|
5599
|
+
multiframe.SharedFunctionalGroupsSequence || (multiframe.SharedFunctionalGroupsSequence = {});
|
|
5512
5600
|
multiframe.SharedFunctionalGroupsSequence.PixelMeasuresSequence = {};
|
|
5513
|
-
multiframe.PerFrameFunctionalGroupsSequence
|
|
5601
|
+
multiframe.PerFrameFunctionalGroupsSequence || (multiframe.PerFrameFunctionalGroupsSequence = []);
|
|
5514
5602
|
for (let index = 0; index < images.length; index++) {
|
|
5515
|
-
|
|
5603
|
+
var _multiframe$PerFrameF, _index;
|
|
5604
|
+
(_multiframe$PerFrameF = multiframe.PerFrameFunctionalGroupsSequence)[_index = index] || (_multiframe$PerFrameF[_index] = {
|
|
5516
5605
|
PlanePositionSequence: {},
|
|
5517
5606
|
PlaneOrientationSequence: {}
|
|
5518
|
-
};
|
|
5607
|
+
});
|
|
5519
5608
|
}
|
|
5520
5609
|
if (isSingleNonMultiFrame) {
|
|
5521
5610
|
multiframe.PerFrameFunctionalGroupsSequence = [multiframe.PerFrameFunctionalGroupsSequence[0]];
|
|
@@ -5905,8 +5994,9 @@ function labelmapImagesFromBuffer_insertPixelDataPlanar(_ref4) {
|
|
|
5905
5994
|
}
|
|
5906
5995
|
};
|
|
5907
5996
|
const processLabelmapChunk = firstIndex => {
|
|
5997
|
+
var _multiframe$SharedFun;
|
|
5908
5998
|
const pfSeq = multiframe.PerFrameFunctionalGroupsSequence;
|
|
5909
|
-
const sharedPlaneOrientation = multiframe.SharedFunctionalGroupsSequence.PlaneOrientationSequence
|
|
5999
|
+
const sharedPlaneOrientation = (_multiframe$SharedFun = multiframe.SharedFunctionalGroupsSequence.PlaneOrientationSequence) === null || _multiframe$SharedFun === void 0 ? void 0 : _multiframe$SharedFun.ImageOrientationPatient;
|
|
5910
6000
|
for (let i = firstIndex; i < firstIndex + imagesPerChunk && i < groupsLen; i++) {
|
|
5911
6001
|
const PerFrameFunctionalGroups = pfSeq[i];
|
|
5912
6002
|
const ImageOrientationPatientI = sharedPlaneOrientation || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
|
|
@@ -5918,7 +6008,7 @@ function labelmapImagesFromBuffer_insertPixelDataPlanar(_ref4) {
|
|
|
5918
6008
|
}
|
|
5919
6009
|
const imageId = findReferenceSourceImageId(multiframe, i, referencedImageIds, metadataProvider, tolerance, sopUIDImageIdIndexMap);
|
|
5920
6010
|
if (!imageId) {
|
|
5921
|
-
console.warn(
|
|
6011
|
+
console.warn("Image not present in stack, can't import frame : ".concat(i, "."));
|
|
5922
6012
|
continue;
|
|
5923
6013
|
}
|
|
5924
6014
|
const sourceImageMetadata = imageIdMaps.metadata[imageId];
|
|
@@ -6265,7 +6355,7 @@ function getReferencedFrameOfReferenceSequence(referencedFrameOfReferenceSequenc
|
|
|
6265
6355
|
const {
|
|
6266
6356
|
FrameOfReferenceUID
|
|
6267
6357
|
} = metadata;
|
|
6268
|
-
referencedFrameOfReferenceSequence
|
|
6358
|
+
referencedFrameOfReferenceSequence || (referencedFrameOfReferenceSequence = []);
|
|
6269
6359
|
let referencedItem = referencedFrameOfReferenceSequence.find(it => it.FrameOfReferenceUID === FrameOfReferenceUID);
|
|
6270
6360
|
if (!referencedItem) {
|
|
6271
6361
|
referencedItem = {
|
|
@@ -6285,12 +6375,12 @@ const {
|
|
|
6285
6375
|
MetadataModules: getReferencedSeriesSequence_MetadataModules
|
|
6286
6376
|
} = esm.Enums;
|
|
6287
6377
|
function getReferencedSeriesSequence(referencedSeriesSequence, metadata, options) {
|
|
6288
|
-
const metadataProvider = options
|
|
6378
|
+
const metadataProvider = (options === null || options === void 0 ? void 0 : options.metadataProvider) || esm.metaData;
|
|
6289
6379
|
const {
|
|
6290
6380
|
referencedImageId: imageId
|
|
6291
6381
|
} = metadata;
|
|
6292
6382
|
const newReferenceSeq = metadataProvider.get(getReferencedSeriesSequence_MetadataModules.REFERENCED_SERIES_REFERENCE, imageId);
|
|
6293
|
-
referencedSeriesSequence
|
|
6383
|
+
referencedSeriesSequence || (referencedSeriesSequence = []);
|
|
6294
6384
|
if (newReferenceSeq) {
|
|
6295
6385
|
const {
|
|
6296
6386
|
ReferencedSeriesInstanceUID: newSeriesUid,
|
|
@@ -6316,11 +6406,12 @@ function getReferencedSeriesSequence(referencedSeriesSequence, metadata, options
|
|
|
6316
6406
|
|
|
6317
6407
|
;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/Cornerstone3D/RTStruct/utilities/getRTROIObservationsSequence.js
|
|
6318
6408
|
function getRTROIObservationsSequence(segment, index, options) {
|
|
6409
|
+
var _segment$segmentIndex;
|
|
6319
6410
|
return {
|
|
6320
6411
|
ObservationNumber: index + 1,
|
|
6321
|
-
ReferencedROINumber: segment.segmentIndex
|
|
6322
|
-
RTROIInterpretedType: options
|
|
6323
|
-
ROIInterpreter: options
|
|
6412
|
+
ReferencedROINumber: (_segment$segmentIndex = segment.segmentIndex) !== null && _segment$segmentIndex !== void 0 ? _segment$segmentIndex : index + 1,
|
|
6413
|
+
RTROIInterpretedType: (options === null || options === void 0 ? void 0 : options.interpretedType) || 'ORGAN',
|
|
6414
|
+
ROIInterpreter: (options === null || options === void 0 ? void 0 : options.observerName) || ''
|
|
6324
6415
|
};
|
|
6325
6416
|
}
|
|
6326
6417
|
|
|
@@ -6347,6 +6438,9 @@ function getStructureSetModule(contour, segment) {
|
|
|
6347
6438
|
|
|
6348
6439
|
|
|
6349
6440
|
|
|
6441
|
+
|
|
6442
|
+
function referencedMetadataProvider_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
6443
|
+
function referencedMetadataProvider_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? referencedMetadataProvider_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : referencedMetadataProvider_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
6350
6444
|
const {
|
|
6351
6445
|
DicomMetaDictionary: referencedMetadataProvider_DicomMetaDictionary
|
|
6352
6446
|
} = dcmjs_es/* default.data */.Ay.data;
|
|
@@ -6358,7 +6452,8 @@ const SERIES_MODULES = [referencedMetadataProvider_MetadataModules.GENERAL_SERIE
|
|
|
6358
6452
|
const IMAGE_MODULES = [referencedMetadataProvider_MetadataModules.GENERAL_IMAGE, referencedMetadataProvider_MetadataModules.IMAGE_PLANE, referencedMetadataProvider_MetadataModules.CINE, referencedMetadataProvider_MetadataModules.VOI_LUT, referencedMetadataProvider_MetadataModules.MODALITY_LUT, referencedMetadataProvider_MetadataModules.SOP_COMMON];
|
|
6359
6453
|
const metadataProvider = {
|
|
6360
6454
|
get: function (type, imageId, options) {
|
|
6361
|
-
|
|
6455
|
+
var _metadataProvider$typ;
|
|
6456
|
+
return (_metadataProvider$typ = metadataProvider[type]) === null || _metadataProvider$typ === void 0 ? void 0 : _metadataProvider$typ.call(metadataProvider, imageId, options);
|
|
6362
6457
|
},
|
|
6363
6458
|
[referencedMetadataProvider_MetadataModules.IMAGE_SOP_INSTANCE_REFERENCE]: function (imageId) {
|
|
6364
6459
|
const frameModule = esm.metaData.get(referencedMetadataProvider_MetadataModules.FRAME_MODULE, imageId);
|
|
@@ -6392,9 +6487,7 @@ const metadataProvider = {
|
|
|
6392
6487
|
};
|
|
6393
6488
|
},
|
|
6394
6489
|
[referencedMetadataProvider_MetadataModules.PREDECESSOR_SEQUENCE]: imageId => {
|
|
6395
|
-
const result = {
|
|
6396
|
-
...esm.metaData.get(referencedMetadataProvider_MetadataModules.SERIES_DATA, imageId)
|
|
6397
|
-
};
|
|
6490
|
+
const result = referencedMetadataProvider_objectSpread({}, esm.metaData.get(referencedMetadataProvider_MetadataModules.SERIES_DATA, imageId));
|
|
6398
6491
|
const generalImage = esm.metaData.get(referencedMetadataProvider_MetadataModules.GENERAL_IMAGE, imageId);
|
|
6399
6492
|
const study = esm.metaData.get(referencedMetadataProvider_MetadataModules.GENERAL_STUDY, imageId);
|
|
6400
6493
|
result.InstanceNumber = 1 + Number(generalImage.instanceNumber);
|
|
@@ -6421,8 +6514,7 @@ const metadataProvider = {
|
|
|
6421
6514
|
},
|
|
6422
6515
|
[referencedMetadataProvider_MetadataModules.RTSS_INSTANCE_DATA]: imageId => {
|
|
6423
6516
|
const newInstanceData = esm.metaData.get(referencedMetadataProvider_MetadataModules.NEW_INSTANCE_DATA, imageId);
|
|
6424
|
-
return {
|
|
6425
|
-
...newInstanceData,
|
|
6517
|
+
return referencedMetadataProvider_objectSpread(referencedMetadataProvider_objectSpread({}, newInstanceData), {}, {
|
|
6426
6518
|
SeriesNumber: '3201',
|
|
6427
6519
|
StructureSetROISequence: [],
|
|
6428
6520
|
ROIContourSequence: [],
|
|
@@ -6435,12 +6527,11 @@ const metadataProvider = {
|
|
|
6435
6527
|
StructureSetName: '',
|
|
6436
6528
|
StructureSetDate: referencedMetadataProvider_DicomMetaDictionary.date(),
|
|
6437
6529
|
StructureSetTime: referencedMetadataProvider_DicomMetaDictionary.time()
|
|
6438
|
-
};
|
|
6530
|
+
});
|
|
6439
6531
|
},
|
|
6440
6532
|
[referencedMetadataProvider_MetadataModules.NEW_INSTANCE_DATA]: imageId => {
|
|
6441
6533
|
const studyData = esm.metaData.get(referencedMetadataProvider_MetadataModules.STUDY_DATA, imageId);
|
|
6442
|
-
return {
|
|
6443
|
-
...studyData,
|
|
6534
|
+
return referencedMetadataProvider_objectSpread(referencedMetadataProvider_objectSpread({}, studyData), {}, {
|
|
6444
6535
|
SeriesNumber: '50000',
|
|
6445
6536
|
InstanceNumber: '1',
|
|
6446
6537
|
OperatorsName: '',
|
|
@@ -6449,7 +6540,7 @@ const metadataProvider = {
|
|
|
6449
6540
|
Manufacturer: 'cs3d',
|
|
6450
6541
|
SOPInstanceUID: referencedMetadataProvider_DicomMetaDictionary.uid(),
|
|
6451
6542
|
SeriesInstanceUID: referencedMetadataProvider_DicomMetaDictionary.uid()
|
|
6452
|
-
};
|
|
6543
|
+
});
|
|
6453
6544
|
},
|
|
6454
6545
|
[referencedMetadataProvider_MetadataModules.RTSS_CONTOUR]: () => metaRTSSContour,
|
|
6455
6546
|
[referencedMetadataProvider_MetadataModules.SR_ANNOTATION]: () => metaSRAnnotation
|
|
@@ -6472,7 +6563,7 @@ function assignDefined(dest, source, options) {
|
|
|
6472
6563
|
if (value === undefined) {
|
|
6473
6564
|
continue;
|
|
6474
6565
|
}
|
|
6475
|
-
if (dest[key] === undefined && options
|
|
6566
|
+
if (dest[key] === undefined && options !== null && options !== void 0 && options.requireDestinationKey) {
|
|
6476
6567
|
continue;
|
|
6477
6568
|
}
|
|
6478
6569
|
dest[key] = value;
|
|
@@ -6509,6 +6600,9 @@ function createInstance(instanceKey, studyExemplarImageId, base, options) {
|
|
|
6509
6600
|
|
|
6510
6601
|
|
|
6511
6602
|
|
|
6603
|
+
|
|
6604
|
+
function RTSS_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
6605
|
+
function RTSS_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? RTSS_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : RTSS_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
6512
6606
|
const {
|
|
6513
6607
|
generateContourSetsFromLabelmap,
|
|
6514
6608
|
AnnotationToPointData
|
|
@@ -6523,6 +6617,7 @@ function generateRTSSFromSegmentations(segmentation, metadataProvider, _DicomMet
|
|
|
6523
6617
|
});
|
|
6524
6618
|
}
|
|
6525
6619
|
async function generateRTSSFromLabelmap(segmentations, options) {
|
|
6620
|
+
var _dataset$ReferencedFr;
|
|
6526
6621
|
const {
|
|
6527
6622
|
metadataProvider = esm.metaData
|
|
6528
6623
|
} = options;
|
|
@@ -6555,7 +6650,7 @@ async function generateRTSSFromLabelmap(segmentations, options) {
|
|
|
6555
6650
|
});
|
|
6556
6651
|
});
|
|
6557
6652
|
});
|
|
6558
|
-
const segLabel = contourSet.label ||
|
|
6653
|
+
const segLabel = contourSet.label || "Segment ".concat(segIndex + 1);
|
|
6559
6654
|
const ROIContour = {
|
|
6560
6655
|
name: segLabel,
|
|
6561
6656
|
description: segLabel,
|
|
@@ -6580,12 +6675,13 @@ async function generateRTSSFromLabelmap(segmentations, options) {
|
|
|
6580
6675
|
dataset.ReferencedSeriesSequence = getReferencedSeriesSequence(dataset.ReferencedSeriesSequence, contour.metadata, options);
|
|
6581
6676
|
dataset.ReferencedFrameOfReferenceSequence = getReferencedFrameOfReferenceSequence(dataset.ReferencedFrameOfReferenceSequence, contour.metadata);
|
|
6582
6677
|
});
|
|
6583
|
-
if (dataset.ReferencedFrameOfReferenceSequence
|
|
6678
|
+
if (((_dataset$ReferencedFr = dataset.ReferencedFrameOfReferenceSequence) === null || _dataset$ReferencedFr === void 0 ? void 0 : _dataset$ReferencedFr.length) === 1) {
|
|
6584
6679
|
dataset.FrameOfReferenceUID = dataset.ReferencedFrameOfReferenceSequence[0].FrameOfReferenceUID;
|
|
6585
6680
|
}
|
|
6586
6681
|
return dataset;
|
|
6587
6682
|
}
|
|
6588
6683
|
function generateRTSSFromAnnotations(segmentations, annotations, options) {
|
|
6684
|
+
var _dataset$ReferencedFr2;
|
|
6589
6685
|
const dataset = _initializeDataset(segmentations, annotations[0].metadata, options);
|
|
6590
6686
|
const segmentsContour = new Map();
|
|
6591
6687
|
annotations.forEach((annotation, index) => {
|
|
@@ -6602,20 +6698,19 @@ function generateRTSSFromAnnotations(segmentations, annotations, options) {
|
|
|
6602
6698
|
segmentationId,
|
|
6603
6699
|
segmentIndex
|
|
6604
6700
|
} = segmentation;
|
|
6605
|
-
const key =
|
|
6701
|
+
const key = "".concat(segmentationId, ":").concat(segmentIndex);
|
|
6606
6702
|
let segmentAnnotation = segmentsContour.get(key);
|
|
6607
6703
|
if (!segmentAnnotation) {
|
|
6608
6704
|
const segment = segmentations.segments[segmentIndex];
|
|
6609
6705
|
const structureSetModule = getStructureSetModule(annotation, segment);
|
|
6610
6706
|
dataset.StructureSetROISequence.push(structureSetModule);
|
|
6611
6707
|
dataset.RTROIObservationsSequence.push(getRTROIObservationsSequence(segment, index, options));
|
|
6612
|
-
segmentAnnotation = {
|
|
6613
|
-
...segmentation,
|
|
6708
|
+
segmentAnnotation = RTSS_objectSpread(RTSS_objectSpread({}, segmentation), {}, {
|
|
6614
6709
|
annotations: [],
|
|
6615
6710
|
structureSetModule,
|
|
6616
6711
|
segment,
|
|
6617
6712
|
roiContourSequence: null
|
|
6618
|
-
};
|
|
6713
|
+
});
|
|
6619
6714
|
segmentsContour.set(key, segmentAnnotation);
|
|
6620
6715
|
}
|
|
6621
6716
|
const roiContourSequence = AnnotationToPointData.convert(annotation, segmentAnnotation.segment, esm.metaData);
|
|
@@ -6628,7 +6723,7 @@ function generateRTSSFromAnnotations(segmentations, annotations, options) {
|
|
|
6628
6723
|
dataset.ReferencedSeriesSequence = getReferencedSeriesSequence(dataset.ReferencedSeriesSequence, annotation.metadata, options);
|
|
6629
6724
|
dataset.ReferencedFrameOfReferenceSequence = getReferencedFrameOfReferenceSequence(dataset.ReferencedFrameOfReferenceSequence, annotation.metadata);
|
|
6630
6725
|
});
|
|
6631
|
-
if (dataset.ReferencedFrameOfReferenceSequence
|
|
6726
|
+
if (((_dataset$ReferencedFr2 = dataset.ReferencedFrameOfReferenceSequence) === null || _dataset$ReferencedFr2 === void 0 ? void 0 : _dataset$ReferencedFr2.length) === 1) {
|
|
6632
6727
|
dataset.FrameOfReferenceUID = dataset.ReferencedFrameOfReferenceSequence[0].FrameOfReferenceUID;
|
|
6633
6728
|
}
|
|
6634
6729
|
return dataset;
|
|
@@ -6669,7 +6764,7 @@ function generateRTSSFromRepresentation(segmentations) {
|
|
|
6669
6764
|
if (segmentations.representationData.Contour) {
|
|
6670
6765
|
return generateRTSSFromContour(segmentations, options);
|
|
6671
6766
|
}
|
|
6672
|
-
throw new Error(
|
|
6767
|
+
throw new Error("No representation available to save to RTSS: ".concat(Object.keys(segmentations.representationData)));
|
|
6673
6768
|
}
|
|
6674
6769
|
|
|
6675
6770
|
|
|
@@ -6729,9 +6824,9 @@ _KeyImage = KeyImage;
|
|
|
6729
6824
|
_KeyImage.init("KeyImage", KeyImage_TID300Point, {
|
|
6730
6825
|
parentType: Probe.toolType
|
|
6731
6826
|
});
|
|
6732
|
-
_KeyImage.trackingSeriesIdentifier =
|
|
6733
|
-
_KeyImage.trackingPointIdentifier =
|
|
6734
|
-
_KeyImage.trackingSeriesPointIdentifier =
|
|
6827
|
+
_KeyImage.trackingSeriesIdentifier = "".concat(_KeyImage.trackingIdentifierTextValue, ":Series");
|
|
6828
|
+
_KeyImage.trackingPointIdentifier = "".concat(_KeyImage.trackingIdentifierTextValue, ":Point");
|
|
6829
|
+
_KeyImage.trackingSeriesPointIdentifier = "".concat(_KeyImage.trackingIdentifierTextValue, ":SeriesPoint");
|
|
6735
6830
|
|
|
6736
6831
|
|
|
6737
6832
|
|