From e682eb297ae834e57367cfd2c16f9fbc8e43cc0a Mon Sep 17 00:00:00 2001 From: Jonathan Olson Date: Thu, 13 Feb 2025 22:19:40 -0700 Subject: [PATCH] Converting dot Utils usage, see https://github.com/phetsims/dot/issues/4 --- js/ChartTransform.ts | 13 +++++++------ js/TickLabelSet.ts | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/ChartTransform.ts b/js/ChartTransform.ts index 66d1513..67f2497 100644 --- a/js/ChartTransform.ts +++ b/js/ChartTransform.ts @@ -11,12 +11,13 @@ import Emitter from '../../axon/js/Emitter.js'; import TEmitter from '../../axon/js/TEmitter.js'; import Range from '../../dot/js/Range.js'; import Transform1 from '../../dot/js/Transform1.js'; -import Utils from '../../dot/js/Utils.js'; import Vector2 from '../../dot/js/Vector2.js'; import optionize from '../../phet-core/js/optionize.js'; import Orientation from '../../phet-core/js/Orientation.js'; import bamboo from './bamboo.js'; import ClippingType from './ClippingType.js'; +import { linear } from '../../dot/js/util/linear.js'; +import { roundSymmetric } from '../../dot/js/util/roundSymmetric.js'; type SelfOptions = { @@ -125,8 +126,8 @@ class ChartTransform { // For vertical, +y is usually up const viewValue = axisOrientation === Orientation.HORIZONTAL ? - Utils.linear( transform.evaluate( modelRange.min ), transform.evaluate( modelRange.max ), lowSide, highSide, transformedValue ) : - Utils.linear( transform.evaluate( modelRange.max ), transform.evaluate( modelRange.min ), lowSide, highSide, transformedValue ); + linear( transform.evaluate( modelRange.min ), transform.evaluate( modelRange.max ), lowSide, highSide, transformedValue ) : + linear( transform.evaluate( modelRange.max ), transform.evaluate( modelRange.min ), lowSide, highSide, transformedValue ); assert && assert( Number.isFinite( viewValue ), `viewValue should be finite: ${viewValue}` ); assert && assert( !isNaN( viewValue ), `viewValue should be a number: ${viewValue}` ); @@ -186,8 +187,8 @@ class ChartTransform { // For vertical, +y is usually up const out = axisOrientation === Orientation.HORIZONTAL ? - Utils.linear( lowSide, highSide, transform.evaluate( modelRange.min ), transform.evaluate( modelRange.max ), value ) : - Utils.linear( lowSide, highSide, transform.evaluate( modelRange.max ), transform.evaluate( modelRange.min ), value ); + linear( lowSide, highSide, transform.evaluate( modelRange.min ), transform.evaluate( modelRange.max ), value ) : + linear( lowSide, highSide, transform.evaluate( modelRange.max ), transform.evaluate( modelRange.min ), value ); assert && assert( Number.isFinite( out ), 'out value should be finite' ); assert && assert( !isNaN( out ), 'out value should be a number' ); @@ -304,7 +305,7 @@ class ChartTransform { function getValueForSpacing( value: number, clippingType: ClippingType, origin: number, spacing: number, round: ( n: number ) => number ): number { return clippingType === 'lenient' ? - Utils.roundSymmetric( ( value - origin ) / spacing ) : + roundSymmetric( ( value - origin ) / spacing ) : round( ( value - origin ) / spacing ); } diff --git a/js/TickLabelSet.ts b/js/TickLabelSet.ts index 2bafade..8679ffa 100644 --- a/js/TickLabelSet.ts +++ b/js/TickLabelSet.ts @@ -8,7 +8,6 @@ import Bounds2 from '../../dot/js/Bounds2.js'; import Range from '../../dot/js/Range.js'; -import Utils from '../../dot/js/Utils.js'; import optionize from '../../phet-core/js/optionize.js'; import Orientation from '../../phet-core/js/Orientation.js'; import StrictOmit from '../../phet-core/js/types/StrictOmit.js'; @@ -19,6 +18,7 @@ import bamboo from './bamboo.js'; import ChartTransform from './ChartTransform.js'; import ClippingType from './ClippingType.js'; import TickMarkSet from './TickMarkSet.js'; +import { toFixed } from '../../dot/js/util/toFixed.js'; type SelfOptions = { @@ -74,7 +74,7 @@ class TickLabelSet extends Path { skipCoordinates: [], extent: TickMarkSet.DEFAULT_EXTENT, clippingType: 'strict', - createLabel: ( value: number ) => new Text( Utils.toFixed( value, 1 ), { fontSize: 12 } ), + createLabel: ( value: number ) => new Text( toFixed( value, 1 ), { fontSize: 12 } ), positionLabel: ( label: Node, tickBounds: Bounds2, axisOrientation: Orientation ) => { if ( axisOrientation === Orientation.HORIZONTAL ) {