Fix hanging protocol bugs

- Convert series number and instance number to integer in imageDetails.sortingInfo to sort the images properly (e.g. 1,2,10 instead of 1,10,2)
- Sort based on firstly instanceNumber, then seriesNumber, to show the first instance of the next series in the next viewport instead of the second instance of the previous series in multiple layout (other than 1x1)
- Do nothing when clicked if the previous and next stage buttons are disabled
- Add forgotten undefined check statements
This commit is contained in:
Evren Ozkan committed 2016-11-14 13:19:20 -05:00
1 parent 8320e11830
commit 9544a24ed8
5 files changed
+29 -9

No files matched your search

@@ -466,8 +466,8 @@ HP.ProtocolEngine = class ProtocolEngine {
sortingInfo: {
score: totalMatchScore,
study: study.studyDate + study.studyTime,
series: series.seriesNumber, // TODO: change for seriesDateTime
instance: instance.instanceNumber // TODO: change for acquisitionTime
series: parseInt(series.seriesNumber), // TODO: change for seriesDateTime
instance: parseInt(instance.instanceNumber) // TODO: change for acquisitionTime
}
};
@@ -500,10 +500,10 @@ HP.ProtocolEngine = class ProtocolEngine {
}, {
name: 'study',
reverse: true
}, {
name: 'series'
}, {
name: 'instance'
}, {
name: 'series'
});
matchingScores.sort((a, b) => sortingFunction(a.sortingInfo, b.sortingInfo));