* Filter segs and fetch correct metadata. * Initiate seg loading logic on series load into viewport. Need to write. * Automatic consumption of SEG functional. * Pull in master. * Fix issues after pulling in master. * Clean up old segmentation handlers. * WIP * WIP * Poppulate viewport with metadata. * Show hide/segmentation in react-vtkjs-viewport. * feat: 🎸 View segmentations in vtkjs viewport * Filter segs and fetch correct metadata. * Initiate seg loading logic on series load into viewport. Need to write. * Automatic consumption of SEG functional. * Pull in master. * Fix issues after pulling in master. * Clean up old segmentation handlers. * WIP * WIP * Poppulate viewport with metadata. * Show hide/segmentation in react-vtkjs-viewport. * feat: 🎸 View segmentations in vtkjs viewport * Rebase on master. * format format format * add basic extension parts * Updated yarn lock * Fetch derived/referenced displaysets in sidepanel * Add buttons, expose seriesDescription, write notes for Danny. * Add growcut tool extention. -> Move to a seperate repo. * Change some text fields. * expose dialog provider * hide draggable area * No pointer events for now; need to revisit * Don't filter seg from the outset for now * fiddling about * fix path to series data * fix logic to determine next available labelmapindex * Ability to swtich between labelmaps * Return a promise so we can make sure our labelmap is loaded before pulling metadata * Better UI to toggle labelmaps * Fix accidental untoggle of active labelmap for ui * Remove brush tool from cornerstone extension * Add cstools in preInit for seg extension * Add buttons for seg magic * Hide the measurements panel for now * Slightly better seg/scissor icons * Add eraser * ability to switch segments * seg color / switcher * Fix vtk labelmap cache. * sidepanel should scroll if there's overflow * Use a fancier range slider * Slightly prettier buttons * Push in progress * A bit more reactive; handle no-meta * Update to vtk.js 11.14.0 and react-vtkjs-viewport 0.6.0 * chore: kickstart preview * Fix conflict issues * Refactor panel * Isolate increment functions * Wip segment table * Hide selector and add scroll to segmentation * Increase width of segment description * Hide not used items * Add new select for segmentations * Align ui * Fix default segmentation * Fix broken import test * Get measurements panel back and add spacing to grouped buttons * Hide brush and selector and refresh when switching segmentations * Add pointer events back and fix broken tests for measurement table * Update segment list when switching humbnails * CR Update: Minor UI adjustments * CR Update: Set active segment * Move components to components folder * Add new settings ui * Integrate configuration * Improve styles * Float numbers * Improve css * Refresh settings menu if side panel changed * Fix settings rendering logic and remove comments * Extract components * Remove not used tools * Remove non used extension * Use style variables and remove comments * Remove non used dep from lock * Remove tools * Remove segmentation from toolbar * Add todo and brushradius from config * Fix packagejson growcut import * Remove webpack config already defined in parent * Update package json description * Change component name to british english to us * Improve prop types * Rename cornerstone label map event * Scope css * Extract and add doc to helper * Update jsdocs for getDerivedDatasets * Add proptypes and cr updates * Update tablistitem proptypes * config is readonly, rollback destructuring * Remove event for side panel * Add jsdocs for util * Extract getimageid to studymetada * Use ohif log instead of console * Remove specific style from side panel * Fix default props for brush radius * Descructure configuration props from settings component to avoid invalid props * Update proptypes to be required (settings) * Update readme * Remove commandsmodule * Get configuration module inside the component * Set selected segment * Rename extension and use modality to filter * Fix for failing tests (#1423) * hello world * Finish rebase for Igor. * Re-fix cornerstoneTools version that got messed up in merge. * Fix reactivity of isDisabled, write implementation for the SEG panel. * Nuke yarn.lock to stack CST to 4.12.0 * Remove debugger statements. * fix: bump cornerstone-tools version to address toFixed issue * test: force tests for MISTER^MR to navigate to study directly * test: remove eraser tool test * test: count is off by one * test: don't save SR state for the time being * test: disable more tests Co-authored-by: James A. Petts <jamesapetts@gmail.com> Co-authored-by: dannyrb <danny.ri.brown@gmail.com> Co-authored-by: igoroctaviano] <igoroctaviano@users.noreply.github.com> Co-authored-by: Mirna Silva <mirna.silva@radicalimaging.com>
189 lines
4.5 KiB
JavaScript
189 lines
4.5 KiB
JavaScript
import './ViewportGrid.css';
|
|
|
|
import React, { useEffect } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import classNames from 'classnames';
|
|
import { utils } from '@ohif/core';
|
|
//
|
|
import ViewportPane from './ViewportPane.js';
|
|
import DefaultViewport from './DefaultViewport.js';
|
|
import EmptyViewport from './EmptyViewport.js';
|
|
|
|
const { loadAndCacheDerivedDisplaySets } = utils;
|
|
|
|
const ViewportGrid = function(props) {
|
|
const {
|
|
activeViewportIndex,
|
|
availablePlugins,
|
|
defaultPlugin: defaultPluginName,
|
|
layout,
|
|
numRows,
|
|
numColumns,
|
|
setViewportData,
|
|
studies,
|
|
viewportData,
|
|
children,
|
|
} = props;
|
|
|
|
const rowSize = 100 / numRows;
|
|
const colSize = 100 / numColumns;
|
|
|
|
// http://grid.malven.co/
|
|
if (!viewportData || !viewportData.length) {
|
|
return null;
|
|
}
|
|
|
|
useEffect(() => {
|
|
viewportData.forEach(displaySet => {
|
|
loadAndCacheDerivedDisplaySets(displaySet, studies);
|
|
});
|
|
}, [viewportData]);
|
|
|
|
const ViewportPanes = layout.viewports.map((layout, viewportIndex) => {
|
|
const displaySet = viewportData[viewportIndex];
|
|
|
|
if (!displaySet) {
|
|
return null;
|
|
}
|
|
|
|
const data = {
|
|
displaySet,
|
|
studies,
|
|
};
|
|
|
|
// JAMES TODO:
|
|
|
|
// Use whichever plugin is currently in use in the panel
|
|
// unless nothing is specified. If nothing is specified
|
|
// and the display set has a plugin specified, use that.
|
|
//
|
|
// TODO: Change this logic to:
|
|
// - Plugins define how capable they are of displaying a SopClass
|
|
// - When updating a panel, ensure that the currently enabled plugin
|
|
// in the viewport is capable of rendering this display set. If not
|
|
// then use the most capable available plugin
|
|
const pluginName =
|
|
!layout.plugin && displaySet && displaySet.plugin
|
|
? displaySet.plugin
|
|
: layout.plugin;
|
|
|
|
const ViewportComponent = _getViewportComponent(
|
|
data, // Why do we pass this as `ViewportData`, when that's not really what it is?
|
|
viewportIndex,
|
|
children,
|
|
availablePlugins,
|
|
pluginName,
|
|
defaultPluginName
|
|
);
|
|
|
|
return (
|
|
<ViewportPane
|
|
onDrop={({
|
|
viewportIndex,
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
}) => {
|
|
setViewportData({
|
|
viewportIndex,
|
|
StudyInstanceUID,
|
|
displaySetInstanceUID,
|
|
});
|
|
}}
|
|
viewportIndex={viewportIndex} // Needed by `setViewportData`
|
|
className={classNames('viewport-container', {
|
|
active: activeViewportIndex === viewportIndex,
|
|
})}
|
|
key={viewportIndex}
|
|
>
|
|
{ViewportComponent}
|
|
</ViewportPane>
|
|
);
|
|
});
|
|
|
|
return (
|
|
<div
|
|
data-cy="viewprt-grid"
|
|
style={{
|
|
display: 'grid',
|
|
gridTemplateRows: `repeat(${numRows}, ${rowSize}%)`,
|
|
gridTemplateColumns: `repeat(${numColumns}, ${colSize}%)`,
|
|
height: '100%',
|
|
width: '100%',
|
|
}}
|
|
>
|
|
{ViewportPanes}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
ViewportGrid.propTypes = {
|
|
viewportData: PropTypes.array.isRequired,
|
|
supportsDrop: PropTypes.bool.isRequired,
|
|
activeViewportIndex: PropTypes.number.isRequired,
|
|
layout: PropTypes.object.isRequired,
|
|
availablePlugins: PropTypes.object.isRequired,
|
|
setViewportData: PropTypes.func.isRequired,
|
|
studies: PropTypes.array,
|
|
children: PropTypes.node,
|
|
defaultPlugin: PropTypes.string,
|
|
numRows: PropTypes.number.isRequired,
|
|
numColumns: PropTypes.number.isRequired,
|
|
};
|
|
|
|
ViewportGrid.defaultProps = {
|
|
viewportData: [],
|
|
numRows: 1,
|
|
numColumns: 1,
|
|
layout: {
|
|
viewports: [{}],
|
|
},
|
|
activeViewportIndex: 0,
|
|
supportsDrop: true,
|
|
availablePlugins: {
|
|
DefaultViewport,
|
|
},
|
|
defaultPlugin: 'defaultViewportPlugin',
|
|
};
|
|
|
|
/**
|
|
*
|
|
*
|
|
* @param {*} plugin
|
|
* @param {*} viewportData
|
|
* @param {*} viewportIndex
|
|
* @param {*} children
|
|
* @returns
|
|
*/
|
|
function _getViewportComponent(
|
|
viewportData,
|
|
viewportIndex,
|
|
children,
|
|
availablePlugins,
|
|
pluginName,
|
|
defaultPluginName
|
|
) {
|
|
if (viewportData.displaySet) {
|
|
pluginName = pluginName || defaultPluginName;
|
|
const ViewportComponent = availablePlugins[pluginName];
|
|
|
|
if (!ViewportComponent) {
|
|
throw new Error(
|
|
`No Viewport Component available for name ${pluginName}.
|
|
Available plugins: ${JSON.stringify(availablePlugins)}`
|
|
);
|
|
}
|
|
|
|
return (
|
|
<ViewportComponent
|
|
viewportData={viewportData}
|
|
viewportIndex={viewportIndex}
|
|
children={[children]}
|
|
/>
|
|
);
|
|
}
|
|
|
|
return <EmptyViewport />;
|
|
}
|
|
|
|
export default ViewportGrid;
|