From a8340b9b692c8dda312ffa7e8b0df4c0ea4ed917 Mon Sep 17 00:00:00 2001
From: "James A. Petts" <jamesapetts@gmail.com>
Date: Tue, 12 May 2020 20:41:11 +0100
Subject: [PATCH] WIP

---
 extensions/cornerstone/src/OHIFCornerstoneViewport.js | 2 +-
 extensions/cornerstone/src/init.js                    | 2 ++
 modes/example/src/index.js                            | 9 +++++++++
 platform/core/src/extensions/ExtensionManager.js      | 2 ++
 platform/viewer/public/config/default.js              | 2 +-
 platform/viewer/src/appInit.js                        | 5 ++++-
 platform/viewer/src/index.js                          | 3 ++-
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/extensions/cornerstone/src/OHIFCornerstoneViewport.js b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
index 1a8e4a3bc..d16916695 100644
--- a/extensions/cornerstone/src/OHIFCornerstoneViewport.js
+++ b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
@@ -25,7 +25,7 @@ class OHIFCornerstoneViewport extends Component {
     customProps: PropTypes.object,
   };
 
-  static id = 'OHIFCornerstoneViewport';
+  static name = 'OHIFCornerstoneViewport';
 
   static init() {
     console.log('OHIFCornerstoneViewport init()');
diff --git a/extensions/cornerstone/src/init.js b/extensions/cornerstone/src/init.js
index 27e962b80..e2f807838 100644
--- a/extensions/cornerstone/src/init.js
+++ b/extensions/cornerstone/src/init.js
@@ -15,6 +15,8 @@ import measurementServiceMappingsFactory from './utils/measurementServiceMapping
 export default function init({ servicesManager, configuration }) {
   const { UIDialogService, MeasurementService } = servicesManager.services;
 
+  debugger;
+
   const callInputDialog = (data, event, callback) => {
     if (UIDialogService) {
       let dialogId = UIDialogService.create({
diff --git a/modes/example/src/index.js b/modes/example/src/index.js
index ef99e7cdd..fd48b5e58 100644
--- a/modes/example/src/index.js
+++ b/modes/example/src/index.js
@@ -26,6 +26,15 @@ export default function mode({ modeConfiguration }) {
               // named slots
               leftPanels: ['org.ohif.default.panelModule.seriesList'],
               rightPanels: ['org.ohif.default.panelModule.measure'],
+              viewports: [
+                {
+                  namespace:
+                    'org.ohif.cornerstone.viewportModule.OHIFCornerstoneViewport',
+                  displaySetsToDisplay: [
+                    'org.ohif.default.sopClassHandlerModule.stack',
+                  ],
+                },
+              ],
             },
           };
         },
diff --git a/platform/core/src/extensions/ExtensionManager.js b/platform/core/src/extensions/ExtensionManager.js
index e5bbe616b..5fab3d8f3 100644
--- a/platform/core/src/extensions/ExtensionManager.js
+++ b/platform/core/src/extensions/ExtensionManager.js
@@ -101,6 +101,8 @@ export default class ExtensionManager {
           module: extensionModule,
         });
 
+        // TODO -> deal with command modules.
+
         extensionModule.forEach(element => {
           this.modulesMap[
             `${extensionId}.${moduleType}.${element.name}`
diff --git a/platform/viewer/public/config/default.js b/platform/viewer/public/config/default.js
index d4a3a6df6..1b22769f0 100644
--- a/platform/viewer/public/config/default.js
+++ b/platform/viewer/public/config/default.js
@@ -1,7 +1,7 @@
 window.config = {
   routerBasename: '/',
   // whiteLabelling: {},
-  extensions: ['org.ohif.default'],
+  extensions: [],
   modes: [],
   showStudyList: true,
   // filterQueryParam: false,
diff --git a/platform/viewer/src/appInit.js b/platform/viewer/src/appInit.js
index 98d1b136c..d489808b3 100644
--- a/platform/viewer/src/appInit.js
+++ b/platform/viewer/src/appInit.js
@@ -6,7 +6,7 @@ import {
   UINotificationService,
   UIModalService,
   UIDialogService,
-  // MeasurementService,
+  MeasurementService,
   // utils,
   // redux as reduxOHIF,
 } from '@ohif/core';
@@ -44,8 +44,11 @@ function appInit(appConfigOrFunc, defaultExtensions) {
     UINotificationService,
     UIModalService,
     UIDialogService,
+    MeasurementService,
   ]);
 
+  debugger;
+
   /**
    * Example: [ext1, ext2, ext3]
    * Example2: [[ext1, config], ext2, [ext3, config]]
diff --git a/platform/viewer/src/index.js b/platform/viewer/src/index.js
index bc8ce7ac8..b390f600e 100644
--- a/platform/viewer/src/index.js
+++ b/platform/viewer/src/index.js
@@ -22,11 +22,12 @@ import ReactDOM from 'react-dom';
  * the defaultExtensions property.
  */
 import OHIFDefaultExtension from '@ohif/extension-default';
+import OHIFCornerstoneExtension from '@ohif/extension-cornerstone';
 
 /** Combine our appConfiguration and "baked-in" extensions */
 const appProps = {
   config: window ? window.config : {},
-  defaultExtensions: [OHIFDefaultExtension],
+  defaultExtensions: [OHIFDefaultExtension, OHIFCornerstoneExtension],
 };
 
 /** Create App */