wire up some ActionBar data; default grid to 2x2
This commit is contained in:
parent
765099f912
commit
c3dd2608b2
@ -50,8 +50,8 @@ function Test() {
|
|||||||
return <div
|
return <div
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
dispatch({ type: '', payload: {
|
dispatch({ type: '', payload: {
|
||||||
numCols: 3,
|
numCols: 2,
|
||||||
numRows: 3,
|
numRows: 2,
|
||||||
activeViewportIndex: 0,
|
activeViewportIndex: 0,
|
||||||
viewports: [],
|
viewports: [],
|
||||||
}})
|
}})
|
||||||
|
|||||||
@ -49,8 +49,8 @@ function Test() {
|
|||||||
return <div
|
return <div
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
dispatch({ type: '', payload: {
|
dispatch({ type: '', payload: {
|
||||||
numCols: 3,
|
numCols: 2,
|
||||||
numRows: 3,
|
numRows: 2,
|
||||||
activeViewportIndex: 0,
|
activeViewportIndex: 0,
|
||||||
viewports: [],
|
viewports: [],
|
||||||
}})
|
}})
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import React, { Component } from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import cornerstone from 'cornerstone-core';
|
import cornerstone from 'cornerstone-core';
|
||||||
import CornerstoneViewport from 'react-cornerstone-viewport';
|
import CornerstoneViewport from 'react-cornerstone-viewport';
|
||||||
import OHIF from '@ohif/core';
|
import OHIF, { DicomMetadataStore } from '@ohif/core';
|
||||||
import { ViewportActionBar } from '@ohif/ui';
|
import { ViewportActionBar } from '@ohif/ui';
|
||||||
import debounce from 'lodash.debounce';
|
import debounce from 'lodash.debounce';
|
||||||
import throttle from 'lodash.throttle';
|
import throttle from 'lodash.throttle';
|
||||||
@ -156,27 +156,42 @@ class OHIFCornerstoneViewport extends Component {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We have...
|
||||||
|
// StudyInstanceUid, DisplaySetInstanceUid
|
||||||
|
// Use displaySetInstanceUid --> SeriesInstanceUid
|
||||||
|
// Get meta for series, map to actionBar
|
||||||
|
// const displaySet = DisplaySetService.getDisplaySetByUID(
|
||||||
|
// dSet.displaySetInstanceUID
|
||||||
|
// );
|
||||||
|
// TODO: This display contains the meta for all instances.
|
||||||
|
// That can't be right...
|
||||||
|
console.log('DISPLAYSET', this.props.displaySet)
|
||||||
|
const seriesMeta = DicomMetadataStore.getSeries(this.props.displaySet.StudyInstanceUID, '');
|
||||||
|
console.log(seriesMeta);
|
||||||
|
|
||||||
|
const { Modality, SeriesDate, SeriesDescription, SeriesNumber } = this.props.displaySet;
|
||||||
|
const { PatientID, PatientName, PatientSex, PatientAge, SliceThickness, } = this.props.displaySet.images[0];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<ViewportActionBar
|
<ViewportActionBar
|
||||||
onSeriesChange={direction => alert(`Series ${direction}`)}
|
onSeriesChange={direction => alert(`Series ${direction}`)}
|
||||||
studyData={{
|
studyData={{
|
||||||
label: 'A',
|
label: '',
|
||||||
isTracked: false,
|
isTracked: false,
|
||||||
isLocked: false,
|
isLocked: false,
|
||||||
studyDate: '07-Sep-2011',
|
studyDate: SeriesDate, // TODO: This is series date. Is that ok?
|
||||||
currentSeries: 1,
|
currentSeries: SeriesNumber,
|
||||||
seriesDescription:
|
seriesDescription: SeriesDescription,
|
||||||
'Series description lorem ipsum dolor sit Series description lorem ipsum dolor sit Series description lorem ipsum dolor sit ',
|
modality: Modality,
|
||||||
modality: 'CT',
|
|
||||||
patientInformation: {
|
patientInformation: {
|
||||||
patientName: 'Smith, Jane',
|
patientName: PatientName ? PatientName.Alphabetic || '' : '',
|
||||||
patientSex: 'F',
|
patientSex: PatientSex || '',
|
||||||
patientAge: '59',
|
patientAge: PatientAge || '',
|
||||||
MRN: '10000001',
|
MRN: PatientID || '',
|
||||||
thickness: '5.0mm',
|
thickness: `${SliceThickness}mm`,
|
||||||
spacing: '1.25mm',
|
spacing: '',
|
||||||
scanner: 'Aquilion',
|
scanner: '',
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user