@ohif/app 3.7.0-beta.9 → 3.7.0-beta.90

package/dist/{208.bundle.05451122c341d80d3c22.js → 99.bundle.eff869422ff7114f5403.js}

@@ -1,9 +1,9 @@
-"use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[208],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[99],{
 
-/***/ 9208:
+/***/ 7395:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
+"use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
@@ -12,50 +12,24 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_test_mode_src)
 });
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var ui_src = __webpack_require__(28619);
-;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/toolbarButtons.js
+// EXTERNAL MODULE: ../../core/src/index.ts + 64 modules
+var src = __webpack_require__(67869);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
+var esm = __webpack_require__(3743);
+;// 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
 
 
+
 const {
   windowLevelPresets
 } = src.defaults;
-/**
- *
- * @param {*} type - 'tool' | 'action' | 'toggle'
- * @param {*} id
- * @param {*} icon
- * @param {*} label
- */
-function _createButton(type, id, icon, label, commands, tooltip, uiType) {
-  return {
-    id,
-    icon,
-    label,
-    type,
-    commands,
-    tooltip,
-    uiType
-  };
-}
-function _createCommands(commandName, toolName, toolGroupIds) {
-  return toolGroupIds.map(toolGroupId => ({
-    /* It's a command that is being run when the button is clicked. */
-    commandName,
-    commandOptions: {
-      toolName,
-      toolGroupId
-    },
-    context: 'CORNERSTONE'
-  }));
-}
-const _createActionButton = _createButton.bind(null, 'action');
-const _createToggleButton = _createButton.bind(null, 'toggle');
-const _createToolButton = _createButton.bind(null, 'tool');
+const _createActionButton = src/* ToolbarService */.Ok._createButton.bind(null, 'action');
+const _createToggleButton = src/* ToolbarService */.Ok._createButton.bind(null, 'toggle');
+const _createToolButton = src/* ToolbarService */.Ok._createButton.bind(null, 'tool');
 
 /**
  *
@@ -78,6 +52,16 @@ function _createWwwcPreset(preset, title, subtitle) {
     }]
   };
 }
+const ReferenceLinesCommands = [{
+  commandName: 'setSourceViewportForReferenceLinesTool',
+  context: 'CORNERSTONE'
+}, {
+  commandName: 'setToolActive',
+  commandOptions: {
+    toolName: 'ReferenceLines'
+  },
+  context: 'CORNERSTONE'
+}];
 const toolbarButtons = [
 // Measurement
 {
@@ -391,16 +375,24 @@ const toolbarButtons = [
       commandOptions: {},
       context: 'CORNERSTONE'
     }], 'Flip Horizontal'), _createToggleButton('StackImageSync', 'link', 'Stack Image Sync', [{
-      commandName: 'toggleStackImageSync',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }]), _createToggleButton('ReferenceLines', 'tool-referenceLines',
+      commandName: 'toggleStackImageSync'
+    }], 'Enable position synchronization on stack viewports', {
+      listeners: {
+        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: {
+          commandName: 'toggleStackImageSync',
+          commandOptions: {
+            toggledState: true
+          }
+        }
+      }
+    }), _createToggleButton('ReferenceLines', 'tool-referenceLines',
     // change this with the new icon
-    'Reference Lines', [{
-      commandName: 'toggleReferenceLines',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }]), _createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
+    'Reference Lines', ReferenceLinesCommands, 'Show Reference Lines', {
+      listeners: {
+        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: ReferenceLinesCommands,
+        [esm.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: ReferenceLinesCommands
+      }
+    }), _createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'StackScroll'
@@ -451,7 +443,7 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/mode-test"}');
 
 const id = package_namespaceObject.u2;
 
-;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/initToolGroups.js
+;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/initToolGroups.ts
 function initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, toolGroupId) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
   const {
@@ -481,7 +473,18 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -507,20 +510,7 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.ReferenceLines
     }]
   };
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const SRUtilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone-dicom-sr.utilityModule.tools');
@@ -570,21 +560,8 @@ function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
   const toolGroupId = 'SRToolGroup';
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
@@ -615,7 +592,18 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -634,7 +622,14 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }],
     disabled: [{
-      toolName: toolNames.Crosshairs
+      toolName: toolNames.Crosshairs,
+      configuration: {
+        viewportIndicators: false,
+        autoPan: {
+          enabled: false,
+          panSize: 10
+        }
+      }
     }, {
       toolName: toolNames.ReferenceLines
     }]
@@ -643,27 +638,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
-      }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools('mpr', tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools('mpr', tools);
 }
 function initToolGroups(extensionManager, toolGroupService, commandsManager) {
   initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default');
@@ -671,7 +646,7 @@ function initToolGroups(extensionManager, toolGroupService, commandsManager) {
   initMPRToolGroup(extensionManager, toolGroupService, commandsManager);
 }
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
-;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/index.js
+;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/index.ts
 
 
 
@@ -751,7 +726,6 @@ function modeFactory() {
       const activateTool = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',
@@ -859,6 +833,13 @@ const mode = {
 };
 /* harmony default export */ const basic_test_mode_src = (mode);
 
