geomui 0.5.51 → 0.5.55

package/dist/DrawingList.svelte.d.ts

@@ -1,19 +1,21 @@
-import { SvelteComponent } from "svelte";
 import type { tParamDef } from 'geometrix';
-declare const __propDef: {
-    props: {
-        pDef: tParamDef;
+interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
+    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
+        $$bindings?: Bindings;
+    } & Exports;
+    (internal: unknown, props: Props & {
+        $$events?: Events;
+        $$slots?: Slots;
+    }): Exports & {
+        $set?: any;
+        $on?: any;
     };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type DrawingListProps = typeof __propDef.props;
-export type DrawingListEvents = typeof __propDef.events;
-export type DrawingListSlots = typeof __propDef.slots;
-export default class DrawingList extends SvelteComponent<DrawingListProps, DrawingListEvents, DrawingListSlots> {
+    z_$$bindings?: Bindings;
 }
-export {};
+declare const DrawingList: $$__sveltets_2_IsomorphicComponent<{
+    pDef: tParamDef;
+}, {
+    [evt: string]: CustomEvent<any>;
+}, {}, {}, string>;
+type DrawingList = InstanceType<typeof DrawingList>;
+export default DrawingList;

package/dist/InputParams.svelte

@@ -1,247 +1,309 @@
-<script>import ModalDiag from "./ModalDiag.svelte";
-import ModalImg from "./ModalImg.svelte";
-import LocStorWrite from "./LocStorWrite.svelte";
-import LocStorRead from "./LocStorRead.svelte";
-import SimpleDrawing from "./SimpleDrawing.svelte";
-import { PType, parseParamFile, createParamFile, adjustZero } from "geometrix";
-import { storePV } from "./storePVal";
-import { downloadParams, generateUrl } from "./downloadParams";
-import { onMount, createEventDispatcher } from "svelte";
-import { browser } from "$app/environment";
-import { page } from "$app/stores";
-import { base } from "$app/paths";
-const dispatch = createEventDispatcher();
-export let pDef;
-export let fgeom;
-export let selFace;
-export let zAdjust;
-export let simTime = 0;
-const cAdjustZero = adjustZero();
-let inputComment = "";
-function paramChange() {
-  dispatch("paramChg", { foo: "bla" });
-}
-function tolerantApply(iPartName, ipVal) {
-  let rMsg = "";
-  let applyWarn1 = false;
-  if (iPartName !== pDef.partName) {
-    rMsg += `warn361: read partName: '${iPartName}'  expected partName: '${pDef.partName}'
-`;
-    applyWarn1 = true;
-  }
-  let cover = 0;
-  let uncover = 0;
-  let equal = 0;
-  const pNameList = [];
-  for (const p of pDef.params) {
-    pNameList.push(p.name);
-    if (Object.hasOwn(ipVal, p.name)) {
-      cover += 1;
-      if ($storePV[pDef.partName][p.name] === ipVal[p.name]) {
-        equal += 1;
-      } else {
-        $storePV[pDef.partName][p.name] = ipVal[p.name];
-      }
-    } else {
-      uncover += 1;
-    }
-  }
-  let notInScope = 0;
-  for (const pa of Object.keys(ipVal)) {
-    if (!pNameList.includes(pa)) {
-      notInScope += 1;
-      rMsg += `warn363: parameter ${pa} not in the scope of the design (${notInScope})
-`;
-    }
-  }
-  const applyWarn2 = notInScope > 0 ? true : false;
-  const loadDate = (/* @__PURE__ */ new Date()).toLocaleTimeString();
-  rMsg += `Params loaded at ${loadDate} :`;
-  rMsg += ` def-nb: ${Object.keys(pDef.params).length}`;
-  rMsg += `, cover-nb: ${cover}, uncover-nb: ${uncover}
-`;
-  rMsg += ` load-nb: ${Object.keys(ipVal).length}`;
-  rMsg += `, equal-nb: ${equal}, changed-nb: ${cover - equal}`;
-  rMsg += `, out-of-scope: ${notInScope}`;
-  const rApplyWarn = applyWarn1 || applyWarn2;
-  return [rMsg, rApplyWarn];
-}
-let loadMsg = "";
-let applyWarn = false;
-function initParams2() {
-  if (browser) {
-    const searchParams = new URLSearchParams($page.url.search);
-    const pVal2 = {};
-    for (const [kk, vv] of searchParams) {
-      const vvn = Number(vv);
-      if (!isNaN(vvn)) {
-        pVal2[kk] = vvn;
-      }
-    }
-    if (Object.keys(pVal2).length > 0) {
-      [loadMsg, applyWarn] = tolerantApply(pDef.partName, pVal2);
-    }
-  }
-}
-function forceInit() {
-  initParams2();
-  paramChange();
-}
-onMount(() => {
-  forceInit();
-});
-function loadParams(iStr) {
-  try {
-    const [paramJson] = parseParamFile(iStr);
-    [loadMsg, applyWarn] = tolerantApply(paramJson.partName, paramJson.pVal);
-    inputComment = paramJson.comment;
-    paramChange();
-  } catch (emsg) {
-    let errMsg = "err723: error by parsing parameter file\n";
-    errMsg += emsg;
-    loadMsg = errMsg;
-    applyWarn = true;
-  }
-}
-async function loadFile(fileP) {
-  const fText = await fileP.text();
-  loadParams(fText);
-}
-function loadParamFromFile(eve) {
-  if (eve.target) {
-    const paramFiles = eve.target.files;
-    if (paramFiles) {
-      loadFile(paramFiles[0]);
-    }
-  }
-}
-function downloadParams2() {
-  downloadParams(pDef.partName, $storePV[pDef.partName], inputComment);
-}
-let modalLoadDefault = false;
-let modalLoadLocal = false;
-let modalSaveUrl = false;
-let modalSaveLocal = false;
-function loadDefaults() {
-  const pInit = {};
-  for (const p of pDef.params) {
-    pInit[p.name] = p.init;
-  }
-  [loadMsg, applyWarn] = tolerantApply(pDef.partName, pInit);
-}
-let locStorRname;
-function loadLocStor() {
-  if (locStorRname !== void 0 && locStorRname !== "") {
-    const storeKey = `${pDef.partName}_${locStorRname}`;
-    if (browser) {
-      const storeStr = window.localStorage.getItem(storeKey);
-      if (storeStr === null) {
-        loadMsg = `Warn157: localStorage key ${storeKey} is null`;
-        applyWarn = true;
-      } else {
-        loadParams(storeStr);
-      }
-    }
-  } else {
-    loadMsg = "Warn239: No valid name for loading from localStorage!";
-    applyWarn = true;
-  }
-}
-let locStorWname;
-function saveInLocStor() {
-  if (locStorWname !== void 0 && locStorWname !== "") {
-    const storeKey = `${pDef.partName}_${locStorWname}`;
-    const re2 = /\..*$/;
-    const lastModif = (/* @__PURE__ */ new Date()).toISOString().replace(re2, "");
-    const storeAllStr = createParamFile(
-      lastModif,
-      pDef.partName,
-      $storePV[pDef.partName],
-      inputComment
-    );
-    if (browser) {
-      window.localStorage.setItem(storeKey, storeAllStr);
-    }
-  } else {
-    console.log("Warn639: No valid name for writing to localStorage!");
-  }
-}
-let pUrl = "";
-function generateUrl2() {
-  const url1 = generateUrl($page.url.href, $storePV[pDef.partName], false);
-  return url1.toString();
-}
-function openModalUrl() {
-  pUrl = generateUrl2();
-  modalSaveUrl = true;
-}
-function saveAsUrl() {
-}
-let paramSvg = `${base}/pgdsvg/default_param_blank.svg`;
-function paramPict(keyName) {
-  paramSvg = `${base}/pgdsvg/default_param_blank.svg`;
-  if (Object.keys(pDef.paramSvg).includes(keyName)) {
-    paramSvg = `${base}/pgdsvg/${pDef.paramSvg[keyName]}`;
-  }
-}
-let prePartName = "";
-function paramPict2(idx, pDef_page) {
-  if (prePartName !== pDef.partName) {
-    const paramNb = Object.keys($storePV[pDef_page]).length;
-    if (idx < paramNb) {
-      paramPict(Object.keys($storePV[pDef_page])[idx]);
-    }
-  }
-}
-$: paramPict2(0, pDef.partName);
-let modalImg = false;
-function showSvg() {
-  modalImg = true;
-}
-function makeHTable(iParams) {
-  const rHTable = [];
-  const sectionMain = {
-    sectionName: "main",
-    sectionID: "g0main",
-    sectionVisible: false,
-    params: []
-  };
-  let section = sectionMain;
-  let sectionID = 0;
-  for (const param of iParams) {
-    if (param.pType === PType.eSectionSeparator) {
-      rHTable.push(section);
-      sectionID += 1;
-      const sectionNew = {
-        sectionName: param.name,
-        sectionID: `g${sectionID}${param.name}`,
-        sectionVisible: true,
-        params: []
-      };
-      section = sectionNew;
-    } else {
-      section.params.push(param);
-    }
-  }
-  rHTable.push(section);
-  return rHTable;
-}
-function makeHTableVis(iHTable) {
-  const rVis = {};
-  for (const section of iHTable) {
-    rVis[section.sectionID] = section.sectionVisible;
-  }
-  return rVis;
-}
-let htable;
-let htableVis;
-$: {
-  htable = makeHTable(pDef.params);
-  if (prePartName !== pDef.partName) {
-    prePartName = pDef.partName;
-    htableVis = makeHTableVis(htable);
-  }
-}
+<script lang="ts">
+	//import type { tOkFunc } from './ModalDiag.svelte';
+	import ModalDiag from './ModalDiag.svelte';
+	import ModalImg from './ModalImg.svelte';
+	import LocStorWrite from './LocStorWrite.svelte';
+	import LocStorRead from './LocStorRead.svelte';
+	import SimpleDrawing from './SimpleDrawing.svelte';
+	import type { tParam, tParamDef, tParamVal, tGeomFunc, tCanvasAdjust } from 'geometrix';
+	import { PType, parseParamFile, createParamFile, adjustZero } from 'geometrix';
+	import { storePV } from './storePVal';
+	import { downloadParams, generateUrl } from './downloadParams';
+	import { onMount, createEventDispatcher } from 'svelte';
+	import { browser } from '$app/environment';
+	import { page } from '$app/stores';
+	import { base } from '$app/paths';
+
+	const dispatch = createEventDispatcher();
+
+	export let pDef: tParamDef;
+	export let fgeom: tGeomFunc;
+	export let selFace: string;
+	export let zAdjust: tCanvasAdjust;
+	export let simTime = 0;
+
+	const cAdjustZero = adjustZero();
+	let inputComment = '';
+
+	// initialization
+	function paramChange() {
+		dispatch('paramChg', { foo: 'bla' });
+	}
+	// tolerant applyParamVal
+	function tolerantApply(iPartName: string, ipVal: tParamVal): [string, boolean] {
+		let rMsg = '';
+		// partName
+		let applyWarn1 = false;
+		if (iPartName !== pDef.partName) {
+			rMsg += `warn361: read partName: '${iPartName}'  expected partName: '${pDef.partName}'\n`;
+			applyWarn1 = true;
+		}
+		// forward
+		let cover = 0;
+		let uncover = 0;
+		let equal = 0;
+		const pNameList: string[] = [];
+		for (const p of pDef.params) {
+			pNameList.push(p.name);
+			if (Object.hasOwn(ipVal, p.name)) {
+				cover += 1;
+				if ($storePV[pDef.partName][p.name] === ipVal[p.name]) {
+					equal += 1;
+				} else {
+					$storePV[pDef.partName][p.name] = ipVal[p.name];
+				}
+			} else {
+				uncover += 1;
+			}
+		}
+		// backward
+		let notInScope = 0;
+		for (const pa of Object.keys(ipVal)) {
+			if (!pNameList.includes(pa)) {
+				notInScope += 1;
+				rMsg += `warn363: parameter ${pa} not in the scope of the design (${notInScope})\n`;
+			}
+		}
+		const applyWarn2 = notInScope > 0 ? true : false;
+		const loadDate = new Date().toLocaleTimeString();
+		rMsg += `Params loaded at ${loadDate} :`;
+		rMsg += ` def-nb: ${Object.keys(pDef.params).length}`;
+		rMsg += `, cover-nb: ${cover}, uncover-nb: ${uncover}\n`;
+		rMsg += ` load-nb: ${Object.keys(ipVal).length}`;
+		rMsg += `, equal-nb: ${equal}, changed-nb: ${cover - equal}`;
+		rMsg += `, out-of-scope: ${notInScope}`;
+		const rApplyWarn = applyWarn1 || applyWarn2;
+		return [rMsg, rApplyWarn];
+	}
+	//function initParams1() {
+	//	for (const p of pDef.params) {
+	//		$storePV[pDef.partName][p.name] = p.init;
+	//	}
+	//}
+	// load parameters
+	let loadMsg = '';
+	let applyWarn = false;
+	function initParams2() {
+		if (browser) {
+			const searchParams = new URLSearchParams($page.url.search);
+			const pVal2: tParamVal = {};
+			for (const [kk, vv] of searchParams) {
+				//console.log(`dbg638: ${kk} ${vv}`);
+				const vvn = Number(vv);
+				if (!isNaN(vvn)) {
+					pVal2[kk] = vvn;
+				}
+			}
+			//console.log(`dbg072: pVal2.length ${Object.keys(pVal2).length}`);
+			if (Object.keys(pVal2).length > 0) {
+				[loadMsg, applyWarn] = tolerantApply(pDef.partName, pVal2);
+			}
+		}
+	}
+	// Bug? No initialization when loading page! Keep the previous values!
+	//initParams1();
+	function forceInit() {
+		initParams2();
+		paramChange();
+	}
+	onMount(() => {
+		forceInit();
+	});
+	// workaround because $page.url.searchParams contains the new value with some delay
+	//function delay(milliseconds: number) {
+	//	return new Promise((resolve) => {
+	//		setTimeout(resolve, milliseconds);
+	//	});
+	//}
+	//async function forceInit2(partName: string) {
+	//	await delay(1000);
+	//	console.log(`dbg081: forceInit: partName ${partName} url ${$page.url}`);
+	//	forceInit(partName);
+	//}
+	//$: forceInit2(pDef.partName);
+	// end of the workaround
+	function loadParams(iStr: string) {
+		try {
+			const [paramJson] = parseParamFile(iStr);
+			[loadMsg, applyWarn] = tolerantApply(paramJson.partName, paramJson.pVal);
+			inputComment = paramJson.comment;
+			paramChange();
+		} catch (emsg) {
+			let errMsg = 'err723: error by parsing parameter file\n';
+			errMsg += emsg as string;
+			loadMsg = errMsg;
+			applyWarn = true;
+		}
+	}
+	// load from file
+	async function loadFile(fileP: File) {
+		const fText = await fileP.text();
+		loadParams(fText);
+	}
+	function loadParamFromFile(eve: Event) {
+		if (eve.target) {
+			type tEveFileList = FileList | null;
+			const paramFiles: tEveFileList = (eve.target as HTMLInputElement).files;
+			if (paramFiles) {
+				loadFile(paramFiles[0]);
+			}
+		}
+	}
+	// download parameters
+	function downloadParams2() {
+		downloadParams(pDef.partName, $storePV[pDef.partName], inputComment);
+	}
+	// modal
+	let modalLoadDefault = false;
+	let modalLoadLocal = false;
+	let modalSaveUrl = false;
+	let modalSaveLocal = false;
+	function loadDefaults() {
+		const pInit: tParamVal = {};
+		for (const p of pDef.params) {
+			pInit[p.name] = p.init;
+		}
+		[loadMsg, applyWarn] = tolerantApply(pDef.partName, pInit);
+	}
+	// load parameters from localStorage
+	let locStorRname: string;
+	function loadLocStor() {
+		if (locStorRname !== undefined && locStorRname !== '') {
+			const storeKey = `${pDef.partName}_${locStorRname}`;
+			//console.log(`load from localStorage ${storeKey}`);
+			if (browser) {
+				const storeStr = window.localStorage.getItem(storeKey);
+				if (storeStr === null) {
+					loadMsg = `Warn157: localStorage key ${storeKey} is null`;
+					applyWarn = true;
+				} else {
+					loadParams(storeStr);
+				}
+			}
+		} else {
+			loadMsg = 'Warn239: No valid name for loading from localStorage!';
+			applyWarn = true;
+		}
+	}
+	// save parameters into localStorage
+	let locStorWname: string;
+	//$: console.log(`dbg888: ${locStorWname}`);
+	function saveInLocStor() {
+		if (locStorWname !== undefined && locStorWname !== '') {
+			const storeKey = `${pDef.partName}_${locStorWname}`;
+			const re2 = /\..*$/;
+			const lastModif = new Date().toISOString().replace(re2, '');
+			const storeAllStr = createParamFile(
+				lastModif,
+				pDef.partName,
+				$storePV[pDef.partName],
+				inputComment
+			);
+			//console.log(`save in localStorage ${storeKey}`);
+			if (browser) {
+				window.localStorage.setItem(storeKey, storeAllStr);
+			}
+		} else {
+			console.log('Warn639: No valid name for writing to localStorage!');
+		}
+	}
+	// Save as URL
+	let pUrl = '';
+	function generateUrl2(): string {
+		const url1 = generateUrl($page.url.href, $storePV[pDef.partName], false);
+		return url1.toString();
+	}
+	function openModalUrl() {
+		pUrl = generateUrl2();
+		modalSaveUrl = true;
+	}
+	function saveAsUrl() {
+		//console.log(`dbg244: voila`);
+	}
+	// parameter picture
+	let paramSvg = `${base}/pgdsvg/default_param_blank.svg`;
+	function paramPict(keyName: string) {
+		//console.log(`dbg783: ${keyName}`);
+		// convention for the file-names of the parameter description
+		//paramSvg = `${base}/pgdsvg/${pDef.partName}_${keyName}.svg`;
+		paramSvg = `${base}/pgdsvg/default_param_blank.svg`;
+		if (Object.keys(pDef.paramSvg).includes(keyName)) {
+			paramSvg = `${base}/pgdsvg/${pDef.paramSvg[keyName]}`;
+		}
+	}
+	// TODO: solve properly this workaround (avoiding weird re-trigger)
+	let prePartName = '';
+	function paramPict2(idx: number, pDef_page: string) {
+		//console.log(`dbg283: ${pDef_page}`);
+		if (prePartName !== pDef.partName) {
+			// workaround for avoiding weird re-trigger
+			const paramNb = Object.keys($storePV[pDef_page]).length;
+			if (idx < paramNb) {
+				paramPict(Object.keys($storePV[pDef_page])[idx]);
+			}
+		}
+	}
+	$: paramPict2(0, pDef.partName);
+	let modalImg = false;
+	function showSvg() {
+		//console.log(`dbg231: svgPath: ${svgPath}`);
+		modalImg = true;
+	}
+	// hierarchical table
+	interface tHTableSection {
+		sectionName: string;
+		sectionID: string;
+		sectionVisible: boolean;
+		params: tParam[];
+	}
+	type tHTableVis = Record<string, boolean>;
+	function makeHTable(iParams: tParam[]): tHTableSection[] {
+		const rHTable: tHTableSection[] = [];
+		const sectionMain: tHTableSection = {
+			sectionName: 'main',
+			sectionID: 'g0main',
+			sectionVisible: false,
+			params: []
+		};
+		let section = sectionMain;
+		let sectionID = 0;
+		for (const param of iParams) {
+			if (param.pType === PType.eSectionSeparator) {
+				rHTable.push(section);
+				sectionID += 1;
+				const sectionNew: tHTableSection = {
+					sectionName: param.name,
+					sectionID: `g${sectionID}${param.name}`,
+					sectionVisible: true,
+					params: []
+				};
+				section = sectionNew;
+			} else {
+				section.params.push(param);
+			}
+		}
+		rHTable.push(section);
+		return rHTable;
+	}
+	function makeHTableVis(iHTable: tHTableSection[]): tHTableVis {
+		const rVis: tHTableVis = {};
+		for (const section of iHTable) {
+			rVis[section.sectionID] = section.sectionVisible;
+		}
+		return rVis;
+	}
+	let htable: tHTableSection[];
+	let htableVis: tHTableVis;
+	// TODO: second workaround to be solved properly
+	//let prePartName = '';
+	$: {
+		htable = makeHTable(pDef.params);
+		if (prePartName !== pDef.partName) {
+			// workaround for avoiding weird re-trigger
+			prePartName = pDef.partName;
+			htableVis = makeHTableVis(htable);
+		}
+	}
 </script>
 
 <section>
@@ -276,10 +338,10 @@ $: {
 			rows="3"
 			cols="80"
 			readonly
-			wrap="off"
+			wrap="soft"
 			value={loadMsg}
 			class:colorWarn={applyWarn}
-		/>
+		></textarea>
 		<table>
 			<thead>
 				<tr>
@@ -294,16 +356,18 @@ $: {
 				</tr>
 			</thead>
 			{#each htable as sect, sidx}
-				<tr class="separator">
-					<td>{sidx + 1}</td>
-					<td colspan="4">{sect.sectionName}</td>
-					<td colspan="3">
-						<label>
-							<input type="checkbox" bind:checked={htableVis[sect.sectionID]} />
-							<span> </span></label
-						>
-					</td>
-				</tr>
+				<tbody>
+					<tr class="separator">
+						<td>{sidx + 1}</td>
+						<td colspan="4">{sect.sectionName}</td>
+						<td colspan="3">
+							<label>
+								<input type="checkbox" bind:checked={htableVis[sect.sectionID]} />
+								<span> </span></label
+							>
+						</td>
+					</tr>
+				</tbody>
 				<tbody class:collaps={htableVis[sect.sectionID]}>
 					{#each sect.params as param, pidx}
 						<tr class:changed={$storePV[pDef.partName][param.name] !== param.init}>
@@ -463,7 +527,7 @@ section > main > table > tbody > tr.changed {
   background-color: #ded;
 }
 
-section > main > table > tr.separator {
+section > main > table > tbody > tr.separator {
   font-weight: 700;
   background-color: Tan;
 }
@@ -507,7 +571,6 @@ tr.separator > td > label > input[type=checkbox]:checked + span::after {
 }
 
 section > main > table > thead > tr > td,
-section > main > table > tr > td,
 section > main > table > tbody > tr > td {
   padding-left: 0.4rem;
   padding-right: 0.4rem;