feat(microscopy): add dicom microscopy extension and mode (#3247)
* skeleton for dicom-microscopy extension * skeleton for microscopy mode * [feat] ported @radicalimaging/microscopy-dicom to OHIF's default extension * [feat] ported microscopy mode from private repo * added new definitions to the package.json * webpack configuration update for microscopy extension * register new icons for microscopy tools * fixes to the microscopy extension and mode * trivial error fix - typescript type import error * link microscopy extension with default OHIF app plugin config * demo config fix * fix logs * remove unsed imports * [fix] loading of microscopy * [fix] webworker script loading, normalizing denaturalized dataset * found the latest version of dicom-microscopy-viewer that works with current OHIF extension : 0.35.2 * hide thumbnail pane by default, as we have issues with * comments * remove unused code * [feat] microscopy - annotation selection * [feat] microscopy - edit annotation label * wip * [bugfix] dicom-microscopy tool * [bugfix] dicom microscopy annotations * [fix] mixed-content blocking caused by BulkDataURI * [fix] microscopy measurements panel - center button * [fix] microscopy measurements panel - styling * [fix] microscopy - controls * fix local loading of microscopy * fix local loading of dicom microscopy * fix typo - indexof to indexOf * [fix] remove unused icons * remove commented out lines from webpack configuration * platform/viewer/public/config/default.js - revert accidental changes * [refactor] redirecting to microscopy mode on Local mode * attribution to DMV and SLIM viewer * [fix] code review feedbacks * fix thumbnails * [fix] microscopy - fix old publisher.publish() to PubSubService._broadcastEvent() * [fix] interactions, webpack config, roi selection * [feat] microscopy - remove select tool from UI * microscopy author * [fix] saving and loading SR * [bugfix] - missing publish() function in MicroscopyService, replace with _broadcastEvent * remove author section from readme * refactor SR saving feature * fix webpack config after merge * [bugfix] repeated import * fix e2e * webpack configuration * hide "Create report" button for microscopy
This commit is contained in:
76 files changed
+5868
-31
No files matched your search
@@ -0,0 +1,413 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import {
|
||||
ServicesManager,
|
||||
ExtensionManager,
|
||||
CommandsManager,
|
||||
DicomMetadataStore,
|
||||
} from '@ohif/core';
|
||||
import { MeasurementTable, Icon, ButtonGroup, Button } from '@ohif/ui';
|
||||
import { withTranslation, WithTranslation } from 'react-i18next';
|
||||
import { EVENTS as MicroscopyEvents } from '../../services/MicroscopyService';
|
||||
import dcmjs from 'dcmjs';
|
||||
import styles from '../../utils/styles';
|
||||
import callInputDialog from '../../utils/callInputDialog';
|
||||
import constructSR from '../../utils/constructSR';
|
||||
import { saveByteArray } from '../../utils/saveByteArray';
|
||||
|
||||
let saving = false;
|
||||
const { datasetToBuffer } = dcmjs.data;
|
||||
|
||||
const formatArea = area => {
|
||||
let mult = 1;
|
||||
let unit = 'mm';
|
||||
if (area > 1000000) {
|
||||
unit = 'm';
|
||||
mult = 1 / 1000000;
|
||||
} else if (area < 1) {
|
||||
unit = 'μm';
|
||||
mult = 1000000;
|
||||
}
|
||||
return `${(area * mult).toFixed(2)} ${unit}²`;
|
||||
};
|
||||
|
||||
const formatLength = (length, unit) => {
|
||||
let mult = 1;
|
||||
if (unit == 'km' || (!unit && length > 1000000)) {
|
||||
unit = 'km';
|
||||
mult = 1 / 1000000;
|
||||
} else if (unit == 'm' || (!unit && length > 1000)) {
|
||||
unit = 'm';
|
||||
mult = 1 / 1000;
|
||||
} else if (unit == 'μm' || (!unit && length < 1)) {
|
||||
unit = 'μm';
|
||||
mult = 1000;
|
||||
} else if (unit && unit != 'mm') {
|
||||
throw new Error(`Unknown length unit ${unit}`);
|
||||
} else {
|
||||
unit = 'mm';
|
||||
}
|
||||
return `${(length * mult).toFixed(2)} ${unit}`;
|
||||
};
|
||||
|
||||
interface IMicroscopyPanelProps extends WithTranslation {
|
||||
viewports: PropTypes.array;
|
||||
activeViewportIndex: PropTypes.number;
|
||||
|
||||
//
|
||||
onSaveComplete?: PropTypes.func; // callback when successfully saved annotations
|
||||
onRejectComplete?: PropTypes.func; // callback when rejected annotations
|
||||
|
||||
//
|
||||
servicesManager: ServicesManager;
|
||||
extensionManager: ExtensionManager;
|
||||
commandsManager: CommandsManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Microscopy Measurements Panel Component
|
||||
*
|
||||
* @param props
|
||||
* @returns
|
||||
*/
|
||||
function MicroscopyPanel(props: IMicroscopyPanelProps) {
|
||||
const { microscopyService } = props.servicesManager.services;
|
||||
|
||||
const [studyInstanceUID, setStudyInstanceUID] = useState(
|
||||
null as string | null
|
||||
);
|
||||
const [roiAnnotations, setRoiAnnotations] = useState([] as any[]);
|
||||
const [selectedAnnotation, setSelectedAnnotation] = useState(null as any);
|
||||
const { servicesManager, extensionManager } = props;
|
||||
|
||||
const { uiDialogService, displaySetService } = servicesManager.services;
|
||||
|
||||
useEffect(() => {
|
||||
const viewport = props.viewports[props.activeViewportIndex];
|
||||
if (viewport.displaySetInstanceUIDs[0]) {
|
||||
const displaySet = displaySetService.getDisplaySetByUID(
|
||||
viewport.displaySetInstanceUIDs[0]
|
||||
);
|
||||
if (displaySet) {
|
||||
setStudyInstanceUID(displaySet.StudyInstanceUID);
|
||||
}
|
||||
}
|
||||
}, [props.viewports, props.activeViewportIndex]);
|
||||
|
||||
useEffect(() => {
|
||||
const onAnnotationUpdated = () => {
|
||||
const roiAnnotations = microscopyService.getAnnotationsForStudy(
|
||||
studyInstanceUID
|
||||
);
|
||||
setRoiAnnotations(roiAnnotations);
|
||||
};
|
||||
|
||||
const onAnnotationSelected = () => {
|
||||
const selectedAnnotation = microscopyService.getSelectedAnnotation();
|
||||
setSelectedAnnotation(selectedAnnotation);
|
||||
};
|
||||
|
||||
const onAnnotationRemoved = () => {
|
||||
onAnnotationUpdated();
|
||||
};
|
||||
|
||||
const {
|
||||
unsubscribe: unsubscribeAnnotationUpdated,
|
||||
} = microscopyService.subscribe(
|
||||
MicroscopyEvents.ANNOTATION_UPDATED,
|
||||
onAnnotationUpdated
|
||||
);
|
||||
const {
|
||||
unsubscribe: unsubscribeAnnotationSelected,
|
||||
} = microscopyService.subscribe(
|
||||
MicroscopyEvents.ANNOTATION_SELECTED,
|
||||
onAnnotationSelected
|
||||
);
|
||||
const {
|
||||
unsubscribe: unsubscribeAnnotationRemoved,
|
||||
} = microscopyService.subscribe(
|
||||
MicroscopyEvents.ANNOTATION_REMOVED,
|
||||
onAnnotationRemoved
|
||||
);
|
||||
onAnnotationUpdated();
|
||||
onAnnotationSelected();
|
||||
|
||||
// on unload unsubscribe from events
|
||||
return () => {
|
||||
unsubscribeAnnotationUpdated();
|
||||
unsubscribeAnnotationSelected();
|
||||
unsubscribeAnnotationRemoved();
|
||||
};
|
||||
}, [studyInstanceUID]);
|
||||
|
||||
/**
|
||||
* On clicking "Save Annotations" button, prompt an input modal for the
|
||||
* new series' description, and continue to save.
|
||||
*
|
||||
* @returns
|
||||
*/
|
||||
const promptSave = () => {
|
||||
const annotations = microscopyService.getAnnotationsForStudy(
|
||||
studyInstanceUID
|
||||
);
|
||||
|
||||
if (!annotations || saving) {
|
||||
return;
|
||||
}
|
||||
|
||||
callInputDialog({
|
||||
uiDialogService,
|
||||
title: 'Enter description of the Series',
|
||||
defaultValue: '',
|
||||
callback: (value: string, action: string) => {
|
||||
switch (action) {
|
||||
case 'save': {
|
||||
saveFunction(value);
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const getAllDisplaySets = (studyMetadata: any) => {
|
||||
let allDisplaySets = [] as any[];
|
||||
studyMetadata.series.forEach((series: any) => {
|
||||
const displaySets = displaySetService.getDisplaySetsForSeries(
|
||||
series.SeriesInstanceUID
|
||||
);
|
||||
allDisplaySets = allDisplaySets.concat(displaySets);
|
||||
});
|
||||
return allDisplaySets;
|
||||
};
|
||||
|
||||
/**
|
||||
* Save annotations as a series
|
||||
*
|
||||
* @param SeriesDescription - series description
|
||||
* @returns
|
||||
*/
|
||||
const saveFunction = async (SeriesDescription: string) => {
|
||||
const dataSource = extensionManager.getActiveDataSource()[0];
|
||||
const { onSaveComplete } = props;
|
||||
const annotations = microscopyService.getAnnotationsForStudy(
|
||||
studyInstanceUID
|
||||
);
|
||||
|
||||
saving = true;
|
||||
|
||||
// There is only one viewer possible for one study,
|
||||
// Since once study contains multiple resolution levels (series) of one whole
|
||||
// Slide image.
|
||||
|
||||
const studyMetadata = DicomMetadataStore.getStudy(studyInstanceUID);
|
||||
const displaySets = getAllDisplaySets(studyMetadata);
|
||||
const smDisplaySet = displaySets.find(ds => ds.Modality === 'SM');
|
||||
|
||||
// Get the next available series number after 4700.
|
||||
|
||||
const dsWithMetadata = displaySets.filter(
|
||||
ds =>
|
||||
ds.metadata &&
|
||||
ds.metadata.SeriesNumber &&
|
||||
typeof ds.metadata.SeriesNumber === 'number'
|
||||
);
|
||||
|
||||
// Generate next series number
|
||||
const seriesNumbers = dsWithMetadata.map(ds => ds.metadata.SeriesNumber);
|
||||
const maxSeriesNumber = Math.max(...seriesNumbers, 4700);
|
||||
const SeriesNumber = maxSeriesNumber + 1;
|
||||
|
||||
const { instance: metadata } = smDisplaySet;
|
||||
|
||||
// construct SR dataset
|
||||
const dataset = constructSR(
|
||||
metadata,
|
||||
{ SeriesDescription, SeriesNumber },
|
||||
annotations
|
||||
);
|
||||
|
||||
// Save in DICOM format
|
||||
try {
|
||||
if (dataSource) {
|
||||
if (dataSource.wadoRoot == 'saveDicom') {
|
||||
// download as DICOM file
|
||||
const part10Buffer = datasetToBuffer(dataset);
|
||||
saveByteArray(part10Buffer, `sr-microscopy.dcm`);
|
||||
} else {
|
||||
// Save into Web Data source
|
||||
const { StudyInstanceUID } = dataset;
|
||||
await dataSource.store.dicom(dataset);
|
||||
if (StudyInstanceUID) {
|
||||
dataSource.deleteStudyMetadataPromise(StudyInstanceUID);
|
||||
}
|
||||
}
|
||||
onSaveComplete({
|
||||
title: 'SR Saved',
|
||||
meassage: 'Measurements downloaded successfully',
|
||||
type: 'success',
|
||||
});
|
||||
} else {
|
||||
console.error('Server unspecified');
|
||||
}
|
||||
} catch (error) {
|
||||
onSaveComplete({
|
||||
title: 'SR Save Failed',
|
||||
message: error.message || error.toString(),
|
||||
type: 'error',
|
||||
});
|
||||
} finally {
|
||||
saving = false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* On clicking "Reject annotations" button
|
||||
*/
|
||||
const onDeleteCurrentSRHandler = async () => {
|
||||
try {
|
||||
const activeViewport = props.viewports[props.activeViewportIndex];
|
||||
const { StudyInstanceUID } = activeViewport;
|
||||
|
||||
// TODO: studies?
|
||||
const study = DicomMetadataStore.getStudy(StudyInstanceUID);
|
||||
|
||||
const lastDerivedDisplaySet = study.derivedDisplaySets.sort(
|
||||
(ds1: any, ds2: any) => {
|
||||
const dateTime1 = Number(`${ds1.SeriesDate}${ds1.SeriesTime}`);
|
||||
const dateTime2 = Number(`${ds2.SeriesDate}${ds2.SeriesTime}`);
|
||||
return dateTime1 > dateTime2;
|
||||
}
|
||||
)[study.derivedDisplaySets.length - 1];
|
||||
|
||||
// TODO: use dataSource.reject.dicom()
|
||||
// await DICOMSR.rejectMeasurements(
|
||||
// study.wadoRoot,
|
||||
// lastDerivedDisplaySet.StudyInstanceUID,
|
||||
// lastDerivedDisplaySet.SeriesInstanceUID
|
||||
// );
|
||||
props.onRejectComplete({
|
||||
title: 'Report rejected',
|
||||
message: 'Latest report rejected successfully',
|
||||
type: 'success',
|
||||
});
|
||||
} catch (error) {
|
||||
props.onRejectComplete({
|
||||
title: 'Failed to reject report',
|
||||
message: error.message,
|
||||
type: 'error',
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Handler for clicking event of an annotation item.
|
||||
*
|
||||
* @param param0
|
||||
*/
|
||||
const onMeasurementItemClickHandler = ({ uid }: { uid: string }) => {
|
||||
const roiAnnotation = microscopyService.getAnnotation(uid);
|
||||
microscopyService.selectAnnotation(roiAnnotation);
|
||||
microscopyService.focusAnnotation(roiAnnotation, props.activeViewportIndex);
|
||||
};
|
||||
|
||||
/**
|
||||
* Handler for "Edit" action of an annotation item
|
||||
* @param param0
|
||||
*/
|
||||
const onMeasurementItemEditHandler = ({
|
||||
uid,
|
||||
isActive,
|
||||
}: {
|
||||
uid: string;
|
||||
isActive: boolean;
|
||||
}) => {
|
||||
props.commandsManager.runCommand('setLabel', { uid }, 'MICROSCOPY');
|
||||
};
|
||||
|
||||
// Convert ROI annotations managed by microscopyService into our
|
||||
// own format for display
|
||||
const data = roiAnnotations.map((roiAnnotation, index) => {
|
||||
const label = roiAnnotation.getDetailedLabel();
|
||||
const area = roiAnnotation.getArea();
|
||||
const length = roiAnnotation.getLength();
|
||||
const shortAxisLength = roiAnnotation.roiGraphic.properties.shortAxisLength;
|
||||
const isSelected: boolean = selectedAnnotation === roiAnnotation;
|
||||
|
||||
// other events
|
||||
const { uid } = roiAnnotation;
|
||||
|
||||
// display text
|
||||
const displayText = [];
|
||||
|
||||
if (area !== undefined) {
|
||||
displayText.push(formatArea(area));
|
||||
} else if (length !== undefined) {
|
||||
displayText.push(
|
||||
shortAxisLength
|
||||
? `${formatLength(length, 'μm')} x ${formatLength(
|
||||
shortAxisLength,
|
||||
'μm'
|
||||
)}`
|
||||
: `${formatLength(length, 'μm')}`
|
||||
);
|
||||
}
|
||||
|
||||
// convert to measurementItem format compatible with <MeasurementTable /> component
|
||||
return {
|
||||
uid,
|
||||
index,
|
||||
label,
|
||||
isActive: isSelected,
|
||||
displayText,
|
||||
roiAnnotation,
|
||||
};
|
||||
});
|
||||
|
||||
const disabled = data.length === 0;
|
||||
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className="overflow-x-hidden overflow-y-auto ohif-scrollbar"
|
||||
data-cy={'measurements-panel'}
|
||||
>
|
||||
<MeasurementTable
|
||||
title="Measurements"
|
||||
servicesManager={props.servicesManager}
|
||||
data={data}
|
||||
onClick={onMeasurementItemClickHandler}
|
||||
onEdit={onMeasurementItemEditHandler}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex justify-center p-4">
|
||||
<ButtonGroup color="black" size="inherit">
|
||||
{/* Let's hide the save button for now, as export SR for SM is a proof of concept */}
|
||||
{/*{promptSave && (
|
||||
<Button
|
||||
className="px-2 py-2 text-base"
|
||||
size="initial"
|
||||
variant={disabled ? 'disabled' : 'outlined'}
|
||||
color="black"
|
||||
border="primaryActive"
|
||||
onClick={promptSave}
|
||||
>
|
||||
{props.t('Create Report')}
|
||||
</Button>
|
||||
)} */}
|
||||
{/* <Button
|
||||
className="px-2 py-2 text-base"
|
||||
onClick={onDeleteCurrentSRHandler}
|
||||
>
|
||||
{props.t('Reject latest report')}
|
||||
</Button> */}
|
||||
</ButtonGroup>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
const connectedMicroscopyPanel = withTranslation(['MicroscopyTable', 'Common'])(
|
||||
MicroscopyPanel
|
||||
);
|
||||
|
||||
export default connectedMicroscopyPanel;
|
||||
@@ -0,0 +1,87 @@
|
||||
.DicomMicroscopyViewer .OpenLayersOverlay {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
display: block !important;
|
||||
pointer-events: none !important;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .text-primary-light {
|
||||
font-size: 14px;
|
||||
color: yellow;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .text-primary-light span {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
max-width: 300px;
|
||||
/* text-shadow: 0px 1px 1px rgba(225, 225, 225, 0.6),
|
||||
0px 1px 1px rgba(225, 225, 225, 0.6),
|
||||
1px 1px 3px rgba(225, 225, 225, 0.9),
|
||||
1px 1px 3px rgba(225, 225, 225, 0.9),
|
||||
1px 1px 3px rgba(225, 225, 225, 0.9),
|
||||
1px 1px 3px rgba(225, 225, 225, 0.9); */
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .absolute {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .flex {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .flex-row {
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .flex-col {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .pointer-events-none {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .left-viewport-scrollbar {
|
||||
left: 0.5rem;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .right-viewport-scrollbar {
|
||||
right: 1.3rem;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .top-viewport {
|
||||
top: 0.5rem;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .bottom-viewport {
|
||||
bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .bottom-viewport.left-viewport {
|
||||
bottom: 0.5rem;
|
||||
left: calc(0.5rem + 250px);
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .right-viewport-scrollbar .flex {
|
||||
justify-content: end;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .microscopy-viewport-overlay {
|
||||
padding: 0.5rem 1rem;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
max-width: 40%;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .microscopy-viewport-overlay .flex {
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.DicomMicroscopyViewer .top-viewport .flex span:not(.font-light) {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
@@ -0,0 +1,155 @@
|
||||
import React from 'react';
|
||||
import classnames from 'classnames';
|
||||
import ConfigPoint from 'config-point';
|
||||
|
||||
import listComponentGenerator from './listComponentGenerator';
|
||||
import './ViewportOverlay.css';
|
||||
import {
|
||||
formatDICOMDate,
|
||||
formatDICOMTime,
|
||||
formatNumberPrecision,
|
||||
formatPN,
|
||||
} from './utils';
|
||||
|
||||
interface OverylayItem {
|
||||
id: string;
|
||||
title: string;
|
||||
value?: (props: any) => string;
|
||||
condition?: (props: any) => boolean;
|
||||
contents?: (props: any) => { className: string; value: any };
|
||||
generator?: (props: any) => any;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {*} config is a configuration object that defines four lists of elements,
|
||||
* one topLeft, topRight, bottomLeft, bottomRight contents.
|
||||
* @param {*} extensionManager is used to load the image data.
|
||||
* @returns
|
||||
*/
|
||||
export const generateFromConfig = ({
|
||||
topLeft,
|
||||
topRight,
|
||||
bottomLeft,
|
||||
bottomRight,
|
||||
itemGenerator,
|
||||
}: {
|
||||
topLeft: OverylayItem[];
|
||||
topRight: OverylayItem[];
|
||||
bottomLeft: OverylayItem[];
|
||||
bottomRight: OverylayItem[];
|
||||
itemGenerator: (props: any) => any;
|
||||
}) => {
|
||||
return (props: any) => {
|
||||
const topLeftClass = 'top-viewport left-viewport text-primary-light';
|
||||
const topRightClass =
|
||||
'top-viewport right-viewport-scrollbar text-primary-light';
|
||||
const bottomRightClass =
|
||||
'bottom-viewport right-viewport-scrollbar text-primary-light';
|
||||
const bottomLeftClass = 'bottom-viewport left-viewport text-primary-light';
|
||||
const overlay = 'absolute pointer-events-none microscopy-viewport-overlay';
|
||||
|
||||
return (
|
||||
<>
|
||||
{topLeft && topLeft.length > 0 && (
|
||||
<div
|
||||
data-cy={'viewport-overlay-top-left'}
|
||||
className={classnames(overlay, topLeftClass)}
|
||||
>
|
||||
{listComponentGenerator({ ...props, list: topLeft, itemGenerator })}
|
||||
</div>
|
||||
)}
|
||||
{topRight && topRight.length > 0 && (
|
||||
<div
|
||||
data-cy={'viewport-overlay-top-right'}
|
||||
className={classnames(overlay, topRightClass)}
|
||||
>
|
||||
{listComponentGenerator({
|
||||
...props,
|
||||
list: topRight,
|
||||
itemGenerator,
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{bottomRight && bottomRight.length > 0 && (
|
||||
<div
|
||||
data-cy={'viewport-overlay-bottom-right'}
|
||||
className={classnames(overlay, bottomRightClass)}
|
||||
>
|
||||
{listComponentGenerator({
|
||||
...props,
|
||||
list: bottomRight,
|
||||
itemGenerator,
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{bottomLeft && bottomLeft.length > 0 && (
|
||||
<div
|
||||
data-cy={'viewport-overlay-bottom-left'}
|
||||
className={classnames(overlay, bottomLeftClass)}
|
||||
>
|
||||
{listComponentGenerator({
|
||||
...props,
|
||||
list: bottomLeft,
|
||||
itemGenerator,
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
const itemGenerator = (props: any) => {
|
||||
const { item } = props;
|
||||
const { title, value: valueFunc, condition, contents } = item;
|
||||
props.image = { ...props.image, ...props.metadata };
|
||||
props.formatDate = formatDICOMDate;
|
||||
props.formatTime = formatDICOMTime;
|
||||
props.formatPN = formatPN;
|
||||
props.formatNumberPrecision = formatNumberPrecision;
|
||||
if (condition && !condition(props)) return null;
|
||||
if (!contents && !valueFunc) return null;
|
||||
const value = valueFunc && valueFunc(props);
|
||||
const contentsValue = (contents && contents(props)) || [
|
||||
{ className: 'mr-1', value: title },
|
||||
{ classname: 'mr-1 font-light', value },
|
||||
];
|
||||
|
||||
return (
|
||||
<div key={item.id} className="flex flex-row">
|
||||
{contentsValue.map((content, idx) => (
|
||||
<span key={idx} className={content.className}>
|
||||
{content.value}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const { MicroscopyViewportOverlay } = ConfigPoint.register({
|
||||
MicroscopyViewportOverlay: {
|
||||
configBase: {
|
||||
topLeft: [
|
||||
// {
|
||||
// id: 'sm-overlay-patient-name',
|
||||
// title: 'PatientName',
|
||||
// condition: ({ instance }) =>
|
||||
// instance && instance.PatientName && instance.PatientName.Alphabetic,
|
||||
// value: ({ instance }) =>
|
||||
// instance.PatientName && instance.PatientName.Alphabetic,
|
||||
// } as OverylayItem,
|
||||
],
|
||||
topRight: [] as OverylayItem[],
|
||||
bottomLeft: [] as OverylayItem[],
|
||||
bottomRight: [] as OverylayItem[],
|
||||
itemGenerator,
|
||||
generateFromConfig,
|
||||
},
|
||||
...(window.config?.MicroscopyViewportOverlay || {}),
|
||||
},
|
||||
});
|
||||
|
||||
export default MicroscopyViewportOverlay.generateFromConfig(
|
||||
MicroscopyViewportOverlay
|
||||
);
|
||||
@@ -0,0 +1,12 @@
|
||||
const listComponentGenerator = props => {
|
||||
const { list, itemGenerator } = props;
|
||||
if (!list) return;
|
||||
return list.map(item => {
|
||||
if (!item) return;
|
||||
const generator = item.generator || itemGenerator;
|
||||
if (!generator) throw new Error(`No generator for ${item}`);
|
||||
return generator({ ...props, item });
|
||||
});
|
||||
};
|
||||
|
||||
export default listComponentGenerator;
|
||||
@@ -0,0 +1,102 @@
|
||||
import moment from 'moment';
|
||||
import * as cornerstone from '@cornerstonejs/core';
|
||||
|
||||
/**
|
||||
* Checks if value is valid.
|
||||
*
|
||||
* @param {number} value
|
||||
* @returns {boolean} is valid.
|
||||
*/
|
||||
export function isValidNumber(value) {
|
||||
return typeof value === 'number' && !isNaN(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats number precision.
|
||||
*
|
||||
* @param {number} number
|
||||
* @param {number} precision
|
||||
* @returns {number} formatted number.
|
||||
*/
|
||||
export function formatNumberPrecision(number, precision) {
|
||||
if (number !== null) {
|
||||
return parseFloat(number).toFixed(precision);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats DICOM date.
|
||||
*
|
||||
* @param {string} date
|
||||
* @param {string} strFormat
|
||||
* @returns {string} formatted date.
|
||||
*/
|
||||
export function formatDICOMDate(date, strFormat = 'MMM D, YYYY') {
|
||||
return moment(date, 'YYYYMMDD').format(strFormat);
|
||||
}
|
||||
|
||||
/**
|
||||
* DICOM Time is stored as HHmmss.SSS, where:
|
||||
* HH 24 hour time:
|
||||
* m mm 0..59 Minutes
|
||||
* s ss 0..59 Seconds
|
||||
* S SS SSS 0..999 Fractional seconds
|
||||
*
|
||||
* Goal: '24:12:12'
|
||||
*
|
||||
* @param {*} time
|
||||
* @param {string} strFormat
|
||||
* @returns {string} formatted name.
|
||||
*/
|
||||
export function formatDICOMTime(time, strFormat = 'HH:mm:ss') {
|
||||
return moment(time, 'HH:mm:ss').format(strFormat);
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats a patient name for display purposes
|
||||
*
|
||||
* @param {string} name
|
||||
* @returns {string} formatted name.
|
||||
*/
|
||||
export function formatPN(name) {
|
||||
if (!name) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert the first ^ to a ', '. String.replace() only affects
|
||||
// the first appearance of the character.
|
||||
const commaBetweenFirstAndLast = name.replace('^', ', ');
|
||||
|
||||
// Replace any remaining '^' characters with spaces
|
||||
const cleaned = commaBetweenFirstAndLast.replace(/\^/g, ' ');
|
||||
|
||||
// Trim any extraneous whitespace
|
||||
return cleaned.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets compression type
|
||||
*
|
||||
* @param {number} imageId
|
||||
* @returns {string} comrpession type.
|
||||
*/
|
||||
export function getCompression(imageId) {
|
||||
const generalImageModule =
|
||||
cornerstone.metaData.get('generalImageModule', imageId) || {};
|
||||
const {
|
||||
lossyImageCompression,
|
||||
lossyImageCompressionRatio,
|
||||
lossyImageCompressionMethod,
|
||||
} = generalImageModule;
|
||||
|
||||
if (lossyImageCompression === '01' && lossyImageCompressionRatio !== '') {
|
||||
const compressionMethod = lossyImageCompressionMethod || 'Lossy: ';
|
||||
const compressionRatio = formatNumberPrecision(
|
||||
lossyImageCompressionRatio,
|
||||
2
|
||||
);
|
||||
return compressionMethod + compressionRatio + ' : 1';
|
||||
}
|
||||
|
||||
return 'Lossless / Uncompressed';
|
||||
}
|
||||
Reference in new issue
Block a user