@kitware/vtk.js 26.9.11 → 26.9.13

package/Common/DataModel/DataSetAttributes/FieldData.js

@@ -78,15 +78,20 @@ function vtkFieldData(publicAPI, model) {
   };
 
   publicAPI.removeArray = function (arrayName) {
-    model.arrays = model.arrays.filter(function (entry) {
-      return arrayName !== entry.data.getName();
+    var index = model.arrays.findIndex(function (array) {
+      return array.getName() === arrayName;
     });
+    return publicAPI.removeArrayByIndex(index);
   };
 
   publicAPI.removeArrayByIndex = function (arrayIdx) {
-    model.arrays = model.arrays.filter(function (entry, idx) {
-      return idx !== arrayIdx;
-    });
+    if (arrayIdx !== -1 && arrayIdx < model.arrays.length) {
+      model.arrays.splice(arrayIdx, 1); // TBD modified() ?
+
+      return true;
+    }
+
+    return false;
   };
 
   publicAPI.getArrays = function () {
@@ -106,15 +111,13 @@ function vtkFieldData(publicAPI, model) {
   };
 
   publicAPI.getArrayWithIndex = function (arrayName) {
-    return model.arrays.reduce(function (a, b, i) {
-      return b.data && b.data.getName() === arrayName ? {
-        array: b.data,
-        index: i
-      } : a;
-    }, {
-      array: null,
-      index: -1
+    var index = model.arrays.findIndex(function (array) {
+      return array.data.getName() === arrayName;
     });
+    return {
+      array: index !== -1 ? model.arrays[index].data : null,
+      index: index
+    };
   };
 
   publicAPI.getArrayByIndex = function (idx) {

package/Common/DataModel/DataSetAttributes.js

@@ -34,6 +34,8 @@ function vtkDataSetAttributes(publicAPI, model) {
 
   model.classHierarchy.push('vtkDataSetAttributes');
 
+  var superClass = _objectSpread({}, publicAPI);
+
   publicAPI.checkNumberOfComponents = function (x) {
     return true;
   }; // TODO
@@ -57,7 +59,8 @@ function vtkDataSetAttributes(publicAPI, model) {
     if (currentAttribute >= 0 && currentAttribute < model.arrays.length) {
       if (model.arrays[currentAttribute] === arr) {
         return currentAttribute;
-      }
+      } // FIXME setting an array actually changes its index
+
 
       publicAPI.removeArrayByIndex(currentAttribute);
     }
@@ -123,39 +126,25 @@ function vtkDataSetAttributes(publicAPI, model) {
 
 
   publicAPI.removeAllArrays = function () {
-    model.arrays = [];
     attrTypes.forEach(function (attType) {
       model["active".concat(attType)] = -1;
     });
-  }; // Override to allow proper handling of active attributes
-
-
-  publicAPI.removeArray = function (arrayName) {
-    model.arrays = model.arrays.filter(function (entry, idx) {
-      if (arrayName === entry.data.getName()) {
-        // Found the array to remove, but is it an active attribute?
-        attrTypes.forEach(function (attType) {
-          if (idx === model["active".concat(attType)]) {
-            model["active".concat(attType)] = -1;
-          }
-        });
-        return false;
-      }
-
-      return true;
-    });
+    superClass.removeAllArrays();
   }; // Override to allow proper handling of active attributes
 
 
   publicAPI.removeArrayByIndex = function (arrayIdx) {
-    model.arrays = model.arrays.filter(function (entry, idx) {
-      return idx !== arrayIdx;
-    });
-    attrTypes.forEach(function (attType) {
-      if (arrayIdx === model["active".concat(attType)]) {
-        model["active".concat(attType)] = -1;
-      }
-    });
+    if (arrayIdx !== -1) {
+      attrTypes.forEach(function (attType) {
+        if (arrayIdx === model["active".concat(attType)]) {
+          model["active".concat(attType)] = -1;
+        } else if (arrayIdx < model["active".concat(attType)]) {
+          model["active".concat(attType)] -= 1;
+        }
+      });
+    }
+
+    return superClass.removeArrayByIndex(arrayIdx);
   };
 
   attrTypes.forEach(function (value) {

package/Filters/Core/PolyDataNormals.js

@@ -79,14 +79,14 @@ function vtkPolyDataNormals(publicAPI, model) {
       numberOfComponents: 3,
       values: outputNormalsData
     });
-    output.setPointData(input.getPointData());
-    output.setCellData(input.getCellData());
-    output.setFieldData(input.getFieldData());
     output.setPoints(input.getPoints());
     output.setVerts(input.getVerts());
     output.setLines(input.getLines());
     output.setPolys(input.getPolys());
     output.setStrips(input.getStrips());
+    output.getPointData().passData(input.getPointData());
+    output.getCellData().passData(input.getCellData());
+    output.getFieldData().passData(input.getFieldData());
     output.getPointData().setNormals(outputNormals);
     outData[0] = output;
   };

package/Interaction/Widgets/OrientationMarkerWidget.js

@@ -38,6 +38,10 @@ function vtkOrientationMarkerWidget(publicAPI, model) {
     }
   }
 
+  model._onParentRendererChanged = function () {
+    return publicAPI.updateViewport();
+  };
+
   publicAPI.computeViewport = function () {
     var parentRen = model.parentRenderer || model._interactor.getCurrentRenderer();
 
@@ -237,16 +241,6 @@ function vtkOrientationMarkerWidget(publicAPI, model) {
     publicAPI.setEnabled(previousState);
   };
 
-  publicAPI.setParentRenderer = function (ren) {
-    var changed = superClass.setParentRenderer(ren);
-
-    if (changed) {
-      publicAPI.updateViewport();
-    }
-
-    return changed;
-  };
-
   publicAPI.getRenderer = function () {
     return selfRenderer;
   };

package/Rendering/Misc/SynchronizableRenderWindow/ObjectManager.js

@@ -282,7 +282,7 @@ function genericUpdater(instance, state, context) {
 
   if (state.arrays) {
     var arraysToBind = [];
-    var promises = state.arrays.map(function (arrayMetadata) {
+    var promises = Object.values(state.arrays).map(function (arrayMetadata) {
       context.start(); // -> start(arrays)
 
       return context.getArray(arrayMetadata.hash, arrayMetadata.dataType, context).then(createNewArrayHandler(instance, arrayMetadata, arraysToBind)).catch(function (error) {
@@ -503,31 +503,41 @@ function removeUnavailableArrays(fields, availableNames) {
 function createDataSetUpdate() {
   var piecesToFetch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return function (instance, state, context) {
-    var _state$arrays;
-
     context.start(); // -> start(dataset-update)
     // Make sure we provide container for std arrays
 
+    var localProperties = _objectSpread({}, state.properties);
+
     if (!state.arrays) {
-      state.arrays = [];
+      state.arrays = {};
     } // Array members
     // => convert old format to generic state.arrays
 
 
-    piecesToFetch.forEach(function (key) {
+    for (var i = 0; i < piecesToFetch.length; i++) {
+      var key = piecesToFetch[i];
+
       if (state.properties[key]) {
         var arrayMeta = state.properties[key];
         arrayMeta.registration = "set".concat(capitalize(key));
-        state.arrays.push(arrayMeta);
-        delete state.properties[key];
+        var arrayKey = "".concat(arrayMeta.hash, "_").concat(arrayMeta.dataType);
+        state.arrays[arrayKey] = arrayMeta;
+        delete localProperties[key];
       }
-    }); // Extract dataset fields
+    } // Extract dataset fields
+
 
     var fieldsArrays = state.properties.fields || [];
 
-    (_state$arrays = state.arrays).push.apply(_state$arrays, _toConsumableArray(fieldsArrays));
+    for (var _i2 = 0; _i2 < fieldsArrays.length; _i2++) {
+      var _arrayMeta = fieldsArrays[_i2];
 
-    delete state.properties.fields; // Reset any pre-existing fields array
+      var _arrayKey = "".concat(_arrayMeta.hash, "_").concat(_arrayMeta.dataType);
+
+      state.arrays[_arrayKey] = _arrayMeta;
+    }
+
+    delete localProperties.fields; // Reset any pre-existing fields array
 
     var arrayToKeep = {
       pointData: new Set(),
@@ -542,7 +552,10 @@ function createDataSetUpdate() {
     removeUnavailableArrays(instance.getPointData(), arrayToKeep.pointData);
     removeUnavailableArrays(instance.getCellData(), arrayToKeep.cellData); // Generic handling
 
-    var res = genericUpdater(instance, state, context); // Finish what we started
+    var cleanState = _objectSpread({}, state);
+
+    cleanState.properties = localProperties;
+    var res = genericUpdater(instance, cleanState, context); // Finish what we started
 
     context.end(); // -> end(dataset-update)
 

package/Rendering/OpenGL/Texture.js

@@ -2,7 +2,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import Constants from './Texture/Constants.js';
 import HalfFloat from '../../Common/Core/HalfFloat.js';
 import { newInstance as newInstance$1, obj, set, setGet, get, moveToProtected, newTypedArray, vtkDebugMacro as vtkDebugMacro$1, vtkErrorMacro as vtkErrorMacro$1, vtkWarningMacro as vtkWarningMacro$1 } from '../../macros.js';
-import vtkDataArray from '../../Common/Core/DataArray.js';
+import vtkDataArray, { STATIC } from '../../Common/Core/DataArray.js';
 import { Q as isPowerOfTwo, M as nearestPowerOfTwo } from '../../Common/Core/Math/index.js';
 import vtkViewNode from '../SceneGraph/ViewNode.js';
 import { registerOverride } from './ViewNodeFactory.js';
@@ -1013,36 +1013,21 @@ function vtkOpenGLTexture(publicAPI, model) {
     var max = [];
 
     for (var c = 0; c < numComps; ++c) {
-      min[c] = data[c];
-      max[c] = data[c];
-    }
-
-    var count = 0;
-
-    for (var i = 0; i < numPixelsIn; ++i) {
-      for (var _c = 0; _c < numComps; ++_c) {
-        if (data[count] < min[_c]) {
-          min[_c] = data[count];
-        }
-
-        if (data[count] > max[_c]) {
-          max[_c] = data[count];
-        }
-
-        count++;
-      }
+      var range = STATIC.fastComputeRange(data, c, numComps);
+      min[c] = range.min;
+      max[c] = range.max;
     }
 
     var offset = [];
     var scale = [];
 
-    for (var _c2 = 0; _c2 < numComps; ++_c2) {
-      if (min[_c2] === max[_c2]) {
-        max[_c2] = min[_c2] + 1.0;
+    for (var _c = 0; _c < numComps; ++_c) {
+      if (min[_c] === max[_c]) {
+        max[_c] = min[_c] + 1.0;
       }
 
-      offset[_c2] = min[_c2];
-      scale[_c2] = max[_c2] - min[_c2];
+      offset[_c] = min[_c];
+      scale[_c] = max[_c] - min[_c];
     }
 
     return {
@@ -1188,16 +1173,16 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     if (model._openGLRenderWindow.getWebgl2()) {
       if (model.oglNorm16Ext && !model.useHalfFloat && dataType === VtkDataTypes.SHORT) {
-        for (var _c3 = 0; _c3 < numComps; ++_c3) {
-          model.volumeInfo.scale[_c3] = 32767.0;
+        for (var _c2 = 0; _c2 < numComps; ++_c2) {
+          model.volumeInfo.scale[_c2] = 32767.0;
         }
 
         return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
       }
 
       if (model.oglNorm16Ext && !model.useHalfFloat && dataType === VtkDataTypes.UNSIGNED_SHORT) {
-        for (var _c4 = 0; _c4 < numComps; ++_c4) {
-          model.volumeInfo.scale[_c4] = 65535.0;
+        for (var _c3 = 0; _c3 < numComps; ++_c3) {
+          model.volumeInfo.scale[_c3] = 65535.0;
         }
 
         return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
@@ -1208,8 +1193,8 @@ function vtkOpenGLTexture(publicAPI, model) {
       }
 
       if (dataType === VtkDataTypes.UNSIGNED_CHAR) {
-        for (var _c5 = 0; _c5 < numComps; ++_c5) {
-          model.volumeInfo.scale[_c5] = 255.0;
+        for (var _c4 = 0; _c4 < numComps; ++_c4) {
+          model.volumeInfo.scale[_c4] = 255.0;
         }
 
         return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
@@ -1248,9 +1233,9 @@ function vtkOpenGLTexture(publicAPI, model) {
     var dataTypeToUse = VtkDataTypes.UNSIGNED_CHAR; // unsigned char gets used as is
 
     if (dataType === VtkDataTypes.UNSIGNED_CHAR) {
-      for (var _c6 = 0; _c6 < numComps; ++_c6) {
-        res.offset[_c6] = 0.0;
-        res.scale[_c6] = 255.0;
+      for (var _c5 = 0; _c5 < numComps; ++_c5) {
+        res.offset[_c5] = 0.0;
+        res.scale[_c5] = 255.0;
       }
     } else if (model.context.getExtension('OES_texture_float') && model.context.getExtension('OES_texture_float_linear')) {
       // use float textures scaled to 0.0 to 1.0

package/Widgets/Manipulators/AbstractManipulator.d.ts

@@ -58,7 +58,7 @@ export interface vtkAbstractManipulator extends vtkObject {
     /* ------------------------------------------------------------------- */
 
     /**
-     * Set the user normal. 
+     * Set the user normal.
      * This normal take precedence on the handleNormal and the widgetNormal.
      * This normal should not be set within the widget internal code.
      * @param {Vector3} normal The normal coordinate.

package/Widgets/Representations/GlyphRepresentation.js

@@ -201,9 +201,9 @@ function vtkGlyphRepresentation(publicAPI, model) {
   publicAPI.getRepresentationStates = function () {
     var input = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : model.inputData[0];
     return superClass.getRepresentationStates(input).filter(function (state) {
-      var _state$getOrigin, _state$isVisible;
+      var _state$getOrigin, _state$isVisible, _state$isVisible2;
 
-      return ((_state$getOrigin = state.getOrigin) === null || _state$getOrigin === void 0 ? void 0 : _state$getOrigin.call(state)) && ((_state$isVisible = state.isVisible) === null || _state$isVisible === void 0 ? void 0 : _state$isVisible.call(state));
+      return ((_state$getOrigin = state.getOrigin) === null || _state$getOrigin === void 0 ? void 0 : _state$getOrigin.call(state)) && ((_state$isVisible = (_state$isVisible2 = state.isVisible) === null || _state$isVisible2 === void 0 ? void 0 : _state$isVisible2.call(state)) !== null && _state$isVisible !== void 0 ? _state$isVisible : true);
     });
   }; // --------------------------------------------------------------------------
 

package/Widgets/Representations/WidgetRepresentation.js

@@ -16,6 +16,25 @@ var vtkErrorMacro = macro.vtkErrorMacro,
     vtkWarningMacro = macro.vtkWarningMacro; // ----------------------------------------------------------------------------
 
 var STYLE_CATEGORIES = ['active', 'inactive', 'static'];
+
+function applyCoincidentTopologyParametersToMapper(mapper, parameters) {
+  if (mapper && mapper.setResolveCoincidentTopologyToPolygonOffset) {
+    mapper.setResolveCoincidentTopologyToPolygonOffset();
+    CATEGORIES.forEach(function (category) {
+      if (parameters[category]) {
+        var methodName = "setRelativeCoincidentTopology".concat(category, "OffsetParameters");
+
+        if (mapper[methodName]) {
+          var _parameters$category = parameters[category],
+              factor = _parameters$category.factor,
+              offset = _parameters$category.offset;
+          mapper[methodName](factor, offset);
+        }
+      }
+    });
+  }
+}
+
 function mergeStyles(elementNames) {
   for (var _len = arguments.length, stylesToMerge = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     stylesToMerge[_key - 1] = arguments[_key];
@@ -151,16 +170,20 @@ function allocateArray(polyData, name, numberOfTuples, dataType, numberOfCompone
 
 function vtkWidgetRepresentation(publicAPI, model) {
   // Set our className
-  model.classHierarchy.push('vtkWidgetRepresentation');
-
-  var superclass = _objectSpread({}, publicAPI); // Internal cache
-
+  model.classHierarchy.push('vtkWidgetRepresentation'); // Internal cache
 
   var cache = {
     mtimes: {},
     states: []
+  };
+
+  model._onCoincidentTopologyParametersChanged = function () {
+    publicAPI.getActors().forEach(function (actor) {
+      applyCoincidentTopologyParametersToMapper(actor.getMapper(), model.coincidentTopologyParameters);
+    });
   }; // --------------------------------------------------------------------------
 
+
   publicAPI.getActors = function () {
     return model.actors;
   };
@@ -245,25 +268,7 @@ function vtkWidgetRepresentation(publicAPI, model) {
         model.alwaysVisibleActors[_i].setVisibility(true);
       }
     }
-  };
-
-  function applyCoincidentTopologyParametersToMapper(mapper, parameters) {
-    if (mapper && mapper.setResolveCoincidentTopologyToPolygonOffset) {
-      mapper.setResolveCoincidentTopologyToPolygonOffset();
-      CATEGORIES.forEach(function (category) {
-        if (parameters[category]) {
-          var methodName = "setRelativeCoincidentTopology".concat(category, "OffsetParameters");
-
-          if (mapper[methodName]) {
-            var _parameters$category = parameters[category],
-                factor = _parameters$category.factor,
-                offset = _parameters$category.offset;
-            mapper[methodName](factor, offset);
-          }
-        }
-      });
-    }
-  } // Add warning to model.actors.push
+  }; // Add warning to model.actors.push
 
 
   model.actors.push = function () {
@@ -281,16 +286,6 @@ function vtkWidgetRepresentation(publicAPI, model) {
   publicAPI.addActor = function (actor) {
     applyCoincidentTopologyParametersToMapper(actor.getMapper(), model.coincidentTopologyParameters);
     Array.prototype.push.apply(model.actors, [actor]);
-  };
-
-  publicAPI.setCoincidentTopologyParameters = function (parameters) {
-    var modified = superclass.setCoincidentTopologyParameters(parameters);
-
-    if (modified) {
-      publicAPI.getActors().forEach(function (actor) {
-        applyCoincidentTopologyParametersToMapper(actor.getMapper(), model.coincidentTopologyParameters);
-      });
-    }
   }; // Make sure setting the labels at build time works with string/array...
 
 

package/Widgets/Widgets3D/AngleWidget.js

@@ -16,13 +16,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 // ----------------------------------------------------------------------------
 
 function vtkAngleWidget(publicAPI, model) {
-  model.classHierarchy.push('vtkAngleWidget');
-
-  var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
-
+  model.classHierarchy.push('vtkAngleWidget'); // --- Widget Requirement ---------------------------------------------------
 
   model.methodsToLink = ['activeScaleFactor', 'activeColor', 'useActiveColor', 'glyphResolution', 'defaultScale', 'scaleInPixels'];
 
+  model._onManipulatorChanged = function () {
+    model.widgetState.getMoveHandle().setManipulator(model.manipulator);
+    model.widgetState.getHandleList().forEach(function (handle) {
+      handle.setManipulator(model.manipulator);
+    });
+  };
+
   publicAPI.getRepresentationsForViewType = function (viewType) {
     switch (viewType) {
       case ViewTypes.DEFAULT:
@@ -58,14 +62,6 @@ function vtkAngleWidget(publicAPI, model) {
     subtract(handles[0].getOrigin(), handles[1].getOrigin(), vec1);
     subtract(handles[2].getOrigin(), handles[1].getOrigin(), vec2);
     return angleBetweenVectors(vec1, vec2);
-  };
-
-  publicAPI.setManipulator = function (manipulator) {
-    superClass.setManipulator(manipulator);
-    model.widgetState.getMoveHandle().setManipulator(manipulator);
-    model.widgetState.getHandleList().forEach(function (handle) {
-      handle.setManipulator(manipulator);
-    });
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------

package/macros.js

@@ -480,6 +480,7 @@ function get(publicAPI, model, fieldNames) {
 
 var objectSetterMap = {
   enum: function _enum(publicAPI, model, field) {
+    var onChanged = "_on".concat(_capitalize(field.name), "Changed");
     return function (value) {
       if (typeof value === 'string') {
         if (field.enum[value] !== undefined) {
@@ -501,7 +502,11 @@ var objectSetterMap = {
           if (Object.keys(field.enum).map(function (key) {
             return field.enum[key];
           }).indexOf(value) !== -1) {
+            var _model$onChanged;
+
+            var previousValue = model[field.name];
             model[field.name] = value;
+            (_model$onChanged = model[onChanged]) === null || _model$onChanged === void 0 ? void 0 : _model$onChanged.call(model, publicAPI, model, value, previousValue);
             publicAPI.modified();
             return true;
           }
@@ -518,9 +523,14 @@ var objectSetterMap = {
     };
   },
   object: function object(publicAPI, model, field) {
+    var onChanged = "_on".concat(_capitalize(field.name), "Changed");
     return function (value) {
       if (!DeepEqual(model[field.name], value)) {
+        var _model$onChanged2;
+
+        var previousValue = model[field.name];
         model[field.name] = value;
+        (_model$onChanged2 = model[onChanged]) === null || _model$onChanged2 === void 0 ? void 0 : _model$onChanged2.call(model, publicAPI, model, value, previousValue);
         publicAPI.modified();
         return true;
       }
@@ -545,6 +555,7 @@ function findSetter(field) {
   }
 
   return function getSetter(publicAPI, model) {
+    var onChanged = "_on".concat(_capitalize(field), "Changed");
     return function setter(value) {
       if (model.deleted) {
         vtkErrorMacro('instance deleted - cannot call any method');
@@ -552,7 +563,11 @@ function findSetter(field) {
       }
 
       if (model[field] !== value) {
+        var _model$onChanged3;
+
+        var previousValue = model[field.name];
         model[field] = value;
+        (_model$onChanged3 = model[onChanged]) === null || _model$onChanged3 === void 0 ? void 0 : _model$onChanged3.call(model, publicAPI, model, value, previousValue);
         publicAPI.modified();
         return true;
       }
@@ -605,6 +620,8 @@ function setArray(publicAPI, model, fieldNames, size) {
       throw new RangeError("Invalid initial number of values for array (".concat(field, ")"));
     }
 
+    var onChanged = "_on".concat(_capitalize(field), "Changed");
+
     publicAPI["set".concat(_capitalize(field))] = function () {
       if (model.deleted) {
         vtkErrorMacro('instance deleted - cannot call any method');
@@ -655,7 +672,11 @@ function setArray(publicAPI, model, fieldNames, size) {
       }
 
       if (changeDetected) {
+        var _model$onChanged4;
+
+        var previousValue = model[field.name];
         model[field] = array;
+        (_model$onChanged4 = model[onChanged]) === null || _model$onChanged4 === void 0 ? void 0 : _model$onChanged4.call(model, publicAPI, model, array, previousValue);
         publicAPI.modified();
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "26.9.11",
+  "version": "26.9.13",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",