Merge branch 'v0.36'

Author: ivmartel

changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [v0.36.1](https://github.com/ivmartel/dwv/releases/tag/v0.36.1) - 20/02/2026
+
+### Fixed
+
+- Close annotation on mouse out [#2088](https://github.com/ivmartel/dwv/issues/2088)
+- Bound annotation drawing to view [#2083](https://github.com/ivmartel/dwv/issues/2083)
+- Missing quantification in annotation SR [#2090](https://github.com/ivmartel/dwv/issues/2090)
+
+---
+
 ## [v0.36.0](https://github.com/ivmartel/dwv/releases/tag/v0.36.0) - 05/02/2026
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dwv",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "DICOM Web Viewer.",
   "keywords": [
     "DICOM",

resources/api/dwv.api.md

@@ -1412,6 +1412,7 @@ export class ViewController {
     stop(): void;
     unbindImageAndLayer(viewLayer: ViewLayer): void;
     updatePlaneHelper(): void;
+    validatePlanePoint(point2D: Point2D): boolean;
 }
 
 // @public

resources/doc/jsdoc.conf.json

@@ -25,7 +25,7 @@
       "package": "package.json",
       "theme_opts": {
         "title": "DWV",
-        "footer": "<i>Documentation generated for dwv v0.36.0.</i>",
+        "footer": "<i>Documentation generated for dwv v0.36.1.</i>",
         "sections": [
           "Tutorials",
           "Namespaces",

resources/doc/tutorials/test-results.md

@@ -2,9 +2,9 @@
 
 ## Context
 
-Commit: [15e8722](https://github.com/ivmartel/dwv/commit/15e87229f378e26dc70b4b5bc1b8425baa732130)
+Commit: [df7a7bf](https://github.com/ivmartel/dwv/commit/df7a7bf25ea43603954fc01ad306f336dd9f450e)
 
-Date: Thu Feb 05 2026 17:32:08 GMT+0100 (Central European Standard Time)
+Date: Fri Feb 20 2026 12:50:29 GMT+0100 (Central European Standard Time)
 
 Environement: jsdom ^28.0.0
 
@@ -13,7 +13,7 @@ Success: 379 ✅
 
 Failed: 0 ❌
 
-(total: 379, skipped: 0, total time: 11234ms)
+(total: 379, skipped: 0, total time: 12286ms)
 
 ## Tests details
 
@@ -1343,3 +1343,4 @@ URS [#DWV-REQ-UI-09-001 (Livewire)](tutorial-user-stories.html#dwv-req-ui-09-001
 
 URS [#DWV-REQ-UI-09-002 (Floodfill)](tutorial-user-stories.html#dwv-req-ui-09-002-floodfill):
  ⚠️ No tests
+

src/app/viewController.js

@@ -666,6 +666,18 @@ export class ViewController {
     return this.getCurrentPosition().mergeWith3D(point3D);
   }
 
+  /**
+   * Check if an input plane point is in the geometrys' bounds.
+   *
+   * @param {Point2D} point2D The point to check.
+   * @returns {boolean} True if in bounds.
+   */
+  validatePlanePoint(point2D) {
+    const pos = this.getPositionFromPlanePoint(point2D);
+    const geometry = this.#view.getImage().getGeometry();
+    return geometry.isInBounds(pos);
+  }
+
   /**
    * Get a 2D plane position from a world position.
    *

src/dicom/dicomCode.js

@@ -375,7 +375,14 @@ export function getConceptNameCode(name) {
   const item = QuantificationName2DictItem[name];
   let code;
   if (typeof item !== 'undefined') {
-    code = getDicomCode(item.key, item.scheme);
+    if (item.scheme === 'DCM') {
+      code = getDcmDicomCode({
+        meaning: name,
+        value: item.key
+      });
+    } else {
+      code = getDicomCode(item.key, item.scheme);
+    }
   }
   return code;
 }

src/dicom/dicomParser.js

@@ -33,7 +33,7 @@ import {logger} from '../utils/logger.js';
  * @returns {string} The version of the library.
  */
 export function getDwvVersion() {
-  return '0.36.0';
+  return '0.36.1';
 }
 
 /**

src/tools/draw.js

@@ -443,6 +443,12 @@ export class Draw {
     }
     const pos = viewLayer.displayToPlanePos(point);
 
+    // validate position
+    const vc = viewLayer.getViewController();
+    if (!vc.validatePlanePoint(pos)) {
+      return;
+    }
+
     // draw line to current pos
     if (Math.abs(pos.getX() - this.#lastPoint.getX()) > 0 ||
       Math.abs(pos.getY() - this.#lastPoint.getY()) > 0) {
@@ -549,6 +555,15 @@ export class Draw {
     this.#finishShapeGroupCreation(layerDetails.groupDivId);
   };
 
+  /**
+   * Handle mouse out event.
+   *
+   * @param {object} event The mouse out event.
+   */
+  mouseout = (event) => {
+    this.mouseup(event);
+  };
+
   /**
    * Handle double click event: some tools use it to finish interaction.
    *
@@ -614,6 +629,12 @@ export class Draw {
     }
     const pos = viewLayer.displayToPlanePos(touchPoints[0]);
 
+    // validate position
+    const vc = viewLayer.getViewController();
+    if (!vc.validatePlanePoint(pos)) {
+      return;
+    }
+
     if (Math.abs(pos.getX() - this.#lastPoint.getX()) > 0 ||
       Math.abs(pos.getY() - this.#lastPoint.getY()) > 0) {
       // clear last added point from the list (but not the first one)