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

Fixes to make Lesion Tracker work

Browse Source
This commit is contained in:
Erik Ziegler 2017-01-16 21:34:06 +01:00 committed by Emanuel F. Oliveira
parent 5fcf167726
commit 30a50c7ade
12 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LesionTracker/.meteor/packages
View File

@ -17,10 +17,7 @@ tracker@1.1.1 # Meteor's client-side reactive programming librar
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.6.1 # Enable ECMAScript2015+ syntax in app code
clinical:router
clinical:extended-api
clinical:active-entry
clinical:error-pages
clinical:theming
clinical:fonts
clinical:hipaa-audit-log

6
LesionTracker/.meteor/versions
View File

@ -26,15 +26,9 @@ callback-hook@1.0.10
check@1.2.4
clinical:active-entry@1.5.16
clinical:auto-resizing@0.2.0
clinical:error-pages@0.2.0
clinical:extended-api@2.2.4
clinical:fonts@1.1.4
clinical:hipaa-audit-log@2.4.2
clinical:hipaa-logger@1.0.1
clinical:router@2.0.19
clinical:router-location@2.1.0
clinical:router-middleware-stack@2.1.2
clinical:router-url@2.1.0
clinical:theming@0.4.10
coffeescript@1.11.1_4
ddp@1.2.5

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

@ -247,7 +247,7 @@ Template.toolbarSection.events({
Template.toolbarSection.onRendered(function() {
// Set disabled/enabled tool buttons that are set in toolManager
const states = toolManager.getToolDefaultStates();
const states = Viewerbase.toolManager.getToolDefaultStates();
const disabledToolButtons = states.disabledToolButtons;
const allToolbarButtons = $('.toolbarSection').find('.toolbarSectionButton:not(.nonAutoDisableState)');

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

@ -5,11 +5,15 @@ import { OHIF } from 'meteor/ohif:core';
import 'meteor/ohif:viewerbase';
import { _ } from 'meteor/underscore';
// @TODO: Figure out what to change so we don't have this duplicate import (export createStacks?)
import { Viewerbase } from 'meteor/ohif:viewerbase';
Session.set('ViewerMainReady', false);
Session.set('TimepointsReady', false);
Session.set('MeasurementsReady', false);
Template.viewer.onCreated(() => {
const toolManager = Viewerbase.toolManager;
ViewerData = window.ViewerData || ViewerData;
const instance = Template.instance();
@ -65,7 +69,7 @@ Template.viewer.onCreated(() => {
instance.data.studies.forEach(study => {
study.selected = true;
study.displaySets = createStacks(study);
study.displaySets = Viewerbase.createStacks(study);
ViewerStudies.insert(study);
});

4
Packages/active-entry/package.js
View File

@ -12,7 +12,7 @@ Package.onUse(function (api) {
api.use([
'meteor-platform',
'templating',
'clinical:router@2.0.17',
'iron:router@1.0.13',
'grove:less@0.1.1',
'session',
'reactive-dict'
@ -78,7 +78,7 @@ Package.onUse(function (api) {
Package.onTest(function (api) {
api.use([
'templating',
'clinical:router@2.0.13',
'iron:router@1.0.13',
'grove:less@0.1.1',
'standard-app-packages'
], ['client']);

2
Packages/hipaa-audit-log/package.js
View File

@ -13,7 +13,7 @@ Package.on_use(function (api) {
api.use('mrt:moment@2.8.1', 'client');
api.use('grove:less@0.1.1', 'client');
api.use('clinical:router@2.0.17');
api.use('iron:router@1.0.13');
api.use('clinical:fonts@1.0.0', 'client');
api.use('clinical:auto-resizing@0.1.2', 'client');
api.use('clinical:hipaa-logger@1.0.0');

1
Packages/ohif-core/package.js
View File

@ -16,7 +16,6 @@ Package.onUse(function(api) {
api.use('reactive-var');
// Router dependencies
// api.use('clinical:router@2.0.18', 'client');
api.use('iron:router@1.0.13', 'client');
// Component's library dependencies

3
Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js
View File

@ -1,5 +1,6 @@
import { toolManager } from 'meteor/ohif:viewerbase';
import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase';
(function($, cornerstone, cornerstoneMath, cornerstoneTools) {
@ -7,7 +8,7 @@ import { OHIF } from 'meteor/ohif:core';
var toolType = 'bidirectional';
const shadowConfig = toolManager.getToolDefaultStates().shadowConfig;
const shadowConfig = Viewerbase.toolManager.getToolDefaultStates().shadowConfig;
var configuration = {
getMeasurementLocationCallback: getMeasurementLocationCallback,

4
Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
View File

@ -1,5 +1,5 @@
import { OHIF } from 'meteor/ohif:core';
import { toolManager } from 'meteor/ohif:viewerbase';
import { Viewerbase } from 'meteor/ohif:viewerbase';
(function($, cornerstone, cornerstoneMath, cornerstoneTools) {
@ -7,7 +7,7 @@ import { toolManager } from 'meteor/ohif:viewerbase';
const toolType = 'nonTarget';
const shadowConfig = toolManager.getToolDefaultStates().shadowConfig;
const shadowConfig = Viewerbase.toolManager.getToolDefaultStates().shadowConfig;
const configuration = {
getMeasurementLocationCallback: getMeasurementLocationCallback,

3
Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
View File

@ -1,4 +1,5 @@
import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase';
Meteor.startup(function() {
StudyList.callbacks['dblClickOnStudy'] = dblClickOnStudy;
@ -13,7 +14,7 @@ Meteor.startup(function() {
*/
function dblClickOnStudy(data) {
// Use the formatPN template helper to clean up the patient name
let title = formatPN(data.patientName);
let title = Viewerbase.helpers.formatPN(data.patientName);
const instance = Template.instance();

4
Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js
View File

@ -1,4 +1,5 @@
import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase';
/**
* Show / hide lesion tracker tools
@ -10,6 +11,8 @@ let previousActiveTool;
let toolsShown = true;
OHIF.lesiontracker.toggleLesionTrackerTools = () => {
const toolManager = Viewerbase.toolManager;
if (toolsShown === true) {
// Save the current settings for later
previousStates = toolManager.getToolDefaultStates();
@ -43,6 +46,7 @@ OHIF.lesiontracker.toggleLesionTrackerTools = () => {
};
OHIF.lesiontracker.toggleLesionTrackerToolsButtons = (isEnabled) => {
const toolManager = Viewerbase.toolManager;
const toolStates = previousStates || toolManager.getToolDefaultStates();
if (isEnabled) {

6
Packages/ohif-lesiontracker/client/tools.js
View File

@ -1,4 +1,9 @@
import { Meteor } from 'meteor/meteor';
import { Viewerbase } from 'meteor/ohif:viewerbase';
Meteor.startup(function() {
const toolManager = Viewerbase.toolManager;
toolManager.addTool('bidirectional', {
mouse: cornerstoneTools.bidirectional,
touch: cornerstoneTools.bidirectionalTouch
@ -53,5 +58,4 @@ Meteor.startup(function() {
}
toolManager.setToolDefaultStates(currentDefaultStates);
});