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

feat(measurementTable): Adding convert measurements into table data function into our reducer

Browse Source
This commit is contained in:
Gustavo Lelis 2019-02-08 17:03:11 -02:00
parent 7c20343912
commit cb32c299e2
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Packages-react/ohif-viewer/src/connectedComponents/ConnectedMeasurementTable.js
View File

@ -19,15 +19,28 @@ function convertMeasurementsToTableData(measurements) {
const tableData = [ const tableData = [
{ {
groupName: 'Measurements', groupName: 'Measurements',
measurements: [] measurements: [],
measurements1: measurements
} }
]; ];
if (!measurements || !measurements.length) { if (measurements && measurements.allTools) {
return tableData; measurements.allTools.forEach(measurement => {
const tableMeasurement = {
label: '...',
hasWarnings: false,
warningTitle: '',
isSplitLesion: false,
warningList: [],
data: [
{
displayText: '...'
}
]
};
tableData[0].measurements.push(tableMeasurement);
});
} }
// TODO: Add measurements into tableData
return tableData; return tableData;
} }

9
Packages-react/ohif-viewer/src/connectedComponents/Viewer.js
View File

@ -52,6 +52,7 @@ OHIF.viewer.functionList = {
class Viewer extends Component { class Viewer extends Component {
static propTypes = { static propTypes = {
studies: PropTypes.array, studies: PropTypes.array,
studyInstanceUids: PropTypes.array,
onTimepointsUpdated: PropTypes.func, onTimepointsUpdated: PropTypes.func,
onMeasurementsUpdated: PropTypes.func onMeasurementsUpdated: PropTypes.func
}; };
@ -158,10 +159,12 @@ class Viewer extends Component {
componentDidMount() { componentDidMount() {
const { studies } = this.props; const { studies } = this.props;
const { TimepointApi, MeasurementApi } = OHIF.measurements; const { TimepointApi, MeasurementApi } = OHIF.measurements;
const currentTimepointId = 'TimepointId';
const timepointApi = new TimepointApi('TimepointId', { const timepointApi = new TimepointApi(currentTimepointId, {
onTimepointsUpdated: this.onTimepointsUpdated onTimepointsUpdated: this.onTimepointsUpdated
}); });
const measurementApi = new MeasurementApi(timepointApi, { const measurementApi = new MeasurementApi(timepointApi, {
onMeasurementsUpdated: this.onMeasurementsUpdated onMeasurementsUpdated: this.onMeasurementsUpdated
}); });
@ -170,8 +173,8 @@ class Viewer extends Component {
timepointApi.retrieveTimepoints({ patientId }); timepointApi.retrieveTimepoints({ patientId });
// TODO: Retrieve measurements and sync them with tool data // TODO: Retrieve measurements and sync them with tool data
// measurementApi.retrieveMeasurements(patientId, [currentTimepointId]); measurementApi.retrieveMeasurements(patientId, [currentTimepointId]);
// measurementApi.syncMeasurementsAndToolData(); //measurementApi.syncMeasurementsAndToolData();
} }
render() { render() {