hellfire 0.30.8 → 0.30.10

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.30.10](http://10.16.100.57/diffusion/115/paladin/compare/v0.30.9...v0.30.10) (2025-08-15)
+
+
+
+## [0.30.9](http://10.16.100.57/diffusion/115/paladin/compare/v0.30.8...v0.30.9) (2025-08-14)
+
+
+
 ## [0.30.8](http://10.16.100.57/diffusion/115/paladin/compare/v0.30.7...v0.30.8) (2025-08-09)
 
 

package/dist/index.js

@@ -10439,19 +10439,42 @@ function executeTask() {
 
         numRequest++;
         task.execute().then(function (res) {
-          if (executeCallback) {
-            executeCallback(task, taskPool.length);
-          }
+          if (!res.sizeInBytes && task.extra.backupId) {
+            // 解析图像数据出问题导致得到的图像是空的
+            // 目前碰到的问题是DR图像压缩后一部分图像会出现解析失败问题，尝试获取原始图像来解决
+            task.backupExecute().then(function (backupRes) {
+              task.putCacheByBackup();
+
+              if (executeCallback) {
+                executeCallback(task, taskPool.length);
+              }
 
-          numRequest--;
-          task.callbacks && task.callbacks.map(function (callback) {
-            callback({
-              success: true,
-              res: res
+              numRequest--;
+              task.callbacks && task.callbacks.map(function (callback) {
+                callback({
+                  success: true,
+                  res: backupRes
+                });
+              });
+              delete cachedTask[task.key];
+              executeTask();
             });
-          });
-          delete cachedTask[task.key];
-          executeTask();
+          } else {
+            // 获得正常的图像数据
+            if (executeCallback) {
+              executeCallback(task, taskPool.length);
+            }
+
+            numRequest--;
+            task.callbacks && task.callbacks.map(function (callback) {
+              callback({
+                success: true,
+                res: res
+              });
+            });
+            delete cachedTask[task.key];
+            executeTask();
+          }
         }, function (err) {
           // 请求失败 重试机制
           numRequest--;
@@ -10598,10 +10621,11 @@ function tryToClearPixelData(element, dataSet) {
 function addTaskPool(series) {
   lodash$1.forEach(series, function (item) {
     if (item && item.imageIds) {
-      lodash$1.forEach(item.imageIds, function (imageId) {
+      lodash$1.forEach(item.imageIds, function (imageId, index) {
         var imageTask = buildImageRequestTask(imageId, {
           extra: {
-            series: item.seriesInstanceUID
+            series: item.seriesInstanceUID,
+            backupId: item.imageIdsBackup && item.imageIdsBackup[index]
           }
         });
         addLoadImageTask(imageTask);
@@ -10645,6 +10669,31 @@ function changePriorityBySeries(seriesInstanceUID, series) {
   }
 }
 
+function handleTopPriorityTask(imageId, priority, resolve, reject) {
+  var _priority = highLevelPriority;
+
+  if (priority || priority === 0) {
+    _priority = priority;
+  } else {
+    highLevelPriority++;
+  } // imageId提取series uid
+
+
+  var match = imageId.match(/series\/(.*?)\/instances/);
+  var seriesUId = match ? match[1] : null;
+  var imageTask = buildImageRequestTask(imageId, {
+    priority: _priority,
+    extra: {
+      series: seriesUId
+    }
+  });
+  addLoadImageTask(imageTask).then(function (res) {
+    resolve(res);
+  }).catch(function (e) {
+    reject(e);
+  });
+}
+
 function loadAndCacheImagePlus(imageId, priority, forceRefresh) {
   return new Promise(function (resolve, reject) {
     if (forceRefresh) {
@@ -10655,33 +10704,16 @@ function loadAndCacheImagePlus(imageId, priority, forceRefresh) {
 
     if (imageLoadObject && !forceRefresh) {
       imageLoadObject.promise.then(function (image) {
-        resolve(image);
+        if (!image.sizeInBytes) {
+          handleTopPriorityTask(imageId, priority, resolve, reject);
+        } else {
+          resolve(image);
+        }
       }, function (err) {
         reject(err);
       });
     } else {
-      var _priority = highLevelPriority;
-
-      if (priority || priority === 0) {
-        _priority = priority;
-      } else {
-        highLevelPriority++;
-      } // imageId提取series uid
-
-
-      var match = imageId.match(/series\/(.*?)\/instances/);
-      var seriesUId = match ? match[1] : null;
-      var imageTask = buildImageRequestTask(imageId, {
-        priority: _priority,
-        extra: {
-          series: seriesUId
-        }
-      });
-      addLoadImageTask(imageTask).then(function (res) {
-        resolve(res);
-      }).catch(function (e) {
-        reject(e);
-      });
+      handleTopPriorityTask(imageId, priority, resolve, reject);
     }
   });
 }
@@ -10693,6 +10725,14 @@ function buildImageRequestTask(imageId) {
   }, config), {}, {
     execute: function execute() {
       return cornerstone.loadAndCacheImage(imageId);
+    },
+    backupExecute: function backupExecute() {
+      cornerstone.imageCache.removeImageLoadObject(imageId);
+      return cornerstone.loadAndCacheImage(config.extra.backupId);
+    },
+    putCacheByBackup: function putCacheByBackup() {
+      var data = cornerstone.imageCache.getImageLoadObject(config.extra.backupId);
+      cornerstone.imageCache.putImageLoadObject(imageId, data);
     }
   });
 }
@@ -75934,24 +75974,29 @@ var mergeProps$D = function mergeProps(propsFromState, propsFromDispatch, ownPro
       } // 清除dicom缓存
 
 
-      purgeDicomCache(); // 手机端清除所有imageCache
-      // 电脑端清除时做判断，超出60%的时候删除前30%
+      purgeDicomCache(); // 清除所有imageCache
 
-      var isMobile = ua.isDeviceTypeMobile();
       var cacheInfo = cornerstone.imageCache.getCacheInfo();
-      var maximumSizeInBytes = cacheInfo.maximumSizeInBytes,
-          cacheSizeInBytes = cacheInfo.cacheSizeInBytes;
-
-      if (isMobile) {
-        cornerstone.imageCache.setMaximumSizeBytes(0);
-        cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes);
-      } else {
-        if (cacheSizeInBytes > maximumSizeInBytes * 0.6) {
-          // 暂未找到更合适的接口,setMaximumSizeBytes时会触发purgeCacheIfNecessary,可以达到效果
-          cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes * 0.3);
-          cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes);
-        }
-      }
+      var maximumSizeInBytes = cacheInfo.maximumSizeInBytes;
+      cornerstone.imageCache.setMaximumSizeBytes(0);
+      cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes);
+      /**
+       * T13247 之前的方案，目前暂时修改为全部清除
+       * 手机端清除所有imageCache，电脑端清除时做判断，超出60%的时候删除前30%
+       *  const isMobile = ua.isDeviceTypeMobile();
+       *  const cacheInfo = cornerstone.imageCache.getCacheInfo();
+       *  const {maximumSizeInBytes, cacheSizeInBytes} = cacheInfo;
+       * if (isMobile) {
+       *                 cornerstone.imageCache.setMaximumSizeBytes(0);
+       *                 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes);
+       *             } else {
+       *                 if (cacheSizeInBytes > maximumSizeInBytes * 0.6) {
+       *                     // 暂未找到更合适的接口,setMaximumSizeBytes时会触发purgeCacheIfNecessary,可以达到效果
+       *                     cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes * 0.3);
+       *                     cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes);
+       *                 }
+       *             }
+       */
     },
     // 匹配序列 切换到指定图像位置
     scrollSeriesImageToIndex: function scrollSeriesImageToIndex(seriesUID, SOPInstanceUID) {