@aics/vole-app 3.4.4 → 3.6.0

package/es/aics-image-viewer/state/test/reset.test.js

@@ -7,10 +7,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { describe, expect, it } from "@jest/globals";
+import { describe, expect, it } from "vitest";
 import { getDefaultCameraState, getDefaultChannelState, getDefaultViewerState } from "../../shared/constants";
-import { ImageType, RenderMode, ViewMode } from "../../shared/enums";
 import { useViewerState } from "../store";
+import { ImageType, RenderMode, ViewMode } from "../types";
 var arbitraryViewerState = function arbitraryViewerState() {
   return {
     viewMode: ViewMode.xy,

package/es/aics-image-viewer/state/test/serialize.test.js

@@ -4,54 +4,48 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { describe, expect, it } from "vitest";
 import { getDefaultCameraState } from "../../shared/constants";
-import { serializeCameraState, serializeViewerChannelSetting, serializeViewerState } from "../serialize";
-import { CUSTOM_TEST_VIEWER_STATE, DEFAULT_TEST_CHANNEL_STATE, DEFAULT_TEST_VIEWER_STATE, SERIALIZED_CUSTOM_TEST_VIEWER_STATE, SERIALIZED_DEFAULT_TEST_CHANNEL_STATE, SERIALIZED_DEFAULT_TEST_VIEWER_STATE } from "./test_data";
-describe("serializeViewerChannelSetting", function () {
+import { cameraStateToSnapshot, channelStateToSnapshot, channelStateToStringSnapshot, objectToKeyValueList, stringifyCameraStateSnapshot, viewerStateToSnapshot, viewerStateToStringSnapshot } from "../serialize";
+import { CUSTOM_TEST_CHANNEL_STATE, CUSTOM_TEST_VIEWER_STATE, DEFAULT_TEST_CHANNEL_STATE, DEFAULT_TEST_VIEWER_STATE, SERIALIZED_CUSTOM_TEST_CHANNEL_STATE, SERIALIZED_CUSTOM_TEST_VIEWER_STATE, SERIALIZED_DEFAULT_TEST_CHANNEL_STATE, SERIALIZED_DEFAULT_TEST_VIEWER_STATE, STRINGIFIED_CUSTOM_TEST_CHANNEL_STATE, STRINGIFIED_CUSTOM_TEST_VIEWER_STATE, STRINGIFIED_DEFAULT_TEST_CHANNEL_STATE, STRINGIFIED_DEFAULT_TEST_VIEWER_STATE } from "./test_data";
+describe("channelStateToSnapshot", function () {
   it("serializes channel settings", function () {
-    expect(serializeViewerChannelSetting(DEFAULT_TEST_CHANNEL_STATE, false)).toEqual(SERIALIZED_DEFAULT_TEST_CHANNEL_STATE);
+    var serialized = channelStateToSnapshot(DEFAULT_TEST_CHANNEL_STATE, false);
+    expect(serialized).toEqual(SERIALIZED_DEFAULT_TEST_CHANNEL_STATE);
   });
   it("serializes custom channel settings", function () {
-    var customChannelState = {
-      name: "a",
-      displayName: "a",
-      color: [3, 255, 157],
-      volumeEnabled: false,
-      isosurfaceEnabled: false,
-      isovalue: 0,
-      opacity: 0.54,
-      colorizeEnabled: false,
-      colorizeAlpha: 1.0,
-      useControlPoints: false,
-      controlPoints: [],
-      ramp: [0, 255],
-      // TODO: the settings below are not serialized. should they be? (see #384)
-      plotMin: 0,
-      plotMax: 255,
-      keepIntensityRange: false
-    };
-    var serializedCustomChannelState = {
-      col: "03ff9d",
-      ven: "0",
-      sen: "0",
-      isv: "0",
-      isa: "0.54",
-      clz: "0",
-      cza: "1",
-      cpe: "0",
-      cpt: "",
-      ram: "0:255",
-      pin: "0"
-    };
-    expect(serializeViewerChannelSetting(customChannelState, false)).toEqual(serializedCustomChannelState);
+    var serialized = channelStateToSnapshot(CUSTOM_TEST_CHANNEL_STATE, false);
+    expect(serialized).toEqual(SERIALIZED_CUSTOM_TEST_CHANNEL_STATE);
+  });
+});
+describe("channelStateToStringSnapshot", function () {
+  it("serializes channel settings", function () {
+    var serialized = channelStateToStringSnapshot(DEFAULT_TEST_CHANNEL_STATE, false);
+    expect(serialized).toEqual(STRINGIFIED_DEFAULT_TEST_CHANNEL_STATE);
+  });
+  it("serializes custom channel settings", function () {
+    var serialized = channelStateToStringSnapshot(CUSTOM_TEST_CHANNEL_STATE, false);
+    expect(serialized).toEqual(STRINGIFIED_CUSTOM_TEST_CHANNEL_STATE);
   });
 });
-describe("serializeViewerState", function () {
+describe("viewerStateToSnapshot", function () {
   it("serializes the default viewer settings", function () {
-    expect(serializeViewerState(DEFAULT_TEST_VIEWER_STATE, false)).toEqual(SERIALIZED_DEFAULT_TEST_VIEWER_STATE);
+    var serialized = viewerStateToSnapshot(DEFAULT_TEST_VIEWER_STATE, false);
+    expect(serialized).toEqual(SERIALIZED_DEFAULT_TEST_VIEWER_STATE);
   });
   it("serializes custom viewer settings", function () {
-    expect(serializeViewerState(CUSTOM_TEST_VIEWER_STATE, false)).toEqual(SERIALIZED_CUSTOM_TEST_VIEWER_STATE);
+    var serialized = viewerStateToSnapshot(CUSTOM_TEST_VIEWER_STATE, false);
+    expect(serialized).toEqual(SERIALIZED_CUSTOM_TEST_VIEWER_STATE);
+  });
+});
+describe("viewerStateToStringSnapshot", function () {
+  it("serializes the default viewer settings", function () {
+    var serialized = viewerStateToStringSnapshot(DEFAULT_TEST_VIEWER_STATE, false);
+    expect(serialized).toEqual(STRINGIFIED_DEFAULT_TEST_VIEWER_STATE);
+  });
+  it("serializes custom viewer settings", function () {
+    var serialized = viewerStateToStringSnapshot(CUSTOM_TEST_VIEWER_STATE, false);
+    expect(serialized).toEqual(STRINGIFIED_CUSTOM_TEST_VIEWER_STATE);
   });
   it("shortens long numbers in the slice and region parameters", function () {
     // Floats should be rounded to 7 significant digits or less
@@ -67,20 +61,25 @@ describe("serializeViewerState", function () {
         z: 0.677402
       }
     };
-    var serializedState = serializeViewerState(state, true);
+    var serializedState = viewerStateToStringSnapshot(state, true);
     expect(serializedState.reg).toEqual("0.4566667:0.8667332,0.5:0.8999999,0.3:0.1646788");
     expect(serializedState.slice).toEqual("0.4111119,0.5,0.677402");
   });
 });
 describe("Camera state", function () {
   it("uses default camera state when choosing elements to exclude/ignore", function () {
-    var cameraState = _objectSpread({}, getDefaultCameraState());
+    var cameraState = getDefaultCameraState();
     // No changes from default
-    expect(serializeCameraState(cameraState, true)).toEqual(undefined);
+    expect(cameraStateToSnapshot(cameraState, true)).toEqual(undefined);
     cameraState = _objectSpread(_objectSpread({}, cameraState), {}, {
       position: [1, 2, 3]
     });
-    expect(serializeCameraState(cameraState, true)).toEqual("pos:1:2:3");
+    var snapshot = cameraStateToSnapshot(cameraState, true);
+    expect(snapshot).toEqual({
+      pos: [1, 2, 3]
+    });
+    var stringified = stringifyCameraStateSnapshot(snapshot);
+    expect(objectToKeyValueList(stringified)).toEqual("pos:1:2:3");
   });
   it("default camera state has not been changed", function () {
     // The default camera state should NOT change unless backwards compatibility

package/es/aics-image-viewer/state/test/test_data.js

@@ -1,4 +1,4 @@
-import { ImageType, RenderMode, ViewMode } from "../../shared/enums";
+import { ImageType, ImageTypeSnapshot, RenderMode, RenderModeSnapshot, ViewMode, ViewModeSnapshot } from "../types";
 export var DEFAULT_TEST_VIEWER_STATE = {
   viewMode: ViewMode.threeD,
   // "XY", "XZ", "YZ"
@@ -34,6 +34,29 @@ export var DEFAULT_TEST_VIEWER_STATE = {
   scaleLevelIndex: 0
 };
 export var SERIALIZED_DEFAULT_TEST_VIEWER_STATE = {
+  mode: RenderModeSnapshot.volumetric,
+  view: ViewModeSnapshot.threeD,
+  image: ImageTypeSnapshot.segmentedCell,
+  axes: false,
+  bb: false,
+  bgcol: "000000",
+  bbcol: "ffffff",
+  rot: false,
+  mask: 0,
+  bright: 70,
+  dens: 50,
+  lvl: [35, 140, 255],
+  interp: true,
+  reg: [[0, 1], [0, 1], [0, 1]],
+  slice: [0.5, 0.5, 0.5],
+  t: 0,
+  scene: 0,
+  scm: false,
+  sci: 0,
+  esl: false,
+  scl: 0
+};
+export var STRINGIFIED_DEFAULT_TEST_VIEWER_STATE = {
   mode: "volumetric",
   view: "3D",
   image: "cell",
@@ -95,6 +118,36 @@ export var CUSTOM_TEST_VIEWER_STATE = {
   }
 };
 export var SERIALIZED_CUSTOM_TEST_VIEWER_STATE = {
+  mode: RenderModeSnapshot.pathTrace,
+  view: ViewModeSnapshot.xy,
+  image: ImageTypeSnapshot.fullField,
+  axes: true,
+  bb: true,
+  bgcol: "ff0000",
+  bbcol: "00ff00",
+  rot: true,
+  mask: 55,
+  bright: 100,
+  dens: 75,
+  lvl: [0, 250, 251],
+  interp: false,
+  reg: [[0, 0.5], [0, 1], [0, 1]],
+  slice: [0.25, 0.75, 0.5],
+  t: 100,
+  scene: 3,
+  scm: true,
+  sci: 3,
+  esl: true,
+  scl: 3,
+  cam: {
+    pos: [-1.05, -4, 45],
+    tar: [0, 0, 0],
+    up: [0, 1, 0],
+    ort: 3.534,
+    fov: 43.5
+  }
+};
+export var STRINGIFIED_CUSTOM_TEST_VIEWER_STATE = {
   mode: "pathtrace",
   view: "Z",
   image: "fov",
@@ -144,6 +197,27 @@ export var DEFAULT_TEST_CHANNEL_STATE = {
   keepIntensityRange: false
 };
 export var SERIALIZED_DEFAULT_TEST_CHANNEL_STATE = {
+  col: "ff0000",
+  ven: true,
+  sen: true,
+  isv: 128,
+  isa: 0.75,
+  clz: true,
+  cza: 0.5,
+  cpe: false,
+  cpt: [{
+    x: 0,
+    opacity: 0.5,
+    color: "1"
+  }, {
+    x: 255,
+    opacity: 1,
+    color: "326496"
+  }],
+  ram: [0, 255],
+  pin: false
+};
+export var STRINGIFIED_DEFAULT_TEST_CHANNEL_STATE = {
   col: "ff0000",
   ven: "1",
   sen: "1",
@@ -156,6 +230,50 @@ export var SERIALIZED_DEFAULT_TEST_CHANNEL_STATE = {
   ram: "0:255",
   pin: "0"
 };
+export var CUSTOM_TEST_CHANNEL_STATE = {
+  name: "a",
+  displayName: "a",
+  color: [3, 255, 157],
+  volumeEnabled: false,
+  isosurfaceEnabled: false,
+  isovalue: 0,
+  opacity: 0.54,
+  colorizeEnabled: false,
+  colorizeAlpha: 1.0,
+  useControlPoints: false,
+  controlPoints: [],
+  ramp: [0, 255],
+  // TODO: the settings below are not serialized. should they be? (see #384)
+  plotMin: 0,
+  plotMax: 255,
+  keepIntensityRange: false
+};
+export var SERIALIZED_CUSTOM_TEST_CHANNEL_STATE = {
+  col: "03ff9d",
+  ven: false,
+  sen: false,
+  isv: 0,
+  isa: 0.54,
+  clz: false,
+  cza: 1,
+  cpe: false,
+  cpt: [],
+  ram: [0, 255],
+  pin: false
+};
+export var STRINGIFIED_CUSTOM_TEST_CHANNEL_STATE = {
+  col: "03ff9d",
+  ven: "0",
+  sen: "0",
+  isv: "0",
+  isa: "0.54",
+  clz: "0",
+  cza: "1",
+  cpe: "0",
+  cpt: "",
+  ram: "0:255",
+  pin: "0"
+};
 export var DEFAULT_TEST_VIEWER_CHANNEL_SETTING = {
   match: 0,
   color: undefined,