-
);
}
diff --git a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/LegacyPanelROIThresholdSegmentation.tsx b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/LegacyPanelROIThresholdSegmentation.tsx
new file mode 100644
index 000000000..ed20412ca
--- /dev/null
+++ b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/LegacyPanelROIThresholdSegmentation.tsx
@@ -0,0 +1,287 @@
+import React, { useEffect, useState, useCallback, useReducer } from 'react';
+import PropTypes from 'prop-types';
+import { SegmentationTable, Button, Icon } from '@ohif/ui';
+
+import { useTranslation } from 'react-i18next';
+import segmentationEditHandler from './segmentationEditHandler';
+import ExportReports from './ExportReports';
+import ROIThresholdConfiguration, { ROI_STAT } from './ROIThresholdConfiguration';
+
+const LOWER_CT_THRESHOLD_DEFAULT = -1024;
+const UPPER_CT_THRESHOLD_DEFAULT = 1024;
+const LOWER_PT_THRESHOLD_DEFAULT = 2.5;
+const UPPER_PT_THRESHOLD_DEFAULT = 100;
+const WEIGHT_DEFAULT = 0.41; // a default weight for suv max often used in the literature
+const DEFAULT_STRATEGY = ROI_STAT;
+
+function reducer(state, action) {
+ const { payload } = action;
+ const { strategy, ctLower, ctUpper, ptLower, ptUpper, weight } = payload;
+
+ switch (action.type) {
+ case 'setStrategy':
+ return {
+ ...state,
+ strategy,
+ };
+ case 'setThreshold':
+ return {
+ ...state,
+ ctLower: ctLower ? ctLower : state.ctLower,
+ ctUpper: ctUpper ? ctUpper : state.ctUpper,
+ ptLower: ptLower ? ptLower : state.ptLower,
+ ptUpper: ptUpper ? ptUpper : state.ptUpper,
+ };
+ case 'setWeight':
+ return {
+ ...state,
+ weight,
+ };
+ default:
+ return state;
+ }
+}
+
+export default function LegacyPanelRoiThresholdSegmentation({ servicesManager, commandsManager }) {
+ const { segmentationService } = servicesManager.services;
+
+ const { t } = useTranslation('PanelSUV');
+ const [showConfig, setShowConfig] = useState(false);
+ const [labelmapLoading, setLabelmapLoading] = useState(false);
+ const [selectedSegmentationId, setSelectedSegmentationId] = useState(null);
+ const [segmentations, setSegmentations] = useState(() => segmentationService.getSegmentations());
+
+ const [config, dispatch] = useReducer(reducer, {
+ strategy: DEFAULT_STRATEGY,
+ ctLower: LOWER_CT_THRESHOLD_DEFAULT,
+ ctUpper: UPPER_CT_THRESHOLD_DEFAULT,
+ ptLower: LOWER_PT_THRESHOLD_DEFAULT,
+ ptUpper: UPPER_PT_THRESHOLD_DEFAULT,
+ weight: WEIGHT_DEFAULT,
+ });
+
+ const [tmtvValue, setTmtvValue] = useState(null);
+
+ const runCommand = useCallback(
+ (commandName, commandOptions = {}) => {
+ return commandsManager.runCommand(commandName, commandOptions);
+ },
+ [commandsManager]
+ );
+
+ const handleTMTVCalculation = useCallback(() => {
+ const tmtv = runCommand('calculateTMTV', { segmentations });
+
+ if (tmtv !== undefined) {
+ setTmtvValue(tmtv.toFixed(2));
+ }
+ }, [segmentations, runCommand]);
+
+ const handleROIThresholding = useCallback(() => {
+ const labelmap = runCommand('thresholdSegmentationByRectangleROITool', {
+ segmentationId: selectedSegmentationId,
+ config,
+ });
+
+ const lesionStats = runCommand('getLesionStats', { labelmap });
+ const suvPeak = runCommand('calculateSuvPeak', { labelmap });
+ const lesionGlyoclysisStats = lesionStats.volume * lesionStats.meanValue;
+
+ // update segDetails with the suv peak for the active segmentation
+ const segmentation = segmentationService.getSegmentation(selectedSegmentationId);
+
+ const cachedStats = {
+ lesionStats,
+ suvPeak,
+ lesionGlyoclysisStats,
+ };
+
+ const notYetUpdatedAtSource = true;
+ segmentationService.addOrUpdateSegmentation(
+ {
+ ...segmentation,
+ ...Object.assign(segmentation.cachedStats, cachedStats),
+ displayText: [`SUV Peak: ${suvPeak.suvPeak.toFixed(2)}`],
+ },
+ notYetUpdatedAtSource
+ );
+
+ handleTMTVCalculation();
+ }, [selectedSegmentationId, config]);
+
+ /**
+ * Update UI based on segmentation changes (added, removed, updated)
+ */
+ useEffect(() => {
+ // ~~ Subscription
+ const added = segmentationService.EVENTS.SEGMENTATION_ADDED;
+ const updated = segmentationService.EVENTS.SEGMENTATION_UPDATED;
+ const subscriptions = [];
+
+ [added, updated].forEach(evt => {
+ const { unsubscribe } = segmentationService.subscribe(evt, () => {
+ const segmentations = segmentationService.getSegmentations();
+ setSegmentations(segmentations);
+ });
+ subscriptions.push(unsubscribe);
+ });
+
+ return () => {
+ subscriptions.forEach(unsub => {
+ unsub();
+ });
+ };
+ }, []);
+
+ useEffect(() => {
+ const { unsubscribe } = segmentationService.subscribe(
+ segmentationService.EVENTS.SEGMENTATION_REMOVED,
+ () => {
+ const segmentations = segmentationService.getSegmentations();
+ setSegmentations(segmentations);
+
+ if (segmentations.length > 0) {
+ setSelectedSegmentationId(segmentations[0].id);
+ handleTMTVCalculation();
+ } else {
+ setSelectedSegmentationId(null);
+ setTmtvValue(null);
+ }
+ }
+ );
+
+ return () => {
+ unsubscribe();
+ };
+ }, []);
+
+ /**
+ * Whenever the segmentations change, update the TMTV calculations
+ */
+ useEffect(() => {
+ if (!selectedSegmentationId && segmentations.length > 0) {
+ setSelectedSegmentationId(segmentations[0].id);
+ }
+
+ handleTMTVCalculation();
+ }, [segmentations, selectedSegmentationId]);
+
+ return (
+ <>
+
+
+
+ {
+ setLabelmapLoading(true);
+ setTimeout(() => {
+ runCommand('createNewLabelmapFromPT').then(segmentationId => {
+ setLabelmapLoading(false);
+ setSelectedSegmentationId(segmentationId);
+ });
+ });
+ }}
+ >
+ {labelmapLoading ? 'loading ...' : 'New Label'}
+
+ Run
+
+
{
+ setShowConfig(!showConfig);
+ }}
+ >
+
{t('ROI Threshold Configuration')}
+
+ {showConfig && (
+
+ )}
+ {/* show segmentation table */}
+
+ {segmentations?.length ? (
+ {
+ runCommand('setSegmentationActiveForToolGroups', {
+ segmentationId: id,
+ });
+ setSelectedSegmentationId(id);
+ }}
+ onToggleVisibility={id => {
+ segmentationService.toggleSegmentationVisibility(id);
+ }}
+ onToggleVisibilityAll={ids => {
+ ids.map(id => {
+ segmentationService.toggleSegmentationVisibility(id);
+ });
+ }}
+ onDelete={id => {
+ segmentationService.remove(id);
+ }}
+ onEdit={id => {
+ segmentationEditHandler({
+ id,
+ servicesManager,
+ });
+ }}
+ />
+ ) : null}
+
+ {tmtvValue !== null ? (
+
+
+ {'TMTV:'}
+
+
{`${tmtvValue} mL`}
+
+ ) : null}
+
+
+
+
{
+ // navigate to a url in a new tab
+ window.open('https://github.com/OHIF/Viewers/blob/master/modes/tmtv/README.md', '_blank');
+ }}
+ >
+ {'User Guide'}
+
+
+ );
+}
+
+LegacyPanelRoiThresholdSegmentation.propTypes = {
+ commandsManager: PropTypes.shape({
+ runCommand: PropTypes.func.isRequired,
+ }),
+ servicesManager: PropTypes.shape({
+ services: PropTypes.shape({
+ segmentationService: PropTypes.shape({
+ getSegmentation: PropTypes.func.isRequired,
+ getSegmentations: PropTypes.func.isRequired,
+ toggleSegmentationVisibility: PropTypes.func.isRequired,
+ subscribe: PropTypes.func.isRequired,
+ EVENTS: PropTypes.object.isRequired,
+ }).isRequired,
+ }).isRequired,
+ }).isRequired,
+};
diff --git a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdSegmentation.tsx b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdSegmentation.tsx
index 306c39c94..dd5c0cdbb 100644
--- a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdSegmentation.tsx
+++ b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdSegmentation.tsx
@@ -1,67 +1,23 @@
-import React, { useEffect, useState, useCallback, useReducer } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
import PropTypes from 'prop-types';
-import { SegmentationTable, Button, Icon } from '@ohif/ui';
+import { SegmentationGroupTableExpanded, Icon } from '@ohif/ui';
+import { createReportAsync } from '@ohif/extension-default';
-import { useTranslation } from 'react-i18next';
import segmentationEditHandler from './segmentationEditHandler';
import ExportReports from './ExportReports';
-import ROIThresholdConfiguration, { ROI_STAT } from './ROIThresholdConfiguration';
+import callInputDialog from './callInputDialog';
+import callColorPickerDialog from './colorPickerDialog';
-const LOWER_CT_THRESHOLD_DEFAULT = -1024;
-const UPPER_CT_THRESHOLD_DEFAULT = 1024;
-const LOWER_PT_THRESHOLD_DEFAULT = 2.5;
-const UPPER_PT_THRESHOLD_DEFAULT = 100;
-const WEIGHT_DEFAULT = 0.41; // a default weight for suv max often used in the literature
-const DEFAULT_STRATEGY = ROI_STAT;
+export default function PanelRoiThresholdSegmentation({
+ servicesManager,
+ commandsManager,
+ extensionManager,
+}) {
+ const { segmentationService, viewportGridService, uiDialogService } = servicesManager.services;
-function reducer(state, action) {
- const { payload } = action;
- const { strategy, ctLower, ctUpper, ptLower, ptUpper, weight } = payload;
-
- switch (action.type) {
- case 'setStrategy':
- return {
- ...state,
- strategy,
- };
- case 'setThreshold':
- return {
- ...state,
- ctLower: ctLower ? ctLower : state.ctLower,
- ctUpper: ctUpper ? ctUpper : state.ctUpper,
- ptLower: ptLower ? ptLower : state.ptLower,
- ptUpper: ptUpper ? ptUpper : state.ptUpper,
- };
- case 'setWeight':
- return {
- ...state,
- weight,
- };
- default:
- return state;
- }
-}
-
-export default function PanelRoiThresholdSegmentation({ servicesManager, commandsManager }) {
- const { segmentationService } = servicesManager.services;
-
- const { t } = useTranslation('PanelSUV');
- const [showConfig, setShowConfig] = useState(false);
- const [labelmapLoading, setLabelmapLoading] = useState(false);
const [selectedSegmentationId, setSelectedSegmentationId] = useState(null);
const [segmentations, setSegmentations] = useState(() => segmentationService.getSegmentations());
- const [config, dispatch] = useReducer(reducer, {
- strategy: DEFAULT_STRATEGY,
- ctLower: LOWER_CT_THRESHOLD_DEFAULT,
- ctUpper: UPPER_CT_THRESHOLD_DEFAULT,
- ptLower: LOWER_PT_THRESHOLD_DEFAULT,
- ptUpper: UPPER_PT_THRESHOLD_DEFAULT,
- weight: WEIGHT_DEFAULT,
- });
-
- const [tmtvValue, setTmtvValue] = useState(null);
-
const runCommand = useCallback(
(commandName, commandOptions = {}) => {
return commandsManager.runCommand(commandName, commandOptions);
@@ -69,46 +25,6 @@ export default function PanelRoiThresholdSegmentation({ servicesManager, command
[commandsManager]
);
- const handleTMTVCalculation = useCallback(() => {
- const tmtv = runCommand('calculateTMTV', { segmentations });
-
- if (tmtv !== undefined) {
- setTmtvValue(tmtv.toFixed(2));
- }
- }, [segmentations, runCommand]);
-
- const handleROIThresholding = useCallback(() => {
- const labelmap = runCommand('thresholdSegmentationByRectangleROITool', {
- segmentationId: selectedSegmentationId,
- config,
- });
-
- const lesionStats = runCommand('getLesionStats', { labelmap });
- const suvPeak = runCommand('calculateSuvPeak', { labelmap });
- const lesionGlyoclysisStats = lesionStats.volume * lesionStats.meanValue;
-
- // update segDetails with the suv peak for the active segmentation
- const segmentation = segmentationService.getSegmentation(selectedSegmentationId);
-
- const cachedStats = {
- lesionStats,
- suvPeak,
- lesionGlyoclysisStats,
- };
-
- const notYetUpdatedAtSource = true;
- segmentationService.addOrUpdateSegmentation(
- {
- ...segmentation,
- ...Object.assign(segmentation.cachedStats, cachedStats),
- displayText: [`SUV Peak: ${suvPeak.suvPeak.toFixed(2)}`],
- },
- notYetUpdatedAtSource
- );
-
- handleTMTVCalculation();
- }, [selectedSegmentationId, config]);
-
/**
* Update UI based on segmentation changes (added, removed, updated)
*/
@@ -116,9 +32,10 @@ export default function PanelRoiThresholdSegmentation({ servicesManager, command
// ~~ Subscription
const added = segmentationService.EVENTS.SEGMENTATION_ADDED;
const updated = segmentationService.EVENTS.SEGMENTATION_UPDATED;
+ const removed = segmentationService.EVENTS.SEGMENTATION_REMOVED;
const subscriptions = [];
- [added, updated].forEach(evt => {
+ [added, updated, removed].forEach(evt => {
const { unsubscribe } = segmentationService.subscribe(evt, () => {
const segmentations = segmentationService.getSegmentations();
setSegmentations(segmentations);
@@ -133,109 +50,222 @@ export default function PanelRoiThresholdSegmentation({ servicesManager, command
};
}, []);
- useEffect(() => {
- const { unsubscribe } = segmentationService.subscribe(
- segmentationService.EVENTS.SEGMENTATION_REMOVED,
- () => {
- const segmentations = segmentationService.getSegmentations();
- setSegmentations(segmentations);
+ const onSegmentationClick = (segmentationId: string) => {
+ segmentationService.setActiveSegmentationForToolGroup(segmentationId);
+ setSelectedSegmentationId(segmentationId);
+ };
- if (segmentations.length > 0) {
- setSelectedSegmentationId(segmentations[0].id);
- handleTMTVCalculation();
- } else {
- setSelectedSegmentationId(null);
- setTmtvValue(null);
- }
+ const onSegmentationAdd = async () => {
+ runCommand('createNewLabelmapFromPT').then(segmentationId => {
+ setSelectedSegmentationId(segmentationId);
+ });
+ };
+
+ const onSegmentAdd = segmentationId => {
+ segmentationService.addSegment(segmentationId);
+ };
+
+ const getToolGroupIds = segmentationId => {
+ const toolGroupIds = segmentationService.getToolGroupIdsWithSegmentation(segmentationId);
+
+ return toolGroupIds;
+ };
+
+ const onSegmentClick = (segmentationId, segmentIndex) => {
+ segmentationService.setActiveSegment(segmentationId, segmentIndex);
+
+ const toolGroupIds = getToolGroupIds(segmentationId);
+
+ toolGroupIds.forEach(toolGroupId => {
+ // const toolGroupId =
+ segmentationService.setActiveSegmentationForToolGroup(segmentationId, toolGroupId);
+ segmentationService.jumpToSegmentCenter(segmentationId, segmentIndex, toolGroupId);
+ });
+ };
+
+ const _setSegmentationConfiguration = useCallback(
+ (segmentationId, key, value) => {
+ segmentationService.setConfiguration({
+ segmentationId,
+ [key]: value,
+ });
+ },
+ [segmentationService]
+ );
+
+ const onToggleSegmentVisibility = (segmentationId, segmentIndex) => {
+ const segmentation = segmentationService.getSegmentation(segmentationId);
+ const segmentInfo = segmentation.segments[segmentIndex];
+ const isVisible = !segmentInfo.isVisible;
+ const toolGroupIds = getToolGroupIds(segmentationId);
+ toolGroupIds.forEach(toolGroupId => {
+ segmentationService.setSegmentVisibility(
+ segmentationId,
+ segmentIndex,
+ isVisible,
+ toolGroupId
+ );
+ });
+ };
+
+ const onSegmentDelete = (segmentationId, segmentIndex) => {
+ segmentationService.removeSegment(segmentationId, segmentIndex);
+ };
+
+ const onSegmentEdit = (segmentationId, segmentIndex) => {
+ const segmentation = segmentationService.getSegmentation(segmentationId);
+
+ const segment = segmentation.segments[segmentIndex];
+ const { label } = segment;
+
+ callInputDialog(uiDialogService, label, (label, actionId) => {
+ if (label === '') {
+ return;
}
- );
- return () => {
- unsubscribe();
+ segmentationService.setSegmentLabel(segmentationId, segmentIndex, label);
+ });
+ };
+
+ const onToggleSegmentLock = (segmentationId, segmentIndex) => {
+ segmentationService.toggleSegmentLocked(segmentationId, segmentIndex);
+ };
+
+ const onSegmentColorClick = (segmentationId, segmentIndex) => {
+ const segmentation = segmentationService.getSegmentation(segmentationId);
+
+ const segment = segmentation.segments[segmentIndex];
+ const { color, opacity } = segment;
+
+ const rgbaColor = {
+ r: color[0],
+ g: color[1],
+ b: color[2],
+ a: opacity / 255.0,
};
- }, []);
- /**
- * Whenever the segmentations change, update the TMTV calculations
- */
- useEffect(() => {
- if (!selectedSegmentationId && segmentations.length > 0) {
- setSelectedSegmentationId(segmentations[0].id);
+ callColorPickerDialog(uiDialogService, rgbaColor, (newRgbaColor, actionId) => {
+ if (actionId === 'cancel') {
+ return;
+ }
+
+ segmentationService.setSegmentRGBAColor(segmentationId, segmentIndex, [
+ newRgbaColor.r,
+ newRgbaColor.g,
+ newRgbaColor.b,
+ newRgbaColor.a * 255.0,
+ ]);
+ });
+ };
+
+ const storeSegmentation = async segmentationId => {
+ const datasources = extensionManager.getActiveDataSource();
+
+ const displaySetInstanceUIDs = await createReportAsync({
+ servicesManager,
+ getReport: () =>
+ commandsManager.runCommand('storeSegmentation', {
+ segmentationId,
+ dataSource: datasources[0],
+ }),
+ reportType: 'Segmentation',
+ });
+
+ // Show the exported report in the active viewport as read only (similar to SR)
+ if (displaySetInstanceUIDs) {
+ // clear the segmentation that we exported, similar to the storeMeasurement
+ // where we remove the measurements and prompt again the user if they would like
+ // to re-read the measurements in a SR read only viewport
+ segmentationService.remove(segmentationId);
+
+ viewportGridService.setDisplaySetsForViewport({
+ viewportId: viewportGridService.getActiveViewportId(),
+ displaySetInstanceUIDs,
+ });
}
+ };
- handleTMTVCalculation();
- }, [segmentations, selectedSegmentationId]);
+ const onSegmentationDownloadRTSS = segmentationId => {
+ commandsManager.runCommand('downloadRTSS', {
+ segmentationId,
+ });
+ };
+
+ const onSegmentationDownload = segmentationId => {
+ commandsManager.runCommand('downloadSegmentation', {
+ segmentationId,
+ });
+ };
+
+ const tmtvValue = segmentations?.[0]?.cachedStats?.tmtv?.value || null;
+ const config = segmentations?.[0]?.cachedStats?.tmtv?.config || {};
return (
<>
-
-
{
- setLabelmapLoading(true);
- setTimeout(() => {
- runCommand('createNewLabelmapFromPT').then(segmentationId => {
- setLabelmapLoading(false);
- setSelectedSegmentationId(segmentationId);
- });
+ {/* show segmentation table */}
+
+ {
+ segmentationService.toggleSegmentationVisibility(id);
+ }}
+ onToggleSegmentVisibility={onToggleSegmentVisibility}
+ onSegmentationDelete={id => {
+ segmentationService.remove(id);
+ }}
+ onSegmentationEdit={id => {
+ segmentationEditHandler({
+ id,
+ servicesManager,
});
}}
- >
- {labelmapLoading ? 'loading ...' : 'New Label'}
-
- Run
-
- {
- setShowConfig(!showConfig);
- }}
- >
-
{t('ROI Threshold Configuration')}
-
+ _setSegmentationConfiguration(selectedSegmentationId, 'renderOutline', value)
+ }
+ setOutlineOpacityActive={value =>
+ _setSegmentationConfiguration(selectedSegmentationId, 'outlineOpacity', value)
+ }
+ setRenderFill={value =>
+ _setSegmentationConfiguration(selectedSegmentationId, 'renderFill', value)
+ }
+ setRenderInactiveSegmentations={value =>
+ _setSegmentationConfiguration(
+ selectedSegmentationId,
+ 'renderInactiveSegmentations',
+ value
+ )
+ }
+ setOutlineWidthActive={value =>
+ _setSegmentationConfiguration(selectedSegmentationId, 'outlineWidthActive', value)
+ }
+ setFillAlpha={value =>
+ _setSegmentationConfiguration(selectedSegmentationId, 'fillAlpha', value)
+ }
+ setFillAlphaInactive={value =>
+ _setSegmentationConfiguration(selectedSegmentationId, 'fillAlphaInactive', value)
+ }
/>
- )}
- {/* show segmentation table */}
-
- {segmentations?.length ? (
- {
- runCommand('setSegmentationActiveForToolGroups', {
- segmentationId: id,
- });
- setSelectedSegmentationId(id);
- }}
- onToggleVisibility={id => {
- segmentationService.toggleSegmentationVisibility(id);
- }}
- onToggleVisibilityAll={ids => {
- ids.map(id => {
- segmentationService.toggleSegmentationVisibility(id);
- });
- }}
- onDelete={id => {
- segmentationService.remove(id);
- }}
- onEdit={id => {
- segmentationEditHandler({
- id,
- servicesManager,
- });
- }}
- />
- ) : null}
{tmtvValue !== null ? (
-
+
{'TMTV:'}
@@ -251,7 +281,7 @@ export default function PanelRoiThresholdSegmentation({ servicesManager, command
{
// navigate to a url in a new tab
window.open('https://github.com/OHIF/Viewers/blob/master/modes/tmtv/README.md', '_blank');
diff --git a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx
index 274ae720d..1f650b1c2 100644
--- a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx
+++ b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx
@@ -14,7 +14,7 @@ function ROIThresholdConfiguration({ config, dispatch, runCommand }) {
const { t } = useTranslation('ROIThresholdConfiguration');
return (
-
+
diff --git a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/callInputDialog.tsx b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/callInputDialog.tsx
new file mode 100644
index 000000000..6de2470d8
--- /dev/null
+++ b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/callInputDialog.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { Input, Dialog, ButtonEnums } from '@ohif/ui';
+
+function callInputDialog(uiDialogService, label, callback) {
+ const dialogId = 'enter-segment-label';
+
+ const onSubmitHandler = ({ action, value }) => {
+ switch (action.id) {
+ case 'save':
+ callback(value.label, action.id);
+ break;
+ case 'cancel':
+ callback('', action.id);
+ break;
+ }
+ uiDialogService.dismiss({ id: dialogId });
+ };
+
+ if (uiDialogService) {
+ uiDialogService.create({
+ id: dialogId,
+ centralize: true,
+ isDraggable: false,
+ showOverlay: true,
+ content: Dialog,
+ contentProps: {
+ title: 'Segment',
+ value: { label },
+ noCloseButton: true,
+ onClose: () => uiDialogService.dismiss({ id: dialogId }),
+ actions: [
+ { id: 'cancel', text: 'Cancel', type: ButtonEnums.type.secondary },
+ { id: 'save', text: 'Confirm', type: ButtonEnums.type.primary },
+ ],
+ onSubmit: onSubmitHandler,
+ body: ({ value, setValue }) => {
+ return (
+
+
+ Run
+
+ )}
+
+ );
+}
+
+export default RectangleROIOptions;
diff --git a/extensions/tmtv/src/commandsModule.js b/extensions/tmtv/src/commandsModule.js
index d00b33c89..765ab7f5b 100644
--- a/extensions/tmtv/src/commandsModule.js
+++ b/extensions/tmtv/src/commandsModule.js
@@ -112,6 +112,7 @@ const commandsModule = ({ servicesManager, commandsManager, extensionManager })
// Create a segmentation of the same resolution as the source data
// using volumeLoader.createAndCacheDerivedVolume.
const { viewportMatchDetails } = hangingProtocolService.getMatchDetails();
+
const ptDisplaySet = actions.getMatchingPTDisplaySet({
viewportMatchDetails,
});
@@ -121,8 +122,11 @@ const commandsModule = ({ servicesManager, commandsManager, extensionManager })
return;
}
+ const currentSegmentations = segmentationService.getSegmentations();
+
const segmentationId = await segmentationService.createSegmentationForDisplaySet(
- ptDisplaySet.displaySetInstanceUID
+ ptDisplaySet.displaySetInstanceUID,
+ { label: `Segmentation ${currentSegmentations.length + 1}` }
);
// Add Segmentation to all toolGroupIds in the viewer
@@ -141,6 +145,12 @@ const commandsModule = ({ servicesManager, commandsManager, extensionManager })
segmentationService.setActiveSegmentationForToolGroup(segmentationId, toolGroupId);
}
+ segmentationService.addSegment(segmentationId, {
+ segmentIndex: 1,
+ properties: {
+ label: 'Segment 1',
+ },
+ });
return segmentationId;
},
setSegmentationActiveForToolGroups: ({ segmentationId }) => {
@@ -150,7 +160,7 @@ const commandsModule = ({ servicesManager, commandsManager, extensionManager })
segmentationService.setActiveSegmentationForToolGroup(segmentationId, toolGroupId);
});
},
- thresholdSegmentationByRectangleROITool: ({ segmentationId, config }) => {
+ thresholdSegmentationByRectangleROITool: ({ segmentationId, config, segmentIndex }) => {
const segmentation = csTools.segmentation.state.getSegmentation(segmentationId);
const { representationData } = segmentation;
@@ -201,12 +211,11 @@ const commandsModule = ({ servicesManager, commandsManager, extensionManager })
{ volume: referencedVolume, lower: ptLower, upper: ptUpper },
{ volume: ctReferencedVolume, lower: ctLower, upper: ctUpper },
],
- { overwrite: true }
+ { overwrite: true, segmentIndex }
);
},
- calculateSuvPeak: ({ labelmap }) => {
+ calculateSuvPeak: ({ labelmap, segmentIndex }) => {
const { referencedVolumeId } = labelmap;
-
const referencedVolume = cs.cache.getVolume(referencedVolumeId);
const annotationUIDs = csTools.annotation.selection.getAnnotationsSelectedByToolName(
@@ -217,7 +226,7 @@ const commandsModule = ({ servicesManager, commandsManager, extensionManager })
csTools.annotation.state.getAnnotation(annotationUID)
);
- const suvPeak = calculateSuvPeak(labelmap, referencedVolume, annotations);
+ const suvPeak = calculateSuvPeak(labelmap, referencedVolume, annotations, segmentIndex);
return {
suvPeak: suvPeak.mean,
suvMax: suvPeak.max,
diff --git a/extensions/tmtv/src/getPanelModule.tsx b/extensions/tmtv/src/getPanelModule.tsx
index 0449ebe48..39a955df3 100644
--- a/extensions/tmtv/src/getPanelModule.tsx
+++ b/extensions/tmtv/src/getPanelModule.tsx
@@ -1,5 +1,6 @@
import React from 'react';
import { PanelPetSUV, PanelROIThresholdSegmentation } from './Panels';
+import { Toolbox } from '@ohif/ui';
// TODO:
// - No loading UI exists yet
@@ -12,18 +13,26 @@ function getPanelModule({ commandsManager, extensionManager, servicesManager })
You need to enable JavaScript to run this app.
-
-
+
+
+