From 76a83bfa061439f0a0dce5599c50115dccc2b1ec Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 10 Aug 2017 14:15:54 -0600 Subject: [PATCH 1/3] Fix apex dot dispose when changing zoom, and add thin black stroke --- js/common/view/TrajectoryNode.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/common/view/TrajectoryNode.js b/js/common/view/TrajectoryNode.js index f1804d59..1acd67d5 100644 --- a/js/common/view/TrajectoryNode.js +++ b/js/common/view/TrajectoryNode.js @@ -73,6 +73,8 @@ define( function( require ) { this.addChild( dotsLayer ); this.addChild( projectileNodesLayer ); + var apexDot = null; + var viewLastPosition = null; // add view nodes based on new dataPoints added @@ -103,7 +105,7 @@ define( function( require ) { // draw green dot if apex if ( addedPoint.apex ) { - var apexDot = new Circle( DOT_RADIUS, { x: viewAddedPosition.x, y: viewAddedPosition.y, fill: DOT_GREEN, stroke: DOT_GREEN } ); + apexDot = new Circle( DOT_RADIUS, { x: viewAddedPosition.x, y: viewAddedPosition.y, fill: DOT_GREEN, stroke: 'black', lineWidth: 0.3 } ); dotsLayer.addChild( apexDot ); } } @@ -147,6 +149,9 @@ define( function( require ) { dotsShape = new Shape(); dotsPath.shape = dotsShape; + if ( apexDot ) { + apexDot.dispose(); + } viewLastPosition = null; From 02d82d54c5c893f95698da9745371f5146e5b284 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 10 Aug 2017 14:44:27 -0600 Subject: [PATCH 2/3] Make apex dot bigger --- js/common/view/TrajectoryNode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/common/view/TrajectoryNode.js b/js/common/view/TrajectoryNode.js index 1acd67d5..3e0764cb 100644 --- a/js/common/view/TrajectoryNode.js +++ b/js/common/view/TrajectoryNode.js @@ -105,7 +105,7 @@ define( function( require ) { // draw green dot if apex if ( addedPoint.apex ) { - apexDot = new Circle( DOT_RADIUS, { x: viewAddedPosition.x, y: viewAddedPosition.y, fill: DOT_GREEN, stroke: 'black', lineWidth: 0.3 } ); + apexDot = new Circle( DOT_RADIUS + 0.3, { x: viewAddedPosition.x, y: viewAddedPosition.y, fill: DOT_GREEN, stroke: 'black', lineWidth: 0.3 } ); dotsLayer.addChild( apexDot ); } } From 3444c5a32da3995984fab31e95e6a1ea6734e8e2 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 10 Aug 2017 14:52:04 -0600 Subject: [PATCH 3/3] Fix clipping text on Intro screen, see #131 --- js/intro/view/IntroProjectilePanel.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/intro/view/IntroProjectilePanel.js b/js/intro/view/IntroProjectilePanel.js index d3e51bdc..15b869b8 100644 --- a/js/intro/view/IntroProjectilePanel.js +++ b/js/intro/view/IntroProjectilePanel.js @@ -129,6 +129,7 @@ define( function( require ) { */ function createParameterControlBox( labelString, unitsString, valueProperty ) { var parameterLabel = new Text( '', parameterLabelOptions ); + parameterLabel.setBoundsMethod( 'accurate' ); valueProperty.link( function( value ) { var valueReadout = unitsString ? StringUtils.fillIn( pattern0Value1UnitsWithSpaceString, {