@ohif/app 3.7.0-beta.1 → 3.7.0-beta.11

package/dist/{192.bundle.4fee0d418ae32bb7ab30.js → 192.bundle.950e5380ea63c6d635d5.js}

@@ -16,8 +16,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
 var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/src/toolbarButtons.js
 // 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

package/dist/{199.bundle.290ef76d4ab8358e29bb.js → 199.bundle.f50ffd85a4334de2f5c1.js}

@@ -159,11 +159,6 @@ async function loadRTStruct(extensionManager, rtStructDisplaySet, referencedDisp
         NumberOfContourPoints,
         ContourGeometricType
       } = ContourSequenceArray[c];
-      const sopInstanceUID = ContourImageSequence.ReferencedSOPInstanceUID;
-      const imageId = _getImageId(imageIdSopInstanceUidPairs, sopInstanceUID);
-      if (!imageId) {
-        continue;
-      }
       let isSupported = false;
       const points = [];
       for (let p = 0; p < NumberOfContourPoints * 3; p += 3) {

package/dist/{208.bundle.29fe1842c33000edc75d.js → 208.bundle.7f610a302dc54c4924da.js}

@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
 var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/toolbarButtons.js
 // 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

package/dist/{283.bundle.7cf0fabc69d49a8a2c5d.js → 283.bundle.1015e87c3a47b1f1379c.js}

@@ -658,8 +658,8 @@ var react = __webpack_require__(32735);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(60216);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var src = __webpack_require__(28619);
 // EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
 var core_src = __webpack_require__(48501);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
@@ -875,7 +875,6 @@ function PanelPetSUV(_ref) {
     value: metadata.SeriesTime || '',
     onChange: () => {}
   }), /*#__PURE__*/react.createElement(src/* Button */.zx, {
-    color: "primary",
     onClick: updateMetadata
   }, "Reload Data"))));
 }
@@ -960,28 +959,24 @@ function segmentationItemEditHandler(_ref) {
             });
           }
         };
-        return /*#__PURE__*/react.createElement("div", {
-          className: "p-4 bg-primary-dark"
-        }, /*#__PURE__*/react.createElement(src/* Input */.II, {
+        return /*#__PURE__*/react.createElement(src/* Input */.II, {
           autoFocus: true,
-          className: "mt-2 bg-black border-primary-main",
+          className: "bg-black border-primary-main",
           type: "text",
           containerClassName: "mr-2",
           value: value.label,
           onChange: onChangeHandler,
           onKeyPress: onKeyPressHandler
-        }));
+        });
       },
