perf(ColorTransferFunction): less JSON.stringify in applyColorMap

Author: PaulHax

Sources/Rendering/Core/ColorTransferFunction/index.js

@@ -1162,16 +1162,18 @@ function vtkColorTransferFunction(publicAPI, model) {
         model.colorSpace = ColorSpace.RGB;
       }
     }
+    let isModified = oldColorSpace !== JSON.stringify(model.colorSpace);
 
-    const oldNanColor = JSON.stringify(model.nanColor);
+    const oldNanColor = isModified || JSON.stringify(model.nanColor);
     if (colorMap.NanColor) {
       model.nanColor = [].concat(colorMap.NanColor);
       while (model.nanColor.length < 4) {
         model.nanColor.push(1.0);
       }
     }
+    isModified = isModified || oldNanColor !== JSON.stringify(model.nanColor);
 
-    const oldNodes = JSON.stringify(model.nodes);
+    const oldNodes = isModified || JSON.stringify(model.nodes);
     if (colorMap.RGBPoints) {
       const size = colorMap.RGBPoints.length;
       model.nodes = [];
@@ -1191,16 +1193,12 @@ function vtkColorTransferFunction(publicAPI, model) {
 
     const modifiedInvoked = publicAPI.sortAndUpdateRange();
 
-    if (!modifiedInvoked) {
-      const isModfied = [
-        [oldColorSpace, model.colorSpace],
-        [oldNanColor, model.nanColor],
-        [oldNodes, model.nodes],
-      ].some(([old, current]) => old !== JSON.stringify(current));
-      if (isModfied) publicAPI.modified();
-      return isModfied;
-    }
-    return modifiedInvoked;
+    const callModified =
+      !modifiedInvoked &&
+      (isModified || oldNodes !== JSON.stringify(model.nodes));
+    if (callModified) publicAPI.modified();
+
+    return modifiedInvoked || callModified;
   };
 }
 

Sources/Rendering/Core/ColorTransferFunction/test/testColorTransferFunction.js

@@ -9,15 +9,12 @@ import vtkActor from 'vtk.js/Sources/Rendering/Core/Actor';
 import vtkMapper from 'vtk.js/Sources/Rendering/Core/Mapper';
 import vtkDataArray from 'vtk.js/Sources/Common/Core/DataArray';
 import vtkPolyData from 'vtk.js/Sources/Common/DataModel/PolyData';
-import Constants from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction/Constants';
 
 import { areEquals } from 'vtk.js/Sources/Common/Core/Math';
 
 import baseline from './testColorTransferFunction.png';
 import baseline2 from './testColorTransferFunction2.png';
 
-const { ColorSpace } = Constants;
-
 test('Test Color Transfer Function', (t) => {
   const gc = testUtils.createGarbageCollector(t);
   t.ok('rendering', 'vtkMapper ColorTransferFunction');
@@ -163,38 +160,60 @@ test('Test discretized color transfer function', (t) => {
   t.end();
 });
 
-test('Test applyColorMap calls modfied', (t) => {
+test('Test applyColorMap calls modified', (t) => {
   const ctf = vtkColorTransferFunction.newInstance();
 
   const colorMapA = {
-    ColorSpace: ColorSpace.RGB,
+    ColorSpace: 'RGB',
     RGBPoints: [0, 0, 0, 0, 1, 0, 0, 0],
   };
   const colorMapB = {
-    ColorSpace: ColorSpace.RGB,
+    ColorSpace: 'RGB',
     RGBPoints: [0, 0, 0, 0, 1, 1, 1, 1],
   };
 
   ctf.applyColorMap(colorMapA);
 
-  let isModfied = false;
+  let isModified = false;
   ctf.onModified(() => {
-    isModfied = true;
+    isModified = true;
   });
 
   ctf.applyColorMap(colorMapA);
-
   t.notOk(
-    isModfied,
+    isModified,
     `Expect applyColorMap does not call modified with same color map`
   );
 
   ctf.applyColorMap(colorMapB);
-
   t.ok(
-    isModfied,
+    isModified,
     `Expect applyColorMap calls modified with different color map`
   );
 
+  colorMapB.ColorSpace = 'LAB';
+  isModified = false;
+  let modifiedReturn = ctf.applyColorMap(colorMapB);
+  t.ok(
+    isModified && modifiedReturn,
+    `Expect applyColorMap calls modified with different ColorSpace`
+  );
+
+  colorMapB.NanColor = [0, 0, 0, 1];
+  isModified = false;
+  modifiedReturn = ctf.applyColorMap(colorMapB);
+  t.ok(
+    isModified && modifiedReturn,
+    `Expect applyColorMap calls modified with different NanColor`
+  );
+
+  colorMapB.RGBPoints = [0, 0, 0, 0, 0.5, 1, 1, 1, 1, 1, 1, 1];
+  isModified = false;
+  modifiedReturn = ctf.applyColorMap(colorMapB);
+  t.ok(
+    isModified && modifiedReturn,
+    `Expect applyColorMap calls modified with different RGBPoints`
+  );
+
   t.end();
 });