Improvements to Screen 3 tandems, see #63

phetsims · Nov 27, 2024 · a5b3a28 · a5b3a28
1 parent 9792818
commit a5b3a28
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/js/spin/model/MeasurementLine.ts b/js/spin/model/MeasurementLine.ts
@@ -11,6 +11,7 @@ import Property from '../../../../axon/js/Property.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import Vector2Property from '../../../../dot/js/Vector2Property.js';
 import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
+import Tandem from '../../../../tandem/js/Tandem.js';
 import BooleanIO from '../../../../tandem/js/types/BooleanIO.js';
 import AbstractBlochSphere, { AbstractBlochSphereOptions } from '../../common/model/AbstractBlochSphere.js';
 import quantumMeasurement from '../../quantumMeasurement.js';
@@ -51,7 +52,9 @@ export default class MeasurementLine {
       phetioValueType: BooleanIO
     } );
 
-    this.simpleBlochSphere = new SimpleBlochSphere( this.spinStateProperty, providedOptions );
+    this.simpleBlochSphere = new SimpleBlochSphere( this.spinStateProperty, {
+      tandem: Tandem.OPT_OUT
+    } );
 
     this.positionProperty = new Vector2Property( position, {
       tandem: providedOptions.tandem.createTandem( 'positionProperty' ),

diff --git a/js/spin/model/ParticleSourceModel.ts b/js/spin/model/ParticleSourceModel.ts
@@ -34,6 +34,7 @@ export default class ParticleSourceModel {
   public readonly exitLocalPosition: Vector2;
   public readonly exitPositionProperty: TReadOnlyProperty<Vector2>;
 
+  // Wether the source is currently shooting particles
   public readonly currentlyShootingParticlesProperty: Property<boolean>;
 
   // Mapped from [0, 1] to control the Continuous mode, 0 is 'None' and 1 is 'Lots'

diff --git a/js/spin/model/SternGerlach.ts b/js/spin/model/SternGerlach.ts
@@ -93,9 +93,8 @@ export default class SternGerlach {
 
     this.blockingModeProperty = new Property<BlockingMode>( BlockingMode.NO_BLOCKER, {
       tandem: tandem.createTandem( 'blockingModeProperty' ),
-      phetioValueType: EnumerationIO<BlockingMode>( {
-        enumeration: BlockingMode.enumeration
-      } )
+      phetioValueType: EnumerationIO( BlockingMode ),
+      validValues: BlockingMode.enumeration.values
     } );
 
     this.isDirectionControllableProperty = new BooleanProperty( false, {

diff --git a/js/spin/view/SpinMeasurementArea.ts b/js/spin/view/SpinMeasurementArea.ts
@@ -18,6 +18,7 @@ import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransfo
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import ShadedSphereNode from '../../../../scenery-phet/js/ShadedSphereNode.js';
 import { HBox, Node, Path, RichText, Text, VBox } from '../../../../scenery/js/imports.js';
+import { GatedVisibleProperty } from '../../../../axon/js/GatedBooleanProperty.js';
 import Checkbox from '../../../../sun/js/Checkbox.js';
 import ComboBox, { ComboBoxItem } from '../../../../sun/js/ComboBox.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
@@ -181,6 +182,7 @@ export default class SpinMeasurementArea extends VBox {
       { tandem: tandem.createTandem( 'manyParticlesCanvasNode' ) }
     );
 
+    const exectedPercentageCheckboxTandem = tandem.createTandem( 'expectedPercentageCheckbox' );
     const expectedPercentageCheckbox = new Checkbox(
       model.expectedPercentageVisibleProperty,
       new HBox( {
@@ -196,11 +198,11 @@ export default class SpinMeasurementArea extends VBox {
         scale: 0.9,
         left: particleSourceNode.left,
         top: particleSourceNode.bottom + 30,
-        visibleProperty: new DerivedProperty(
+        visibleProperty: new GatedVisibleProperty( new DerivedProperty(
           [ model.particleSourceModel.sourceModeProperty ],
           sourceMode => sourceMode === SourceMode.CONTINUOUS
-        ),
-        tandem: tandem.createTandem( 'expectedPercentageCheckbox' )
+        ), exectedPercentageCheckboxTandem ),
+        tandem: exectedPercentageCheckboxTandem
       } );
 
     const exitBlockerNode = new Path( new Shape().moveTo( 0, 0 ).lineTo( 0, 35 ), {

diff --git a/js/spin/view/SpinStatePreparationArea.ts b/js/spin/view/SpinStatePreparationArea.ts
@@ -126,12 +126,12 @@ export default class SpinStatePreparationArea extends VBox {
         new ProbabilityValueControl(
           `|${QuantumMeasurementConstants.ALPHA}|<sup>2`,
           model.upProbabilityProperty,
-          tandem.createTandem( 'classicalUpProbabilityControl' )
+          tandem.createTandem( 'upProbabilityControl' )
         ),
         new ProbabilityValueControl(
           `|${QuantumMeasurementConstants.BETA}|<sup>2`,
           model.downProbabilityProperty,
-          tandem.createTandem( 'classicalDownProbabilityControl' )
+          tandem.createTandem( 'downProbabilityControl' )
         )
       ]
     } );