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

Moving Nucleus bug fix of slow toggling of reference lines to OHIF viewers...

Browse Source
This commit is contained in:
Emanuel F. Oliveira 2017-01-20 19:22:01 -02:00
parent f94d951453
commit d22094bbe1
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,7 +287,9 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// Define a function to run whenever the Cornerstone viewport is rendered // Define a function to run whenever the Cornerstone viewport is rendered
// (e.g. following a change of window or zoom) // (e.g. following a change of window or zoom)
const onImageRendered = (event, eventData) => { const onImageRendered = (event, eventData) => {
OHIF.log.info('imageViewerViewport onImageRendered'); // Attention: Adding OHIF.log.info in this function may decrease the performance
// since this callback function is called multiple times (eg: when a tool is
// enabled/disabled -> cornerstone[toolName].tool.enable)
if (!layoutManager.viewportData[viewportIndex]) { if (!layoutManager.viewportData[viewportIndex]) {
OHIF.log.warn(`onImageRendered: LayoutManager has no viewport data for this viewport index?: ${viewportIndex}`); OHIF.log.warn(`onImageRendered: LayoutManager has no viewport data for this viewport index?: ${viewportIndex}`);
@ -306,7 +308,6 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// Check if it has onImageRendered loadAndCacheImage callback // Check if it has onImageRendered loadAndCacheImage callback
if(typeof callbacks.onImageRendered === 'function') { if(typeof callbacks.onImageRendered === 'function') {
OHIF.log.info('imageViewerViewport onImageRendered callback');
callbacks.onImageRendered(event, eventData, viewportIndex, templateData); callbacks.onImageRendered(event, eventData, viewportIndex, templateData);
} }
}; };
@ -321,7 +322,9 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// Define a function to run whenever the Cornerstone viewport changes images // Define a function to run whenever the Cornerstone viewport changes images
// (e.g. during scrolling) // (e.g. during scrolling)
const onNewImage = (event, eventData) => { const onNewImage = (event, eventData) => {
OHIF.log.info('imageViewerViewport onNewImage'); // Attention: Adding OHIF.log.info in this function may decrease the performance
// since this callback function is called multiple times (eg: when a tool is
// enabled/disabled -> cornerstone[toolName].tool.enable)
// Update the metaData for missing fields // Update the metaData for missing fields
updateMetaData(eventData.enabledElement.image); updateMetaData(eventData.enabledElement.image);
@ -355,7 +358,6 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// Check if it has onNewImage loadAndCacheImage callback // Check if it has onNewImage loadAndCacheImage callback
if(typeof callbacks.onNewImage === 'function') { if(typeof callbacks.onNewImage === 'function') {
OHIF.log.info('imageViewerViewport onNewImage callback');
callbacks.onNewImage(event, eventData, viewportIndex, templateData); callbacks.onNewImage(event, eventData, viewportIndex, templateData);
} }
}; };
@ -368,7 +370,9 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
Session.set('CornerstoneNewImage' + viewportIndex, Random.id()); Session.set('CornerstoneNewImage' + viewportIndex, Random.id());
const onStackScroll = (e, eventData) => { const onStackScroll = (e, eventData) => {
OHIF.log.info('imageViewerViewport onStackScroll'); // Attention: Adding OHIF.log.info in this function may decrease the performance
// since this callback function is called multiple times (eg: when a tool is
// enabled/disabled -> cornerstone[toolName].tool.enable)
// Update the imageSlider value // Update the imageSlider value
Session.set('CornerstoneNewImage' + viewportIndex, Random.id()); Session.set('CornerstoneNewImage' + viewportIndex, Random.id());
@ -383,6 +387,10 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// This is used to update the value of the "active viewport", when the user interacts // This is used to update the value of the "active viewport", when the user interacts
// with a new viewport element // with a new viewport element
const sendActivationTrigger = (event, eventData) => { const sendActivationTrigger = (event, eventData) => {
// Attention: Adding OHIF.log.info in this function decrease the performance
// since this callback function is called multiple times (eg: when a tool is
// enabled/disabled -> cornerstone[toolName].tool.enable)
// Check if the current active viewport in the Meteor Session // Check if the current active viewport in the Meteor Session
// Is the same as the viewport in which the activation event was fired. // Is the same as the viewport in which the activation event was fired.
// If it was, no changes are necessary, so stop here. // If it was, no changes are necessary, so stop here.
@ -421,6 +429,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
// If it is, add this element to the global synchronizer... // If it is, add this element to the global synchronizer...
OHIF.viewer.updateImageSynchronizer.add(element); OHIF.viewer.updateImageSynchronizer.add(element);
if (OHIF.viewer.refLinesEnabled) { if (OHIF.viewer.refLinesEnabled) {
// ... and if reference lines are globally enabled, let cornerstoneTools know. // ... and if reference lines are globally enabled, let cornerstoneTools know.
cornerstoneTools.referenceLines.tool.enable(element, OHIF.viewer.updateImageSynchronizer); cornerstoneTools.referenceLines.tool.enable(element, OHIF.viewer.updateImageSynchronizer);

4
Packages/ohif-viewerbase/client/index.js
View File

@ -86,6 +86,10 @@ Viewerbase.addMetaData = addMetaData;
Viewerbase.addSpecificMetadata = addSpecificMetadata; Viewerbase.addSpecificMetadata = addSpecificMetadata;
Viewerbase.updateMetaData = updateMetaData; Viewerbase.updateMetaData = updateMetaData;
// displayReferenceLines
import { displayReferenceLines } from './lib/displayReferenceLines';
Viewerbase.displayReferenceLines = displayReferenceLines;
/** /**
* Exported Namespaces (sub-namespaces) * Exported Namespaces (sub-namespaces)
*/ */