feat(layout): new layout selector with 3D volume rendering (#3923)

extensions/cornerstone/src/commandsModule.ts

@@ -311,6 +311,10 @@ function commandsModule({
         return;
       }
 
+      if (!toolGroup.hasTool(toolName)) {
+        return;
+      }
+
       const activeToolName = toolGroup.getActivePrimaryMouseButtonTool();
 
       if (activeToolName) {

extensions/cornerstone/src/getToolbarModule.tsx

@@ -166,6 +166,19 @@ export default function getToolbarModule({ commandsManager, servicesManager }) {
         };
       },
     },
+    {
+      name: 'evaluate.not3D',
+      evaluate: ({ viewportId, button }) => {
+        const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+
+        if (viewport?.type === 'volume3d') {
+          return {
+            disabled: true,
+            className: '!text-common-bright ohif-disabled',
+          };
+        }
+      },
+    },
     {
       name: 'evaluate.viewportProperties.toggle',
       evaluate: ({ viewportId, button }) => {

extensions/cornerstone/src/hps/fourUp.ts

@@ -1,7 +1,9 @@
 export const fourUp = {
   id: 'fourUp',
   locked: true,
-  name: 'fourUp',
+  name: '3D four up',
+  icon: 'layout-advanced-3d-four-up',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},

extensions/cornerstone/src/hps/main3D.ts

@@ -1,7 +1,9 @@
 export const main3D = {
   id: 'main3D',
   locked: true,
-  name: 'main3D',
+  name: '3D main',
+  icon: 'layout-advanced-3d-main',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},

extensions/cornerstone/src/hps/mpr.ts

@@ -2,8 +2,10 @@ import { Types } from '@ohif/core';
 
 export const mpr: Types.HangingProtocol.Protocol = {
   id: 'mpr',
-  name: 'Multi-Planar Reconstruction',
+  name: 'MPR',
   locked: true,
+  icon: 'layout-advanced-mpr',
+  isPreset: true,
   createdDate: '2021-02-23',
   modifiedDate: '2023-08-15',
   availableTo: {},

extensions/cornerstone/src/hps/only3D.ts

@@ -1,7 +1,9 @@
 export const only3D = {
   id: 'only3D',
   locked: true,
-  name: 'only3D',
+  name: '3D only',
+  icon: 'layout-advanced-3d-only',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},

extensions/cornerstone/src/hps/primary3D.ts

@@ -1,7 +1,9 @@
 export const primary3D = {
   id: 'primary3D',
   locked: true,
-  name: 'primary3D',
+  name: '3D primary',
+  icon: 'layout-advanced-3d-primary',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},

extensions/cornerstone/src/hps/primaryAxial.ts

@@ -1,7 +1,9 @@
 export const primaryAxial = {
   id: 'primaryAxial',
   locked: true,
-  name: 'primaryAxial',
+  name: 'Axial Primary',
+  icon: 'layout-advanced-axial-primary',
+  isPreset: true,
   createdDate: '2023-03-15T10:29:44.894Z',
   modifiedDate: '2023-03-15T10:29:44.894Z',
   availableTo: {},