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

Adding Metadata classes to Lesion Tracker (WIP) and some fixed;

Browse Source
This commit is contained in:
Eloízio Salgado 2017-01-18 17:08:56 -02:00 committed by Emanuel F. Oliveira
parent 4ceba29164
commit e693d48dbe
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LesionTracker/client/components/toolbarSection/toolbarSection.js
View File

@ -9,11 +9,11 @@ Template.toolbarSection.helpers({
Session.get('LayoutManagerUpdated'); Session.get('LayoutManagerUpdated');
// Stops here if layout manager is not defined yet // Stops here if layout manager is not defined yet
if (!window.layoutManager) { if (!Viewerbase.layoutManager) {
return; return;
} }
return window.layoutManager.viewportData.length > 1; return Viewerbase.layoutManager.viewportData.length > 1;
}, },
leftSidebarToggleButtonData() { leftSidebarToggleButtonData() {
@ -217,7 +217,7 @@ Template.toolbarSection.events({
'click #toggleTarget'(event, instance) { 'click #toggleTarget'(event, instance) {
const $target = $(event.currentTarget); const $target = $(event.currentTarget);
if (!$target.hasClass('active') && $target.hasClass('expanded')) { if (!$target.hasClass('active') && $target.hasClass('expanded')) {
toolManager.setActiveTool('bidirectional'); Viewerbase.toolManager.setActiveTool('bidirectional');
} }
}, },

10
LesionTracker/client/components/viewer/viewer.js
View File

@ -1,12 +1,11 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Session } from 'meteor/session'; import { Session } from 'meteor/session';
import { ReactiveDict } from 'meteor/reactive-dict'; import { ReactiveDict } from 'meteor/reactive-dict';
import { OHIF } from 'meteor/ohif:core';
import 'meteor/ohif:viewerbase';
import { _ } from 'meteor/underscore'; import { _ } from 'meteor/underscore';
// @TODO: Figure out what to change so we don't have this duplicate import (export createStacks?) import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase'; import 'meteor/ohif:viewerbase';
import 'meteor/ohif:metadata';
Session.set('ViewerMainReady', false); Session.set('ViewerMainReady', false);
Session.set('TimepointsReady', false); Session.set('TimepointsReady', false);
@ -70,7 +69,8 @@ Template.viewer.onCreated(() => {
instance.data.studies.forEach(study => { instance.data.studies.forEach(study => {
study.selected = true; study.selected = true;
study.displaySets = OHIF.viewerbase.createStacks(study); const studyMetadata = new OHIF.metadata.StudyMetadata(study);
study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
OHIF.viewer.Studies.insert(study); OHIF.viewer.Studies.insert(study);
}); });

1
OHIFViewer/client/components/viewer/viewer.js
View File

@ -55,7 +55,6 @@ Template.viewer.onCreated(() => {
ViewerData[contentId].studyInstanceUids = []; ViewerData[contentId].studyInstanceUids = [];
instance.data.studies.forEach(study => { instance.data.studies.forEach(study => {
study.selected = true; study.selected = true;
// study.displaySets = OHIF.viewerbase.createStacks(study);
const studyMetadata = new OHIF.metadata.StudyMetadata(study); const studyMetadata = new OHIF.metadata.StudyMetadata(study);
study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata); study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
OHIF.viewer.Studies.insert(study); OHIF.viewer.Studies.insert(study);

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

@ -65,7 +65,7 @@ class MeasurementHandlers {
// Get the update the measurement number after inserting // Get the update the measurement number after inserting
Meteor.defer(() => { Meteor.defer(() => {
measurementData.measurementNumber = Collection.findOne(measurementData._id).measurementNumber; measurementData.measurementNumber = Collection.findOne(measurementData._id).measurementNumber;
cornerstone.updateImage(getActiveViewportElement()); cornerstone.updateImage(OHIF.viewerbase.viewportUtils.getActiveViewportElement());
}); });
// Signal unsaved changes // Signal unsaved changes

11
Packages/ohif-viewerbase/client/lib/stackImagePositionOffsetSynchronizer.js
View File

@ -181,14 +181,23 @@ class StackImagePositionOffsetSynchronizer {
} }
getViewportImageNormal(element) { getViewportImageNormal(element) {
if(!element) {
return;
}
element = $(element).get(0); element = $(element).get(0);
try { try {
const enabledElement = cornerstone.getEnabledElement(element); const enabledElement = cornerstone.getEnabledElement(element);
if(!enabledElement || !enabledElement.image) {
return;
}
const imageId = enabledElement.image.imageId; const imageId = enabledElement.image.imageId;
const imagePlane = cornerstoneTools.metaData.get('imagePlane', imageId); const imagePlane = cornerstoneTools.metaData.get('imagePlane', imageId);
return imagePlane.rowCosines.clone().cross(imagePlane.columnCosines);; return imagePlane.rowCosines.clone().cross(imagePlane.columnCosines);
} catch(error) { } catch(error) {
console.log(error.message); console.log(error.message);
} }