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

…ersion. Also corrected shelves not appearing on desired screens. #48
phetsims · Jan 30, 2019 · 1afb03a · 1afb03a
1 parent 9c3da7a
commit 1afb03a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/js/bounce/BounceScreen.js b/js/bounce/BounceScreen.js
@@ -31,7 +31,6 @@ define( require => {
     constructor( tandem, options ) {
 
       options = _.extend( {
-        basicsVersion: true,
         name: screenBounceString,
         backgroundColorProperty: MassesAndSpringsColorProfile.backgroundProperty,
         homeScreenIcon: new Image( bounceHomeScreenImage ),
@@ -45,6 +44,7 @@ define( require => {
 
           // model reference used for spring and mass creation
           const model = new MassesAndSpringsModel( modelTandem, options );
+          model.basicsVersion = true;
           model.addDefaultSprings( modelTandem );
           model.addDefaultMasses( modelTandem );
           return model;

diff --git a/js/bounce/view/BounceScreenView.js b/js/bounce/view/BounceScreenView.js
@@ -97,8 +97,15 @@ define( require => {
         rectY: this.modelViewTransform.modelToViewY( MassesAndSpringsConstants.FLOOR_Y ) - this.shelf.rectHeight
       } );
 
+      const mysteryMassesShelf = new ShelfNode( tandem, {
+        rectHeight: 7,
+        rectWidth: 120,
+        left: labeledMassesShelf.right + this.spacing * 2,
+        rectY: this.modelViewTransform.modelToViewY( MassesAndSpringsConstants.FLOOR_Y ) - this.shelf.rectHeight
+      } );
+
       // Back layer used to handle z order of view elements.
-      this.backLayer.children = [ this.backgroundDragPlane, rightPanelsVBox, labeledMassesShelf ];
+      this.backLayer.children = [ this.backgroundDragPlane, rightPanelsVBox, labeledMassesShelf, mysteryMassesShelf ];
     }
   }
 

diff --git a/js/lab/LabScreen.js b/js/lab/LabScreen.js
@@ -40,7 +40,7 @@ define( require => {
       }, options );
 
       super(
-        () => new LabModel( tandem.createTandem( 'model' ), options ),
+        () => new LabModel( tandem.createTandem( 'model' ), true, options ),
         model => { return new LabScreenView( model, tandem.createTandem( 'view' ) ); },
         options
       );

diff --git a/js/lab/view/LabScreenView.js b/js/lab/view/LabScreenView.js
@@ -38,7 +38,6 @@ define( require => {
 
       // Calls common spring view
       super( model, tandem );
-
       const vectorVisibilityControlNode = new VectorVisibilityControlNode(
         model,
         tandem.createTandem( 'vectorVisibilityControlNode' ),

diff --git a/js/stretch/StretchScreen.js b/js/stretch/StretchScreen.js
@@ -31,7 +31,6 @@ define( require => {
     constructor( tandem, options ) {
 
       options = _.extend( {
-        basicsVersion: true,
         name: screenStretchString,
         backgroundColorProperty: MassesAndSpringsColorProfile.backgroundProperty,
         homeScreenIcon: new Image( stretchHomeScreenImage ),

diff --git a/js/stretch/view/StretchScreenView.js b/js/stretch/view/StretchScreenView.js
@@ -97,6 +97,13 @@ define( require => {
         rectY: this.modelViewTransform.modelToViewY( MassesAndSpringsConstants.FLOOR_Y ) - this.shelf.rectHeight
       } );
 
+      const mysteryMassesShelf = new ShelfNode( tandem, {
+        rectHeight: 7,
+        rectWidth: 120,
+        left: labeledMassesShelf.right + this.spacing * 2,
+        rectY: this.modelViewTransform.modelToViewY( MassesAndSpringsConstants.FLOOR_Y ) - this.shelf.rectHeight
+      } );
+
       // @public {DraggableRulerNode}
       this.rulerNode = new DraggableRulerNode(
         this.modelViewTransform,
@@ -109,7 +116,7 @@ define( require => {
       this.addChild( this.rulerNode );
 
       // Back layer used to handle z order of view elements.
-      this.backLayer.children = [ this.backgroundDragPlane, optionsPanel, labeledMassesShelf ];
+      this.backLayer.children = [ this.backgroundDragPlane, optionsPanel, labeledMassesShelf, mysteryMassesShelf ];
 
       this.visibleBoundsProperty.link( () => {
         optionsPanel.rightTop = new Vector2( this.panelRightSpacing, this.springSystemControlsNode.top );