From 0cea2a8bffb8ae83c0b6089859d6eed42f6686d0 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Sun, 16 Jun 2019 14:15:34 -0400
Subject: [PATCH] Simplify basic viewport extensions

---
 .../src/OHIFDicomHtmlExtension.js             | 27 -------------------
 .../ohif-dicom-html-extension/src/index.js    | 20 ++++++++++++--
 .../src/OHIFDicomMicroscopyExtension.js       | 27 -------------------
 .../src/index.js                              | 20 ++++++++++++--
 .../src/OHIFDicomPDFExtension.js              | 27 -------------------
 .../ohif-dicom-pdf-extension/src/index.js     | 20 ++++++++++++--
 6 files changed, 54 insertions(+), 87 deletions(-)
 delete mode 100644 extensions/ohif-dicom-html-extension/src/OHIFDicomHtmlExtension.js
 delete mode 100644 extensions/ohif-dicom-microscopy-extension/src/OHIFDicomMicroscopyExtension.js
 delete mode 100644 extensions/ohif-dicom-pdf-extension/src/OHIFDicomPDFExtension.js

diff --git a/extensions/ohif-dicom-html-extension/src/OHIFDicomHtmlExtension.js b/extensions/ohif-dicom-html-extension/src/OHIFDicomHtmlExtension.js
deleted file mode 100644
index b661aebf2..000000000
--- a/extensions/ohif-dicom-html-extension/src/OHIFDicomHtmlExtension.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import OHIFDicomHtmlViewport from './OHIFDicomHtmlViewport.js';
-import OHIFDicomHtmlSopClassHandler from './OHIFDicomHtmlSopClassHandler.js';
-
-export default class OHIFDicomHtmlExtension {
-  /**
-   * Extension ID is a unique id, might be used for namespacing extension specific redux actions/reducers (?)
-   */
-  getExtensionId() {
-    return 'html';
-  }
-
-  getViewportModule() {
-    return OHIFDicomHtmlViewport;
-  }
-
-  getSopClassHandler() {
-    return OHIFDicomHtmlSopClassHandler;
-  }
-
-  getPanelModuleDefinition() {
-    return null;
-  }
-
-  getToolbarModuleDefinition() {
-    return null;
-  }
-}
diff --git a/extensions/ohif-dicom-html-extension/src/index.js b/extensions/ohif-dicom-html-extension/src/index.js
index 6a940f7b1..1c1bbca20 100644
--- a/extensions/ohif-dicom-html-extension/src/index.js
+++ b/extensions/ohif-dicom-html-extension/src/index.js
@@ -1,3 +1,19 @@
-import OHIFDicomHtmlExtension from './OHIFDicomHtmlExtension.js';
+import OHIFDicomHtmlSopClassHandler from './OHIFDicomHtmlSopClassHandler.js';
+import OHIFDicomHtmlViewport from './OHIFDicomHtmlViewport.js';
 
