Merge branch 'master' into feat/idc-2374

platform/viewer/public/config/default.js

@@ -1,28 +1,129 @@
 window.config = {
+  // default: '/'
   routerBasename: '/',
-  enableGoogleCloudAdapter: true,
+  extensions: [],
+  showStudyList: true,
+  filterQueryParam: false,
+  disableServersCache: false,
   servers: {
-    // This is an array, but we'll only use the first entry for now
+    dicomWeb: [
-    dicomWeb: [],
+      {
+        name: 'DCM4CHEE',
+        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',
+        qidoSupportsIncludeField: true,
+        imageRendering: 'wadors',
+        thumbnailRendering: 'wadors',
+        enableStudyLazyLoad: true,
+        supportsFuzzyMatching: true,
+      },
+    ],
   },
-  // This is an array, but we'll only use the first entry for now
+  // Extensions should be able to suggest default values for these?
-  oidc: [
+  // Or we can require that these be explicitly set
+  hotkeys: [
+    // ~ Global
     {
-      // ~ REQUIRED
+      commandName: 'incrementActiveViewport',
-      // Authorization Server URL
+      label: 'Next Viewport',
-      authority: 'https://accounts.google.com',
+      keys: ['right'],
-      client_id:
+    },
-        '723928408739-k9k9r3i44j32rhu69vlnibipmmk9i57p.apps.googleusercontent.com',
+    {
-      redirect_uri: '/callback', // `OHIFStandaloneViewer.js`
+      commandName: 'decrementActiveViewport',
-      response_type: 'id_token token',
+      label: 'Previous Viewport',
-      scope:
+      keys: ['left'],
-        'email profile openid https://www.googleapis.com/auth/cloudplatformprojects.readonly https://www.googleapis.com/auth/cloud-healthcare', // email profile openid
+    },
-      // ~ OPTIONAL
+    // Supported Keys: https://craig.is/killing/mice
-      post_logout_redirect_uri: '/logout-redirect.html',
+    // ~ Cornerstone Extension
-      revoke_uri: 'https://accounts.google.com/o/oauth2/revoke?token=',
+    { commandName: 'rotateViewportCW', label: 'Rotate Right', keys: ['r'] },
-      automaticSilentRenew: true,
+    { commandName: 'rotateViewportCCW', label: 'Rotate Left', keys: ['l'] },
-      revokeAccessTokenOnSignout: true,
+    { commandName: 'invertViewport', label: 'Invert', keys: ['i'] },
+    {
+      commandName: 'flipViewportVertical',
+      label: 'Flip Horizontally',
+      keys: ['h'],
+    },
+    {
+      commandName: 'flipViewportHorizontal',
+      label: 'Flip Vertically',
+      keys: ['v'],
+    },
+    { commandName: 'scaleUpViewport', label: 'Zoom In', keys: ['+'] },
+    { commandName: 'scaleDownViewport', label: 'Zoom Out', keys: ['-'] },
+    { commandName: 'fitViewportToWindow', label: 'Zoom to Fit', keys: ['='] },
+    { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
+    // clearAnnotations
+    { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
+    { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
+    // firstImage
+    // lastImage
+    {
+      commandName: 'previousViewportDisplaySet',
+      label: 'Previous Series',
+      keys: ['pagedown'],
+    },
+    {
+      commandName: 'nextViewportDisplaySet',
+      label: 'Next Series',
+      keys: ['pageup'],
+    },
+    // ~ Cornerstone Tools
+    { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
+    // ~ Window level presets
+    {
+      commandName: 'windowLevelPreset1',
+      label: 'W/L Preset 1',
+      keys: ['1'],
+    },
+    {
+      commandName: 'windowLevelPreset2',
+      label: 'W/L Preset 2',
+      keys: ['2'],
+    },
+    {
+      commandName: 'windowLevelPreset3',
+      label: 'W/L Preset 3',
+      keys: ['3'],
+    },
+    {
+      commandName: 'windowLevelPreset4',
+      label: 'W/L Preset 4',
+      keys: ['4'],
+    },
+    {
+      commandName: 'windowLevelPreset5',
+      label: 'W/L Preset 5',
+      keys: ['5'],
+    },
+    {
+      commandName: 'windowLevelPreset6',
+      label: 'W/L Preset 6',
+      keys: ['6'],
+    },
+    {
+      commandName: 'windowLevelPreset7',
+      label: 'W/L Preset 7',
+      keys: ['7'],
+    },
+    {
+      commandName: 'windowLevelPreset8',
+      label: 'W/L Preset 8',
+      keys: ['8'],
+    },
+    {
+      commandName: 'windowLevelPreset9',
+      label: 'W/L Preset 9',
+      keys: ['9'],
     },
   ],
-  studyListFunctionsEnabled: true,
+  cornerstoneExtensionConfig: {},
+  // Following property limits number of simultaneous series metadata requests.
+  // For http/1.x-only servers, set this to 5 or less to improve
+  //  on first meaningful display in viewer
+  // If the server is particularly slow to respond to series metadata
+  //  requests as it extracts the metadata from raw files everytime,
+  //  try setting this to even lower value
+  // Leave it undefined for no limit, sutiable for HTTP/2 enabled servers
+  // maxConcurrentMetadataRequests: 5,
 };