@kitware/vtk.js 26.0.0-beta.1 → 26.0.0-beta.3

package/Widgets/Widgets3D/LineWidget/behavior.js

@@ -1,13 +1,9 @@
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import Constants from './Constants.js';
 import macro from '../../../macros.js';
 import { s as subtract, l as add, m as normalize } from '../../../Common/Core/Math/index.js';
 import { getNumberOfPlacedHandles, isHandlePlaced, calculateTextPosition, updateTextPosition, getPoint } from './helpers.js';
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var ShapeType = Constants.ShapeType; // Total number of points to place
 
 var MAX_POINTS = 2;
@@ -70,44 +66,6 @@ function widgetBehavior(publicAPI, model) {
   // Text methods
   // --------------------------------------------------------------------------
 
-  /**
-   * check for handle 2 position in comparison to handle 1 position
-   * and sets text offset to not overlap on the line representation
-   */
-
-
-  function getOffsetDirectionForTextPosition() {
-    var pos1 = publicAPI.getHandle(0).getOrigin();
-    var pos2 = publicAPI.getHandle(1).getOrigin();
-    var dySign = 1;
-
-    if (pos1 && pos2) {
-      if (pos1[0] <= pos2[0]) {
-        dySign = pos1[1] <= pos2[1] ? 1 : -1;
-      } else {
-        dySign = pos1[1] <= pos2[1] ? -1 : 1;
-      }
-    }
-
-    return dySign;
-  }
-  /**
-   * place SVGText on line according to both handle positions
-   * which purpose is to never have text representation overlapping
-   * on PolyLine representation
-   * */
-
-
-  publicAPI.placeText = function () {
-    var dySign = getOffsetDirectionForTextPosition();
-
-    var textPropsCp = _objectSpread({}, model.representations[3].getTextProps());
-
-    textPropsCp.dy = dySign * Math.abs(textPropsCp.dy);
-    model.representations[3].setTextProps(textPropsCp);
-
-    model._interactor.render();
-  };
 
   publicAPI.setText = function (text) {
     model.widgetState.getText().setText(text);
@@ -211,7 +169,6 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (handleIndex === 1) {
-      publicAPI.placeText();
       publicAPI.loseFocus();
     }
   }; // --------------------------------------------------------------------------
@@ -289,7 +246,6 @@ function widgetBehavior(publicAPI, model) {
     if (model._isDragging && publicAPI.isPlaced()) {
       var wasTextActive = model.widgetState.getText().getActive(); // Recompute offsets
 
-      publicAPI.placeText();
       model.widgetState.deactivate();
       model.activeState = null;
 

package/Widgets/Widgets3D/LineWidget.js

@@ -5,7 +5,6 @@ import generateState from './LineWidget/state.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkArrowHandleRepresentation from '../Representations/ArrowHandleRepresentation.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
-import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import vtkPolyLineRepresentation from '../Representations/PolyLineRepresentation.js';
 import widgetBehavior from './LineWidget/behavior.js';
 import { Behavior } from '../Representations/WidgetRepresentation/Constants.js';
@@ -107,16 +106,6 @@ function vtkLineWidget(publicAPI, model) {
               }
             }
           }
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            text: '',
-            textProps: {
-              dx: 12,
-              dy: -12
-            }
-          },
-          labels: ['SVGtext']
         }, {
           builder: vtkPolyLineRepresentation,
           labels: ['handle1', 'handle2', 'moveHandle'],

package/Widgets/Widgets3D/PolyLineWidget.js

@@ -4,7 +4,6 @@ import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkPolyLineRepresentation from '../Representations/PolyLineRepresentation.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
-import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import widgetBehavior from './PolyLineWidget/behavior.js';
 import generateState from './PolyLineWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
@@ -36,15 +35,6 @@ function vtkPolyLineWidget(publicAPI, model) {
         }, {
           builder: vtkSphereHandleRepresentation,
           labels: ['moveHandle']
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            textProps: {
-              dx: 12,
-              dy: -12
-            }
-          },
-          labels: ['handles']
         }, {
           builder: vtkPolyLineRepresentation,
           labels: ['handles', 'moveHandle']

package/Widgets/Widgets3D/RectangleWidget.js

@@ -5,7 +5,6 @@ import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkShapeWidget from './ShapeWidget.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
 import vtkRectangleContextRepresentation from '../Representations/RectangleContextRepresentation.js';
-import vtkSVGLandmarkRepresentation from '../SVG/SVGLandmarkRepresentation.js';
 import widgetBehavior from './RectangleWidget/behavior.js';
 import generateState from './RectangleWidget/state.js';
 import { BehaviorCategory, ShapeBehavior } from './ShapeWidget/Constants.js';
@@ -34,12 +33,6 @@ function vtkRectangleWidget(publicAPI, model) {
         }, {
           builder: vtkRectangleContextRepresentation,
           labels: ['rectangleHandle']
-        }, {
-          builder: vtkSVGLandmarkRepresentation,
-          initialValues: {
-            text: ''
-          },
-          labels: ['SVGtext']
         }];
     }
   }; // --------------------------------------------------------------------------