-      actions: [
-      // temp: swap button types until colors are updated
-      {
+      actions: [{
         id: 'cancel',
         text: 'Cancel',
-        type: 'primary'
+        type: src/* ButtonEnums.type */.LZ.U.secondary
       }, {
         id: 'save',
         text: 'Save',
-        type: 'secondary'
+        type: src/* ButtonEnums.type */.LZ.U.primary
       }],
       onSubmit: onSubmitHandler
     }
@@ -1007,7 +1002,7 @@ function ExportReports(_ref) {
   }, /*#__PURE__*/react.createElement(src/* ButtonGroup */.hE, {
     color: "black",
     size: "inherit"
-  }, /*#__PURE__*/react.createElement(src/* Button */.zx, {
+  }, /*#__PURE__*/react.createElement(src/* LegacyButton */.mN, {
     className: "px-2 py-2 text-base",
     disabled: tmtvValue === null,
     onClick: () => {
@@ -1020,7 +1015,7 @@ function ExportReports(_ref) {
   }, t('Export CSV'))), /*#__PURE__*/react.createElement(src/* ButtonGroup */.hE, {
     color: "black",
     size: "inherit"
-  }, /*#__PURE__*/react.createElement(src/* Button */.zx, {
+  }, /*#__PURE__*/react.createElement(src/* LegacyButton */.mN, {
     className: "px-2 py-2 text-base",
     onClick: () => {
       commandsManager.runCommand('createTMTVRTReport');
@@ -1079,13 +1074,13 @@ function ROIThresholdConfiguration(_ref) {
     }
   })), /*#__PURE__*/react.createElement("div", {
     className: "w-1/2"
-  }, /*#__PURE__*/react.createElement(src/* ButtonGroup */.hE, null, /*#__PURE__*/react.createElement(src/* Button */.zx, {
+  }, /*#__PURE__*/react.createElement(src/* ButtonGroup */.hE, null, /*#__PURE__*/react.createElement(src/* LegacyButton */.mN, {
     size: "initial",
     className: "px-2 py-2 text-base text-white",
     color: "primaryLight",
     variant: "outlined",
     onClick: () => runCommand('setStartSliceForROIThresholdTool')
-  }, t('Start')), /*#__PURE__*/react.createElement(src/* Button */.zx, {
+  }, t('Start')), /*#__PURE__*/react.createElement(src/* LegacyButton */.mN, {
     size: "initial",
     color: "primaryLight",
     variant: "outlined",
@@ -1367,7 +1362,6 @@ function PanelRoiThresholdSegmentation(_ref) {
   }, /*#__PURE__*/react.createElement("div", {
     className: "flex mx-4 my-4 mb-4 space-x-4"
   }, /*#__PURE__*/react.createElement(src/* Button */.zx, {
-    color: "primary",
     onClick: () => {
       setLabelmapLoading(true);
       setTimeout(() => {
@@ -1378,7 +1372,6 @@ function PanelRoiThresholdSegmentation(_ref) {
       });
     }
   }, labelmapLoading ? 'loading ...' : 'New Label'), /*#__PURE__*/react.createElement(src/* Button */.zx, {
-    color: "primary",
     onClick: handleROIThresholding
   }, "Run")), /*#__PURE__*/react.createElement("div", {
     className: "flex items-center justify-around h-8 mb-2 border-t outline-none cursor-pointer select-none bg-secondary-dark first:border-0 border-secondary-light",

package/dist/{351.bundle.2d4bc19d8b493879dbbe.js → 351.bundle.0742237651aef9694a65.js}

@@ -25,8 +25,8 @@ var esm = __webpack_require__(57270);
 var dist_esm = __webpack_require__(77331);
 // EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
 var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
 var state = __webpack_require__(21922);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.css
@@ -549,7 +549,7 @@ function _getViewportInstance(viewportData, imageIndex) {
   if (viewportData.viewportType === dist_esm.Enums.ViewportType.STACK) {
     imageId = viewportData.data.imageIds[imageIndex];
   } else if (viewportData.viewportType === dist_esm.Enums.ViewportType.ORTHOGRAPHIC) {
-    const volumes = viewportData.volumes;
+    const volumes = viewportData.data;
     if (volumes && volumes.length == 1) {
       const volume = volumes[0];
       imageId = volume.imageIds[imageIndex];

package/dist/{404.bundle.902c664e3e581335a5d2.js → 404.bundle.3d65ff813eead20462d3.js}

@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
 var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/initToolGroups.js
 const toolGroupIds = {
   CT: 'ctToolGroup',

package/dist/{55.bundle.5f5e5ef9087b0beee35c.js → 55.bundle.550a823e75eb608e8d5e.js}

@@ -22,8 +22,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
 var lodash_debounce = __webpack_require__(40001);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
 // extracted by mini-css-extract-plugin
 

package/dist/{569.bundle.0ed8d8178ffd43fe1c34.js → 569.bundle.c8e771a8d28e237b32be.js}

@@ -21,8 +21,8 @@ var react = __webpack_require__(32735);
 var es = __webpack_require__(21572);
 // EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
 var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
   const {
@@ -86,6 +86,7 @@ async function _hydrateSEGDisplaySet(_ref) {
 /* harmony default export */ const _hydrateSEG = (_hydrateSEGDisplaySet);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts
 
+
 const RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -116,11 +117,11 @@ function _askHydrate(uiViewportDialogService, viewportIndex) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [{
-      type: 'secondary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
       text: 'No',
       value: RESPONSE.CANCEL
     }, {
-      type: 'primary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Yes',
       value: RESPONSE.HYDRATE_SEG
     }];
@@ -255,7 +256,7 @@ function OHIFCornerstoneSEGViewport(props) {
     activeViewportIndex
   } = viewportGrid;
   const referencedDisplaySet = segDisplaySet.getReferenceDisplaySet();
-  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet);
+  const referencedDisplaySetMetadata = _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet);
   referencedDisplaySetRef.current = {
     displaySet: referencedDisplaySet,
     metadata: referencedDisplaySetMetadata
@@ -490,20 +491,30 @@ OHIFCornerstoneSEGViewport.propTypes = {
 OHIFCornerstoneSEGViewport.defaultProps = {
   customProps: {}
 };
-function _getReferencedDisplaySetMetadata(referencedDisplaySet) {
+function _getReferencedDisplaySetMetadata(referencedDisplaySet, segDisplaySet) {
+  const {
+    SharedFunctionalGroupsSequence: [SharedFunctionalGroup]
+  } = segDisplaySet.instance;
+  const {
+    PixelMeasuresSequence: [PixelMeasures]
+  } = SharedFunctionalGroup;
+  const {
+    SpacingBetweenSlices,
+    SliceThickness
+  } = PixelMeasures;
   const image0 = referencedDisplaySet.images[0];
   const referencedDisplaySetMetadata = {
     PatientID: image0.PatientID,
     PatientName: image0.PatientName,
     PatientSex: image0.PatientSex,
     PatientAge: image0.PatientAge,
-    SliceThickness: image0.SliceThickness,
+    SliceThickness: image0.SliceThickness || SliceThickness,
     StudyDate: image0.StudyDate,
     SeriesDescription: image0.SeriesDescription,
     SeriesInstanceUID: image0.SeriesInstanceUID,
     SeriesNumber: image0.SeriesNumber,
     ManufacturerModelName: image0.ManufacturerModelName,
-    SpacingBetweenSlices: image0.SpacingBetweenSlices
+    SpacingBetweenSlices: image0.SpacingBetweenSlices || SpacingBetweenSlices
   };
   return referencedDisplaySetMetadata;
 }

package/dist/{581.bundle.360d26f97b37da8faec3.js → 581.bundle.dc6197189f7c88c27d4c.js}

@@ -19,8 +19,8 @@ var prop_types = __webpack_require__(60216);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
 var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/_hydrateRT.ts
 async function _hydrateRTDisplaySet(_ref) {
   let {
@@ -77,6 +77,7 @@ async function _hydrateRTDisplaySet(_ref) {
 /* harmony default export */ const _hydrateRT = (_hydrateRTDisplaySet);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
 
+
 const RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -109,11 +110,11 @@ function _askHydrate(uiViewportDialogService, viewportIndex) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [{
-      type: 'secondary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
       text: 'No',
       value: RESPONSE.CANCEL
     }, {
-      type: 'primary',
+      type: ui_src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Yes',
       value: RESPONSE.HYDRATE_SEG
     }];

package/dist/{616.bundle.b76c70aeeed8b142593c.js → 616.bundle.de530ae226dfa5573f6e.js}

@@ -252,8 +252,8 @@ function getSopClassHandlerModule(_ref2) {
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(60216);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/panels/callInputDialog.tsx
 
 
@@ -295,11 +295,11 @@ function callInputDialog(uiDialogService, label, callback) {
         actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary
         }, {
           id: 'save',
           text: 'Confirm',
-          type: 'secondary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.primary
         }],
         onSubmit: onSubmitHandler,
         body: _ref2 => {

package/dist/{707.bundle.832f50366089fd23e93b.js → 707.bundle.f774f3e4a687ddd60a32.js}

@@ -122,8 +122,8 @@ function destroy() {
   }
   webWorkers.length = 0;
 }
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/callInputDialog.tsx
 
 
@@ -187,11 +187,11 @@ function callInputDialog(uiDialogService, data, callback) {
         actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary
         }, {
           id: 'save',
           text: 'Save',
-          type: 'secondary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.primary
         }],
         onSubmit: onSubmitHandler,
         body: _ref2 => {
@@ -3850,8 +3850,6 @@ function DicomUploadProgress(_ref) {
     }, numFilesCompleted === dicomFileUploaderArr.length ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("span", {
       className: NO_WRAP_ELLIPSIS_CLASS_NAMES
     }, `${dicomFileUploaderArr.length} ${dicomFileUploaderArr.length > 1 ? 'files' : 'file'} completed.`), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-      variant: "contained",
-      color: "primary",
       disabled: false,
       className: "ml-auto",
       onClick: onComplete
@@ -3959,8 +3957,6 @@ function DicomUpload(_ref) {
           getInputProps
         } = _ref3;
         return /*#__PURE__*/react.createElement("div", getRootProps(), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-          variant: "contained",
-          color: "primary",
           disabled: false,
           onClick: () => {}
         }, 'Add files', /*#__PURE__*/react.createElement("input", getInputProps())));
@@ -3973,9 +3969,7 @@ function DicomUpload(_ref) {
           getInputProps
         } = _ref4;
         return /*#__PURE__*/react.createElement("div", getRootProps(), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-          variant: "contained",
-          color: "primaryDark",
-          border: "primaryActive",
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
           disabled: false,
           onClick: () => {}
         }, 'Add folder', /*#__PURE__*/react.createElement("input", _extends({}, getInputProps(), {
@@ -6942,41 +6936,47 @@ class SegmentationService extends src/* PubSubService */.hC {
         segmentIndex,
         geometryId
       } = rtStructData;
-      const geometry = await esm.geometryLoader.createAndCacheGeometry(geometryId, {
-        geometryData: {
-          data,
-          id,
-          color,
-          frameOfReferenceUID: structureSet.frameOfReferenceUID,
-          segmentIndex
-        },
-        type: esm.Enums.GeometryType.CONTOUR
-      });
-      const contourSet = geometry.data;
-      const centroid = contourSet.getCentroid();
-      segmentsCachedStats[segmentIndex] = {
-        center: {
-          world: centroid
-        },
-        modifiedTime: rtDisplaySet.SeriesDate // we use the SeriesDate as the modifiedTime since this is the first time we are creating the segmentation
-      };
 
-      segmentation.segments[segmentIndex] = {
-        label: id,
-        segmentIndex,
-        color,
-        ...SEGMENT_CONSTANT
-      };
-      const numInitialized = Object.keys(segmentsCachedStats).length;
+      // catch error instead of failing to allow loading to continue
+      try {
+        const geometry = await esm.geometryLoader.createAndCacheGeometry(geometryId, {
+          geometryData: {
+            data,
+            id,
+            color,
+            frameOfReferenceUID: structureSet.frameOfReferenceUID,
+            segmentIndex
+          },
+          type: esm.Enums.GeometryType.CONTOUR
+        });
+        const contourSet = geometry.data;
+        const centroid = contourSet.getCentroid();
+        segmentsCachedStats[segmentIndex] = {
+          center: {
+            world: centroid
+          },
+          modifiedTime: rtDisplaySet.SeriesDate // we use the SeriesDate as the modifiedTime since this is the first time we are creating the segmentation
+        };
 
-      // Calculate percentage completed
-      const percentComplete = Math.round(numInitialized / allRTStructData.length * 100);
-      this._broadcastEvent(SegmentationService_EVENTS.SEGMENT_LOADING_COMPLETE, {
-        percentComplete,
-        // Note: this is not the geometryIds length since there might be
-        // some missing ROINumbers
-        numSegments: allRTStructData.length
-      });
+        segmentation.segments[segmentIndex] = {
+          label: id,
+          segmentIndex,
+          color,
+          ...SEGMENT_CONSTANT
+        };
+        const numInitialized = Object.keys(segmentsCachedStats).length;
+
+        // Calculate percentage completed
+        const percentComplete = Math.round(numInitialized / allRTStructData.length * 100);
+        this._broadcastEvent(SegmentationService_EVENTS.SEGMENT_LOADING_COMPLETE, {
+          percentComplete,
+          // Note: this is not the geometryIds length since there might be
+          // some missing ROINumbers
+          numSegments: allRTStructData.length
+        });
+      } catch (e) {
+        console.warn(e);
+      }
     };
     const promiseArray = [];
     for (let i = 0; i < allRTStructData.length; i++) {