diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages index 306b75f84..62628e2cc 100644 --- a/LesionTracker/.meteor/packages +++ b/LesionTracker/.meteor/packages @@ -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 diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions index 12d2532d3..3194fe8bd 100644 --- a/LesionTracker/.meteor/versions +++ b/LesionTracker/.meteor/versions @@ -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 diff --git a/LesionTracker/client/components/toolbarSection/toolbarSection.js b/LesionTracker/client/components/toolbarSection/toolbarSection.js index 836c90290..09a2a504f 100644 --- a/LesionTracker/client/components/toolbarSection/toolbarSection.js +++ b/LesionTracker/client/components/toolbarSection/toolbarSection.js @@ -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)'); diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js index 32d908ee3..9a9da3b7f 100644 --- a/LesionTracker/client/components/viewer/viewer.js +++ b/LesionTracker/client/components/viewer/viewer.js @@ -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); }); diff --git a/Packages/active-entry/package.js b/Packages/active-entry/package.js index 8f78f11bc..1feb8146a 100755 --- a/Packages/active-entry/package.js +++ b/Packages/active-entry/package.js @@ -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']); diff --git a/Packages/hipaa-audit-log/package.js b/Packages/hipaa-audit-log/package.js index 387ca142e..0174bd84a 100644 --- a/Packages/hipaa-audit-log/package.js +++ b/Packages/hipaa-audit-log/package.js @@ -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'); diff --git a/Packages/ohif-core/package.js b/Packages/ohif-core/package.js index 5a429de6f..ecb6ee825 100644 --- a/Packages/ohif-core/package.js +++ b/Packages/ohif-core/package.js @@ -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 diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js index 7648ae721..7adfe4bcd 100644 --- a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js +++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js @@ -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, diff --git a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js index 861cea9f2..72cbd8c7d 100644 --- a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js +++ b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js @@ -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, diff --git a/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js b/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js index 531192d0d..e172606a5 100644 --- a/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js +++ b/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js @@ -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(); diff --git a/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js b/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js index fadfacf45..42e0384fb 100644 --- a/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js +++ b/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js @@ -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) { diff --git a/Packages/ohif-lesiontracker/client/tools.js b/Packages/ohif-lesiontracker/client/tools.js index e1dcdacdf..8ea811127 100644 --- a/Packages/ohif-lesiontracker/client/tools.js +++ b/Packages/ohif-lesiontracker/client/tools.js @@ -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); - });