-export default OHIFDicomHtmlExtension;
+export default class OHIFDicomHtmlExtension {
+  /**
+   * Extension ID is a unique id, might be used for namespacing extension specific redux actions/reducers (?)
+   */
+  getExtensionId() {
+    return 'html';
+  }
+
+  getViewportModule() {
+    return OHIFDicomHtmlViewport;
+  }
+
+  getSopClassHandler() {
+    return OHIFDicomHtmlSopClassHandler;
+  }
+}
diff --git a/extensions/ohif-dicom-microscopy-extension/src/OHIFDicomMicroscopyExtension.js b/extensions/ohif-dicom-microscopy-extension/src/OHIFDicomMicroscopyExtension.js
deleted file mode 100644
index 089de90fd..000000000
--- a/extensions/ohif-dicom-microscopy-extension/src/OHIFDicomMicroscopyExtension.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import DicomMicroscopyViewport from './DicomMicroscopyViewport.js';
-import DicomMicroscopySopClassHandler from './DicomMicroscopySopClassHandler.js';
-
-export default class OHIFDicomMicroscopyExtension {
-  /**
-   * Extension ID is a unique id, might be used for namespacing extension specific redux actions/reducers (?)
-   */
-  getExtensionId() {
-    return 'microscopy';
-  }
-
-  getViewportModule() {
-    return DicomMicroscopyViewport;
-  }
-
-  getSopClassHandler() {
-    return DicomMicroscopySopClassHandler;
-  }
-
-  getPanelModule() {
-    return null;
-  }
-
-  getToolbarModule() {
-    return null;
-  }
-}
diff --git a/extensions/ohif-dicom-microscopy-extension/src/index.js b/extensions/ohif-dicom-microscopy-extension/src/index.js
index 8bf217ecc..4bcc9add5 100644
--- a/extensions/ohif-dicom-microscopy-extension/src/index.js
+++ b/extensions/ohif-dicom-microscopy-extension/src/index.js
@@ -1,3 +1,19 @@
-import OHIFDicomMicroscopyExtension from './OHIFDicomMicroscopyExtension.js';
+import DicomMicroscopySopClassHandler from './DicomMicroscopySopClassHandler.js';
+import DicomMicroscopyViewport from './DicomMicroscopyViewport.js';
 
-export default OHIFDicomMicroscopyExtension;
+export default class OHIFDicomMicroscopyExtension {
+  /**
+   * Extension ID is a unique id, might be used for namespacing extension specific redux actions/reducers (?)
+   */
+  getExtensionId() {
+    return 'microscopy';
+  }
+
+  getViewportModule() {
+    return DicomMicroscopyViewport;
+  }
+
+  getSopClassHandlerModule() {
+    return DicomMicroscopySopClassHandler;
+  }
+}
diff --git a/extensions/ohif-dicom-pdf-extension/src/OHIFDicomPDFExtension.js b/extensions/ohif-dicom-pdf-extension/src/OHIFDicomPDFExtension.js
deleted file mode 100644
index e42e981df..000000000
--- a/extensions/ohif-dicom-pdf-extension/src/OHIFDicomPDFExtension.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import OHIFDicomPDFViewport from './OHIFDicomPDFViewport.js';
-import OHIFDicomPDFSopClassHandler from './OHIFDicomPDFSopClassHandler.js';
-
-export default class OHIFDicomPDFExtension {
-  /**
-   * Extension ID is a unique id, might be used for namespacing extension specific redux actions/reducers (?)
-   */
-  getExtensionId() {
-    return 'pdf';
-  }
-
-  getViewportModule() {
-    return OHIFDicomPDFViewport;
-  }
-
-  getSopClassHandler() {
-    return OHIFDicomPDFSopClassHandler;
-  }
-
-  getPanelModule() {
-    return null;
-  }
-
-  getToolbarModule() {
-    return null;
-  }
-}
diff --git a/extensions/ohif-dicom-pdf-extension/src/index.js b/extensions/ohif-dicom-pdf-extension/src/index.js
index 74e7fff7b..1b6ad9e2d 100644
--- a/extensions/ohif-dicom-pdf-extension/src/index.js
+++ b/extensions/ohif-dicom-pdf-extension/src/index.js
@@ -1,3 +1,19 @@
-import OHIFDicomPDFExtension from './OHIFDicomPDFExtension.js';
+import OHIFDicomPDFSopClassHandler from './OHIFDicomPDFSopClassHandler.js';
+import OHIFDicomPDFViewport from './OHIFDicomPDFViewport.js';
 
-export default OHIFDicomPDFExtension;
+export default class OHIFDicomPDFExtension {
+  /**
+   * Extension ID is a unique id, might be used for namespacing extension specific redux actions/reducers (?)
+   */
+  getExtensionId() {
+    return 'pdf';
+  }
+
+  getViewportModule() {
+    return OHIFDicomPDFViewport;
+  }
+
+  getSopClassHandler() {
+    return OHIFDicomPDFSopClassHandler;
+  }
+}