rename Properties for Diffusion particle colors, #77

phetsims · May 3, 2024 · c11da20 · c11da20
1 parent ececabf
commit c11da20
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/js/common/GasPropertiesColors.ts b/js/common/GasPropertiesColors.ts
@@ -146,23 +146,23 @@ const GasPropertiesColors = {
     default: 'rgb( 255, 170, 170 )' // lighter shade of lightParticleColor
   } ),
 
-  // primary color for 1st particle type in Diffusion screen
-  particle1ColorProperty: new ProfileColorProperty( gasProperties, 'particle1Color', {
+  // primary color for particle type 1 in Diffusion screen
+  diffusionParticle1ColorProperty: new ProfileColorProperty( gasProperties, 'diffusionParticle1Color', {
     default: 'rgb( 0, 230, 255)' // cyan
   } ),
 
-  // specular highlight for 1st particle type in Diffusion screen
-  particle1HighlightColorProperty: new ProfileColorProperty( gasProperties, 'particle1HighlightColor', {
+  // specular highlight for particle type 1 in Diffusion screen
+  diffusionParticle1HighlightColorProperty: new ProfileColorProperty( gasProperties, 'diffusionParticle1HighlightColor', {
     default: 'rgb( 203, 247, 252 )' // lighter shade of particle1Color
   } ),
 
-  // primary color for 2nd particle type in Diffusion screen
-  particle2ColorProperty: new ProfileColorProperty( gasProperties, 'particle2Color', {
+  // primary color for particle type 2 in Diffusion screen
+  diffusionParticle2ColorProperty: new ProfileColorProperty( gasProperties, 'diffusionParticle2Color', {
     default: 'rgb( 232, 78, 32 )' // red
   } ),
 
-  // specular highlight for 2nd particle type in Diffusion screen
-  particle2HighlightColorProperty: new ProfileColorProperty( gasProperties, 'particle2HighlightColor', {
+  // specular highlight for particle type 2 in Diffusion screen
+  diffusionParticle2HighlightColorProperty: new ProfileColorProperty( gasProperties, 'diffusionParticle2HighlightColor', {
     default: 'rgb( 255, 170, 170 )' // lighter shade of particle2Color
   } ),
 

diff --git a/js/common/view/GasPropertiesIconFactory.ts b/js/common/view/GasPropertiesIconFactory.ts
@@ -373,11 +373,11 @@ const GasPropertiesIconFactory = {
       spacing: 12,
       children: [
         new Rectangle( 0, 0, width, height, {
-          fill: GasPropertiesColors.particle1ColorProperty,
+          fill: GasPropertiesColors.diffusionParticle1ColorProperty,
           stroke: GasPropertiesColors.centerOfMassStrokeProperty
         } ),
         new Rectangle( 0, 0, width, height, {
-          fill: GasPropertiesColors.particle2ColorProperty,
+          fill: GasPropertiesColors.diffusionParticle2ColorProperty,
           stroke: GasPropertiesColors.centerOfMassStrokeProperty
         } )
       ]
@@ -390,7 +390,7 @@ const GasPropertiesIconFactory = {
   createParticleFlowRateIcon(): Node {
 
     const arrowOptions = {
-      fill: GasPropertiesColors.particle1ColorProperty,
+      fill: GasPropertiesColors.diffusionParticle1ColorProperty,
       stroke: 'black',
       headHeight: 12,
       headWidth: 12,

diff --git a/js/diffusion/model/DiffusionParticle1.ts b/js/diffusion/model/DiffusionParticle1.ts
@@ -25,8 +25,8 @@ export default class DiffusionParticle1 extends DiffusionParticle {
     super( optionize<DiffusionParticle1Options, SelfOptions, DiffusionParticleOptions>()( {
 
       // DiffusionParticleOptions
-      colorProperty: GasPropertiesColors.particle1ColorProperty,
-      highlightColorProperty: GasPropertiesColors.particle1HighlightColorProperty
+      colorProperty: GasPropertiesColors.diffusionParticle1ColorProperty,
+      highlightColorProperty: GasPropertiesColors.diffusionParticle1HighlightColorProperty
     }, providedOptions ) );
   }
 }

diff --git a/js/diffusion/model/DiffusionParticle2.ts b/js/diffusion/model/DiffusionParticle2.ts
@@ -25,8 +25,8 @@ export default class DiffusionParticle2 extends DiffusionParticle {
     super( optionize<DiffusionParticle2Options, SelfOptions, DiffusionParticleOptions>()( {
 
       // ParticleOptions
-      colorProperty: GasPropertiesColors.particle2ColorProperty,
-      highlightColorProperty: GasPropertiesColors.particle2HighlightColorProperty
+      colorProperty: GasPropertiesColors.diffusionParticle2ColorProperty,
+      highlightColorProperty: GasPropertiesColors.diffusionParticle2HighlightColorProperty
     }, providedOptions ) );
   }
 }

diff --git a/js/diffusion/view/DiffusionScreenView.ts b/js/diffusion/view/DiffusionScreenView.ts
@@ -62,27 +62,27 @@ export default class DiffusionScreenView extends BaseScreenView {
 
     // Center of Mass indicators
     const centerOfMassNode1 = new CenterOfMassNode( model.centerOfMass1Property, model.container.bottom,
-      model.container.widthProperty, model.modelViewTransform, GasPropertiesColors.particle1ColorProperty, {
+      model.container.widthProperty, model.modelViewTransform, GasPropertiesColors.diffusionParticle1ColorProperty, {
         visibleProperty: viewProperties.centerOfMassVisibleProperty
       } );
     const centerOfMassNode2 = new CenterOfMassNode( model.centerOfMass2Property, model.container.bottom,
-      model.container.widthProperty, model.modelViewTransform, GasPropertiesColors.particle2ColorProperty, {
+      model.container.widthProperty, model.modelViewTransform, GasPropertiesColors.diffusionParticle2ColorProperty, {
         visibleProperty: viewProperties.centerOfMassVisibleProperty
       } );
 
     // Particle Flow Rate vectors
     const particleFlowRateNode1 = new ParticleFlowRateNode( model.particle1FlowRateModel, {
       visibleProperty: viewProperties.particleFlowRateVisibleProperty,
       arrowNodeOptions: {
-        fill: GasPropertiesColors.particle1ColorProperty
+        fill: GasPropertiesColors.diffusionParticle1ColorProperty
       },
       centerX: containerNode.centerX,
       top: containerNode.bottom + 38
     } );
     const particleFlowRateNode2 = new ParticleFlowRateNode( model.particle2FlowRateModel, {
       visibleProperty: viewProperties.particleFlowRateVisibleProperty,
       arrowNodeOptions: {
-        fill: GasPropertiesColors.particle2ColorProperty
+        fill: GasPropertiesColors.diffusionParticle2ColorProperty
       },
       centerX: containerNode.centerX,
       top: particleFlowRateNode1.bottom + 5