Fixes to make Lesion Tracker work

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']);

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');

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

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,

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,

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();
 

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) {

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);
-
 });