@kitware/vtk.js 23.4.2 → 24.0.0-beta.1

package/Rendering/SceneGraph/ViewNode.js

@@ -61,15 +61,15 @@ function vtkViewNode(publicAPI, model) {
   };
 
   publicAPI.getFirstAncestorOfType = function (type) {
-    if (!model.parent) {
+    if (!model._parent) {
       return null;
     }
 
-    if (model.parent.isA(type)) {
-      return model.parent;
+    if (model._parent.isA(type)) {
+      return model._parent;
     }
 
-    return model.parent.getFirstAncestorOfType(type);
+    return model._parent.getFirstAncestorOfType(type);
   };
 
   publicAPI.addMissingNode = function (dobj) {
@@ -188,7 +188,7 @@ function vtkViewNode(publicAPI, model) {
 
 
 var DEFAULT_VALUES = {
-  parent: null,
+  // _parent: null,
   renderable: null,
   myFactory: null,
   children: [],
@@ -203,8 +203,9 @@ function extend(publicAPI, model) {
   macro.event(publicAPI, model, 'event');
   model._renderableChildMap = new Map();
   macro.get(publicAPI, model, ['visited']);
-  macro.setGet(publicAPI, model, ['parent', 'renderable', 'myFactory']);
-  macro.getArray(publicAPI, model, ['children']); // Object methods
+  macro.setGet(publicAPI, model, ['_parent', 'renderable', 'myFactory']);
+  macro.getArray(publicAPI, model, ['children']);
+  macro.moveToProtected(publicAPI, model, ['parent']); // Object methods
 
   vtkViewNode(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/WebGPU/Renderer.js

@@ -116,7 +116,7 @@ function vtkWebGPURenderer(publicAPI, model) {
     // has the camera changed?
     var utime = model.UBO.getSendTime();
 
-    if (model.parent.getMTime() > utime || publicAPI.getMTime() > utime || model.camera.getMTime() > utime || model.renderable.getMTime() > utime) {
+    if (model._parent.getMTime() > utime || publicAPI.getMTime() > utime || model.camera.getMTime() > utime || model.renderable.getMTime() > utime) {
       var keyMats = model.webgpuCamera.getKeyMatrices(publicAPI);
       model.UBO.setArray('WCVCMatrix', keyMats.wcvc);
       model.UBO.setArray('SCPCMatrix', keyMats.scpc);
@@ -127,7 +127,9 @@ function vtkWebGPURenderer(publicAPI, model) {
       var tsize = publicAPI.getYInvertedTiledSizeAndOrigin();
       model.UBO.setArray('viewportSize', [tsize.usize, tsize.vsize]);
       model.UBO.setValue('cameraParallel', model.camera.getParallelProjection());
-      var device = model.parent.getDevice();
+
+      var device = model._parent.getDevice();
+
       model.UBO.sendIfNeeded(device);
     }
   };
@@ -148,7 +150,7 @@ function vtkWebGPURenderer(publicAPI, model) {
     if (prepass) {
       // clear last pipelines
       model.pipelineCallbacks = [];
-      model.renderEncoder.begin(model.parent.getCommandEncoder());
+      model.renderEncoder.begin(model._parent.getCommandEncoder());
       publicAPI.updateUBO();
     } else {
       publicAPI.scissorAndViewport(model.renderEncoder);
@@ -174,7 +176,7 @@ function vtkWebGPURenderer(publicAPI, model) {
       return;
     }
 
-    var device = model.parent.getDevice();
+    var device = model._parent.getDevice();
 
     if (!model.clearFSQ) {
       model.clearFSQ = vtkWebGPUFullScreenQuad.newInstance();
@@ -198,7 +200,7 @@ function vtkWebGPURenderer(publicAPI, model) {
     if (prepass) {
       // clear last pipelines
       model.pipelineCallbacks = [];
-      model.renderEncoder.begin(model.parent.getCommandEncoder());
+      model.renderEncoder.begin(model._parent.getCommandEncoder());
     } else {
       publicAPI.scissorAndViewport(model.renderEncoder); // loop over registered pipelines
 
@@ -221,7 +223,7 @@ function vtkWebGPURenderer(publicAPI, model) {
     if (prepass) {
       // clear last pipelines
       model.pipelineCallbacks = [];
-      model.renderEncoder.begin(model.parent.getCommandEncoder());
+      model.renderEncoder.begin(model._parent.getCommandEncoder());
     } else {
       publicAPI.scissorAndViewport(model.renderEncoder); // loop over registered pipelines
 
@@ -241,7 +243,8 @@ function vtkWebGPURenderer(publicAPI, model) {
   };
 
   publicAPI.getAspectRatio = function () {
-    var size = model.parent.getSizeByReference();
+    var size = model._parent.getSizeByReference();
+
     var viewport = model.renderable.getViewportByReference();
     return size[0] * (viewport[2] - viewport[0]) / ((viewport[3] - viewport[1]) * size[1]);
   };
@@ -252,7 +255,9 @@ function vtkWebGPURenderer(publicAPI, model) {
 
   publicAPI.getYInvertedTiledSizeAndOrigin = function () {
     var res = publicAPI.getTiledSizeAndOrigin();
-    var size = model.parent.getSizeByReference();
+
+    var size = model._parent.getSizeByReference();
+
     res.lowerLeftV = size[1] - res.vsize - res.lowerLeftV;
     return res;
   };
@@ -266,16 +271,19 @@ function vtkWebGPURenderer(publicAPI, model) {
     var vpu = vport[0] - tileViewPort[0];
     var vpv = vport[1] - tileViewPort[1]; // store the result as a pixel value
 
-    var ndvp = model.parent.normalizedDisplayToDisplay(vpu, vpv);
+    var ndvp = model._parent.normalizedDisplayToDisplay(vpu, vpv);
+
     var lowerLeftU = Math.round(ndvp[0]);
     var lowerLeftV = Math.round(ndvp[1]); // find the upper right corner of the viewport, taking into account the
     // lower left boundary of this tile
 
     var vpu2 = vport[2] - tileViewPort[0];
     var vpv2 = vport[3] - tileViewPort[1];
-    var ndvp2 = model.parent.normalizedDisplayToDisplay(vpu2, vpv2); // now compute the size of the intersection of the viewport with the
+
+    var ndvp2 = model._parent.normalizedDisplayToDisplay(vpu2, vpv2); // now compute the size of the intersection of the viewport with the
     // current tile
 
+
     var usize = Math.round(ndvp2[0]) - lowerLeftU;
     var vsize = Math.round(ndvp2[1]) - lowerLeftV;
 

package/Widgets/Core/AbstractWidget.js

@@ -87,8 +87,8 @@ function vtkAbstractWidget(publicAPI, model) {
   };
 
   publicAPI.getViewWidgets = function () {
-    return model.factory.getViewIds().map(function (viewId) {
-      return model.factory.getWidgetForView({
+    return model._factory.getViewIds().map(function (viewId) {
+      return model._factory.getWidgetForView({
         viewId: viewId
       });
     });
@@ -110,7 +110,7 @@ var DEFAULT_VALUES = {
  * @param {*} publicAPI public methods to populate
  * @param {*} model internal values to populate
  * @param {object} initialValues Contains at least
- *   {viewType, renderer, camera, openGLRenderWindow, factory}
+ *   {viewType, _renderer, _camera, _openGLRenderWindow, _factory}
  */
 
 function extend(publicAPI, model) {
@@ -118,8 +118,9 @@ function extend(publicAPI, model) {
   Object.assign(model, DEFAULT_VALUES, initialValues);
   vtkProp.extend(publicAPI, model, initialValues);
   vtkInteractorObserver.extend(publicAPI, model, initialValues);
-  macro.setGet(publicAPI, model, ['contextVisibility', 'handleVisibility', 'widgetManager']);
+  macro.setGet(publicAPI, model, ['contextVisibility', 'handleVisibility', '_widgetManager']);
   macro.get(publicAPI, model, ['representations', 'widgetState']);
+  macro.moveToProtected(publicAPI, model, ['widgetManager']);
   macro.event(publicAPI, model, 'ActivateHandle');
   vtkAbstractWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Widgets/Core/AbstractWidgetFactory.js

@@ -48,6 +48,7 @@ function vtkAbstractWidgetFactory(publicAPI, model) {
         apiSpecificRenderWindow: apiSpecificRenderWindow,
         factory: publicAPI
       });
+      macro.moveToProtected(widgetPublicAPI, widgetModel, ['renderer', 'camera', 'apiSpecificRenderWindow', 'factory']);
       macro.safeArrays(widgetModel);
       vtkAbstractWidget.extend(widgetPublicAPI, widgetModel, initialValues); // Create representations for that view
 
@@ -60,7 +61,7 @@ function vtkAbstractWidgetFactory(publicAPI, model) {
             labels = _ref2.labels,
             initialValues = _ref2.initialValues;
         return builder.newInstance(_objectSpread(_objectSpread({
-          parentProp: widgetPublicAPI,
+          _parentProp: widgetPublicAPI,
           labels: labels
         }, initialValues), widgetInitialValues));
       });

package/Widgets/Core/WidgetManager.js

@@ -92,8 +92,10 @@ function vtkWidgetManager(publicAPI, model) {
   var pendingSvgRenders = new WeakMap();
 
   function enableSvgLayer() {
-    var container = model.apiSpecificRenderWindow.getReferenceByName('el');
-    var canvas = model.apiSpecificRenderWindow.getCanvas();
+    var container = model._apiSpecificRenderWindow.getReferenceByName('el');
+
+    var canvas = model._apiSpecificRenderWindow.getCanvas();
+
     container.insertBefore(model.svgRoot, canvas.nextSibling);
     var containerStyles = window.getComputedStyle(container);
 
@@ -103,7 +105,8 @@ function vtkWidgetManager(publicAPI, model) {
   }
 
   function disableSvgLayer() {
-    var container = model.apiSpecificRenderWindow.getReferenceByName('el');
+    var container = model._apiSpecificRenderWindow.getReferenceByName('el');
+
     container.removeChild(model.svgRoot);
   }
 
@@ -118,10 +121,10 @@ function vtkWidgetManager(publicAPI, model) {
   }
 
   function setSvgSize() {
-    var _model$apiSpecificRen = model.apiSpecificRenderWindow.getSize(),
-        _model$apiSpecificRen2 = _slicedToArray(_model$apiSpecificRen, 2),
-        cwidth = _model$apiSpecificRen2[0],
-        cheight = _model$apiSpecificRen2[1];
+    var _model$_apiSpecificRe = model._apiSpecificRenderWindow.getSize(),
+        _model$_apiSpecificRe2 = _slicedToArray(_model$_apiSpecificRe, 2),
+        cwidth = _model$_apiSpecificRe2[0],
+        cheight = _model$_apiSpecificRe2[1];
 
     var ratio = window.devicePixelRatio || 1;
     var bwidth = String(cwidth / ratio);
@@ -215,17 +218,17 @@ function vtkWidgetManager(publicAPI, model) {
 
 
   function updateDisplayScaleParams() {
-    var apiSpecificRenderWindow = model.apiSpecificRenderWindow,
-        camera = model.camera,
-        renderer = model.renderer;
+    var _apiSpecificRenderWindow = model._apiSpecificRenderWindow,
+        _camera = model._camera,
+        _renderer = model._renderer;
 
-    if (renderer && apiSpecificRenderWindow && camera) {
-      var _apiSpecificRenderWin = apiSpecificRenderWindow.getSize(),
+    if (_renderer && _apiSpecificRenderWindow && _camera) {
+      var _apiSpecificRenderWin = _apiSpecificRenderWindow.getSize(),
           _apiSpecificRenderWin2 = _slicedToArray(_apiSpecificRenderWin, 2),
           rwW = _apiSpecificRenderWin2[0],
           rwH = _apiSpecificRenderWin2[1];
 
-      var _renderer$getViewport = renderer.getViewport(),
+      var _renderer$getViewport = _renderer.getViewport(),
           _renderer$getViewport2 = _slicedToArray(_renderer$getViewport, 4),
           vxmin = _renderer$getViewport2[0],
           vymin = _renderer$getViewport2[1],
@@ -233,10 +236,14 @@ function vtkWidgetManager(publicAPI, model) {
           vymax = _renderer$getViewport2[3];
 
       var rendererPixelDims = [rwW * (vxmax - vxmin), rwH * (vymax - vymin)];
-      var cameraPosition = camera.getPosition();
-      var cameraDir = camera.getDirectionOfProjection();
-      var isParallel = camera.getParallelProjection();
-      var dispHeightFactor = isParallel ? 2 * camera.getParallelScale() : 2 * Math.tan(radiansFromDegrees(camera.getViewAngle()) / 2);
+
+      var cameraPosition = _camera.getPosition();
+
+      var cameraDir = _camera.getDirectionOfProjection();
+
+      var isParallel = _camera.getParallelProjection();
+
+      var dispHeightFactor = isParallel ? 2 * _camera.getParallelScale() : 2 * Math.tan(radiansFromDegrees(_camera.getViewAngle()) / 2);
       model.widgets.forEach(function (w) {
         w.getNestedProps().forEach(function (r) {
           if (r.getScaleInPixels()) {
@@ -292,7 +299,7 @@ function vtkWidgetManager(publicAPI, model) {
               renderPickingBuffer();
               model._capturedBuffers = null;
               _context3.next = 7;
-              return model.selector.getSourceDataAsync(model.renderer, x1, y1, x2, y2);
+              return model._selector.getSourceDataAsync(model._renderer, x1, y1, x2, y2);
 
             case 7:
               model._capturedBuffers = _context3.sent;
@@ -317,10 +324,10 @@ function vtkWidgetManager(publicAPI, model) {
 
   publicAPI.renderWidgets = function () {
     if (model.pickingEnabled && model.captureOn === CaptureOn.MOUSE_RELEASE) {
-      var _model$apiSpecificRen3 = model.apiSpecificRenderWindow.getSize(),
-          _model$apiSpecificRen4 = _slicedToArray(_model$apiSpecificRen3, 2),
-          w = _model$apiSpecificRen4[0],
-          h = _model$apiSpecificRen4[1];
+      var _model$_apiSpecificRe3 = model._apiSpecificRenderWindow.getSize(),
+          _model$_apiSpecificRe4 = _slicedToArray(_model$_apiSpecificRe3, 2),
+          w = _model$_apiSpecificRe4[0],
+          h = _model$_apiSpecificRe4[1];
 
       captureBuffers(0, 0, w, h);
     }
@@ -334,28 +341,32 @@ function vtkWidgetManager(publicAPI, model) {
   };
 
   publicAPI.setRenderer = function (renderer) {
-    Object.assign(model, extractRenderingComponents(renderer));
+    var renderingComponents = extractRenderingComponents(renderer);
+    Object.assign(model, renderingComponents);
+    macro.moveToProtected({}, model, Object.keys(renderingComponents));
 
     while (subscriptions.length) {
       subscriptions.pop().unsubscribe();
     }
 
-    model.selector = model.apiSpecificRenderWindow.createSelector();
-    model.selector.setFieldAssociation(FieldAssociations.FIELD_ASSOCIATION_POINTS);
-    subscriptions.push(model.interactor.onRenderEvent(updateSvg));
-    subscriptions.push(model.apiSpecificRenderWindow.onModified(setSvgSize));
+    model._selector = model._apiSpecificRenderWindow.createSelector();
+
+    model._selector.setFieldAssociation(FieldAssociations.FIELD_ASSOCIATION_POINTS);
+
+    subscriptions.push(model._interactor.onRenderEvent(updateSvg));
+    subscriptions.push(model._apiSpecificRenderWindow.onModified(setSvgSize));
     setSvgSize();
-    subscriptions.push(model.apiSpecificRenderWindow.onModified(updateDisplayScaleParams));
-    subscriptions.push(model.camera.onModified(updateDisplayScaleParams));
+    subscriptions.push(model._apiSpecificRenderWindow.onModified(updateDisplayScaleParams));
+    subscriptions.push(model._camera.onModified(updateDisplayScaleParams));
     updateDisplayScaleParams();
-    subscriptions.push(model.interactor.onStartAnimation(function () {
+    subscriptions.push(model._interactor.onStartAnimation(function () {
       model.isAnimating = true;
     }));
-    subscriptions.push(model.interactor.onEndAnimation(function () {
+    subscriptions.push(model._interactor.onEndAnimation(function () {
       model.isAnimating = false;
       publicAPI.renderWidgets();
     }));
-    subscriptions.push(model.interactor.onMouseMove( /*#__PURE__*/function () {
+    subscriptions.push(model._interactor.onMouseMove( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
         var position, _yield$publicAPI$getS, requestCount, selectedState, representation, widget, i, w;
 
@@ -394,7 +405,7 @@ function vtkWidgetManager(publicAPI, model) {
 
               case 14:
                 // Default cursor behavior
-                model.apiSpecificRenderWindow.setCursor(widget ? 'pointer' : 'default');
+                model._apiSpecificRenderWindow.setCursor(widget ? 'pointer' : 'default');
 
                 if (model.widgetInFocus === widget && widget.hasFocus()) {
                   widget.activateHandle({
@@ -402,8 +413,9 @@ function vtkWidgetManager(publicAPI, model) {
                     representation: representation
                   }); // Ken FIXME
 
-                  model.interactor.render();
-                  model.interactor.render();
+                  model._interactor.render();
+
+                  model._interactor.render();
                 } else {
                   for (i = 0; i < model.widgets.length; i++) {
                     w = model.widgets[i];
@@ -420,8 +432,9 @@ function vtkWidgetManager(publicAPI, model) {
                   } // Ken FIXME
 
 
-                  model.interactor.render();
-                  model.interactor.render();
+                  model._interactor.render();
+
+                  model._interactor.render();
                 }
 
               case 16:
@@ -452,25 +465,25 @@ function vtkWidgetManager(publicAPI, model) {
     updateWidgetWeakMap(viewWidget);
     updateDisplayScaleParams(); // Register to renderer
 
-    model.renderer.addActor(viewWidget);
+    model._renderer.addActor(viewWidget);
   }
 
   publicAPI.addWidget = function (widget, viewType, initialValues) {
-    if (!model.renderer) {
+    if (!model._renderer) {
       vtkErrorMacro('Widget manager MUST BE link to a view before registering widgets');
       return null;
     }
 
     var viewId = model.viewId,
-        renderer = model.renderer;
+        _renderer = model._renderer;
     var w = widget.getWidgetForView({
       viewId: viewId,
-      renderer: renderer,
+      renderer: _renderer,
       viewType: viewType || ViewTypes.DEFAULT,
       initialValues: initialValues
     });
 
-    if (model.widgets.indexOf(w) === -1) {
+    if (w != null && model.widgets.indexOf(w) === -1) {
       model.widgets.push(w);
       addWidgetInternal(w);
       publicAPI.modified();
@@ -480,13 +493,15 @@ function vtkWidgetManager(publicAPI, model) {
   };
 
   function removeWidgetInternal(viewWidget) {
-    model.renderer.removeActor(viewWidget);
+    model._renderer.removeActor(viewWidget);
+
     removeFromSvgLayer(viewWidget);
     viewWidget.delete();
   }
 
   function onWidgetRemoved() {
-    model.renderer.getRenderWindow().getInteractor().render();
+    model._renderer.getRenderWindow().getInteractor().render();
+
     publicAPI.renderWidgets();
   }
 
@@ -631,10 +646,10 @@ function vtkWidgetManager(publicAPI, model) {
     var pageX = event.pageX,
         pageY = event.pageY;
 
-    var _model$apiSpecificRen5 = model.apiSpecificRenderWindow.getCanvas().getBoundingClientRect(),
-        top = _model$apiSpecificRen5.top,
-        left = _model$apiSpecificRen5.left,
-        height = _model$apiSpecificRen5.height;
+    var _model$_apiSpecificRe5 = model._apiSpecificRenderWindow.getCanvas().getBoundingClientRect(),
+        top = _model$_apiSpecificRe5.top,
+        left = _model$_apiSpecificRe5.left,
+        height = _model$_apiSpecificRe5.height;
 
     var x = pageX - left;
     var y = height - (pageY - top);
@@ -709,7 +724,7 @@ function vtkWidgetManager(publicAPI, model) {
     if (useSvgLayer !== model.useSvgLayer) {
       model.useSvgLayer = useSvgLayer;
 
-      if (model.renderer) {
+      if (model._renderer) {
         if (useSvgLayer) {
           enableSvgLayer(); // force a render so svg widgets can be drawn
 
@@ -740,6 +755,8 @@ function vtkWidgetManager(publicAPI, model) {
 
 
 var DEFAULT_VALUES = {
+  // _camera: null,
+  // _selector: null,
   viewId: null,
   widgets: [],
   renderer: null,

package/Widgets/Manipulators/LineManipulator.js

@@ -1,5 +1,5 @@
 import macro from '../../macros.js';
-import { g as subtract, j as cross, d as dot, t as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
+import { g as subtract, j as cross, d as dot, x as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
 
 function projectDisplayToLine(x, y, lineOrigin, lineDirection, renderer, glRenderWindow) {
   var near = glRenderWindow.displayToWorld(x, y, 0, renderer);

package/Widgets/Representations/CircleContextRepresentation.js

@@ -65,7 +65,7 @@ function vtkCircleContextRepresentation(publicAPI, model) {
       }),
       actor: vtkActor.newInstance({
         pickable: false,
-        parentProp: publicAPI
+        _parentProp: publicAPI
       })
     }
   };

package/Widgets/Representations/ImplicitPlaneRepresentation.js

@@ -98,7 +98,7 @@ function vtkImplicitPlaneRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: false,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   model.pipelines.plane = {
@@ -106,7 +106,7 @@ function vtkImplicitPlaneRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   model.pipelines.origin = {
@@ -114,7 +114,7 @@ function vtkImplicitPlaneRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   model.pipelines.normal = {
@@ -122,7 +122,7 @@ function vtkImplicitPlaneRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   model.pipelines.display2D = {
@@ -130,7 +130,7 @@ function vtkImplicitPlaneRepresentation(publicAPI, model) {
     mapper: vtkPixelSpaceCallbackMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: false,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   }; // Plane generation pipeline
 

package/Widgets/Representations/PolyLineRepresentation.js

@@ -2,7 +2,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkActor from '../../Rendering/Core/Actor.js';
 import vtkMapper from '../../Rendering/Core/Mapper.js';
-import { z as areEquals, f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
+import { B as areEquals, f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
 import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
 import vtkPolyData from '../../Common/DataModel/PolyData.js';
 import vtkTubeFilter from '../../Filters/General/TubeFilter.js';

package/Widgets/Representations/ResliceCursorContextRepresentation.js

@@ -1,7 +1,7 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
-import { g as subtract, Q as multiplyAccumulate, l as normalize, j as cross } from '../../Common/Core/Math/index.js';
+import { g as subtract, m as multiplyAccumulate, l as normalize, j as cross } from '../../Common/Core/Math/index.js';
 import vtkActor from '../../Rendering/Core/Actor.js';
 import vtkCylinderSource from '../../Filters/Sources/CylinderSource.js';
 import vtkMapper from '../../Rendering/Core/Mapper.js';
@@ -51,7 +51,7 @@ function vtkResliceCursorContextRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   axis1.rotation1 = {
@@ -59,7 +59,7 @@ function vtkResliceCursorContextRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   axis1.rotation2 = {
@@ -67,7 +67,7 @@ function vtkResliceCursorContextRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   }; // Create axis 2
 
@@ -77,7 +77,7 @@ function vtkResliceCursorContextRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   axis2.rotation1 = {
@@ -85,7 +85,7 @@ function vtkResliceCursorContextRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   axis2.rotation2 = {
@@ -93,7 +93,7 @@ function vtkResliceCursorContextRepresentation(publicAPI, model) {
     mapper: vtkMapper.newInstance(),
     actor: vtkActor.newInstance({
       pickable: true,
-      parentProp: publicAPI
+      _parentProp: publicAPI
     })
   };
   model.pipelines.axes.push(axis1);

package/Widgets/SVG/SVGLandmarkRepresentation/Constants.js

@@ -17,9 +17,9 @@ function fontSizeToPixels(fontProperties) {
       if (fontProperties.fontSize.slice(-2) === 'px') {
         return window.devicePixelRatio * parseInt(fontProperties.fontSize, 10);
       }
-    } else {
-      return window.devicePixelRatio * fontProperties.fontSize;
     }
+
+    return window.devicePixelRatio * fontProperties.fontSize;
   }
 
   return window.devicePixelRatio * defaultFontSize;

package/Widgets/SVG/SVGLandmarkRepresentation.js

@@ -24,6 +24,8 @@ function vtkSVGLandmarkRepresentation(publicAPI, model) {
         texts.push(state.getText ? state.getText() : "L".concat(index));
       }
     });
+    var state = list[0];
+    var isActive = state.getActive();
     return publicAPI.worldPointsToPixelSpace(coords).then(function (pixelSpace) {
       var points2d = pixelSpace.coords;
       var winHeight = pixelSpace.windowSize[1];
@@ -39,7 +41,7 @@ function vtkSVGLandmarkRepresentation(publicAPI, model) {
         var x = xy[0];
         var y = winHeight - xy[1];
 
-        if (model.showCircle === true) {
+        if (model.circleProps && model.circleProps.visible) {
           var circle = publicAPI.createListenableSvgElement('circle', i);
           Object.keys(model.circleProps || {}).forEach(function (prop) {
             return circle.setAttribute(prop, model.circleProps[prop]);
@@ -83,10 +85,22 @@ function vtkSVGLandmarkRepresentation(publicAPI, model) {
           text.setAttribute('dy', dy);
           text.setAttribute('font-size', fontSize);
 
-          if (model.fontProperties != null) {
+          if (model.fontProperties && model.fontProperties.fontFamily) {
             text.setAttribute('font-family', model.fontProperties.fontFamily);
+          } else if (isActive && model.strokeFontProperties && model.strokeFontProperties.fontFamily) {
+            text.setAttribute('font-family', model.strokeFontProperties.fontFamily);
+          }
+
+          if (model.fontProperties && model.fontProperties.fontStyle) {
             text.setAttribute('font-weight', model.fontProperties.fontStyle);
+          } else if (isActive && model.strokeFontProperties && model.strokeFontProperties.fontStyle) {
+            text.setAttribute('font-weight', model.strokeFontProperties.fontStyle);
+          }
+
+          if (model.fontProperties && model.fontProperties.fontColor) {
             text.setAttribute('fill', model.fontProperties.fontColor);
+          } else if (isActive && model.strokeFontProperties && model.strokeFontProperties.fontColor) {
+            text.setAttribute('fill', model.strokeFontProperties.fontColor);
           }
 
           text.textContent = subText;
@@ -110,21 +124,20 @@ function vtkSVGLandmarkRepresentation(publicAPI, model) {
 /**
  * textProps can contain any "svg" attribute (e.g. text-anchor, text-align,
  * alignment-baseline...)
- * @param {*} initialValues
- * @returns
  */
 
 
 function defaultValues(initialValues) {
   return _objectSpread(_objectSpread({}, initialValues), {}, {
     circleProps: _objectSpread({
+      visible: false,
       r: 5,
       stroke: 'red',
       fill: 'red'
     }, initialValues.circleProps),
-    textProps: _objectSpread({
-      fill: 'white'
-    }, initialValues.textProps)
+    fontProperties: _objectSpread({
+      fontColor: 'white'
+    }, initialValues.fontProperties)
   });
 } // ----------------------------------------------------------------------------
 
@@ -132,7 +145,7 @@ function defaultValues(initialValues) {
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   vtkSVGRepresentation.extend(publicAPI, model, defaultValues(initialValues));
-  macro.setGet(publicAPI, model, ['circleProps', 'fontProperties', 'name', 'textProps']); // Object specific methods
+  macro.setGet(publicAPI, model, ['circleProps', 'fontProperties', 'strokeFontProperties', 'textProps']); // Object specific methods
 
   vtkSVGLandmarkRepresentation(publicAPI, model);
 } // ----------------------------------------------------------------------------