Added logic to remove vector arrows if the massNode is an icon. #250

phetsims · May 15, 2018 · 92833ff · 92833ff
1 parent be29567
commit 92833ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/js/common/view/MassNode.js b/js/common/view/MassNode.js
@@ -199,12 +199,14 @@ define( function( require ) {
     var springForceArrow = new ForceVectorArrow( MassesAndSpringsConstants.SPRING_ARROW_COLOR );
     var netForceArrow = new ForceVectorArrow( 'black' );
 
-    this.addChild( velocityArrow );
-    this.addChild( accelerationArrow );
-    this.addChild( gravityForceArrow );
-    this.addChild( springForceArrow );
-    this.addChild( netForceArrow );
-    this.addChild( forceNullLine );
+    if ( !mass.icon ) {
+      this.addChild( velocityArrow );
+      this.addChild( accelerationArrow );
+      this.addChild( gravityForceArrow );
+      this.addChild( springForceArrow );
+      this.addChild( netForceArrow );
+      this.addChild( forceNullLine );
+    }
 
     // Used to position the vectors on the left of right side of the massNode depending on the attached spring.
     var forcesOrientation = 1;

diff --git a/js/common/view/MassValueControlPanel.js b/js/common/view/MassValueControlPanel.js
@@ -53,16 +53,16 @@ define( function( require ) {
       valuePattern: StringUtils.fillIn( massValueString, {
         mass: '{0}'
       } ),
-      valueFont: new PhetFont( 14 ),
+      valueFont: new PhetFont( 16 ),
       majorTickLength: 10,
-      titleFont: new PhetFont( { size: 14, weight: 'bold' } ),
+      titleFont: new PhetFont( { size: 16, weight: 'bold' } ),
       titleMaxWidth: 55,
       trackSize: new Dimension2( 125, 0.1 ),
       thumbSize: new Dimension2( 13, 24 ),
       thumbFillEnabled: '#00C4DF',
       thumbFillHighlighted: MassesAndSpringsConstants.THUMB_HIGHLIGHT,
       stroke: null,
-      valueMaxWidth:40,
+      valueMaxWidth: 40,
       sliderIndent: 7,
       majorTicks: [
         {
@@ -97,8 +97,7 @@ define( function( require ) {
       xMargin: 6
     } );
 
-    massNodeIcon.left = this.bounds.left;
-    massNodeIcon.centerY = numberControl.top + 6.5;
+    massNodeIcon.leftTop = numberControl.leftTop;
     massNodeIcon.pickable = false;
   }