Add "British" schematicStandard, see #429

phetsims · Mar 5, 2021 · 508ad4b · 508ad4b
1 parent ec106b6
commit 508ad4b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/circuit-construction-kit-common-strings_en.json b/circuit-construction-kit-common-strings_en.json
@@ -14,6 +14,9 @@
   "iec": {
     "value": "IEC"
   },
+  "british": {
+    "value": "British"
+  },
   "animationSpeedLimitReached": {
     "value": "Animation speed limit reached! Simulation speed reduced to {{percent}}% normal."
   },

diff --git a/js/CCKCQueryParameters.js b/js/CCKCQueryParameters.js
@@ -50,7 +50,7 @@ const CCKCQueryParameters = window.QueryStringMachine.getAll( {
     public: true,
     type: 'string',
     defaultValue: 'ieee',
-    validValues: [ 'ieee', 'iec' ]
+    validValues: [ 'ieee', 'iec', 'british' ]
   },
 
   //------------------------------------------------------------------------------------------------------------------

diff --git a/js/view/CCKCOptionsDialogContent.js b/js/view/CCKCOptionsDialogContent.js
@@ -21,7 +21,8 @@ class CCKCOptionsDialogContent extends VBox {
     };
     const verticalAquaRadioButtonGroup = new VerticalAquaRadioButtonGroup( schematicTypeProperty, [
       { node: new Text( circuitConstructionKitCommonStrings.ieee, textOptions ), value: SchematicType.IEEE, tandemName: 'ieeeRadioButton' },
-      { node: new Text( circuitConstructionKitCommonStrings.iec, textOptions ), value: SchematicType.IEC, tandemName: 'iecRadioButton' }
+      { node: new Text( circuitConstructionKitCommonStrings.iec, textOptions ), value: SchematicType.IEC, tandemName: 'iecRadioButton' },
+      { node: new Text( circuitConstructionKitCommonStrings.british, textOptions ), value: SchematicType.BRITISH, tandemName: 'britishRadioButton' }
     ], {
       tandem: tandem.createTandem( 'schematicTypeRadioButtonGroup' ),
       radioButtonOptions: {

diff --git a/js/view/FuseNode.js b/js/view/FuseNode.js
@@ -147,7 +147,7 @@ class FuseNode extends FixedCircuitElementNode {
       .lineToRelative( 0, -boxHeight );
 
     const updateSchematicType = schematicType => {
-      schematicNode.shape = schematicType === SchematicType.IEEE ? schematicShape :
+      schematicNode.shape = ( schematicType === SchematicType.IEEE || schematicType === SchematicType.BRITISH ) ? schematicShape :
                             fuseIEC;
     };
     schematicTypeProperty.link( updateSchematicType );

diff --git a/js/view/SchematicType.js b/js/view/SchematicType.js
@@ -8,7 +8,7 @@
 import Enumeration from '../../../phet-core/js/Enumeration.js';
 import circuitConstructionKitCommon from '../circuitConstructionKitCommon.js';
 
-const SchematicType = Enumeration.byKeys( [ 'IEC', 'IEEE' ] );
+const SchematicType = Enumeration.byKeys( [ 'IEC', 'IEEE', 'BRITISH' ] );
 
 circuitConstructionKitCommon.register( 'SchematicType', SchematicType );
 export default SchematicType;
diff --git a/js/view/schematicTypeProperty.js b/js/view/schematicTypeProperty.js
@@ -10,7 +10,9 @@ import CCKCQueryParameters from '../CCKCQueryParameters.js';
 import circuitConstructionKitCommon from '../circuitConstructionKitCommon.js';
 import SchematicType from './SchematicType.js';
 
-const schematicTypeProperty = new Property( CCKCQueryParameters.schematicStandard === 'iec' ? SchematicType.IEC : SchematicType.IEEE );
+const schematicTypeProperty = new Property( CCKCQueryParameters.schematicStandard === 'iec' ? SchematicType.IEC :
+                                            CCKCQueryParameters.schematicStandard === 'british' ? SchematicType.BRITISH :
+                                            SchematicType.IEEE );
 
 circuitConstructionKitCommon.register( 'schematicTypeProperty', schematicTypeProperty );
 export default schematicTypeProperty;