wip: need to fix StackManager

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

View File

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

View File

@ -31,6 +31,10 @@ function createAndAddStack(
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 stack = {

View File

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

View File

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