Merge pull request #196 from LinkunGao/release/v1.13.29

Release/v1.13.29

Author: LinkunGao

docs/source/conf.py

@@ -22,7 +22,7 @@
 author = 'LinkunGao'
 
 # The full version, including alpha/beta/rc tags
-release = 'v1.13.28'
+release = 'v1.13.29'
 
 
 # -- General configuration ---------------------------------------------------

docs/source/release/release.md

@@ -1519,3 +1519,8 @@ const resetMainAreaSize = (factor: number) => {
 ## Release v1.13.28
 
 - update getMask() type
+
+## Release v1.13.29
+
+- fixed the load mask function bug.
+  - if load a empty mask accidentally, there is no bugs any more!

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "copper3d_visualisation",
   "description": "A 3d visualisation package base on threejs provides multiple scenes and Nrrd image load funtion.",
-  "version": "1.13.28",
+  "version": "1.13.29",
   "main": "dist/bundle.umd.js",
   "moudle": "dist/bundle.esm.js",
   "types": "dist/types/index.d.ts",

package.json

@@ -305,34 +305,36 @@ export class nrrd_tools {
   }
 
   setMasksData(masksData: exportPaintImageType[], loadingBar?: loadingBarType) {
-    this.nrrd_states.loadMaskJson = true;
-    if (loadingBar) {
-      let { loadingContainer, progress } = loadingBar;
-      loadingContainer.style.display = "flex";
-      progress.innerText = "Loading masks data......";
-    }
-
-    this.setEmptyCanvasSize();
+    if (!!masksData) {
+      this.nrrd_states.loadMaskJson = true;
+      if (loadingBar) {
+        let { loadingContainer, progress } = loadingBar;
+        loadingContainer.style.display = "flex";
+        progress.innerText = "Loading masks data......";
+      }
 
-    masksData.forEach((mask, index) => {
-      let imageData = this.emptyCtx.createImageData(
-        this.nrrd_states.nrrd_x_centimeter,
-        this.nrrd_states.nrrd_y_centimeter
-      );
       this.setEmptyCanvasSize();
 
-      for (let j = 0; j < mask.data.length; j++) {
-        imageData.data[j] = mask.data[j];
-      }
+      masksData.forEach((mask, index) => {
+        let imageData = this.emptyCtx.createImageData(
+          this.nrrd_states.nrrd_x_centimeter,
+          this.nrrd_states.nrrd_y_centimeter
+        );
+        this.setEmptyCanvasSize();
 
-      this.emptyCtx.putImageData(imageData, 0, 0);
+        for (let j = 0; j < mask.data.length; j++) {
+          imageData.data[j] = mask.data[j];
+        }
 
-      this.storeAllImages(index);
-    });
-    this.nrrd_states.loadMaskJson = false;
-    this.gui_states.resetZoom();
-    if (loadingBar) {
-      loadingBar.loadingContainer.style.display = "none";
+        this.emptyCtx.putImageData(imageData, 0, 0);
+
+        this.storeAllImages(index);
+      });
+      this.nrrd_states.loadMaskJson = false;
+      this.gui_states.resetZoom();
+      if (loadingBar) {
+        loadingBar.loadingContainer.style.display = "none";
+      }
     }
   }
 

src/Utils/nrrd_tool.ts

@@ -36,10 +36,10 @@ import {
 
 import "./css/style.css";
 
-export const REVISION = "v1.13.28";
+export const REVISION = "v1.13.29";
 
 console.log(
-  "%cCopper3D Visualisation %cBeta:v1.13.28",
+  "%cCopper3D Visualisation %cBeta:v1.13.29",
   "padding: 3px;color:white; background:#023047",
   "padding: 3px;color:white; background:#f50a25"
 );