@ohif/app 3.8.0-beta.42 → 3.8.0-beta.43
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/{170.bundle.8d5c47085b07b1b98f41.js → 170.bundle.5632b1b6fab9906388e2.js} +9 -9
- package/dist/{181.bundle.d2fe517852935b82368b.js → 181.bundle.a2d7b26d73467d2ce8cd.js} +6 -6
- package/dist/{185.bundle.dee4d4f6103bce7ff6e7.js → 185.bundle.6311718cd457884f813a.js} +4 -4
- package/dist/{19.bundle.ad4a68419e733f9f22cd.js → 19.bundle.2fa92040006123dc9251.js} +4 -4
- package/dist/{199.bundle.741d18af781924e8c385.js → 199.bundle.8a5e36ae7e18dd2de580.js} +4 -4
- package/dist/202.bundle.c7c412d83b745f890834.js +18169 -0
- package/dist/{250.bundle.ba94ff371388e395cd05.js → 250.bundle.96a47756a15efbdf78af.js} +4 -4
- package/dist/{359.bundle.7ef31482741597c798e4.js → 359.bundle.bb663da51cbd0b8d1eff.js} +2 -2
- package/dist/{410.bundle.6cf43e5bb1fccdc3c3aa.js → 410.bundle.bd04d9a698385a43f682.js} +2 -2
- package/dist/{451.bundle.68a551a7d1746cf904cb.js → 451.bundle.9b9abf9ca8967a46fa93.js} +2 -9
- package/dist/{456.bundle.618aab00b3812ce7e3bd.js → 456.bundle.00c2bac49511bea54b5c.js} +10 -45
- package/dist/{466.bundle.26b834134da98f20c7ca.js → 466.bundle.8cdd9c3bcc81fe4cb8c6.js} +39 -11
- package/dist/{471.bundle.5809b10f75c8fc2f7167.js → 471.bundle.a646b0616732bbc945b4.js} +4 -2
- package/dist/{483.bundle.d982f0421bcb44ea2fd3.js → 483.bundle.7a8402a110f9f42fdc94.js} +6 -6
- package/dist/{613.bundle.9c5c87fd6768ceef5caf.js → 613.bundle.a54c8cdf616a799bcf4b.js} +47 -23
- package/dist/{738.bundle.3a2ff8e9bea835a0fe81.js → 738.bundle.f5179d74c16cb154c759.js} +6 -6
- package/dist/{822.bundle.f5ae3f366ce742fb060a.js → 822.bundle.2092dbfefbc1b5834965.js} +3 -3
- package/dist/{485.bundle.5b6c33cc43d8f3470642.js → 831.bundle.127a3064e8844d6d2c82.js} +1 -279
- package/dist/{886.bundle.4496fc7fb83b8c897d20.js → 886.bundle.69f07c567a3dc69b060f.js} +1 -1
- package/dist/{95.bundle.830304446bffa705883c.js → 95.bundle.644c927d99988ff60b36.js} +26 -259
- package/dist/{965.bundle.f8680a6f67d5473d1184.js → 965.bundle.254019aafbf9c9d3d800.js} +2 -2
- package/dist/{app.bundle.de0a06c3967d6df956ee.js → app.bundle.ab96a3986fbf883f78ea.js} +49893 -49656
- package/dist/app.bundle.css +1 -1
- package/dist/cornerstoneDICOMImageLoader.min.js +1 -1
- package/dist/cornerstoneDICOMImageLoader.min.js.map +1 -1
- package/dist/index.html +1 -1
- package/dist/sw.js +1 -1
- package/package.json +18 -18
- package/dist/202.bundle.0ca2f2479d2578f539b0.js +0 -6353
- /package/dist/{12.bundle.0bf0dc568701c021f413.js → 12.bundle.e97b1190673797a03d1a.js} +0 -0
- /package/dist/{281.bundle.24c3be00f70a1126b30c.js → 281.bundle.5eddac45a51ce75f55c4.js} +0 -0
- /package/dist/{506.bundle.edb0fe41253c046a8ac3.js → 506.bundle.4bcf51e2946dab485d2b.js} +0 -0
- /package/dist/{687.bundle.7f262cad0fe884785951.js → 687.bundle.e798aa93251dc9bc87ef.js} +0 -0
- /package/dist/{814.bundle.36a17ce54e2779f5c0b9.js → 814.bundle.198efdffbe64f60e38ef.js} +0 -0
|
@@ -22,8 +22,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
|
22
22
|
// EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
|
|
23
23
|
var lodash_debounce = __webpack_require__(8324);
|
|
24
24
|
var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
|
|
25
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
26
|
-
var src = __webpack_require__(
|
|
25
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
26
|
+
var src = __webpack_require__(89556);
|
|
27
27
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
|
|
28
28
|
// extracted by mini-css-extract-plugin
|
|
29
29
|
|
|
@@ -59,8 +59,8 @@ const listComponentGenerator = props => {
|
|
|
59
59
|
|
|
60
60
|
// EXTERNAL MODULE: ../../../node_modules/moment/moment.js
|
|
61
61
|
var moment_moment = __webpack_require__(71271);
|
|
62
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js +
|
|
63
|
-
var esm = __webpack_require__(
|
|
62
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
|
|
63
|
+
var esm = __webpack_require__(56846);
|
|
64
64
|
;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/components/ViewportOverlay/utils.ts
|
|
65
65
|
|
|
66
66
|
|
|
@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
14
14
|
|
|
15
15
|
// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
|
|
16
16
|
var src = __webpack_require__(71771);
|
|
17
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
18
|
-
var ui_src = __webpack_require__(
|
|
17
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
18
|
+
var ui_src = __webpack_require__(89556);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../modes/tmtv/src/initToolGroups.js
|
|
20
20
|
const toolGroupIds = {
|
|
21
21
|
CT: 'ctToolGroup',
|
|
@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
12
12
|
"default": () => (/* binding */ basic_dev_mode_src)
|
|
13
13
|
});
|
|
14
14
|
|
|
15
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
16
|
-
var src = __webpack_require__(
|
|
15
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
16
|
+
var src = __webpack_require__(89556);
|
|
17
17
|
// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
|
|
18
18
|
var core_src = __webpack_require__(71771);
|
|
19
19
|
;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js
|
|
@@ -21,8 +21,8 @@ var react = __webpack_require__(43001);
|
|
|
21
21
|
var es = __webpack_require__(69190);
|
|
22
22
|
// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
|
|
23
23
|
var src = __webpack_require__(71771);
|
|
24
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
25
|
-
var ui_src = __webpack_require__(
|
|
24
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
25
|
+
var ui_src = __webpack_require__(89556);
|
|
26
26
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
|
|
27
27
|
function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
|
|
28
28
|
const {
|
|
@@ -295,13 +295,6 @@ function OHIFCornerstoneSEGViewport(props) {
|
|
|
295
295
|
if (evt.segDisplaySet.displaySetInstanceUID === segDisplaySet.displaySetInstanceUID) {
|
|
296
296
|
setSegIsLoading(false);
|
|
297
297
|
}
|
|
298
|
-
if (evt.overlappingSegments) {
|
|
299
|
-
uiNotificationService.show({
|
|
300
|
-
title: 'Overlapping Segments',
|
|
301
|
-
message: 'Overlapping segments detected which is not currently supported',
|
|
302
|
-
type: 'warning'
|
|
303
|
-
});
|
|
304
|
-
}
|
|
305
298
|
});
|
|
306
299
|
return () => {
|
|
307
300
|
unsubscribe();
|
|
@@ -35,10 +35,10 @@ __webpack_require__.r(types_namespaceObject);
|
|
|
35
35
|
|
|
36
36
|
// EXTERNAL MODULE: ../../../node_modules/react/index.js
|
|
37
37
|
var react = __webpack_require__(43001);
|
|
38
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js +
|
|
39
|
-
var esm = __webpack_require__(
|
|
40
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js +
|
|
41
|
-
var dist_esm = __webpack_require__(
|
|
38
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
|
|
39
|
+
var esm = __webpack_require__(56846);
|
|
40
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
|
|
41
|
+
var dist_esm = __webpack_require__(81399);
|
|
42
42
|
// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
|
|
43
43
|
var src = __webpack_require__(71771);
|
|
44
44
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
|
|
@@ -119,8 +119,8 @@ function destroy() {
|
|
|
119
119
|
}
|
|
120
120
|
webWorkers.length = 0;
|
|
121
121
|
}
|
|
122
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
123
|
-
var ui_src = __webpack_require__(
|
|
122
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
123
|
+
var ui_src = __webpack_require__(89556);
|
|
124
124
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/callInputDialog.tsx
|
|
125
125
|
|
|
126
126
|
|
|
@@ -3756,7 +3756,7 @@ async function init({
|
|
|
3756
3756
|
|
|
3757
3757
|
/**
|
|
3758
3758
|
* Runs error handler for failed requests.
|
|
3759
|
-
* @param event
|
|
3759
|
+
* @param event
|
|
3760
3760
|
*/
|
|
3761
3761
|
const imageLoadFailedHandler = ({
|
|
3762
3762
|
detail
|
|
@@ -6798,9 +6798,6 @@ SyncGroupService.REGISTRATION = {
|
|
|
6798
6798
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/services/SyncGroupService/index.js
|
|
6799
6799
|
|
|
6800
6800
|
/* harmony default export */ const services_SyncGroupService = (SyncGroupService);
|
|
6801
|
-
// EXTERNAL MODULE: ../../../node_modules/lodash.clonedeep/index.js
|
|
6802
|
-
var lodash_clonedeep = __webpack_require__(11677);
|
|
6803
|
-
var lodash_clonedeep_default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep);
|
|
6804
6801
|
// EXTERNAL MODULE: ../../../node_modules/lodash.isequal/index.js
|
|
6805
6802
|
var lodash_isequal = __webpack_require__(10311);
|
|
6806
6803
|
var lodash_isequal_default = /*#__PURE__*/__webpack_require__.n(lodash_isequal);
|
|
@@ -6892,10 +6889,6 @@ var SegmentationService_class;
|
|
|
6892
6889
|
|
|
6893
6890
|
|
|
6894
6891
|
|
|
6895
|
-
|
|
6896
|
-
const {
|
|
6897
|
-
COLOR_LUT
|
|
6898
|
-
} = dist_esm.CONSTANTS;
|
|
6899
6892
|
const LABELMAP = dist_esm.Enums.SegmentationRepresentations.Labelmap;
|
|
6900
6893
|
const CONTOUR = dist_esm.Enums.SegmentationRepresentations.Contour;
|
|
6901
6894
|
const SegmentationService_EVENTS = {
|
|
@@ -7087,9 +7080,6 @@ class SegmentationService extends src/* PubSubService */.hC {
|
|
|
7087
7080
|
// hydrate the segmentation if it's not hydrated yet
|
|
7088
7081
|
segmentation.hydrated = true;
|
|
7089
7082
|
}
|
|
7090
|
-
const {
|
|
7091
|
-
colorLUTIndex
|
|
7092
|
-
} = segmentation;
|
|
7093
7083
|
|
|
7094
7084
|
// Based on the segmentationId, set the colorLUTIndex.
|
|
7095
7085
|
const segmentationRepresentationUIDs = await dist_esm.segmentation.addSegmentationRepresentations(toolGroupId, [{
|
|
@@ -7099,7 +7089,6 @@ class SegmentationService extends src/* PubSubService */.hC {
|
|
|
7099
7089
|
|
|
7100
7090
|
// set the latest segmentation representation as active one
|
|
7101
7091
|
this._setActiveSegmentationForToolGroup(segmentationId, toolGroupId, segmentationRepresentationUIDs[0]);
|
|
7102
|
-
dist_esm.segmentation.config.color.setColorLUT(toolGroupId, segmentationRepresentationUIDs[0], colorLUTIndex);
|
|
7103
7092
|
|
|
7104
7093
|
// add the segmentation segments properly
|
|
7105
7094
|
for (const segment of segmentation.segments) {
|
|
@@ -7453,15 +7442,6 @@ class SegmentationService extends src/* PubSubService */.hC {
|
|
|
7453
7442
|
}
|
|
7454
7443
|
return viewportInfo.getToolGroupId();
|
|
7455
7444
|
};
|
|
7456
|
-
this.getNextColorLUTIndex = () => {
|
|
7457
|
-
let i = 0;
|
|
7458
|
-
while (true) {
|
|
7459
|
-
if (dist_esm.segmentation.state.getColorLUT(i) === undefined) {
|
|
7460
|
-
return i;
|
|
7461
|
-
}
|
|
7462
|
-
i++;
|
|
7463
|
-
}
|
|
7464
|
-
};
|
|
7465
7445
|
/**
|
|
7466
7446
|
* Converts object of objects to array.
|
|
7467
7447
|
*
|
|
@@ -7714,15 +7694,6 @@ class SegmentationService extends src/* PubSubService */.hC {
|
|
|
7714
7694
|
}
|
|
7715
7695
|
}
|
|
7716
7696
|
}]);
|
|
7717
|
-
|
|
7718
|
-
// if first segmentation, we can use the default colorLUT, otherwise
|
|
7719
|
-
// we need to generate a new one and use a new colorLUT
|
|
7720
|
-
const colorLUTIndex = 0;
|
|
7721
|
-
if (Object.keys(this.segmentations).length !== 0) {
|
|
7722
|
-
const newColorLUT = this.generateNewColorLUT();
|
|
7723
|
-
const colorLUTIndex = this.getNextColorLUTIndex();
|
|
7724
|
-
dist_esm.segmentation.config.color.addColorLUT(newColorLUT, colorLUTIndex);
|
|
7725
|
-
}
|
|
7726
7697
|
this.segmentations[segmentationId] = {
|
|
7727
7698
|
...segmentation,
|
|
7728
7699
|
label: segmentation.label || '',
|
|
@@ -7730,8 +7701,7 @@ class SegmentationService extends src/* PubSubService */.hC {
|
|
|
7730
7701
|
activeSegmentIndex: segmentation.activeSegmentIndex ?? null,
|
|
7731
7702
|
segmentCount: segmentation.segmentCount ?? 0,
|
|
7732
7703
|
isActive: false,
|
|
7733
|
-
isVisible: true
|
|
7734
|
-
colorLUTIndex
|
|
7704
|
+
isVisible: true
|
|
7735
7705
|
};
|
|
7736
7706
|
cachedSegmentation = this.segmentations[segmentationId];
|
|
7737
7707
|
this._updateCornerstoneSegmentations({
|
|
@@ -8209,8 +8179,7 @@ class SegmentationService extends src/* PubSubService */.hC {
|
|
|
8209
8179
|
segmentCount: 0,
|
|
8210
8180
|
segments: [],
|
|
8211
8181
|
isVisible: true,
|
|
8212
|
-
isActive: false
|
|
8213
|
-
colorLUTIndex: 0
|
|
8182
|
+
isActive: false
|
|
8214
8183
|
};
|
|
8215
8184
|
}
|
|
8216
8185
|
_setActiveSegmentationForToolGroup(segmentationId, toolGroupId, suppressEvents = false) {
|
|
@@ -8439,10 +8408,6 @@ class SegmentationService extends src/* PubSubService */.hC {
|
|
|
8439
8408
|
return referencedFrameOfReferenceSequence.FrameOfReferenceUID;
|
|
8440
8409
|
}
|
|
8441
8410
|
}
|
|
8442
|
-
generateNewColorLUT() {
|
|
8443
|
-
const newColorLUT = lodash_clonedeep_default()(COLOR_LUT);
|
|
8444
|
-
return newColorLUT;
|
|
8445
|
-
}
|
|
8446
8411
|
}
|
|
8447
8412
|
SegmentationService_class = SegmentationService;
|
|
8448
8413
|
SegmentationService.REGISTRATION = {
|
|
@@ -9959,7 +9924,7 @@ const reset = () => {
|
|
|
9959
9924
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
9960
9925
|
/* harmony export */ Z: () => (/* binding */ getSOPInstanceAttributes)
|
|
9961
9926
|
/* harmony export */ });
|
|
9962
|
-
/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
|
|
9927
|
+
/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56846);
|
|
9963
9928
|
|
|
9964
9929
|
|
|
9965
9930
|
/**
|
|
@@ -24,10 +24,10 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
|
|
|
24
24
|
var react = __webpack_require__(43001);
|
|
25
25
|
// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
|
|
26
26
|
var src = __webpack_require__(71771);
|
|
27
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js +
|
|
28
|
-
var esm = __webpack_require__(
|
|
29
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js +
|
|
30
|
-
var dist_esm = __webpack_require__(
|
|
27
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
|
|
28
|
+
var esm = __webpack_require__(56846);
|
|
29
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
|
|
30
|
+
var dist_esm = __webpack_require__(81399);
|
|
31
31
|
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
|
|
32
32
|
var adapters_es = __webpack_require__(91202);
|
|
33
33
|
// EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
|
|
@@ -213,6 +213,13 @@ async function _loadSegments({
|
|
|
213
213
|
}
|
|
214
214
|
}
|
|
215
215
|
});
|
|
216
|
+
if (results.overlappingSegments) {
|
|
217
|
+
uiNotificationService.show({
|
|
218
|
+
title: 'Overlapping Segments',
|
|
219
|
+
message: 'Unsupported overlapping segments detected, segmentation rendering results may be incorrect.',
|
|
220
|
+
type: 'warning'
|
|
221
|
+
});
|
|
222
|
+
}
|
|
216
223
|
if (!usedRecommendedDisplayCIELabValue) {
|
|
217
224
|
// Display a notification about the non-utilization of RecommendedDisplayCIELabValue
|
|
218
225
|
uiNotificationService.show({
|
|
@@ -313,8 +320,8 @@ var default_src = __webpack_require__(78738);
|
|
|
313
320
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
314
321
|
var prop_types = __webpack_require__(3827);
|
|
315
322
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
316
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
317
|
-
var ui_src = __webpack_require__(
|
|
323
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
324
|
+
var ui_src = __webpack_require__(89556);
|
|
318
325
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
|
|
319
326
|
|
|
320
327
|
|
|
@@ -744,7 +751,7 @@ const initialState = {
|
|
|
744
751
|
},
|
|
745
752
|
ThresholdBrush: {
|
|
746
753
|
brushSize: 15,
|
|
747
|
-
thresholdRange:
|
|
754
|
+
thresholdRange: null
|
|
748
755
|
},
|
|
749
756
|
activeTool: null
|
|
750
757
|
};
|
|
@@ -801,6 +808,7 @@ function SegmentationToolbox({
|
|
|
801
808
|
});
|
|
802
809
|
}, [activeViewportId, viewports, toolGroupService, dispatch]);
|
|
803
810
|
const setToolActive = (0,react.useCallback)(toolName => {
|
|
811
|
+
initializeThresholdValue(toolName);
|
|
804
812
|
toolbarService.recordInteraction({
|
|
805
813
|
interactionType: 'tool',
|
|
806
814
|
commands: [{
|
|
@@ -872,6 +880,25 @@ function SegmentationToolbox({
|
|
|
872
880
|
segmentationUtils.setBrushSizeForToolGroup(toolGroupId, brushSize, toolName);
|
|
873
881
|
});
|
|
874
882
|
}, [toolGroupService]);
|
|
883
|
+
function initializeThresholdValue(toolName) {
|
|
884
|
+
if (state.ThresholdBrush.thresholdRange === null) {
|
|
885
|
+
// set the default threshold range from the tool configuration
|
|
886
|
+
const toolGroupIds = toolGroupService.getToolGroupIds();
|
|
887
|
+
const toolGroupId = toolGroupIds[0];
|
|
888
|
+
const toolGroup = toolGroupService.getToolGroup(toolGroupId);
|
|
889
|
+
const toolConfig = toolGroup.getToolConfiguration(toolName);
|
|
890
|
+
const defaultThresholdRange = toolConfig?.strategySpecificConfiguration?.THRESHOLD?.threshold;
|
|
891
|
+
dispatch({
|
|
892
|
+
type: ACTIONS.SET_TOOL_CONFIG,
|
|
893
|
+
payload: {
|
|
894
|
+
tool: 'ThresholdBrush',
|
|
895
|
+
config: {
|
|
896
|
+
thresholdRange: defaultThresholdRange
|
|
897
|
+
}
|
|
898
|
+
}
|
|
899
|
+
});
|
|
900
|
+
}
|
|
901
|
+
}
|
|
875
902
|
const onBrushSizeChange = (0,react.useCallback)((valueAsStringOrNumber, toolCategory) => {
|
|
876
903
|
const value = Number(valueAsStringOrNumber);
|
|
877
904
|
_getToolNamesFromCategory(toolCategory).forEach(toolName => {
|
|
@@ -888,7 +915,7 @@ function SegmentationToolbox({
|
|
|
888
915
|
});
|
|
889
916
|
}, [toolGroupService, dispatch]);
|
|
890
917
|
const handleRangeChange = (0,react.useCallback)(newRange => {
|
|
891
|
-
if (newRange[0] === state.ThresholdBrush.thresholdRange[0] && newRange[1] === state.ThresholdBrush.thresholdRange[1]) {
|
|
918
|
+
if (newRange[0] === state.ThresholdBrush.thresholdRange?.[0] && newRange[1] === state.ThresholdBrush.thresholdRange?.[1]) {
|
|
892
919
|
return;
|
|
893
920
|
}
|
|
894
921
|
const toolNames = _getToolNamesFromCategory('ThresholdBrush');
|
|
@@ -897,7 +924,7 @@ function SegmentationToolbox({
|
|
|
897
924
|
const toolGroup = toolGroupService.getToolGroup(toolGroupId);
|
|
898
925
|
toolGroup.setToolConfiguration(toolName, {
|
|
899
926
|
strategySpecificConfiguration: {
|
|
900
|
-
|
|
927
|
+
THRESHOLD: {
|
|
901
928
|
threshold: newRange
|
|
902
929
|
}
|
|
903
930
|
}
|
|
@@ -1036,7 +1063,8 @@ function SegmentationToolbox({
|
|
|
1036
1063
|
}, "Threshold"), /*#__PURE__*/react.createElement(ui_src/* InputDoubleRange */.R0, {
|
|
1037
1064
|
values: state.ThresholdBrush.thresholdRange,
|
|
1038
1065
|
onChange: handleRangeChange,
|
|
1039
|
-
minValue: -1000
|
|
1066
|
+
minValue: -1000 // Todo: these should be configurable
|
|
1067
|
+
,
|
|
1040
1068
|
maxValue: 1000,
|
|
1041
1069
|
step: 1,
|
|
1042
1070
|
showLabel: true,
|
|
@@ -1639,7 +1667,7 @@ const commandsModule = ({
|
|
|
1639
1667
|
const segmentations = segmentationService.getSegmentation(segmentationId);
|
|
1640
1668
|
const vtkUtils = {
|
|
1641
1669
|
vtkImageMarchingSquares: ImageMarchingSquares/* default */.ZP,
|
|
1642
|
-
vtkDataArray: DataArray
|
|
1670
|
+
vtkDataArray: DataArray["default"],
|
|
1643
1671
|
vtkImageData: ImageData/* default */.ZP
|
|
1644
1672
|
};
|
|
1645
1673
|
const RTSS = generateRTSSFromSegmentations(segmentations, src.classes.MetadataProvider, src.DicomMetadataStore, esm.cache, dist_esm.Enums, vtkUtils);
|
|
@@ -19,8 +19,8 @@ var prop_types = __webpack_require__(3827);
|
|
|
19
19
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
20
20
|
// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
|
|
21
21
|
var src = __webpack_require__(71771);
|
|
22
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
23
|
-
var ui_src = __webpack_require__(
|
|
22
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
23
|
+
var ui_src = __webpack_require__(89556);
|
|
24
24
|
;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
|
|
25
25
|
|
|
26
26
|
const RESPONSE = {
|
|
@@ -296,6 +296,8 @@ function OHIFCornerstoneRTViewport(props) {
|
|
|
296
296
|
});
|
|
297
297
|
}, [servicesManager, viewportId, rtDisplaySet, rtIsLoading]);
|
|
298
298
|
(0,react.useEffect)(() => {
|
|
299
|
+
// I'm not sure what is this, since in RT we support Overlapping segmnets
|
|
300
|
+
// via contours
|
|
299
301
|
const {
|
|
300
302
|
unsubscribe
|
|
301
303
|
} = segmentationService.subscribe(segmentationService.EVENTS.SEGMENTATION_LOADING_COMPLETE, evt => {
|
|
@@ -693,8 +693,8 @@ var react = __webpack_require__(43001);
|
|
|
693
693
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
694
694
|
var prop_types = __webpack_require__(3827);
|
|
695
695
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
696
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
697
|
-
var src = __webpack_require__(
|
|
696
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
697
|
+
var src = __webpack_require__(89556);
|
|
698
698
|
// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
|
|
699
699
|
var core_src = __webpack_require__(71771);
|
|
700
700
|
// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
|
|
@@ -1527,10 +1527,10 @@ function getPanelModule({
|
|
|
1527
1527
|
}];
|
|
1528
1528
|
}
|
|
1529
1529
|
/* harmony default export */ const src_getPanelModule = (getPanelModule);
|
|
1530
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js +
|
|
1531
|
-
var esm = __webpack_require__(
|
|
1532
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js +
|
|
1533
|
-
var dist_esm = __webpack_require__(
|
|
1530
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
|
|
1531
|
+
var esm = __webpack_require__(81399);
|
|
1532
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
|
|
1533
|
+
var dist_esm = __webpack_require__(56846);
|
|
1534
1534
|
;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/constants/supportedTools.js
|
|
1535
1535
|
/* harmony default export */ const supportedTools = (['RectangleROIStartEndThreshold']);
|
|
1536
1536
|
;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js
|
|
@@ -20,8 +20,8 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/mode-segmentation"}');
|
|
|
20
20
|
|
|
21
21
|
const id = package_namespaceObject.u2;
|
|
22
22
|
|
|
23
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
24
|
-
var ui_src = __webpack_require__(
|
|
23
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
24
|
+
var ui_src = __webpack_require__(89556);
|
|
25
25
|
;// CONCATENATED MODULE: ../../../modes/segmentation/src/toolbarButtons.ts
|
|
26
26
|
|
|
27
27
|
|
|
@@ -258,22 +258,6 @@ const toolbarButtons = [
|
|
|
258
258
|
}];
|
|
259
259
|
/* harmony default export */ const src_toolbarButtons = (toolbarButtons);
|
|
260
260
|
;// CONCATENATED MODULE: ../../../modes/segmentation/src/initToolGroups.ts
|
|
261
|
-
const brushInstanceNames = {
|
|
262
|
-
CircularBrush: 'CircularBrush',
|
|
263
|
-
CircularEraser: 'CircularEraser',
|
|
264
|
-
SphereBrush: 'SphereBrush',
|
|
265
|
-
SphereEraser: 'SphereEraser',
|
|
266
|
-
ThresholdCircularBrush: 'ThresholdCircularBrush',
|
|
267
|
-
ThresholdSphereBrush: 'ThresholdSphereBrush'
|
|
268
|
-
};
|
|
269
|
-
const brushStrategies = {
|
|
270
|
-
CircularBrush: 'FILL_INSIDE_CIRCLE',
|
|
271
|
-
CircularEraser: 'ERASE_INSIDE_CIRCLE',
|
|
272
|
-
SphereBrush: 'FILL_INSIDE_SPHERE',
|
|
273
|
-
SphereEraser: 'ERASE_INSIDE_SPHERE',
|
|
274
|
-
ThresholdCircularBrush: 'THRESHOLD_INSIDE_CIRCLE',
|
|
275
|
-
ThresholdSphereBrush: 'THRESHOLD_INSIDE_SPHERE'
|
|
276
|
-
};
|
|
277
261
|
function createTools(utilityModule) {
|
|
278
262
|
const {
|
|
279
263
|
toolNames,
|
|
@@ -299,13 +283,53 @@ function createTools(utilityModule) {
|
|
|
299
283
|
toolName: toolNames.StackScrollMouseWheel,
|
|
300
284
|
bindings: []
|
|
301
285
|
}],
|
|
302
|
-
passive:
|
|
303
|
-
toolName:
|
|
286
|
+
passive: [{
|
|
287
|
+
toolName: 'CircularBrush',
|
|
288
|
+
parentTool: 'Brush',
|
|
289
|
+
configuration: {
|
|
290
|
+
activeStrategy: 'FILL_INSIDE_CIRCLE'
|
|
291
|
+
}
|
|
292
|
+
}, {
|
|
293
|
+
toolName: 'CircularEraser',
|
|
294
|
+
parentTool: 'Brush',
|
|
295
|
+
configuration: {
|
|
296
|
+
activeStrategy: 'ERASE_INSIDE_CIRCLE'
|
|
297
|
+
}
|
|
298
|
+
}, {
|
|
299
|
+
toolName: 'SphereBrush',
|
|
300
|
+
parentTool: 'Brush',
|
|
301
|
+
configuration: {
|
|
302
|
+
activeStrategy: 'FILL_INSIDE_SPHERE'
|
|
303
|
+
}
|
|
304
|
+
}, {
|
|
305
|
+
toolName: 'SphereEraser',
|
|
304
306
|
parentTool: 'Brush',
|
|
305
307
|
configuration: {
|
|
306
|
-
activeStrategy:
|
|
308
|
+
activeStrategy: 'ERASE_INSIDE_SPHERE'
|
|
307
309
|
}
|
|
308
|
-
}
|
|
310
|
+
}, {
|
|
311
|
+
toolName: 'ThresholdCircularBrush',
|
|
312
|
+
parentTool: 'Brush',
|
|
313
|
+
configuration: {
|
|
314
|
+
activeStrategy: 'THRESHOLD_INSIDE_CIRCLE',
|
|
315
|
+
strategySpecificConfiguration: {
|
|
316
|
+
THRESHOLD: {
|
|
317
|
+
threshold: [-500, 500]
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
}, {
|
|
322
|
+
toolName: 'ThresholdSphereBrush',
|
|
323
|
+
parentTool: 'Brush',
|
|
324
|
+
configuration: {
|
|
325
|
+
activeStrategy: 'THRESHOLD_INSIDE_SPHERE',
|
|
326
|
+
strategySpecificConfiguration: {
|
|
327
|
+
THRESHOLD: {
|
|
328
|
+
threshold: [-500, 500]
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
}, {
|
|
309
333
|
toolName: toolNames.CircleScissors
|
|
310
334
|
}, {
|
|
311
335
|
toolName: toolNames.RectangleScissors
|
|
@@ -317,7 +341,7 @@ function createTools(utilityModule) {
|
|
|
317
341
|
toolName: toolNames.Magnify
|
|
318
342
|
}, {
|
|
319
343
|
toolName: toolNames.SegmentationDisplay
|
|
320
|
-
}]
|
|
344
|
+
}],
|
|
321
345
|
disabled: [{
|
|
322
346
|
toolName: toolNames.ReferenceLines
|
|
323
347
|
}]
|
|
@@ -2356,8 +2356,8 @@ var react = __webpack_require__(43001);
|
|
|
2356
2356
|
// EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
|
|
2357
2357
|
var prop_types = __webpack_require__(3827);
|
|
2358
2358
|
var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
|
|
2359
|
-
// EXTERNAL MODULE: ../../ui/src/index.js +
|
|
2360
|
-
var ui_src = __webpack_require__(
|
|
2359
|
+
// EXTERNAL MODULE: ../../ui/src/index.js + 487 modules
|
|
2360
|
+
var ui_src = __webpack_require__(89556);
|
|
2361
2361
|
// EXTERNAL MODULE: ./state/index.js + 1 modules
|
|
2362
2362
|
var state = __webpack_require__(62657);
|
|
2363
2363
|
// EXTERNAL MODULE: ../node_modules/react-router-dom/dist/index.js
|
|
@@ -2475,8 +2475,8 @@ function ViewerHeader({
|
|
|
2475
2475
|
hotkeyDefinitions,
|
|
2476
2476
|
hotkeyDefaults
|
|
2477
2477
|
} = hotkeysManager;
|
|
2478
|
-
const versionNumber = "3.8.0-beta.
|
|
2479
|
-
const commitHash = "
|
|
2478
|
+
const versionNumber = "3.8.0-beta.43";
|
|
2479
|
+
const commitHash = "b1efe40aa146e4052cc47b3f774cabbb47a8d1a6";
|
|
2480
2480
|
const menuOptions = [{
|
|
2481
2481
|
title: t('Header:About'),
|
|
2482
2482
|
icon: 'info',
|
|
@@ -4823,8 +4823,8 @@ function adaptItem(item, subProps) {
|
|
|
4823
4823
|
}
|
|
4824
4824
|
// EXTERNAL MODULE: ../../ui/src/components/ContextMenu/ContextMenu.tsx
|
|
4825
4825
|
var ContextMenu = __webpack_require__(5638);
|
|
4826
|
-
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js +
|
|
4827
|
-
var dist_esm = __webpack_require__(
|
|
4826
|
+
// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
|
|
4827
|
+
var dist_esm = __webpack_require__(81399);
|
|
4828
4828
|
;// CONCATENATED MODULE: ../../../extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx
|
|
4829
4829
|
var _class;
|
|
4830
4830
|
|
|
@@ -12,11 +12,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
12
12
|
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3827);
|
|
13
13
|
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
|
|
14
14
|
/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(71771);
|
|
15
|
-
/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(
|
|
15
|
+
/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(89556);
|
|
16
16
|
/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(69190);
|
|
17
|
-
/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
|
17
|
+
/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(81399);
|
|
18
18
|
/* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41832);
|
|
19
|
-
/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(
|
|
19
|
+
/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(56846);
|
|
20
20
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
21
21
|
|
|
22
22
|
|