diff --git a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx index 1f650b1c2..c03750013 100644 --- a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx +++ b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ROIThresholdConfiguration.tsx @@ -1,5 +1,14 @@ import React from 'react'; -import { Input, Label, Select, LegacyButton, LegacyButtonGroup } from '@ohif/ui'; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, + Label, + Input, + Button, +} from '@ohif/ui-next'; import { useTranslation } from 'react-i18next'; export const ROI_STAT = 'roi_stat'; @@ -14,17 +23,15 @@ function ROIThresholdConfiguration({ config, dispatch, runCommand }) { const { t } = useTranslation('ROIThresholdConfiguration'); return ( -
-
-
+
+
+
+ {/* The original panel design does not include "Strategy," but it was found in the code. + Need to determine if it should be included or removed. + */}
-
- {/* TODO Revisit design of LegacyButtonGroup later - for now use LegacyButton for its children.*/} - - +
+ +
{config.strategy === ROI_STAT && ( - { - dispatch({ - type: 'setWeight', - payload: { - weight: e.target.value, - }, - }); - }} - /> +
+
+ +
+ { + dispatch({ + type: 'setWeight', + payload: { + weight: e.target.value, + }, + }); + }} + /> +
)} {config.strategy !== ROI_STAT && (
- - - - - - - - - - - - - - -
- -
- - -
- { - dispatch({ - type: 'setThreshold', - payload: { - ctLower: e.target.value, - }, - }); - }} - /> - { - dispatch({ - type: 'setThreshold', - payload: { - ctUpper: e.target.value, - }, - }); - }} - /> -
-
- - -
- { - dispatch({ - type: 'setThreshold', - payload: { - ptLower: e.target.value, - }, - }); - }} - /> - { - dispatch({ - type: 'setThreshold', - payload: { - ptUpper: e.target.value, - }, - }); - }} - /> -
-
+
+ {/* Header */} + + + {/* CT Row */} +
+
+ +
+
+
+ { + dispatch({ + type: 'setThreshold', + payload: { + ctLower: e.target.value, + }, + }); + }} + /> +
+
+ { + dispatch({ + type: 'setThreshold', + payload: { + ctUpper: e.target.value, + }, + }); + }} + /> +
+
+
+ + {/* PT Row */} +
+
+ +
+
+
+ { + dispatch({ + type: 'setThreshold', + payload: { + ptLower: e.target.value, + }, + }); + }} + /> +
+
+ { + dispatch({ + type: 'setThreshold', + payload: { + ptUpper: e.target.value, + }, + }); + }} + /> +
+
+
+
)}
diff --git a/extensions/tmtv/src/Panels/RectangleROIOptions.tsx b/extensions/tmtv/src/Panels/RectangleROIOptions.tsx index d6ebf7490..390ddf0db 100644 --- a/extensions/tmtv/src/Panels/RectangleROIOptions.tsx +++ b/extensions/tmtv/src/Panels/RectangleROIOptions.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useReducer } from 'react'; -import { Button } from '@ohif/ui'; +import { Button } from '@ohif/ui-next'; import ROIThresholdConfiguration, { ROI_STAT, } from './PanelROIThresholdSegmentation/ROIThresholdConfiguration'; @@ -80,7 +80,7 @@ function RectangleROIOptions() { }, [activeSegmentation, config]); return ( -
+
{activeSegmentation && (