package/Widgets/Widgets3D/ShapeWidget.js

@@ -12,7 +12,7 @@ function vtkShapeWidget(publicAPI, model) {
 
   var superClass = _objectSpread({}, publicAPI);
 
-  model.methodsToLink = ['scaleInPixels', 'textProps', 'fontProperties'];
+  model.methodsToLink = ['scaleInPixels'];
 
   publicAPI.setManipulator = function (manipulator) {
     superClass.setManipulator(manipulator);

package/index.d.ts

@@ -26,6 +26,7 @@
 /// <reference path="./Common/DataModel/DataSet.d.ts" />
 /// <reference path="./Common/DataModel/DataSetAttributes/FieldData.d.ts" />
 /// <reference path="./Common/DataModel/DataSetAttributes.d.ts" />
+/// <reference path="./Common/DataModel/EdgeLocator.d.ts" />
 /// <reference path="./Common/DataModel/ITKHelper.d.ts" />
 /// <reference path="./Common/DataModel/ImageData.d.ts" />
 /// <reference path="./Common/DataModel/IncrementalOctreeNode.d.ts" />

package/macros.d.ts

@@ -172,17 +172,19 @@ export function get(publicAPI: object, model: object, fieldNames: Array<string>)
  * @param publicAPI object on which public methods get attached to
  * @param model object on which protected fields are stored
  * @param fieldNames list of fields available in model that we want to expose as set{FieldName} methods on the publicAPI
+ * * Can be a string (the name of the field to expose) or an object (e.g. {type:enum, name: {FieldName}, enum: FieldEnum}).
  */
-export function set(publicAPI: object, model: object, fields: Array<string>): void;
+export function set(publicAPI: object, model: object, fields: Array<string|object>): void;
 
 /**
  * Add setter+getter methods to the provided publicAPI
  *
  * @param publicAPI object on which public methods get attached to
  * @param model object on which protected fields are stored
- * @param fieldNames list of fields available in model that we want to expose as set{FieldName}+get{FieldName} methods on the publicAPI
+ * @param fieldNames list of fields available in model that we want to expose as set{FieldName}+get{FieldName} methods on the publicAPI.
+ * Can be a string (the name of the field to expose) or an object (e.g. {type:enum, name: {FieldName}, enum: FieldEnum}).
  */
-export function setGet(publicAPI: object, model: object, fields: Array<string>): void;
+export function setGet(publicAPI: object, model: object, fields: Array<string|object>): void;
 
 /**
  * Add getter methods to the provided publicAPI for arrays.

package/macros.js

@@ -3,6 +3,7 @@ import _typeof from '@babel/runtime/helpers/typeof';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _construct from '@babel/runtime/helpers/construct';
+import DeepEqual from 'fast-deep-equal';
 import vtk, { vtkGlobal } from './vtk.js';
 import ClassHierarchy from './Common/Core/ClassHierarchy.js';
 
@@ -233,7 +234,13 @@ function obj() {
   if (!('classHierarchy' in model)) {
     model.classHierarchy = new ClassHierarchy('vtkObject');
   } else if (!(model.classHierarchy instanceof ClassHierarchy)) {
-    model.classHierarchy = ClassHierarchy.from(model.classHierarchy);
+    var hierarchy = new ClassHierarchy();
+
+    for (var i = 0; i < model.classHierarchy.length; i++) {
+      hierarchy.push(model.classHierarchy[i]);
+    }
+
+    model.classHierarchy = hierarchy;
   }
 
   function off(index) {
@@ -437,12 +444,25 @@ function obj() {
 // getXXX: add getters
 // ----------------------------------------------------------------------------
 
+var objectGetterMap = {
+  object: function object(publicAPI, model, field) {
+    return function getter() {
+      return _objectSpread({}, model[field.name]);
+    };
+  }
+};
 function get(publicAPI, model, fieldNames) {
   fieldNames.forEach(function (field) {
     if (_typeof(field) === 'object') {
-      publicAPI["get".concat(_capitalize(field.name))] = function () {
-        return model[field.name];
-      };
+      var getter = objectGetterMap[field.type];
+
+      if (getter) {
+        publicAPI["get".concat(_capitalize(field.name))] = getter(publicAPI, model, field);
+      } else {
+        publicAPI["get".concat(_capitalize(field.name))] = function () {
+          return model[field.name];
+        };
+      }
     } else {
       publicAPI["get".concat(_capitalize(field))] = function () {
         return model[field];
@@ -491,6 +511,17 @@ var objectSetterMap = {
       vtkErrorMacro("Set Enum with invalid argument (String/Number) ".concat(field, ", ").concat(value));
       throw new TypeError('Set Enum with invalid argument (String/Number)');
     };
+  },
+  object: function object(publicAPI, model, field) {
+    return function (value) {
+      if (!DeepEqual(model[field.name], value)) {
+        model[field.name] = value;
+        publicAPI.modified();
+        return true;
+      }
+
+      return false;
+    };
   }
 };
 
@@ -549,7 +580,7 @@ function setGet(publicAPI, model, fieldNames) {
 function getArray(publicAPI, model, fieldNames) {
   fieldNames.forEach(function (field) {
     publicAPI["get".concat(_capitalize(field))] = function () {
-      return model[field] ? [].concat(model[field]) : model[field];
+      return model[field] ? Array.from(model[field]) : model[field];
     };
 
     publicAPI["get".concat(_capitalize(field), "ByReference")] = function () {
@@ -607,9 +638,11 @@ function setArray(publicAPI, model, fieldNames, size) {
           }
         }
 
-        changeDetected = model[field] == null || model[field].some(function (item, index) {
-          return item !== array[index];
-        }) || model[field].length !== array.length;
+        changeDetected = model[field] == null || model[field].length !== array.length;
+
+        for (var i = 0; !changeDetected && i < array.length; ++i) {
+          changeDetected = model[field][i] !== array[i];
+        }
 
         if (changeDetected && needCopy) {
           array = Array.from(array);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "26.0.0-beta.1",
+  "version": "26.0.0-beta.3",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -33,6 +33,7 @@
     "@babel/runtime": "7.17.9",
     "commander": "9.2.0",
     "d3-scale": "4.0.2",
+    "fast-deep-equal": "^3.1.3",
     "fflate": "0.7.3",
     "gl-matrix": "3.4.3",
     "globalthis": "1.0.3",
@@ -112,6 +113,7 @@
     "rollup-plugin-svgo": "1.1.0",
     "rollup-plugin-web-worker-loader": "1.6.1",
     "semantic-release": "19.0.3",
+    "snabbdom": "^3.5.1",
     "string-replace-loader": "3.1.0",
     "style-loader": "3.3.1",
     "tape": "5.5.3",
@@ -140,6 +142,7 @@
     "doc:publish": "kw-doc -c ./Documentation/config.js -mp",
     "doc:generate-api": "node ./Documentation/generate-api-docs.js",
     "example": "node ./Utilities/ExampleRunner/example-runner-cli.js -c ./Documentation/config.js",
+    "example:webgpu": "cross-env WEBGPU=1 NO_WEBGL=1 node ./Utilities/ExampleRunner/example-runner-cli.js -c ./Documentation/config.js",
     "dev:esm": "npm run build:esm -- -w",
     "dev:umd": "webpack --watch --config webpack.dev.js --progress",
     "build": "npm run build:release",

package/Filters/General/ClipClosedSurface/ccsEdgeLocator.js

@@ -1,40 +0,0 @@
-import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
-import _createClass from '@babel/runtime/helpers/createClass';
-
-var CCSEdgeLocator = /*#__PURE__*/function () {
-  function CCSEdgeLocator() {
-    _classCallCheck(this, CCSEdgeLocator);
-
-    this._edgeMap = new Map();
-  }
-
-  _createClass(CCSEdgeLocator, [{
-    key: "initialize",
-    value: function initialize() {
-      this._edgeMap.clear();
-    }
-  }, {
-    key: "insertUniqueEdge",
-    value: function insertUniqueEdge(i0, i1) {
-      // Generate key, which is unique, since we order the edges
-      var key = i1 < i0 ? "".concat(i1, "-").concat(i0) : "".concat(i0, "-").concat(i1);
-
-      var node = this._edgeMap.get(key);
-
-      if (!node) {
-        // Didn't find key, so add a new edge entry
-        node = {
-          edgeId: -1
-        };
-
-        this._edgeMap.set(key, node);
-      }
-
-      return node;
-    }
-  }]);
-
-  return CCSEdgeLocator;
-}();
-
-export { CCSEdgeLocator as default };

package/Widgets/Core/WidgetManager/vdom.js

@@ -1,172 +0,0 @@
-import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-
-var SVG_XMLNS = 'http://www.w3.org/2000/svg';
-
-function attrDelta(oldObj, newObj) {
-  var set = [];
-  var remove = [];
-  var oldKeysArray = Object.keys(oldObj);
-  var newKeysArray = Object.keys(newObj);
-  var oldKeys = new Set(oldKeysArray);
-  var newKeys = new Set(newKeysArray);
-
-  for (var i = 0; i < oldKeysArray.length; i++) {
-    var key = oldKeysArray[i];
-
-    if (newKeys.has(key)) {
-      if (oldObj[key] !== newObj[key]) {
-        set.push([key, newObj[key]]);
-      }
-    } else {
-      remove.push(key);
-    }
-  }
-
-  for (var _i = 0; _i < newKeysArray.length; _i++) {
-    var _key = newKeysArray[_i];
-
-    if (!oldKeys.has(_key)) {
-      set.push([_key, newObj[_key]]);
-    }
-  }
-
-  return [set, remove];
-}
-
-function render(vnode) {
-  var node = document.createElementNS(SVG_XMLNS, vnode.name);
-  var keys = Object.keys(vnode.attrs);
-
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    node.setAttribute(key, vnode.attrs[key]);
-  } // TODO: support removing event listener (e.g. use snabbdom)
-
-
-  Object.keys(vnode.eventListeners).forEach(function (key) {
-    node.addEventListener(key, vnode.eventListeners[key]);
-  });
-
-  if (vnode.textContent) {
-    node.textContent = vnode.textContent;
-  } else {
-    for (var _i2 = 0; _i2 < vnode.children.length; _i2++) {
-      node.appendChild(render(vnode.children[_i2]));
-    }
-  }
-
-  return node;
-}
-/**
- * Returns a set of patch functions to be applied to a document node.
- *
- * Patch functions must return the effective result node.
- */
-
-function diff(oldVTree, newVTree) {
-  if (newVTree.textContent !== null && newVTree.children.length) {
-    throw new Error('Tree cannot have both children and textContent!');
-  }
-
-  if (!oldVTree) {
-    return [function () {
-      return render(newVTree);
-    }];
-  }
-
-  if (!newVTree) {
-    return [function (node) {
-      return node.remove();
-    }];
-  }
-
-  if (oldVTree.name !== newVTree.name) {
-    return [function (node) {
-      var newNode = render(newVTree);
-      node.replaceWith(newNode);
-      return newNode;
-    }];
-  }
-
-  var patchFns = [];
-
-  var _attrDelta = attrDelta(oldVTree.attrs, newVTree.attrs),
-      _attrDelta2 = _slicedToArray(_attrDelta, 2),
-      attrsSet = _attrDelta2[0],
-      attrsRemove = _attrDelta2[1];
-
-  if (attrsSet.length || attrsRemove.length) {
-    patchFns.push(function (node) {
-      for (var i = 0; i < attrsSet.length; i++) {
-        var _attrsSet$i = _slicedToArray(attrsSet[i], 2),
-            name = _attrsSet$i[0],
-            value = _attrsSet$i[1];
-
-        node.setAttribute(name, value);
-      }
-
-      for (var _i3 = 0; _i3 < attrsRemove.length; _i3++) {
-        var _name = attrsRemove[_i3];
-        node.removeAttribute(_name);
-      }
-
-      return node;
-    });
-  }
-
-  if (oldVTree.textContent !== newVTree.textContent && newVTree.textContent !== null) {
-    patchFns.push(function (node) {
-      node.textContent = newVTree.textContent;
-      return node;
-    });
-  }
-
-  if (newVTree.textContent === null) {
-    var min = Math.min(oldVTree.children.length, newVTree.children.length);
-
-    var _loop = function _loop(i) {
-      var childPatches = diff(oldVTree.children[i], newVTree.children[i]);
-      patchFns.push(function (node) {
-        for (var p = 0; p < childPatches.length; p++) {
-          childPatches[p](node.children[i]);
-        }
-
-        return node;
-      });
-    };
-
-    for (var i = 0; i < min; i++) {
-      _loop(i);
-    }
-
-    if (oldVTree.children.length < newVTree.children.length) {
-      var _loop2 = function _loop2(_i4) {
-        patchFns.push(function (node) {
-          node.appendChild(render(newVTree.children[_i4]));
-          return node;
-        });
-      };
-
-      for (var _i4 = min; _i4 < newVTree.children.length; _i4++) {
-        _loop2(_i4);
-      }
-    } else {
-      var _loop3 = function _loop3(_i5) {
-        patchFns.push(function (node) {
-          node.children[_i5].remove();
-
-          return node;
-        });
-      };
-
-      // always delete nodes in reverse
-      for (var _i5 = oldVTree.children.length - 1; _i5 >= min; _i5--) {
-        _loop3(_i5);
-      }
-    }
-  }
-
-  return patchFns;
-}
-
-export { diff, render };

package/Widgets/SVG/SVGLandmarkRepresentation/Constants.js

@@ -1,28 +0,0 @@
-var VerticalTextAlignment = {
-  TOP: 'TOP',
-  BOTTOM: 'BOTTOM',
-  MIDDLE: 'MIDDLE'
-};
-/**
- * fontSize can be a number or a string representing a size in px
- * @param {Number|String} fontSize
- * @returns Number representing the fontSize in pixels
- */
-
-function fontSizeToPixels(fontProperties) {
-  var defaultFontSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 16;
-
-  if (fontProperties != null && fontProperties.fontSize) {
-    if (typeof fontProperties.fontSize === 'string') {
-      if (fontProperties.fontSize.slice(-2) === 'px') {
-        return window.devicePixelRatio * parseInt(fontProperties.fontSize, 10);
-      }
-    }
-
-    return window.devicePixelRatio * fontProperties.fontSize;
-  }
-
-  return window.devicePixelRatio * defaultFontSize;
-}
-
-export { VerticalTextAlignment, VerticalTextAlignment as default, fontSizeToPixels };