Merge branch 'v0.30.8'

changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [v0.30.8](https://github.com/ivmartel/dwv/releases/tag/v0.30.8) - 03/01/2022
+
+### Fixed
+
+- Load state shape does not show on correct slice [#1078](https://github.com/ivmartel/dwv/issues/1078)
+- TypeError: point.get is not a function when loading state [#1077](https://github.com/ivmartel/dwv/issues/1077)
+- Uncaught TypeError: t.getX is not a function when saving state [#1072](https://github.com/ivmartel/dwv/issues/1072)
+
+---
+
 ## [v0.30.7](https://github.com/ivmartel/dwv/releases/tag/v0.30.7) - 28/12/2021
 
 ### Fixed

dist/dwv.js

@@ -1,4 +1,4 @@
-/*! dwv 0.30.7 2021-12-30 11:37:54 */
+/*! dwv 0.30.8 2022-01-04 12:43:27 */
 // Inspired from umdjs
 // See https://github.com/umdjs/umd/blob/master/templates/returnExports.js
 (function (root, factory) {
@@ -718,7 +718,8 @@ dwv.App = function () {
       drawings, drawingsDetails, fireEvent, this.addToUndoStack);
 
     drawController.activateDrawLayer(
-      viewController.getCurrentOrientedPosition());
+      viewController.getCurrentOrientedIndex(),
+      viewController.getScrollIndex());
   };
   /**
    * Update a drawing from its details.
@@ -2680,12 +2681,17 @@ dwv.ctrl.ViewController = function (view) {
    *
    * @returns {dwv.math.Point} The position.
    */
-  this.getCurrentOrientedPosition = function () {
-    var res = view.getCurrentPosition();
+  this.getCurrentOrientedIndex = function () {
+    var res = view.getCurrentIndex();
     // values = orientation * orientedValues
     // -> inv(orientation) * values = orientedValues
     if (typeof view.getOrientation() !== 'undefined') {
-      res = view.getOrientation().getInverse().getAbs().multiplyVector3D(res);
+      var index3D = new dwv.math.Index(
+        [res.get(0), res.get(1), res.get(2)]);
+      var orientedIndex3D =
+         view.getOrientation().getInverse().getAbs().multiplyIndex3D(index3D);
+      var values = orientedIndex3D.getValues();
+      res = new dwv.math.Index(values);
     }
     return res;
   };
@@ -4444,7 +4450,7 @@ dwv.dicom = dwv.dicom || {};
  * @returns {string} The version of the library.
  */
 dwv.getVersion = function () {
-  return '0.30.7';
+  return '0.30.8';
 };
 
 /**
@@ -21033,7 +21039,7 @@ dwv.io.State = function () {
       version: '0.5',
       'window-center': viewController.getWindowLevel().center,
       'window-width': viewController.getWindowLevel().width,
-      position: [position.getX(), position.getY(), position.getZ()],
+      position: position.getValues(),
       scale: app.getAddedScale(),
       offset: app.getOffset(),
       drawings: drawLayer.getKonvaLayer().toObject(),
@@ -21078,9 +21084,7 @@ dwv.io.State = function () {
     // display
     viewController.setWindowLevel(
       data['window-center'], data['window-width']);
-    viewController.setCurrentPosition(
-      new dwv.math.Point3D(
-        data.position[0], data.position[1], data.position[2]), true);
+    viewController.setCurrentPosition(new dwv.math.Point(data.position));
     // apply saved scale on top of current base one
     var baseScale = app.getActiveLayerGroup().getBaseScale();
     var scale = null;

package.json

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

src/app/application.js

@@ -644,7 +644,8 @@ dwv.App = function () {
       drawings, drawingsDetails, fireEvent, this.addToUndoStack);
 
     drawController.activateDrawLayer(
-      viewController.getCurrentOrientedPosition());
+      viewController.getCurrentOrientedIndex(),
+      viewController.getScrollIndex());
   };
   /**
    * Update a drawing from its details.

src/app/viewController.js

@@ -108,12 +108,17 @@ dwv.ctrl.ViewController = function (view) {
    *
    * @returns {dwv.math.Point} The position.
    */
-  this.getCurrentOrientedPosition = function () {
-    var res = view.getCurrentPosition();
+  this.getCurrentOrientedIndex = function () {
+    var res = view.getCurrentIndex();
     // values = orientation * orientedValues
     // -> inv(orientation) * values = orientedValues
     if (typeof view.getOrientation() !== 'undefined') {
-      res = view.getOrientation().getInverse().getAbs().multiplyVector3D(res);
+      var index3D = new dwv.math.Index(
+        [res.get(0), res.get(1), res.get(2)]);
+      var orientedIndex3D =
+         view.getOrientation().getInverse().getAbs().multiplyIndex3D(index3D);
+      var values = orientedIndex3D.getValues();
+      res = new dwv.math.Index(values);
     }
     return res;
   };

src/dicom/dicomParser.js

@@ -9,7 +9,7 @@ dwv.dicom = dwv.dicom || {};
  * @returns {string} The version of the library.
  */
 dwv.getVersion = function () {
-  return '0.30.7';
+  return '0.30.8';
 };
 
 /**

src/io/state.js

@@ -49,7 +49,7 @@ dwv.io.State = function () {
       version: '0.5',
       'window-center': viewController.getWindowLevel().center,
       'window-width': viewController.getWindowLevel().width,
-      position: [position.getX(), position.getY(), position.getZ()],
+      position: position.getValues(),
       scale: app.getAddedScale(),
       offset: app.getOffset(),
       drawings: drawLayer.getKonvaLayer().toObject(),
@@ -94,9 +94,7 @@ dwv.io.State = function () {
     // display
     viewController.setWindowLevel(
       data['window-center'], data['window-width']);
-    viewController.setCurrentPosition(
-      new dwv.math.Point3D(
-        data.position[0], data.position[1], data.position[2]), true);
+    viewController.setCurrentPosition(new dwv.math.Point(data.position));
     // apply saved scale on top of current base one
     var baseScale = app.getActiveLayerGroup().getBaseScale();
     var scale = null;

tests/state/state.test.js

@@ -111,10 +111,7 @@ dwv.test.checkDrawings = function (drawings, details, version, type, assert) {
       layerKid.attrs.name,
       'position-group',
       'Layer first level is a position group.');
-    var groupId = '#2-114.63';
-    if (version <= 0.4) {
-      groupId = '#2-0';
-    }
+    var groupId = '#2-0';
     assert.equal(
       layerKid.attrs.id,
       groupId,
@@ -417,8 +414,6 @@ dwv.test.checkRulerDrawings = function (layerKids, details, version, assert) {
     }
   ];
 
-  var groupIds = [116.87, 125.85, 134.84, 143.82, 152.81];
-
   for (var i = 0; i < ndraws; ++i) {
     var layerKid = layerKids[i];
     assert.equal(
@@ -429,10 +424,7 @@ dwv.test.checkRulerDrawings = function (layerKids, details, version, assert) {
       layerKid.attrs.name,
       'position-group',
       'Layer first level is a position group.');
-    var groupId = '#2-' + groupIds[i];
-    if (version <= 0.4) {
-      groupId = '#2-' + (i + 1);
-    }
+    var groupId = '#2-' + (i + 1);
     assert.equal(
       layerKid.attrs.id,
       groupId,

tests/state/v0.5/state-arrow.json

@@ -21,7 +21,7 @@
     "children": [
       {
         "attrs": {
-          "id": "#2-114.63",
+          "id": "#2-0",
           "name": "position-group"
         },
         "className": "Group",

tests/state/v0.5/state-arrow_zoom.json

@@ -23,7 +23,7 @@
     "children": [
       {
         "attrs": {
-          "id": "#2-114.63",
+          "id": "#2-0",
           "name": "position-group"
         },
         "className": "Group",

tests/state/v0.5/state-ellipse.json

@@ -22,7 +22,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-114.63"
+          "id": "#2-0"
         },
         "className": "Group",
         "children": [

tests/state/v0.5/state-hand.json

@@ -22,7 +22,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-114.63"
+          "id": "#2-0"
         },
         "className": "Group",
         "children": [

tests/state/v0.5/state-protractor.json

@@ -21,7 +21,7 @@
     "children": [
       {
         "attrs": {
-          "id": "#2-114.63",
+          "id": "#2-0",
           "name": "position-group"
         },
         "className": "Group",

tests/state/v0.5/state-rectangle.json

@@ -22,7 +22,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-114.63"
+          "id": "#2-0"
         },
         "className": "Group",
         "children": [

tests/state/v0.5/state-roi.json

@@ -24,7 +24,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-114.63"
+          "id": "#2-0"
         },
         "className": "Group",
         "children": [

tests/state/v0.5/state-ruler.json

@@ -21,7 +21,7 @@
     "children": [
       {
         "attrs": {
-          "id": "#2-114.63",
+          "id": "#2-0",
           "name": "position-group"
         },
         "className": "Group",

tests/state/v0.5/state-ruler_multi-slice.json

@@ -22,7 +22,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-116.87",
+          "id": "#2-1",
           "visible": false
         },
         "className": "Group",
@@ -118,7 +118,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-125.85",
+          "id": "#2-2",
           "visible": false
         },
         "className": "Group",
@@ -214,7 +214,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-134.84",
+          "id": "#2-3",
           "visible": false
         },
         "className": "Group",
@@ -310,7 +310,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-143.82",
+          "id": "#2-4",
           "visible": false
         },
         "className": "Group",
@@ -406,7 +406,7 @@
       {
         "attrs": {
           "name": "position-group",
-          "id": "#2-152.81"
+          "id": "#2-5"
         },
         "className": "Group",
         "children": [