fix(bugs): enhancements and bugs in several areas (#4086)

modes/basic-test-mode/src/initToolGroups.ts

@@ -1,3 +1,15 @@
+const colours = {
+  'viewport-0': 'rgb(200, 0, 0)',
+  'viewport-1': 'rgb(200, 200, 0)',
+  'viewport-2': 'rgb(0, 200, 0)',
+};
+
+const colorsByOrientation = {
+  axial: 'rgb(200, 0, 0)',
+  sagittal: 'rgb(200, 200, 0)',
+  coronal: 'rgb(0, 200, 0)',
+};
+
 function initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, toolGroupId) {
   const utilityModule = extensionManager.getModuleEntry(
     '@ohif/extension-cornerstone.utilityModule.tools'
@@ -132,6 +144,9 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     '@ohif/extension-cornerstone.utilityModule.tools'
   );
 
+  const serviceManager = extensionManager._servicesManager;
+  const { cornerstoneViewportService } = serviceManager.services;
+
   const { toolNames, Enums } = utilityModule.exports;
 
   const tools = {
@@ -188,6 +203,20 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
             enabled: false,
             panSize: 10,
           },
+          getReferenceLineColor: viewportId => {
+            const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
+            const viewportOptions = viewportInfo?.viewportOptions;
+            if (viewportOptions) {
+              return (
+                colours[viewportOptions.id] ||
+                colorsByOrientation[viewportOptions.orientation] ||
+                '#0c0'
+              );
+            } else {
+              console.warn('missing viewport?', viewportId);
+              return '#0c0';
+            }
+          },
         },
       },
       { toolName: toolNames.ReferenceLines },

modes/basic-test-mode/src/moreTools.ts

@@ -135,6 +135,14 @@ const moreTools = [
           commands: setToolActiveToolbar,
           evaluate: 'evaluate.cornerstoneTool',
         }),
+        createButton({
+          id: 'CobbAngle',
+          icon: 'tool-angle',
+          label: 'Cobb Angle',
+          tooltip: 'Cobb Angle',
+          commands: setToolActiveToolbar,
+          evaluate: 'evaluate.cornerstoneTool',
+        }),
         createButton({
           id: 'Magnify',
           icon: 'tool-magnify',

modes/longitudinal/src/initToolGroups.js

@@ -1,3 +1,15 @@
+const colours = {
+  'viewport-0': 'rgb(200, 0, 0)',
+  'viewport-1': 'rgb(200, 200, 0)',
+  'viewport-2': 'rgb(0, 200, 0)',
+};
+
+const colorsByOrientation = {
+  axial: 'rgb(200, 0, 0)',
+  sagittal: 'rgb(200, 200, 0)',
+  coronal: 'rgb(0, 200, 0)',
+};
+
 function initDefaultToolGroup(
   extensionManager,
   toolGroupService,
@@ -155,6 +167,9 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m
     '@ohif/extension-cornerstone.utilityModule.tools'
   );
 
+  const serviceManager = extensionManager._servicesManager;
+  const { cornerstoneViewportService } = serviceManager.services;
+
   const { toolNames, Enums } = utilityModule.exports;
 
   const tools = {
@@ -221,6 +236,20 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m
             enabled: false,
             panSize: 10,
           },
+          getReferenceLineColor: viewportId => {
+            const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
+            const viewportOptions = viewportInfo?.viewportOptions;
+            if (viewportOptions) {
+              return (
+                colours[viewportOptions.id] ||
+                colorsByOrientation[viewportOptions.orientation] ||
+                '#0c0'
+              );
+            } else {
+              console.warn('missing viewport?', viewportId);
+              return '#0c0';
+            }
+          },
         },
       },
       {

modes/longitudinal/src/moreTools.ts

@@ -135,6 +135,14 @@ const moreTools = [
           commands: setToolActiveToolbar,
           evaluate: 'evaluate.cornerstoneTool',
         }),
+        createButton({
+          id: 'CobbAngle',
+          icon: 'tool-angle',
+          label: 'Cobb Angle',
+          tooltip: 'Cobb Angle',
+          commands: setToolActiveToolbar,
+          evaluate: 'evaluate.cornerstoneTool',
+        }),
         createButton({
           id: 'Magnify',
           icon: 'tool-magnify',

modes/microscopy/src/index.tsx

@@ -51,7 +51,7 @@ function modeFactory({ modeConfiguration }) {
       const { toolbarService } = servicesManager.services;
 
       toolbarService.addButtons(toolbarButtons);
-      toolbarService.createButtonSection('primary', ['MeasurementTools', 'dragPan']);
+      toolbarService.createButtonSection('primary', ['MeasurementTools', 'dragPan', 'TagBrowser']);
     },
 
     onModeExit: ({ servicesManager }) => {

modes/microscopy/src/toolbarButtons.js

@@ -145,6 +145,20 @@ const toolbarButtons = [
       evaluate: 'evaluate.microscopyTool',
     },
   },
+  {
+    id: 'TagBrowser',
+    uiType: 'ohif.radioGroup',
+    props: {
+      icon: 'dicom-tag-browser',
+      label: 'Dicom Tag Browser',
+      commands: [
+        {
+          commandName: 'openDICOMTagViewer',
+        },
+      ],
+      evaluate: 'evaluate.action',
+    },
+  },
 ];
 
 export default toolbarButtons;