dcmjs 0.24.6 → 0.24.9

package/build/dcmjs.es.js

@@ -3418,8 +3418,40 @@ var EXPLICIT_LITTLE_ENDIAN$1 = "1.2.840.10008.1.2.1";
 var EXPLICIT_BIG_ENDIAN = "1.2.840.10008.1.2.2";
 var singleVRs$1 = ["SQ", "OF", "OW", "OB", "UN", "LT"];
 var encodingMapping = {
+  "": "iso-8859-1",
+  "iso-ir-6": "iso-8859-1",
+  "iso-ir-13": "shift-jis",
+  "iso-ir-100": "latin1",
+  "iso-ir-101": "iso-8859-2",
+  "iso-ir-109": "iso-8859-3",
+  "iso-ir-110": "iso-8859-4",
+  "iso-ir-126": "iso-ir-126",
+  "iso-ir-127": "iso-ir-127",
+  "iso-ir-138": "iso-ir-138",
+  "iso-ir-144": "iso-ir-144",
+  "iso-ir-148": "iso-ir-148",
+  "iso-ir-166": "tis-620",
+  "iso-2022-ir-6": "iso-8859-1",
+  "iso-2022-ir-13": "shift-jis",
+  "iso-2022-ir-87": "iso-2022-jp",
+  "iso-2022-ir-100": "latin1",
+  "iso-2022-ir-101": "iso-8859-2",
+  "iso-2022-ir-109": "iso-8859-3",
+  "iso-2022-ir-110": "iso-8859-4",
+  "iso-2022-ir-126": "iso-ir-126",
+  "iso-2022-ir-127": "iso-ir-127",
+  "iso-2022-ir-138": "iso-ir-138",
+  "iso-2022-ir-144": "iso-ir-144",
+  "iso-2022-ir-148": "iso-ir-148",
+  "iso-2022-ir-149": "euc-kr",
+  "iso-2022-ir-159": "iso-2022-jp",
+  "iso-2022-ir-166": "tis-620",
+  "iso-2022-ir-58": "iso-ir-58",
   "iso-ir-192": "utf-8",
-  "": "latin1"
+  gb18030: "gb18030",
+  "iso-2022-gbk": "gbk",
+  "iso-2022-58": "gb2312",
+  gbk: "gbk"
 };
 var encapsulatedSyntaxes = ["1.2.840.10008.1.2.4.50", "1.2.840.10008.1.2.4.51", "1.2.840.10008.1.2.4.57", "1.2.840.10008.1.2.4.70", "1.2.840.10008.1.2.4.80", "1.2.840.10008.1.2.4.81", "1.2.840.10008.1.2.4.90", "1.2.840.10008.1.2.4.91", "1.2.840.10008.1.2.4.92", "1.2.840.10008.1.2.4.93", "1.2.840.10008.1.2.4.94", "1.2.840.10008.1.2.4.95", "1.2.840.10008.1.2.5", "1.2.840.10008.1.2.6.1", "1.2.840.10008.1.2.4.100", "1.2.840.10008.1.2.4.102", "1.2.840.10008.1.2.4.103"];
 
