bump JSON version, minor fixes

yaptide · Dec 21, 2023 · 2ea569f · 2ea569f
1 parent d38d709
commit 2ea569f
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 51 deletions.
diff --git a/src/ThreeEditor/Simulation/Detectors/DetectorManager.ts b/src/ThreeEditor/Simulation/Detectors/DetectorManager.ts
@@ -40,7 +40,7 @@ export class DetectorManager
 {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.11`,
+		version: `0.12`,
 		type: 'Manager',
 		generator: 'DetectorManager.toJSON'
 	} as {

diff --git a/src/ThreeEditor/Simulation/Figures/FigureManager.ts b/src/ThreeEditor/Simulation/Figures/FigureManager.ts
@@ -50,7 +50,7 @@ export class FigureManager
 {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.11`, //update this to current YaptideEditor version when format changes
+		version: `0.12`, //update this to current YaptideEditor version when format changes
 		type: 'Manager',
 		generator: 'FigureManager.toJSON'
 	} satisfies Record<string, string | number>;

diff --git a/src/ThreeEditor/Simulation/Materials/MaterialManager.ts b/src/ThreeEditor/Simulation/Materials/MaterialManager.ts
@@ -25,7 +25,7 @@ export type Icru = number;
 export class MaterialManager extends THREE.Object3D implements SimulationPropertiesType {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.11`,
+		version: `0.12`,
 		type: 'Manager',
 		generator: 'MaterialManager.toJSON'
 	} as {

diff --git a/src/ThreeEditor/Simulation/Scoring/ScoringManager.ts b/src/ThreeEditor/Simulation/Scoring/ScoringManager.ts
@@ -5,7 +5,7 @@ import { SimulationSceneContainer } from '../Base/SimulationContainer';
 import { SimulationElement, SimulationElementJSON } from '../Base/SimulationElement';
 import { SimulationElementManager } from '../Base/SimulationManager';
 import { CustomFilter, isCustomFilterJSON } from './CustomFilter';
-import { isParticleFilterJSON,ParticleFilter } from './ParticleFilter';
+import { isParticleFilterJSON, ParticleFilter } from './ParticleFilter';
 import { FilterJSON, ScoringFilter } from './ScoringFilter';
 import { ScoringOutput, ScoringOutputJSON as OutputJSON } from './ScoringOutput';
 import { ScoringQuantity } from './ScoringQuantity';
@@ -64,7 +64,7 @@ export class ScoringManager
 {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.11`,
+		version: `0.12`,
 		type: 'Manager',
 		generator: 'ScoringManager.toJSON'
 	} as {
@@ -116,11 +116,7 @@ export class ScoringManager
 
 	getFilterOptions(): Record<string, string> {
 		const options = this.filters
-			.filter(filter => {
-				if (filter instanceof CustomFilter) return filter.rules.length;
-
-				return true;
-			})
+			.filter(filter => (filter instanceof CustomFilter ? filter.rules.length : true))
 			.reduce(
 				(acc, filter) => {
 					acc[filter.uuid] = `${filter.name} [${filter.id}]`;

diff --git a/src/ThreeEditor/Simulation/SpecialComponents/SpecialComponentManager.ts b/src/ThreeEditor/Simulation/SpecialComponents/SpecialComponentManager.ts
@@ -27,7 +27,7 @@ export class SpecialComponentManager
 {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.11`,
+		version: `0.12`,
 		type: 'Manager',
 		generator: 'SpecialComponentManager.toJSON'
 	} as {

diff --git a/src/ThreeEditor/Simulation/Zones/ZoneManager.ts b/src/ThreeEditor/Simulation/Zones/ZoneManager.ts
@@ -51,7 +51,7 @@ export class ZoneManager
 {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.11`,
+		version: `0.12`,
 		type: 'Manager',
 		generator: 'ZoneManager.toJSON'
 	} as {

diff --git a/src/ThreeEditor/examples/ex1.json b/src/ThreeEditor/examples/ex1.json
@@ -2,7 +2,7 @@
   "input": {
     "inputJson": {
       "metadata": {
-        "version": "0.11",
+        "version": "0.12",
         "type": "Editor",
         "generator": "YaptideEditor.toJSON"
       },
@@ -48,7 +48,7 @@
         "name": "Figure Manager",
         "type": "FigureManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "FigureManager.toJSON"
         },
@@ -93,7 +93,7 @@
         "name": "Zones",
         "type": "ZoneManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ZoneManager.toJSON"
         },
@@ -160,7 +160,7 @@
         "name": "DetectManager",
         "type": "DetectorManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "DetectorManager.toJSON"
         },
@@ -248,7 +248,7 @@
         "name": "Special Components",
         "type": "SpecialComponentManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "SpecialComponentManager.toJSON"
         }
@@ -292,7 +292,7 @@
           "1dd2e8f0-6684-42c2-ad35-7aa55358204e": 1
         },
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "MaterialManager.toJSON"
         }
@@ -582,7 +582,7 @@
               }]
           }],
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ScoringManager.toJSON"
         }

diff --git a/src/ThreeEditor/examples/ex2.json b/src/ThreeEditor/examples/ex2.json
@@ -2,7 +2,7 @@
   "input": {
     "inputJson": {
       "metadata": {
-        "version": "0.11",
+        "version": "0.12",
         "type": "Editor",
         "generator": "YaptideEditor.toJSON"
       },
@@ -48,7 +48,7 @@
         "name": "Figure Manager",
         "type": "FigureManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "FigureManager.toJSON"
         },
@@ -140,7 +140,7 @@
         "name": "Zones",
         "type": "ZoneManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ZoneManager.toJSON"
         },
