Beta v0.33.0-beta.45

dist/dwv.d.ts

@@ -879,7 +879,7 @@ export declare class DeleteSegmentCommand {
 /**
  * DICOM code: item of a basic code sequence.
  *
- * Ref: {@link https://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_8.8.html}.
+ * Ref: {@link https://dicom.nema.org/medical/dicom/2022a/output/chtml/part03/sect_8.8.html}.
  */
 export declare class DicomCode {
     /**
@@ -1335,11 +1335,11 @@ export declare class DrawLayer {
     /**
      * Fit the layer to its parent container.
      *
-     * @param {number} fitScale1D The 1D fit scale.
-     * @param {Scalar2D} fitSize The fit size as {x,y}.
+     * @param {Scalar2D} containerSize The container size as {x,y}.
+     * @param {number} divToWorldSizeRatio The div to world size ratio.
      * @param {Scalar2D} fitOffset The fit offset as {x,y}.
      */
-    fitToContainer(fitScale1D: number, fitSize: Scalar2D, fitOffset: Scalar2D): void;
+    fitToContainer(containerSize: Scalar2D, divToWorldSizeRatio: number, fitOffset: Scalar2D): void;
     /**
      * Check the visibility of a given group.
      *
@@ -1735,7 +1735,7 @@ export declare function getTypedArray(bitsAllocated: number, pixelRepresentation
  * Note: Use {@link https://github.com/uuidjs/uuid}?
  *
  * Ref:
- * - {@link http://dicom.nema.org/dicom/2013/output/chtml/part05/chapter_9.html},
+ * - {@link http://dicom.nema.org/medical/dicom/2022a/output/chtml/part05/chapter_9.html},
  * - {@link http://dicomiseasy.blogspot.com/2011/12/chapter-4-dicom-objects-in-chapter-3.html},
  * - {@link https://stackoverflow.com/questions/46304306/how-to-generate-unique-dicom-uid}.
  *
@@ -1748,7 +1748,7 @@ export declare function getUID(tagName: string): string;
  * Check that an input buffer includes the DICOM prefix 'DICM'
  *   after the 128 bytes preamble.
  *
- * Ref: [DICOM File Meta]{@link https://dicom.nema.org/dicom/2013/output/chtml/part10/chapter_7.html#sect_7.1}.
+ * Ref: [DICOM File Meta]{@link https://dicom.nema.org/medical/dicom/2022a/output/chtml/part10/chapter_7.html#sect_7.1}.
  *
  * @param {ArrayBuffer} buffer The buffer to check.
  * @returns {boolean} True if the buffer includes the prefix.
@@ -3677,7 +3677,7 @@ export declare class Tag {
     /**
      * Is the tag group a private tag group ?
      *
-     * See: {@link http://dicom.nema.org/medical/dicom/2015a/output/html/part05.html#sect_7.8}.
+     * See: {@link http://dicom.nema.org/medical/dicom/2022a/output/html/part05.html#sect_7.8}.
      *
      * @returns {boolean} True if the tag group is private,
      *   ie if its group is an odd number.
@@ -4634,11 +4634,11 @@ export declare class ViewLayer {
      */
     getScale(): Scalar2D;
     /**
-     * Get the layer zoom offset.
+     * Get the layer zoom offset without the fit scale.
      *
      * @returns {Scalar2D} The offset as {x,y}.
      */
-    getZoomOffset(): Scalar2D;
+    getAbsoluteZoomOffset(): Scalar2D;
     /**
      * Set the imageSmoothing flag value.
      *
@@ -4755,13 +4755,13 @@ export declare class ViewLayer {
      */
     setScale(newScale: Scalar3D, center?: Point3D): void;
     /**
-     * Initialise the layer scale. Works with a zoom offset that
-     * comes from a equal view layer (size, scale, offset...).
+     * Initialise the layer scale.
      *
      * @param {Scalar3D} newScale The scale as {x,y,z}.
-     * @param {Scalar2D} zoomOffset The zoom offset as {x,y}.
+     * @param {Scalar2D} absoluteZoomOffset The zoom offset as {x,y}
+     *   without the fit scale (as provided by getAbsoluteZoomOffset).
      */
-    initScale(newScale: Scalar3D, zoomOffset: Scalar2D): void;
+    initScale(newScale: Scalar3D, absoluteZoomOffset: Scalar2D): void;
     /**
      * Set the base layer offset. Updates the layer offset.
      *
@@ -4845,11 +4845,11 @@ export declare class ViewLayer {
     /**
      * Fit the layer to its parent container.
      *
+     * @param {Scalar2D} containerSize The fit size as {x,y}.
      * @param {number} divToWorldSizeRatio The div to world size ratio.
-     * @param {Scalar2D} fitSize The fit size as {x,y}.
      * @param {Scalar2D} fitOffset The fit offset as {x,y}.
      */
-    fitToContainer(divToWorldSizeRatio: number, fitSize: Scalar2D, fitOffset: Scalar2D): void;
+    fitToContainer(containerSize: Scalar2D, divToWorldSizeRatio: number, fitOffset: Scalar2D): void;
     /**
      * Enable and listen to container interaction events.
      */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dwv",
-  "version": "0.33.0-beta.44",
+  "version": "0.33.0-beta.45",
   "description": "DICOM Web Viewer.",
   "keywords": [
     "DICOM",

resources/api/dwv.api.md

@@ -282,7 +282,7 @@ export class DrawLayer {
     deleteDraws(exeCallback: object): void;
     display(flag: boolean): void;
     draw(): void;
-    fitToContainer(fitScale1D: number, fitSize: Scalar2D, fitOffset: Scalar2D): void;
+    fitToContainer(containerSize: Scalar2D, divToWorldSizeRatio: number, fitOffset: Scalar2D): void;
     flipScaleX(): void;
     flipScaleY(): void;
     flipScaleZ(): void;
@@ -974,10 +974,11 @@ export class ViewLayer {
     displayToPlanePos(point2D: Point2D): Point2D;
     displayToPlaneScale(point2D: Point2D): Point2D;
     draw(): void;
-    fitToContainer(divToWorldSizeRatio: number, fitSize: Scalar2D, fitOffset: Scalar2D): void;
+    fitToContainer(containerSize: Scalar2D, divToWorldSizeRatio: number, fitOffset: Scalar2D): void;
     flipScaleX(): void;
     flipScaleY(): void;
     flipScaleZ(): void;
+    getAbsoluteZoomOffset(): Scalar2D;
     getBaseSize(): Scalar2D;
     getDataId(): string;
     getId(): string;
@@ -986,9 +987,8 @@ export class ViewLayer {
     getOpacity(): number;
     getScale(): Scalar2D;
     getViewController(): ViewController;
-    getZoomOffset(): Scalar2D;
     initialise(size: Scalar2D, spacing: Scalar2D, alpha: number): void;
-    initScale(newScale: Scalar3D, zoomOffset: Scalar2D): void;
+    initScale(newScale: Scalar3D, absoluteZoomOffset: Scalar2D): void;
     isVisible(): boolean;
     onimagecontentchange: (event: object) => void;
     onimagegeometrychange: (event: object) => void;

resources/doc/jsdoc.conf.json

@@ -25,7 +25,7 @@
       "package": "package.json",
       "theme_opts": {
         "title": "DWV",
-        "footer": "<i>Documentation generated for dwv v0.33.0-beta.44.</i>",
+        "footer": "<i>Documentation generated for dwv v0.33.0-beta.45.</i>",
         "sections": [
           "Tutorials",
           "Namespaces",
@@ -50,7 +50,7 @@
         "codepen": {
           "enable_for": ["examples"],
           "options": {
-            "js_external": "https://github.com/ivmartel/dwv/releases/download/v0.33.0-beta.44/dwv-0.33.0-beta.44.min.js",
+            "js_external": "https://github.com/ivmartel/dwv/releases/download/v0.33.0-beta.45/dwv-0.33.0-beta.45.min.js",
             "html": "<div id='dwv'><div id='layerGroup0'></div></div>"
           }
         }

src/dicom/dicomParser.js

@@ -38,7 +38,7 @@ import {DataElement} from '../dicom/dataElement';
  * @returns {string} The version of the library.
  */
 export function getDwvVersion() {
-  return '0.33.0-beta.44';
+  return '0.33.0-beta.45';
 }
 
 /**