dcmjs 0.35.0 → 0.37.0

package/build/dcmjs.es.js

@@ -8405,6 +8405,10 @@ var DicomMetaDictionary = /*#__PURE__*/function () {
             // when the vr is data-dependent, keep track of the original type
             naturalDataset._vrMap[naturalName] = data.vr;
           }
+          if (data.vr !== entry.vr) {
+            // save origin vr if it different that in dictionary
+            naturalDataset._vrMap[naturalName] = data.vr;
+          }
         }
         if (data.Value === undefined) {
           // In the case of type 2, add this tag but explictly set it null to indicate its empty.
@@ -8478,8 +8482,9 @@ var DicomMetaDictionary = /*#__PURE__*/function () {
             return;
           }
           // process this one entry
+          var vr = dataset._vrMap && dataset._vrMap[naturalName] ? dataset._vrMap[naturalName] : entry.vr;
           var dataItem = ValueRepresentation.addTagAccessors({
-            vr: entry.vr
+            vr: vr
           });
           dataItem.Value = dataset[naturalName];
           if (dataValue !== null) {
@@ -8490,7 +8495,7 @@ var DicomMetaDictionary = /*#__PURE__*/function () {
                 log.error("No value representation given for", naturalName);
               }
             }
-            var vr = ValueRepresentation.createByTypeString(dataItem.vr);
+            var _vr = ValueRepresentation.createByTypeString(dataItem.vr);
             dataItem.Value = DicomMetaDictionary.denaturalizeValue(dataItem.Value);
             if (entry.vr == "SQ") {
               var unnaturalValues = [];
@@ -8500,11 +8505,11 @@ var DicomMetaDictionary = /*#__PURE__*/function () {
               }
               dataItem.Value = unnaturalValues;
             }
-            if (!vr.isBinary() && vr.maxLength) {
+            if (!_vr.isBinary() && _vr.maxLength) {
               dataItem.Value = dataItem.Value.map(function (value) {
-                if (value.length > vr.maxLength) {
-                  log.warn("Truncating value ".concat(value, " of ").concat(naturalName, " because it is longer than ").concat(vr.maxLength));
-                  return value.slice(0, vr.maxLength);
+                if (value.length > _vr.maxLength) {
+                  log.warn("Truncating value ".concat(value, " of ").concat(naturalName, " because it is longer than ").concat(_vr.maxLength));
+                  return value.slice(0, _vr.maxLength);
                 } else {
                   return value;
                 }
@@ -8615,7 +8620,8 @@ DicomMetaDictionary.sopClassNamesByUID = {
   "1.2.840.10008.5.1.4.1.1.128": "PETImage",
   "1.2.840.10008.5.1.4.1.1.130": "EnhancedPETImage",
   "1.2.840.10008.5.1.4.1.1.128.1": "LegacyConvertedEnhancedPETImage",
-  "1.2.840.10008.5.1.4.1.1.77.1.5.1": "OphthalmicPhotography8BitImage"
+  "1.2.840.10008.5.1.4.1.1.77.1.5.1": "OphthalmicPhotography8BitImage",
+  "1.2.840.10008.5.1.4.1.1.77.1.5.4": "OphthalmicTomographyImage"
 };
 DicomMetaDictionary.dictionary = dictionary;
 DicomMetaDictionary._generateNameMap();
@@ -11250,13 +11256,14 @@ var Normalizer = /*#__PURE__*/function () {
       sopClassUIDMap[toUID.Segmentation] = SEGImageNormalizer;
       sopClassUIDMap[toUID.DeformableSpatialRegistration] = DSRNormalizer;
       sopClassUIDMap[toUID.OphthalmicPhotography8BitImage] = OPImageNormalizer;
+      sopClassUIDMap[toUID.OphthalmicTomographyImage] = OCTImageNormalizer;
       return sopClassUIDMap[sopClassUID];
     }
   }, {
     key: "isMultiframeSOPClassUID",
     value: function isMultiframeSOPClassUID(sopClassUID) {
       var toUID = DicomMetaDictionary.sopClassUIDsByName;
-      var multiframeSOPClasses = [toUID.NMImage, toUID.EnhancedMRImage, toUID.LegacyConvertedEnhancedMRImage, toUID.EnhancedCTImage, toUID.LegacyConvertedEnhancedCTImage, toUID.EnhancedUSVolume, toUID.EnhancedPETImage, toUID.LegacyConvertedEnhancedPETImage, toUID.Segmentation, toUID.ParametricMapStorage];
+      var multiframeSOPClasses = [toUID.NMImage, toUID.EnhancedMRImage, toUID.LegacyConvertedEnhancedMRImage, toUID.EnhancedCTImage, toUID.LegacyConvertedEnhancedCTImage, toUID.EnhancedUSVolume, toUID.EnhancedPETImage, toUID.LegacyConvertedEnhancedPETImage, toUID.Segmentation, toUID.ParametricMapStorage, toUID.OphthalmicTomographyImage];
       return multiframeSOPClasses.indexOf(sopClassUID) !== -1;
     }
   }, {
@@ -11777,6 +11784,20 @@ var OPImageNormalizer = /*#__PURE__*/function (_Normalizer3) {
   }]);
   return OPImageNormalizer;
 }(Normalizer);
+var OCTImageNormalizer = /*#__PURE__*/function (_ImageNormalizer10) {
+  _inherits(OCTImageNormalizer, _ImageNormalizer10);
+  function OCTImageNormalizer() {
+    _classCallCheck(this, OCTImageNormalizer);
+    return _callSuper(this, OCTImageNormalizer, arguments);
+  }
+  _createClass(OCTImageNormalizer, [{
+    key: "normalize",
+    value: function normalize() {
+      _get(_getPrototypeOf(OCTImageNormalizer.prototype), "normalize", this).call(this);
+    }
+  }]);
+  return OCTImageNormalizer;
+}(ImageNormalizer);
 
 var Segmentation$4 = /*#__PURE__*/function (_DerivedPixels) {
   _inherits(Segmentation, _DerivedPixels);