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

Adding a setting for cornerstone default image renderer

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-08-23 11:25:58 -03:00
parent edd6ff862d
commit df5cd20a78
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/ohif-cornerstone/client/index.js
View File

@ -1,4 +1,5 @@
import { OHIF } from '../namespace';
import './renderer.js';
import { MetadataProvider } from './lib/classes/MetadataProvider';
OHIF.cornerstone.metadataProvider = new MetadataProvider();
OHIF.cornerstone.metadataProvider = new MetadataProvider();

4
Packages/ohif-cornerstone/client/renderer.js Normal file
View File

@ -0,0 +1,4 @@
import { Meteor, OHIF } from '../namespace';
const rendererPath = 'settings.public.ui.cornerstoneRenderer';
OHIF.cornerstone.renderer = OHIF.utils.ObjectPath.get(Meteor, rendererPath) || '';

2
Packages/ohif-cornerstone/main.js
View File

@ -2,7 +2,7 @@
* Import namespace...
*/
import { OHIF } from './namespace.js';
import { OHIF } from './namespace.js';
/**
* Import scripts that will populate the Cornerstone namespace as a side effect only import. This is effectively the public API...

3
Packages/ohif-cornerstone/namespace.js
View File

@ -2,6 +2,7 @@
* Import main dependency
*/
import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core';
/**
@ -22,4 +23,4 @@ OHIF.cornerstone = Cornerstone;
* Export relevant objects
*/
export { OHIF };
export { Meteor, OHIF };

2
Packages/ohif-measurements/client/lib/getImageDataUrl.js
View File

@ -154,7 +154,7 @@ const createEnabledElement = (width, height) => {
const element = $element[0];
$element.appendTo(document.body);
cornerstone.enable(element, { renderer: 'webgl' });
cornerstone.enable(element, { renderer: OHIF.cornerstone.renderer });
const enabledElement = cornerstone.getEnabledElement(element);
enabledElement.toolStateManager = cornerstoneTools.newImageIdSpecificToolStateManager();

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

@ -170,6 +170,11 @@ export const UISettings = new SimpleSchema({
type: Boolean,
label: 'Show a progress bar closest to the thumbnail showing how much the stack has loaded',
defaultValue: true
},
cornerstoneRenderer: {
type: String,
label: 'Cornerstone default image renderer',
defaultValue: 'webgl'
}
});

6
Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
View File

@ -92,12 +92,8 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// Enable Cornerstone for the viewport element
const options = {
renderer: 'webgl'
renderer: OHIF.cornerstone.renderer
};
// NOTE: This uses the experimental WebGL renderer for Cornerstone!
// If you have problems, replace it with this line instead:
// cornerstone.enable(element);
cornerstone.enable(element, options);
// Get the handler functions that will run when loading has finished or thrown