Revert "support dynamic range via Property, phetsims/phet-io-wrappers#45

 phetsims/gravity-force-lab#172"

This reverts commit 0e01429.

js/model/ISLCObject.js

@@ -14,12 +14,12 @@ import Property from '../../../axon/js/Property.js';
 import Range from '../../../dot/js/Range.js';
 import merge from '../../../phet-core/js/merge.js';
 import NumberIO from '../../../tandem/js/types/NumberIO.js';
-import inverseSquareLawCommon from '../inverseSquareLawCommon.js';
 import ISLCConstants from '../ISLCConstants.js';
+import inverseSquareLawCommon from '../inverseSquareLawCommon.js';
 import ISLCObjectEnum from '../view/ISLCObjectEnum.js';
 
 class ISLCObject {
-
+  
   /**
    * @param {number} initialMass
    * @param {Vector2} initialPosition
@@ -30,37 +30,27 @@ class ISLCObject {
    * @param {Object} [options]
    */
   constructor( initialMass, initialPosition, valueRange, constantRadiusProperty, calculateRadius, tandem, options ) {
-
+  
     options = merge( {
-
+  
       // in meters
       leftObjectBoundary: ISLCConstants.LEFT_OBJECT_BOUNDARY,
       rightObjectBoundary: ISLCConstants.RIGHT_OBJECT_BOUNDARY,
       constantRadius: ISLCConstants.CONSTANT_RADIUS, // radius when constant
-
+  
       valueUnits: 'kilograms',
       valueStep: null
     }, options );
-
-    const enabledRange = new Range( options.leftObjectBoundary, options.rightObjectBoundary );
-
-    // @public {Property.<Range>}- set by ISLCModel when the force changes, the range for position of the objects
-    // based on their radius and position
-    this.enabledRangeProperty = new Property( enabledRange, {
-      tandem: tandem.createTandem( 'enabledRangeProperty' ),
-      phetioDocumentation: 'The range for position of this object based on the radius and position of both objects',
-      phetioType: Property.PropertyIO( Range.RangeIO ),
-      phetioReadOnly: true
-    } );
-
+
     // @public
     this.positionProperty = new NumberProperty( initialPosition, {
       tandem: tandem.createTandem( 'positionProperty' ),
       units: 'meters',
-      range: this.enabledRangeProperty,
-      phetioDocumentation: 'The position of the object along the track, in meters. The origin is in the center between the two objects.'
+      range: new Range( options.leftObjectBoundary, options.rightObjectBoundary ),
+      phetioDocumentation: 'The position of the object along the track, in meters. The origin is in the center between the two objects.',
+      phetioStudioControl: false // temporary workaround until we support dynamic ranges in https://github.com/phetsims/gravity-force-lab/issues/172
     } );
-
+  
     // @public {Property.<number>} - the mass or charge of the object in kilograms or coulombs
     this.valueProperty = new NumberProperty( initialMass, {
       tandem: tandem.createTandem( 'valueProperty' ),
@@ -69,10 +59,10 @@ class ISLCObject {
       phetioDocumentation: 'The value of the object',
       step: options.valueStep
     } );
-
+  
     // @public (read-only) {function(mass:number):number}
     this.calculateRadius = calculateRadius;
-
+  
     // @public {Property.<number>} - the radius of the mass or charge in meters
     // since ISLCObjects are never destroyed, no need to dispose
     this.radiusProperty = new DerivedProperty( [ this.valueProperty, constantRadiusProperty ],
@@ -85,41 +75,52 @@ class ISLCObject {
         phetioType: DerivedProperty.DerivedPropertyIO( NumberIO )
       }
     );
-
+
+    const enabledRange = new Range( options.leftObjectBoundary, options.rightObjectBoundary );
+
+    // @public {Property.<Range>}- set by ISLCModel when the force changes, the range for position of the objects
+    // based on their radius and position
+    this.enabledRangeProperty = new Property( enabledRange, {
+      tandem: tandem.createTandem( 'enabledRangeProperty' ),
+      phetioDocumentation: 'The range for position of this object based on the radius and position of both objects',
+      phetioType: Property.PropertyIO( Range.RangeIO ),
+      phetioReadOnly: true
+    } );
+
     // @public (read-only) - Emitter that fires whenever the position changes as a result of an object's value changing.
     // Emits with the objectEnum that caused the position change.
     this.positionChangedFromSecondarySourceEmitter = new Emitter( { parameters: [ { valueType: ISLCObjectEnum } ] } );
-
+  
     // @public - flag to check if the object is being dragged by the user
     //           set in the drag handler
     this.isDraggingProperty = new BooleanProperty( false );
-
+  
     // @public - flag to check whether object's radius was updated, used to determine positioning
     this.radiusLastChanged = false;
-
+  
     // @private - flag flipped when the value change is updated. This is used to check if a position change is caused
     // from a value change. See https://github.com/phetsims/gravity-force-lab-basics/issues/168
     this.valueChangedSinceLastStep = false;
-
+  
     // @public (read-only) - flag flipped when the constant radius boolean is toggled. This is used to check if a position change is
     // caused from the constant radius toggling. See https://github.com/phetsims/gravity-force-lab-basics/issues/168
     this.constantRadiusChangedSinceLastStep = false;
-
+  
     // @public
     this.valueRange = valueRange;
-
+  
     // @public {ISLCObjectEnum|null} - filled in by ISLCModel
     this.enum = null;
-
+  
     // @public {Property.<Color>} - filled in by subtypes
     // - object node color is will change with value (linked in ISLCObjectNode.js)
     //   - color Property will be updated based on a boolean value (negative vs positive)
     //   - brightness will be set according to the Mass/Charge magnitude
     this.baseColorProperty = null;
-
+  
     // @public (read-only) {number} - the radius of the object when radius is constant.
     this.constantRadius = options.constantRadius;
-
+  
     // Link these flags to their associatedProperties
     this.valueProperty.link( () => { this.valueChangedSinceLastStep = true; } );
     constantRadiusProperty.link( () => { this.constantRadiusChangedSinceLastStep = true; } );