Skip to content

Commit

Permalink
uninstrument some text elements, see #341
Browse files Browse the repository at this point in the history
  • Loading branch information
jbphet committed Aug 7, 2023
1 parent e9a2082 commit fb1d6c1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
2 changes: 1 addition & 1 deletion js/common/model/PhotonAbsorbingEmittingLayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class PhotonAbsorbingEmittingLayer extends PhetioObject {
const options = optionize<PhotonAbsorbingEmittingLayerOptions, SelfOptions, PhetioObjectOptions>()( {
thickness: 0,
photonMaxLateralJumpProportion: 0.01,
photonAbsorptionTime: 0.1,
photonAbsorptionTime: 5,
absorbanceMultiplier: 1,
phetioType: PhotonAbsorbingEmittingLayer.PhotonAbsorbingEmittingLayerIO,

Expand Down
16 changes: 5 additions & 11 deletions js/common/view/ThermometerAndReadout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,19 @@ class ThermometerAndReadout extends Node {
kelvinUnitsStringProperty,
temperatureInKelvinProperty,
temperatureInKelvinProperty.range,
TemperatureUnits.KELVIN,
`kelvin${ComboBox.ITEM_TANDEM_NAME_SUFFIX}`
TemperatureUnits.KELVIN
),
ThermometerAndReadout.createComboBoxItem(
celsiusUnitsStringProperty,
temperatureInCelsiusProperty,
celsiusRange,
TemperatureUnits.CELSIUS,
`celsius${ComboBox.ITEM_TANDEM_NAME_SUFFIX}`
TemperatureUnits.CELSIUS
),
ThermometerAndReadout.createComboBoxItem(
fahrenheitUnitsStringProperty,
temperatureInFahrenheitProperty,
fahrenheitRange,
TemperatureUnits.FAHRENHEIT,
`fahrenheit${ComboBox.ITEM_TANDEM_NAME_SUFFIX}`
TemperatureUnits.FAHRENHEIT
)
];

Expand Down Expand Up @@ -190,8 +187,7 @@ class ThermometerAndReadout extends Node {
return units === TemperatureUnits.KELVIN ? kelvinUnitsString :
units === TemperatureUnits.CELSIUS ? celsiusUnitsString :
fahrenheitUnitsString;
},
{ tandem: options.tandem.createTandem( 'unitsStringProperty' ) }
}
);

// Create the temperature readout.
Expand Down Expand Up @@ -230,8 +226,7 @@ class ThermometerAndReadout extends Node {
private static createComboBoxItem( unitsStringProperty: TReadOnlyProperty<string>,
property: TReadOnlyProperty<number>,
propertyRange: Range,
propertyValue: TemperatureUnits,
tandemName: string ): ComboBoxItem<TemperatureUnits> {
propertyValue: TemperatureUnits ): ComboBoxItem<TemperatureUnits> {
return {
value: propertyValue,
createNode: tandem => new NumberDisplay( property, propertyRange, {
Expand All @@ -248,7 +243,6 @@ class ThermometerAndReadout extends Node {
tandem: tandem,
phetioVisiblePropertyInstrumented: false
} ),
tandemName: tandemName,
a11yName: TemperatureDescriber.getTemperatureUnitsString( propertyValue )
};
}
Expand Down
9 changes: 5 additions & 4 deletions js/layer-model/view/AtmosphereLayerNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,13 @@ class AtmosphereLayerNode extends Node {
temperatureUnits === TemperatureUnits.KELVIN ? kelvinString :
temperatureUnits === TemperatureUnits.CELSIUS ? celsiusString :
fahrenheitString;
},
{ tandem: options.tandem.createTandem( 'unitsStringProperty' ) }
}
)
}, {
},
{
tandem: temperatureReadoutTandem.createTandem( 'valuePatternStringProperty' )
} ),
}
),
tandem: temperatureReadoutTandem,
decimalPlaces: 1,
cornerRadius: 3,
Expand Down

0 comments on commit fb1d6c1

Please sign in to comment.