@@ -268,7 +268,7 @@
         "name": "DetectManager",
         "type": "DetectorManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "DetectorManager.toJSON"
         },
@@ -299,7 +299,7 @@
         "name": "Special Components",
         "type": "SpecialComponentManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "SpecialComponentManager.toJSON"
         }
@@ -346,7 +346,7 @@
           "334be148-f344-4156-a7c2-80c0c83bc9ea": 2
         },
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "MaterialManager.toJSON"
         }
@@ -431,7 +431,7 @@
               }]
           }],
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ScoringManager.toJSON"
         }

diff --git a/src/ThreeEditor/examples/ex3.json b/src/ThreeEditor/examples/ex3.json
@@ -148,7 +148,7 @@
 				"metadata": {
 					"generator": "DetectorManager.toJSON",
 					"type": "Manager",
-					"version": "0.11"
+					"version": "0.12"
 				},
 				"name": "DetectManager",
 				"type": "DetectorManager",
@@ -193,7 +193,7 @@
 				"metadata": {
 					"generator": "FigureManager.toJSON",
 					"type": "Manager",
-					"version": "0.11"
+					"version": "0.12"
 				},
 				"name": "Figure Manager",
 				"type": "FigureManager",
@@ -239,7 +239,7 @@
 				"metadata": {
 					"generator": "MaterialManager.toJSON",
 					"type": "Manager",
-					"version": "0.11"
+					"version": "0.12"
 				},
 				"name": "Material Manager",
 				"selectedMaterials": {
@@ -254,7 +254,7 @@
 			"metadata": {
 				"generator": "YaptideEditor.toJSON",
 				"type": "Editor",
-				"version": "0.11"
+				"version": "0.12"
 			},
 			"physic": {
 				"availableStoppingPowerFiles": {},
@@ -372,7 +372,7 @@
 				"metadata": {
 					"generator": "ScoringManager.toJSON",
 					"type": "Manager",
-					"version": "0.11"
+					"version": "0.12"
 				},
 				"name": "Outputs",
 				"outputs": [
@@ -564,7 +564,7 @@
 				"metadata": {
 					"generator": "SpecialComponentManager.toJSON",
 					"type": "Manager",
-					"version": "0.11"
+					"version": "0.12"
 				},
 				"name": "Special Components",
 				"type": "SpecialComponentManager",
@@ -574,7 +574,7 @@
 				"metadata": {
 					"generator": "ZoneManager.toJSON",
 					"type": "Manager",
-					"version": "0.11"
+					"version": "0.12"
 				},
 				"name": "Zones",
 				"type": "ZoneManager",

diff --git a/src/ThreeEditor/examples/ex4.json b/src/ThreeEditor/examples/ex4.json
@@ -2,7 +2,7 @@
   "input": {
     "inputJson": {
       "metadata": {
-        "version": "0.11",
+        "version": "0.12",
         "type": "Editor",
         "generator": "YaptideEditor.toJSON"
       },
@@ -48,7 +48,7 @@
         "name": "Figure Manager",
         "type": "FigureManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "FigureManager.toJSON"
         },
@@ -127,7 +127,7 @@
         "name": "Zones",
         "type": "ZoneManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ZoneManager.toJSON"
         },
@@ -262,7 +262,7 @@
         "name": "DetectManager",
         "type": "DetectorManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "DetectorManager.toJSON"
         },
@@ -333,7 +333,7 @@
         "name": "Special Components",
         "type": "SpecialComponentManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "SpecialComponentManager.toJSON"
         }
@@ -385,7 +385,7 @@
           "b588ae88-8aca-41c8-abb1-a0d9833d107e": 1
         },
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "MaterialManager.toJSON"
         }
@@ -553,7 +553,7 @@
               }]
           }],
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ScoringManager.toJSON"
         }

diff --git a/src/ThreeEditor/examples/ex5.json b/src/ThreeEditor/examples/ex5.json
@@ -2,7 +2,7 @@
   "input": {
     "inputJson": {
       "metadata": {
-        "version": "0.11",
+        "version": "0.12",
         "type": "Editor",
         "generator": "YaptideEditor.toJSON"
       },
@@ -48,7 +48,7 @@
         "name": "Figure Manager",
         "type": "FigureManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "FigureManager.toJSON"
         },
@@ -127,7 +127,7 @@
         "name": "Zones",
         "type": "ZoneManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ZoneManager.toJSON"
         },
@@ -280,7 +280,7 @@
         "name": "DetectManager",
         "type": "DetectorManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "DetectorManager.toJSON"
         },
@@ -351,7 +351,7 @@
         "name": "Special Components",
         "type": "SpecialComponentManager",
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "SpecialComponentManager.toJSON"
         }
@@ -400,7 +400,7 @@
           "b588ae88-8aca-41c8-abb1-a0d9833d107e": 1
         },
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "MaterialManager.toJSON"
         }
@@ -568,7 +568,7 @@
               }]
           }],
         "metadata": {
-          "version": "0.11",
+          "version": "0.12",
           "type": "Manager",
           "generator": "ScoringManager.toJSON"
         }