@kitware/vtk.js 34.13.2 → 34.15.0

package/Rendering/Core/ScalarBarActor/Constants.js

@@ -0,0 +1,10 @@
+const Orientation = {
+  HORIZONTAL: 'horizontal',
+  VERTICAL: 'vertical',
+  AUTO: 'auto'
+};
+var Constants = {
+  Orientation
+};
+
+export { Orientation, Constants as default };

package/Rendering/Core/ScalarBarActor.d.ts

@@ -19,13 +19,16 @@ export interface IStyle {
   fontColor?: string;
   fontStyle?: string;
   fontFamily?: string;
-  fontSize?: string;
+  fontSize?: number | string;
 }
 
+export type Orientation = 'horizontal' | 'vertical' | 'auto' | null;
+
 /**
  *
  */
-export interface IScalarBarActorInitialValues extends IActorInitialValues {
+export interface IScalarBarActorInitialValues
+  extends Omit<IActorInitialValues, 'orientation'> {
   automated?: boolean;
   autoLayout?: (publicAPI: object, model: object) => void;
   axisLabel?: string;
@@ -42,9 +45,11 @@ export interface IScalarBarActorInitialValues extends IActorInitialValues {
   drawBelowRangeSwatch?: boolean;
   drawAboveRangeSwatch?: boolean;
   drawNanAnnotation?: boolean;
+  orientation?: Orientation;
 }
 
-export interface vtkScalarBarActor extends vtkActor {
+export interface vtkScalarBarActor
+  extends Omit<vtkActor, 'getOrientation' | 'setOrientation'> {
   /**
    *
    * @param {Boolean} doUpdate
@@ -222,6 +227,27 @@ export interface vtkScalarBarActor extends vtkActor {
    */
   setAxisTextStyle(axisTextStyle: IStyle): boolean;
 
+  /**
+   * Get the current bar orientation setting
+   */
+  getOrientation(): Orientation;
+
+  /**
+   * Forces the scalar bar to use horizontal orientation regardless of aspect ratio
+   */
+  setOrientationToHorizontal(): boolean;
+
+  /**
+   * Forces the scalar bar to use vertical orientation regardless of aspect ratio
+   */
+  setOrientationToVertical(): boolean;
+
+  /**
+   * Set the orientation of the scalar bar
+   * @param orientation 'horizontal' to force horizontal, 'vertical' to force vertical, or null/undefined for auto
+   */
+  setOrientation(orientation: Orientation): boolean;
+
   /**
    *
    * @param {Number} axisTitlePixelOffset

package/Rendering/Core/ScalarBarActor.js

@@ -7,10 +7,14 @@ import vtkScalarsToColors from '../../Common/Core/ScalarsToColors.js';
 import vtkMapper from './Mapper.js';
 import vtkPolyData from '../../Common/DataModel/PolyData.js';
 import vtkTexture from './Texture.js';
+import Constants from './ScalarBarActor/Constants.js';
 
 const {
   VectorMode
 } = vtkScalarsToColors;
+const {
+  Orientation
+} = Constants;
 
 // ----------------------------------------------------------------------------
 // vtkScalarBarActor
@@ -28,11 +32,12 @@ const {
 //
 // ----------------------------------------------------------------------------
 
-function applyTextStyle(ctx, style) {
+function applyTextStyle(ctx, style, defaultFontSize) {
   ctx.strokeStyle = style.strokeColor;
   ctx.lineWidth = style.strokeSize;
   ctx.fillStyle = style.fontColor;
-  ctx.font = `${style.fontStyle} ${style.fontSize}px ${style.fontFamily}`;
+  const fontSize = style.fontSize ?? defaultFontSize;
+  ctx.font = `${style.fontStyle} ${fontSize}px ${style.fontFamily}`;
 }
 
 // ----------------------------------------------------------------------------
@@ -68,12 +73,16 @@ function defaultAutoLayout(publicAPI, model) {
     Object.assign(axisTextStyle, model.axisTextStyle);
     Object.assign(tickTextStyle, model.tickTextStyle);
 
-    // compute a reasonable font size first
-    axisTextStyle.fontSize = Math.max(24 * minAdjust, 12);
-    if (helper.getLastAspectRatio() > 1.0) {
-      tickTextStyle.fontSize = Math.max(20 * minAdjust, 10);
-    } else {
-      tickTextStyle.fontSize = Math.max(16 * minAdjust, 10);
+    // compute a reasonable font size first, but only if user hasn't explicitly set it
+    if (axisTextStyle.fontSize === undefined) {
+      axisTextStyle.fontSize = Math.max(24 * minAdjust, 12);
+    }
+    if (tickTextStyle.fontSize === undefined) {
+      if (helper.getLastAspectRatio() > 1.0) {
+        tickTextStyle.fontSize = Math.max(20 * minAdjust, 10);
+      } else {
+        tickTextStyle.fontSize = Math.max(16 * minAdjust, 10);
+      }
     }
 
     // rebuild the text atlas
@@ -84,8 +93,19 @@ function defaultAutoLayout(publicAPI, model) {
     helper.setTopTitle(false);
     const boxSize = helper.getBoxSizeByReference();
 
+    // Determine orientation: user-forced, or auto based on aspect ratio
+    let isVertical = false;
+    if (model.orientation === Orientation.VERTICAL) {
+      isVertical = true;
+    } else if (model.orientation === Orientation.HORIZONTAL) {
+      isVertical = false;
+    } else {
+      // auto: use aspect ratio (original behavior)
+      isVertical = helper.getLastAspectRatio() > 1.0;
+    }
+
     // if vertical
-    if (helper.getLastAspectRatio() > 1.0) {
+    if (isVertical) {
       helper.setTickLabelPixelOffset(0.3 * tickTextStyle.fontSize);
 
       // if the title will fit within the width of the bar then that looks
@@ -243,7 +263,7 @@ function vtkScalarBarActorHelper(publicAPI, model) {
     const newTmAtlas = new Map();
     let maxWidth = 0;
     let totalHeight = 1; // start one pixel in so we have a border
-    applyTextStyle(model.tmContext, model.axisTextStyle);
+    applyTextStyle(model.tmContext, model.axisTextStyle, 18);
     let metrics = model.tmContext.measureText(model.renderable.getAxisLabel());
     let entry = {
       height: metrics.actualBoundingBoxAscent + 2,
@@ -260,7 +280,7 @@ function vtkScalarBarActorHelper(publicAPI, model) {
     // and the ticks, NaN Below and Above
     results.tickWidth = 0;
     results.tickHeight = 0;
-    applyTextStyle(model.tmContext, model.tickTextStyle);
+    applyTextStyle(model.tmContext, model.tickTextStyle, 14);
     const strings = [...publicAPI.getTickStrings(), 'NaN', 'Below', 'Above'];
     for (let t = 0; t < strings.length; t++) {
       if (!newTmAtlas.has(strings[t])) {
@@ -304,7 +324,8 @@ function vtkScalarBarActorHelper(publicAPI, model) {
 
     // draw the text onto the texture
     newTmAtlas.forEach((value, key) => {
-      applyTextStyle(model.tmContext, value.textStyle);
+      const defaultSize = value.textStyle === model.axisTextStyle ? 18 : 14;
+      applyTextStyle(model.tmContext, value.textStyle, defaultSize);
       model.tmContext.fillText(key, 1, value.startingHeight + value.height - 1);
     });
     model.tmTexture.setCanvas(model.tmCanvas);
@@ -720,6 +741,8 @@ function vtkScalarBarActor(publicAPI, model) {
     };
     publicAPI.modified();
   };
+  publicAPI.setOrientationToHorizontal = () => publicAPI.setOrientation(Orientation.HORIZONTAL);
+  publicAPI.setOrientationToVertical = () => publicAPI.setOrientation(Orientation.VERTICAL);
   publicAPI.resetAutoLayoutToDefault = () => {
     publicAPI.setAutoLayout(defaultAutoLayout(publicAPI, model));
   };
@@ -746,20 +769,21 @@ function defaultValues(initialValues) {
     axisTextStyle: {
       fontColor: 'white',
       fontStyle: 'normal',
-      fontSize: 18,
+      fontSize: undefined,
       fontFamily: 'serif'
     },
     tickLabelPixelOffset: 14.0,
     tickTextStyle: {
       fontColor: 'white',
       fontStyle: 'normal',
-      fontSize: 14,
+      fontSize: undefined,
       fontFamily: 'serif'
     },
     generateTicks: null,
     drawNanAnnotation: true,
     drawBelowRangeSwatch: true,
     drawAboveRangeSwatch: true,
+    orientation: null,
     ...initialValues
   };
 }
@@ -776,7 +800,7 @@ function extend(publicAPI, model) {
   vtkActor.extend(publicAPI, model, initialValues);
   publicAPI.getProperty().setDiffuse(0.0);
   publicAPI.getProperty().setAmbient(1.0);
-  macro.setGet(publicAPI, model, ['automated', 'autoLayout', 'axisTitlePixelOffset', 'axisLabel', 'scalarsToColors', 'tickLabelPixelOffset', 'generateTicks', 'drawNanAnnotation', 'drawBelowRangeSwatch', 'drawAboveRangeSwatch']);
+  macro.setGet(publicAPI, model, ['automated', 'autoLayout', 'axisTitlePixelOffset', 'axisLabel', 'scalarsToColors', 'tickLabelPixelOffset', 'generateTicks', 'drawNanAnnotation', 'drawBelowRangeSwatch', 'drawAboveRangeSwatch', 'orientation']);
   macro.get(publicAPI, model, ['axisTextStyle', 'tickTextStyle']);
   macro.getArray(publicAPI, model, ['barPosition', 'barSize', 'boxPosition', 'boxSize']);
   macro.setArray(publicAPI, model, ['barPosition', 'barSize', 'boxPosition', 'boxSize'], 2);
@@ -794,7 +818,8 @@ const newInstance = macro.newInstance(extend, 'vtkScalarBarActor');
 var vtkScalarBarActor$1 = {
   newInstance,
   extend,
-  newScalarBarActorHelper
+  newScalarBarActorHelper,
+  ...Constants
 };
 
 export { vtkScalarBarActor$1 as default, extend, newInstance };

package/Rendering/OpenGL/Texture.js

@@ -1214,7 +1214,7 @@ function vtkOpenGLTexture(publicAPI, model) {
       width,
       height,
       dataArray: vtkDataArray.newInstance({
-        numComps,
+        numberOfComponents: numComps,
         dataType,
         values: data,
         ranges
@@ -1411,7 +1411,7 @@ function vtkOpenGLTexture(publicAPI, model) {
       height,
       depth,
       dataArray: vtkDataArray.newInstance({
-        numComps,
+        numberOfComponents: numComps,
         dataType,
         values: data,
         ranges

package/Widgets/Widgets3D/TransformControlsWidget/behavior.js

@@ -126,6 +126,7 @@ function widgetBehavior(publicAPI, model) {
       translation[axisIndex] = translateState.startPos + delta;
       model.widgetState.getTransform().setTranslation(translation);
     }
+    return macro.EVENT_ABORT;
   };
   publicAPI.handleScaleEvent = (callData, axis, axisIndex) => {
     model.lineManipulator.setHandleOrigin(model.activeState.getOrigin());
@@ -140,6 +141,7 @@ function widgetBehavior(publicAPI, model) {
       scales[axisIndex] = scale;
       model.widgetState.getTransform().setScale(scales);
     }
+    return macro.EVENT_ABORT;
   };
   publicAPI.handleRotateEvent = callData => {
     model.rotationManipulator.setHandleOrigin(model.activeState.getOrigin());

package/package.json

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