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

Allowing display sets to be sorted by incoming order

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-08-25 12:02:28 -03:00
parent 9e0a9c35da
commit 66c8db697f
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Packages/ohif-servers/both/schema/servers.js
View File

@ -175,6 +175,11 @@ export const UISettings = new SimpleSchema({
type: String,
label: 'Cornerstone default image renderer',
defaultValue: 'webgl'
},
sortSeriesByIncomingOrder: {
type: Boolean,
label: 'Define if the series\' images shall be sorted by incoming order. Sort by Instance Number by default.',
defaultValue: false
}
});

15
Packages/ohif-viewerbase/client/lib/createStacks.js
View File

@ -1,5 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { ImageSet } from './classes/ImageSet';
import { isImage } from './isImage';
import { OHIF } from 'meteor/ohif:core';
const isMultiFrame = instance => {
// NumberOfFrames (0028,0008)
@ -26,11 +28,14 @@ const makeDisplaySet = (series, instances) => {
isMultiFrame: isMultiFrame(instance)
});
// Sort the images in this series
imageSet.sortBy((a, b) => {
// Sort by InstanceNumber (0020,0013)
return (parseInt(a.getRawValue('x00200013', 0)) || 0) - (parseInt(b.getRawValue('x00200013', 0)) || 0);
});
// Sort the images in this series if needed
const shallSort = !OHIF.utils.ObjectPath.get(Meteor, 'settings.public.ui.sortSeriesByIncomingOrder');
if (shallSort) {
imageSet.sortBy((a, b) => {
// Sort by InstanceNumber (0020,0013)
return (parseInt(a.getRawValue('x00200013', 0)) || 0) - (parseInt(b.getRawValue('x00200013', 0)) || 0);
});
}
// Include the first image instance number (after sorted)
imageSet.setAttribute('instanceNumber', imageSet.getImage(0).getRawValue('x00200013'));