Skip to content

Commit

Permalink
remove studio slider to prefer sim sliders, #219
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Feb 15, 2020
1 parent 0e8b1cb commit 7373e2b
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 21 deletions.
4 changes: 4 additions & 0 deletions js/common/model/ProjectileMotionModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ define( require => {
this.cannonHeightProperty = new NumberProperty( options.defaultCannonHeight, {
tandem: tandem.createTandem( 'cannonHeightProperty' ),
phetioDocumentation: 'Height of the cannon',
phetioStudioControl: false, // see https://github.com/phetsims/projectile-motion/issues/219
units: 'm',
range: ProjectileMotionConstants.CANNON_HEIGHT_RANGE
} );
Expand All @@ -75,6 +76,7 @@ define( require => {
this.cannonAngleProperty = new NumberProperty( options.defaultCannonAngle, {
tandem: tandem.createTandem( 'cannonAngleProperty' ),
phetioDocumentation: 'Angle of the cannon',
phetioStudioControl: false, // see https://github.com/phetsims/projectile-motion/issues/219
units: '\u00B0', // in degrees
range: ProjectileMotionConstants.CANNON_ANGLE_RANGE
} );
Expand All @@ -83,6 +85,7 @@ define( require => {
this.initialSpeedProperty = new NumberProperty( options.defaultInitialSpeed, {
tandem: tandem.createTandem( 'initialSpeedProperty' ),
phetioDocumentation: 'The speed on launch',
phetioStudioControl: false, // see https://github.com/phetsims/projectile-motion/issues/219
units: 'm/s',
range: ProjectileMotionConstants.LAUNCH_VELOCITY_RANGE
} );
Expand Down Expand Up @@ -126,6 +129,7 @@ define( require => {
this.gravityProperty = new NumberProperty( PhysicalConstants.GRAVITY_ON_EARTH, {
tandem: tandem.createTandem( 'gravityProperty' ),
phetioDocumentation: 'Acceleration due to gravity',
phetioStudioControl: false, // see https://github.com/phetsims/projectile-motion/issues/219
units: 'm/s^2'
} );

Expand Down
3 changes: 2 additions & 1 deletion js/common/view/ProjectileMotionScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ define( require => {
const zoomProperty = new NumberProperty( DEFAULT_ZOOM, {
tandem: tandem.createTandem( 'zoomProperty' ),
range: new Range( MIN_ZOOM, MAX_ZOOM ),
phetioDocumentation: 'Used to adjust to visual zoom for this screen'
phetioDocumentation: 'Used to adjust to visual zoom for this screen',
phetioStudioControl: false // see https://github.com/phetsims/projectile-motion/issues/219
} );

// zoom control view
Expand Down
40 changes: 20 additions & 20 deletions js/phet-io/projectile-motion-phet-io-elements-baseline.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.dragScreen.model.cannonHeightProperty": {
Expand All @@ -102,7 +102,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.dragScreen.model.fireEnabledProperty": {
Expand All @@ -128,7 +128,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.dragScreen.model.initialSpeedProperty": {
Expand All @@ -141,7 +141,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.dragScreen.model.isPlayingProperty": {
Expand Down Expand Up @@ -6121,7 +6121,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.general.activeProperty": {
Expand Down Expand Up @@ -10099,7 +10099,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.introScreen.model.cannonHeightProperty": {
Expand All @@ -10112,7 +10112,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.introScreen.model.fireEnabledProperty": {
Expand All @@ -10138,7 +10138,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.introScreen.model.initialSpeedProperty": {
Expand All @@ -10151,7 +10151,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.introScreen.model.isPlayingProperty": {
Expand Down Expand Up @@ -14844,7 +14844,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.labScreen": {
Expand Down Expand Up @@ -14922,7 +14922,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.labScreen.model.cannonHeightProperty": {
Expand All @@ -14935,7 +14935,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.labScreen.model.fireEnabledProperty": {
Expand All @@ -14961,7 +14961,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.labScreen.model.initialSpeedProperty": {
Expand All @@ -14974,7 +14974,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.labScreen.model.isPlayingProperty": {
Expand Down Expand Up @@ -36918,7 +36918,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.vectorsScreen": {
Expand Down Expand Up @@ -36983,7 +36983,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.vectorsScreen.model.cannonHeightProperty": {
Expand All @@ -36996,7 +36996,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.vectorsScreen.model.fireEnabledProperty": {
Expand All @@ -37022,7 +37022,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.vectorsScreen.model.initialSpeedProperty": {
Expand All @@ -37035,7 +37035,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
},
"projectileMotion.vectorsScreen.model.isPlayingProperty": {
Expand Down Expand Up @@ -41910,7 +41910,7 @@ window.phet.phetio.phetioElementsBaseline = assert &&
"phetioPlayback": false,
"phetioReadOnly": false,
"phetioState": true,
"phetioStudioControl": true,
"phetioStudioControl": false,
"phetioTypeName": "NumberPropertyIO"
}
};

0 comments on commit 7373e2b

Please sign in to comment.