diff --git a/js/standardform/view/StandardFormInteractiveEquationNode.js b/js/standardform/view/StandardFormInteractiveEquationNode.js index 88705be7..af57ec73 100644 --- a/js/standardform/view/StandardFormInteractiveEquationNode.js +++ b/js/standardform/view/StandardFormInteractiveEquationNode.js @@ -45,20 +45,27 @@ define( require => { const bProperty = new NumberProperty( bRange.defaultValue, { range: bRange } ); const cProperty = new NumberProperty( cRange.defaultValue, { range: cRange } ); - //TODO #14 instrument pickers so they can be disabled // coefficient pickers const numberPickerOptions = { font: new PhetFont( GQConstants.INTERACTIVE_EQUATION_FONT_SIZE ), - color: GQColors.STANDARD_FORM_INTERACTIVE_CURVE, xMargin: 5, touchAreaXDilation: GQConstants.PICKER_TOUCH_AREA_X_DILATION }; const aNumberPicker = new NumberPicker( aProperty, new Property( aProperty.range ), - _.extend( {}, numberPickerOptions, { color: GQColors.STANDARD_FORM_A } ) ); + _.extend( { + color: GQColors.STANDARD_FORM_A, + tandem: options.tandem.createTandem( 'aNumberPicker' ) + }, numberPickerOptions ) ); const bNumberPicker = new NumberPicker( bProperty, new Property( bProperty.range ), - _.extend( {}, numberPickerOptions, { color: GQColors.STANDARD_FORM_B } ) ); + _.extend( { + color: GQColors.STANDARD_FORM_B, + tandem: options.tandem.createTandem( 'bNumberPicker' ) + }, numberPickerOptions ) ); const cNumberPicker = new NumberPicker( cProperty, new Property( cProperty.range ), - _.extend( {}, numberPickerOptions, { color: GQColors.STANDARD_FORM_C } ) ); + _.extend( { + color: GQColors.STANDARD_FORM_C, + tandem: options.tandem.createTandem( 'cNumberPicker' ) + }, numberPickerOptions ) ); // static parts of the equation const richTextOptions = { diff --git a/js/vertexform/view/VertexFormInteractiveEquationNode.js b/js/vertexform/view/VertexFormInteractiveEquationNode.js index 4d051567..3c466db5 100644 --- a/js/vertexform/view/VertexFormInteractiveEquationNode.js +++ b/js/vertexform/view/VertexFormInteractiveEquationNode.js @@ -45,7 +45,6 @@ define( require => { const hProperty = new NumberProperty( hRange.defaultValue, { range: hRange } ); const kProperty = new NumberProperty( kRange.defaultValue, { range: kRange } ); - //TODO #14 instrument pickers so they can be disabled // Coefficient pickers const numberPickerOptions = { font: new PhetFont( GQConstants.INTERACTIVE_EQUATION_FONT_SIZE ), @@ -53,11 +52,20 @@ define( require => { touchAreaXDilation: GQConstants.PICKER_TOUCH_AREA_X_DILATION }; const aNumberPicker = new NumberPicker( aProperty, new Property( aProperty.range ), - _.extend( {}, numberPickerOptions, { color: GQColors.VERTEX_FORM_A } ) ); + _.extend( { + color: GQColors.VERTEX_FORM_A, + tandem: options.tandem.createTandem( 'aNumberPicker' ) + }, numberPickerOptions ) ); const hNumberPicker = new NumberPicker( hProperty, new Property( hProperty.range ), - _.extend( {}, numberPickerOptions, { color: GQColors.VERTEX_FORM_H } ) ); + _.extend( { + color: GQColors.VERTEX_FORM_H, + tandem: options.tandem.createTandem( 'hNumberPicker' ) + }, numberPickerOptions ) ); const kNumberPicker = new NumberPicker( kProperty, new Property( kProperty.range ), - _.extend( {}, numberPickerOptions, { color: GQColors.VERTEX_FORM_K } ) ); + _.extend( { + color: GQColors.VERTEX_FORM_K, + tandem: options.tandem.createTandem( 'kNumberPicker' ) + }, numberPickerOptions ) ); // static parts of the equation const richTextOptions = {