@ohif/app 3.13.0-beta.116 → 3.13.0-beta.117

package/dist/{9437.bundle.0fff227a859992ea.js → 9437.bundle.f3f5aff637471ac4.js}

@@ -7,12 +7,16 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_test_mode_src)
 });
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
-var esm = __webpack_require__(88479);
-// EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
-var src = __webpack_require__(50679);
+// UNUSED EXPORTS: basicTestLayout, basicTestRoute, initToolGroups, modeInstance
+
 // EXTERNAL MODULE: ../../../node_modules/i18next/dist/esm/i18next.js + 22 modules
 var i18next = __webpack_require__(26104);
+// EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
+var src = __webpack_require__(50679);
+// EXTERNAL MODULE: ../../../modes/basic/src/index.tsx + 4 modules
+var basic_src = __webpack_require__(69932);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
+var esm = __webpack_require__(88479);
 ;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/toolbarButtons.ts
 // TODO: torn, can either bake this here; or have to create a whole new button type
 // Only ways that you can pass in a custom React component for render :l
@@ -868,7 +872,11 @@ function initVolume3DToolGroup(extensionManager, toolGroupService) {
   };
   toolGroupService.createToolGroupAndAddTools('volume3d', tools);
 }
-function initToolGroups(extensionManager, toolGroupService, commandsManager) {
+function initToolGroups({
+  extensionManager,
+  toolGroupService,
+  commandsManager
+}) {
   initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default');
   initSRToolGroup(extensionManager, toolGroupService, commandsManager);
   initMPRToolGroup(extensionManager, toolGroupService, commandsManager);
@@ -881,6 +889,11 @@ function initToolGroups(extensionManager, toolGroupService, commandsManager) {
 
 
 
+
+const {
+  TOOLBAR_SECTIONS
+} = src/* .ToolbarService */.hx;
+
 // Allow this mode by excluding non-imaging modalities such as SR, SEG
 // Also, SM is not a simple imaging modalities, so exclude it.
 const NON_IMAGE_MODALITIES = ['ECG', 'SR', 'SEG', 'RTSTRUCT'];
@@ -933,133 +946,104 @@ const extensionDependencies = {
   '@ohif/extension-dicom-video': '^3.0.1',
   '@ohif/extension-test': '^0.0.1'
 };
-function modeFactory() {
-  return {
-    id: id,
-    routeName: 'basic-test',
-    displayName: i18next/* ["default"].t */.A.t('Modes:Basic Test Mode'),
-    /**
-     * Lifecycle hooks
-     */
-    onModeEnter: ({
-      servicesManager,
-      extensionManager,
-      commandsManager
-    }) => {
-      const {
-        measurementService,
-        toolbarService,
-        toolGroupService,
-        customizationService
-      } = servicesManager.services;
-      measurementService.clearMeasurements();
-
-      // Init Default and SR ToolGroups
-      src_initToolGroups(extensionManager, toolGroupService, commandsManager);
 
-      // init customizations
-      customizationService.setCustomizations(['@ohif/extension-test.customizationModule.custom-context-menu']);
-      toolbarService.register(src_toolbarButtons);
-      console.debug('toolbarButtons', src_toolbarButtons);
-      toolbarService.updateSection(toolbarService.sections.primary, ['MeasurementTools', 'Zoom', 'WindowLevelGroup', 'Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'MoreTools']);
-      toolbarService.updateSection('WindowLevelGroup', ['WindowLevel', 'Soft tissue', 'Lung', 'Liver', 'Bone', 'Brain']);
-      toolbarService.updateSection(toolbarService.sections.viewportActionMenu.topLeft, ['orientationMenu', 'dataOverlayMenu']);
-      toolbarService.updateSection(toolbarService.sections.viewportActionMenu.bottomMiddle, ['AdvancedRenderingControls']);
-      toolbarService.updateSection('AdvancedRenderingControls', ['voiManualControlMenu', 'Colorbar', 'opacityMenu', 'thresholdMenu']);
-      toolbarService.updateSection(toolbarService.sections.viewportActionMenu.topRight, ['modalityLoadBadge', 'trackingStatus', 'navigationComponent']);
-      toolbarService.updateSection(toolbarService.sections.viewportActionMenu.bottomLeft, ['windowLevelMenu']);
-      toolbarService.updateSection('WindowLevelGroup', ['WindowLevel', 'Soft tissue', 'Lung', 'Liver', 'Bone', 'Brain']);
-      toolbarService.updateSection('MeasurementTools', ['Length', 'Bidirectional', 'ArrowAnnotate', 'EllipticalROI', 'CircleROI', 'PlanarFreehandROI', 'SplineROI', 'LivewireContour']);
-      toolbarService.updateSection('MoreTools', ['Reset', 'rotate-right', 'flipHorizontal', 'ImageSliceSync', 'ReferenceLines', 'ImageOverlayViewer', 'StackScroll', 'invert', 'Probe', 'Cine', 'Angle', 'CobbAngle', 'Magnify', 'RectangleROI', 'CalibrationLine', 'TagBrowser', 'AdvancedMagnify', 'UltrasoundDirectionalTool', 'WindowLevelRegion']);
-      customizationService.setCustomizations({
-        'ohif.hotkeyBindings': {
-          $push: [{
-            commandName: 'undo',
-            label: 'Undo',
-            keys: ['ctrl+z'],
-            isEditable: true
-          }]
-        }
-      }, 'mode');
-    },
-    onModeExit: ({
-      servicesManager
-    }) => {
-      const {
-        toolGroupService,
-        syncGroupService,
-        segmentationService,
-        cornerstoneViewportService,
-        uiDialogService,
-        uiModalService
-      } = servicesManager.services;
-      uiDialogService.hideAll();
-      uiModalService.hide();
-      toolGroupService.destroy();
-      syncGroupService.destroy();
-      segmentationService.destroy();
-      cornerstoneViewportService.destroy();
-    },
-    validationTags: {
-      study: [],
-      series: []
-    },
-    isValidMode: function ({
-      modalities
-    }) {
-      const modalities_list = modalities.split('\\');
+/**
+ * The test mode's toolbar layout, supplied as literal values rather than
+ * `{ $reference }` capability-pack markers (the composition is resolved the
+ * same way either — literals pass through untouched).
+ */
+const toolbarSections = {
+  [TOOLBAR_SECTIONS.primary]: ['MeasurementTools', 'Zoom', 'WindowLevelGroup', 'Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'MoreTools'],
+  WindowLevelGroup: ['WindowLevel', 'Soft tissue', 'Lung', 'Liver', 'Bone', 'Brain'],
+  [TOOLBAR_SECTIONS.viewportActionMenu.topLeft]: ['orientationMenu', 'dataOverlayMenu'],
+  [TOOLBAR_SECTIONS.viewportActionMenu.bottomMiddle]: ['AdvancedRenderingControls'],
+  AdvancedRenderingControls: ['voiManualControlMenu', 'Colorbar', 'opacityMenu', 'thresholdMenu'],
+  [TOOLBAR_SECTIONS.viewportActionMenu.topRight]: ['modalityLoadBadge', 'trackingStatus', 'navigationComponent'],
+  [TOOLBAR_SECTIONS.viewportActionMenu.bottomLeft]: ['windowLevelMenu'],
+  MeasurementTools: ['Length', 'Bidirectional', 'ArrowAnnotate', 'EllipticalROI', 'CircleROI', 'PlanarFreehandROI', 'SplineROI', 'LivewireContour'],
+  MoreTools: ['Reset', 'rotate-right', 'flipHorizontal', 'ImageSliceSync', 'ReferenceLines', 'ImageOverlayViewer', 'StackScroll', 'invert', 'Probe', 'Cine', 'Angle', 'CobbAngle', 'Magnify', 'RectangleROI', 'CalibrationLine', 'TagBrowser', 'AdvancedMagnify', 'UltrasoundDirectionalTool', 'WindowLevelRegion']
+};
+const basicTestLayout = {
+  id: ohif.layout,
+  props: {
+    // Literal panel lists; the shared layout template also accepts
+    // customization names here.
+    leftPanels: [tracked.thumbnailList],
+    leftPanelResizable: true,
+    rightPanels: [cornerstone.panel, tracked.measurements, testExtension.measurements],
+    rightPanelResizable: true,
+    viewports: [{
+      namespace: tracked.viewport,
+      displaySetsToDisplay: [ohif.sopClassHandler, dicomvideo.sopClassHandler, ohif.wsiSopClassHandler]
+    }, {
+      namespace: dicomsr.viewport,
+      displaySetsToDisplay: [dicomsr.sopClassHandler, dicomsr.sopClassHandler3D]
+    }, {
+      namespace: dicompdf.viewport,
+      displaySetsToDisplay: [dicompdf.sopClassHandler]
+    }, {
+      namespace: dicomSeg.viewport,
+      displaySetsToDisplay: [dicomSeg.sopClassHandler]
+    }, {
+      namespace: dicomPmap.viewport,
+      displaySetsToDisplay: [dicomPmap.sopClassHandler]
+    }]
+  }
+};
+const basicTestRoute = {
+  path: 'basic-test',
+  layoutTemplate: basic_src/* .layoutTemplate */.ZM,
+  layoutInstance: basicTestLayout
+};
 
-      // Exclude non-image modalities
-      return {
-        valid: !!modalities_list.filter(modality => NON_IMAGE_MODALITIES.indexOf(modality) === -1).length,
-        description: 'The mode does not support studies that ONLY include the following modalities: SM, ECG, SR, SEG'
-      };
-    },
-    routes: [{
-      path: 'basic-test',
-      layoutTemplate: () => {
-        return {
-          id: ohif.layout,
-          props: {
-            leftPanels: [tracked.thumbnailList],
-            leftPanelResizable: true,
-            rightPanels: [cornerstone.panel, tracked.measurements, testExtension.measurements],
-            rightPanelResizable: true,
-            viewports: [{
-              namespace: tracked.viewport,
-              displaySetsToDisplay: [ohif.sopClassHandler, dicomvideo.sopClassHandler, ohif.wsiSopClassHandler]
-            }, {
-              namespace: dicomsr.viewport,
-              displaySetsToDisplay: [dicomsr.sopClassHandler, dicomsr.sopClassHandler3D]
-            }, {
-              namespace: dicompdf.viewport,
-              displaySetsToDisplay: [dicompdf.sopClassHandler]
-            }, {
-              namespace: dicomSeg.viewport,
-              displaySetsToDisplay: [dicomSeg.sopClassHandler]
-            }, {
-              namespace: dicomPmap.viewport,
-              displaySetsToDisplay: [dicomPmap.sopClassHandler]
-            }]
-          }
-        };
-      }
-    }],
-    extensions: extensionDependencies,
-    hangingProtocol: 'default',
-    sopClassHandlers: [dicomvideo.sopClassHandler, dicomSeg.sopClassHandler, ohif.wsiSopClassHandler, ohif.sopClassHandler, dicompdf.sopClassHandler, dicomsr.sopClassHandler, dicomsr.sopClassHandler3D],
-    hotkeys: {
-      name: 'basic-test-hotkeys'
+/**
+ * Extends the basic mode instance: the shared onModeEnter/onModeExit are
+ * inherited, and the test specifics (toolbar layout, tool groups, test
+ * customizations) are supplied as instance data.
+ */
+const modeInstance = {
+  ...basic_src/* .modeInstance */.dw,
+  id: id,
+  routeName: 'basic-test',
+  displayName: i18next/* ["default"].t */.A.t('Modes:Basic Test Mode'),
+  // Literal toolbar values instead of the basic mode's customization names.
+  toolbarButtons: src_toolbarButtons,
+  toolbarSections,
+  // Tool group setup used by the shared onModeEnter.
+  initToolGroups: src_initToolGroups,
+  // The mode's own customizations, applied by the mode route as the bottom
+  // layer of the mode scope: the test extension's custom context menu, plus
+  // the undo hotkey used by the E2E tests.  Given as a literal here; modes may
+  // also reference a registered block by name (see `basicModeCustomizations`).
+  modeCustomizations: ['@ohif/extension-test.customizationModule.custom-context-menu', {
+    'ohif.hotkeyBindings': {
+      $push: [{
+        commandName: 'undo',
+        label: 'Undo',
+        keys: ['ctrl+z'],
+        isEditable: true
+      }]
     }
-  };
-}
+  }],
+  isValidMode: basic_src/* .isValidMode */.ur,
+  nonModeModalities: NON_IMAGE_MODALITIES,
+  routes: [basicTestRoute],
+  extensions: extensionDependencies,
+  hangingProtocol: 'default',
+  sopClassHandlers: [dicomvideo.sopClassHandler, dicomSeg.sopClassHandler, ohif.wsiSopClassHandler, ohif.sopClassHandler, dicompdf.sopClassHandler, dicomsr.sopClassHandler, dicomsr.sopClassHandler3D],
+  hotkeys: {
+    name: 'basic-test-hotkeys'
+  }
+};
 const mode = {
   id: id,
-  modeFactory,
+  modeFactory: basic_src/* .modeFactory */.U1,
+  modeInstance,
   extensionDependencies
 };
 /* export default */ const basic_test_mode_src = (mode);
 
+
 },
 
 }]);

package/dist/app-config.js

@@ -33,7 +33,7 @@ window.config = {
   // are never executed. Example (left disabled here on purpose):
   //
   // customizationUrlPrefixes: {
-  //   default: './customizations/',                       // ?customization=ctPresets
+  //   default: './customizations/',                       // ?customization=tools/ctPresets
   //   '/remote/': 'https://cdn.example.com/ohif-custom/', // ?customization=/remote/siteA
   // },
   // ----------------------------------------------------------------------------