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

OHIF x Nucleus Code change sync-up

Browse Source
This commit is contained in:
Emanuel F. Oliveira 2017-01-23 13:00:44 -02:00
parent d22094bbe1
commit 541891d2ee
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/ohif-core/client/helpers/number.js
View File

@ -11,3 +11,7 @@ Template.registerHelper('sum', (...values) => {
_.each(_.initial(values, 1), value => (result += (value | 0))); _.each(_.initial(values, 1), value => (result += (value | 0)));
return result; return result;
}); });
Template.registerHelper('isValidNumber', value => {
return typeof value === 'number' && !isNaN(value);
});

2
Packages/ohif-viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.html
View File

@ -21,7 +21,7 @@
<div>{{#if frameRate}}{{formatNumberPrecision frameRate 2}} FPS{{/if}}</div> <div>{{#if frameRate}}{{formatNumberPrecision frameRate 2}} FPS{{/if}}</div>
<div>{{imageDimensions}}</div> <div>{{imageDimensions}}</div>
<div> <div>
<span>{{#if location}}Loc: {{formatNumberPrecision location 2}} mm{{/if}}</span> <span>{{#if isValidNumber location}}Loc: {{formatNumberPrecision location 2}} mm{{/if}}</span>
<span>{{#if thickness}}Thick: {{formatNumberPrecision thickness 2}} mm{{/if}}</span> <span>{{#if thickness}}Thick: {{formatNumberPrecision thickness 2}} mm{{/if}}</span>
<span>{{#if spacingBetweenSlices}}Spacing: {{formatNumberPrecision spacingBetweenSlices 2}} mm{{/if}}</span> <span>{{#if spacingBetweenSlices}}Spacing: {{formatNumberPrecision spacingBetweenSlices 2}} mm{{/if}}</span>
</div> </div>

10
Packages/ohif-viewerbase/client/lib/seriesNavigation.js
View File

@ -1,6 +1,6 @@
import { Session } from 'meteor/session'; import { Session } from 'meteor/session';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
// @TODO: import symbols into local scope: Studies and ViewerData // @TODO: import symbols into local scope: ViewerData
const getStudyFromStudyInstanceUid = studyInstanceUid => { const getStudyFromStudyInstanceUid = studyInstanceUid => {
// @TypeSafeStudies // @TypeSafeStudies
@ -11,11 +11,11 @@ const getNumberOfStacks = studyInstanceUid => {
// May not work if the Study contains non-image series? // May not work if the Study contains non-image series?
const study = getStudyFromStudyInstanceUid(studyInstanceUid); const study = getStudyFromStudyInstanceUid(studyInstanceUid);
if (!study || !study.series || !study.series.length) { if (!study || !study.displaySets || !study.displaySets.length) {
return; return;
} }
return study.series.length; return study.displaySets.length;
}; };
const getActiveViewportIndex = () => { const getActiveViewportIndex = () => {
@ -48,8 +48,8 @@ const loadSeries = indexCalculator => {
const study = getStudyFromStudyInstanceUid(studyInstanceUid); const study = getStudyFromStudyInstanceUid(studyInstanceUid);
const displaySetInstanceUids = study.series.map(series => { const displaySetInstanceUids = study.displaySets.map(displaySet => {
return series.displaySetInstanceUid; return displaySet.displaySetInstanceUid;
}); });
const currentLoadedStackIndex = displaySetInstanceUids.indexOf(displaySetInstanceUid); const currentLoadedStackIndex = displaySetInstanceUids.indexOf(displaySetInstanceUid);