adding proper NumberControls, see phetsims/my-solar-system#104

phetsims · Mar 21, 2023 · 315e557 · 315e557
1 parent bac42e3
commit 315e557
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/js/SolarSystemCommonStrings.ts b/js/SolarSystemCommonStrings.ts
@@ -23,6 +23,8 @@ type StringsType = {
   'clearStringProperty': LinkableProperty<string>;
   'path': string;
   'pathStringProperty': LinkableProperty<string>;
+  'scale': string;
+  'scaleStringProperty': LinkableProperty<string>;
   'offscaleMessage': string;
   'offscaleMessageStringProperty': LinkableProperty<string>;
   'speed': string;
@@ -48,6 +50,8 @@ type StringsType = {
     'restartStringProperty': LinkableProperty<string>;
     'massSlider': string;
     'massSliderStringProperty': LinkableProperty<string>;
+    'scaleSlider': string;
+    'scaleSliderStringProperty': LinkableProperty<string>;
     'increase': string;
     'increaseStringProperty': LinkableProperty<string>;
     'decrease': string;

diff --git a/js/view/VectorNode.ts b/js/view/VectorNode.ts
@@ -71,21 +71,21 @@ export default class VectorNode extends ArrowNode {
 
     this.tipProperty = new DerivedProperty( [ this.tailProperty, vectorProperty, transformProperty, forceScaleProperty ],
       ( tail, vector, transform, forceScale ) => {
-      // forceScale currently goes from -2 to 8, where -2 is scaling down for big vectors ~100 units of force
-      // and 8 is scaling up for small vectors ~1/100000000 units of force
-      const magnitudeLog = vector.magnitude ? Math.log10( vector.magnitude / 500 ) : -forceScale;
-      if ( magnitudeLog > -forceScale + 1 ) {
-        this.oversizeType = OversizeType.BIGGER;
-        body.forceOffscaleProperty.value = true;
-      }
-      else if ( magnitudeLog < -forceScale - 1 ) {
-        this.oversizeType = OversizeType.SMALLER;
-        body.forceOffscaleProperty.value = true;
-      }
-      else {
-        this.oversizeType = OversizeType.NONE;
-        body.forceOffscaleProperty.value = false;
-      }
+        // forceScale currently goes from -2 to 8, where -2 is scaling down for big vectors ~100 units of force
+        // and 8 is scaling up for small vectors ~1/100000000 units of force
+        const magnitudeLog = vector.magnitude ? Math.log10( vector.magnitude / 500 ) : -forceScale;
+        if ( magnitudeLog > -forceScale + 1 ) {
+          this.oversizeType = OversizeType.BIGGER;
+          body.forceOffscaleProperty.value = true;
+        }
+        else if ( magnitudeLog < -forceScale - 1 ) {
+          this.oversizeType = OversizeType.SMALLER;
+          body.forceOffscaleProperty.value = true;
+        }
+        else {
+          this.oversizeType = OversizeType.NONE;
+          body.forceOffscaleProperty.value = false;
+        }
         const finalPosition = transform.modelToViewDelta( vector.times( 0.05 * Math.pow( 10, forceScale ) ) ).plus( tail );
         return finalPosition;
       } );

diff --git a/solar-system-common-strings_en.json b/solar-system-common-strings_en.json
@@ -20,6 +20,9 @@
   "path": {
     "value": "Path"
   },
+  "scale": {
+    "value": "Scale:"
+  },
   "offscaleMessage": {
     "value": "Some force vectors might be off-scale"
   },
@@ -51,6 +54,9 @@
     "massSlider": {
       "value": "Mass Slider"
     },
+    "scaleSlider": {
+      "value": "Scale Slider"
+    },
     "increase": {
       "value": "Increase"
     },