fix(measurements): Show missing measurements in measurement table (#426)

- Bump cornerstone-tools to 3.9.0, ohif-core to 0.5.2 and react-viewerbase to 0.4.1
- Add bidirectional, elliptical, circle and rectangle roi tools
- Support labeling and context-menu for all annotation tools
- Sort measurements by lesion naming number to show the last added measurement in the end in measurement table
This commit is contained in:
Evren Ozkan authored and GitHub committed 2019-05-13 18:07:57 -04:00
1 parent 12172eaf48
commit 065a81d6e7
6 files changed
+119 -31

No files matched your search

@@ -6,12 +6,12 @@ import cornerstone from 'cornerstone-core'
import jumpToRowItem from '../lib/jumpToRowItem.js'
import getMeasurementLocationCallback from '../lib/getMeasurementLocationCallback'
const { setViewportSpecificData } = OHIF.redux.actions;
const { setViewportSpecificData } = OHIF.redux.actions
const { MeasurementApi } = OHIF.measurements
function groupBy(list, props) {
return list.reduce((a, b) => {
(a[b[props]] = a[b[props]] || []).push(b)
;(a[b[props]] = a[b[props]] || []).push(b)
return a
}, {})
}
@@ -84,17 +84,18 @@ function convertMeasurementsToTableData(toolCollections, timepoints) {
Object.keys(groupedMeasurements).forEach(groupedMeasurementsIndex => {
const measurementNumberList =
groupedMeasurements[groupedMeasurementsIndex]
const measurementData = measurementNumberList[0]
const {
measurementNumber,
lesionNamingNumber,
toolType,
} = measurementNumberList[0]
const measurementId = measurementNumberList[0]._id
} = measurementData
const measurementId = measurementData._id
//check if all measurements with same measurementNumber will have same LABEL
const tableMeasurement = {
label: getMeasurementText(measurementNumberList[0]),
itemNumber: lesionNamingNumber,
label: getMeasurementText(measurementData),
measurementId,
measurementNumber,
lesionNamingNumber,
@@ -119,6 +120,13 @@ function convertMeasurementsToTableData(toolCollections, timepoints) {
})
})
// Sort measurements by lesion naming number
tableMeasurements.forEach(tm => {
tm.measurements.sort((m1, m2) =>
m1.lesionNamingNumber > m2.lesionNamingNumber ? 1 : -1
)
})
return tableMeasurements
}
@@ -230,9 +238,9 @@ const mapDispatchToProps = dispatch => {
)
actionData.viewportSpecificData.forEach(viewportSpecificData => {
const { viewportIndex, displaySet } = viewportSpecificData;
const { viewportIndex, displaySet } = viewportSpecificData
dispatch(setViewportSpecificData(viewportIndex, displaySet));
dispatch(setViewportSpecificData(viewportIndex, displaySet))
})
const { toolType, measurementNumber } = measurementData
@@ -320,7 +328,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
)
},
onDeleteClick: (event, measurementData) => {
const { MeasurementHandlers } = OHIF.measurements;
const { MeasurementHandlers } = OHIF.measurements
MeasurementHandlers.onRemoved({
detail: {
@@ -328,11 +336,11 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
measurementData: {
_id: measurementData.measurementId,
lesionNamingNumber: measurementData.lesionNamingNumber,
measurementNumber: measurementData.measurementNumber
}
}
});
}
measurementNumber: measurementData.measurementNumber,
},
},
})
},
}
}
+9 -1
View File
@@ -6,7 +6,15 @@ import getMeasurementLocationCallback from '../lib/getMeasurementLocationCallbac
import './ToolContextMenu.css'
const toolTypes = ['Angle', 'Length']
const toolTypes = [
'Angle',
'Bidirectional',
'Length',
'FreehandMouse',
'EllipticalRoi',
'CircleRoi',
'RectangleRoi',
]
let defaultDropdownItems = [
{
+45 -1
View File
@@ -145,6 +145,15 @@ export default function setupTools(store) {
{ name: 'Pan', mouseButtonMasks: [1, 4] },
{ name: 'Zoom', mouseButtonMasks: [1, 2] },
{ name: 'Wwwc', mouseButtonMasks: [1] },
{
name: 'Bidirectional',
configuration: {
configuration: {
getMeasurementLocationCallback: toolLabellingFlowCallback,
},
},
mouseButtonMasks: [1],
},
{
name: 'Length',
configuration: {
@@ -165,7 +174,42 @@ export default function setupTools(store) {
},
{ name: 'StackScroll', mouseButtonMasks: [1] },
{ name: 'Brush', mouseButtonMasks: [1] },
{ name: 'FreehandMouse', mouseButtonMasks: [1] },
{
name: 'FreehandMouse',
configuration: {
configuration: {
getMeasurementLocationCallback: toolLabellingFlowCallback,
},
},
mouseButtonMasks: [1],
},
{
name: 'EllipticalRoi',
configuration: {
configuration: {
getMeasurementLocationCallback: toolLabellingFlowCallback,
},
},
mouseButtonMasks: [1],
},
{
name: 'CircleRoi',
configuration: {
configuration: {
getMeasurementLocationCallback: toolLabellingFlowCallback,
},
},
mouseButtonMasks: [1],
},
{
name: 'RectangleRoi',
configuration: {
configuration: {
getMeasurementLocationCallback: toolLabellingFlowCallback,
},
},
mouseButtonMasks: [1],
},
{ name: 'PanMultiTouch' },
{ name: 'ZoomTouchPinch' },
{ name: 'StackScrollMouseWheel' },
+28
View File
@@ -60,6 +60,13 @@ export default function(baseDirectory = '/') {
iconClasses: 'fa fa-angle-left',
active: false,
},
{
command: 'Bidirectional',
type: 'tool',
text: 'Bidirectional',
svgUrl: `${relativePathToIcons}#icon-tools-measure-target`,
active: false,
},
{
command: 'Brush',
type: 'tool',
@@ -74,6 +81,27 @@ export default function(baseDirectory = '/') {
iconClasses: 'fa fa-star',
active: false,
},
{
command: 'EllipticalRoi',
type: 'tool',
text: 'EllipticalRoi',
iconClasses: 'far fa-circle',
active: false,
},
{
command: 'CircleRoi',
type: 'tool',
text: 'CircleRoi',
iconClasses: 'far fa-dot-circle',
active: false,
},
{
command: 'RectangleRoi',
type: 'tool',
text: 'RectangleRoi',
iconClasses: 'far fa-square',
active: false,
},
{
command: 'reset',
type: 'command',