{rtIsLoading && (
This Segmentation is loaded in the segmentation panel
- );
+ ToolTipMessage = () => This Segmentation is loaded in the segmentation panel
;
break;
case false:
StatusIcon = () => (
- Click LOAD to load RTSTRUCT.
;
}
const StatusArea = () => (
-
-
+
+
@@ -46,7 +47,10 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {
return (
<>
{ToolTipMessage && (
-
- segmentationService.getSegmentations()
- );
+ const [segmentations, setSegmentations] = useState(() => segmentationService.getSegmentations());
const [isMinimized, setIsMinimized] = useState({});
@@ -78,32 +73,20 @@ export default function PanelSegmentation({
};
const getToolGroupIds = segmentationId => {
- const toolGroupIds = segmentationService.getToolGroupIdsWithSegmentation(
- segmentationId
- );
+ const toolGroupIds = segmentationService.getToolGroupIdsWithSegmentation(segmentationId);
return toolGroupIds;
};
const onSegmentClick = (segmentationId, segmentIndex) => {
- segmentationService.setActiveSegmentForSegmentation(
- segmentationId,
- segmentIndex
- );
+ segmentationService.setActiveSegmentForSegmentation(segmentationId, segmentIndex);
const toolGroupIds = getToolGroupIds(segmentationId);
toolGroupIds.forEach(toolGroupId => {
// const toolGroupId =
- segmentationService.setActiveSegmentationForToolGroup(
- segmentationId,
- toolGroupId
- );
- segmentationService.jumpToSegmentCenter(
- segmentationId,
- segmentIndex,
- toolGroupId
- );
+ segmentationService.setActiveSegmentationForToolGroup(segmentationId, toolGroupId);
+ segmentationService.jumpToSegmentCenter(segmentationId, segmentIndex, toolGroupId);
});
};
@@ -118,11 +101,7 @@ export default function PanelSegmentation({
return;
}
- segmentationService.setSegmentLabelForSegmentation(
- segmentationId,
- segmentIndex,
- label
- );
+ segmentationService.setSegmentLabelForSegmentation(segmentationId, segmentIndex, label);
});
};
@@ -191,7 +170,7 @@ export default function PanelSegmentation({
);
return (
-
+
{/* show segmentation table */}
{segmentations?.length ? (
- _setSegmentationConfiguration(
- selectedSegmentationId,
- 'renderOutline',
- value
- )
+ _setSegmentationConfiguration(selectedSegmentationId, 'renderOutline', value)
}
setOutlineOpacityActive={value =>
- _setSegmentationConfiguration(
- selectedSegmentationId,
- 'outlineOpacity',
- value
- )
+ _setSegmentationConfiguration(selectedSegmentationId, 'outlineOpacity', value)
}
setRenderFill={value =>
- _setSegmentationConfiguration(
- selectedSegmentationId,
- 'renderFill',
- value
- )
+ _setSegmentationConfiguration(selectedSegmentationId, 'renderFill', value)
}
setRenderInactiveSegmentations={value =>
_setSegmentationConfiguration(
@@ -241,25 +208,13 @@ export default function PanelSegmentation({
)
}
setOutlineWidthActive={value =>
- _setSegmentationConfiguration(
- selectedSegmentationId,
- 'outlineWidthActive',
- value
- )
+ _setSegmentationConfiguration(selectedSegmentationId, 'outlineWidthActive', value)
}
setFillAlpha={value =>
- _setSegmentationConfiguration(
- selectedSegmentationId,
- 'fillAlpha',
- value
- )
+ _setSegmentationConfiguration(selectedSegmentationId, 'fillAlpha', value)
}
setFillAlphaInactive={value =>
- _setSegmentationConfiguration(
- selectedSegmentationId,
- 'fillAlphaInactive',
- value
- )
+ _setSegmentationConfiguration(selectedSegmentationId, 'fillAlphaInactive', value)
}
/>
) : null}
diff --git a/extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx b/extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
index 6909d93fc..6de2470d8 100644
--- a/extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
+++ b/extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
@@ -39,7 +39,7 @@ function callInputDialog(uiDialogService, label, callback) {
label="Enter the segment label"
labelClassName="text-white text-[14px] leading-[1.2]"
autoFocus
- className="bg-black border-primary-main"
+ className="border-primary-main bg-black"
type="text"
value={value.label}
onChange={event => {
diff --git a/extensions/cornerstone-dicom-seg/src/utils/_hydrateSEG.ts b/extensions/cornerstone-dicom-seg/src/utils/_hydrateSEG.ts
index f028ce9f3..84d075f97 100644
--- a/extensions/cornerstone-dicom-seg/src/utils/_hydrateSEG.ts
+++ b/extensions/cornerstone-dicom-seg/src/utils/_hydrateSEG.ts
@@ -3,11 +3,8 @@ async function _hydrateSEGDisplaySet({
viewportId: targetViewportId,
servicesManager,
}) {
- const {
- segmentationService,
- hangingProtocolService,
- viewportGridService,
- } = servicesManager.services;
+ const { segmentationService, hangingProtocolService, viewportGridService } =
+ servicesManager.services;
const displaySetInstanceUID = segDisplaySet.referencedDisplaySetInstanceUID;
diff --git a/extensions/cornerstone-dicom-seg/src/utils/dicomlabToRGB.ts b/extensions/cornerstone-dicom-seg/src/utils/dicomlabToRGB.ts
index a8668cf12..34ce1e54f 100644
--- a/extensions/cornerstone-dicom-seg/src/utils/dicomlabToRGB.ts
+++ b/extensions/cornerstone-dicom-seg/src/utils/dicomlabToRGB.ts
@@ -6,9 +6,7 @@ import dcmjs from 'dcmjs';
* @returns The RGB color as an array of three integers between 0 and 255.
*/
function dicomlabToRGB(cielab: number[]): number[] {
- const rgb = dcmjs.data.Colors.dicomlab2RGB(cielab).map(x =>
- Math.round(x * 255)
- );
+ const rgb = dcmjs.data.Colors.dicomlab2RGB(cielab).map(x => Math.round(x * 255));
return rgb;
}
diff --git a/extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts b/extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
index e032542f1..f4fe36ca7 100644
--- a/extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
+++ b/extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
@@ -1,10 +1,5 @@
-function createSEGToolGroupAndAddTools(
- ToolGroupService,
- customizationService,
- toolGroupId
-) {
- const { tools } =
- customizationService.get('cornerstone.overlayViewportTools') ?? {};
+function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
+ const { tools } = customizationService.get('cornerstone.overlayViewportTools') ?? {};
return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools, {});
}
diff --git a/extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts b/extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts
index d6cdf23d7..65f92c743 100644
--- a/extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts
+++ b/extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts
@@ -7,15 +7,10 @@ const RESPONSE = {
HYDRATE_SEG: 5,
};
-function promptHydrateSEG({
- servicesManager,
- segDisplaySet,
- viewportId,
- preHydrateCallbacks,
-}) {
+function promptHydrateSEG({ servicesManager, segDisplaySet, viewportId, preHydrateCallbacks }) {
const { uiViewportDialogService } = servicesManager.services;
- return new Promise(async function(resolve, reject) {
+ return new Promise(async function (resolve, reject) {
const promptResult = await _askHydrate(uiViewportDialogService, viewportId);
if (promptResult === RESPONSE.HYDRATE_SEG) {
@@ -35,7 +30,7 @@ function promptHydrateSEG({
}
function _askHydrate(uiViewportDialogService, viewportId) {
- return new Promise(function(resolve, reject) {
+ return new Promise(function (resolve, reject) {
const message = 'Do you want to open this Segmentation?';
const actions = [
{
diff --git a/extensions/cornerstone-dicom-seg/src/viewports/OHIFCornerstoneSEGViewport.tsx b/extensions/cornerstone-dicom-seg/src/viewports/OHIFCornerstoneSEGViewport.tsx
index 88feed10f..7e4d39778 100644
--- a/extensions/cornerstone-dicom-seg/src/viewports/OHIFCornerstoneSEGViewport.tsx
+++ b/extensions/cornerstone-dicom-seg/src/viewports/OHIFCornerstoneSEGViewport.tsx
@@ -2,11 +2,7 @@ import PropTypes from 'prop-types';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import OHIF, { utils } from '@ohif/core';
-import {
- LoadingIndicatorTotalPercent,
- useViewportGrid,
- ViewportActionBar,
-} from '@ohif/ui';
+import { LoadingIndicatorTotalPercent, useViewportGrid, ViewportActionBar } from '@ohif/ui';
import createSEGToolGroupAndAddTools from '../utils/initSEGToolGroup';
import promptHydrateSEG from '../utils/promptHydrateSEG';
import hydrateSEGDisplaySet from '../utils/_hydrateSEG';
@@ -106,9 +102,7 @@ function OHIFCornerstoneSEGViewport(props) {
'@ohif/extension-cornerstone.viewportModule.cornerstone'
);
- const {
- displaySet: referencedDisplaySet,
- } = referencedDisplaySetRef.current;
+ const { displaySet: referencedDisplaySet } = referencedDisplaySetRef.current;
// Todo: jump to the center of the first segment
return (
@@ -148,11 +142,7 @@ function OHIFCornerstoneSEGViewport(props) {
newSelectedSegmentIndex = numberOfSegments - 1;
}
- segmentationService.jumpToSegmentCenter(
- segmentationId,
- newSelectedSegmentIndex,
- toolGroupId
- );
+ segmentationService.jumpToSegmentCenter(segmentationId, newSelectedSegmentIndex, toolGroupId);
setSelectedSegment(newSelectedSegmentIndex);
},
[selectedSegment]
@@ -179,18 +169,14 @@ function OHIFCornerstoneSEGViewport(props) {
const { unsubscribe } = segmentationService.subscribe(
segmentationService.EVENTS.SEGMENTATION_LOADING_COMPLETE,
evt => {
- if (
- evt.segDisplaySet.displaySetInstanceUID ===
- segDisplaySet.displaySetInstanceUID
- ) {
+ if (evt.segDisplaySet.displaySetInstanceUID === segDisplaySet.displaySetInstanceUID) {
setSegIsLoading(false);
}
if (evt.overlappingSegments) {
uiNotificationService.show({
title: 'Overlapping Segments',
- message:
- 'Overlapping segments detected which is not currently supported',
+ message: 'Overlapping segments detected which is not currently supported',
type: 'warning',
});
}
@@ -226,9 +212,7 @@ function OHIFCornerstoneSEGViewport(props) {
displaySetService.EVENTS.DISPLAY_SETS_REMOVED,
({ displaySetInstanceUIDs }) => {
const activeViewport = viewports.get(activeViewportId);
- if (
- displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)
- ) {
+ if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
viewportGridService.setDisplaySetsForViewport({
viewportId: activeViewportId,
displaySetInstanceUIDs: [],
@@ -251,17 +235,11 @@ function OHIFCornerstoneSEGViewport(props) {
// This creates a custom tool group which has the lifetime of this view
// only, and does NOT interfere with currently displayed segmentations.
- toolGroup = createSEGToolGroupAndAddTools(
- toolGroupService,
- customizationService,
- toolGroupId
- );
+ toolGroup = createSEGToolGroupAndAddTools(toolGroupService, customizationService, toolGroupId);
return () => {
// remove the segmentation representations if seg displayset changed
- segmentationService.removeSegmentationRepresentationFromToolGroup(
- toolGroupId
- );
+ segmentationService.removeSegmentationRepresentationFromToolGroup(toolGroupId);
// Only destroy the viewport specific implementation
toolGroupService.destroyToolGroup(toolGroupId);
@@ -273,9 +251,7 @@ function OHIFCornerstoneSEGViewport(props) {
return () => {
// remove the segmentation representations if seg displayset changed
- segmentationService.removeSegmentationRepresentationFromToolGroup(
- toolGroupId
- );
+ segmentationService.removeSegmentationRepresentationFromToolGroup(toolGroupId);
referencedDisplaySetRef.current = null;
};
}, [segDisplaySet]);
@@ -351,29 +327,23 @@ function OHIFCornerstoneSEGViewport(props) {
studyDate: formatDate(StudyDate),
seriesDescription: `SEG Viewport ${SeriesDescription}`,
patientInformation: {
- patientName: PatientName
- ? OHIF.utils.formatPN(PatientName.Alphabetic)
- : '',
+ patientName: PatientName ? OHIF.utils.formatPN(PatientName.Alphabetic) : '',
patientSex: PatientSex || '',
patientAge: PatientAge || '',
MRN: PatientID || '',
- thickness: SliceThickness
- ? utils.roundNumber(SliceThickness, 2)
- : '',
+ thickness: SliceThickness ? utils.roundNumber(SliceThickness, 2) : '',
thicknessUnits: SliceThickness !== undefined ? 'mm' : '',
spacing:
- SpacingBetweenSlices !== undefined
- ? utils.roundNumber(SpacingBetweenSlices, 2)
- : '',
+ SpacingBetweenSlices !== undefined ? utils.roundNumber(SpacingBetweenSlices, 2) : '',
scanner: ManufacturerModelName || '',
},
}}
/>
-
+
{segIsLoading && (
This Segmentation is loaded in the segmentation panel
- );
+ ToolTipMessage = () => This Segmentation is loaded in the segmentation panel
;
break;
case false:
StatusIcon = () => (
- Click LOAD to load segmentation.
;
}
const StatusArea = () => (
-
-
+
+
@@ -46,7 +47,10 @@ export default function _getStatusComponent({ isHydrated, onStatusClick }) {
return (
<>
{ToolTipMessage && (
-
+
{getCornerstoneViewport()}
{childrenWithProps}
@@ -435,9 +403,7 @@ async function _getViewportReferencedDisplaySetData(
const { displaySetInstanceUID } = measurement;
- const referencedDisplaySet = displaySetService.getDisplaySetByUID(
- displaySetInstanceUID
- );
+ const referencedDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
const image0 = referencedDisplaySet.images[0];
const referencedDisplaySetMetadata = {
@@ -477,8 +443,7 @@ function _getStatusComponent({
// 1 - Incompatible
// 2 - Locked
// 3 - Rehydratable / Open
- const state =
- isRehydratable && !isLocked ? 3 : isRehydratable && isLocked ? 2 : 1;
+ const state = isRehydratable && !isLocked ? 3 : isRehydratable && isLocked ? 2 : 1;
let ToolTipMessage = null;
let StatusIcon = null;
@@ -509,23 +474,24 @@ function _getStatusComponent({
break;
case 3:
StatusIcon = () => (
- {`Click ${loadStr} to restore measurements.`}
- );
+ ToolTipMessage = () => {`Click ${loadStr} to restore measurements.`}
;
}
const StatusArea = () => (
-
-
+
+
onImageScrollbarChange(evt, viewportId)}
- max={
- imageSliceData.numberOfSlices ? imageSliceData.numberOfSlices - 1 : 0
- }
+ max={imageSliceData.numberOfSlices ? imageSliceData.numberOfSlices - 1 : 0}
height={scrollbarHeight}
value={imageSliceData.imageIndex}
/>
diff --git a/extensions/cornerstone/src/Viewport/Overlays/ViewportImageSliceLoadingIndicator.tsx b/extensions/cornerstone/src/Viewport/Overlays/ViewportImageSliceLoadingIndicator.tsx
index fc483b5f4..70e03e534 100644
--- a/extensions/cornerstone/src/Viewport/Overlays/ViewportImageSliceLoadingIndicator.tsx
+++ b/extensions/cornerstone/src/Viewport/Overlays/ViewportImageSliceLoadingIndicator.tsx
@@ -33,26 +33,14 @@ function ViewportImageSliceLoadingIndicator({ viewportData, element }) {
};
useEffect(() => {
- element.addEventListener(
- Enums.Events.STACK_VIEWPORT_SCROLL,
- setLoadingState
- );
+ element.addEventListener(Enums.Events.STACK_VIEWPORT_SCROLL, setLoadingState);
element.addEventListener(Enums.Events.IMAGE_LOAD_ERROR, setErrorState);
- element.addEventListener(
- Enums.Events.STACK_NEW_IMAGE,
- setFinishLoadingState
- );
+ element.addEventListener(Enums.Events.STACK_NEW_IMAGE, setFinishLoadingState);
return () => {
- element.removeEventListener(
- Enums.Events.STACK_VIEWPORT_SCROLL,
- setLoadingState
- );
+ element.removeEventListener(Enums.Events.STACK_VIEWPORT_SCROLL, setLoadingState);
- element.removeEventListener(
- Enums.Events.STACK_NEW_IMAGE,
- setFinishLoadingState
- );
+ element.removeEventListener(Enums.Events.STACK_NEW_IMAGE, setFinishLoadingState);
element.removeEventListener(Enums.Events.IMAGE_LOAD_ERROR, setErrorState);
};
@@ -61,8 +49,8 @@ function ViewportImageSliceLoadingIndicator({ viewportData, element }) {
if (error) {
return (
<>
-
@@ -538,7 +504,10 @@ function _getStatusComponent({
return (
<>
{ToolTipMessage && (
-
);
}
@@ -116,11 +107,8 @@ function CustomizableViewportOverlay({
viewportId,
servicesManager,
}) {
- const {
- toolbarService,
- cornerstoneViewportService,
- customizationService,
- } = servicesManager.services;
+ const { toolbarService, cornerstoneViewportService, customizationService } =
+ servicesManager.services;
const [voi, setVOI] = useState({ windowCenter: null, windowWidth: null });
const [scale, setScale] = useState(1);
const [activeTools, setActiveTools] = useState([]);
@@ -149,12 +137,7 @@ function CustomizableViewportOverlay({
const instanceNumber = useMemo(() => {
if (viewportData != null) {
- return _getInstanceNumber(
- viewportData,
- viewportId,
- imageIndex,
- cornerstoneViewportService
- );
+ return _getInstanceNumber(viewportData, viewportId, imageIndex, cornerstoneViewportService);
}
return null;
}, [viewportData, viewportId, imageIndex, cornerstoneViewportService]);
@@ -178,10 +161,7 @@ function CustomizableViewportOverlay({
}
const { lower, upper } = range;
- const { windowWidth, windowCenter } = utilities.windowLevel.toWindowLevel(
- lower,
- upper
- );
+ const { windowWidth, windowCenter } = utilities.windowLevel.toWindowLevel(lower, upper);
setVOI({ windowCenter, windowWidth });
};
@@ -204,9 +184,7 @@ function CustomizableViewportOverlay({
previousCamera.parallelScale !== camera.parallelScale ||
previousCamera.scale !== camera.scale
) {
- const viewport = cornerstoneViewportService.getCornerstoneViewport(
- viewportId
- );
+ const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
if (!viewport) {
return;
@@ -225,8 +203,7 @@ function CustomizableViewportOverlay({
const { spacing } = imageData;
// convert parallel scale to scale
- const scale =
- (element.clientHeight * spacing[0] * 0.5) / camera.parallelScale;
+ const scale = (element.clientHeight * spacing[0] * 0.5) / camera.parallelScale;
setScale(scale);
}
};
@@ -342,9 +319,7 @@ function CustomizableViewportOverlay({
return (
<>
{items.map((item, i) => (
-
- {_renderOverlayItem(item)}
-
+ {_renderOverlayItem(item)}
))}
);
@@ -355,9 +330,7 @@ function CustomizableViewportOverlay({
return (
<>
{items.map((item, i) => (
-
- {_renderOverlayItem(item)}
-
+ {_renderOverlayItem(item)}
))}
);
@@ -387,12 +360,7 @@ function _getViewportInstance(viewportData, imageIndex) {
return imageId ? metaData.get('instance', imageId) || {} : {};
}
-function _getInstanceNumber(
- viewportData,
- viewportId,
- imageIndex,
- cornerstoneViewportService
-) {
+function _getInstanceNumber(viewportData, viewportId, imageIndex, cornerstoneViewportService) {
let instanceNumber;
if (viewportData.viewportType === Enums.ViewportType.STACK) {
@@ -435,11 +403,7 @@ function _getInstanceNumberFromStack(viewportData, imageIndex) {
// Since volume viewports can be in any view direction, they can render
// a reconstructed image which don't have imageIds; therefore, no instance and instanceNumber
// Here we check if viewport is in the acquisition direction and if so, we get the instanceNumber
-function _getInstanceNumberFromVolume(
- viewportData,
- viewportId,
- cornerstoneViewportService
-) {
+function _getInstanceNumberFromVolume(viewportData, viewportId, cornerstoneViewportService) {
const volumes = viewportData.volumes;
// Todo: support fusion of acquisition plane which has instanceNumber
@@ -450,9 +414,7 @@ function _getInstanceNumberFromVolume(
const volume = volumes[0];
const { direction, imageIds } = volume;
- const cornerstoneViewport = cornerstoneViewportService.getCornerstoneViewport(
- viewportId
- );
+ const cornerstoneViewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
if (!cornerstoneViewport) {
return;
@@ -475,8 +437,7 @@ function _getInstanceNumberFromVolume(
return {};
}
- const { instanceNumber } =
- metaData.get('generalImageModule', imageId) || {};
+ const { instanceNumber } = metaData.get('generalImageModule', imageId) || {};
return parseInt(instanceNumber);
}
}
diff --git a/extensions/cornerstone/src/Viewport/Overlays/ViewportImageScrollbar.tsx b/extensions/cornerstone/src/Viewport/Overlays/ViewportImageScrollbar.tsx
index 26fe32e01..2f7b71a45 100644
--- a/extensions/cornerstone/src/Viewport/Overlays/ViewportImageScrollbar.tsx
+++ b/extensions/cornerstone/src/Viewport/Overlays/ViewportImageScrollbar.tsx
@@ -14,15 +14,10 @@ function CornerstoneImageScrollbar({
scrollbarHeight,
servicesManager,
}) {
- const {
- cineService,
- cornerstoneViewportService,
- } = (servicesManager as ServicesManger).services;
+ const { cineService, cornerstoneViewportService } = (servicesManager as ServicesManger).services;
const onImageScrollbarChange = (imageIndex, viewportId) => {
- const viewport = cornerstoneViewportService.getCornerstoneViewport(
- viewportId
- );
+ const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
const { isCineEnabled } = cineService.getState();
@@ -43,9 +38,7 @@ function CornerstoneImageScrollbar({
return;
}
- const viewport = cornerstoneViewportService.getCornerstoneViewport(
- viewportId
- );
+ const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
if (!viewport) {
return;
@@ -90,16 +83,10 @@ function CornerstoneImageScrollbar({
});
};
- element.addEventListener(
- Enums.Events.STACK_VIEWPORT_SCROLL,
- updateStackIndex
- );
+ element.addEventListener(Enums.Events.STACK_VIEWPORT_SCROLL, updateStackIndex);
return () => {
- element.removeEventListener(
- Enums.Events.STACK_VIEWPORT_SCROLL,
- updateStackIndex
- );
+ element.removeEventListener(Enums.Events.STACK_VIEWPORT_SCROLL, updateStackIndex);
};
}, [viewportData, element]);
@@ -117,19 +104,14 @@ function CornerstoneImageScrollbar({
element.addEventListener(Enums.Events.VOLUME_NEW_IMAGE, updateVolumeIndex);
return () => {
- element.removeEventListener(
- Enums.Events.VOLUME_NEW_IMAGE,
- updateVolumeIndex
- );
+ element.removeEventListener(Enums.Events.VOLUME_NEW_IMAGE, updateVolumeIndex);
};
}, [viewportData, element]);
return (
-
+
+
Error Loading Image
An error has occurred.
@@ -78,8 +66,8 @@ function ViewportImageSliceLoadingIndicator({ viewportData, element }) { return ( // IMPORTANT: we need to use the pointer-events-none class to prevent the loading indicator from // interacting with the mouse, since scrolling should propagate to the viewport underneath -
-
+
+
diff --git a/extensions/cornerstone/src/Viewport/Overlays/ViewportOrientationMarkers.tsx b/extensions/cornerstone/src/Viewport/Overlays/ViewportOrientationMarkers.tsx
index d0ba9550a..2f33456a4 100644
--- a/extensions/cornerstone/src/Viewport/Overlays/ViewportOrientationMarkers.tsx
+++ b/extensions/cornerstone/src/Viewport/Overlays/ViewportOrientationMarkers.tsx
@@ -13,10 +13,7 @@ import { vec3 } from 'gl-matrix';
import './ViewportOrientationMarkers.css';
-const {
- getOrientationStringLPS,
- invertOrientationStringLPS,
-} = utilities.orientation;
+const { getOrientationStringLPS, invertOrientationStringLPS } = utilities.orientation;
function ViewportOrientationMarkers({
element,
@@ -33,9 +30,7 @@ function ViewportOrientationMarkers({
const { cornerstoneViewportService } = servicesManager.services;
useEffect(() => {
- const cameraModifiedListener = (
- evt: Types.EventTypes.CameraModifiedEvent
- ) => {
+ const cameraModifiedListener = (evt: Types.EventTypes.CameraModifiedEvent) => {
const { rotation, previousCamera, camera } = evt.detail;
if (rotation !== undefined) {
@@ -57,16 +52,10 @@ function ViewportOrientationMarkers({
}
};
- element.addEventListener(
- Enums.Events.CAMERA_MODIFIED,
- cameraModifiedListener
- );
+ element.addEventListener(Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
return () => {
- element.removeEventListener(
- Enums.Events.CAMERA_MODIFIED,
- cameraModifiedListener
- );
+ element.removeEventListener(Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
};
}, []);
@@ -85,8 +74,7 @@ function ViewportOrientationMarkers({
return false;
}
- ({ rowCosines, columnCosines } =
- metaData.get('imagePlaneModule', imageId) || {});
+ ({ rowCosines, columnCosines } = metaData.get('imagePlaneModule', imageId) || {});
} else {
if (!element || !getEnabledElement(element)) {
return '';
@@ -124,9 +112,7 @@ function ViewportOrientationMarkers({
// Todo: probably this can be done in a better way in which we identify bright
// background
- const isLight = backgroundColor
- ? csUtils.isEqual(backgroundColor, [1, 1, 1])
- : false;
+ const isLight = backgroundColor ? csUtils.isEqual(backgroundColor, [1, 1, 1]) : false;
return orientationMarkers.map((m, index) => (
Loading...
{
- const viewportInfo = cornerstoneViewportService.getViewportInfo(
- viewportId
- );
+ const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
if (!viewportInfo) {
console.warn('No viewport found for viewportId:', viewportId);
return;
@@ -249,9 +230,7 @@ function commandsModule({
const { isCineEnabled } = cineService.getState();
cineService.setIsCineEnabled(!isCineEnabled);
toolbarService.setButton('Cine', { props: { isActive: !isCineEnabled } });
- viewports.forEach((_, index) =>
- cineService.setCine({ id: index, isPlaying: false })
- );
+ viewports.forEach((_, index) => cineService.setCine({ id: index, isPlaying: false }));
},
setWindowLevel({ window, level, toolGroupId }) {
// convert to numbers
@@ -259,9 +238,7 @@ function commandsModule({
const windowCenterNum = Number(level);
const { viewportId } = _getActiveViewportEnabledElement();
- const viewportToolGroupId = toolGroupService.getToolGroupForViewport(
- viewportId
- );
+ const viewportToolGroupId = toolGroupService.getToolGroupForViewport(viewportId);
if (toolGroupId && toolGroupId !== viewportToolGroupId) {
return;
@@ -271,10 +248,7 @@ function commandsModule({
const renderingEngine = cornerstoneViewportService.getRenderingEngine();
const viewport = renderingEngine.getViewport(viewportId);
- const { lower, upper } = csUtils.windowLevel.toLowHighRange(
- windowWidthNum,
- windowCenterNum
- );
+ const { lower, upper } = csUtils.windowLevel.toLowHighRange(windowWidthNum, windowCenterNum);
viewport.setProperties({
voiRange: {
@@ -323,11 +297,9 @@ function commandsModule({
return;
}
- const filteredViewports = Array.from(viewports.values()).filter(
- viewport => {
- return toolGroupViewportIds.includes(viewport.viewportId);
- }
- );
+ const filteredViewports = Array.from(viewports.values()).filter(viewport => {
+ return toolGroupViewportIds.includes(viewport.viewportId);
+ });
if (!filteredViewports.length) {
return;
@@ -367,9 +339,7 @@ function commandsModule({
showDownloadViewportModal: () => {
const { activeViewportId } = viewportGridService.getState();
- if (
- !cornerstoneViewportService.getCornerstoneViewport(activeViewportId)
- ) {
+ if (!cornerstoneViewportService.getCornerstoneViewport(activeViewportId)) {
// Cannot download a non-cornerstone viewport (image).
uiNotificationService.show({
title: 'Download Image',
@@ -508,9 +478,7 @@ function commandsModule({
}
viewport = enabledElement.viewport;
} else {
- viewport = cornerstoneViewportService.getCornerstoneViewport(
- gridViewport.id
- );
+ viewport = cornerstoneViewportService.getCornerstoneViewport(gridViewport.id);
}
// Get number of slices
@@ -520,14 +488,12 @@ function commandsModule({
if (viewport instanceof StackViewport) {
numberOfSlices = viewport.getImageIds().length;
} else if (viewport instanceof VolumeViewport) {
- numberOfSlices = csUtils.getImageSliceDataForVolumeViewport(viewport)
- .numberOfSlices;
+ numberOfSlices = csUtils.getImageSliceDataForVolumeViewport(viewport).numberOfSlices;
} else {
throw new Error('Unsupported viewport type');
}
- const jumpIndex =
- imageIndex < 0 ? numberOfSlices + imageIndex : imageIndex;
+ const jumpIndex = imageIndex < 0 ? numberOfSlices + imageIndex : imageIndex;
if (jumpIndex >= numberOfSlices || jumpIndex < 0) {
throw new Error(`Can't jump to ${imageIndex}`);
}
@@ -548,15 +514,8 @@ function commandsModule({
cstUtils.scroll(viewport, options);
},
- setViewportColormap: ({
- viewportId,
- displaySetInstanceUID,
- colormap,
- immediate = false,
- }) => {
- const viewport = cornerstoneViewportService.getCornerstoneViewport(
- viewportId
- );
+ setViewportColormap: ({ viewportId, displaySetInstanceUID, colormap, immediate = false }) => {
+ const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
const actorEntries = viewport.getActors();
@@ -578,9 +537,7 @@ function commandsModule({
const currentIndex = viewportIds.indexOf(activeViewportId);
const nextViewportIndex =
(currentIndex + direction + viewportIds.length) % viewportIds.length;
- viewportGridService.setActiveViewportId(
- viewportIds[nextViewportIndex] as string
- );
+ viewportGridService.setActiveViewportId(viewportIds[nextViewportIndex] as string);
},
toggleStackImageSync: ({ toggledState }) => {
@@ -592,9 +549,7 @@ function commandsModule({
},
toggleReferenceLines: ({ toggledState }) => {
const { activeViewportId } = viewportGridService.getState();
- const viewportInfo = cornerstoneViewportService.getViewportInfo(
- activeViewportId
- );
+ const viewportInfo = cornerstoneViewportService.getViewportInfo(activeViewportId);
const viewportId = viewportInfo.getViewportId();
const toolGroup = toolGroupService.getToolGroupForViewport(viewportId);
diff --git a/extensions/cornerstone/src/components/CinePlayer/CinePlayer.tsx b/extensions/cornerstone/src/components/CinePlayer/CinePlayer.tsx
index d39f3bab0..e4e080422 100644
--- a/extensions/cornerstone/src/components/CinePlayer/CinePlayer.tsx
+++ b/extensions/cornerstone/src/components/CinePlayer/CinePlayer.tsx
@@ -46,17 +46,11 @@ function WrappedCinePlayer({ enabledVPElement, viewportId, servicesManager }) {
};
useEffect(() => {
- eventTarget.addEventListener(
- Enums.Events.STACK_VIEWPORT_NEW_STACK,
- cineHandler
- );
+ eventTarget.addEventListener(Enums.Events.STACK_VIEWPORT_NEW_STACK, cineHandler);
return () => {
cineService.setCine({ id: viewportId, isPlaying: false });
- eventTarget.removeEventListener(
- Enums.Events.STACK_VIEWPORT_NEW_STACK,
- cineHandler
- );
+ eventTarget.removeEventListener(Enums.Events.STACK_VIEWPORT_NEW_STACK, cineHandler);
};
}, [enabledVPElement]);
@@ -80,7 +74,7 @@ function WrappedCinePlayer({ enabledVPElement, viewportId, servicesManager }) {
return (
isCineEnabled && (
diff --git a/extensions/cornerstone/src/components/DicomUpload/DicomUpload.css b/extensions/cornerstone/src/components/DicomUpload/DicomUpload.css
index 55ddf7922..d37d2a6a6 100644
--- a/extensions/cornerstone/src/components/DicomUpload/DicomUpload.css
+++ b/extensions/cornerstone/src/components/DicomUpload/DicomUpload.css
@@ -1,6 +1,23 @@
.dicom-upload-drop-area-border-dash {
- background-image: repeating-linear-gradient(to right, #7BB2CE 0%, #7BB2CE 50%, transparent 50%, transparent 100%), repeating-linear-gradient(to right, #7BB2CE 0%, #7BB2CE 50%, transparent 50%, transparent 100%), repeating-linear-gradient(to bottom, #7BB2CE 0%, #7BB2CE 50%, transparent 50%, transparent 100%), repeating-linear-gradient(to bottom, #7BB2CE 0%, #7BB2CE 50%, transparent 50%, transparent 100%);
- background-position: left top, left bottom, left top, right top;
+ background-image: repeating-linear-gradient(
+ to right,
+ #7bb2ce 0%,
+ #7bb2ce 50%,
+ transparent 50%,
+ transparent 100%
+ ),
+ repeating-linear-gradient(to right, #7bb2ce 0%, #7bb2ce 50%, transparent 50%, transparent 100%),
+ repeating-linear-gradient(to bottom, #7bb2ce 0%, #7bb2ce 50%, transparent 50%, transparent 100%),
+ repeating-linear-gradient(to bottom, #7bb2ce 0%, #7bb2ce 50%, transparent 50%, transparent 100%);
+ background-position:
+ left top,
+ left bottom,
+ left top,
+ right top;
background-repeat: repeat-x, repeat-x, repeat-y, repeat-y;
- background-size: 20px 3px, 20px 3px, 3px 20px, 3px 20px;
+ background-size:
+ 20px 3px,
+ 20px 3px,
+ 3px 20px,
+ 3px 20px;
}
diff --git a/extensions/cornerstone/src/components/DicomUpload/DicomUpload.tsx b/extensions/cornerstone/src/components/DicomUpload/DicomUpload.tsx
index e90728cb3..8284ee070 100644
--- a/extensions/cornerstone/src/components/DicomUpload/DicomUpload.tsx
+++ b/extensions/cornerstone/src/components/DicomUpload/DicomUpload.tsx
@@ -14,19 +14,13 @@ type DicomUploadProps = {
onStarted: () => void;
};
-function DicomUpload({
- dataSource,
- onComplete,
- onStarted,
-}: DicomUploadProps): ReactElement {
+function DicomUpload({ dataSource, onComplete, onStarted }: DicomUploadProps): ReactElement {
const baseClassNames = 'min-h-[480px] flex flex-col bg-black select-none';
const [dicomFileUploaderArr, setDicomFileUploaderArr] = useState([]);
const onDrop = useCallback(async acceptedFiles => {
onStarted();
- setDicomFileUploaderArr(
- acceptedFiles.map(file => new DicomFileUploader(file, dataSource))
- );
+ setDicomFileUploaderArr(acceptedFiles.map(file => new DicomFileUploader(file, dataSource)));
}, []);
const getDropZoneComponent = (): ReactElement => {
@@ -40,20 +34,29 @@ function DicomUpload({
{({ getRootProps }) => (
) : (
- (0);
@@ -83,15 +73,13 @@ function DicomUploadProgress({
let intervalStartTime = Date.now();
const setUploadRateRef = () => {
- const uploadSizeFromStartOfInterval =
- currentUploadSizeRef.current - intervalStartUploadSize;
+ const uploadSizeFromStartOfInterval = currentUploadSizeRef.current - intervalStartUploadSize;
const now = Date.now();
const timeSinceStartOfInterval = now - intervalStartTime;
// Calculate and set the upload rate (ref)
- uploadRateRef.current =
- uploadSizeFromStartOfInterval / timeSinceStartOfInterval;
+ uploadRateRef.current = uploadSizeFromStartOfInterval / timeSinceStartOfInterval;
// Reset the interval starting values.
intervalStartUploadSize = currentUploadSizeRef.current;
@@ -134,28 +122,19 @@ function DicomUploadProgress({
const updateProgress = (percentComplete: number) => {
const previousFileUploadSize = currentFileUploadSize;
- currentFileUploadSize = Math.round(
- (percentComplete / 100) * fileUploader.getFileSize()
- );
+ currentFileUploadSize = Math.round((percentComplete / 100) * fileUploader.getFileSize());
currentUploadSizeRef.current = Math.min(
totalUploadSize,
- currentUploadSizeRef.current -
- previousFileUploadSize +
- currentFileUploadSize
+ currentUploadSizeRef.current - previousFileUploadSize + currentFileUploadSize
);
- setPercentComplete(
- (currentUploadSizeRef.current / totalUploadSize) * 100
- );
+ setPercentComplete((currentUploadSizeRef.current / totalUploadSize) * 100);
if (uploadRateRef.current !== 0) {
- const uploadSizeRemaining =
- totalUploadSize - currentUploadSizeRef.current;
+ const uploadSizeRemaining = totalUploadSize - currentUploadSizeRef.current;
- const timeRemaining = Math.round(
- uploadSizeRemaining / uploadRateRef.current
- );
+ const timeRemaining = Math.round(uploadSizeRemaining / uploadRateRef.current);
if (currentTimeRemaining === null) {
currentTimeRemaining = timeRemaining;
@@ -168,9 +147,7 @@ function DicomUploadProgress({
// due to rounding, inaccuracies in the estimate and slight variations
// in upload rates over time.
if (timeRemaining < ONE_MINUTE) {
- const currentSecondsRemaining = Math.ceil(
- currentTimeRemaining / ONE_SECOND
- );
+ const currentSecondsRemaining = Math.ceil(currentTimeRemaining / ONE_SECOND);
const secondsRemaining = Math.ceil(timeRemaining / ONE_SECOND);
const delta = secondsRemaining - currentSecondsRemaining;
if (delta < 0 || delta > 2) {
@@ -181,9 +158,7 @@ function DicomUploadProgress({
}
if (timeRemaining < ONE_HOUR) {
- const currentMinutesRemaining = Math.ceil(
- currentTimeRemaining / ONE_MINUTE
- );
+ const currentMinutesRemaining = Math.ceil(currentTimeRemaining / ONE_MINUTE);
const minutesRemaining = Math.ceil(timeRemaining / ONE_MINUTE);
const delta = minutesRemaining - currentMinutesRemaining;
if (delta < 0 || delta > 2) {
@@ -199,9 +174,7 @@ function DicomUploadProgress({
}
};
- const progressCallback = (
- progressEvent: DicomFileUploaderProgressEvent
- ) => {
+ const progressCallback = (progressEvent: DicomFileUploaderProgressEvent) => {
updateProgress(progressEvent.percentComplete);
};
@@ -249,16 +222,12 @@ function DicomUploadProgress({
if (timeRemaining < ONE_MINUTE) {
const secondsRemaining = Math.ceil(timeRemaining / ONE_SECOND);
- return `${secondsRemaining} ${
- secondsRemaining === 1 ? 'second' : 'seconds'
- }`;
+ return `${secondsRemaining} ${secondsRemaining === 1 ? 'second' : 'seconds'}`;
}
if (timeRemaining < ONE_HOUR) {
const minutesRemaining = Math.ceil(timeRemaining / ONE_MINUTE);
- return `${minutesRemaining} ${
- minutesRemaining === 1 ? 'minute' : 'minutes'
- }`;
+ return `${minutesRemaining} ${minutesRemaining === 1 ? 'minute' : 'minutes'}`;
}
const hoursRemaining = Math.ceil(timeRemaining / ONE_HOUR);
@@ -278,9 +247,7 @@ function DicomUploadProgress({
const showInfiniteProgressBar = useCallback((): boolean => {
return (
getPercentCompleteRounded() < 1 &&
- (progressBarContainerRef?.current?.offsetWidth ?? 0) *
- (percentComplete / 100) <
- 1
+ (progressBarContainerRef?.current?.offsetWidth ?? 0) * (percentComplete / 100) < 1
);
}, [getPercentCompleteRounded, percentComplete]);
@@ -300,15 +267,17 @@ function DicomUploadProgress({
const getNumCompletedAndTimeRemainingComponent = (): ReactElement => {
return (
-
-
+
{({ getRootProps, getInputProps }) => (
-
+
{({ getRootProps, getInputProps }) => (
)}
@@ -92,9 +93,7 @@ function DicomUpload({
/>
-
)}
or drag images or folders here
-
- (DICOM files supported)
-
+ (DICOM files supported)
- {getDropZoneComponent()}
-
+ {getDropZoneComponent()}
)}
);
diff --git a/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgress.tsx b/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgress.tsx
index 6fd14823a..c09d96988 100644
--- a/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgress.tsx
+++ b/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgress.tsx
@@ -1,10 +1,4 @@
-import React, {
- useCallback,
- useEffect,
- useRef,
- useState,
- ReactElement,
-} from 'react';
+import React, { useCallback, useEffect, useRef, useState, ReactElement } from 'react';
import PropTypes from 'prop-types';
import { Button, Icon, ProgressLoadingBar } from '@ohif/ui';
import DicomFileUploader, {
@@ -39,18 +33,14 @@ const BASE_INTERVAL_TIME = 15000;
// calculate the upload rate.
const UPLOAD_RATE_THRESHOLD = 75;
-const NO_WRAP_ELLIPSIS_CLASS_NAMES =
- 'text-ellipsis whitespace-nowrap overflow-hidden';
+const NO_WRAP_ELLIPSIS_CLASS_NAMES = 'text-ellipsis whitespace-nowrap overflow-hidden';
function DicomUploadProgress({
dicomFileUploaderArr,
onComplete,
}: DicomUploadProgressProps): ReactElement {
const [totalUploadSize] = useState(
- dicomFileUploaderArr.reduce(
- (acc, fileUploader) => acc + fileUploader.getFileSize(),
- 0
- )
+ dicomFileUploaderArr.reduce((acc, fileUploader) => acc + fileUploader.getFileSize(), 0)
);
const currentUploadSizeRef = useRef
+
{numFilesCompleted === dicomFileUploaderArr.length ? (
<>
- {`${
- dicomFileUploaderArr.length
- } ${
+ {`${dicomFileUploaderArr.length} ${
dicomFileUploaderArr.length > 1 ? 'files' : 'file'
} completed.`}
-
+ {' files completed.'}
- {' files completed.'}
-
-
- {timeRemaining
- ? `Less than ${getFormattedTimeRemaining()} remaining. `
- : ''}
+ {timeRemaining ? `Less than ${getFormattedTimeRemaining()} remaining. ` : ''}
@@ -345,14 +310,13 @@ function DicomUploadProgress({
const getShowFailedOnlyIconComponent = (): ReactElement => {
return (
-
+
{numFails > 0 && (
-
- setShowFailedOnly(currentShowFailedOnly => !currentShowFailedOnly)
- }
- >
-
@@ -361,31 +325,28 @@ function DicomUploadProgress({
const getPercentCompleteComponent = (): ReactElement => {
return (
- setShowFailedOnly(currentShowFailedOnly => !currentShowFailedOnly)}>
+
)}
-
+
+
{numFilesCompleted === dicomFileUploaderArr.length ? (
<>
-
+
{numFails > 0
- ? `Completed with ${numFails} ${
- numFails > 1 ? 'errors' : 'error'
- }!`
+ ? `Completed with ${numFails} ${numFails > 1 ? 'errors' : 'error'}!`
: 'Completed!'}
{getShowFailedOnlyIconComponent()}
) : (
<>
-
+
+
@@ -397,16 +358,15 @@ function DicomUploadProgress({
};
return (
-
{`${getPercentCompleteRounded()}%`}
{getShowFailedOnlyIconComponent()}
+
{getNumCompletedAndTimeRemainingComponent()}
-
+
{getPercentCompleteComponent()}
-
+
{dicomFileUploaderArr
.filter(
dicomFileUploader =>
- !showFailedOnly ||
- dicomFileUploader.getStatus() === UploadStatus.Failed
+ !showFailedOnly || dicomFileUploader.getStatus() === UploadStatus.Failed
)
.map(dicomFileUploader => (
{
- const [percentComplete, setPercentComplete] = useState(
- dicomFileUploader.getPercentComplete()
- );
+ const [percentComplete, setPercentComplete] = useState(dicomFileUploader.getPercentComplete());
const [failedReason, setFailedReason] = useState('');
const [status, setStatus] = useState(dicomFileUploader.getStatus());
@@ -62,7 +54,10 @@ const DicomUploadProgressItem = memo(
switch (dicomFileUploader.getStatus()) {
case UploadStatus.Success:
return (
-
-
+
+
-
-
- {getStatusIcon()}
-
-
+
{failedReason && {getStatusIcon()}
+
{dicomFileUploader.getFileName()}
{failedReason}
}
+
{!isComplete() && (
<>
{dicomFileUploader.getStatus() === UploadStatus.InProgress && (
{percentComplete}%
)}
-
+
{
+ preRegistration: function (props: Types.Extensions.ExtensionParams): Promise {
const { servicesManager } = props;
servicesManager.registerService(CornerstoneViewportService.REGISTRATION);
servicesManager.registerService(ToolGroupService.REGISTRATION);
@@ -139,5 +135,10 @@ const cornerstoneExtension: Types.Extensions.Extension = {
};
export type { PublicViewportOptions };
-export { measurementMappingUtils, CornerstoneExtensionTypes, toolNames , getActiveViewportEnabledElement};
+export {
+ measurementMappingUtils,
+ CornerstoneExtensionTypes,
+ toolNames,
+ getActiveViewportEnabledElement,
+};
export default cornerstoneExtension;
diff --git a/extensions/cornerstone/src/init.tsx b/extensions/cornerstone/src/init.tsx
index 3938189b2..6be18b363 100644
--- a/extensions/cornerstone/src/init.tsx
+++ b/extensions/cornerstone/src/init.tsx
@@ -49,8 +49,7 @@ export default async function init({
...cornerstone.getConfiguration(),
rendering: {
...cornerstone.getConfiguration().rendering,
- strictZSpacingForVolumeViewport:
- appConfig.strictZSpacingForVolumeViewport,
+ strictZSpacingForVolumeViewport: appConfig.strictZSpacingForVolumeViewport,
},
});
@@ -62,10 +61,7 @@ export default async function init({
initCornerstoneTools();
- Settings.getRuntimeSettings().set(
- 'useCursors',
- Boolean(appConfig.useCursors)
- );
+ Settings.getRuntimeSettings().set('useCursors', Boolean(appConfig.useCursors));
const {
userAuthenticationService,
@@ -84,22 +80,15 @@ export default async function init({
window.extensionManager = extensionManager;
window.commandsManager = commandsManager;
- if (
- appConfig.showWarningMessageForCrossOrigin &&
- !window.crossOriginIsolated
- ) {
+ if (appConfig.showWarningMessageForCrossOrigin && !window.crossOriginIsolated) {
uiNotificationService.show({
title: 'Cross Origin Isolation',
- message:
- 'Cross Origin Isolation is not enabled, volume rendering will not work (e.g., MPR)',
+ message: 'Cross Origin Isolation is not enabled, volume rendering will not work (e.g., MPR)',
type: 'warning',
});
}
- if (
- appConfig.showCPUFallbackMessage &&
- cornerstone.getShouldUseCPURendering()
- ) {
+ if (appConfig.showCPUFallbackMessage && cornerstone.getShouldUseCPURendering()) {
_showCPURenderingModal(uiModalService, hangingProtocolService);
}
@@ -119,18 +108,14 @@ export default async function init({
clearOnModeExit: true,
});
- const labelmapRepresentation =
- cornerstoneTools.Enums.SegmentationRepresentations.Labelmap;
+ const labelmapRepresentation = cornerstoneTools.Enums.SegmentationRepresentations.Labelmap;
- cornerstoneTools.segmentation.config.setGlobalRepresentationConfig(
- labelmapRepresentation,
- {
- fillAlpha: 0.3,
- fillAlphaInactive: 0.2,
- outlineOpacity: 1,
- outlineOpacityInactive: 0.65,
- }
- );
+ cornerstoneTools.segmentation.config.setGlobalRepresentationConfig(labelmapRepresentation, {
+ fillAlpha: 0.3,
+ fillAlphaInactive: 0.2,
+ outlineOpacity: 1,
+ outlineOpacityInactive: 0.65,
+ });
const metadataProvider = OHIF.classes.MetadataProvider;
@@ -139,14 +124,8 @@ export default async function init({
cornerstoneStreamingImageVolumeLoader
);
- hangingProtocolService.registerImageLoadStrategy(
- 'interleaveCenter',
- interleaveCenterLoader
- );
- hangingProtocolService.registerImageLoadStrategy(
- 'interleaveTopToBottom',
- interleaveTopToBottom
- );
+ hangingProtocolService.registerImageLoadStrategy('interleaveCenter', interleaveCenterLoader);
+ hangingProtocolService.registerImageLoadStrategy('interleaveTopToBottom', interleaveTopToBottom);
hangingProtocolService.registerImageLoadStrategy('nth', nthLoader);
// add metadata providers
@@ -166,9 +145,7 @@ export default async function init({
initWADOImageLoader(userAuthenticationService, appConfig, extensionManager);
/* Measurement Service */
- this.measurementServiceSource = connectToolsToMeasurementService(
- servicesManager
- );
+ this.measurementServiceSource = connectToolsToMeasurementService(servicesManager);
initCineService(cineService);
@@ -178,31 +155,18 @@ export default async function init({
volumeInputArrayMap => {
for (const entry of volumeInputArrayMap.entries()) {
const [viewportId, volumeInputArray] = entry;
- const viewport = cornerstoneViewportService.getCornerstoneViewport(
- viewportId
- );
+ const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
- const ohifViewport = cornerstoneViewportService.getViewportInfo(
- viewportId
- );
+ const ohifViewport = cornerstoneViewportService.getViewportInfo(viewportId);
- const {
- lutPresentationStore,
- positionPresentationStore,
- } = stateSyncService.getState();
+ const { lutPresentationStore, positionPresentationStore } = stateSyncService.getState();
const { presentationIds } = ohifViewport.getViewportOptions();
const presentations = {
- positionPresentation:
- positionPresentationStore[presentationIds?.positionPresentationId],
- lutPresentation:
- lutPresentationStore[presentationIds?.lutPresentationId],
+ positionPresentation: positionPresentationStore[presentationIds?.positionPresentationId],
+ lutPresentation: lutPresentationStore[presentationIds?.lutPresentationId],
};
- cornerstoneViewportService.setVolumesForViewport(
- viewport,
- volumeInputArray,
- presentations
- );
+ cornerstoneViewportService.setVolumesForViewport(viewport, volumeInputArray, presentations);
}
}
);
@@ -225,9 +189,7 @@ export default async function init({
const resetCrosshairs = evt => {
const { element } = evt.detail;
- const { viewportId, renderingEngineId } = cornerstone.getEnabledElement(
- element
- );
+ const { viewportId, renderingEngineId } = cornerstone.getEnabledElement(element);
const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroupForViewport(
viewportId,
@@ -253,10 +215,7 @@ export default async function init({
const { element } = evt.detail;
element.addEventListener(EVENTS.CAMERA_RESET, resetCrosshairs);
- eventTarget.addEventListener(
- EVENTS.STACK_VIEWPORT_NEW_STACK,
- newStackCallback
- );
+ eventTarget.addEventListener(EVENTS.STACK_VIEWPORT_NEW_STACK, newStackCallback);
}
function elementDisabledHandler(evt) {
@@ -271,15 +230,9 @@ export default async function init({
// );
}
- eventTarget.addEventListener(
- EVENTS.ELEMENT_ENABLED,
- elementEnabledHandler.bind(null)
- );
+ eventTarget.addEventListener(EVENTS.ELEMENT_ENABLED, elementEnabledHandler.bind(null));
- eventTarget.addEventListener(
- EVENTS.ELEMENT_DISABLED,
- elementDisabledHandler.bind(null)
- );
+ eventTarget.addEventListener(EVENTS.ELEMENT_DISABLED, elementDisabledHandler.bind(null));
viewportGridService.subscribe(
viewportGridService.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED,
@@ -292,8 +245,7 @@ export default async function init({
// check if reference lines are active
const referenceLinesEnabled =
- toolGroup._toolInstances['ReferenceLines'].mode ===
- Enums.ToolModes.Enabled;
+ toolGroup._toolInstances['ReferenceLines'].mode === Enums.ToolModes.Enabled;
if (!referenceLinesEnabled) {
return;
@@ -318,10 +270,9 @@ function CPUModal() {
return (
);
diff --git a/extensions/cornerstone/src/initContextMenu.ts b/extensions/cornerstone/src/initContextMenu.ts
index 48a5c19a3..60e166824 100644
--- a/extensions/cornerstone/src/initContextMenu.ts
+++ b/extensions/cornerstone/src/initContextMenu.ts
@@ -60,8 +60,7 @@ function initContextMenu({
*/
const cornerstoneViewportHandleEvent = (name, evt) => {
const customizations =
- customizationService.get('cornerstoneViewportClickCommands') ||
- DEFAULT_CONTEXT_MENU_CLICKS;
+ customizationService.get('cornerstoneViewportClickCommands') || DEFAULT_CONTEXT_MENU_CLICKS;
const toRun = customizations[name];
const options = {
nearbyToolData: findNearbyToolData(commandsManager, evt),
@@ -84,30 +83,18 @@ function initContextMenu({
// TODO check update upstream
setEnabledElement(viewportId, element);
- element.addEventListener(
- cs3DToolsEvents.MOUSE_CLICK,
- cornerstoneViewportHandleClick
- );
+ element.addEventListener(cs3DToolsEvents.MOUSE_CLICK, cornerstoneViewportHandleClick);
}
function elementDisabledHandler(evt) {
const { element } = evt.detail;
- element.removeEventListener(
- cs3DToolsEvents.MOUSE_CLICK,
- cornerstoneViewportHandleClick
- );
+ element.removeEventListener(cs3DToolsEvents.MOUSE_CLICK, cornerstoneViewportHandleClick);
}
- eventTarget.addEventListener(
- EVENTS.ELEMENT_ENABLED,
- elementEnabledHandler.bind(null)
- );
+ eventTarget.addEventListener(EVENTS.ELEMENT_ENABLED, elementEnabledHandler.bind(null));
- eventTarget.addEventListener(
- EVENTS.ELEMENT_DISABLED,
- elementDisabledHandler.bind(null)
- );
+ eventTarget.addEventListener(EVENTS.ELEMENT_DISABLED, elementDisabledHandler.bind(null));
}
export default initContextMenu;
diff --git a/extensions/cornerstone/src/initDoubleClick.ts b/extensions/cornerstone/src/initDoubleClick.ts
index 14f80c775..049d72cbe 100644
--- a/extensions/cornerstone/src/initDoubleClick.ts
+++ b/extensions/cornerstone/src/initDoubleClick.ts
@@ -39,10 +39,7 @@ export type initDoubleClickArgs = {
commandsManager: CommandsManager;
};
-function initDoubleClick({
- customizationService,
- commandsManager,
-}: initDoubleClickArgs): void {
+function initDoubleClick({ customizationService, commandsManager }: initDoubleClickArgs): void {
const cornerstoneViewportHandleDoubleClick = (evt: CustomEvent) => {
// Do not allow double click on a tool.
const nearbyToolData = findNearbyToolData(commandsManager, evt);
@@ -54,8 +51,7 @@ function initDoubleClick({
// Allows for the customization of the double click on a viewport.
const customizations =
- customizationService.get('cornerstoneViewportClickCommands') ||
- DEFAULT_DOUBLE_CLICK;
+ customizationService.get('cornerstoneViewportClickCommands') || DEFAULT_DOUBLE_CLICK;
const toRun = customizations[eventName];
@@ -84,15 +80,9 @@ function initDoubleClick({
);
}
- eventTarget.addEventListener(
- EVENTS.ELEMENT_ENABLED,
- elementEnabledHandler.bind(null)
- );
+ eventTarget.addEventListener(EVENTS.ELEMENT_ENABLED, elementEnabledHandler.bind(null));
- eventTarget.addEventListener(
- EVENTS.ELEMENT_DISABLED,
- elementDisabledHandler.bind(null)
- );
+ eventTarget.addEventListener(EVENTS.ELEMENT_DISABLED, elementDisabledHandler.bind(null));
}
export default initDoubleClick;
diff --git a/extensions/cornerstone/src/initMeasurementService.js b/extensions/cornerstone/src/initMeasurementService.js
index 3a883cc79..2ab5cce55 100644
--- a/extensions/cornerstone/src/initMeasurementService.js
+++ b/extensions/cornerstone/src/initMeasurementService.js
@@ -127,11 +127,8 @@ const initMeasurementService = (
};
const connectToolsToMeasurementService = servicesManager => {
- const {
- measurementService,
- displaySetService,
- cornerstoneViewportService,
- } = servicesManager.services;
+ const { measurementService, displaySetService, cornerstoneViewportService } =
+ servicesManager.services;
const csTools3DVer1MeasurementSource = initMeasurementService(
measurementService,
displaySetService,
@@ -153,10 +150,7 @@ const connectToolsToMeasurementService = servicesManager => {
} = annotationAddedEventDetail;
const { toolName } = metadata;
- if (
- csToolsEvent.type === completedEvt &&
- toolName === toolNames.CalibrationLine
- ) {
+ if (csToolsEvent.type === completedEvt && toolName === toolNames.CalibrationLine) {
// show modal to input the measurement (mm)
onCompletedCalibrationLine(servicesManager, csToolsEvent)
.then(
@@ -212,10 +206,8 @@ const connectToolsToMeasurementService = servicesManager => {
try {
const annotationSelectionEventDetail = csToolsEvent.detail;
- const {
- added: addedSelectedAnnotationUIDs,
- removed: removedSelectedAnnotationUIDs,
- } = annotationSelectionEventDetail;
+ const { added: addedSelectedAnnotationUIDs, removed: removedSelectedAnnotationUIDs } =
+ annotationSelectionEventDetail;
if (removedSelectedAnnotationUIDs) {
removedSelectedAnnotationUIDs.forEach(annotationUID =>
@@ -283,12 +275,8 @@ const connectMeasurementServiceToTools = (
cornerstoneViewportService,
measurementSource
) => {
- const {
- MEASUREMENT_REMOVED,
- MEASUREMENTS_CLEARED,
- MEASUREMENT_UPDATED,
- RAW_MEASUREMENT_ADDED,
- } = measurementService.EVENTS;
+ const { MEASUREMENT_REMOVED, MEASUREMENTS_CLEARED, MEASUREMENT_UPDATED, RAW_MEASUREMENT_ADDED } =
+ measurementService.EVENTS;
const csTools3DVer1MeasurementSource = measurementService.getSource(
CORNERSTONE_3D_TOOLS_SOURCE_NAME,
@@ -351,11 +339,7 @@ const connectMeasurementServiceToTools = (
return;
}
- const {
- referenceSeriesUID,
- referenceStudyUID,
- SOPInstanceUID,
- } = measurement;
+ const { referenceSeriesUID, referenceStudyUID, SOPInstanceUID } = measurement;
const instance = DicomMetadataStore.getInstance(
referenceStudyUID,
@@ -368,9 +352,7 @@ const connectMeasurementServiceToTools = (
if (measurement?.metadata?.referencedImageId) {
imageId = measurement.metadata.referencedImageId;
- frameNumber = getSOPInstanceAttributes(
- measurement.metadata.referencedImageId
- ).frameNumber;
+ frameNumber = getSOPInstanceAttributes(measurement.metadata.referencedImageId).frameNumber;
} else {
imageId = dataSource.getImageIdsForInstance({ instance });
}
diff --git a/extensions/cornerstone/src/initWADOImageLoader.js b/extensions/cornerstone/src/initWADOImageLoader.js
index 8b2aec1cc..1df82f1c9 100644
--- a/extensions/cornerstone/src/initWADOImageLoader.js
+++ b/extensions/cornerstone/src/initWADOImageLoader.js
@@ -1,9 +1,7 @@
import * as cornerstone from '@cornerstonejs/core';
import { volumeLoader } from '@cornerstonejs/core';
import { cornerstoneStreamingImageVolumeLoader } from '@cornerstonejs/streaming-image-volume-loader';
-import dicomImageLoader, {
- webWorkerManager,
-} from '@cornerstonejs/dicom-image-loader';
+import dicomImageLoader, { webWorkerManager } from '@cornerstonejs/dicom-image-loader';
import dicomParser from 'dicom-parser';
import { errorHandler, utils } from '@ohif/core';
@@ -41,10 +39,7 @@ export default function initWADOImageLoader(
dicomImageLoader.external.cornerstone = cornerstone;
dicomImageLoader.external.dicomParser = dicomParser;
- registerVolumeLoader(
- 'cornerstoneStreamingImageVolume',
- cornerstoneStreamingImageVolumeLoader
- );
+ registerVolumeLoader('cornerstoneStreamingImageVolume', cornerstoneStreamingImageVolumeLoader);
dicomImageLoader.configure({
decodeConfig: {
@@ -55,10 +50,9 @@ export default function initWADOImageLoader(
// we should set this flag to false.
convertFloatPixelDataToInt: false,
},
- beforeSend: function(xhr) {
+ beforeSend: function (xhr) {
//TODO should be removed in the future and request emitted by DicomWebDataSource
- const sourceConfig =
- extensionManager.getActiveDataSource()?.[0].getConfig() ?? {};
+ const sourceConfig = extensionManager.getActiveDataSource()?.[0].getConfig() ?? {};
const headers = userAuthenticationService.getAuthorizationHeader();
const acceptHeader = utils.generateAcceptHeader(
sourceConfig.acceptHeader,
diff --git a/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts b/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts
index 31ea90cb2..8d573f564 100644
--- a/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts
+++ b/extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts
@@ -1,16 +1,8 @@
import { ServicesManager, Types } from '@ohif/core';
-import {
- cache as cs3DCache,
- Enums,
- volumeLoader,
- utilities as utils,
-} from '@cornerstonejs/core';
+import { cache as cs3DCache, Enums, volumeLoader, utilities as utils } from '@cornerstonejs/core';
import getCornerstoneViewportType from '../../utils/getCornerstoneViewportType';
-import {
- StackViewportData,
- VolumeViewportData,
-} from '../../types/CornerstoneCacheService';
+import { StackViewportData, VolumeViewportData } from '../../types/CornerstoneCacheService';
const VOLUME_LOADER_SCHEME = 'cornerstoneStreamingImageVolume';
@@ -18,9 +10,7 @@ class CornerstoneCacheService {
static REGISTRATION = {
name: 'cornerstoneCacheService',
altName: 'CornerstoneCacheService',
- create: ({
- servicesManager,
- }: Types.Extensions.ExtensionParams): CornerstoneCacheService => {
+ create: ({ servicesManager }: Types.Extensions.ExtensionParams): CornerstoneCacheService => {
return new CornerstoneCacheService(servicesManager);
},
};
@@ -77,11 +67,7 @@ class CornerstoneCacheService {
cs3DViewportType === Enums.ViewportType.ORTHOGRAPHIC ||
cs3DViewportType === Enums.ViewportType.VOLUME_3D
) {
- viewportData = await this._getVolumeViewportData(
- dataSource,
- displaySets,
- cs3DViewportType
- );
+ viewportData = await this._getVolumeViewportData(dataSource, displaySets, cs3DViewportType);
}
viewportData.viewportType = cs3DViewportType;
@@ -134,20 +120,14 @@ class CornerstoneCacheService {
// For Stack Viewport we don't have fusion currently
const displaySet = displaySets[0];
- let stackImageIds = this.stackImageIds.get(
- displaySet.displaySetInstanceUID
- );
+ let stackImageIds = this.stackImageIds.get(displaySet.displaySetInstanceUID);
if (!stackImageIds) {
stackImageIds = this._getCornerstoneStackImageIds(displaySet, dataSource);
this.stackImageIds.set(displaySet.displaySetInstanceUID, stackImageIds);
}
- const {
- displaySetInstanceUID,
- StudyInstanceUID,
- isCompositeStack,
- } = displaySet;
+ const { displaySetInstanceUID, StudyInstanceUID, isCompositeStack } = displaySet;
const StackViewportData: StackViewportData = {
viewportType,
@@ -196,31 +176,22 @@ class CornerstoneCacheService {
continue;
}
- const volumeLoaderSchema =
- displaySet.volumeLoaderSchema ?? VOLUME_LOADER_SCHEME;
+ const volumeLoaderSchema = displaySet.volumeLoaderSchema ?? VOLUME_LOADER_SCHEME;
const volumeId = `${volumeLoaderSchema}:${displaySet.displaySetInstanceUID}`;
- let volumeImageIds = this.volumeImageIds.get(
- displaySet.displaySetInstanceUID
- );
+ let volumeImageIds = this.volumeImageIds.get(displaySet.displaySetInstanceUID);
let volume = cs3DCache.getVolume(volumeId);
if (!volumeImageIds || !volume) {
- volumeImageIds = this._getCornerstoneVolumeImageIds(
- displaySet,
- dataSource
- );
+ volumeImageIds = this._getCornerstoneVolumeImageIds(displaySet, dataSource);
volume = await volumeLoader.createAndCacheVolume(volumeId, {
imageIds: volumeImageIds,
});
- this.volumeImageIds.set(
- displaySet.displaySetInstanceUID,
- volumeImageIds
- );
+ this.volumeImageIds.set(displaySet.displaySetInstanceUID, volumeImageIds);
}
volumeData.push({
@@ -268,10 +239,7 @@ class CornerstoneCacheService {
}
private _getCornerstoneVolumeImageIds(displaySet, dataSource): string[] {
- const stackImageIds = this._getCornerstoneStackImageIds(
- displaySet,
- dataSource
- );
+ const stackImageIds = this._getCornerstoneStackImageIds(displaySet, dataSource);
return stackImageIds;
}
diff --git a/extensions/cornerstone/src/services/SegmentationService/RTSTRUCT/mapROIContoursToRTStructData.ts b/extensions/cornerstone/src/services/SegmentationService/RTSTRUCT/mapROIContoursToRTStructData.ts
index f17ec5c70..b61307412 100644
--- a/extensions/cornerstone/src/services/SegmentationService/RTSTRUCT/mapROIContoursToRTStructData.ts
+++ b/extensions/cornerstone/src/services/SegmentationService/RTSTRUCT/mapROIContoursToRTStructData.ts
@@ -7,32 +7,27 @@
* @returns An array of object that includes data, id, segmentIndex, color
* and geometry Id
*/
-export function mapROIContoursToRTStructData(
- structureSet: unknown,
- rtDisplaySetUID: unknown
-) {
- return structureSet.ROIContours.map(
- ({ contourPoints, ROINumber, ROIName, colorArray }) => {
- const data = contourPoints.map(({ points, ...rest }) => {
- const newPoints = points.map(({ x, y, z }) => {
- return [x, y, z];
- });
-
- return {
- ...rest,
- points: newPoints,
- };
+export function mapROIContoursToRTStructData(structureSet: unknown, rtDisplaySetUID: unknown) {
+ return structureSet.ROIContours.map(({ contourPoints, ROINumber, ROIName, colorArray }) => {
+ const data = contourPoints.map(({ points, ...rest }) => {
+ const newPoints = points.map(({ x, y, z }) => {
+ return [x, y, z];
});
- const id = ROIName || ROINumber;
-
return {
- data,
- id,
- segmentIndex: ROINumber,
- color: colorArray,
- geometryId: `${rtDisplaySetUID}:${id}:segmentIndex-${ROINumber}`,
+ ...rest,
+ points: newPoints,
};
- }
- );
+ });
+
+ const id = ROIName || ROINumber;
+
+ return {
+ data,
+ id,
+ segmentIndex: ROINumber,
+ color: colorArray,
+ geometryId: `${rtDisplaySetUID}:${id}:segmentIndex-${ROINumber}`,
+ };
+ });
}
diff --git a/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts b/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts
index 03a4e8461..8ea071e5a 100644
--- a/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts
+++ b/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts
@@ -21,11 +21,7 @@ import {
import isEqual from 'lodash.isequal';
import { Types as ohifTypes } from '@ohif/core';
import { easeInOutBell, reverseEaseInOutBell } from '../../utils/transitions';
-import {
- Segment,
- Segmentation,
- SegmentationConfig,
-} from './SegmentationServiceTypes';
+import { Segment, Segmentation, SegmentationConfig } from './SegmentationServiceTypes';
import { mapROIContoursToRTStructData } from './RTSTRUCT/mapROIContoursToRTStructData';
const { COLOR_LUT } = cstConstants;
@@ -42,8 +38,7 @@ const EVENTS = {
// fired when the segmentation is removed
SEGMENTATION_REMOVED: 'event::segmentation_removed',
// fired when the configuration for the segmentation is changed (e.g., brush size, render fill, outline thickness, etc.)
- SEGMENTATION_CONFIGURATION_CHANGED:
- 'event::segmentation_configuration_changed',
+ SEGMENTATION_CONFIGURATION_CHANGED: 'event::segmentation_configuration_changed',
// fired when the active segment is loaded in SEG or RTSTRUCT
SEGMENT_LOADING_COMPLETE: 'event::segment_loading_complete',
// for all segments
@@ -64,9 +59,7 @@ class SegmentationService extends PubSubService {
static REGISTRATION = {
name: 'segmentationService',
altName: 'SegmentationService',
- create: ({
- servicesManager,
- }: OhifTypes.Extensions.ExtensionParams): SegmentationService => {
+ create: ({ servicesManager }: OhifTypes.Extensions.ExtensionParams): SegmentationService => {
return new SegmentationService({ servicesManager });
},
};
@@ -138,10 +131,10 @@ class SegmentationService extends PubSubService {
toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
- const {
- segmentationRepresentationUID,
- segmentation,
- } = this._getSegmentationInfo(segmentationId, toolGroupId);
+ const { segmentationRepresentationUID, segmentation } = this._getSegmentationInfo(
+ segmentationId,
+ toolGroupId
+ );
if (this._getSegmentInfo(segmentation, segmentIndex)) {
throw new Error(`Segment ${segmentIndex} already exists`);
@@ -166,32 +159,14 @@ class SegmentationService extends PubSubService {
const suppressEvents = true;
if (properties !== undefined) {
- const {
- color: newColor,
- opacity,
- isLocked,
- visibility,
- active,
- } = properties;
+ const { color: newColor, opacity, isLocked, visibility, active } = properties;
if (newColor !== undefined) {
- this._setSegmentColor(
- segmentationId,
- segmentIndex,
- newColor,
- toolGroupId,
- suppressEvents
- );
+ this._setSegmentColor(segmentationId, segmentIndex, newColor, toolGroupId, suppressEvents);
}
if (opacity !== undefined) {
- this._setSegmentOpacity(
- segmentationId,
- segmentIndex,
- opacity,
- toolGroupId,
- suppressEvents
- );
+ this._setSegmentOpacity(segmentationId, segmentIndex, opacity, toolGroupId, suppressEvents);
}
if (visibility !== undefined) {
@@ -209,12 +184,7 @@ class SegmentationService extends PubSubService {
}
if (isLocked !== undefined) {
- this._setSegmentLocked(
- segmentationId,
- segmentIndex,
- isLocked,
- suppressEvents
- );
+ this._setSegmentLocked(segmentationId, segmentIndex, isLocked, suppressEvents);
}
}
@@ -285,9 +255,7 @@ class SegmentationService extends PubSubService {
if (segmentation.activeSegmentIndex === segmentIndex) {
const segmentIndices = Object.keys(segmentation.segments);
- const newActiveSegmentIndex = segmentIndices.length
- ? Number(segmentIndices[0])
- : 1;
+ const newActiveSegmentIndex = segmentIndices.length ? Number(segmentIndices[0]) : 1;
this._setActiveSegment(segmentationId, newActiveSegmentIndex, true);
}
@@ -319,19 +287,10 @@ class SegmentationService extends PubSubService {
isLocked: boolean
): void {
const suppressEvents = false;
- this._setSegmentLocked(
- segmentationId,
- segmentIndex,
- isLocked,
- suppressEvents
- );
+ this._setSegmentLocked(segmentationId, segmentIndex, isLocked, suppressEvents);
}
- public setSegmentLabel(
- segmentationId: string,
- segmentIndex: number,
- segmentLabel: string
- ): void {
+ public setSegmentLabel(segmentationId: string, segmentIndex: number, segmentLabel: string): void {
this._setSegmentLabel(segmentationId, segmentIndex, segmentLabel);
}
@@ -387,24 +346,14 @@ class SegmentationService extends PubSubService {
this._setSegmentOpacity(segmentationId, segmentIndex, opacity, toolGroupId);
}
- public setActiveSegmentationForToolGroup(
- segmentationId: string,
- toolGroupId?: string
- ): void {
+ public setActiveSegmentationForToolGroup(segmentationId: string, toolGroupId?: string): void {
toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
const suppressEvents = false;
- this._setActiveSegmentationForToolGroup(
- segmentationId,
- toolGroupId,
- suppressEvents
- );
+ this._setActiveSegmentationForToolGroup(segmentationId, toolGroupId, suppressEvents);
}
- public setActiveSegmentForSegmentation(
- segmentationId: string,
- segmentIndex: number
- ): void {
+ public setActiveSegmentForSegmentation(segmentationId: string, segmentIndex: number): void {
this._setActiveSegment(segmentationId, segmentIndex, false);
}
@@ -420,9 +369,7 @@ class SegmentationService extends PubSubService {
* @return Array of segmentations
*/
- public getSegmentations(
- filterNonHydratedSegmentations = true
- ): Segmentation[] {
+ public getSegmentations(filterNonHydratedSegmentations = true): Segmentation[] {
const segmentations = this._getSegmentations();
return (
@@ -435,10 +382,7 @@ class SegmentationService extends PubSubService {
private _getSegmentations(): Segmentation[] {
const segmentations = this.arrayOfObjects(this.segmentations);
- return (
- segmentations &&
- segmentations.map(m => this.segmentations[Object.keys(m)[0]])
- );
+ return segmentations && segmentations.map(m => this.segmentations[Object.keys(m)[0]]);
}
/**
@@ -477,8 +421,7 @@ class SegmentationService extends PubSubService {
}
const representationType = segmentation.type;
- const representationData =
- segmentation.representationData[representationType];
+ const representationData = segmentation.representationData[representationType];
cstSegmentation.addSegmentations([
{
segmentationId,
@@ -566,9 +509,7 @@ class SegmentationService extends PubSubService {
const { labelmapBufferArray, referencedVolumeId } = segDisplaySet;
if (!labelmapBufferArray || !referencedVolumeId) {
- throw new Error(
- 'No labelmapBufferArray or referencedVolumeId found for the SEG displaySet'
- );
+ throw new Error('No labelmapBufferArray or referencedVolumeId found for the SEG displaySet');
}
// if the labelmap doesn't exist, we need to create it first from the
@@ -576,23 +517,18 @@ class SegmentationService extends PubSubService {
const referencedVolume = cache.getVolume(referencedVolumeId);
if (!referencedVolume) {
- throw new Error(
- `No volume found for referencedVolumeId: ${referencedVolumeId}`
- );
+ throw new Error(`No volume found for referencedVolumeId: ${referencedVolumeId}`);
}
// Force use of a Uint8Array SharedArrayBuffer for the segmentation to save space and so
// it is easily compressible in worker thread.
- const derivedVolume = await volumeLoader.createAndCacheDerivedVolume(
- referencedVolumeId,
- {
- volumeId: segmentationId,
- targetBuffer: {
- type: 'Uint8Array',
- sharedArrayBuffer: true,
- },
- }
- );
+ const derivedVolume = await volumeLoader.createAndCacheDerivedVolume(referencedVolumeId, {
+ volumeId: segmentationId,
+ targetBuffer: {
+ type: 'Uint8Array',
+ sharedArrayBuffer: true,
+ },
+ });
const derivedVolumeScalarData = derivedVolume.getScalarData();
const segmentsInfo = segDisplaySet.segMetadata.data;
@@ -680,10 +616,7 @@ class SegmentationService extends PubSubService {
const defaultScheme = this._getDefaultSegmentationScheme();
const rtDisplaySetUID = rtDisplaySet.displaySetInstanceUID;
- const allRTStructData = mapROIContoursToRTStructData(
- structureSet,
- rtDisplaySetUID
- );
+ const allRTStructData = mapROIContoursToRTStructData(structureSet, rtDisplaySetUID);
// sort by segmentIndex
allRTStructData.sort((a, b) => a.segmentIndex - b.segmentIndex);
@@ -726,19 +659,16 @@ class SegmentationService extends PubSubService {
// catch error instead of failing to allow loading to continue
try {
- const geometry = await geometryLoader.createAndCacheGeometry(
- geometryId,
- {
- geometryData: {
- data,
- id,
- color,
- frameOfReferenceUID: structureSet.frameOfReferenceUID,
- segmentIndex,
- },
- type: csEnums.GeometryType.CONTOUR,
- }
- );
+ const geometry = await geometryLoader.createAndCacheGeometry(geometryId, {
+ geometryData: {
+ data,
+ id,
+ color,
+ frameOfReferenceUID: structureSet.frameOfReferenceUID,
+ segmentIndex,
+ },
+ type: csEnums.GeometryType.CONTOUR,
+ });
const contourSet = geometry.data;
const centroid = contourSet.getCentroid();
@@ -758,9 +688,7 @@ class SegmentationService extends PubSubService {
const numInitialized = Object.keys(segmentsCachedStats).length;
// Calculate percentage completed
- const percentComplete = Math.round(
- (numInitialized / allRTStructData.length) * 100
- );
+ const percentComplete = Math.round((numInitialized / allRTStructData.length) * 100);
this._broadcastEvent(EVENTS.SEGMENT_LOADING_COMPLETE, {
percentComplete,
@@ -824,8 +752,7 @@ class SegmentationService extends PubSubService {
const { world } = center;
// todo: generalize
- toolGroupId =
- toolGroupId || this._getToolGroupIdsWithSegmentation(segmentationId);
+ toolGroupId = toolGroupId || this._getToolGroupIdsWithSegmentation(segmentationId);
const toolGroups = [];
@@ -842,10 +769,7 @@ class SegmentationService extends PubSubService {
// @ts-ignore
for (const { viewportId, renderingEngineId } of viewportsInfo) {
- const { viewport } = getEnabledElementByIds(
- viewportId,
- renderingEngineId
- );
+ const { viewport } = getEnabledElementByIds(viewportId, renderingEngineId);
cstUtils.viewport.jumpToWorld(viewport, world);
}
@@ -888,9 +812,7 @@ class SegmentationService extends PubSubService {
const { segments } = segmentation;
const highlightFn =
- type === LABELMAP
- ? this._highlightLabelmap.bind(this)
- : this._highlightContour.bind(this);
+ type === LABELMAP ? this._highlightLabelmap.bind(this) : this._highlightContour.bind(this);
const adjustedAlpha = type === LABELMAP ? alpha : 1 - alpha;
@@ -914,9 +836,7 @@ class SegmentationService extends PubSubService {
): Promise => {
const { displaySetService } = this.servicesManager.services;
- const displaySet = displaySetService.getDisplaySetByUID(
- displaySetInstanceUID
- );
+ const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
// Todo: we currently only support labelmap for segmentation for a displaySet
const representationType = LABELMAP;
@@ -977,9 +897,7 @@ class SegmentationService extends PubSubService {
const segmentation = this.getSegmentation(segmentationId);
if (!segmentation) {
- throw new Error(
- `Segmentation with segmentationId ${segmentationId} not found.`
- );
+ throw new Error(`Segmentation with segmentationId ${segmentationId} not found.`);
}
if (hydrateSegmentation) {
@@ -1019,34 +937,16 @@ class SegmentationService extends PubSubService {
continue;
}
- const {
- segmentIndex,
- color,
- isLocked,
- isVisible: visibility,
- opacity,
- } = segment;
+ const { segmentIndex, color, isLocked, isVisible: visibility, opacity } = segment;
const suppressEvents = true;
if (color !== undefined) {
- this._setSegmentColor(
- segmentationId,
- segmentIndex,
- color,
- toolGroupId,
- suppressEvents
- );
+ this._setSegmentColor(segmentationId, segmentIndex, color, toolGroupId, suppressEvents);
}
if (opacity !== undefined) {
- this._setSegmentOpacity(
- segmentationId,
- segmentIndex,
- opacity,
- toolGroupId,
- suppressEvents
- );
+ this._setSegmentOpacity(segmentationId, segmentIndex, opacity, toolGroupId, suppressEvents);
}
if (visibility !== undefined) {
@@ -1060,12 +960,7 @@ class SegmentationService extends PubSubService {
}
if (isLocked !== undefined) {
- this._setSegmentLocked(
- segmentationId,
- segmentIndex,
- isLocked,
- suppressEvents
- );
+ this._setSegmentLocked(segmentationId, segmentIndex, isLocked, suppressEvents);
}
}
};
@@ -1102,25 +997,16 @@ class SegmentationService extends PubSubService {
});
};
- public getToolGroupIdsWithSegmentation = (
- segmentationId: string
- ): string[] => {
- const toolGroupIds = cstSegmentation.state.getToolGroupIdsWithSegmentation(
- segmentationId
- );
+ public getToolGroupIdsWithSegmentation = (segmentationId: string): string[] => {
+ const toolGroupIds = cstSegmentation.state.getToolGroupIdsWithSegmentation(segmentationId);
return toolGroupIds;
};
- public hydrateSegmentation = (
- segmentationId: string,
- suppressEvents = false
- ): void => {
+ public hydrateSegmentation = (segmentationId: string, suppressEvents = false): void => {
const segmentation = this.getSegmentation(segmentationId);
if (!segmentation) {
- throw new Error(
- `Segmentation with segmentationId ${segmentationId} not found.`
- );
+ throw new Error(`Segmentation with segmentationId ${segmentationId} not found.`);
}
this._setDisplaySetIsHydrated(segmentationId, true);
@@ -1134,13 +1020,8 @@ class SegmentationService extends PubSubService {
}
};
- private _setDisplaySetIsHydrated(
- displaySetUID: string,
- isHydrated: boolean
- ): void {
- const {
- DisplaySetService: displaySetService,
- } = this.servicesManager.services;
+ private _setDisplaySetIsHydrated(displaySetUID: string, isHydrated: boolean): void {
+ const { DisplaySetService: displaySetService } = this.servicesManager.services;
const displaySet = displaySetService.getDisplaySetByUID(displaySetUID);
displaySet.isHydrated = isHydrated;
displaySetService.setDisplaySetMetadataInvalidated(displaySetUID, false);
@@ -1259,17 +1140,13 @@ class SegmentationService extends PubSubService {
): void {
const uids = segmentationRepresentationUIDsIds || [];
if (!uids.length) {
- const representations = cstSegmentation.state.getSegmentationRepresentations(
- toolGroupId
- );
+ const representations = cstSegmentation.state.getSegmentationRepresentations(toolGroupId);
if (!representations || !representations.length) {
return;
}
- uids.push(
- ...representations.map(rep => rep.segmentationRepresentationUID)
- );
+ uids.push(...representations.map(rep => rep.segmentationRepresentationUID));
}
cstSegmentation.removeSegmentationsFromToolGroup(toolGroupId, uids);
@@ -1285,9 +1162,7 @@ class SegmentationService extends PubSubService {
const wasActive = segmentation.isActive;
if (!segmentationId || !segmentation) {
- console.warn(
- `No segmentationId provided, or unable to find segmentation by id.`
- );
+ console.warn(`No segmentationId provided, or unable to find segmentation by id.`);
return;
}
@@ -1309,11 +1184,7 @@ class SegmentationService extends PubSubService {
if (remainingSegmentations.length) {
const { id } = remainingSegmentations[0];
- this._setActiveSegmentationForToolGroup(
- id,
- this._getFirstToolGroupId(),
- false
- );
+ this._setActiveSegmentationForToolGroup(id, this._getFirstToolGroupId(), false);
}
}
@@ -1337,9 +1208,8 @@ class SegmentationService extends PubSubService {
// toolGroupId
// );
- const segmentationRepresentations = this.getSegmentationRepresentationsForToolGroup(
- toolGroupId
- );
+ const segmentationRepresentations =
+ this.getSegmentationRepresentationsForToolGroup(toolGroupId);
const typeToUse = segmentationRepresentations?.[0]?.type || LABELMAP;
@@ -1397,11 +1267,7 @@ class SegmentationService extends PubSubService {
setConfigValueIfDefined('outlineOpacity', outlineOpacity, v => v / 100);
setConfigValueIfDefined('fillAlpha', fillAlpha, v => v / 100);
setConfigValueIfDefined('renderFill', renderFill);
- setConfigValueIfDefined(
- 'fillAlphaInactive',
- fillAlphaInactive,
- v => v / 100
- );
+ setConfigValueIfDefined('fillAlphaInactive', fillAlphaInactive, v => v / 100);
setConfigValueIfDefined('outlineOpacityInactive', fillAlphaInactive, v =>
Math.max(0.75, v / 100)
);
@@ -1435,10 +1301,7 @@ class SegmentationService extends PubSubService {
// });
// }
- this._broadcastEvent(
- this.EVENTS.SEGMENTATION_CONFIGURATION_CHANGED,
- this.getConfiguration()
- );
+ this._broadcastEvent(this.EVENTS.SEGMENTATION_CONFIGURATION_CHANGED, this.getConfiguration());
};
public getLabelmapVolume = (segmentationId: string) => {
@@ -1472,9 +1335,7 @@ class SegmentationService extends PubSubService {
const segmentInfo = segmentation.segments[segmentIndex];
if (segmentInfo === undefined) {
- throw new Error(
- `Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`
- );
+ throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
}
segmentInfo.label = label;
@@ -1487,14 +1348,8 @@ class SegmentationService extends PubSubService {
}
}
- public shouldRenderSegmentation(
- viewportDisplaySetInstanceUIDs,
- segDisplaySetInstanceUID
- ) {
- if (
- !viewportDisplaySetInstanceUIDs ||
- !viewportDisplaySetInstanceUIDs.length
- ) {
+ public shouldRenderSegmentation(viewportDisplaySetInstanceUIDs, segDisplaySetInstanceUID) {
+ if (!viewportDisplaySetInstanceUIDs || !viewportDisplaySetInstanceUIDs.length) {
return false;
}
@@ -1502,20 +1357,14 @@ class SegmentationService extends PubSubService {
let shouldDisplaySeg = false;
- const segDisplaySet = displaySetService.getDisplaySetByUID(
- segDisplaySetInstanceUID
- );
+ const segDisplaySet = displaySetService.getDisplaySetByUID(segDisplaySetInstanceUID);
- const segFrameOfReferenceUID = this._getFrameOfReferenceUIDForSeg(
- segDisplaySet
- );
+ const segFrameOfReferenceUID = this._getFrameOfReferenceUIDForSeg(segDisplaySet);
// check if the displaySet is sharing the same frameOfReferenceUID
// with the new segmentation
for (const displaySetInstanceUID of viewportDisplaySetInstanceUIDs) {
- const displaySet = displaySetService.getDisplaySetByUID(
- displaySetInstanceUID
- );
+ const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
// Todo: this might not be ideal for use cases such as 4D, since we
// don't want to show the segmentation for all the frames
@@ -1563,10 +1412,7 @@ class SegmentationService extends PubSubService {
segmentation.isActive = segmentation.id === segmentationId;
});
- const representation = this._getSegmentationRepresentation(
- segmentationId,
- toolGroupId
- );
+ const representation = this._getSegmentationRepresentation(segmentationId, toolGroupId);
cstSegmentation.activeSegmentation.setActiveSegmentationRepresentation(
toolGroupId,
@@ -1580,16 +1426,11 @@ class SegmentationService extends PubSubService {
}
}
- private _toggleSegmentationVisibility = (
- segmentationId: string,
- suppressEvents = false
- ) => {
+ private _toggleSegmentationVisibility = (segmentationId: string, suppressEvents = false) => {
const segmentation = this.segmentations[segmentationId];
if (!segmentation) {
- throw new Error(
- `Segmentation with segmentationId ${segmentationId} not found.`
- );
+ throw new Error(`Segmentation with segmentationId ${segmentationId} not found.`);
}
segmentation.isVisible = !segmentation.isVisible;
@@ -1603,21 +1444,14 @@ class SegmentationService extends PubSubService {
}
};
- private _setActiveSegment(
- segmentationId: string,
- segmentIndex: number,
- suppressEvents = false
- ) {
+ private _setActiveSegment(segmentationId: string, segmentIndex: number, suppressEvents = false) {
const segmentation = this.getSegmentation(segmentationId);
if (segmentation === undefined) {
throw new Error(`no segmentation for segmentationId: ${segmentationId}`);
}
- cstSegmentation.segmentIndex.setActiveSegmentIndex(
- segmentationId,
- segmentIndex
- );
+ cstSegmentation.segmentIndex.setActiveSegmentIndex(segmentationId, segmentIndex);
segmentation.activeSegmentIndex = segmentIndex;
@@ -1641,8 +1475,7 @@ class SegmentationService extends PubSubService {
}
private _getVolumeIdForDisplaySet(displaySet) {
- const volumeLoaderSchema =
- displaySet.volumeLoaderSchema ?? VOLUME_LOADER_SCHEME;
+ const volumeLoaderSchema = displaySet.volumeLoaderSchema ?? VOLUME_LOADER_SCHEME;
return `${volumeLoaderSchema}:${displaySet.displaySetInstanceUID}`;
}
@@ -1663,9 +1496,7 @@ class SegmentationService extends PubSubService {
const segmentInfo = this._getSegmentInfo(segmentation, segmentIndex);
if (segmentInfo === undefined) {
- throw new Error(
- `Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`
- );
+ throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
}
toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
@@ -1676,9 +1507,7 @@ class SegmentationService extends PubSubService {
);
if (!segmentationRepresentation) {
- throw new Error(
- 'Must add representation to toolgroup before setting segments'
- );
+ throw new Error('Must add representation to toolgroup before setting segments');
}
const { segmentationRepresentationUID } = segmentationRepresentation;
@@ -1743,18 +1572,12 @@ class SegmentationService extends PubSubService {
const segmentInfo = this._getSegmentInfo(segmentation, segmentIndex);
if (segmentInfo === undefined) {
- throw new Error(
- `Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`
- );
+ throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
}
segmentInfo.isLocked = isLocked;
- cstSegmentation.segmentLocking.setSegmentIndexLocked(
- segmentationId,
- segmentIndex,
- isLocked
- );
+ cstSegmentation.segmentLocking.setSegmentIndexLocked(segmentationId, segmentIndex, isLocked);
if (suppressEvents === false) {
this._broadcastEvent(this.EVENTS.SEGMENTATION_UPDATED, {
@@ -1772,10 +1595,10 @@ class SegmentationService extends PubSubService {
) {
toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
- const {
- segmentationRepresentationUID,
- segmentation,
- } = this._getSegmentationInfo(segmentationId, toolGroupId);
+ const { segmentationRepresentationUID, segmentation } = this._getSegmentationInfo(
+ segmentationId,
+ toolGroupId
+ );
if (segmentation === undefined) {
throw new Error(`no segmentation for segmentationId: ${segmentationId}`);
@@ -1784,9 +1607,7 @@ class SegmentationService extends PubSubService {
const segmentInfo = this._getSegmentInfo(segmentation, segmentIndex);
if (segmentInfo === undefined) {
- throw new Error(
- `Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`
- );
+ throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
}
segmentInfo.isVisible = isVisible;
@@ -1828,9 +1649,7 @@ class SegmentationService extends PubSubService {
const segmentInfo = this._getSegmentInfo(segmentation, segmentIndex);
if (segmentInfo === undefined) {
- throw new Error(
- `Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`
- );
+ throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
}
toolGroupId = toolGroupId ?? this._getFirstToolGroupId();
@@ -1841,9 +1660,7 @@ class SegmentationService extends PubSubService {
);
if (!segmentationRepresentation) {
- throw new Error(
- 'Must add representation to toolgroup before setting segments'
- );
+ throw new Error('Must add representation to toolgroup before setting segments');
}
const { segmentationRepresentationUID } = segmentationRepresentation;
@@ -1884,9 +1701,7 @@ class SegmentationService extends PubSubService {
const segmentInfo = this._getSegmentInfo(segmentation, segmentIndex);
if (segmentInfo === undefined) {
- throw new Error(
- `Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`
- );
+ throw new Error(`Segment ${segmentIndex} not yet added to segmentation: ${segmentationId}`);
}
segmentInfo.label = segmentLabel;
@@ -1899,9 +1714,8 @@ class SegmentationService extends PubSubService {
}
private _getSegmentationRepresentation(segmentationId, toolGroupId) {
- const segmentationRepresentations = this.getSegmentationRepresentationsForToolGroup(
- toolGroupId
- );
+ const segmentationRepresentations =
+ this.getSegmentationRepresentationsForToolGroup(toolGroupId);
if (segmentationRepresentations.length === 0) {
return;
@@ -1974,21 +1788,13 @@ class SegmentationService extends PubSubService {
return;
}
- const segmentationState = cstSegmentation.state.getSegmentation(
- segmentationId
- );
+ const segmentationState = cstSegmentation.state.getSegmentation(segmentationId);
if (!segmentationState) {
return;
}
- const {
- activeSegmentIndex,
- cachedStats,
- segmentsLocked,
- label,
- type,
- } = segmentationState;
+ const { activeSegmentIndex, cachedStats, segmentsLocked, label, type } = segmentationState;
if (![LABELMAP, CONTOUR].includes(type)) {
throw new Error(
@@ -2018,10 +1824,7 @@ class SegmentationService extends PubSubService {
try {
this.addOrUpdateSegmentation(segmentationSchema);
} catch (error) {
- console.warn(
- `Failed to add/update segmentation ${segmentationId}`,
- error
- );
+ console.warn(`Failed to add/update segmentation ${segmentationId}`, error);
}
};
@@ -2037,9 +1840,7 @@ class SegmentationService extends PubSubService {
);
if (!segmentationRepresentation) {
- throw new Error(
- 'Must add representation to toolgroup before setting segments'
- );
+ throw new Error('Must add representation to toolgroup before setting segments');
}
const { segmentationRepresentationUID } = segmentationRepresentation;
@@ -2057,14 +1858,11 @@ class SegmentationService extends PubSubService {
return;
}
- const toolGroupIds = segmentationState.getToolGroupIdsWithSegmentation(
- segmentationId
- );
+ const toolGroupIds = segmentationState.getToolGroupIdsWithSegmentation(segmentationId);
toolGroupIds.forEach(toolGroupId => {
- const segmentationRepresentations = segmentationState.getSegmentationRepresentations(
- toolGroupId
- );
+ const segmentationRepresentations =
+ segmentationState.getSegmentationRepresentations(toolGroupId);
const UIDsToRemove = [];
segmentationRepresentations.forEach(representation => {
@@ -2089,17 +1887,12 @@ class SegmentationService extends PubSubService {
}
}
- private _updateCornerstoneSegmentations({
- segmentationId,
- notYetUpdatedAtSource,
- }) {
+ private _updateCornerstoneSegmentations({ segmentationId, notYetUpdatedAtSource }) {
if (notYetUpdatedAtSource === false) {
return;
}
const segmentationState = cstSegmentation.state;
- const sourceSegmentation = segmentationState.getSegmentation(
- segmentationId
- );
+ const sourceSegmentation = segmentationState.getSegmentation(segmentationId);
const segmentation = this.segmentations[segmentationId];
const { label, cachedStats } = segmentation;
@@ -2115,14 +1908,11 @@ class SegmentationService extends PubSubService {
private _updateCornerstoneSegmentationVisibility = segmentationId => {
const segmentationState = cstSegmentation.state;
- const toolGroupIds = segmentationState.getToolGroupIdsWithSegmentation(
- segmentationId
- );
+ const toolGroupIds = segmentationState.getToolGroupIdsWithSegmentation(segmentationId);
toolGroupIds.forEach(toolGroupId => {
- const segmentationRepresentations = cstSegmentation.state.getSegmentationRepresentations(
- toolGroupId
- );
+ const segmentationRepresentations =
+ cstSegmentation.state.getSegmentationRepresentations(toolGroupId);
if (segmentationRepresentations.length === 0) {
return;
@@ -2146,10 +1936,7 @@ class SegmentationService extends PubSubService {
);
// update segments visibility
- const { segmentation } = this._getSegmentationInfo(
- segmentationId,
- toolGroupId
- );
+ const { segmentation } = this._getSegmentationInfo(segmentationId, toolGroupId);
const segments = segmentation.segments.filter(Boolean);
@@ -2161,9 +1948,7 @@ class SegmentationService extends PubSubService {
private _getToolGroupIdsWithSegmentation(segmentationId: string) {
const segmentationState = cstSegmentation.state;
- const toolGroupIds = segmentationState.getToolGroupIdsWithSegmentation(
- segmentationId
- );
+ const toolGroupIds = segmentationState.getToolGroupIdsWithSegmentation(segmentationId);
return toolGroupIds;
}
diff --git a/extensions/cornerstone/src/services/SyncGroupService/SyncGroupService.ts b/extensions/cornerstone/src/services/SyncGroupService/SyncGroupService.ts
index 56a760d5f..0b1c22fb2 100644
--- a/extensions/cornerstone/src/services/SyncGroupService/SyncGroupService.ts
+++ b/extensions/cornerstone/src/services/SyncGroupService/SyncGroupService.ts
@@ -1,8 +1,4 @@
-import {
- synchronizers,
- SynchronizerManager,
- Synchronizer,
-} from '@cornerstonejs/tools';
+import { synchronizers, SynchronizerManager, Synchronizer } from '@cornerstonejs/tools';
import { pubSubServiceInterface, Types, ServicesManager } from '@ohif/core';
@@ -14,10 +10,7 @@ const EVENTS = {
* @params options - are an optional set of options associated with the first
* sync group declared.
*/
-export type SyncCreator = (
- id: string,
- options?: Record
-) => Synchronizer;
+export type SyncCreator = (id: string, options?: Record) => Synchronizer;
export type SyncGroup = {
type: string;
@@ -40,9 +33,7 @@ export default class SyncGroupService {
static REGISTRATION = {
name: 'syncGroupService',
altName: 'SyncGroupService',
- create: ({
- servicesManager,
- }: Types.Extensions.ExtensionParams): SyncGroupService => {
+ create: ({ servicesManager }: Types.Extensions.ExtensionParams): SyncGroupService => {
return new SyncGroupService(servicesManager);
},
};
@@ -65,11 +56,7 @@ export default class SyncGroupService {
Object.assign(this, pubSubServiceInterface);
}
- private _createSynchronizer(
- type: string,
- id: string,
- options
- ): Synchronizer | undefined {
+ private _createSynchronizer(type: string, id: string, options): Synchronizer | undefined {
const syncCreator = this.synchronizerCreators[type.toLowerCase()];
if (syncCreator) {
return syncCreator(id, options);
@@ -109,19 +96,11 @@ export default class SyncGroupService {
return;
}
- const syncGroupsArray = Array.isArray(syncGroups)
- ? syncGroups
- : [syncGroups];
+ const syncGroupsArray = Array.isArray(syncGroups) ? syncGroups : [syncGroups];
syncGroupsArray.forEach(syncGroup => {
const syncGroupObj = asSyncGroup(syncGroup);
- const {
- type,
- target = true,
- source = true,
- options = {},
- id = type,
- } = syncGroupObj;
+ const { type, target = true, source = true, options = {}, id = type } = syncGroupObj;
const synchronizer = this._getOrCreateSynchronizer(type, id, options);
synchronizer.setOptions(viewportId, options);
diff --git a/extensions/cornerstone/src/services/ToolGroupService/ToolGroupService.ts b/extensions/cornerstone/src/services/ToolGroupService/ToolGroupService.ts
index b8f6c9709..fc3d6c86c 100644
--- a/extensions/cornerstone/src/services/ToolGroupService/ToolGroupService.ts
+++ b/extensions/cornerstone/src/services/ToolGroupService/ToolGroupService.ts
@@ -24,9 +24,7 @@ export default class ToolGroupService {
public static REGISTRATION = {
name: 'toolGroupService',
altName: 'ToolGroupService',
- create: ({
- servicesManager,
- }: OhifTypes.Extensions.ExtensionParams): ToolGroupService => {
+ create: ({ servicesManager }: OhifTypes.Extensions.ExtensionParams): ToolGroupService => {
return new ToolGroupService(servicesManager);
},
};
@@ -40,10 +38,7 @@ export default class ToolGroupService {
EVENTS: { [key: string]: string };
constructor(serviceManager) {
- const {
- cornerstoneViewportService,
- viewportGridService,
- } = serviceManager.services;
+ const { cornerstoneViewportService, viewportGridService } = serviceManager.services;
this.cornerstoneViewportService = cornerstoneViewportService;
this.viewportGridService = viewportGridService;
this.listeners = {};
@@ -66,19 +61,14 @@ export default class ToolGroupService {
if (!toolGroupIdToUse) {
// Use the active viewport's tool group if no tool group id is provided
- const enabledElement = getActiveViewportEnabledElement(
- this.viewportGridService
- );
+ const enabledElement = getActiveViewportEnabledElement(this.viewportGridService);
if (!enabledElement) {
return;
}
const { renderingEngineId, viewportId } = enabledElement;
- const toolGroup = ToolGroupManager.getToolGroupForViewport(
- viewportId,
- renderingEngineId
- );
+ const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
if (!toolGroup) {
console.warn(
@@ -103,10 +93,7 @@ export default class ToolGroupService {
public getToolGroupForViewport(viewportId: string): Types.IToolGroup | void {
const renderingEngine = this.cornerstoneViewportService.getRenderingEngine();
- return ToolGroupManager.getToolGroupForViewport(
- viewportId,
- renderingEngine.id
- );
+ return ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngine.id);
}
public getActiveToolForViewport(viewportId: string): string {
@@ -133,10 +120,7 @@ export default class ToolGroupService {
renderingEngineId: string,
deleteToolGroupIfEmpty?: boolean
): void {
- const toolGroup = ToolGroupManager.getToolGroupForViewport(
- viewportId,
- renderingEngineId
- );
+ const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
if (!toolGroup) {
return;
@@ -193,11 +177,7 @@ export default class ToolGroupService {
return toolGroup;
}
- public addToolsToToolGroup(
- toolGroupId: string,
- tools: Array,
- configs: any = {}
- ): void {
+ public addToolsToToolGroup(toolGroupId: string, tools: Array, configs: any = {}): void {
const toolGroup = ToolGroupManager.getToolGroup(toolGroupId);
// this.changeConfigurationIfNecessary(toolGroup, volumeId);
this._addTools(toolGroup, tools, configs);
diff --git a/extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts b/extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts
index 6ee00b8ec..29ffe0d39 100644
--- a/extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts
+++ b/extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts
@@ -12,10 +12,7 @@ import {
Enums as csEnums,
} from '@cornerstonejs/core';
-import {
- utilities as csToolsUtils,
- Enums as csToolsEnums,
-} from '@cornerstonejs/tools';
+import { utilities as csToolsUtils, Enums as csToolsEnums } from '@cornerstonejs/tools';
import { IViewportService } from './IViewportService';
import { RENDERING_ENGINE_ID } from './constants';
import ViewportInfo, {
@@ -23,25 +20,20 @@ import ViewportInfo, {
DisplaySetOptions,
PublicViewportOptions,
} from './Viewport';
-import {
- StackViewportData,
- VolumeViewportData,
-} from '../../types/CornerstoneCacheService';
+import { StackViewportData, VolumeViewportData } from '../../types/CornerstoneCacheService';
import { Presentation, Presentations } from '../../types/Presentation';
import JumpPresets from '../../utils/JumpPresets';
const EVENTS = {
- VIEWPORT_DATA_CHANGED:
- 'event::cornerstoneViewportService:viewportDataChanged',
+ VIEWPORT_DATA_CHANGED: 'event::cornerstoneViewportService:viewportDataChanged',
};
/**
* Handles cornerstone viewport logic including enabling, disabling, and
* updating the viewport.
*/
-class CornerstoneViewportService extends PubSubService
- implements IViewportService {
+class CornerstoneViewportService extends PubSubService implements IViewportService {
static REGISTRATION = {
name: 'cornerstoneViewportService',
altName: 'CornerstoneViewportService',
@@ -182,8 +174,7 @@ class CornerstoneViewportService extends PubSubService
const camera = csViewport.getCamera();
return {
presentationIds,
- viewportType:
- !viewportType || viewportType === 'stack' ? 'stack' : 'volume',
+ viewportType: !viewportType || viewportType === 'stack' ? 'stack' : 'volume',
properties,
initialImageIndex,
camera,
@@ -202,10 +193,7 @@ class CornerstoneViewportService extends PubSubService
if (!presentation || !presentation.presentationIds) {
return;
}
- const {
- lutPresentationStore,
- positionPresentationStore,
- } = stateSyncService.getState();
+ const { lutPresentationStore, positionPresentationStore } = stateSyncService.getState();
const { presentationIds } = presentation;
const { lutPresentationId, positionPresentationId } = presentationIds || {};
const storeState = {};
@@ -258,12 +246,8 @@ class CornerstoneViewportService extends PubSubService
// override the viewportOptions and displaySetOptions with the public ones
// since those are the newly set ones, we set them here so that it handles defaults
- const displaySetOptions = viewportInfo.setPublicDisplaySetOptions(
- publicDisplaySetOptions
- );
- const viewportOptions = viewportInfo.setPublicViewportOptions(
- publicViewportOptions
- );
+ const displaySetOptions = viewportInfo.setPublicDisplaySetOptions(publicDisplaySetOptions);
+ const viewportOptions = viewportInfo.setPublicViewportOptions(publicViewportOptions);
const element = viewportInfo.getElement();
const type = viewportInfo.getViewportType();
@@ -317,11 +301,7 @@ class CornerstoneViewportService extends PubSubService
): Types.IStackViewport | Types.IVolumeViewport | null {
const viewportInfo = this.getViewportInfo(viewportId);
- if (
- !viewportInfo ||
- !this.renderingEngine ||
- this.renderingEngine.hasBeenDestroyed
- ) {
+ if (!viewportInfo || !this.renderingEngine || this.renderingEngine.hasBeenDestroyed) {
return null;
}
@@ -342,24 +322,15 @@ class CornerstoneViewportService extends PubSubService
): void {
const displaySetOptions = viewportInfo.getDisplaySetOptions();
- const {
- imageIds,
- initialImageIndex,
- displaySetInstanceUID,
- } = viewportData.data;
+ const { imageIds, initialImageIndex, displaySetInstanceUID } = viewportData.data;
this.viewportsDisplaySets.set(viewport.id, [displaySetInstanceUID]);
let initialImageIndexToUse =
- presentations?.positionPresentation?.initialImageIndex ??
- initialImageIndex;
+ presentations?.positionPresentation?.initialImageIndex ?? initialImageIndex;
- if (
- initialImageIndexToUse === undefined ||
- initialImageIndexToUse === null
- ) {
- initialImageIndexToUse =
- this._getInitialImageIndexForViewport(viewportInfo, imageIds) || 0;
+ if (initialImageIndexToUse === undefined || initialImageIndexToUse === null) {
+ initialImageIndexToUse = this._getInitialImageIndexForViewport(viewportInfo, imageIds) || 0;
}
const properties = { ...presentations.lutPresentation?.properties };
@@ -404,12 +375,8 @@ class CornerstoneViewportService extends PubSubService
if (viewportType === csEnums.ViewportType.STACK) {
numberOfSlices = imageIds.length;
} else if (viewportType === csEnums.ViewportType.ORTHOGRAPHIC) {
- const viewport = this.getCornerstoneViewport(
- viewportInfo.getViewportId()
- );
- const imageSliceData = csUtils.getImageSliceDataForVolumeViewport(
- viewport
- );
+ const viewport = this.getCornerstoneViewport(viewportInfo.getViewportId());
+ const imageSliceData = csUtils.getImageSliceDataForVolumeViewport(viewport);
if (!imageSliceData) {
return;
@@ -423,11 +390,7 @@ class CornerstoneViewportService extends PubSubService
return this._getInitialImageIndex(numberOfSlices, index, preset);
}
- _getInitialImageIndex(
- numberOfSlices: number,
- imageIndex?: number,
- preset?: JumpPresets
- ): number {
+ _getInitialImageIndex(numberOfSlices: number, imageIndex?: number, preset?: JumpPresets): number {
const lastSliceIndex = numberOfSlices - 1;
if (imageIndex !== undefined) {
@@ -449,9 +412,7 @@ class CornerstoneViewportService extends PubSubService
// it will jump to a different slice than the middle one which
// was the initial slice, and we have some tools such as Crosshairs
// which rely on a relative camera modifications and those will break.
- return lastSliceIndex % 2 === 0
- ? lastSliceIndex / 2
- : (lastSliceIndex + 1) / 2;
+ return lastSliceIndex % 2 === 0 ? lastSliceIndex / 2 : (lastSliceIndex + 1) / 2;
}
return 0;
@@ -521,22 +482,11 @@ class CornerstoneViewportService extends PubSubService
});
// This returns the async continuation only
- return this.setVolumesForViewport(
- viewport,
- volumeInputArray,
- presentations
- );
+ return this.setVolumesForViewport(viewport, volumeInputArray, presentations);
}
- public async setVolumesForViewport(
- viewport,
- volumeInputArray,
- presentations
- ) {
- const {
- displaySetService,
- toolGroupService,
- } = this.servicesManager.services;
+ public async setVolumesForViewport(viewport, volumeInputArray, presentations) {
+ const { displaySetService, toolGroupService } = this.servicesManager.services;
const viewportInfo = this.getViewportInfo(viewport.id);
const displaySetOptions = viewportInfo.getDisplaySetOptions();
@@ -594,10 +544,7 @@ class CornerstoneViewportService extends PubSubService
// associated with the primary displaySet
// get segmentations only returns the hydrated segmentations
- this._addSegmentationRepresentationToToolGroupIfNecessary(
- displaySetInstanceUIDs,
- viewport
- );
+ this._addSegmentationRepresentationToToolGroupIfNecessary(displaySetInstanceUIDs, viewport);
}
const toolGroup = toolGroupService.getToolGroupForViewport(viewport.id);
@@ -618,10 +565,7 @@ class CornerstoneViewportService extends PubSubService
displaySetInstanceUIDs: string[],
viewport: any
) {
- const {
- segmentationService,
- toolGroupService,
- } = this.servicesManager.services;
+ const { segmentationService, toolGroupService } = this.servicesManager.services;
const toolGroup = toolGroupService.getToolGroupForViewport(viewport.id);
@@ -630,9 +574,7 @@ class CornerstoneViewportService extends PubSubService
for (const segmentation of segmentations) {
const toolGroupSegmentationRepresentations =
- segmentationService.getSegmentationRepresentationsForToolGroup(
- toolGroup.id
- ) || [];
+ segmentationService.getSegmentationRepresentationsForToolGroup(toolGroup.id) || [];
// if there is already a segmentation representation for this segmentation
// for this toolGroup, don't bother at all
@@ -647,16 +589,12 @@ class CornerstoneViewportService extends PubSubService
// otherwise, check if the hydrated segmentations are in the same FOR
// as the primary displaySet, if so add the representation (since it was not there)
const { id: segDisplaySetInstanceUID, type } = segmentation;
- const segFrameOfReferenceUID = this._getFrameOfReferenceUID(
- segDisplaySetInstanceUID
- );
+ const segFrameOfReferenceUID = this._getFrameOfReferenceUID(segDisplaySetInstanceUID);
let shouldDisplaySeg = false;
for (const displaySetInstanceUID of displaySetInstanceUIDs) {
- const primaryFrameOfReferenceUID = this._getFrameOfReferenceUID(
- displaySetInstanceUID
- );
+ const primaryFrameOfReferenceUID = this._getFrameOfReferenceUID(displaySetInstanceUID);
if (segFrameOfReferenceUID === primaryFrameOfReferenceUID) {
shouldDisplaySeg = true;
@@ -677,14 +615,8 @@ class CornerstoneViewportService extends PubSubService
}
}
- private addOverlayRepresentationForDisplaySet(
- displaySet: any,
- viewport: any
- ) {
- const {
- segmentationService,
- toolGroupService,
- } = this.servicesManager.services;
+ private addOverlayRepresentationForDisplaySet(displaySet: any, viewport: any) {
+ const { segmentationService, toolGroupService } = this.servicesManager.services;
const { referencedVolumeId } = displaySet;
const segmentationId = displaySet.displaySetInstanceUID;
@@ -711,10 +643,7 @@ class CornerstoneViewportService extends PubSubService
const viewport = this.getCornerstoneViewport(viewportId);
const viewportCamera = viewport.getCamera();
- if (
- viewport instanceof VolumeViewport ||
- viewport instanceof VolumeViewport3D
- ) {
+ if (viewport instanceof VolumeViewport || viewport instanceof VolumeViewport3D) {
this._setVolumeViewport(viewport, viewportData, viewportInfo).then(() => {
if (keepCamera) {
viewport.setCamera(viewportCamera);
@@ -744,10 +673,7 @@ class CornerstoneViewportService extends PubSubService
viewportInfo,
presentations
);
- } else if (
- viewport instanceof VolumeViewport ||
- viewport instanceof VolumeViewport3D
- ) {
+ } else if (viewport instanceof VolumeViewport || viewport instanceof VolumeViewport3D) {
this._setVolumeViewport(
viewport,
viewportData as VolumeViewportData,
@@ -770,10 +696,7 @@ class CornerstoneViewportService extends PubSubService
_getSlabThickness(displaySetOptions, volumeId) {
const { blendMode } = displaySetOptions;
- if (
- blendMode === undefined ||
- displaySetOptions.slabThickness === undefined
- ) {
+ if (blendMode === undefined || displaySetOptions.slabThickness === undefined) {
return;
}
@@ -799,9 +722,7 @@ class CornerstoneViewportService extends PubSubService
_getFrameOfReferenceUID(displaySetInstanceUID) {
const { displaySetService } = this.servicesManager.services;
- const displaySet = displaySetService.getDisplaySetByUID(
- displaySetInstanceUID
- );
+ const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
if (!displaySet) {
return;
diff --git a/extensions/cornerstone/src/services/ViewportService/IViewportService.ts b/extensions/cornerstone/src/services/ViewportService/IViewportService.ts
index 82f6d2058..e96a7d702 100644
--- a/extensions/cornerstone/src/services/ViewportService/IViewportService.ts
+++ b/extensions/cornerstone/src/services/ViewportService/IViewportService.ts
@@ -1,10 +1,6 @@
import { Types } from '@cornerstonejs/core';
import { StackData, VolumeData } from '../../types/CornerstoneCacheService';
-import {
- DisplaySetOptions,
- PublicViewportOptions,
- ViewportOptions,
-} from './Viewport';
+import { DisplaySetOptions, PublicViewportOptions, ViewportOptions } from './Viewport';
/**
* Handles cornerstone viewport logic including enabling, disabling, and
diff --git a/extensions/cornerstone/src/services/ViewportService/Viewport.ts b/extensions/cornerstone/src/services/ViewportService/Viewport.ts
index d27f2129f..42fa56046 100644
--- a/extensions/cornerstone/src/services/ViewportService/Viewport.ts
+++ b/extensions/cornerstone/src/services/ViewportService/Viewport.ts
@@ -1,9 +1,6 @@
import { Types, Enums } from '@cornerstonejs/core';
import { Types as UITypes } from '@ohif/ui';
-import {
- StackViewportData,
- VolumeViewportData,
-} from '../../types/CornerstoneCacheService';
+import { StackViewportData, VolumeViewportData } from '../../types/CornerstoneCacheService';
import getCornerstoneBlendMode from '../../utils/getCornerstoneBlendMode';
import getCornerstoneOrientation from '../../utils/getCornerstoneOrientation';
import getCornerstoneViewportType from '../../utils/getCornerstoneViewportType';
@@ -90,11 +87,7 @@ const DEFAULT_TOOLGROUP_ID = 'default';
// Return true if the data contains the given display set UID OR the imageId
// if it is a composite object.
-const dataContains = (
- data,
- displaySetUID: string,
- imageId?: string
-): boolean => {
+const dataContains = (data, displaySetUID: string, imageId?: string): boolean => {
if (data.displaySetInstanceUID === displaySetUID) {
return true;
}
@@ -128,9 +121,7 @@ class ViewportInfo {
}
if (this.viewportData.data.length) {
- return !!this.viewportData.data.find(data =>
- dataContains(data, displaySetUID, imageId)
- );
+ return !!this.viewportData.data.find(data => dataContains(data, displaySetUID, imageId));
}
return dataContains(this.viewportData.data, displaySetUID, imageId);
}
@@ -158,9 +149,7 @@ class ViewportInfo {
this.element = element;
}
- public setViewportData(
- viewportData: StackViewportData | VolumeViewportData
- ): void {
+ public setViewportData(viewportData: StackViewportData | VolumeViewportData): void {
this.viewportData = viewportData;
}
@@ -168,7 +157,6 @@ class ViewportInfo {
return this.viewportData;
}
-
public getElement(): HTMLDivElement {
return this.element;
}
@@ -181,13 +169,11 @@ class ViewportInfo {
publicDisplaySetOptions: PublicDisplaySetOptions[] | DisplaySetSelector[]
): Array {
// map the displaySetOptions and check if they are undefined then set them to default values
- const displaySetOptions = this.mapDisplaySetOptions(
- publicDisplaySetOptions
- );
+ const displaySetOptions = this.mapDisplaySetOptions(publicDisplaySetOptions);
this.setDisplaySetOptions(displaySetOptions);
- return this.displaySetOptions
+ return this.displaySetOptions;
}
public hasDisplaySet(displaySetInstanceUID: string): boolean {
@@ -196,8 +182,9 @@ class ViewportInfo {
// via cornerstoneViewportService
let viewportData = this.getViewportData();
- if (viewportData.viewportType === Enums.ViewportType.ORTHOGRAPHIC ||
- viewportData.viewportType === Enums.ViewportType.VOLUME_3D
+ if (
+ viewportData.viewportType === Enums.ViewportType.ORTHOGRAPHIC ||
+ viewportData.viewportType === Enums.ViewportType.VOLUME_3D
) {
viewportData = viewportData as VolumeViewportData;
return viewportData.data.some(
@@ -209,22 +196,15 @@ class ViewportInfo {
return viewportData.data.displaySetInstanceUID === displaySetInstanceUID;
}
- public setPublicViewportOptions(
- viewportOptionsEntry: PublicViewportOptions
- ): ViewportOptions {
+ public setPublicViewportOptions(viewportOptionsEntry: PublicViewportOptions): ViewportOptions {
let viewportType = viewportOptionsEntry.viewportType;
- const {
- toolGroupId = DEFAULT_TOOLGROUP_ID,
- presentationIds,
- } = viewportOptionsEntry;
+ const { toolGroupId = DEFAULT_TOOLGROUP_ID, presentationIds } = viewportOptionsEntry;
let orientation;
if (!viewportType) {
viewportType = getCornerstoneViewportType(STACK);
} else {
- viewportType = getCornerstoneViewportType(
- viewportOptionsEntry.viewportType
- );
+ viewportType = getCornerstoneViewportType(viewportOptionsEntry.viewportType);
}
// map SAGITTAL, AXIAL, CORONAL orientation to be used by cornerstone
@@ -256,9 +236,7 @@ class ViewportInfo {
return this.viewportOptions;
}
- public setDisplaySetOptions(
- displaySetOptions: Array
- ): void {
+ public setDisplaySetOptions(displaySetOptions: Array): void {
this.displaySetOptions = displaySetOptions;
}
diff --git a/extensions/cornerstone/src/state.ts b/extensions/cornerstone/src/state.ts
index 821078c1d..4af81e7de 100644
--- a/extensions/cornerstone/src/state.ts
+++ b/extensions/cornerstone/src/state.ts
@@ -9,11 +9,7 @@ const state = {
* @param {HTMLElement} dom Active viewport element.
* @return void
*/
-const setEnabledElement = (
- viewportId: string,
- element: HTMLElement,
- context?: string
-): void => {
+const setEnabledElement = (viewportId: string, element: HTMLElement, context?: string): void => {
const targetContext = context || state.DEFAULT_CONTEXT;
state.enabledElements[viewportId] = {
diff --git a/extensions/cornerstone/src/tools/CalibrationLineTool.ts b/extensions/cornerstone/src/tools/CalibrationLineTool.ts
index 1db404034..ae914019b 100644
--- a/extensions/cornerstone/src/tools/CalibrationLineTool.ts
+++ b/extensions/cornerstone/src/tools/CalibrationLineTool.ts
@@ -25,8 +25,7 @@ class CalibrationLineTool extends LengthTool {
this._renderingViewport.worldToCanvas(p)
);
// for display, round to 2 decimal points
- const lengthPx =
- Math.round(calculateLength2(canvasPoint1, canvasPoint2) * 100) / 100;
+ const lengthPx = Math.round(calculateLength2(canvasPoint1, canvasPoint2) * 100) / 100;
const textLines = [`${lengthPx}px`];
@@ -64,17 +63,11 @@ export function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
const length =
Math.round(
- calculateLength3(
- annotationData.handles.points[0],
- annotationData.handles.points[1]
- ) * 100
+ calculateLength3(annotationData.handles.points[0], annotationData.handles.points[1]) * 100
) / 100;
// calculate the currently applied pixel spacing on the viewport
- const calibratedPixelSpacing = metaData.get(
- 'calibratedPixelSpacing',
- imageId
- );
+ const calibratedPixelSpacing = metaData.get('calibratedPixelSpacing', imageId);
const imagePlaneModule = metaData.get('imagePlaneModule', imageId);
const currentRowPixelSpacing =
calibratedPixelSpacing?.[0] || imagePlaneModule?.rowPixelSpacing || 1;
@@ -87,12 +80,7 @@ export function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
const colSpacing = spacingScale * currentColumnPixelSpacing;
// trigger resize of the viewport to adjust the world/pixel mapping
- calibrateImageSpacing(
- imageId,
- viewport.getRenderingEngine(),
- rowSpacing,
- colSpacing
- );
+ calibrateImageSpacing(imageId, viewport.getRenderingEngine(), rowSpacing, colSpacing);
};
return new Promise((resolve, reject) => {
diff --git a/extensions/cornerstone/src/types/index.ts b/extensions/cornerstone/src/types/index.ts
index 6c729817d..c8db85fb7 100644
--- a/extensions/cornerstone/src/types/index.ts
+++ b/extensions/cornerstone/src/types/index.ts
@@ -1,7 +1,4 @@
-import * as CornerstoneCacheService from './CornerstoneCacheService'
+import * as CornerstoneCacheService from './CornerstoneCacheService';
import CornerstoneServices from './CornerstoneServices';
-export type {
- CornerstoneCacheService,
- CornerstoneServices,
-}
+export type { CornerstoneCacheService, CornerstoneServices };
diff --git a/extensions/cornerstone/src/utils/CornerstoneViewportDownloadForm.tsx b/extensions/cornerstone/src/utils/CornerstoneViewportDownloadForm.tsx
index b9971059b..048c6d008 100644
--- a/extensions/cornerstone/src/utils/CornerstoneViewportDownloadForm.tsx
+++ b/extensions/cornerstone/src/utils/CornerstoneViewportDownloadForm.tsx
@@ -27,31 +27,22 @@ const CornerstoneViewportDownloadForm = ({
const activeViewportElement = enabledElement?.element;
const activeViewportEnabledElement = getEnabledElement(activeViewportElement);
- const {
- viewportId: activeViewportId,
- renderingEngineId,
- } = activeViewportEnabledElement;
+ const { viewportId: activeViewportId, renderingEngineId } = activeViewportEnabledElement;
- const toolGroup = ToolGroupManager.getToolGroupForViewport(
- activeViewportId,
- renderingEngineId
- );
+ const toolGroup = ToolGroupManager.getToolGroupForViewport(activeViewportId, renderingEngineId);
- const toolModeAndBindings = Object.keys(toolGroup.toolOptions).reduce(
- (acc, toolName) => {
- const tool = toolGroup.toolOptions[toolName];
- const { mode, bindings } = tool;
+ const toolModeAndBindings = Object.keys(toolGroup.toolOptions).reduce((acc, toolName) => {
+ const tool = toolGroup.toolOptions[toolName];
+ const { mode, bindings } = tool;
- return {
- ...acc,
- [toolName]: {
- mode,
- bindings,
- },
- };
- },
- {}
- );
+ return {
+ ...acc,
+ [toolName]: {
+ mode,
+ bindings,
+ },
+ };
+ }, {});
useEffect(() => {
return () => {
@@ -64,9 +55,7 @@ const CornerstoneViewportDownloadForm = ({
const enableViewport = viewportElement => {
if (viewportElement) {
- const { renderingEngine, viewport } = getEnabledElement(
- activeViewportElement
- );
+ const { renderingEngine, viewport } = getEnabledElement(activeViewportElement);
const viewportInput = {
viewportId: VIEWPORT_ID,
@@ -91,11 +80,7 @@ const CornerstoneViewportDownloadForm = ({
}
};
- const updateViewportPreview = (
- downloadViewportElement,
- internalCanvas,
- fileType
- ) =>
+ const updateViewportPreview = (downloadViewportElement, internalCanvas, fileType) =>
new Promise(resolve => {
const enabledElement = getEnabledElement(downloadViewportElement);
@@ -133,10 +118,7 @@ const CornerstoneViewportDownloadForm = ({
resolve({ dataUrl, width: newWidth, height: newHeight });
- downloadViewportElement.removeEventListener(
- Enums.Events.IMAGE_RENDERED,
- updateViewport
- );
+ downloadViewportElement.removeEventListener(Enums.Events.IMAGE_RENDERED, updateViewport);
}
);
});
@@ -144,9 +126,7 @@ const CornerstoneViewportDownloadForm = ({
const loadImage = (activeViewportElement, viewportElement, width, height) =>
new Promise(resolve => {
if (activeViewportElement && viewportElement) {
- const activeViewportEnabledElement = getEnabledElement(
- activeViewportElement
- );
+ const activeViewportEnabledElement = getEnabledElement(activeViewportElement);
if (!activeViewportEnabledElement) {
return;
@@ -165,10 +145,7 @@ const CornerstoneViewportDownloadForm = ({
downloadViewport.setProperties(properties);
const newWidth = Math.min(width || image.width, MAX_TEXTURE_SIZE);
- const newHeight = Math.min(
- height || image.height,
- MAX_TEXTURE_SIZE
- );
+ const newHeight = Math.min(height || image.height, MAX_TEXTURE_SIZE);
resolve({ width: newWidth, height: newHeight });
});
@@ -190,31 +167,19 @@ const CornerstoneViewportDownloadForm = ({
}
});
- const toggleAnnotations = (
- toggle,
- viewportElement,
- activeViewportElement
- ) => {
- const activeViewportEnabledElement = getEnabledElement(
- activeViewportElement
- );
+ const toggleAnnotations = (toggle, viewportElement, activeViewportElement) => {
+ const activeViewportEnabledElement = getEnabledElement(activeViewportElement);
const downloadViewportElement = getEnabledElement(viewportElement);
- const {
- viewportId: activeViewportId,
- renderingEngineId,
- } = activeViewportEnabledElement;
+ const { viewportId: activeViewportId, renderingEngineId } = activeViewportEnabledElement;
const { viewportId: downloadViewportId } = downloadViewportElement;
if (!activeViewportEnabledElement || !downloadViewportElement) {
return;
}
- const toolGroup = ToolGroupManager.getToolGroupForViewport(
- activeViewportId,
- renderingEngineId
- );
+ const toolGroup = ToolGroupManager.getToolGroupForViewport(activeViewportId, renderingEngineId);
// add the viewport to the toolGroup
toolGroup.addViewport(downloadViewportId, renderingEngineId);
diff --git a/extensions/cornerstone/src/utils/DicomFileUploader.ts b/extensions/cornerstone/src/utils/DicomFileUploader.ts
index 45a6c9e94..cfbad0745 100644
--- a/extensions/cornerstone/src/utils/DicomFileUploader.ts
+++ b/extensions/cornerstone/src/utils/DicomFileUploader.ts
@@ -98,22 +98,13 @@ export default class DicomFileUploader extends PubSubService {
});
},
timeout: () => {
- this._reject(
- reject,
- new UploadRejection(UploadStatus.Failed, 'The request timed out.')
- );
+ this._reject(reject, new UploadRejection(UploadStatus.Failed, 'The request timed out.'));
},
abort: () => {
- this._reject(
- reject,
- new UploadRejection(UploadStatus.Cancelled, 'Cancelled')
- );
+ this._reject(reject, new UploadRejection(UploadStatus.Cancelled, 'Cancelled'));
},
error: () => {
- this._reject(
- reject,
- new UploadRejection(UploadStatus.Failed, 'The request failed.')
- );
+ this._reject(reject, new UploadRejection(UploadStatus.Failed, 'The request failed.'));
},
};
@@ -122,10 +113,7 @@ export default class DicomFileUploader extends PubSubService {
.loadFileRequest(this._fileId)
.then(dicomFile => {
if (this._abortController.signal.aborted) {
- this._reject(
- reject,
- new UploadRejection(UploadStatus.Cancelled, 'Cancelled')
- );
+ this._reject(reject, new UploadRejection(UploadStatus.Cancelled, 'Cancelled'));
return;
}
@@ -133,10 +121,7 @@ export default class DicomFileUploader extends PubSubService {
// The file is not DICOM
this._reject(
reject,
- new UploadRejection(
- UploadStatus.Failed,
- 'Not a valid DICOM file.'
- )
+ new UploadRejection(UploadStatus.Failed, 'Not a valid DICOM file.')
);
return;
}
@@ -164,10 +149,7 @@ export default class DicomFileUploader extends PubSubService {
}
private _isRejected(): boolean {
- return (
- this._status === UploadStatus.Failed ||
- this._status === UploadStatus.Cancelled
- );
+ return this._status === UploadStatus.Failed || this._status === UploadStatus.Cancelled;
}
private _reject(reject: (reason?: any) => void, reason: any) {
diff --git a/extensions/cornerstone/src/utils/callInputDialog.tsx b/extensions/cornerstone/src/utils/callInputDialog.tsx
index dc35d6266..37d5021c5 100644
--- a/extensions/cornerstone/src/utils/callInputDialog.tsx
+++ b/extensions/cornerstone/src/utils/callInputDialog.tsx
@@ -21,11 +21,7 @@ function callInputDialog(
dialogConfig: any = {}
) {
const dialogId = 'dialog-enter-annotation';
- const label = data
- ? isArrowAnnotateInputDialog
- ? data.text
- : data.label
- : '';
+ const label = data ? (isArrowAnnotateInputDialog ? data.text : data.label) : '';
const {
dialogTitle = 'Annotation',
inputLabel = 'Enter your annotation',
@@ -69,7 +65,7 @@ function callInputDialog(
return (
{
return;
}
- return typeof imageObj.getImageId === 'function'
- ? imageObj.getImageId()
- : imageObj.url;
+ return typeof imageObj.getImageId === 'function' ? imageObj.getImageId() : imageObj.url;
};
const findImageIdOnStudies = (studies, displaySetInstanceUID) => {
@@ -163,9 +161,7 @@ class DicomLoaderService {
getDicomDataMethod = fetchIt.bind(this, imageId);
break;
default:
- throw new Error(
- `Unsupported image type: ${loaderType} for imageId: ${imageId}`
- );
+ throw new Error(`Unsupported image type: ${loaderType} for imageId: ${imageId}`);
}
return getDicomDataMethod();
diff --git a/extensions/cornerstone/src/utils/getActiveViewportEnabledElement.ts b/extensions/cornerstone/src/utils/getActiveViewportEnabledElement.ts
index d067622e0..e63e85f79 100644
--- a/extensions/cornerstone/src/utils/getActiveViewportEnabledElement.ts
+++ b/extensions/cornerstone/src/utils/getActiveViewportEnabledElement.ts
@@ -3,9 +3,7 @@ import { IEnabledElement } from '@cornerstonejs/core/dist/esm/types';
import { getEnabledElement as OHIFgetEnabledElement } from '../state';
-export default function getActiveViewportEnabledElement(
- viewportGridService
-): IEnabledElement {
+export default function getActiveViewportEnabledElement(viewportGridService): IEnabledElement {
const { activeViewportId } = viewportGridService.getState();
const { element } = OHIFgetEnabledElement(activeViewportId) || {};
const enabledElement = getEnabledElement(element);
diff --git a/extensions/cornerstone/src/utils/getCornerstoneBlendMode.ts b/extensions/cornerstone/src/utils/getCornerstoneBlendMode.ts
index 4bc7cb449..37dca4c10 100644
--- a/extensions/cornerstone/src/utils/getCornerstoneBlendMode.ts
+++ b/extensions/cornerstone/src/utils/getCornerstoneBlendMode.ts
@@ -2,9 +2,7 @@ import { Enums } from '@cornerstonejs/core';
const MIP = 'mip';
-export default function getCornerstoneBlendMode(
- blendMode: string
-): Enums.BlendModes {
+export default function getCornerstoneBlendMode(blendMode: string): Enums.BlendModes {
if (!blendMode) {
return Enums.BlendModes.COMPOSITE;
}
diff --git a/extensions/cornerstone/src/utils/getCornerstoneOrientation.ts b/extensions/cornerstone/src/utils/getCornerstoneOrientation.ts
index 8ac7b2cb5..6e47fe807 100644
--- a/extensions/cornerstone/src/utils/getCornerstoneOrientation.ts
+++ b/extensions/cornerstone/src/utils/getCornerstoneOrientation.ts
@@ -4,9 +4,7 @@ const AXIAL = 'axial';
const SAGITTAL = 'sagittal';
const CORONAL = 'coronal';
-export default function getCornerstoneOrientation(
- orientation: string
-): Enums.OrientationAxis {
+export default function getCornerstoneOrientation(orientation: string): Enums.OrientationAxis {
if (orientation) {
switch (orientation.toLowerCase()) {
case AXIAL:
diff --git a/extensions/cornerstone/src/utils/getCornerstoneViewportType.ts b/extensions/cornerstone/src/utils/getCornerstoneViewportType.ts
index 47a5ede85..9a5dd71de 100644
--- a/extensions/cornerstone/src/utils/getCornerstoneViewportType.ts
+++ b/extensions/cornerstone/src/utils/getCornerstoneViewportType.ts
@@ -5,9 +5,7 @@ const VOLUME = 'volume';
const ORTHOGRAPHIC = 'orthographic';
const VOLUME_3D = 'volume3d';
-export default function getCornerstoneViewportType(
- viewportType: string
-): Enums.ViewportType {
+export default function getCornerstoneViewportType(viewportType: string): Enums.ViewportType {
const lowerViewportType = viewportType.toLowerCase();
if (lowerViewportType === STACK) {
return Enums.ViewportType.STACK;
@@ -21,7 +19,5 @@ export default function getCornerstoneViewportType(
return Enums.ViewportType.VOLUME_3D;
}
- throw new Error(
- `Invalid viewport type: ${viewportType}. Valid types are: stack, volume`
- );
+ throw new Error(`Invalid viewport type: ${viewportType}. Valid types are: stack, volume`);
}
diff --git a/extensions/cornerstone/src/utils/getNthFrames.js b/extensions/cornerstone/src/utils/getNthFrames.js
index 09bfc0b1e..38df66d95 100644
--- a/extensions/cornerstone/src/utils/getNthFrames.js
+++ b/extensions/cornerstone/src/utils/getNthFrames.js
@@ -19,11 +19,7 @@ export default function getNthFrames(imageIds) {
const centerEnd = centerStart + 6;
for (let i = 0; i < imageIds.length; i++) {
- if (
- i < 2 ||
- i > imageIds.length - 4 ||
- (i > centerStart && i < centerEnd)
- ) {
+ if (i < 2 || i > imageIds.length - 4 || (i > centerStart && i < centerEnd)) {
frames[0].push(imageIds[i]);
} else if (i % 7 === 2) {
frames[1].push(imageIds[i]);
@@ -33,12 +29,6 @@ export default function getNthFrames(imageIds) {
frames[(i % 2) + 3].push(imageIds[i]);
}
}
- const ret = [
- ...frames[0],
- ...frames[1],
- ...frames[2],
- ...frames[3],
- ...frames[4],
- ];
+ const ret = [...frames[0], ...frames[1], ...frames[2], ...frames[3], ...frames[4]];
return ret;
}
diff --git a/extensions/cornerstone/src/utils/interleaveCenterLoader.ts b/extensions/cornerstone/src/utils/interleaveCenterLoader.ts
index 0047f0ac0..d8f64b5d8 100644
--- a/extensions/cornerstone/src/utils/interleaveCenterLoader.ts
+++ b/extensions/cornerstone/src/utils/interleaveCenterLoader.ts
@@ -105,9 +105,7 @@ export default function interleaveCenterLoader({
const { imageId } = request;
AllRequests.forEach(volumeRequests => {
- const volumeImageIdRequest = volumeRequests.find(
- req => req.imageId === imageId
- );
+ const volumeImageIdRequest = volumeRequests.find(req => req.imageId === imageId);
if (volumeImageIdRequest) {
finalRequests.push(volumeImageIdRequest);
}
@@ -117,31 +115,17 @@ export default function interleaveCenterLoader({
const requestType = Enums.RequestType.Prefetch;
const priority = 0;
- finalRequests.forEach(
- ({ callLoadImage, additionalDetails, imageId, imageIdIndex, options }) => {
- const callLoadImageBound = callLoadImage.bind(
- null,
- imageId,
- imageIdIndex,
- options
- );
+ finalRequests.forEach(({ callLoadImage, additionalDetails, imageId, imageIdIndex, options }) => {
+ const callLoadImageBound = callLoadImage.bind(null, imageId, imageIdIndex, options);
- imageLoadPoolManager.addRequest(
- callLoadImageBound,
- requestType,
- additionalDetails,
- priority
- );
- }
- );
+ imageLoadPoolManager.addRequest(callLoadImageBound, requestType, additionalDetails, priority);
+ });
// clear the volumeIdMapsToLoad
volumeIdMapsToLoad.clear();
// copy the viewportIdVolumeInputArrayMap
- const viewportIdVolumeInputArrayMapCopy = new Map(
- viewportIdVolumeInputArrayMap
- );
+ const viewportIdVolumeInputArrayMapCopy = new Map(viewportIdVolumeInputArrayMap);
// reset the viewportIdVolumeInputArrayMap
viewportIdVolumeInputArrayMap.clear();
diff --git a/extensions/cornerstone/src/utils/interleaveTopToBottom.ts b/extensions/cornerstone/src/utils/interleaveTopToBottom.ts
index 162bb5588..0caf40372 100644
--- a/extensions/cornerstone/src/utils/interleaveTopToBottom.ts
+++ b/extensions/cornerstone/src/utils/interleaveTopToBottom.ts
@@ -94,9 +94,7 @@ export default function interleaveTopToBottom({
const { imageId } = request;
AllRequests.forEach(volumeRequests => {
- const volumeImageIdRequest = volumeRequests.find(
- req => req.imageId === imageId
- );
+ const volumeImageIdRequest = volumeRequests.find(req => req.imageId === imageId);
if (volumeImageIdRequest) {
finalRequests.push(volumeImageIdRequest);
}
@@ -106,31 +104,17 @@ export default function interleaveTopToBottom({
const requestType = Enums.RequestType.Prefetch;
const priority = 0;
- finalRequests.forEach(
- ({ callLoadImage, additionalDetails, imageId, imageIdIndex, options }) => {
- const callLoadImageBound = callLoadImage.bind(
- null,
- imageId,
- imageIdIndex,
- options
- );
+ finalRequests.forEach(({ callLoadImage, additionalDetails, imageId, imageIdIndex, options }) => {
+ const callLoadImageBound = callLoadImage.bind(null, imageId, imageIdIndex, options);
- imageLoadPoolManager.addRequest(
- callLoadImageBound,
- requestType,
- additionalDetails,
- priority
- );
- }
- );
+ imageLoadPoolManager.addRequest(callLoadImageBound, requestType, additionalDetails, priority);
+ });
// clear the volumeIdMapsToLoad
volumeIdMapsToLoad.clear();
// copy the viewportIdVolumeInputArrayMap
- const viewportIdVolumeInputArrayMapCopy = new Map(
- viewportIdVolumeInputArrayMap
- );
+ const viewportIdVolumeInputArrayMapCopy = new Map(viewportIdVolumeInputArrayMap);
// reset the viewportIdVolumeInputArrayMap
viewportIdVolumeInputArrayMap.clear();
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/Angle.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/Angle.ts
index 767f550d4..40f9c9ef6 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/Angle.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/Angle.ts
@@ -32,11 +32,7 @@ const Angle = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
CornerstoneViewportService,
viewportId
@@ -55,14 +51,10 @@ const Angle = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- displaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, displaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -99,16 +91,11 @@ function getMappedAnnotations(annotation, DisplaySetService) {
const targetStats = cachedStats[targetId];
if (!referencedImageId) {
- throw new Error(
- 'Non-acquisition plane measurement mapping not supported'
- );
+ throw new Error('Non-acquisition plane measurement mapping not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -179,17 +166,9 @@ function getDisplayText(mappedAnnotations, displaySet) {
const displayText = [];
// Area is the same for all series
- const {
- angle,
- unit,
- SeriesNumber,
- SOPInstanceUID,
- frameNumber,
- } = mappedAnnotations[0];
+ const { angle, unit, SeriesNumber, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
@@ -202,9 +181,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
return displayText;
}
const roundedAngle = utils.roundNumber(angle, 2);
- displayText.push(
- `${roundedAngle} ${unit} (S: ${SeriesNumber}${instanceText}${frameText})`
- );
+ displayText.push(`${roundedAngle} ${unit} (S: ${SeriesNumber}${instanceText}${frameText})`);
return displayText;
}
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts
index 9a6f6e49b..d5a7129da 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts
@@ -31,11 +31,7 @@ const Length = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
cornerstoneViewportService,
viewportId
@@ -54,10 +50,7 @@ const Length = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- displaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, displaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
@@ -91,11 +84,8 @@ function getMappedAnnotations(annotation, displaySetService) {
const annotations = [];
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -126,9 +116,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
// Area is the same for all series
const { SeriesNumber, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/Bidirectional.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/Bidirectional.ts
index 781a0f909..a1c214e1c 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/Bidirectional.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/Bidirectional.ts
@@ -27,11 +27,7 @@ const Bidirectional = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
cornerstoneViewportService,
viewportId
@@ -50,14 +46,10 @@ const Bidirectional = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- displaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, displaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -94,16 +86,11 @@ function getMappedAnnotations(annotation, displaySetService) {
const targetStats = cachedStats[targetId];
if (!referencedImageId) {
- throw new Error(
- 'Non-acquisition plane measurement mapping not supported'
- );
+ throw new Error('Non-acquisition plane measurement mapping not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -175,19 +162,11 @@ function getDisplayText(mappedAnnotations, displaySet) {
const displayText = [];
// Area is the same for all series
- const {
- length,
- width,
- SeriesNumber,
- SOPInstanceUID,
- frameNumber,
- } = mappedAnnotations[0];
+ const { length, width, SeriesNumber, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
const roundedLength = utils.roundNumber(length, 2);
const roundedWidth = utils.roundNumber(width, 2);
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
@@ -197,9 +176,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
const instanceText = InstanceNumber ? ` I: ${InstanceNumber}` : '';
const frameText = displaySet.isMultiFrame ? ` F: ${frameNumber}` : '';
- displayText.push(
- `L: ${roundedLength} mm (S: ${SeriesNumber}${instanceText}${frameText})`
- );
+ displayText.push(`L: ${roundedLength} mm (S: ${SeriesNumber}${instanceText}${frameText})`);
displayText.push(`W: ${roundedWidth} mm`);
return displayText;
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/CircleROI.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/CircleROI.ts
index f261ac4ba..ac784878b 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/CircleROI.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/CircleROI.ts
@@ -25,11 +25,7 @@ const CircleROI = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
CornerstoneViewportService,
viewportId
@@ -48,14 +44,10 @@ const CircleROI = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- DisplaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, DisplaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -93,16 +85,11 @@ function getMappedAnnotations(annotation, DisplaySetService) {
if (!referencedImageId) {
// Todo: Non-acquisition plane measurement mapping not supported yet
- throw new Error(
- 'Non-acquisition plane measurement mapping not supported'
- );
+ throw new Error('Non-acquisition plane measurement mapping not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -150,12 +137,7 @@ function _getReport(mappedAnnotations, points, FrameOfReferenceUID) {
return;
}
- columns.push(
- `max (${unit})`,
- `mean (${unit})`,
- `std (${unit})`,
- `area (mm2)`
- );
+ columns.push(`max (${unit})`, `mean (${unit})`, `std (${unit})`, `area (mm2)`);
values.push(max, mean, stdDev, area);
});
@@ -188,9 +170,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
// Area is the same for all series
const { area, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/CobbAngle.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/CobbAngle.ts
index 6e2ebc79c..8c78a377d 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/CobbAngle.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/CobbAngle.ts
@@ -32,11 +32,7 @@ const CobbAngle = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
CornerstoneViewportService,
viewportId
@@ -55,14 +51,10 @@ const CobbAngle = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- displaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, displaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -99,16 +91,11 @@ function getMappedAnnotations(annotation, DisplaySetService) {
const targetStats = cachedStats[targetId];
if (!referencedImageId) {
- throw new Error(
- 'Non-acquisition plane measurement mapping not supported'
- );
+ throw new Error('Non-acquisition plane measurement mapping not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -179,17 +166,9 @@ function getDisplayText(mappedAnnotations, displaySet) {
const displayText = [];
// Area is the same for all series
- const {
- angle,
- unit,
- SeriesNumber,
- SOPInstanceUID,
- frameNumber,
- } = mappedAnnotations[0];
+ const { angle, unit, SeriesNumber, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
@@ -202,9 +181,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
return displayText;
}
const roundedAngle = utils.roundNumber(angle, 2);
- displayText.push(
- `${roundedAngle} ${unit} (S: ${SeriesNumber}${instanceText}${frameText})`
- );
+ displayText.push(`${roundedAngle} ${unit} (S: ${SeriesNumber}${instanceText}${frameText})`);
return displayText;
}
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts
index e20998534..aa7e5f129 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts
@@ -25,11 +25,7 @@ const EllipticalROI = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
cornerstoneViewportService,
viewportId
@@ -48,14 +44,10 @@ const EllipticalROI = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- displaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, displaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -93,16 +85,11 @@ function getMappedAnnotations(annotation, displaySetService) {
if (!referencedImageId) {
// Todo: Non-acquisition plane measurement mapping not supported yet
- throw new Error(
- 'Non-acquisition plane measurement mapping not supported'
- );
+ throw new Error('Non-acquisition plane measurement mapping not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -150,12 +137,7 @@ function _getReport(mappedAnnotations, points, FrameOfReferenceUID) {
return;
}
- columns.push(
- `max (${unit})`,
- `mean (${unit})`,
- `std (${unit})`,
- `area (mm2)`
- );
+ columns.push(`max (${unit})`, `mean (${unit})`, `std (${unit})`, `area (mm2)`);
values.push(max, mean, stdDev, area);
});
@@ -188,9 +170,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
// Area is the same for all series
const { area, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/Length.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/Length.ts
index fdc5993ab..249522e84 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/Length.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/Length.ts
@@ -32,11 +32,7 @@ const Length = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
cornerstoneViewportService,
viewportId
@@ -55,14 +51,10 @@ const Length = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- displaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, displaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -99,16 +91,11 @@ function getMappedAnnotations(annotation, displaySetService) {
const targetStats = cachedStats[targetId];
if (!referencedImageId) {
- throw new Error(
- 'Non-acquisition plane measurement mapping not supported'
- );
+ throw new Error('Non-acquisition plane measurement mapping not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -179,16 +166,9 @@ function getDisplayText(mappedAnnotations, displaySet) {
const displayText = [];
// Area is the same for all series
- const {
- length,
- SeriesNumber,
- SOPInstanceUID,
- frameNumber,
- } = mappedAnnotations[0];
+ const { length, SeriesNumber, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
@@ -202,9 +182,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
return displayText;
}
const roundedLength = utils.roundNumber(length, 2);
- displayText.push(
- `${roundedLength} mm (S: ${SeriesNumber}${instanceText}${frameText})`
- );
+ displayText.push(`${roundedLength} mm (S: ${SeriesNumber}${instanceText}${frameText})`);
return displayText;
}
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/PlanarFreehandROI.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/PlanarFreehandROI.ts
index 2b0fd7008..b6db513b6 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/PlanarFreehandROI.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/PlanarFreehandROI.ts
@@ -31,11 +31,7 @@ const PlanarFreehandROI = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
CornerstoneViewportService,
viewportId
@@ -54,14 +50,10 @@ const PlanarFreehandROI = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- DisplaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, DisplaySetService);
const displayText = getDisplayText(mappedAnnotations);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -96,10 +88,8 @@ function getMappedAnnotations(annotationData, DisplaySetService) {
const annotations = [];
- const {
- SOPInstanceUID: _SOPInstanceUID,
- SeriesInstanceUID: _SeriesInstanceUID,
- } = getSOPInstanceAttributes(referencedImageId) || {};
+ const { SOPInstanceUID: _SOPInstanceUID, SeriesInstanceUID: _SeriesInstanceUID } =
+ getSOPInstanceAttributes(referencedImageId) || {};
if (!_SOPInstanceUID || !_SeriesInstanceUID) {
return annotations;
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/RectangleROI.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/RectangleROI.ts
index 3694f76d0..035b87457 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/RectangleROI.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/RectangleROI.ts
@@ -25,11 +25,7 @@ const RectangleROI = {
throw new Error('Tool not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- StudyInstanceUID,
- } = getSOPInstanceAttributes(
+ const { SOPInstanceUID, SeriesInstanceUID, StudyInstanceUID } = getSOPInstanceAttributes(
referencedImageId,
CornerstoneViewportService,
viewportId
@@ -48,14 +44,10 @@ const RectangleROI = {
const { points } = data.handles;
- const mappedAnnotations = getMappedAnnotations(
- annotation,
- DisplaySetService
- );
+ const mappedAnnotations = getMappedAnnotations(annotation, DisplaySetService);
const displayText = getDisplayText(mappedAnnotations, displaySet);
- const getReport = () =>
- _getReport(mappedAnnotations, points, FrameOfReferenceUID);
+ const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID);
return {
uid: annotationUID,
@@ -93,16 +85,11 @@ function getMappedAnnotations(annotation, DisplaySetService) {
if (!referencedImageId) {
// Todo: Non-acquisition plane measurement mapping not supported yet
- throw new Error(
- 'Non-acquisition plane measurement mapping not supported'
- );
+ throw new Error('Non-acquisition plane measurement mapping not supported');
}
- const {
- SOPInstanceUID,
- SeriesInstanceUID,
- frameNumber,
- } = getSOPInstanceAttributes(referencedImageId);
+ const { SOPInstanceUID, SeriesInstanceUID, frameNumber } =
+ getSOPInstanceAttributes(referencedImageId);
const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(
SOPInstanceUID,
@@ -150,12 +137,7 @@ function _getReport(mappedAnnotations, points, FrameOfReferenceUID) {
return;
}
- columns.push(
- `max (${unit})`,
- `mean (${unit})`,
- `std (${unit})`,
- `area (mm2)`
- );
+ columns.push(`max (${unit})`, `mean (${unit})`, `std (${unit})`, `area (mm2)`);
values.push(max, mean, stdDev, area);
});
@@ -188,9 +170,7 @@ function getDisplayText(mappedAnnotations, displaySet) {
// Area is the same for all series
const { area, SOPInstanceUID, frameNumber } = mappedAnnotations[0];
- const instance = displaySet.images.find(
- image => image.SOPInstanceUID === SOPInstanceUID
- );
+ const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
let InstanceNumber;
if (instance) {
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.ts
index 2a4562e7d..e3ccf4e51 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.ts
@@ -23,15 +23,8 @@ const measurementServiceMappingsFactory = (
*/
const _getValueTypeFromToolType = toolType => {
- const {
- POLYLINE,
- ELLIPSE,
- CIRCLE,
- RECTANGLE,
- BIDIRECTIONAL,
- POINT,
- ANGLE,
- } = MeasurementService.VALUE_TYPES;
+ const { POLYLINE, ELLIPSE, CIRCLE, RECTANGLE, BIDIRECTIONAL, POINT, ANGLE } =
+ MeasurementService.VALUE_TYPES;
// TODO -> I get why this was attempted, but its not nearly flexible enough.
// A single measurement may have an ellipse + a bidirectional measurement, for instances.
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/utils/selection.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/utils/selection.ts
index 156133306..1de09d942 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/utils/selection.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/utils/selection.ts
@@ -18,24 +18,16 @@ function setAnnotationSelected(annotationUID: string, selected: boolean): void {
const isCurrentSelected = isAnnotationSelected(annotationUID);
// branch cut, avoid invoking imaging library unnecessarily.
if (isCurrentSelected !== selected) {
- cs3dToolAnnotationUtils.selection.setAnnotationSelected(
- annotationUID,
- selected
- );
+ cs3dToolAnnotationUtils.selection.setAnnotationSelected(annotationUID, selected);
}
}
function getFirstAnnotationSelected(element) {
- const [selectedAnnotationUID] =
- cs3dToolAnnotationUtils.selection.getAnnotationsSelected() || [];
+ const [selectedAnnotationUID] = cs3dToolAnnotationUtils.selection.getAnnotationsSelected() || [];
if (selectedAnnotationUID) {
return cs3dToolAnnotationUtils.state.getAnnotation(selectedAnnotationUID);
}
}
-export {
- isAnnotationSelected,
- setAnnotationSelected,
- getFirstAnnotationSelected,
-};
+export { isAnnotationSelected, setAnnotationSelected, getFirstAnnotationSelected };
diff --git a/extensions/cornerstone/src/utils/nthLoader.ts b/extensions/cornerstone/src/utils/nthLoader.ts
index bce0d22f5..90aab65a8 100644
--- a/extensions/cornerstone/src/utils/nthLoader.ts
+++ b/extensions/cornerstone/src/utils/nthLoader.ts
@@ -51,9 +51,7 @@ export default function interleaveNthLoader({
.map(volume => volume.getImageLoadRequests())
.filter(requests => requests?.[0]?.imageId);
- const orderedRequests = originalRequests.map(request =>
- getNthFrames(request)
- );
+ const orderedRequests = originalRequests.map(request => getNthFrames(request));
// set the finalRequests to the imageLoadPoolManager
const finalRequests = interleave(orderedRequests);
@@ -61,31 +59,17 @@ export default function interleaveNthLoader({
const requestType = Enums.RequestType.Prefetch;
const priority = 0;
- finalRequests.forEach(
- ({ callLoadImage, additionalDetails, imageId, imageIdIndex, options }) => {
- const callLoadImageBound = callLoadImage.bind(
- null,
- imageId,
- imageIdIndex,
- options
- );
+ finalRequests.forEach(({ callLoadImage, additionalDetails, imageId, imageIdIndex, options }) => {
+ const callLoadImageBound = callLoadImage.bind(null, imageId, imageIdIndex, options);
- imageLoadPoolManager.addRequest(
- callLoadImageBound,
- requestType,
- additionalDetails,
- priority
- );
- }
- );
+ imageLoadPoolManager.addRequest(callLoadImageBound, requestType, additionalDetails, priority);
+ });
// clear the volumeIdMapsToLoad
volumeIdMapsToLoad.clear();
// copy the viewportIdVolumeInputArrayMap
- const viewportIdVolumeInputArrayMapCopy = new Map(
- viewportIdVolumeInputArrayMap
- );
+ const viewportIdVolumeInputArrayMapCopy = new Map(viewportIdVolumeInputArrayMap);
// reset the viewportIdVolumeInputArrayMap
viewportIdVolumeInputArrayMap.clear();
diff --git a/extensions/cornerstone/src/utils/removeToolGroupSegmentationRepresentations.ts b/extensions/cornerstone/src/utils/removeToolGroupSegmentationRepresentations.ts
index 513321b32..b0f3e5796 100644
--- a/extensions/cornerstone/src/utils/removeToolGroupSegmentationRepresentations.ts
+++ b/extensions/cornerstone/src/utils/removeToolGroupSegmentationRepresentations.ts
@@ -1,9 +1,7 @@
import { segmentation } from '@cornerstonejs/tools';
function removeToolGroupSegmentationRepresentations(toolGroupId) {
- const representations = segmentation.state.getSegmentationRepresentations(
- toolGroupId
- );
+ const representations = segmentation.state.getSegmentationRepresentations(toolGroupId);
if (!representations || !representations.length) {
return;
diff --git a/extensions/cornerstone/src/utils/stackSync/calculateViewportRegistrations.ts b/extensions/cornerstone/src/utils/stackSync/calculateViewportRegistrations.ts
index cbb976534..aae2882b0 100644
--- a/extensions/cornerstone/src/utils/stackSync/calculateViewportRegistrations.ts
+++ b/extensions/cornerstone/src/utils/stackSync/calculateViewportRegistrations.ts
@@ -1,8 +1,6 @@
import { Types, getRenderingEngine, utilities } from '@cornerstonejs/core';
-export default function calculateViewportRegistrations(
- viewports: Types.IViewportId[]
-) {
+export default function calculateViewportRegistrations(viewports: Types.IViewportId[]) {
const viewportPairs = _getViewportPairs(viewports);
for (const [viewport, nextViewport] of viewportPairs) {
diff --git a/extensions/cornerstone/src/utils/stackSync/toggleStackImageSync.ts b/extensions/cornerstone/src/utils/stackSync/toggleStackImageSync.ts
index 7f7ce32cc..5e18b6ba4 100644
--- a/extensions/cornerstone/src/utils/stackSync/toggleStackImageSync.ts
+++ b/extensions/cornerstone/src/utils/stackSync/toggleStackImageSync.ts
@@ -6,28 +6,16 @@ import calculateViewportRegistrations from './calculateViewportRegistrations';
// ]}
let STACK_IMAGE_SYNC_GROUPS_INFO = [];
-export default function toggleStackImageSync({
- toggledState,
- servicesManager,
- getEnabledElement,
-}) {
- const {
- syncGroupService,
- viewportGridService,
- displaySetService,
- cornerstoneViewportService,
- } = servicesManager.services;
+export default function toggleStackImageSync({ toggledState, servicesManager, getEnabledElement }) {
+ const { syncGroupService, viewportGridService, displaySetService, cornerstoneViewportService } =
+ servicesManager.services;
if (!toggledState) {
STACK_IMAGE_SYNC_GROUPS_INFO.forEach(syncGroupInfo => {
const { viewports, synchronizerId } = syncGroupInfo;
viewports.forEach(({ viewportId, renderingEngineId }) => {
- syncGroupService.removeViewportFromSyncGroup(
- viewportId,
- renderingEngineId,
- synchronizerId
- );
+ syncGroupService.removeViewportFromSyncGroup(viewportId, renderingEngineId, synchronizerId);
});
});
@@ -47,9 +35,7 @@ export default function toggleStackImageSync({
const { displaySetInstanceUIDs } = viewport;
for (const displaySetInstanceUID of displaySetInstanceUIDs) {
- const displaySet = displaySetService.getDisplaySetByUID(
- displaySetInstanceUID
- );
+ const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
return !!displaySet?.isReconstructable;
}
@@ -64,8 +50,7 @@ export default function toggleStackImageSync({
}
const { element } = cornerstoneViewportService.getViewportInfo(viewportId);
- const { viewport: csViewport, renderingEngineId } =
- getEnabledElement(element);
+ const { viewport: csViewport, renderingEngineId } = getEnabledElement(element);
const { viewPlaneNormal } = csViewport.getCamera();
// Should we round here? I guess so, but not sure how much precision we need
@@ -82,9 +67,7 @@ export default function toggleStackImageSync({
// create synchronizer for each group
Object.values(viewportsByOrientation).map(viewports => {
- let synchronizerId = viewports
- .map(({ viewportId }) => viewportId)
- .join(',');
+ let synchronizerId = viewports.map(({ viewportId }) => viewportId).join(',');
synchronizerId = `imageSync_${synchronizerId}`;
diff --git a/extensions/default/.webpack/webpack.dev.js b/extensions/default/.webpack/webpack.dev.js
index 96d68096d..6aea859ca 100644
--- a/extensions/default/.webpack/webpack.dev.js
+++ b/extensions/default/.webpack/webpack.dev.js
@@ -7,7 +7,6 @@ const ENTRY = {
app: `${SRC_DIR}/index.tsx`,
};
-
module.exports = (env, argv) => {
return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
};
diff --git a/extensions/default/.webpack/webpack.prod.js b/extensions/default/.webpack/webpack.prod.js
index ea7b2e5bb..1151efc8b 100644
--- a/extensions/default/.webpack/webpack.prod.js
+++ b/extensions/default/.webpack/webpack.prod.js
@@ -40,13 +40,7 @@ module.exports = (env, argv) => {
libraryTarget: 'umd',
filename: pkg.main,
},
- externals: [
- /\b(vtk.js)/,
- /\b(dcmjs)/,
- /\b(gl-matrix)/,
- /^@ohif/,
- /^@cornerstonejs/,
- ],
+ externals: [/\b(vtk.js)/, /\b(dcmjs)/, /\b(gl-matrix)/, /^@ohif/, /^@cornerstonejs/],
plugins: [
new webpack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
diff --git a/extensions/default/src/Actions/createReportAsync.tsx b/extensions/default/src/Actions/createReportAsync.tsx
index 98080288b..af9520917 100644
--- a/extensions/default/src/Actions/createReportAsync.tsx
+++ b/extensions/default/src/Actions/createReportAsync.tsx
@@ -16,11 +16,7 @@ async function createReportAsync(
measurements,
options
) {
- const {
- displaySetService,
- uiNotificationService,
- uiDialogService,
- } = servicesManager.services;
+ const { displaySetService, uiNotificationService, uiDialogService } = servicesManager.services;
const loadingDialogId = uiDialogService.create({
showOverlay: true,
isDraggable: false,
diff --git a/extensions/default/src/Components/DataSourceConfigurationComponent.tsx b/extensions/default/src/Components/DataSourceConfigurationComponent.tsx
index c9606c54e..97896a92c 100644
--- a/extensions/default/src/Components/DataSourceConfigurationComponent.tsx
+++ b/extensions/default/src/Components/DataSourceConfigurationComponent.tsx
@@ -18,13 +18,10 @@ function DataSourceConfigurationComponent({
const { customizationService } = servicesManager.services;
- const [configurationAPI, setConfigurationAPI] = useState<
- Types.BaseDataSourceConfigurationAPI
- >();
+ const [configurationAPI, setConfigurationAPI] = useState();
- const [configuredItems, setConfiguredItems] = useState<
- Array
- >();
+ const [configuredItems, setConfiguredItems] =
+ useState>();
useEffect(() => {
let shouldUpdate = true;
@@ -37,9 +34,7 @@ function DataSourceConfigurationComponent({
}
const { factory: configurationAPIFactory } =
- customizationService.get(
- activeDataSourceDef.configuration.configurationAPI
- ) ?? {};
+ customizationService.get(activeDataSourceDef.configuration.configurationAPI) ?? {};
if (!configurationAPIFactory) {
return;
@@ -95,24 +90,25 @@ function DataSourceConfigurationComponent({
}, [configurationAPI, configuredItems, showConfigurationModal]);
return configuredItems ? (
-
- Your computer does not have enough GPU power to support the default GPU - rendering mode. OHIF has switched to CPU rendering mode. Please note - that CPU rendering does not support all features such as Volume - Rendering, Multiplanar Reconstruction, and Segmentation Overlays. + Your computer does not have enough GPU power to support the default GPU rendering mode. OHIF + has switched to CPU rendering mode. Please note that CPU rendering does not support all + features such as Volume Rendering, Multiplanar Reconstruction, and Segmentation Overlays.
+
+
);
})}
diff --git a/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx b/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx
index b10267740..c709a45e1 100644
--- a/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx
+++ b/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx
@@ -5,8 +5,7 @@ import { Icon } from '@ohif/ui';
import { Types } from '@ohif/core';
import ItemListComponent from './ItemListComponent';
-const NO_WRAP_ELLIPSIS_CLASS_NAMES =
- 'text-ellipsis whitespace-nowrap overflow-hidden';
+const NO_WRAP_ELLIPSIS_CLASS_NAMES = 'text-ellipsis whitespace-nowrap overflow-hidden';
type DataSourceConfigurationModalComponentProps = {
configurationAPI: Types.BaseDataSourceConfigurationAPI;
@@ -21,9 +20,7 @@ function DataSourceConfigurationModalComponent({
}: DataSourceConfigurationModalComponentProps) {
const { t } = useTranslation('DataSourceConfiguration');
- const [itemList, setItemList] = useState<
- Array
- >();
+ const [itemList, setItemList] = useState>();
const [selectedItems, setSelectedItems] = useState(configuredItems);
@@ -104,9 +101,7 @@ function DataSourceConfigurationModalComponent({
itemIndex < selectedItems.length
? classNames(
'bg-black/[.4]',
- itemIndex !== itemLabels.length - 1
- ? 'hover:bg-transparent active:bg-secondary-dark'
- : ''
+ itemIndex !== itemLabels.length - 1 ? 'hover:bg-transparent active:bg-secondary-dark' : ''
)
: 'bg-transparent';
@@ -118,17 +113,15 @@ function DataSourceConfigurationModalComponent({
: 'border border-dashed border-secondary-light';
const getSelectedItemTextClasses = itemIndex =>
- itemIndex <= selectedItems.length
- ? 'text-primary-light'
- : 'text-primary-active';
+ itemIndex <= selectedItems.length ? 'text-primary-light' : 'text-primary-active';
const getErrorComponent = (): ReactElement => {
return (
-
{item.name}
- {itemIndex !== configuredItems.length - 1 && (
- |
- )}
+ {itemIndex !== configuredItems.length - 1 && |
}
+
);
};
@@ -141,7 +134,7 @@ function DataSourceConfigurationModalComponent({
{t(`Error fetching ${itemLabels[selectedItems.length]} list`)}
- {errorMessage}
+ {errorMessage}
{
setShowFullConfig(false);
- setSelectedItems(theList =>
- theList.slice(0, itemLabelIndex)
- );
+ setSelectedItems(theList => theList.slice(0, itemLabelIndex));
}
: undefined
}
>
-
+
{itemLabelIndex < selectedItems.length ? (
{itemLabelIndex < selectedItems.length ? (
-
- {t(itemLabel)}
-
+ {t(itemLabel)}
+
{selectedItems[itemLabelIndex].name}
) : (
@@ -189,9 +173,9 @@ function DataSourceConfigurationModalComponent({
};
return (
-
+
{getSelectedItemsComponent()}
-
+
{errorMessage ? (
getErrorComponent()
) : (
@@ -200,10 +184,7 @@ function DataSourceConfigurationModalComponent({
itemList={itemList}
onItemClicked={item => {
setShowFullConfig(false);
- setSelectedItems(theList => [
- ...theList.slice(0, currentSelectedItemIndex + 1),
- item,
- ]);
+ setSelectedItems(theList => [...theList.slice(0, currentSelectedItemIndex + 1), item]);
}}
>
)}
diff --git a/extensions/default/src/Components/ItemListComponent.tsx b/extensions/default/src/Components/ItemListComponent.tsx
index b2d8525a3..d8c30714f 100644
--- a/extensions/default/src/Components/ItemListComponent.tsx
+++ b/extensions/default/src/Components/ItemListComponent.tsx
@@ -1,12 +1,7 @@
import classNames from 'classnames';
import React, { ReactElement, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import {
- Button,
- Icon,
- InputFilterText,
- LoadingIndicatorProgress,
-} from '@ohif/ui';
+import { Button, Icon, InputFilterText, LoadingIndicatorProgress } from '@ohif/ui';
import { Types } from '@ohif/core';
type ItemListComponentProps = {
@@ -28,37 +23,35 @@ function ItemListComponent({
}, [itemList]);
return (
-
-
-
- {t(`Select ${itemLabel}`)}
-
+
+
+
- {t(`Select ${itemLabel}`)}
+
{itemList == null ? (
-
-
+
) : (
<>
-
- {t(itemLabel)}
-
-
+
{t(itemLabel)}
+
{itemList
.filter(
item =>
- !filterValue ||
- item.name.toLowerCase().includes(filterValue.toLowerCase())
+ !filterValue || item.name.toLowerCase().includes(filterValue.toLowerCase())
)
.map(item => {
const border =
@@ -66,7 +59,7 @@ function ItemListComponent({
return (
- this.services.uiDialogService.dismiss({ id: 'context-menu' }),
+ onClickOutside: () => this.services.uiDialogService.dismiss({ id: 'context-menu' }),
contentProps: {
items,
@@ -170,9 +166,7 @@ export default class ContextMenuController {
};
static _isValidPosition = (source): boolean => {
- return (
- source && typeof source.x === 'number' && typeof source.y === 'number'
- );
+ return source && typeof source.x === 'number' && typeof source.y === 'number';
};
/**
@@ -180,10 +174,7 @@ export default class ContextMenuController {
*/
static _getDefaultPosition = (canvasPoints, eventDetail, viewerElement) => {
function* getPositionIterator() {
- yield ContextMenuController._getCanvasPointsPosition(
- canvasPoints,
- viewerElement
- );
+ yield ContextMenuController._getCanvasPointsPosition(canvasPoints, viewerElement);
yield ContextMenuController._getEventDefaultPosition(eventDetail);
yield ContextMenuController._getElementDefaultPosition(viewerElement);
yield ContextMenuController.getDefaultPosition();
diff --git a/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.test.js b/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.test.js
index b5555f71f..00ee469dd 100644
--- a/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.test.js
+++ b/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.test.js
@@ -1,4 +1,4 @@
-import ContextMenuItemsBuilder from "./ContextMenuItemsBuilder";
+import ContextMenuItemsBuilder from './ContextMenuItemsBuilder';
const menus = [
{
diff --git a/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.ts b/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.ts
index 2fe20e8d9..8b8b98532 100644
--- a/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.ts
+++ b/extensions/default/src/CustomizableContextMenu/ContextMenuItemsBuilder.ts
@@ -31,16 +31,11 @@ export function findMenuById(menus: Menu[], menuId?: string): Menu {
* @param {*} subProps
* @returns
*/
-export function findMenuDefault(
- menus: Menu[],
- subProps: Record
-): Menu {
+export function findMenuDefault(menus: Menu[], subProps: Record): Menu {
if (!menus) {
return null;
}
- return menus.find(
- menu => !menu.selector || menu.selector(subProps.selectorProps)
- );
+ return menus.find(menu => !menu.selector || menu.selector(subProps.selectorProps));
}
/**
@@ -53,11 +48,7 @@ export function findMenuDefault(
* @param menuIdFilter - menu id identifier (to be considered on selection)
* This is intended to support other types of filtering in the future.
*/
-export function findMenu(
- menus: Menu[],
- props?: Types.IProps,
- menuIdFilter?: string
-) {
+export function findMenu(menus: Menu[], props?: Types.IProps, menuIdFilter?: string) {
const { subMenu } = props;
function* findMenuIterator() {
@@ -137,10 +128,7 @@ export function getMenuItems(
if (!selector || selector(selectorProps)) {
if (delegating) {
- menuItems = [
- ...menuItems,
- ...getMenuItems(selectorProps, event, menus, subMenu),
- ];
+ menuItems = [...menuItems, ...getMenuItems(selectorProps, event, menus, subMenu)];
} else {
const toAdd = adaptItem(item, subProps);
menuItems.push(toAdd);
@@ -161,10 +149,7 @@ export function getMenuItems(
* @returns a MenuItem that is compatible with the base ContextMenu
* This requires having a label and set of actions to be called.
*/
-export function adaptItem(
- item: MenuItem,
- subProps: ContextMenuProps
-): ContextMenuItem {
+export function adaptItem(item: MenuItem, subProps: ContextMenuProps): ContextMenuItem {
const newItem: ContextMenuItem = {
...item,
value: subProps.selectorProps?.value,
diff --git a/extensions/default/src/DataSourceConfigurationAPI/GoogleCloudDataSourceConfigurationAPI.ts b/extensions/default/src/DataSourceConfigurationAPI/GoogleCloudDataSourceConfigurationAPI.ts
index 919592379..4e02cafae 100644
--- a/extensions/default/src/DataSourceConfigurationAPI/GoogleCloudDataSourceConfigurationAPI.ts
+++ b/extensions/default/src/DataSourceConfigurationAPI/GoogleCloudDataSourceConfigurationAPI.ts
@@ -29,15 +29,15 @@ const initialUrl = 'https://cloudresourcemanager.googleapis.com/v1';
const baseHealthcareUrl = 'https://healthcare.googleapis.com/v1';
class GoogleCloudDataSourceConfigurationAPIItem
- implements Types.BaseDataSourceConfigurationAPIItem {
+ implements Types.BaseDataSourceConfigurationAPIItem
+{
id: string;
name: string;
url: string;
itemType: ItemType;
}
-class GoogleCloudDataSourceConfigurationAPI
- implements Types.BaseDataSourceConfigurationAPI {
+class GoogleCloudDataSourceConfigurationAPI implements Types.BaseDataSourceConfigurationAPI {
private _extensionManager: ExtensionManager;
private _fetchOptions: { method: string; headers: unknown };
private _dataSourceName: string;
@@ -45,8 +45,7 @@ class GoogleCloudDataSourceConfigurationAPI
constructor(dataSourceName, servicesManager, extensionManager) {
this._dataSourceName = dataSourceName;
this._extensionManager = extensionManager;
- const userAuthenticationService =
- servicesManager.services.userAuthenticationService;
+ const userAuthenticationService = servicesManager.services.userAuthenticationService;
this._fetchOptions = {
method: 'GET',
headers: userAuthenticationService.getAuthorizationHeader(),
@@ -89,9 +88,7 @@ class GoogleCloudDataSourceConfigurationAPI
// Last configurable item, so update the data source configuration.
const url = `${googleCloudItem.url}/dicomWeb`;
const dataSourceDefCopy = JSON.parse(
- JSON.stringify(
- this._extensionManager.getDataSourceDefinition(this._dataSourceName)
- )
+ JSON.stringify(this._extensionManager.getDataSourceDefinition(this._dataSourceName))
);
dataSourceDefCopy.configuration = {
...dataSourceDefCopy.configuration,
@@ -136,9 +133,7 @@ class GoogleCloudDataSourceConfigurationAPI
return subItems;
}
- async getConfiguredItems(): Promise<
- Array
- > {
+ async getConfiguredItems(): Promise> {
const dataSourceDefinition = this._extensionManager.getDataSourceDefinition(
this._dataSourceName
);
@@ -216,9 +211,7 @@ class GoogleCloudDataSourceConfigurationAPI
fetchOptions,
fetchSearchParams
);
- data[ItemType[fetchItemType]] = data[ItemType[fetchItemType]].concat(
- subPageData
- );
+ data[ItemType[fetchItemType]] = data[ItemType[fetchItemType]].concat(subPageData);
}
if (data[ItemType[fetchItemType]]) {
return data[ItemType[fetchItemType]];
diff --git a/extensions/default/src/DicomJSONDataSource/index.js b/extensions/default/src/DicomJSONDataSource/index.js
index 271946c37..15ca386aa 100644
--- a/extensions/default/src/DicomJSONDataSource/index.js
+++ b/extensions/default/src/DicomJSONDataSource/index.js
@@ -152,15 +152,9 @@ function createDicomJSONApi(dicomJsonConfig) {
return getDirectURL(wadoRoot, params);
},
series: {
- metadata: ({
- StudyInstanceUID,
- madeInClient = false,
- customSort,
- } = {}) => {
+ metadata: ({ StudyInstanceUID, madeInClient = false, customSort } = {}) => {
if (!StudyInstanceUID) {
- throw new Error(
- 'Unable to query for SeriesMetadata without StudyInstanceUID'
- );
+ throw new Error('Unable to query for SeriesMetadata without StudyInstanceUID');
}
const study = findStudies('StudyInstanceUID', StudyInstanceUID)[0];
@@ -186,16 +180,10 @@ function createDicomJSONApi(dicomJsonConfig) {
DicomMetadataStore.addInstances(naturalizedInstances, madeInClient);
}
- DicomMetadataStore.addSeriesMetadata(
- seriesSummaryMetadata,
- madeInClient
- );
+ DicomMetadataStore.addSeriesMetadata(seriesSummaryMetadata, madeInClient);
function setSuccessFlag() {
- const study = DicomMetadataStore.getStudy(
- StudyInstanceUID,
- madeInClient
- );
+ const study = DicomMetadataStore.getStudy(StudyInstanceUID, madeInClient);
study.isLoaded = true;
}
diff --git a/extensions/default/src/DicomLocalDataSource/index.js b/extensions/default/src/DicomLocalDataSource/index.js
index aa9949981..712acd057 100644
--- a/extensions/default/src/DicomLocalDataSource/index.js
+++ b/extensions/default/src/DicomLocalDataSource/index.js
@@ -127,16 +127,11 @@ function createDicomLocalApi(dicomLocalConfig) {
series: {
metadata: async ({ StudyInstanceUID, madeInClient = false } = {}) => {
if (!StudyInstanceUID) {
- throw new Error(
- 'Unable to query for SeriesMetadata without StudyInstanceUID'
- );
+ throw new Error('Unable to query for SeriesMetadata without StudyInstanceUID');
}
// Instances metadata already added via local upload
- const study = DicomMetadataStore.getStudy(
- StudyInstanceUID,
- madeInClient
- );
+ const study = DicomMetadataStore.getStudy(StudyInstanceUID, madeInClient);
// Series metadata already added via local upload
DicomMetadataStore._broadcastEvent(EVENTS.SERIES_ADDED, {
@@ -236,8 +231,7 @@ function createDicomLocalApi(dicomLocalConfig) {
const { StudyInstanceUIDs: paramsStudyInstanceUIDs } = params;
const queryStudyInstanceUIDs = query.getAll('StudyInstanceUIDs');
- const StudyInstanceUIDs =
- queryStudyInstanceUIDs || paramsStudyInstanceUIDs;
+ const StudyInstanceUIDs = queryStudyInstanceUIDs || paramsStudyInstanceUIDs;
const StudyInstanceUIDsAsArray =
StudyInstanceUIDs && Array.isArray(StudyInstanceUIDs)
? StudyInstanceUIDs
diff --git a/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css b/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css
index fe6a96096..2845f2f39 100644
--- a/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css
+++ b/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css
@@ -4,7 +4,7 @@
}
.dicom-tag-browser-table-wrapper {
-/* height: 500px;*/
+ /* height: 500px;*/
/*overflow-y: scroll;*/
overflow-x: scroll;
}
@@ -45,7 +45,7 @@
padding-left: 10px;
padding-right: 10px;
text-align: center;
- color: "#20A5D6";
+ color: '#20A5D6';
}
.dicom-tag-browser-table th.dicom-tag-browser-table-left {
diff --git a/extensions/default/src/DicomTagBrowser/DicomTagBrowser.tsx b/extensions/default/src/DicomTagBrowser/DicomTagBrowser.tsx
index c616fe022..22eea9bc8 100644
--- a/extensions/default/src/DicomTagBrowser/DicomTagBrowser.tsx
+++ b/extensions/default/src/DicomTagBrowser/DicomTagBrowser.tsx
@@ -21,10 +21,8 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
// 3: Value
const excludedColumnIndicesForFilter: Set = new Set([1]);
- const [
- selectedDisplaySetInstanceUID,
- setSelectedDisplaySetInstanceUID,
- ] = useState(displaySetInstanceUID);
+ const [selectedDisplaySetInstanceUID, setSelectedDisplaySetInstanceUID] =
+ useState(displaySetInstanceUID);
const [instanceNumber, setInstanceNumber] = useState(1);
const [filterValue, setFilterValue] = useState('');
@@ -110,27 +108,31 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
return (
-
-
-
+
+
+
Series
-
+
-
+
-
-
{showInstanceList && (
-
+
Instance Number
)}
@@ -153,10 +155,10 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
)}
+
+
-
+
-
+
-
+
-
+
@@ -114,10 +106,7 @@ function DicomTagTable({ rows }) {
* When the browser window resizes, update the row virtualization (i.e. row heights)
*/
useEffect(() => {
- const debouncedResize = debounce(
- () => listRef.current.resetAfterIndex(0),
- 100
- );
+ const debouncedResize = debounce(() => listRef.current.resetAfterIndex(0), 100);
window.addEventListener('resize', debouncedResize);
@@ -135,15 +124,15 @@ function DicomTagTable({ rows }) {
-
);
},
@@ -154,9 +143,7 @@ function DicomTagTable({ rows }) {
* Whenever any one of the column headers is set, then the header is rendered.
* Here we chose the tag header.
*/
- const isHeaderRendered = useCallback(() => tagHeaderElem !== null, [
- tagHeaderElem,
- ]);
+ const isHeaderRendered = useCallback(() => tagHeaderElem !== null, [tagHeaderElem]);
/**
* Get the item/row size. We use the header column widths to calculate the various row heights.
@@ -179,11 +166,7 @@ function DicomTagTable({ rows }) {
.map((colText, index) => {
const colOneLineWidth = context.measureText(colText).width;
const numLines = Math.ceil(colOneLineWidth / headerWidths[index]);
- return (
- numLines * lineHeightPx +
- 2 * rowVerticalPaddingPx +
- rowBottomBorderPx
- );
+ return numLines * lineHeightPx + 2 * rowVerticalPaddingPx + rowBottomBorderPx;
})
.reduce((maxHeight, colHeight) => Math.max(maxHeight, colHeight));
},
@@ -204,7 +187,7 @@ function DicomTagTable({ rows }) {
valueRef={valueRef}
/>
{row[0]}
- {row[1]}
- {row[2]}
- {row[3]}
+ {row[0]}
+ {row[1]}
+ {row[2]}
+ {row[3]}
{isHeaderRendered() && (
diff --git a/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js b/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js
index e902aa095..542267abe 100644
--- a/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js
+++ b/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js
@@ -1,4 +1,4 @@
-export default function(wadoRoot) {
+export default function (wadoRoot) {
return {
series: (StudyInstanceUID, SeriesInstanceUID) => {
return new Promise((resolve, reject) => {
@@ -15,7 +15,7 @@ export default function(wadoRoot) {
console.log(xhr);
- xhr.onreadystatechange = function() {
+ xhr.onreadystatechange = function () {
//Call a function when the state changes.
if (xhr.readyState == 4) {
switch (xhr.status) {
diff --git a/extensions/default/src/DicomWebDataSource/index.js b/extensions/default/src/DicomWebDataSource/index.js
index efbcf944b..650e29f38 100644
--- a/extensions/default/src/DicomWebDataSource/index.js
+++ b/extensions/default/src/DicomWebDataSource/index.js
@@ -1,11 +1,5 @@
import { api } from 'dicomweb-client';
-import {
- DicomMetadataStore,
- IWebApiDataSource,
- utils,
- errorHandler,
- classes,
-} from '@ohif/core';
+import { DicomMetadataStore, IWebApiDataSource, utils, errorHandler, classes } from '@ohif/core';
import {
mapParams,
@@ -18,10 +12,7 @@ import dcm4cheeReject from './dcm4cheeReject';
import getImageId from './utils/getImageId';
import dcmjs from 'dcmjs';
-import {
- retrieveStudyMetadata,
- deleteStudyMetadataPromise,
-} from './retrieveStudyMetadata.js';
+import { retrieveStudyMetadata, deleteStudyMetadataPromise } from './retrieveStudyMetadata.js';
import StaticWadoClient from './utils/StaticWadoClient';
import getDirectURL from '../utils/getDirectURL';
import { fixBulkDataURI } from './utils/fixBulkDataURI';
@@ -30,8 +21,7 @@ const { DicomMetaDictionary, DicomDict } = dcmjs.data;
const { naturalizeDataset, denaturalizeDataset } = DicomMetaDictionary;
-const ImplementationClassUID =
- '2.25.270695996825855179949881587723571202391.2.0.0';
+const ImplementationClassUID = '2.25.270695996825855179949881587723571202391.2.0.0';
const ImplementationVersionName = 'OHIF-VIEWER-2.0.0';
const EXPLICIT_VR_LITTLE_ENDIAN = '1.2.840.10008.1.2.1';
@@ -61,10 +51,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
const implementation = {
initialize: ({ params, query }) => {
- if (
- dicomWebConfig.onConfiguration &&
- typeof dicomWebConfig.onConfiguration === 'function'
- ) {
+ if (dicomWebConfig.onConfiguration && typeof dicomWebConfig.onConfiguration === 'function') {
dicomWebConfig = dicomWebConfig.onConfiguration(dicomWebConfig, {
params,
query,
@@ -126,7 +113,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
query: {
studies: {
mapParams: mapParams.bind(),
- search: async function(origParams) {
+ search: async function (origParams) {
qidoDicomWebClient.headers = getAuthrorizationHeader();
const { studyInstanceUid, seriesInstanceUid, ...mappedParams } =
mapParams(origParams, {
@@ -134,12 +121,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
supportsWildcard: dicomWebConfig.supportsWildcard,
}) || {};
- const results = await qidoSearch(
- qidoDicomWebClient,
- undefined,
- undefined,
- mappedParams
- );
+ const results = await qidoSearch(qidoDicomWebClient, undefined, undefined, mappedParams);
return processResults(results);
},
@@ -147,12 +129,9 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
},
series: {
// mapParams: mapParams.bind(),
- search: async function(studyInstanceUid) {
+ search: async function (studyInstanceUid) {
qidoDicomWebClient.headers = getAuthrorizationHeader();
- const results = await seriesInStudy(
- qidoDicomWebClient,
- studyInstanceUid
- );
+ const results = await seriesInStudy(qidoDicomWebClient, studyInstanceUid);
return processSeriesResults(results);
},
@@ -161,13 +140,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
instances: {
search: (studyInstanceUid, queryParameters) => {
qidoDicomWebClient.headers = getAuthrorizationHeader();
- qidoSearch.call(
- undefined,
- qidoDicomWebClient,
- studyInstanceUid,
- null,
- queryParameters
- );
+ qidoSearch.call(undefined, qidoDicomWebClient, studyInstanceUid, null, queryParameters);
},
},
},
@@ -213,9 +186,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
madeInClient = false,
} = {}) => {
if (!StudyInstanceUID) {
- throw new Error(
- 'Unable to query for SeriesMetadata without StudyInstanceUID'
- );
+ throw new Error('Unable to query for SeriesMetadata without StudyInstanceUID');
}
if (dicomWebConfig.enableStudyLazyLoad) {
@@ -250,8 +221,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
await wadoDicomWebClient.storeInstances(options);
} else {
const meta = {
- FileMetaInformationVersion:
- dataset._meta.FileMetaInformationVersion.Value,
+ FileMetaInformationVersion: dataset._meta.FileMetaInformationVersion.Value,
MediaStorageSOPClassUID: dataset.SOPClassUID,
MediaStorageSOPInstanceUID: dataset.SOPInstanceUID,
TransferSyntaxUID: EXPLICIT_VR_LITTLE_ENDIAN,
@@ -340,10 +310,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
DicomMetadataStore.addSeriesMetadata(seriesMetadata, madeInClient);
Object.keys(instancesPerSeries).forEach(seriesInstanceUID =>
- DicomMetadataStore.addInstances(
- instancesPerSeries[seriesInstanceUID],
- madeInClient
- )
+ DicomMetadataStore.addInstances(instancesPerSeries[seriesInstanceUID], madeInClient)
);
},
@@ -357,17 +324,15 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
const enableStudyLazyLoad = true;
wadoDicomWebClient.headers = generateWadoHeader();
// Get Series
- const {
- preLoadData: seriesSummaryMetadata,
- promises: seriesPromises,
- } = await retrieveStudyMetadata(
- wadoDicomWebClient,
- StudyInstanceUID,
- enableStudyLazyLoad,
- filters,
- sortCriteria,
- sortFunction
- );
+ const { preLoadData: seriesSummaryMetadata, promises: seriesPromises } =
+ await retrieveStudyMetadata(
+ wadoDicomWebClient,
+ StudyInstanceUID,
+ enableStudyLazyLoad,
+ filters,
+ sortCriteria,
+ sortFunction
+ );
/**
* naturalizes the dataset, and adds a retrieve bulkdata method
@@ -412,8 +377,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
// the bulk data and DICOM video cases where the second ArrayBuffer is
// the bulk data. Here we play it safe and do a find.
const ret =
- (val instanceof Array &&
- val.find(arrayBuffer => arrayBuffer?.byteLength)) ||
+ (val instanceof Array && val.find(arrayBuffer => arrayBuffer?.byteLength)) ||
undefined;
value.Value = ret;
return ret;
@@ -456,10 +420,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
}
function setSuccessFlag() {
- const study = DicomMetadataStore.getStudy(
- StudyInstanceUID,
- madeInClient
- );
+ const study = DicomMetadataStore.getStudy(StudyInstanceUID, madeInClient);
study.isLoaded = true;
}
@@ -520,13 +481,10 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
},
getStudyInstanceUIDs({ params, query }) {
const { StudyInstanceUIDs: paramsStudyInstanceUIDs } = params;
- const queryStudyInstanceUIDs = utils.splitComma(
- query.getAll('StudyInstanceUIDs')
- );
+ const queryStudyInstanceUIDs = utils.splitComma(query.getAll('StudyInstanceUIDs'));
const StudyInstanceUIDs =
- (queryStudyInstanceUIDs.length && queryStudyInstanceUIDs) ||
- paramsStudyInstanceUIDs;
+ (queryStudyInstanceUIDs.length && queryStudyInstanceUIDs) || paramsStudyInstanceUIDs;
const StudyInstanceUIDsAsArray =
StudyInstanceUIDs && Array.isArray(StudyInstanceUIDs)
? StudyInstanceUIDs
diff --git a/extensions/default/src/DicomWebDataSource/qido.js b/extensions/default/src/DicomWebDataSource/qido.js
index ce372cd5f..4bea9a074 100644
--- a/extensions/default/src/DicomWebDataSource/qido.js
+++ b/extensions/default/src/DicomWebDataSource/qido.js
@@ -54,10 +54,7 @@ function processResults(qidoStudies) {
patientName: utils.formatPN(getName(qidoStudy['00100010'])) || '',
instances: Number(getString(qidoStudy['00201208'])) || 0, // number
description: getString(qidoStudy['00081030']) || '',
- modalities:
- getString(
- getModalities(qidoStudy['00080060'], qidoStudy['00080061'])
- ) || '',
+ modalities: getString(getModalities(qidoStudy['00080060'], qidoStudy['00080061'])) || '',
})
);
@@ -105,12 +102,7 @@ export function processSeriesResults(qidoSeries) {
* @param {string} [queryParamaters]
* @returns {Promise} - Promise that resolves results
*/
-async function search(
- dicomWebClient,
- studyInstanceUid,
- seriesInstanceUid,
- queryParameters
-) {
+async function search(dicomWebClient, studyInstanceUid, seriesInstanceUid, queryParameters) {
let searchResult = await dicomWebClient.searchForStudies({
studyInstanceUid: undefined,
queryParams: queryParameters,
@@ -136,10 +128,7 @@ export function seriesInStudy(dicomWebClient, studyInstanceUID) {
}
export default function searchStudies(server, filter) {
- const queryParams = getQIDOQueryParams(
- filter,
- server.qidoSupportsIncludeField
- );
+ const queryParams = getQIDOQueryParams(filter, server.qidoSupportsIncludeField);
const options = {
queryParams,
};
diff --git a/extensions/default/src/DicomWebDataSource/retrieveStudyMetadata.js b/extensions/default/src/DicomWebDataSource/retrieveStudyMetadata.js
index faf5e2c90..86baecb4d 100644
--- a/extensions/default/src/DicomWebDataSource/retrieveStudyMetadata.js
+++ b/extensions/default/src/DicomWebDataSource/retrieveStudyMetadata.js
@@ -28,14 +28,10 @@ export function retrieveStudyMetadata(
// corresponding promise from the "StudyMetaDataPromises" map...
if (!dicomWebClient) {
- throw new Error(
- `${moduleName}: Required 'dicomWebClient' parameter not provided.`
- );
+ throw new Error(`${moduleName}: Required 'dicomWebClient' parameter not provided.`);
}
if (!StudyInstanceUID) {
- throw new Error(
- `${moduleName}: Required 'StudyInstanceUID' parameter not provided.`
- );
+ throw new Error(`${moduleName}: Required 'StudyInstanceUID' parameter not provided.`);
}
// Already waiting on result? Return cached promise
@@ -52,7 +48,7 @@ export function retrieveStudyMetadata(
filters,
sortCriteria,
sortFunction
- ).then(function(data) {
+ ).then(function (data) {
resolve(data);
}, reject);
});
diff --git a/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts b/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts
index c6ff3c7d8..6d790cd7c 100644
--- a/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts
+++ b/extensions/default/src/DicomWebDataSource/utils/StaticWadoClient.ts
@@ -50,14 +50,7 @@ export default class StaticWadoClient extends api.DICOMwebClient {
const lowerParams = this.toLowerParams(queryParams);
const filtered = searchResult.filter(study => {
for (const key of Object.keys(StaticWadoClient.studyFilterKeys)) {
- if (
- !this.filterItem(
- key,
- lowerParams,
- study,
- StaticWadoClient.studyFilterKeys
- )
- ) {
+ if (!this.filterItem(key, lowerParams, study, StaticWadoClient.studyFilterKeys)) {
return false;
}
}
@@ -80,14 +73,7 @@ export default class StaticWadoClient extends api.DICOMwebClient {
const filtered = searchResult.filter(series => {
for (const key of Object.keys(StaticWadoClient.seriesFilterKeys)) {
- if (
- !this.filterItem(
- key,
- lowerParams,
- series,
- StaticWadoClient.seriesFilterKeys
- )
- ) {
+ if (!this.filterItem(key, lowerParams, series, StaticWadoClient.seriesFilterKeys)) {
return false;
}
}
@@ -132,10 +118,7 @@ export default class StaticWadoClient extends api.DICOMwebClient {
} else if (desired[desired.length - 1] === '*') {
return actual.indexOf(desired.substring(0, desired.length - 1)) != -1;
} else if (desired[0] === '*') {
- return (
- actual.indexOf(desired.substring(1)) ===
- actual.length - desired.length + 1
- );
+ return actual.indexOf(desired.substring(1)) === actual.length - desired.length + 1;
}
}
return desired === actual;
diff --git a/extensions/default/src/DicomWebDataSource/utils/fixBulkDataURI.ts b/extensions/default/src/DicomWebDataSource/utils/fixBulkDataURI.ts
index 1a408b597..2e592c757 100644
--- a/extensions/default/src/DicomWebDataSource/utils/fixBulkDataURI.ts
+++ b/extensions/default/src/DicomWebDataSource/utils/fixBulkDataURI.ts
@@ -20,10 +20,7 @@ function fixBulkDataURI(value, instance, dicomWebConfig) {
// in case of the relative path, make it absolute. The current DICOM standard says
// the bulkdataURI is relative to the series. However, there are situations where
// it can be relative to the study too
- if (
- !value.BulkDataURI.startsWith('http') &&
- !value.BulkDataURI.startsWith('/')
- ) {
+ if (!value.BulkDataURI.startsWith('http') && !value.BulkDataURI.startsWith('/')) {
if (dicomWebConfig.bulkDataURI?.relativeResolution === 'studies') {
value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${instance.StudyInstanceUID}/${value.BulkDataURI}`;
} else if (
diff --git a/extensions/default/src/DicomWebDataSource/utils/getImageId.js b/extensions/default/src/DicomWebDataSource/utils/getImageId.js
index a493a3d3a..29877bd43 100644
--- a/extensions/default/src/DicomWebDataSource/utils/getImageId.js
+++ b/extensions/default/src/DicomWebDataSource/utils/getImageId.js
@@ -24,12 +24,7 @@ function buildInstanceWadoUrl(config, instance) {
* @param thumbnail
* @returns {string} The imageId to be used by Cornerstone
*/
-export default function getImageId({
- instance,
- frame,
- config,
- thumbnail = false,
-}) {
+export default function getImageId({ instance, frame, config, thumbnail = false }) {
if (!instance) {
return;
}
diff --git a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadata.js b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadata.js
index d70a2cdcc..ba62cca1d 100644
--- a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadata.js
+++ b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadata.js
@@ -20,9 +20,7 @@ async function RetrieveMetadata(
sortFunction
) {
const RetrieveMetadataLoader =
- enableStudyLazyLoad !== false
- ? RetrieveMetadataLoaderAsync
- : RetrieveMetadataLoaderSync;
+ enableStudyLazyLoad !== false ? RetrieveMetadataLoaderAsync : RetrieveMetadataLoaderSync;
const retrieveMetadataLoader = new RetrieveMetadataLoader(
dicomWebClient,
diff --git a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoader.js b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoader.js
index 49302f7a8..da747c88b 100644
--- a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoader.js
+++ b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoader.js
@@ -14,13 +14,7 @@ export default class RetrieveMetadataLoader {
* @param {string} [filter.seriesInstanceUID] - series instance uid to filter results against
* @param {Function} [sortSeries] - Custom sort function for series
*/
- constructor(
- client,
- studyInstanceUID,
- filters = {},
- sortCriteria,
- sortFunction
- ) {
+ constructor(client, studyInstanceUID, filters = {}, sortCriteria, sortFunction) {
this.client = client;
this.studyInstanceUID = studyInstanceUID;
this.filters = filters;
diff --git a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderAsync.js b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderAsync.js
index 096c3c818..bca309429 100644
--- a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderAsync.js
+++ b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderAsync.js
@@ -1,8 +1,5 @@
import dcmjs from 'dcmjs';
-import {
- sortStudySeries,
- sortingCriteria,
-} from '@ohif/core/src/utils/sortStudy';
+import { sortStudySeries, sortingCriteria } from '@ohif/core/src/utils/sortStudy';
import RetrieveMetadataLoader from './retrieveMetadataLoader';
/**
@@ -12,11 +9,7 @@ import RetrieveMetadataLoader from './retrieveMetadataLoader';
* @param {Array} seriesInstanceUIDList A list of Series Instance UIDs
* @returns {Object} Returns an object which supports loading of instances from each of given Series Instance UID
*/
-function makeSeriesAsyncLoader(
- client,
- studyInstanceUID,
- seriesInstanceUIDList
-) {
+function makeSeriesAsyncLoader(client, studyInstanceUID, seriesInstanceUIDList) {
return Object.freeze({
hasNext() {
return seriesInstanceUIDList.length > 0;
@@ -43,11 +36,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
*/
*getPreLoaders() {
const preLoaders = [];
- const {
- studyInstanceUID,
- filters: { seriesInstanceUID } = {},
- client,
- } = this;
+ const { studyInstanceUID, filters: { seriesInstanceUID } = {}, client } = this;
if (seriesInstanceUID) {
const options = {
@@ -73,8 +62,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
return sortStudySeries(
naturalized,
- sortCriteria ||
- sortingCriteria.seriesSortCriteria.seriesInfoSortingCriteria,
+ sortCriteria || sortingCriteria.seriesSortCriteria.seriesInfoSortingCriteria,
sortFunction
);
}
@@ -84,11 +72,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
const seriesInstanceUIDs = preLoadData.map(s => s.SeriesInstanceUID);
- const seriesAsyncLoader = makeSeriesAsyncLoader(
- client,
- studyInstanceUID,
- seriesInstanceUIDs
- );
+ const seriesAsyncLoader = makeSeriesAsyncLoader(client, studyInstanceUID, seriesInstanceUIDs);
const promises = [];
diff --git a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderSync.js b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderSync.js
index 6ca47ce9d..1a7cd9d50 100644
--- a/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderSync.js
+++ b/extensions/default/src/DicomWebDataSource/wado/retrieveMetadataLoaderSync.js
@@ -31,11 +31,7 @@ export default class RetrieveMetadataLoaderSync extends RetrieveMetadataLoader {
*/
*getLoaders() {
const loaders = [];
- const {
- studyInstanceUID,
- filters: { seriesInstanceUID } = {},
- client,
- } = this;
+ const { studyInstanceUID, filters: { seriesInstanceUID } = {}, client } = this;
if (seriesInstanceUID) {
loaders.push(
@@ -46,9 +42,7 @@ export default class RetrieveMetadataLoaderSync extends RetrieveMetadataLoader {
);
}
- loaders.push(
- client.retrieveStudyMetadata.bind(client, { studyInstanceUID })
- );
+ loaders.push(client.retrieveStudyMetadata.bind(client, { studyInstanceUID }));
yield* loaders;
}
diff --git a/extensions/default/src/DicomWebProxyDataSource/index.js b/extensions/default/src/DicomWebProxyDataSource/index.js
index 326c13144..05ebb57ac 100644
--- a/extensions/default/src/DicomWebProxyDataSource/index.js
+++ b/extensions/default/src/DicomWebProxyDataSource/index.js
@@ -9,10 +9,7 @@ import { createDicomWebApi } from '../DicomWebDataSource/index';
* dicomWeb configuration array
*
*/
-function createDicomWebProxyApi(
- dicomWebProxyConfig,
- UserAuthenticationService
-) {
+function createDicomWebProxyApi(dicomWebProxyConfig, UserAuthenticationService) {
const { name } = dicomWebProxyConfig;
let dicomWebDelegate = undefined;
@@ -45,28 +42,21 @@ function createDicomWebProxyApi(
},
instances: {
search: (studyInstanceUid, queryParameters) =>
- dicomWebDelegate.query.instances.search(
- studyInstanceUid,
- queryParameters
- ),
+ dicomWebDelegate.query.instances.search(studyInstanceUid, queryParameters),
},
},
retrieve: {
directURL: (...args) => dicomWebDelegate.retrieve.directURL(...args),
series: {
- metadata: (...args) =>
- dicomWebDelegate.retrieve.series.metadata(...args),
+ metadata: (...args) => dicomWebDelegate.retrieve.series.metadata(...args),
},
},
store: {
dicom: (...args) => dicomWebDelegate.store(...args),
},
- deleteStudyMetadataPromise: (...args) =>
- dicomWebDelegate.deleteStudyMetadataPromise(...args),
- getImageIdsForDisplaySet: (...args) =>
- dicomWebDelegate.getImageIdsForDisplaySet(...args),
- getImageIdsForInstance: (...args) =>
- dicomWebDelegate.getImageIdsForInstance(...args),
+ deleteStudyMetadataPromise: (...args) => dicomWebDelegate.deleteStudyMetadataPromise(...args),
+ getImageIdsForDisplaySet: (...args) => dicomWebDelegate.getImageIdsForDisplaySet(...args),
+ getImageIdsForInstance: (...args) => dicomWebDelegate.getImageIdsForInstance(...args),
getStudyInstanceUIDs({ params, query }) {
let studyInstanceUIDs = [];
diff --git a/extensions/default/src/Panels/ActionButtons.tsx b/extensions/default/src/Panels/ActionButtons.tsx
index 133f2b814..9382a2451 100644
--- a/extensions/default/src/Panels/ActionButtons.tsx
+++ b/extensions/default/src/Panels/ActionButtons.tsx
@@ -9,9 +9,15 @@ function ActionButtons({ onExportClick, onCreateReportClick }) {
return (
-
+
{/* TODO Revisit design of ButtonGroup later - for now use LegacyButton for its children.*/}
-
+
{t('Export CSV')}
-
-
+
+
-
-
+
{dsConfigs
- .filter(
- it =>
- it.sourceName !== 'dicomjson' &&
- it.sourceName !== 'dicomlocal'
- )
+ .filter(it => it.sourceName !== 'dicomjson' && it.sourceName !== 'dicomlocal')
.map(ds => (
diff --git a/extensions/default/src/Panels/PanelMeasurementTable.tsx b/extensions/default/src/Panels/PanelMeasurementTable.tsx
index 49063e566..2ff2414fe 100644
--- a/extensions/default/src/Panels/PanelMeasurementTable.tsx
+++ b/extensions/default/src/Panels/PanelMeasurementTable.tsx
@@ -1,13 +1,7 @@
import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { utils, ServicesManager } from '@ohif/core';
-import {
- MeasurementTable,
- Dialog,
- Input,
- useViewportGrid,
- ButtonEnums,
-} from '@ohif/ui';
+import { MeasurementTable, Dialog, Input, useViewportGrid, ButtonEnums } from '@ohif/ui';
import ActionButtons from './ActionButtons';
import debounce from 'lodash.debounce';
@@ -26,19 +20,13 @@ export default function PanelMeasurementTable({
}): React.FunctionComponent {
const [viewportGrid, viewportGridService] = useViewportGrid();
const { activeViewportId, viewports } = viewportGrid;
- const {
- measurementService,
- uiDialogService,
- uiNotificationService,
- displaySetService,
- } = (servicesManager as ServicesManager).services;
+ const { measurementService, uiDialogService, uiNotificationService, displaySetService } = (
+ servicesManager as ServicesManager
+ ).services;
const [displayMeasurements, setDisplayMeasurements] = useState([]);
useEffect(() => {
- const debouncedSetDisplayMeasurements = debounce(
- setDisplayMeasurements,
- 100
- );
+ const debouncedSetDisplayMeasurements = debounce(setDisplayMeasurements, 100);
// ~~ Initial
setDisplayMeasurements(_getMappedMeasurements(measurementService));
@@ -53,9 +41,7 @@ export default function PanelMeasurementTable({
[added, addedRaw, updated, removed, cleared].forEach(evt => {
subscriptions.push(
measurementService.subscribe(evt, () => {
- debouncedSetDisplayMeasurements(
- _getMappedMeasurements(measurementService)
- );
+ debouncedSetDisplayMeasurements(_getMappedMeasurements(measurementService));
}).unsubscribe
);
});
@@ -104,9 +90,7 @@ export default function PanelMeasurementTable({
});
if (promptResult.action === CREATE_REPORT_DIALOG_RESPONSE.CREATE_REPORT) {
- const dataSources = extensionManager.getDataSources(
- promptResult.dataSourceName
- );
+ const dataSources = extensionManager.getDataSources(promptResult.dataSourceName);
const dataSource = dataSources[0];
const SeriesDescription =
@@ -117,10 +101,7 @@ export default function PanelMeasurementTable({
// Re-use an existing series having the same series description to avoid
// creating too many series instances.
- const options = findSRWithSameSeriesDescription(
- SeriesDescription,
- displaySetService
- );
+ const options = findSRWithSameSeriesDescription(SeriesDescription, displaySetService);
return createReportAsync(
servicesManager,
@@ -186,7 +167,7 @@ export default function PanelMeasurementTable({
labelClassName="text-white text-[14px] leading-[1.2]"
autoFocus
id="annotation"
- className="bg-black border-primary-main"
+ className="border-primary-main bg-black"
type="text"
value={value.label}
onChange={onChangeHandler}
@@ -217,7 +198,7 @@ export default function PanelMeasurementTable({
return (
<>