Fix history on master.

ImagingDataCommons · Oct 15, 2020 · 339768d · 339768d
1 parent d8714ea
commit 339768d
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 89 deletions.
diff --git a/extensions/cornerstone/src/toolbarModule.js b/extensions/cornerstone/src/toolbarModule.js
@@ -53,15 +53,6 @@ const definitions = [
     commandName: 'setToolActive',
     commandOptions: { toolName: 'Zoom' },
   },
-  {
-    id: 'Wwwc',
-    label: 'Levels',
-    icon: 'level',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Wwwc' },
-  },
   {
     id: 'Pan',
     label: 'Pan',
@@ -72,31 +63,30 @@ const definitions = [
     commandOptions: { toolName: 'Pan' },
   },
   {
-    id: 'Length',
-    label: 'Length',
-    icon: 'measure-temp',
+    id: 'Wwwc',
+    label: 'Levels',
+    icon: 'level',
     //
     type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
     commandName: 'setToolActive',
-    commandOptions: { toolName: 'Length' },
+    commandOptions: { toolName: 'Wwwc' },
   },
   {
-    id: 'ArrowAnnotate',
-    label: 'Annotate',
-    icon: 'measure-non-target',
+    id: 'WwwcRegion',
+    label: 'ROI Window',
+    icon: 'stop',
     //
     type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
     commandName: 'setToolActive',
-    commandOptions: { toolName: 'ArrowAnnotate' },
+    commandOptions: { toolName: 'WwwcRegion' },
   },
   {
-    id: 'Angle',
-    label: 'Angle',
-    icon: 'angle-left',
+    id: 'Invert',
+    label: 'Invert',
+    icon: 'adjust',
     //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Angle' },
+    type: TOOLBAR_BUTTON_TYPES.COMMAND,
+    commandName: 'invertViewport',
   },
   {
     id: 'Reset',
@@ -130,50 +120,6 @@ const definitions = [
         commandName: 'setToolActive',
         commandOptions: { toolName: 'Magnify' },
       },
-      {
-        id: 'WwwcRegion',
-        label: 'ROI Window',
-        icon: 'stop',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'WwwcRegion' },
-      },
-      {
-        id: 'DragProbe',
-        label: 'Probe',
-        icon: 'dot-circle',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'DragProbe' },
-      },
-      {
-        id: 'EllipticalRoi',
-        label: 'Ellipse',
-        icon: 'circle-o',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'EllipticalRoi' },
-      },
-      {
-        id: 'RectangleRoi',
-        label: 'Rectangle',
-        icon: 'square-o',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'RectangleRoi' },
-      },
-      {
-        id: 'Invert',
-        label: 'Invert',
-        icon: 'adjust',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'invertViewport',
-      },
       {
         id: 'RotateRight',
         label: 'Rotate Right',
@@ -198,23 +144,6 @@ const definitions = [
         type: TOOLBAR_BUTTON_TYPES.COMMAND,
         commandName: 'flipViewportVertical',
       },
-      {
-        id: 'Clear',
-        label: 'Clear',
-        icon: 'trash',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'clearAnnotations',
-      },
-      {
-        id: 'Bidirectional',
-        label: 'Bidirectional',
-        icon: 'measure-target',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'Bidirectional' },
-      },
       {
         id: 'Download',
         label: 'Download',

diff --git a/platform/ui/src/elements/Icon/getIcon.js b/platform/ui/src/elements/Icon/getIcon.js
@@ -114,6 +114,7 @@ const ICONS = {
   'angle-double-up': angleDoubleUp,
   'arrows-alt-h': arrowsAltH,
   'arrows-alt-v': arrowsAltV,
+  clipboard: clipboard,
   bars,
   'caret-down': caretDown,
   'caret-up': caretUp,

diff --git a/platform/viewer/public/config/idc.js b/platform/viewer/public/config/idc.js
@@ -5,6 +5,7 @@ window.config = function(props) {
     disableMeasurementPanel: true,
     routerBasename: '/',
     enableGoogleCloudAdapter: true,
+    disableMeasurementPanel: true,
     splitQueryParameterCalls: true, // Allows the user to split QIDO SeriesInstanceUID filters into multiple calls, if the server does not support multi-valued query parameters.
     enableGoogleCloudAdapterUI: false,
     showStudyList: true,

diff --git a/platform/viewer/public/html-templates/index.html b/platform/viewer/public/html-templates/index.html
@@ -2,11 +2,28 @@
 <html lang="en">
 
 <head>
+
+  <!-- Google Analytics -->
+  <script>
+    if (window.location.host == 'viewer.imaging.datacommons.cancer.gov') {
+      (function (i, s, o, g, r, a, m) {
+        i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+          (i[r].q = i[r].q || []).push(arguments)
+        }, i[r].l = 1 * new Date(); a = s.createElement(o),
+          m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
+      })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+
+      ga('create', 'UA-151885665-6', 'auto');
+      ga('send', 'pageview');
+    }
+  </script>
+  <!-- End Google Analytics -->
+
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
   <meta name="theme-color" content="#000000" />
   <meta name="mobile-web-app-capable" content="yes">
-  <meta name="application-name" content="OHIF Viewer">
+  <meta name="application-name" content="IDC Viewer">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
   <meta name="apple-mobile-web-app-title" content="@ohif/viewer">

diff --git a/platform/viewer/src/index.js b/platform/viewer/src/index.js
@@ -29,9 +29,9 @@ import OHIFDicomSegmentationExtension from '@ohif/extension-dicom-segmentation';
 import OHIFDicomRtExtension from '@ohif/extension-dicom-rt';
 import OHIFDicomMicroscopyExtension from '@ohif/extension-dicom-microscopy';
 import OHIFDicomPDFExtension from '@ohif/extension-dicom-pdf';
-//import OHIFDicomTagBrowserExtension from '@ohif/extension-dicom-tag-browser';
+import OHIFDicomTagBrowserExtension from '@ohif/extension-dicom-tag-browser';
 // Add this for Debugging purposes:
-//import OHIFDebuggingExtension from '@ohif/extension-debugging';
+import OHIFDebuggingExtension from '@ohif/extension-debugging';
 import { version } from '../package.json';
 
 /*
@@ -54,8 +54,15 @@ const appProps = {
     OHIFDicomPDFExtension,
     OHIFDicomSegmentationExtension,
     OHIFDicomRtExtension,
-    //OHIFDebuggingExtension,
-    //OHIFDicomTagBrowserExtension,
+    [
+      OHIFDebuggingExtension,
+      {
+        mailTo: '[email protected]',
+        debugModalMessage:
+          'If the Send Bug Report button does not work, copy to clipboard and e-mail [email protected].',
+      },
+    ],
+    OHIFDicomTagBrowserExtension,
   ],
 };