use 3 decimal places for pH meter in Micro and My Solution screens, #225

phetsims · Jul 26, 2021 · a7b56c9 · a7b56c9
1 parent 4c6cfe5
commit a7b56c9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/js/common/PHScaleConstants.js b/js/common/PHScaleConstants.js
@@ -44,7 +44,8 @@ const PHScaleConstants = {
 
   // pH
   PH_RANGE: new RangeWithValue( -1, 15, 7 ),
-  PH_METER_DECIMAL_PLACES: 2,
+  MACRO_PH_METER_DECIMAL_PLACES: 2,
+  MICRO_PH_METER_DECIMAL_PLACES: 3,
 
   // volume
   VOLUME_DECIMAL_PLACES: 2,

diff --git a/js/common/view/PHMeterNode.js b/js/common/view/PHMeterNode.js
@@ -79,7 +79,7 @@ class PHMeterNode extends AccordionBox {
 
       // the meter is not interactive, just display the pH value
       contentNode = new NumberDisplay( pHProperty, PHScaleConstants.PH_RANGE, {
-        decimalPlaces: PHScaleConstants.PH_METER_DECIMAL_PLACES,
+        decimalPlaces: PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES,
         cornerRadius: CORNER_RADIUS,
         textOptions: {
           font: new PhetFont( 28 ),
@@ -137,18 +137,18 @@ class PHSpinnerNode extends NumberSpinner {
    */
   constructor( pHProperty, options ) {
 
-    const pHDelta = 1 / Math.pow( 10, PHScaleConstants.PH_METER_DECIMAL_PLACES );
+    const pHDelta = 1 / Math.pow( 10, PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES );
 
     // When using the spinner to change pH, constrain pHProperty to be exactly the value displayed by the spinner.
     // See https://github.com/phetsims/ph-scale/issues/143
     const incrementFunction = value => {
-      value = Utils.toFixedNumber( value, PHScaleConstants.PH_METER_DECIMAL_PLACES );
-      return Utils.toFixedNumber( value + pHDelta, PHScaleConstants.PH_METER_DECIMAL_PLACES );
+      value = Utils.toFixedNumber( value, PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES );
+      return Utils.toFixedNumber( value + pHDelta, PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES );
     };
 
     const decrementFunction = value => {
-      value = Utils.toFixedNumber( value, PHScaleConstants.PH_METER_DECIMAL_PLACES );
-      return Utils.toFixedNumber( value - pHDelta, PHScaleConstants.PH_METER_DECIMAL_PLACES );
+      value = Utils.toFixedNumber( value, PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES );
+      return Utils.toFixedNumber( value - pHDelta, PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES );
     };
 
     options = merge( {
@@ -157,7 +157,7 @@ class PHSpinnerNode extends NumberSpinner {
       incrementFunction: incrementFunction,
       decrementFunction: decrementFunction,
       numberDisplayOptions: {
-        decimalPlaces: PHScaleConstants.PH_METER_DECIMAL_PLACES,
+        decimalPlaces: PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES,
         xMargin: 10,
         yMargin: 4,
         cornerRadius: CORNER_RADIUS,

diff --git a/js/common/view/RatioNode.js b/js/common/view/RatioNode.js
@@ -146,7 +146,7 @@ class RatioNode extends Node {
 
     let pH = this.solution.pHProperty.get();
     if ( pH !== null ) {
-      pH = Utils.toFixedNumber( this.solution.pHProperty.get(), PHScaleConstants.PH_METER_DECIMAL_PLACES );
+      pH = Utils.toFixedNumber( this.solution.pHProperty.get(), PHScaleConstants.MICRO_PH_METER_DECIMAL_PLACES );
     }
 
     if ( this.pH !== pH ) {

diff --git a/js/macro/model/MacroSolution.js b/js/macro/model/MacroSolution.js
@@ -220,7 +220,7 @@ class MacroSolution extends PhetioObject {
    * @private
    */
   isEquivalentToWater() {
-    return Utils.toFixedNumber( this.pHProperty.get(), PHScaleConstants.PH_METER_DECIMAL_PLACES ) === Water.pH;
+    return Utils.toFixedNumber( this.pHProperty.get(), PHScaleConstants.MACRO_PH_METER_DECIMAL_PLACES ) === Water.pH;
   }
 }
 

diff --git a/js/macro/view/MacroPHMeterNode.js b/js/macro/view/MacroPHMeterNode.js
@@ -359,7 +359,7 @@ class PHIndicatorNode extends Node {
 
     // pH display
     const numberDisplay = new NumberDisplay( pHProperty, PHScaleConstants.PH_RANGE, {
-      decimalPlaces: PHScaleConstants.PH_METER_DECIMAL_PLACES,
+      decimalPlaces: PHScaleConstants.MACRO_PH_METER_DECIMAL_PLACES,
       align: 'right',
       noValueAlign: 'center',
       cornerRadius: CORNER_RADIUS,
@@ -445,7 +445,7 @@ class PHIndicatorNode extends Node {
       arrowNode.visible = lineNode.visible = enabled;
 
       // Highlight the indicator when displayed pH === 7
-      highlight.visible = ( Utils.toFixedNumber( pH, PHScaleConstants.PH_METER_DECIMAL_PLACES ) === 7 );
+      highlight.visible = ( Utils.toFixedNumber( pH, PHScaleConstants.MACRO_PH_METER_DECIMAL_PLACES ) === 7 );
     } );
   }
 }