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

fix(hanging-protocols): Fail rule matching if a required rule fails

Browse Source
This commit is contained in:
Bruno Alves de Faria 2018-07-24 13:52:36 -03:00 committed by Erik Ziegler
parent b6eecf8c8f
commit b64c9878af
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/ohif-hanging-protocols/client/matcher/HPMatcher.js
View File

@ -103,7 +103,8 @@ const match = (metadataInstance, rules) => {
return { return {
score, score,
details details,
requiredFailed
}; };
}; };

24
Packages/ohif-hanging-protocols/client/protocolEngine.js
View File

@ -274,8 +274,6 @@ HP.ProtocolEngine = class ProtocolEngine {
let highestStudyMatchingScore = 0; let highestStudyMatchingScore = 0;
let highestSeriesMatchingScore = 0; let highestSeriesMatchingScore = 0;
let highestImageMatchingScore = 0;
let bestMatch;
// Set custom attribute for study metadata and it's first instance // Set custom attribute for study metadata and it's first instance
currentStudy.setCustomAttribute(ABSTRACT_PRIOR_VALUE, 0); currentStudy.setCustomAttribute(ABSTRACT_PRIOR_VALUE, 0);
@ -349,8 +347,9 @@ HP.ProtocolEngine = class ProtocolEngine {
this.studies.forEach(study => { this.studies.forEach(study => {
const studyMatchDetails = HPMatcher.match(study.getFirstInstance(), studyMatchingRules); const studyMatchDetails = HPMatcher.match(study.getFirstInstance(), studyMatchingRules);
if ((studyMatchingRules.length && !studyMatchDetails.score) ||
studyMatchDetails.score < highestStudyMatchingScore) { // Prevent bestMatch from being updated if the matchDetails' required attribute check has failed
if (studyMatchDetails.requiredFailed === true || studyMatchDetails.score < highestStudyMatchingScore) {
return; return;
} }
@ -358,8 +357,9 @@ HP.ProtocolEngine = class ProtocolEngine {
study.forEachSeries(series => { study.forEachSeries(series => {
const seriesMatchDetails = HPMatcher.match(series.getFirstInstance(), seriesMatchingRules); const seriesMatchDetails = HPMatcher.match(series.getFirstInstance(), seriesMatchingRules);
if ((seriesMatchingRules.length && !seriesMatchDetails.score) ||
seriesMatchDetails.score < highestSeriesMatchingScore) { // Prevent bestMatch from being updated if the matchDetails' required attribute check has failed
if (seriesMatchDetails.requiredFailed === true || seriesMatchDetails.score < highestSeriesMatchingScore) {
return; return;
} }
@ -377,6 +377,11 @@ HP.ProtocolEngine = class ProtocolEngine {
const instanceMatchDetails = HPMatcher.match(instance, instanceMatchingRules); const instanceMatchDetails = HPMatcher.match(instance, instanceMatchingRules);
// Prevent bestMatch from being updated if the matchDetails' required attribute check has failed
if (instanceMatchDetails.requiredFailed === true) {
return;
}
const matchDetails = { const matchDetails = {
passed: [], passed: [],
failed: [] failed: []
@ -417,11 +422,6 @@ HP.ProtocolEngine = class ProtocolEngine {
imageDetails.imageId = instance.getImageId(); imageDetails.imageId = instance.getImageId();
} }
if ((totalMatchScore > highestImageMatchingScore) || !bestMatch) {
highestImageMatchingScore = totalMatchScore;
bestMatch = imageDetails;
}
matchingScores.push(imageDetails); matchingScores.push(imageDetails);
}); });
}); });
@ -441,6 +441,8 @@ HP.ProtocolEngine = class ProtocolEngine {
}); });
matchingScores.sort((a, b) => sortingFunction(a.sortingInfo, b.sortingInfo)); matchingScores.sort((a, b) => sortingFunction(a.sortingInfo, b.sortingInfo));
const bestMatch = matchingScores[0];
OHIF.log.info('ProtocolEngine::matchImages bestMatch', bestMatch); OHIF.log.info('ProtocolEngine::matchImages bestMatch', bestMatch);
return { return {