othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependents to use new exposed service

Browse Source
This commit is contained in:
dannyrb 2020-06-26 13:28:30 -04:00
parent dfbf32fe43
commit 3993c12701
5 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/default/src/Toolbar/ToolbarLayoutSelector.jsx
View File

@ -7,7 +7,7 @@ import {
function LayoutSelector() {
const [isOpen, setIsOpen] = useState(false);
const [viewportGridState, dispatch] = useViewportGrid();
const [viewportGridState, viewportGridService] = useViewportGrid();
useEffect(() => {
function closeOnOutsideClick() {
@ -35,13 +35,7 @@ function LayoutSelector() {
DropdownContent !== null && (
<DropdownContent
onSelection={({ numRows, numCols }) => {
dispatch({
type: 'SET_LAYOUT',
payload: {
numCols,
numRows,
},
});
viewportGridService.setLayout({ numCols, numRows });
}}
/>
)

2
extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
View File

@ -25,7 +25,7 @@ function OHIFCornerstoneSRViewport({
viewportIndex,
DisplaySetService,
}) {
const [viewportGrid, dispatchViewportGrid] = useViewportGrid();
const [viewportGrid, viewportGridService] = useViewportGrid();
const [measurementSelected, setMeasurementSelected] = useState(0);
const [measurementCount, setMeasurementCount] = useState(1);
const [viewportData, setViewportData] = useState(null);

5
extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx
View File

@ -19,10 +19,7 @@ function PanelStudyBrowserTracking({
// doesn't have to have such an intense shape. This works well enough for now.
// Tabs --> Studies --> DisplaySets --> Thumbnails
const [{ StudyInstanceUIDs }, dispatchImageViewer] = useImageViewer();
const [
{ activeViewportIndex, viewports },
dispatchViewportGrid,
] = useViewportGrid();
const [{ activeViewportIndex, viewports }] = useViewportGrid();
const [
trackedMeasurements,
sendTrackedMeasurementsEvent,

5
extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js
View File

@ -41,10 +41,7 @@ function TrackedCornerstoneViewport({
}) {
const [trackedMeasurements] = useTrackedMeasurements();
const [
{ activeViewportIndex, viewports },
dispatchViewportGrid,
] = useViewportGrid();
const [{ activeViewportIndex, viewports }] = useViewportGrid();
// viewportIndex, onSubmit
const [viewportDialogState, viewportDialogApi] = useViewportDialog();
const [viewportData, setViewportData] = useState(null);

15
platform/viewer/src/components/ViewportGrid.jsx
View File

@ -10,11 +10,13 @@ function ViewerViewportGrid(props) {
const { servicesManager, viewportComponents, dataSource } = props;
const [
{ numCols, numRows, activeViewportIndex, viewports },
dispatch,
viewportGridService,
] = useViewportGrid();
debugger;
const setActiveViewportIndex = index => {
dispatch({ type: 'SET_ACTIVE_VIEWPORT_INDEX', payload: index });
viewportGridService.setActiveViewportIndex(index);
};
// TODO -> Need some way of selecting which displaySets hit the viewports.
@ -71,12 +73,9 @@ function ViewerViewportGrid(props) {
// ]);
const onDropHandler = (viewportIndex, { displaySetInstanceUID }) => {
console.warn(`DROPPED: ${displaySetInstanceUID}`);
dispatch({
type: 'SET_DISPLAYSET_FOR_VIEWPORT',
payload: {
viewportIndex,
displaySetInstanceUID,
},
viewportGridService.setDisplaysetForViewport({
viewportIndex,
displaySetInstanceUID,
});
};