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

LT-115: Add location and response data in lesion table (WIP)

Browse Source
This commit is contained in:
Aysel Afsar 2016-03-02 23:06:51 -05:00
parent cd4a9a51da
commit a4521c0fa7
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/lesiontracker/client/compatibility/crunexTool.js
View File

@ -158,10 +158,10 @@
seriesInstanceUid: seriesInstanceUid, seriesInstanceUid: seriesInstanceUid,
studyInstanceUid: studyInstanceUid, studyInstanceUid: studyInstanceUid,
patientId: patientId, patientId: patientId,
response: '', response: toolName,
isTarget: true, isTarget: true,
measurementType: 'nonTarget', measurementType: 'nonTarget',
toolName: toolName toolName: 'Target'
}; };
return measurementData; return measurementData;

2
Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.html
View File

@ -1,6 +1,6 @@
<template name="lesionTableTimepointCell"> <template name="lesionTableTimepointCell">
{{ #if hasDataAtThisTimepoint }} {{ #if hasDataAtThisTimepoint }}
{{ #if isTarget }} {{ #if isBirectional }}
<td class="lesionTableTimepointCell targetCell" tabindex="1">{{displayData}}</td> <td class="lesionTableTimepointCell targetCell" tabindex="1">{{displayData}}</td>
{{ else }} {{ else }}
<td class="lesionTableTimepointCell nonTargetCell" tabindex="1">{{displayData}}</td> <td class="lesionTableTimepointCell nonTargetCell" tabindex="1">{{displayData}}</td>

10
Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js
View File

@ -18,7 +18,7 @@ Template.lesionTableTimepointCell.helpers({
var data = lesionData.timepoints[this.timepointId]; var data = lesionData.timepoints[this.timepointId];
if (lesionData.isTarget === true) { if (lesionData.measurementType === 'bidirectional') {
if (data.shortestDiameter) { if (data.shortestDiameter) {
return data.longestDiameter + ' x ' + data.shortestDiameter; return data.longestDiameter + ' x ' + data.shortestDiameter;
} }
@ -31,6 +31,14 @@ Template.lesionTableTimepointCell.helpers({
isTarget: function() { isTarget: function() {
var lesionData = Template.parentData(1); var lesionData = Template.parentData(1);
return lesionData.isTarget; return lesionData.isTarget;
},
isBidirectional: function() {
var lesionData = Template.parentData(1);
if (lesionData.measurementType === 'bidirectional') {
return true;
}
return false
} }
}); });

3
Packages/lesiontracker/lib/LesionManager.js
View File

@ -80,7 +80,8 @@ function updateLesionData(lesionData) {
lesionNumber: lesionData.lesionNumber, lesionNumber: lesionData.lesionNumber,
isTarget: lesionData.isTarget, isTarget: lesionData.isTarget,
patientId: lesionData.patientId, patientId: lesionData.patientId,
id: lesionData.id id: lesionData.id,
measurementType: lesionData.measurementType
}; };
// Retrieve the location name given the locationUID // Retrieve the location name given the locationUID

3
Packages/lesiontracker/lib/handleMeasurementAdded.js
View File

@ -1,8 +1,9 @@
handleMeasurementAdded = function(e, eventData) { handleMeasurementAdded = function(e, eventData) {
var measurementData = eventData.measurementData; var measurementData = eventData.measurementData;
switch (eventData.toolType) { switch (measurementData.measurementType) {
case 'nonTarget': case 'nonTarget':
case 'bidirectional':
case 'lesion': case 'lesion':
log.info('CornerstoneToolsMeasurementAdded'); log.info('CornerstoneToolsMeasurementAdded');
LesionManager.updateLesionData(measurementData); LesionManager.updateLesionData(measurementData);

4
Packages/lesiontracker/lib/handleMeasurementModified.js
View File

@ -1,9 +1,9 @@
handleMeasurementModified = function(e, eventData) { handleMeasurementModified = function(e, eventData) {
var measurementData = eventData.measurementData; var measurementData = eventData.measurementData;
switch (measurementData.measurementType) {
switch (eventData.toolType) {
case 'nonTarget': case 'nonTarget':
case 'lesion': case 'lesion':
case 'bidirectional':
log.info('CornerstoneToolsMeasurementModified'); log.info('CornerstoneToolsMeasurementModified');
LesionManager.updateLesionData(measurementData); LesionManager.updateLesionData(measurementData);
TrialResponseCriteria.validateDelayed(measurementData); TrialResponseCriteria.validateDelayed(measurementData);