@@ -3472,21 +3504,24 @@ var DicomMessage = /*#__PURE__*/function () {
           if (cleanTagString === "00080005") {
             if (readInfo.values.length > 0) {
               var coding = readInfo.values[0];
-              coding = coding.replaceAll("_", "-").replaceAll(" ", "-").toLowerCase();
+              coding = coding.replace(/[_ ]/g, "-").toLowerCase();
 
               if (coding in encodingMapping) {
                 coding = encodingMapping[coding];
-              }
-
-              try {
                 bufferStream.setDecoder(new TextDecoder(coding));
-              } catch (error) {
-                console.warn(error);
+              } else if (ignoreErrors) {
+                console.warn("Unsupported character set: ".concat(coding, ", using default character set"));
+              } else {
+                throw Error("Unsupported character set: ".concat(coding));
               }
             }
 
             if (readInfo.values.length > 1) {
-              console.warn("multiple encodings not supported, using first encoding!", readInfo.values);
+              if (ignoreErrors) {
+                console.warn("Using multiple character sets is not supported, proceeding with just the first character set", readInfo.values);
+              } else {
+                throw Error("Using multiple character sets is not supported: ".concat(readInfo.values));
+              }
             }
 
             readInfo.values = ["ISO_IR 192"]; // change SpecificCharacterSet to UTF-8
@@ -3543,7 +3578,7 @@ var DicomMessage = /*#__PURE__*/function () {
       stream.increment(128);
 
       if (stream.readAsciiString(4) !== "DICM") {
-        throw new Error("Invalid a dicom file");
+        throw new Error("Invalid DICOM file, expected header is missing");
       }
 
       var el = DicomMessage._readTag(stream, useSyntax),
@@ -8150,7 +8185,8 @@ var FreehandRoi = /*#__PURE__*/function () {
     value: function getMeasurementData(MeasurementGroup) {
       var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
           defaultState = _MeasurementReport$ge.defaultState,
-          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup,
+          NUMGroup = _MeasurementReport$ge.NUMGroup;
 
       var state = _objectSpread2(_objectSpread2({}, defaultState), {}, {
         toolType: FreehandRoi.toolType,
@@ -8165,6 +8201,9 @@ var FreehandRoi = /*#__PURE__*/function () {
             hasBoundingBox: true
           }
         },
+        cachedStats: {
+          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
+        },
         color: undefined,
         invalidated: true
       });
@@ -8189,7 +8228,8 @@ var FreehandRoi = /*#__PURE__*/function () {
           handles = _tool.handles,
           finding = _tool.finding,
           findingSites = _tool.findingSites,
-          cachedStats = _tool.cachedStats;
+          _tool$cachedStats = _tool.cachedStats,
+          cachedStats = _tool$cachedStats === void 0 ? {} : _tool$cachedStats;
       var points = handles.points;
       var _cachedStats$area = cachedStats.area,
           area = _cachedStats$area === void 0 ? 0 : _cachedStats$area,
@@ -8606,7 +8646,7 @@ var EllipticalRoi = /*#__PURE__*/function () {
         toolType: EllipticalRoi.toolType,
         active: false,
         cachedStats: {
-          area: NUMGroup.MeasuredValueSequence.NumericValue
+          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
         },
         handles: {
           end: {
@@ -8639,7 +8679,8 @@ var EllipticalRoi = /*#__PURE__*/function () {
   }, {
     key: "getTID300RepresentationArguments",
     value: function getTID300RepresentationArguments(tool) {
-      var cachedStats = tool.cachedStats,
+      var _tool$cachedStats = tool.cachedStats,
+          cachedStats = _tool$cachedStats === void 0 ? {} : _tool$cachedStats,
           handles = tool.handles,
           finding = tool.finding,
           findingSites = tool.findingSites;
@@ -8874,7 +8915,7 @@ var CircleRoi = /*#__PURE__*/function () {
         toolType: CircleRoi.toolType,
         active: false,
         cachedStats: {
-          area: NUMGroup.MeasuredValueSequence.NumericValue,
+          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
           // Dummy values to be updated by cornerstone
           radius: 0,
           perimeter: 0
@@ -8913,7 +8954,8 @@ var CircleRoi = /*#__PURE__*/function () {
   }, {
     key: "getTID300RepresentationArguments",
     value: function getTID300RepresentationArguments(tool) {
-      var cachedStats = tool.cachedStats,
+      var _tool$cachedStats = tool.cachedStats,
+          cachedStats = _tool$cachedStats === void 0 ? {} : _tool$cachedStats,
           handles = tool.handles,
           finding = tool.finding,
           findingSites = tool.findingSites;
@@ -14718,7 +14760,8 @@ var RectangleRoi = /*#__PURE__*/function () {
     value: function getMeasurementData(MeasurementGroup) {
       var _MeasurementReport$ge = MeasurementReport.getSetupMeasurementData(MeasurementGroup),
           defaultState = _MeasurementReport$ge.defaultState,
-          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup;
+          SCOORDGroup = _MeasurementReport$ge.SCOORDGroup,
+          NUMGroup = _MeasurementReport$ge.NUMGroup;
 
       var state = _objectSpread2(_objectSpread2({}, defaultState), {}, {
         toolType: RectangleRoi.toolType,
@@ -14735,6 +14778,9 @@ var RectangleRoi = /*#__PURE__*/function () {
           },
           initialRotation: 0
         },
+        cachedStats: {
+          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
+        },
         color: undefined,
         invalidated: true
       });
@@ -14756,7 +14802,8 @@ var RectangleRoi = /*#__PURE__*/function () {
     value: function getTID300RepresentationArguments(tool) {
       var finding = tool.finding,
           findingSites = tool.findingSites,
-          cachedStats = tool.cachedStats,
+          _tool$cachedStats = tool.cachedStats,
+          cachedStats = _tool$cachedStats === void 0 ? {} : _tool$cachedStats,
           handles = tool.handles;
       console.log("getTID300 Rectangle", tool, cachedStats, handles);
       var start = handles.start,
@@ -15185,7 +15232,7 @@ var Length$2 = /*#__PURE__*/function () {
           }
         },
         cachedStats: _defineProperty({}, "imageId:".concat(referencedImageId), {
-          length: NUMGroup.MeasuredValueSequence.NumericValue
+          length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
         })
       };
       return state;
@@ -15197,7 +15244,8 @@ var Length$2 = /*#__PURE__*/function () {
           finding = tool.finding,
           findingSites = tool.findingSites,
           metadata = tool.metadata;
-      var cachedStats = data.cachedStats,
+      var _data$cachedStats = data.cachedStats,
+          cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
           handles = data.handles;
       var referencedImageId = metadata.referencedImageId;
 
@@ -15215,7 +15263,10 @@ var Length$2 = /*#__PURE__*/function () {
         x: end[0],
         y: end[1]
       };
-      var distance = cachedStats["imageId:".concat(referencedImageId)].length;
+
+      var _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+          distance = _ref.length;
+
       return {
         point1: point1,
         point2: point2,
@@ -15315,7 +15366,8 @@ var Bidirectional$2 = /*#__PURE__*/function () {
           finding = tool.finding,
           findingSites = tool.findingSites,
           metadata = tool.metadata;
-      var cachedStats = data.cachedStats,
+      var _data$cachedStats = data.cachedStats,
+          cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
           handles = data.handles;
       var referencedImageId = metadata.referencedImageId;
 
@@ -15323,9 +15375,10 @@ var Bidirectional$2 = /*#__PURE__*/function () {
         throw new Error("Bidirectional.getTID300RepresentationArguments: referencedImageId is not defined");
       }
 
-      var _cachedStats$ = cachedStats["imageId:".concat(referencedImageId)],
-          length = _cachedStats$.length,
-          width = _cachedStats$.width;
+      var _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+          length = _ref.length,
+          width = _ref.width;
+
       var points = handles.points; // Find the length and width point pairs by comparing the distances of the points at 0,1 to points at 2,3
 
       var firstPointPairs = [points[0], points[1]];
@@ -15477,7 +15530,7 @@ var EllipticalROI = /*#__PURE__*/function () {
           }
         },
         cachedStats: _defineProperty({}, "imageId:".concat(referencedImageId), {
-          area: NUMGroup.MeasuredValueSequence.NumericValue
+          area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
         })
       };
       return state;
@@ -15489,7 +15542,8 @@ var EllipticalROI = /*#__PURE__*/function () {
           finding = tool.finding,
           findingSites = tool.findingSites,
           metadata = tool.metadata;
-      var cachedStats = data.cachedStats,
+      var _data$cachedStats = data.cachedStats,
+          cachedStats = _data$cachedStats === void 0 ? {} : _data$cachedStats,
           handles = data.handles;
       var referencedImageId = metadata.referencedImageId;
 
@@ -15546,7 +15600,9 @@ var EllipticalROI = /*#__PURE__*/function () {
         });
       }
 
-      var area = cachedStats["imageId:".concat(referencedImageId)].area;
+      var _ref = cachedStats["imageId:".concat(referencedImageId)] || {},
+          area = _ref.area;
+
       return {
         area: area,
         points: points,