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

Final split lesion adjustments

Browse Source
This commit is contained in:
Bruno Alves de Faria 2018-01-26 19:10:50 -02:00
parent fb9d583074
commit a9658e6a00
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
View File

@ -13,6 +13,6 @@
<p class="maxNumMeasurements">Max {{getMax toolGroup.id}}</p> <p class="maxNumMeasurements">Max {{getMax toolGroup.id}}</p>
{{/if}} {{/if}}
</div> </div>
<div class="numberOfMeasurements">{{numberOfMeasurements}}</div> <div class="numberOfMeasurements">{{numberOfMeasurements toolGroup.id}}</div>
</div> </div>
</template> </template>

16
Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js
View File

@ -3,8 +3,20 @@ import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase'; import { Viewerbase } from 'meteor/ohif:viewerbase';
Template.measurementTableHeaderRow.helpers({ Template.measurementTableHeaderRow.helpers({
numberOfMeasurements() { numberOfMeasurements(toolGroupId) {
const { measurementRows } = Template.instance().data; const { toolGroup, measurementRows } = Template.instance().data;
if (toolGroup.id === 'newTargets') {
let result = 0;
measurementRows.forEach(measurementRow => {
const measurementData = measurementRow.entries[0];
if (measurementData.isSplitLesion) return;
result++;
});
return result;
}
return measurementRows.length ? measurementRows.length : null; return measurementRows.length ? measurementRows.length : null;
}, },

3
Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js
View File

@ -56,7 +56,8 @@ export class MaxTargetsCriterion extends BaseCriterion {
const newTargetNumbers = this.getNewTargetNumbers(data); const newTargetNumbers = this.getNewTargetNumbers(data);
const measurementNumbers = []; const measurementNumbers = [];
_.each(data.targets, target => { _.each(data.targets, target => {
const { location, measurementNumber } = target.measurement; const { location, measurementNumber, isSplitLesion } = target.measurement;
if (isSplitLesion) return;
if (options.newTarget && !newTargetNumbers.has(measurementNumber)) return; if (options.newTarget && !newTargetNumbers.has(measurementNumber)) return;
if (options.locationIn && options.locationIn.indexOf(location) === -1) return; if (options.locationIn && options.locationIn.indexOf(location) === -1) return;
if (options.locationNotIn && options.locationNotIn.indexOf(location) > -1) return; if (options.locationNotIn && options.locationNotIn.indexOf(location) > -1) return;

5
Packages/ohif-measurements/client/conformance/criteria/MaxTargetsPerOrgan.js
View File

@ -38,7 +38,10 @@ export class MaxTargetsPerOrganCriterion extends BaseCriterion {
const newTargetNumbers = this.getNewTargetNumbers(data); const newTargetNumbers = this.getNewTargetNumbers(data);
_.each(data.targets, target => { _.each(data.targets, target => {
const { measurement } = target; const { measurement } = target;
const { location, measurementNumber } = measurement; const { location, measurementNumber, isSplitLesion } = measurement;
if (isSplitLesion) return;
if (!targetsPerOrgan[location]) { if (!targetsPerOrgan[location]) {
targetsPerOrgan[location] = new Set(); targetsPerOrgan[location] = new Set();
} }