Addressed REVIEW: Corrections after refactoring model.options.basicsV…

…ersion. Also corrected shelves not appearing on desired screens. phetsims/masses-and-springs-basics#48
phetsims · Jan 30, 2019 · 7f2c2e1 · 7f2c2e1
1 parent f334342
commit 7f2c2e1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/js/common/model/MassesAndSpringsModel.js b/js/common/model/MassesAndSpringsModel.js
@@ -42,7 +42,7 @@ define( function( require ) {
   function MassesAndSpringsModel( tandem ) {
 
     // Flag used to differentiate basics and non-basics version
-    this.basicsVersion = false;
+    this.basicsVersion = true;
 
     // @public {Enumeration}
     this.forcesModeChoice = new Enumeration( [ 'FORCES', 'NET_FORCES' ] );

diff --git a/js/energy/model/EnergyModel.js b/js/energy/model/EnergyModel.js
@@ -23,6 +23,7 @@ define( function( require ) {
    */
   function EnergyModel( tandem ) {
     MassesAndSpringsModel.call( this, tandem );
+    this.basicsVersion = false;
 
     // Energy screen should have spring damping
     // REVIEW: This looks like we should pass in the initial value of damping, instead of overwriting the Property.

diff --git a/js/energy/view/EnergyScreenView.js b/js/energy/view/EnergyScreenView.js
@@ -52,6 +52,7 @@ define( function( require ) {
     this.addChild( rightPanelsVBox );
     rightPanelsVBox.moveToBack();
 
+
     this.visibleBoundsProperty.link( function() {
       rightPanelsVBox.rightTop = new Vector2( self.panelRightSpacing, self.energyGraphNode.top );
     } );

diff --git a/js/intro/model/IntroModel.js b/js/intro/model/IntroModel.js
@@ -29,6 +29,7 @@ define( function( require ) {
 
     MassesAndSpringsModel.call( this, tandem );
     var self = this;
+    this.basicsVersion = false;
 
     // @public {Enumeration} Choices for constant parameter
     this.constantModeChoice = new Enumeration( [ 'SPRING_CONSTANT', 'SPRING_THICKNESS' ] );

diff --git a/js/lab/LabScreen.js b/js/lab/LabScreen.js
@@ -39,7 +39,7 @@ define( function( require ) {
 
     Screen.call( this,
       function() {
-        return new LabModel( tandem.createTandem( 'model' ) );
+        return new LabModel( tandem.createTandem( 'model' ), false );
       },
       function( model ) {
         return new LabScreenView( model, tandem.createTandem( 'view' ) );

diff --git a/js/lab/model/LabModel.js b/js/lab/model/LabModel.js
@@ -24,14 +24,16 @@ define( function( require ) {
   var MASS_OFFSET = 0.15;
 
   /**
+   * @param {Boolean} basicsVersion
    * @param {Tandem} tandem
    * @param {object} options
    *
    * @constructor
    */
-  function LabModel( tandem, options ) {
+  function LabModel( tandem, basicsVersion, options ) {
 
     MassesAndSpringsModel.call( this, tandem, options );
+    this.basicsVersion = basicsVersion;
 
     // Lab screen shouldn't have spring damping for non-basics version
     this.dampingProperty = new NumberProperty( this.basicsVersion ? 0 : 0.0575 );

diff --git a/js/vectors/VectorsScreen.js b/js/vectors/VectorsScreen.js
@@ -41,6 +41,7 @@ define( function( require ) {
       function() {
         var modelTandem = tandem.createTandem( 'model' );
         var model = new MassesAndSpringsModel( modelTandem );
+        model.basicsVersion = false;
         model.addDefaultSprings( modelTandem );
         model.addDefaultMasses( modelTandem );
         return model;