Skip to content

Commit

Permalink
rename pHIndicatorNode, #92
Browse files Browse the repository at this point in the history
  • Loading branch information
pixelzoom committed Feb 6, 2020
1 parent 1f46c8b commit ab38f07
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions js/macro/view/MacroPHMeterNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ define( require => {
scaleNode.translation = modelViewTransform.modelToViewPosition( meter.bodyPosition );

// indicator that slides vertically along scale
const indicatorNode = new IndicatorNode( meter.valueProperty, SCALE_SIZE.width, {
tandem: options.tandem.createTandem( 'indicatorNode' )
const pHIndicatorNode = new PHIndicatorNode( meter.valueProperty, SCALE_SIZE.width, {
tandem: options.tandem.createTandem( 'pHIndicatorNode' )
} );
indicatorNode.left = scaleNode.x;
pHIndicatorNode.left = scaleNode.x;

// interactive probe
const probeNode = new PHProbeNode( meter.probe, modelViewTransform, solutionNode, dropperFluidNode,
Expand All @@ -103,11 +103,11 @@ define( require => {
this.addChild( wireNode );
this.addChild( probeNode );
this.addChild( scaleNode );
this.addChild( indicatorNode );
this.addChild( pHIndicatorNode );

// vertical position of the indicator
meter.valueProperty.link( value => {
indicatorNode.centerY = scaleNode.y + Utils.linear( PHScaleConstants.PH_RANGE.min, PHScaleConstants.PH_RANGE.max, SCALE_SIZE.height, 0, value || 7 );
pHIndicatorNode.centerY = scaleNode.y + Utils.linear( PHScaleConstants.PH_RANGE.min, PHScaleConstants.PH_RANGE.max, SCALE_SIZE.height, 0, value || 7 );
} );

const updateValue = () => {
Expand Down Expand Up @@ -416,7 +416,7 @@ define( require => {
* pH indicator that slides vertically along scale.
* When there is no pH value, it points to 'neutral' but does not display a value.
*/
class IndicatorNode extends Node {
class PHIndicatorNode extends Node {

/**
* @param {Property.<number>} pHProperty
Expand Down
34 changes: 17 additions & 17 deletions js/phet-io/ph-scale-phet-io-elements-baseline.js
Original file line number Diff line number Diff line change
Expand Up @@ -4265,34 +4265,34 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioStudioControl": true,
"phetioTypeName": "NodeIO"
},
"phScale.macroScreen.view.pHMeterNode.indicatorNode": {
"phetioDocumentation": "",
"phScale.macroScreen.view.pHMeterNode.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
"phetioFeatured": false,
"phetioHighFrequency": false,
"phetioIsArchetype": false,
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioTypeName": "NodeIO"
"phetioTypeName": "NumberPropertyIO"
},
"phScale.macroScreen.view.pHMeterNode.indicatorNode.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phScale.macroScreen.view.pHMeterNode.pHIndicatorNode": {
"phetioDocumentation": "",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
"phetioFeatured": false,
"phetioHighFrequency": false,
"phetioIsArchetype": false,
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioState": false,
"phetioStudioControl": true,
"phetioTypeName": "NumberPropertyIO"
"phetioTypeName": "NodeIO"
},
"phScale.macroScreen.view.pHMeterNode.indicatorNode.pickableProperty": {
"phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
"phScale.macroScreen.view.pHMeterNode.pHIndicatorNode.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
"phetioFeatured": false,
Expand All @@ -4302,10 +4302,10 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<NullableIO<BooleanIO>>"
"phetioTypeName": "NumberPropertyIO"
},
"phScale.macroScreen.view.pHMeterNode.indicatorNode.visibleProperty": {
"phetioDocumentation": "Controls whether the Node will be visible (and interactive), see the NodeIO documentation for more details.",
"phScale.macroScreen.view.pHMeterNode.pHIndicatorNode.pickableProperty": {
"phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
"phetioFeatured": false,
Expand All @@ -4315,10 +4315,10 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioTypeName": "PropertyIO<BooleanIO>"
"phetioTypeName": "PropertyIO<NullableIO<BooleanIO>>"
},
"phScale.macroScreen.view.pHMeterNode.opacityProperty": {
"phetioDocumentation": "Opacity of the parent NodeIO, between 0 (invisible) and 1 (fully visible)",
"phScale.macroScreen.view.pHMeterNode.pHIndicatorNode.visibleProperty": {
"phetioDocumentation": "Controls whether the Node will be visible (and interactive), see the NodeIO documentation for more details.",
"phetioDynamicElement": false,
"phetioEventType": "MODEL",
"phetioFeatured": false,
Expand All @@ -4328,7 +4328,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioTypeName": "NumberPropertyIO"
"phetioTypeName": "PropertyIO<BooleanIO>"
},
"phScale.macroScreen.view.pHMeterNode.pickableProperty": {
"phetioDocumentation": "Sets whether the node will be pickable (and hence interactive), see the NodeIO documentation for more details",
Expand Down

0 comments on commit ab38f07

Please sign in to comment.