Made TNumber nonparametric and moved range/units to NumberProperty, see

phetsims/axon#137
phetsims · Sep 11, 2017 · 712bf2f · 712bf2f
1 parent 9379acb
commit 712bf2f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/js/photon-absorption/model/PhotonAbsorptionModel.js b/js/photon-absorption/model/PhotonAbsorptionModel.js
@@ -19,28 +19,29 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var BooleanProperty = require( 'AXON/BooleanProperty' );
+  var NumberProperty = require( 'AXON/NumberProperty' );
+  var ObservableArray = require( 'AXON/ObservableArray' );
+  var Property = require( 'AXON/Property' );
+  var Vector2 = require( 'DOT/Vector2' );
+  var moleculesAndLight = require( 'MOLECULES_AND_LIGHT/moleculesAndLight' );
   var CO = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/molecules/CO' );
   var CO2 = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/molecules/CO2' );
   var H2O = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/molecules/H2O' );
-  var inherit = require( 'PHET_CORE/inherit' );
   var N2 = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/molecules/N2' );
   var NO2 = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/molecules/NO2' );
   var O2 = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/molecules/O2' );
   var O3 = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/molecules/O3' );
-  var ObservableArray = require( 'AXON/ObservableArray' );
   var Photon = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/Photon' );
   var PhotonTarget = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/PhotonTarget' );
-  var Property = require( 'AXON/Property' );
-  var BooleanProperty = require( 'AXON/BooleanProperty' );
-  var Vector2 = require( 'DOT/Vector2' );
   var WavelengthConstants = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/WavelengthConstants' );
-  var moleculesAndLight = require( 'MOLECULES_AND_LIGHT/moleculesAndLight' );
+  var inherit = require( 'PHET_CORE/inherit' );
 
   // phet-io modules
-  var TMolecule = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/TMolecule' );
   var TNumber = require( 'ifphetio!PHET_IO/types/TNumber' );
-  var TPhoton = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/TPhoton' );
   var TString = require( 'ifphetio!PHET_IO/types/TString' );
+  var TMolecule = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/TMolecule' );
+  var TPhoton = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/TPhoton' );
   var TPhotonAbsorptionModel = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/TPhotonAbsorptionModel' );
 
   // ------- constants -------------
@@ -76,22 +77,22 @@ define( function( require ) {
     this.photonGroupTandem = tandem.createGroupTandem( 'photons' );
 
     // @public
-    this.emissionFrequencyProperty = new Property( 0, {
+    this.emissionFrequencyProperty = new NumberProperty( 0, {
       tandem: tandem.createTandem( 'emissionFrequencyProperty' ),
-      phetioValueType: TNumber( { units: 'hertz' } )
-    });
+      units: 'hertz'
+    } );
 
     // @public
     this.photonWavelengthProperty = new Property( WavelengthConstants.IR_WAVELENGTH, {
       tandem: tandem.createTandem( 'photonWavelengthProperty' ),
-      phetioValueType: TNumber( {
-        units: 'meters', values: [
-          WavelengthConstants.MICRO_WAVELENGTH,
-          WavelengthConstants.IR_WAVELENGTH,
-          WavelengthConstants.VISIBLE_WAVELENGTH,
-          WavelengthConstants.UV_WAVELENGTH
-        ]
-      } )
+      units: 'meters',
+      validValues: [
+        WavelengthConstants.MICRO_WAVELENGTH,
+        WavelengthConstants.IR_WAVELENGTH,
+        WavelengthConstants.VISIBLE_WAVELENGTH,
+        WavelengthConstants.UV_WAVELENGTH
+      ],
+      phetioValueType: TNumber
     } );
 
     this.photonTargetProperty = new Property( initialPhotonTarget, {
@@ -164,7 +165,7 @@ define( function( require ) {
       this.emissionFrequencyProperty.reset();
       this.photonWavelengthProperty.reset();
       this.runningProperty.reset();
-      this.photonTargetProperty.reset();      
+      this.photonTargetProperty.reset();
     },
 
     /**

diff --git a/js/photon-absorption/model/TPhoton.js b/js/photon-absorption/model/TPhoton.js
@@ -30,17 +30,17 @@ define( function( require ) {
     documentation: 'A Photon',
     fromStateObject: function( stateObject ) {
       return {
-        vx: TNumber().fromStateObject( stateObject.vx ),
-        vy: TNumber().fromStateObject( stateObject.vy ),
-        wavelength: TNumber().fromStateObject( stateObject.wavelength )
+        vx: TNumber.fromStateObject( stateObject.vx ),
+        vy: TNumber.fromStateObject( stateObject.vy ),
+        wavelength: TNumber.fromStateObject( stateObject.wavelength )
       };
     },
 
     toStateObject: function( value ) {
       return {
-        vx: TNumber().toStateObject( value.vx ),
-        vy: TNumber().toStateObject( value.vy ),
-        wavelength: TNumber().toStateObject( value.wavelength )
+        vx: TNumber.toStateObject( value.vx ),
+        vy: TNumber.toStateObject( value.vy ),
+        wavelength: TNumber.toStateObject( value.wavelength )
       };
     }
   } );