1196 add dose to medium and let to medium

src/ThreeEditor/Simulation/Base/SimulationZone.ts

@@ -8,8 +8,8 @@ import { SimulationElement, SimulationElementJSON } from './SimulationElement';
 
 export type SimulationZoneJSON = Omit<
 	SimulationElementJSON & {
-		materialUuid: string;
-		materialPropertiesOverrides: Partial<MaterialOverridable>;
+		materialUuid?: string;
+		materialPropertiesOverrides?: Partial<MaterialOverridable>;
 		customMaterial?: SimulationMaterialJSON & {
 			originalMaterialUuid: string;
 		};
@@ -100,12 +100,13 @@ export abstract class SimulationZone
 
 	private reconstructMaterialFromJSON(json: SimulationZoneJSON) {
 		const { materialUuid, customMaterial } = json;
-		const simulationMaterial =
-			this.editor.materialManager.getMaterialByUuid(
-				customMaterial && materialUuid === customMaterial.uuid
-					? customMaterial.originalMaterialUuid
-					: materialUuid
-			) ?? this.editor.materialManager.defaultMaterial;
+		const simulationMaterial = materialUuid
+			? this.editor.materialManager.getMaterialByUuid(
+					customMaterial && materialUuid === customMaterial.uuid
+						? customMaterial.originalMaterialUuid
+						: materialUuid
+			  )
+			: this.editor.materialManager.defaultMaterial;
 
 		if (simulationMaterial === undefined) throw new Error('SimulationMaterial not found');
 		this.simulationMaterial = simulationMaterial;

src/ThreeEditor/Simulation/CustomStoppingPower/CustomStoppingPower.ts

@@ -54,7 +54,7 @@ export const addCustomStoppingPowerTableToEditorJSON = async (editorJson: Editor
 		const zone = editorJson.zoneManager.zones[key];
 		console.log(zone);
 
-		if (zone.materialPropertiesOverrides.customStoppingPower && zone.customMaterial) {
+		if (zone.materialPropertiesOverrides?.customStoppingPower && zone.customMaterial) {
 			usedStoppingPowerTables.add(zone.customMaterial.icru);
 		}
 	}

src/ThreeEditor/Simulation/Detectors/DetectorManager.ts

@@ -2,7 +2,7 @@ import { Signal } from 'signals';
 import * as THREE from 'three';
 
 import { SimulationPropertiesType } from '../../../types/SimulationProperties';
-import { YaptideEditor } from '../../js/YaptideEditor';
+import { JSON_VERSION, YaptideEditor } from '../../js/YaptideEditor';
 import { SimulationSceneContainer } from '../Base/SimulationContainer';
 import { SimulationElementJSON } from '../Base/SimulationElement';
 import { SimulationElementManager } from '../Base/SimulationManager';
@@ -40,9 +40,11 @@ export class DetectorManager
 {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.10`, //update this to current YaptideEditor version when format changes
+		version: `0.11`,
 		type: 'Manager',
 		generator: 'DetectorManager.toJSON'
+	} as {
+		version: typeof JSON_VERSION;
 	} satisfies Record<string, string | number>;
 
 	private editor: YaptideEditor;
@@ -133,11 +135,14 @@ export class DetectorManager
 				return this.editor.zoneManager.getZoneByUuid(geometryData.zoneUuid) !== undefined;
 			})
 			.filter(additionalPredicate || (() => true))
-			.reduce((acc, geometry) => {
-				acc[geometry.uuid] = `${geometry.name} [${geometry.id}]`;
-
-				return acc;
-			}, {} as Record<string, string>);
+			.reduce(
+				(acc, geometry) => {
+					acc[geometry.uuid] = `${geometry.name} [${geometry.id}]`;
+
+					return acc;
+				},
+				{} as Record<string, string>
+			);
 
 		return options;
 	}

src/ThreeEditor/Simulation/Figures/FigureManager.ts

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

src/ThreeEditor/Simulation/Materials/MaterialManager.ts

@@ -3,7 +3,7 @@ import * as THREE from 'three';
 
 import { SimulationPropertiesType } from '../../../types/SimulationProperties';
 import { CounterMap } from '../../../util/CounterMap/CounterMap';
-import { YaptideEditor } from '../../js/YaptideEditor.js';
+import { JSON_VERSION, YaptideEditor } from '../../js/YaptideEditor.js';
 import { SimulationElementJSON } from '../Base/SimulationElement';
 import { DEFAULT_MATERIAL_ICRU, MATERIALS } from './materials';
 import SimulationMaterial, {
@@ -25,9 +25,11 @@ export type Icru = number;
 export class MaterialManager extends THREE.Object3D implements SimulationPropertiesType {
 	/****************************Private****************************/
 	private readonly metadata = {
-		version: `0.10`, //update this to current YaptideEditor version when format changes
+		version: `0.11`,
 		type: 'Manager',
 		generator: 'MaterialManager.toJSON'
+	} as {
+		version: typeof JSON_VERSION;
 	} satisfies Record<string, string | number>;
 
 	private editor: YaptideEditor;
@@ -43,10 +45,13 @@ export class MaterialManager extends THREE.Object3D implements SimulationPropert
 	private createMaterialPrefabs = () => {
 		const { editor } = this;
 		const editorMaterials = MATERIALS.reduce(
-			([prevMaterials, prevOptions], { name, icru, density }) => [
+			(
+				[prevMaterials, prevOptions],
+				{ name, sanitized_name: sanitizedName, icru, density }
+			) => [
 				{
 					...prevMaterials,
-					[icru]: new SimulationMaterial(editor, name, icru, density)
+					[icru]: new SimulationMaterial(editor, name, sanitizedName, icru, density)
 				},
 				{
 					...prevOptions,

src/ThreeEditor/Simulation/Materials/SimulationMaterial.test.ts

@@ -21,18 +21,19 @@ test('constructor default', () => {
 });
 
 test('constructor params', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	expect(material).toBeInstanceOf(SimulationMaterial);
 	expect(material.icru).toBe(1);
 	expect(material.density).toBe(2);
 	expect(material.name).toBe('test');
 });
 
 test('toJSON', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	expect(material.toJSON()).toEqual({
 		uuid: material.uuid,
 		name: 'test',
+		sanitizedName: 'test',
 		icru: 1,
 		density: 2
 	});
@@ -42,6 +43,7 @@ test('fromJSON', () => {
 	const material = SimulationMaterial.fromJSON(editor, {
 		uuid: 'testUuid',
 		name: 'test',
+		sanitizedName: 'test',
 		icru: 1,
 		density: 2
 	});
@@ -55,6 +57,7 @@ test('fromJSON', () => {
 	const material2 = SimulationMaterial.fromJSON(editor, {
 		uuid: 'testUuid',
 		name: 'test',
+		sanitizedName: 'test',
 		icru: 1,
 		density: 2,
 		customStoppingPower: true
@@ -69,7 +72,7 @@ test('fromJSON', () => {
 });
 
 test('clone', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	material.customStoppingPower = true;
 	const clone = material.clone();
 	expect(clone).toBeInstanceOf(SimulationMaterial);
@@ -81,7 +84,7 @@ test('clone', () => {
 });
 
 test('copy', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	material.customStoppingPower = true;
 	const copy = new SimulationMaterial(editor);
 	copy.copy(material);

src/ThreeEditor/Simulation/Materials/SimulationMaterial.ts

@@ -6,14 +6,19 @@ import { Icru } from './MaterialManager';
 import {
 	DEFAULT_MATERIAL_DENSITY,
 	DEFAULT_MATERIAL_ICRU,
-	DEFAULT_MATERIAL_NAME
+	DEFAULT_MATERIAL_NAME,
+	DEFAULT_SANITIZED_MATERIAL_NAME
 } from './materials';
 
-export type RenderProps = Omit<SimulationMaterialJSON, 'uuid' | 'name' | 'icru' | 'density'>;
+export type RenderProps = Omit<
+	SimulationMaterialJSON,
+	'uuid' | 'name' | 'icru' | 'density' | 'sanitizedName'
+>;
 
 export type SimulationMaterialJSON = {
 	uuid: string;
 	name: string;
+	sanitizedName: string;
 	icru: Icru;
 	density: number;
 	customStoppingPower?: boolean;
@@ -28,6 +33,7 @@ export default class SimulationMaterial extends THREE.MeshPhongMaterial {
 	private editor: YaptideEditor;
 	private colorProxy: THREE.Color;
 	icru: Icru;
+	sanitizedName: string;
 	density: number;
 	customStoppingPower: boolean = false;
 	renderProps: RenderProps;
@@ -73,6 +79,7 @@ export default class SimulationMaterial extends THREE.MeshPhongMaterial {
 	constructor(
 		editor: YaptideEditor,
 		name: string = DEFAULT_MATERIAL_NAME,
+		sanitizedName: string = DEFAULT_SANITIZED_MATERIAL_NAME,
 		icru: number = DEFAULT_MATERIAL_ICRU,
 		density: number = DEFAULT_MATERIAL_DENSITY
 	) {
@@ -83,6 +90,7 @@ export default class SimulationMaterial extends THREE.MeshPhongMaterial {
 			transparent: false,
 			color: new THREE.Color(0xff3d3d)
 		});
+		this.sanitizedName = sanitizedName;
 		this.colorProxy = new Proxy(new THREE.Color(0xff3d3d), this.materialColorHandler);
 		this.editor = editor;
 		this.icru = icru;
@@ -101,10 +109,11 @@ export default class SimulationMaterial extends THREE.MeshPhongMaterial {
 	}
 
 	toJSON(): SimulationMaterialJSON {
-		const { uuid, name, icru, density, renderProps, customStoppingPower } = this;
+		const { uuid, name, sanitizedName, icru, density, renderProps, customStoppingPower } = this;
 
 		return {
 			uuid,
+			sanitizedName,
 			name,
 			icru,
 			density,
@@ -115,9 +124,17 @@ export default class SimulationMaterial extends THREE.MeshPhongMaterial {
 
 	static fromJSON(
 		editor: YaptideEditor,
-		{ uuid, name, icru, density, customStoppingPower, ...renderProps }: SimulationMaterialJSON
+		{
+			uuid,
+			name,
+			sanitizedName,
+			icru,
+			density,
+			customStoppingPower,
+			...renderProps
+		}: SimulationMaterialJSON
 	): SimulationMaterial {
-		const material = new SimulationMaterial(editor, name, icru, density);
+		const material = new SimulationMaterial(editor, name, sanitizedName, icru, density);
 		material.uuid = uuid;
 		material.customStoppingPower = customStoppingPower ?? false;
 		material.renderProps = renderProps;
@@ -138,6 +155,7 @@ export default class SimulationMaterial extends THREE.MeshPhongMaterial {
 
 	copy(source: SimulationMaterial): this {
 		const result = super.copy(source);
+		result.sanitizedName = source.sanitizedName;
 		result.renderProps = { ...source.renderProps };
 		result.density = source.density;
 		result.icru = source.icru;