Merge branch 'v0.32'

ivmartel · Apr 17, 2024 · 042253e · 042253e
2 parents 085f3db + 7786d92
commit 042253e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.32.5](https://github.com/ivmartel/dwv/releases/tag/v0.32.5) - 17/04/2024
+
+### Fixed
+
+- Image does not completely fill div [#1655](https://github.com/ivmartel/dwv/issues/1655)
+
 ## [v0.32.4](https://github.com/ivmartel/dwv/releases/tag/v0.32.4) - 18/03/2024
 
 ### Fixed

diff --git a/dist/dwv.min.js b/dist/dwv.min.js
diff --git a/dist/dwv.min.js.map b/dist/dwv.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dwv",
-  "version": "0.32.4",
+  "version": "0.32.5",
   "description": "DICOM Web Viewer.",
   "keywords": [
     "DICOM",

diff --git a/resources/doc/jsdoc.conf.json b/resources/doc/jsdoc.conf.json
@@ -25,7 +25,7 @@
       "package": "package.json",
       "theme_opts": {
         "title": "DWV",
-        "footer": "<i>Documentation generated for dwv v0.32.4.</i>",
+        "footer": "<i>Documentation generated for dwv v0.32.5.</i>",
         "sections": [
           "Tutorials",
           "Namespaces",
@@ -50,7 +50,7 @@
         "codepen": {
           "enable_for": ["examples"],
           "options": {
-            "js_external": "https://github.com/ivmartel/dwv/releases/download/v0.32.4/dwv-0.32.4.min.js",
+            "js_external": "https://github.com/ivmartel/dwv/releases/download/v0.32.5/dwv-0.32.5.min.js",
             "html": "<div id='dwv'><div id='layerGroup0'></div></div>"
           }
         }

diff --git a/src/dicom/dicomParser.js b/src/dicom/dicomParser.js
@@ -31,7 +31,7 @@ import {DataElement} from '../dicom/dataElement';
  * @returns {string} The version of the library.
  */
 export function getDwvVersion() {
-  return '0.32.4';
+  return '0.32.5';
 }
 
 /**

diff --git a/src/gui/layerGroup.js b/src/gui/layerGroup.js
@@ -752,6 +752,14 @@ export class LayerGroup {
     if (typeof maxSize === 'undefined') {
       return undefined;
     }
+    // if the container has a width but no height,
+    // resize it to follow the same ratio to completely
+    // fill the div with the image
+    if (this.#containerDiv.offsetHeight === 0) {
+      const ratioX = this.#containerDiv.offsetWidth / maxSize.x;
+      const height = maxSize.y * ratioX;
+      this.#containerDiv.style.height = height + 'px';
+    }
     // return best fit
     return Math.min(
       this.#containerDiv.offsetWidth / maxSize.x,