Merge branch 'master' into fix/hardware-selector-edges

Author: finetjul

Examples/Volume/VolumeOutline/index.js

@@ -88,6 +88,7 @@ function createLabelPipeline(backgroundImageData) {
   labelMap.actor.getProperty().setInterpolationTypeToNearest();
   labelMap.actor.getProperty().setUseLabelOutline(true);
   labelMap.actor.getProperty().setLabelOutlineThickness(3);
+  labelMap.actor.getProperty().setLabelOutlineOpacity(1.0);
 
   return labelMap;
 }

Sources/Common/Core/ClassHierarchy/index.js

@@ -1,7 +1,12 @@
+/* eslint-disable prefer-rest-params */
 export default class ClassHierarchy extends Array {
-  push(...args) {
-    // no perf issue since args.length should be small
-    const newArgs = args.filter((arg) => !this.includes(arg));
-    return super.push(...newArgs);
+  push() {
+    for (let i = 0; i < arguments.length; i++) {
+      if (!this.includes(arguments[i])) {
+        super.push(arguments[i]);
+      }
+    }
+
+    return this.length;
   }
 }

Sources/Rendering/Core/Prop3D/index.js

@@ -99,8 +99,12 @@ function vtkProp3D(publicAPI, model) {
   };
 
   publicAPI.setUserMatrix = (matrix) => {
+    if (vtkMath.areMatricesEqual(model.userMatrix, matrix)) {
+      return false;
+    }
     mat4.copy(model.userMatrix, matrix);
     publicAPI.modified();
+    return true;
   };
 
   publicAPI.getMatrix = () => {

Sources/Rendering/Core/VolumeProperty/index.js

@@ -253,6 +253,7 @@ const DEFAULT_VALUES = {
   specularPower: 10.0,
   useLabelOutline: false,
   labelOutlineThickness: 1,
+  labelOutlineOpacity: 1.0,
 };
 
 // ----------------------------------------------------------------------------
@@ -295,6 +296,7 @@ export function extend(publicAPI, model, initialValues = {}) {
     'specularPower',
     'useLabelOutline',
     'labelOutlineThickness',
+    'labelOutlineOpacity',
   ]);
 
   // Object methods

Sources/Rendering/Misc/RemoteView/example/index.js

@@ -46,9 +46,7 @@ const config = {
 clientToConnect
   .connect(config)
   .then((validClient) => {
-    const viewStream = this.clientToConnect
-      .getImageStream()
-      .createViewStream('-1');
+    const viewStream = clientToConnect.getImageStream().createViewStream('-1');
 
     const view = vtkRemoteView.newInstance({
       rpcWheelEvent: 'viewport.mouse.zoom.wheel',

Sources/Rendering/OpenGL/VolumeMapper/index.js

@@ -1029,7 +1029,10 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
         .getProperty()
         .getLabelOutlineThickness();
 
+      const labelOutlineOpacity = actor.getProperty().getLabelOutlineOpacity();
+
       program.setUniformi('outlineThickness', labelOutlineThickness);
+      program.setUniformf('outlineOpacity', labelOutlineOpacity);
     }
 
     if (model.lastLightComplexity > 0) {

Sources/Rendering/OpenGL/glsl/vtkVolumeFS.glsl

@@ -44,6 +44,7 @@ varying vec3 vertexVCVSOutput;
 
 #ifdef vtkImageLabelOutlineOn
 uniform int outlineThickness;
+uniform float outlineOpacity;
 uniform float vpWidth;
 uniform float vpHeight;
 uniform float vpOffsetX;
@@ -995,7 +996,7 @@ vec4 getColorForValue(vec4 tValue, vec3 posIS, vec3 tstep)
 
     // If I am on the border, I am displayed at full opacity
     if (pixelOnBorder == true) {
-      tColor.a = 1.0;
+      tColor.a = outlineOpacity;
     }
   }
 

Sources/Testing/testMacro.js

@@ -35,6 +35,7 @@ const DEFAULT_VALUES = {
   myProp11: 11,
   _myProp12: [12],
   _myProp13: 13,
+  myObjectProp: { foo: 1 },
 };
 
 // ----------------------------------------------------------------------------
@@ -74,6 +75,9 @@ function extend(publicAPI, model, initialValues = {}) {
   macro.setGetArray(publicAPI, model, ['_myProp12'], 1);
   macro.moveToProtected(publicAPI, model, ['myProp11', 'myProp12', 'myProp13']);
 
+  // Object member variables
+  macro.setGet(publicAPI, model, [{ name: 'myObjectProp', type: 'object' }]);
+
   // Object specific methods
   myClass(publicAPI, model);
 
@@ -405,6 +409,39 @@ test('Macro methods enum tests', (t) => {
   t.end();
 });
 
+test('Macro methods object tests', (t) => {
+  const myTestClass = newInstance();
+
+  const mtime = myTestClass.getMTime();
+  t.equal(
+    myTestClass.setMyObjectProp({ foo: 1 }),
+    false,
+    'No change on same object'
+  );
+  t.equal(myTestClass.getMTime(), mtime, 'No change when setting same object');
+
+  t.equal(
+    myTestClass.setMyObjectProp({ foo: 2 }),
+    true,
+    'Change on different object'
+  );
+  t.notEqual(myTestClass.getMTime(), mtime, 'Change when setting same object');
+  t.deepEqual(
+    myTestClass.getMyObjectProp(),
+    { foo: 2 },
+    'Change on different object'
+  );
+
+  myTestClass.getMyObjectProp().foo = 3;
+  t.deepEqual(
+    myTestClass.getMyObjectProp(),
+    { foo: 2 },
+    'Getter shall return a copy'
+  );
+
+  t.end();
+});
+
 test('Macro methods object tests', (t) => {
   const myTestClass = newInstance();
 

Sources/Widgets/Representations/WidgetRepresentation/index.js

@@ -78,6 +78,7 @@ export function connectPipeline(pipeline) {
 function vtkWidgetRepresentation(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkWidgetRepresentation');
+  const superclass = { ...publicAPI };
   // Internal cache
   const cache = { mtimes: {}, states: [] };
 
@@ -194,13 +195,15 @@ function vtkWidgetRepresentation(publicAPI, model) {
   };
 
   publicAPI.setCoincidentTopologyParameters = (parameters) => {
-    model.coincidentTopologyParameters = parameters;
-    publicAPI.getActors().forEach((actor) => {
-      applyCoincidentTopologyParametersToMapper(
-        actor.getMapper(),
-        model.coincidentTopologyParameters
-      );
-    });
+    const modified = superclass.setCoincidentTopologyParameters(parameters);
+    if (modified) {
+      publicAPI.getActors().forEach((actor) => {
+        applyCoincidentTopologyParametersToMapper(
+          actor.getMapper(),
+          model.coincidentTopologyParameters
+        );
+      });
+    }
   };
 
   publicAPI.getPixelWorldHeightAtCoord = (worldCoord) => {
@@ -268,8 +271,11 @@ export function extend(publicAPI, model, initialValues = {}) {
   // Object methods
   vtkProp.extend(publicAPI, model, initialValues);
   macro.algo(publicAPI, model, 1, 1);
-  macro.get(publicAPI, model, ['labels', 'coincidentTopologyParameters']);
-  macro.set(publicAPI, model, ['displayScaleParams']);
+  macro.get(publicAPI, model, ['labels']);
+  macro.set(publicAPI, model, [
+    { type: 'object', name: 'displayScaleParams' },
+    { type: 'object', name: 'coincidentTopologyParameters' },
+  ]);
   macro.setGet(publicAPI, model, ['scaleInPixels']);
 
   // Object specific methods

Sources/Widgets/SVG/SVGLandmarkRepresentation/index.js

@@ -168,10 +168,10 @@ export function extend(publicAPI, model, initialValues = {}) {
   vtkSVGRepresentation.extend(publicAPI, model, defaultValues(initialValues));
 
   macro.setGet(publicAPI, model, [
-    'circleProps',
-    'fontProperties',
-    'strokeFontProperties',
-    'textProps',
+    { type: 'object', name: 'circleProps' },
+    { type: 'object', name: 'fontProperties' },
+    { type: 'object', name: 'strokeFontProperties' },
+    { type: 'object', name: 'textProps' },
   ]);
 
   // Object specific methods