@cornerstonejs/tools 1.58.4 → 1.59.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.58.4",
+  "version": "1.59.0",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.58.4",
+    "@cornerstonejs/core": "^1.59.0",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "27788d9a480cf3dff59865f721cde0d158439734"
+  "gitHead": "85e398173df425f594c5ebd4fb5cd96da9d7dbd4"
 }

package/src/utilities/triggerAnnotationRender.ts

@@ -98,12 +98,20 @@ class AnnotationRenderingEngine {
         // If there is nothing left that is flagged for rendering, stop here
         // and allow RAF to be called again
         if (this._needsRender.size === 0) {
-          this._animationFrameSet = false;
-          this._animationFrameHandle = null;
-          return;
+          break;
         }
       }
     }
+
+    this._animationFrameSet = false;
+    this._animationFrameHandle = null;
+
+    // Call render again which will use RAF to call this function asynchronously
+    // if there is any viewport that needs to be rendered because when
+    // `triggerRender` is called inside the render loop a listener can flag new
+    // viewports that need to be rendered and some of the viewports that were
+    // already rendered can be added back to `_needsRender`.
+    this._render();
   };
 
   private _setAllViewportsToBeRenderedNextFrame() {

package/src/utilities/voi/colorbar/ViewportColorbar.ts

@@ -171,6 +171,19 @@ class ViewportColorbar extends Colorbar {
     this.showAndAutoHideTicks();
   };
 
+  private _viewportColormapModifiedCallback = (
+    evt: Types.EventTypes.ColormapModifiedEvent
+  ) => {
+    const { viewportId, colormap } = evt.detail;
+    const { viewport } = this.enabledElement;
+
+    if (viewportId !== viewport.id) {
+      return;
+    }
+
+    this.activeColormapName = colormap.name;
+  };
+
   private _addCornerstoneEventListener() {
     const { _element: element } = this;
 
@@ -188,6 +201,11 @@ class ViewportColorbar extends Colorbar {
       Events.VOI_MODIFIED,
       this._viewportVOIModifiedCallback as EventListener
     );
+
+    element.addEventListener(
+      Events.COLORMAP_MODIFIED,
+      this._viewportColormapModifiedCallback as EventListener
+    );
   }
 }