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

wip: need to fix StackManager

Browse Source
This commit is contained in:
Erik Ziegler 2020-05-18 23:40:28 +02:00
parent ba5d465aa9
commit 755e6b5f77
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/cornerstone/src/OHIFCornerstoneViewport.js
View File

@ -78,6 +78,7 @@ class OHIFCornerstoneViewport extends Component {
} }
getViewportData = async displaySet => { getViewportData = async displaySet => {
debugger;
let viewportData; let viewportData;
const { dataSource } = this.props; const { dataSource } = this.props;

4
platform/core/src/utils/StackManager.js
View File

@ -31,6 +31,10 @@ function createAndAddStack(
return; return;
} }
// TODO: This is broken because it needs to give DisplaySetService to the dataSource
// DisplaySetService
// Should be something like:
// const imageIds = dataSource.getImageIdsForDisplaySet(displaySetInstanceUID, DisplaySetService);
const imageIds = dataSource.getImageIdsForDisplaySet(displaySetInstanceUID); const imageIds = dataSource.getImageIdsForDisplaySet(displaySetInstanceUID);
const stack = { const stack = {

6
platform/ui/src/components/ViewportPane/ViewportPane.jsx
View File

@ -13,7 +13,7 @@ function ViewportPane({
onDrop, onDrop,
acceptDropsFor, acceptDropsFor,
}) { }) {
const [{ isHovered, isHighlighted }, drop] = useDrop({ /*const [{ isHovered, isHighlighted }, drop] = useDrop({
accept: acceptDropsFor, accept: acceptDropsFor,
// TODO: pass in as prop? // TODO: pass in as prop?
drop: (droppedItem, monitor) => { drop: (droppedItem, monitor) => {
@ -29,11 +29,11 @@ function ViewportPane({
isHighlighted: monitor.canDrop(), isHighlighted: monitor.canDrop(),
isHovered: monitor.isOver(), isHovered: monitor.isOver(),
}), }),
}); });*/
// ref={drop}
return ( return (
<div <div
ref={drop}
className={classnames( className={classnames(
'rounded-lg hover:border-primary-light transition duration-300 outline-none overflow-hidden', 'rounded-lg hover:border-primary-light transition duration-300 outline-none overflow-hidden',
{ {

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

@ -20,7 +20,7 @@ function ViewerViewportGrid(props) {
// TODO -> Make a HangingProtocolService // TODO -> Make a HangingProtocolService
const HangingProtocolService = displaySets => { const HangingProtocolService = displaySets => {
const displaySetInstanceUid = displaySets[Object.keys(displaySets)[0]][0].displaySetInstanceUid; const displaySetInstanceUID = displaySets[Object.keys(displaySets)[0]][0].displaySetInstanceUID;
return { return {
numRows: 1, numRows: 1,
@ -28,7 +28,7 @@ function ViewerViewportGrid(props) {
activeViewportIndex: 0, activeViewportIndex: 0,
viewports: [ viewports: [
{ {
displaySetInstanceUid, displaySetInstanceUID,
}, },
], ],
}; };
@ -56,16 +56,17 @@ function ViewerViewportGrid(props) {
// viewportData --> displaySets // viewportData --> displaySets
debugger;
const getViewportPanes = () => const getViewportPanes = () =>
viewportGrid.viewports.map((viewport, viewportIndex) => { viewportGrid.viewports.map((viewport, viewportIndex) => {
const displaySetInstanceUid = viewport.displaySetInstanceUid; const displaySetInstanceUID = viewport.displaySetInstanceUID;
if (!displaySetInstanceUid) { if (!displaySetInstanceUID) {
return null; return null;
} }
// TODO: Is this ever being hit?? // TODO: Is this ever being hit??
debugger; debugger;
const displaySet = DisplaySetService.getDisplaySetByUID(displaySetInstanceUid); const displaySet = DisplaySetService.getDisplaySetByUID(displaySetInstanceUID);
if (!displaySet) { if (!displaySet) {
return ( return (