@kitware/vtk.js 21.5.0 → 21.5.1

package/Rendering/Core/ColorTransferFunction.js

@@ -221,23 +221,32 @@ function vtkColorTransferFunction(publicAPI, model) {
 
   publicAPI.setNodes = function (nodes) {
     if (model.nodes !== nodes) {
+      var before = JSON.stringify(model.nodes);
       model.nodes = nodes;
-      publicAPI.sortAndUpdateRange();
+      var after = JSON.stringify(model.nodes);
+      return publicAPI.sortAndUpdateRange() || before !== after;
     }
+
+    return false;
   }; //----------------------------------------------------------------------------
   // Sort the vector in increasing order, then fill in
   // the Range
 
 
   publicAPI.sortAndUpdateRange = function () {
+    var before = JSON.stringify(model.nodes);
     model.nodes.sort(function (a, b) {
       return a.x - b.x;
     });
+    var after = JSON.stringify(model.nodes);
     var modifiedInvoked = publicAPI.updateRange(); // If range is updated, Modified() has been called, don't call it again.
 
-    if (!modifiedInvoked) {
+    if (!modifiedInvoked && before !== after) {
       publicAPI.modified();
+      return true;
     }
+
+    return modifiedInvoked;
   }; //----------------------------------------------------------------------------
 
 

package/Rendering/Misc/SynchronizableRenderWindow/vtkObjectManager.js

@@ -102,12 +102,29 @@ function bindArrays(arraysToBind) {
 
 function createNewArrayHandler(instance, arrayMetadata, arraysToBind) {
   return function (values) {
+    var regMethod = arrayMetadata.registration ? arrayMetadata.registration : 'addArray';
+    var location = arrayMetadata.location ? instance.getReferenceByName(arrayMetadata.location) : instance; // Try to prevent unncessary modified
+
+    var previousArray = null;
+
+    if (arrayMetadata.location) {
+      previousArray = instance.getReferenceByName(arrayMetadata.location).getArray(arrayMetadata.name);
+    } else {
+      previousArray = instance["get".concat(regMethod.substring(3))]();
+    }
+
+    if (previousArray) {
+      if (previousArray.getData() !== values) {
+        arraysToBind.push([previousArray.setData, [values, arrayMetadata.numberOfComponents]]);
+      }
+
+      return previousArray;
+    }
+
     var vtkClass = arrayMetadata.vtkClass ? arrayMetadata.vtkClass : 'vtkDataArray';
     var array = DATA_ARRAY_MAPPER[vtkClass].newInstance(_objectSpread(_objectSpread({}, arrayMetadata), {}, {
       values: values
     }));
-    var regMethod = arrayMetadata.registration ? arrayMetadata.registration : 'addArray';
-    var location = arrayMetadata.location ? instance.getReferenceByName(arrayMetadata.location) : instance;
     arraysToBind.push([location[regMethod], [array]]);
     return array;
   };
@@ -273,6 +290,11 @@ function genericUpdater(instance, state, context) {
     context.start(); // -> start(arraysToBind)
 
     dependencies.push(Promise.all(promises).then(function () {
+      // Since some arrays are getting updated, we should modify our dataset
+      if (arraysToBind.length) {
+        instance.modified();
+      }
+
       bindArrays(arraysToBind);
       return true;
     }).catch(function (error) {
@@ -429,8 +451,6 @@ function colorTransferFunctionUpdater(instance, state, context) {
   instance.set(_objectSpread(_objectSpread({}, state.properties), {}, {
     nodes: nodes
   }), true);
-  instance.sortAndUpdateRange();
-  instance.modified();
   context.end(); // -> end(colorTransferFunctionUpdater)
 }
 
@@ -454,12 +474,30 @@ function piecewiseFunctionUpdater(instance, state, context) {
   instance.set(_objectSpread(_objectSpread({}, state.properties), {}, {
     nodes: nodes
   }), true);
-  instance.sortAndUpdateRange();
-  instance.modified();
+  instance.sortAndUpdateRange(); // instance.modified();
+
   context.end(); // -> end(piecewiseFunctionUpdater)
 } // ----------------------------------------------------------------------------
 
 
+function removeUnavailableArrays(fields, availableNames) {
+  var namesToDelete = [];
+  var size = fields.getNumberOfArrays();
+
+  for (var i = 0; i < size; i++) {
+    var array = fields.getArray(i);
+    var name = array.getName();
+
+    if (!availableNames.has(name)) {
+      namesToDelete.push(name);
+    }
+  }
+
+  for (var _i = 0; _i < namesToDelete.length; _i++) {
+    fields.removeArray(namesToDelete[_i]);
+  }
+}
+
 function createDataSetUpdate() {
   var piecesToFetch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return function (instance, state, context) {
@@ -489,8 +527,18 @@ function createDataSetUpdate() {
 
     delete state.properties.fields; // Reset any pre-existing fields array
 
-    instance.getPointData().removeAllArrays();
-    instance.getCellData().removeAllArrays(); // Generic handling
+    var arrayToKeep = {
+      pointData: new Set(),
+      cellData: new Set(),
+      fieldData: new Set()
+    };
+    fieldsArrays.forEach(function (_ref5) {
+      var location = _ref5.location,
+          name = _ref5.name;
+      arrayToKeep[location].add(name);
+    });
+    removeUnavailableArrays(instance.getPointData(), arrayToKeep.pointData);
+    removeUnavailableArrays(instance.getCellData(), arrayToKeep.cellData); // Generic handling
 
     var res = genericUpdater(instance, state, context); // Finish what we started
 

package/macros.js

@@ -304,8 +304,8 @@ function obj() {
           vtkWarningMacro("Warning: Set value to model directly ".concat(name, ", ").concat(map[name]));
         }
 
+        ret = model[name] !== map[name] || ret;
         model[name] = map[name];
-        ret = true;
       }
     });
     return ret;

package/package.json

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