+/***/ }),
+
+/***/ 78753:
+/***/ (() => {
+
+/* (ignored) */
+
 /***/ })
 
 }]);

package/dist/_redirects

@@ -1,6 +1,6 @@
 # Specific to our deploy-preview
 # Our docs are published using CircleCI + GitBook
-# Confgure redirects using netlify.toml
+# Configure redirects using netlify.toml
 
 # Spa
 /* /index.html 200

package/dist/app-config.js

@@ -3,15 +3,11 @@ window.config = {
   // whiteLabeling: {},
   extensions: [],
   modes: [],
-  customizationService: {
-    // Shows a custom route -access via http://localhost:3000/custom
-    // helloPage: '@ohif/extension-default.customizationModule.helloPage',
-  },
+  customizationService: {},
   showStudyList: true,
   // some windows systems have issues with more than 3 web workers
   maxNumberOfWebWorkers: 3,
   // below flag is for performance reasons, but it might not work for all servers
-  omitQuotationForMultipartRequest: true,
   showWarningMessageForCrossOrigin: true,
   showCPUFallbackMessage: true,
   showLoadingIndicator: true,
@@ -37,21 +33,41 @@ window.config = {
   // },
   dataSources: [
     {
-      friendlyName: 'dcmjs DICOMWeb Server',
       namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
       sourceName: 'dicomweb',
       configuration: {
+        friendlyName: 'AWS S3 Static wado server',
         name: 'aws',
-        // old server
-        // wadoUriRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado',
-        // qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
-        // wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
-
-        // new server
         wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
         qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
         wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
-
+        qidoSupportsIncludeField: false,
+        imageRendering: 'wadors',
+        thumbnailRendering: 'wadors',
+        enableStudyLazyLoad: true,
+        supportsFuzzyMatching: false,
+        supportsWildcard: true,
+        staticWado: true,
+        singlepart: 'bulkdata,video',
+        // whether the data source should use retrieveBulkData to grab metadata,
+        // and in case of relative path, what would it be relative to, options
+        // are in the series level or study level (some servers like series some study)
+        bulkDataURI: {
+          enabled: true,
+          relativeResolution: 'studies',
+        },
+        omitQuotationForMultipartRequest: true,
+      },
+    },
+    {
+      namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
+      sourceName: 'dicomweb2',
+      configuration: {
+        friendlyName: 'AWS S3 Static wado secondary server',
+        name: 'aws',
+        wadoUriRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb',
+        qidoRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb',
+        wadoRoot: 'https://d28o5kq0jsoob5.cloudfront.net/dicomweb',
         qidoSupportsIncludeField: false,
         supportsReject: false,
         imageRendering: 'wadors',
@@ -68,29 +84,31 @@ window.config = {
           enabled: true,
           relativeResolution: 'studies',
         },
+        omitQuotationForMultipartRequest: true,
       },
     },
     {
-      friendlyName: 'dicomweb delegating proxy',
       namespace: '@ohif/extension-default.dataSourcesModule.dicomwebproxy',
       sourceName: 'dicomwebproxy',
       configuration: {
+        friendlyName: 'dicomweb delegating proxy',
         name: 'dicomwebproxy',
       },
     },
     {
-      friendlyName: 'dicom json',
       namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',
       sourceName: 'dicomjson',
       configuration: {
+        friendlyName: 'dicom json',
         name: 'json',
       },
     },
     {
-      friendlyName: 'dicom local',
       namespace: '@ohif/extension-default.dataSourcesModule.dicomlocal',
       sourceName: 'dicomlocal',
-      configuration: {},
+      configuration: {
+        friendlyName: 'dicom local',
+      },
     },
   ],
   httpErrorHandler: error => {