@kitware/vtk.js 30.2.0 → 30.3.0

package/Rendering/Core/CubeAxesActor.js

@@ -45,6 +45,22 @@ function applyTextStyle(ctx, style) {
   ctx.fillStyle = style.fontColor;
   ctx.font = `${style.fontStyle} ${style.fontSize}px ${style.fontFamily}`;
 }
+function defaultGenerateTicks(publicApi, model) {
+  return dataBounds => {
+    const ticks = [];
+    const tickStrings = [];
+    for (let i = 0; i < 3; i++) {
+      const scale = d3.scaleLinear().domain([dataBounds[i * 2], dataBounds[i * 2 + 1]]);
+      ticks[i] = scale.ticks(5);
+      const format = scale.tickFormat(5);
+      tickStrings[i] = ticks[i].map(format);
+    }
+    return {
+      ticks,
+      tickStrings
+    };
+  };
+}
 
 // many properties of this actor depend on the API specific view The main
 // dependency being the resolution as that drives what font sizes to use.
@@ -534,25 +550,18 @@ function vtkCubeAxesActor(publicAPI, model) {
       }
 
       // compute tick marks for axes
-      const ticks = [];
-      const tickStrings = [];
-      for (let i = 0; i < 3; i++) {
-        const scale = d3.scaleLinear().domain([model.dataBounds[i * 2], model.dataBounds[i * 2 + 1]]);
-        ticks[i] = scale.ticks(5);
-        const format = scale.tickFormat(5);
-        tickStrings[i] = ticks[i].map(format);
-      }
+      const t = model.generateTicks(model.dataBounds);
 
       // update gridlines / edge lines
-      publicAPI.updatePolyData(facesToDraw, edgesToDraw, ticks);
+      publicAPI.updatePolyData(facesToDraw, edgesToDraw, t.ticks);
 
       // compute label world coords and text
-      publicAPI.updateTextData(facesToDraw, edgesToDraw, ticks, tickStrings);
+      publicAPI.updateTextData(facesToDraw, edgesToDraw, t.ticks, t.tickStrings);
 
       // rebuild the texture only when force or changed bounds, face
       // visibility changes do to change the atlas
       if (boundsChanged || model.forceUpdate) {
-        publicAPI.updateTextureAtlas(tickStrings);
+        publicAPI.updateTextureAtlas(t.tickStrings);
       }
     }
     model.forceUpdate = false;
@@ -675,7 +684,7 @@ function vtkCubeAxesActor(publicAPI, model) {
 // Object factory
 // ----------------------------------------------------------------------------
 
-function defaultValues(initialValues) {
+function defaultValues(publicAPI, model, initialValues) {
   return {
     boundsScaleFactor: 1.3,
     camera: null,
@@ -684,20 +693,23 @@ function defaultValues(initialValues) {
     gridLines: true,
     axisLabels: null,
     axisTitlePixelOffset: 35.0,
+    tickLabelPixelOffset: 12.0,
+    generateTicks: defaultGenerateTicks(),
+    ...initialValues,
     axisTextStyle: {
       fontColor: 'white',
       fontStyle: 'normal',
       fontSize: 18,
-      fontFamily: 'serif'
+      fontFamily: 'serif',
+      ...initialValues?.axisTextStyle
     },
-    tickLabelPixelOffset: 12.0,
     tickTextStyle: {
       fontColor: 'white',
       fontStyle: 'normal',
       fontSize: 14,
-      fontFamily: 'serif'
-    },
-    ...initialValues
+      fontFamily: 'serif',
+      ...initialValues?.tickTextStyle
+    }
   };
 }
 
@@ -705,10 +717,8 @@ function defaultValues(initialValues) {
 
 function extend(publicAPI, model) {
   let initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, defaultValues(initialValues));
-
   // Inheritance
-  vtkActor.extend(publicAPI, model, initialValues);
+  vtkActor.extend(publicAPI, model, defaultValues(publicAPI, model, initialValues));
 
   // internal variables
   model.lastFacesToDraw = [false, false, false, false, false, false];
@@ -733,7 +743,7 @@ function extend(publicAPI, model) {
   model.gridActor.setProperty(publicAPI.getProperty());
   model.gridActor.setParentProp(publicAPI);
   model.textPolyData = vtkPolyData.newInstance();
-  macro.setGet(publicAPI, model, ['axisTitlePixelOffset', 'boundsScaleFactor', 'faceVisibilityAngle', 'gridLines', 'tickLabelPixelOffset']);
+  macro.setGet(publicAPI, model, ['axisTitlePixelOffset', 'boundsScaleFactor', 'faceVisibilityAngle', 'gridLines', 'tickLabelPixelOffset', 'generateTicks']);
   macro.setGetArray(publicAPI, model, ['dataBounds'], 6);
   macro.setGetArray(publicAPI, model, ['axisLabels'], 3);
   macro.get(publicAPI, model, ['axisTextStyle', 'tickTextStyle', 'camera', 'tmTexture', 'textValues', 'textPolyData', 'tickCounts', 'gridActor']);

package/package.json

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