geomui 0.5.52 → 0.5.56

package/dist/OneDesign.svelte.d.ts

@@ -1,20 +1,7 @@
-import { SvelteComponent } from "svelte";
 import type { tPageDef, tAllLink } from 'geometrix';
-declare const __propDef: {
-    props: {
-        pageDef: tPageDef;
-        pLink: tAllLink;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type OneDesignProps = typeof __propDef.props;
-export type OneDesignEvents = typeof __propDef.events;
-export type OneDesignSlots = typeof __propDef.slots;
-export default class OneDesign extends SvelteComponent<OneDesignProps, OneDesignEvents, OneDesignSlots> {
-}
-export {};
+declare const OneDesign: import("svelte").Component<{
+    pageDef: tPageDef;
+    pLink: tAllLink;
+}, {}, "">;
+type OneDesign = ReturnType<typeof OneDesign>;
+export default OneDesign;

package/dist/ParamDrawExport.svelte

@@ -1,148 +1,218 @@
-<script>import {
-  EFormat,
-  fileBinContent,
-  fileTextContent,
-  fileSuffix,
-  fileMime,
-  fileBin,
-  adjustZero
-} from "geometrix";
-import InputParams from "./InputParams.svelte";
-import Drawing from "./Drawing.svelte";
-import SubDesign from "./SubDesign.svelte";
-import { storePV } from "./storePVal";
-export let pDef;
-export let fgeom;
-export let pLink;
-function checkWarn(txt) {
-  let rWarn = true;
-  const re = /warn/i;
-  if (txt.search(re) < 0) {
-    rWarn = false;
-  }
-  return rWarn;
-}
-let optFaces = [];
-let exportFace;
-let selFace;
-let simTime = 0;
-let zAdjust = adjustZero();
-let logValue = "Dummy initial\nWill be replaced during onMount\n";
-let calcErr = false;
-let calcWarn = false;
-let subD = {};
-function paramChange2(iPageName, iSimTime) {
-  const mydate = (/* @__PURE__ */ new Date()).toLocaleTimeString();
-  logValue = `Geometry ${iPageName} computed at ${mydate}
-`;
-  const geome = fgeom(iSimTime, $storePV[pDef.partName]);
-  logValue += geome.logstr;
-  calcErr = geome.calcErr;
-  calcWarn = checkWarn(geome.logstr);
-  optFaces = Object.keys(geome.fig);
-  exportFace = "zip";
-  subD = geome.sub;
-}
-function paramChange() {
-  paramChange2(pDef.partName, simTime);
-}
-$: paramChange2(pDef.partName, simTime);
-function download_binFile(fName, fContent) {
-  const elem_a_download = document.createElement("a");
-  const payload = URL.createObjectURL(fContent);
-  elem_a_download.setAttribute("href", payload);
-  elem_a_download.setAttribute("download", fName);
-  elem_a_download.click();
-  elem_a_download.remove();
-  URL.revokeObjectURL(payload);
-}
-function download_textFile(fName, fContent, fMime) {
-  const elem_a_download = document.createElement("a");
-  const payload = "data:" + fMime + ";utf-8," + encodeURIComponent(fContent);
-  elem_a_download.setAttribute("href", payload);
-  elem_a_download.setAttribute("download", fName);
-  elem_a_download.click();
-  elem_a_download.remove();
-}
-function dateString() {
-  const re1 = /[-:]/g;
-  const re2 = /\..*$/;
-  const rDateStr = (/* @__PURE__ */ new Date()).toISOString().replace(re1, "").replace(re2, "").replace("T", "_");
-  return rDateStr;
-}
-async function downloadExport(iExportFace) {
-  const reSvg = /^svg_/;
-  const reDxf = /^dxf_/;
-  let exportFormat = EFormat.eSVG;
-  let nFace = "all";
-  if (iExportFace.match(reSvg)) {
-    exportFormat = EFormat.eSVG;
-    nFace = iExportFace.replace(reSvg, "");
-  } else if (iExportFace.match(reDxf)) {
-    exportFormat = EFormat.eDXF;
-    nFace = iExportFace.replace(reDxf, "");
-  } else if (iExportFace === "allsvg") {
-    exportFormat = EFormat.eSVGALL;
-  } else if (iExportFace === "alldxf") {
-    exportFormat = EFormat.eDXFALL;
-  } else if (iExportFace === "compute_log") {
-    exportFormat = EFormat.eTXTLOG;
-  } else if (iExportFace === "pax") {
-    exportFormat = EFormat.ePAX;
-  } else if (iExportFace === "oscad") {
-    exportFormat = EFormat.eOPENSCAD;
-  } else if (iExportFace === "ojscad") {
-    exportFormat = EFormat.eJSCAD;
-  } else if (iExportFace === "freecad") {
-    exportFormat = EFormat.eFREECAD;
-  } else if (iExportFace === "zip") {
-    exportFormat = EFormat.eZIP;
-  } else {
-    console.log(`err883: downloadExport iExportFace ${iExportFace} invalid`);
-  }
-  const fSuffix = fileSuffix(exportFormat);
-  const fMime = fileMime(exportFormat);
-  const fBin = fileBin(exportFormat);
-  const fName = pDef.partName + "_" + nFace + "_" + dateString() + fSuffix;
-  if (fBin) {
-    const fContent = await fileBinContent(
-      fgeom,
-      simTime,
-      $storePV[pDef.partName],
-      pDef,
-      exportFormat
-    );
-    download_binFile(fName, fContent);
-  } else {
-    const fContent = fileTextContent(
-      fgeom,
-      $storePV[pDef.partName],
-      pDef,
-      nFace,
-      exportFormat
-    );
-    download_textFile(fName, fContent, fMime);
-  }
-}
-async function downloadExport2() {
-  await downloadExport(exportFace);
-}
+<script lang="ts">
+	import type {
+		tParamDef,
+		tGeomFunc,
+		tSubDesign,
+		tAllLink,
+		tFigures,
+		Figure,
+		tGeom
+	} from 'geometrix';
+	import {
+		EFormat,
+		fileBinContent,
+		fileTextContent,
+		fileSuffix,
+		fileMime,
+		fileBin,
+		mergeFaces
+	} from 'geometrix';
+	import InputParams from './InputParams.svelte';
+	import Drawing from './Drawing.svelte';
+	import SubDesign from './SubDesign.svelte';
+	import { sParams } from './stateParams.svelte';
+
+	// properties
+	interface Props {
+		pDef: tParamDef;
+		fgeom: tGeomFunc;
+		pLink: tAllLink;
+	}
+	let { pDef, fgeom, pLink }: Props = $props();
+
+	// const
+	const c_ParametrixAll = 'ParametrixAll';
+
+	// helper function
+	function checkWarn(txt: string) {
+		let rWarn = true;
+		const re = /warn/i;
+		if (txt.search(re) < 0) {
+			rWarn = false;
+		}
+		return rWarn;
+	}
+	// create pFig
+	function checkFace(iFaces: string[], iFace: string): string {
+		let rFace = iFace;
+		if (iFaces.length === 0) {
+			console.log(`warn404: Drawing has an empty face list`);
+		} else {
+			//rFace = iFaces[0];
+			const FaceList2 = iFaces.slice();
+			FaceList2.push(c_ParametrixAll);
+			if (!FaceList2.includes(rFace)) {
+				//console.log(`warn403: Drawing has an invalid face ${rFace}`);
+				rFace = iFaces[0];
+			}
+		}
+		//console.log(iFaces);
+		//console.log(`dbg097: rFace ${rFace}`);
+		return rFace;
+	}
+	function selectFig(iFigures: tFigures, iFace: string) {
+		let rFig: Figure;
+		const FigListKeys = Object.keys(iFigures);
+		const sFace = checkFace(FigListKeys, iFace);
+		if (FigListKeys.includes(sFace)) {
+			rFig = iFigures[sFace];
+		} else {
+			rFig = mergeFaces(iFigures);
+		}
+		return rFig;
+	}
+
+	// state
+	let simTime: number = $state(0);
+	let selFace: string = $state(checkFace(Object.keys(fgeom(0, sParams[pDef.partName]).fig), ''));
+	// internal state that should not need state
+	let exportFace: string = $state('zip'); // TODO5 keep state otherwise svelte complains
+
+	// derived
+	let geome: tGeom = $derived(fgeom(simTime, sParams[pDef.partName]));
+	let logValue: string = $derived.by(() => {
+		const mydate = new Date().toLocaleTimeString();
+		let rLogValue = `Geometry ${pDef.partName} computed at ${mydate}\n`;
+		rLogValue += geome.logstr;
+		return rLogValue;
+	});
+	let optFaces: string[] = $derived(Object.keys(geome.fig));
+	let calcErr: boolean = $derived(geome.calcErr);
+	let calcWarn: boolean = $derived(checkWarn(geome.logstr));
+	let pFig: Figure = $derived(selectFig(geome.fig, selFace));
+	let subD: tSubDesign = $derived(geome.sub);
+
+	// actions: export drawings
+	function download_binFile(fName: string, fContent: Blob) {
+		//create temporary an invisible element
+		const elem_a_download = document.createElement('a');
+		//const payload = 'data:' + fMime + ';base64,' + fContent;
+		const payload = URL.createObjectURL(fContent);
+		elem_a_download.setAttribute('href', payload);
+		elem_a_download.setAttribute('download', fName);
+		//document.body.appendChild(elem_a_download); // it does not seem required to append the element to the DOM to use it
+		elem_a_download.click();
+		//document.body.removeChild(elem_a_download);
+		elem_a_download.remove(); // Is this really required?
+		URL.revokeObjectURL(payload);
+	}
+	function download_textFile(fName: string, fContent: string, fMime: string) {
+		//create temporary an invisible element
+		const elem_a_download = document.createElement('a');
+		const payload = 'data:' + fMime + ';utf-8,' + encodeURIComponent(fContent);
+		elem_a_download.setAttribute('href', payload);
+		elem_a_download.setAttribute('download', fName);
+		//document.body.appendChild(elem_a_download); // it does not seem required to append the element to the DOM to use it
+		elem_a_download.click();
+		//document.body.removeChild(elem_a_download);
+		elem_a_download.remove(); // Is this really required?
+	}
+	function dateString(): string {
+		const re1 = /[-:]/g;
+		const re2 = /\..*$/;
+		const rDateStr = new Date()
+			.toISOString()
+			.replace(re1, '')
+			.replace(re2, '')
+			.replace('T', '_');
+		return rDateStr;
+	}
+	async function downloadExport(iExportFace: string) {
+		//console.log(`dbg883: iExportFace ${iExportFace}`);
+		const reSvg = /^svg_/;
+		const reDxf = /^dxf_/;
+		let exportFormat = EFormat.eSVG;
+		let nFace = 'all';
+		if (iExportFace.match(reSvg)) {
+			exportFormat = EFormat.eSVG;
+			nFace = iExportFace.replace(reSvg, '');
+		} else if (iExportFace.match(reDxf)) {
+			exportFormat = EFormat.eDXF;
+			nFace = iExportFace.replace(reDxf, '');
+		} else if (iExportFace === 'allsvg') {
+			exportFormat = EFormat.eSVGALL;
+		} else if (iExportFace === 'alldxf') {
+			exportFormat = EFormat.eDXFALL;
+		} else if (iExportFace === 'compute_log') {
+			exportFormat = EFormat.eTXTLOG;
+		} else if (iExportFace === 'pax') {
+			exportFormat = EFormat.ePAX;
+		} else if (iExportFace === 'oscad') {
+			exportFormat = EFormat.eOPENSCAD;
+		} else if (iExportFace === 'ojscad') {
+			exportFormat = EFormat.eJSCAD;
+		} else if (iExportFace === 'freecad') {
+			exportFormat = EFormat.eFREECAD;
+		} else if (iExportFace === 'zip') {
+			exportFormat = EFormat.eZIP;
+		} else {
+			console.log(`err883: downloadExport iExportFace ${iExportFace} invalid`);
+		}
+		//console.log(`exportFormat ${exportFormat}`);
+		const fSuffix = fileSuffix(exportFormat);
+		const fMime = fileMime(exportFormat);
+		const fBin = fileBin(exportFormat);
+		const fName = pDef.partName + '_' + nFace + '_' + dateString() + fSuffix;
+		if (fBin) {
+			const fContent = await fileBinContent(
+				fgeom,
+				simTime,
+				sParams[pDef.partName],
+				pDef,
+				exportFormat
+			);
+			download_binFile(fName, fContent);
+		} else {
+			const fContent = fileTextContent(
+				fgeom,
+				sParams[pDef.partName],
+				pDef,
+				nFace,
+				exportFormat
+			);
+			download_textFile(fName, fContent, fMime);
+		}
+	}
+	async function downloadExport2() {
+		await downloadExport(exportFace);
+	}
 </script>
 
-<InputParams {pDef} on:paramChg={paramChange} {fgeom} {selFace} {zAdjust} {simTime} />
+<InputParams {pDef} {pFig} />
 <section>
 	<h2>Log</h2>
 	<textarea
 		rows="5"
 		cols="94"
 		readonly
-		wrap="off"
+		wrap="soft"
 		value={logValue}
 		class:colorErr={calcErr}
 		class:colorWarn={calcWarn}
-	/>
+	></textarea>
+</section>
+<section>
+	<h2>
+		Drawing
+		<select bind:value={selFace}>
+			{#each optFaces as optFace}
+				<option value={optFace}>{optFace}</option>
+			{/each}
+			<option value={c_ParametrixAll}>All faces merged</option>
+		</select>
+	</h2>
 </section>
-<Drawing {pDef} {fgeom} {optFaces} bind:selFace bind:zAdjust bind:simTime />
+<Drawing pDefSim={pDef.sim} {pFig} bind:simTime />
 <section>
 	<h2>Export</h2>
 	<select bind:value={exportFace}>
@@ -161,7 +231,7 @@ async function downloadExport2() {
 		<option value="freecad">all faces as Freecad.py</option>
 		<option value="zip">all faces and more as zip</option>
 	</select>
-	<button on:click={downloadExport2}>Save to File</button>
+	<button onclick={downloadExport2}>Save to File</button>
 	<SubDesign {subD} origPartName={pDef.partName} {pLink} />
 </section>
 
@@ -178,6 +248,22 @@ section > h2 {
   margin: 1rem 0.5rem 0;
 }
 
+section > h2 > select {
+  /*display: inline-block;*/
+  height: 1.6rem;
+  /*width: 1.6rem;*/
+  color: darkBlue;
+  font-size: 0.8rem;
+  font-weight: 400;
+  padding: 0.2rem 0.4rem 0.2rem;
+  border-style: solid;
+  border-width: 0.1rem;
+  border-radius: 0.2rem;
+  border-color: darkBlue;
+  margin: 0.5rem;
+  background-color: lightBlue;
+}
+
 section > textarea {
   /*resize: horizontal;*/
   margin-left: 0.5rem;

package/dist/ParamDrawExport.svelte.d.ts

@@ -1,21 +1,8 @@
-import { SvelteComponent } from "svelte";
 import type { tParamDef, tGeomFunc, tAllLink } from 'geometrix';
-declare const __propDef: {
-    props: {
-        pDef: tParamDef;
-        fgeom: tGeomFunc;
-        pLink: tAllLink;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type ParamDrawExportProps = typeof __propDef.props;
-export type ParamDrawExportEvents = typeof __propDef.events;
-export type ParamDrawExportSlots = typeof __propDef.slots;
-export default class ParamDrawExport extends SvelteComponent<ParamDrawExportProps, ParamDrawExportEvents, ParamDrawExportSlots> {
-}
-export {};
+declare const ParamDrawExport: import("svelte").Component<{
+    pDef: tParamDef;
+    fgeom: tGeomFunc;
+    pLink: tAllLink;
+}, {}, "">;
+type ParamDrawExport = ReturnType<typeof ParamDrawExport>;
+export default ParamDrawExport;

package/dist/SimpleDrawing.svelte

@@ -1,54 +1,87 @@
-<script>import { copyLayers, mergeFaces } from "geometrix";
-import { storePV } from "./storePVal";
-import { dLayers } from "./drawingLayers";
-import { onMount } from "svelte";
-export let pageName;
-export let fgeom;
-export let selFace;
-export let zAdjust;
-export let simTime = 0;
-let canvasMini;
-const canvas_size_mini = 200;
-let mAdjust;
-function canvasRedrawMini(aFigure, iLayers) {
-  const sLayers = copyLayers(iLayers);
-  sLayers.ruler = false;
-  const ctx1 = canvasMini.getContext("2d");
-  ctx1.clearRect(0, 0, ctx1.canvas.width, ctx1.canvas.height);
-  try {
-    if (zAdjust.init === 0) {
-      mAdjust = aFigure.getAdjustFull(ctx1.canvas.width, ctx1.canvas.height);
-    } else {
-      mAdjust = zAdjust;
-    }
-    aFigure.draw(ctx1, mAdjust, sLayers);
-  } catch (emsg) {
-    console.log(emsg);
-  }
-}
-let domInit = 0;
-function geomRedraw(iSimTime, ipVal, iFace, iLayers) {
-  const FigList = fgeom(iSimTime, ipVal).fig;
-  if (Object.keys(FigList).includes(iFace)) {
-    const aFigure = FigList[iFace];
-    canvasRedrawMini(aFigure, iLayers);
-  } else {
-    const aFigure = mergeFaces(FigList);
-    canvasRedrawMini(aFigure, iLayers);
-  }
-}
-onMount(() => {
-  geomRedraw(simTime, $storePV[pageName], selFace, $dLayers);
-  domInit = 1;
-});
-$: {
-  if (domInit === 1) {
-    geomRedraw(simTime, $storePV[pageName], selFace, $dLayers);
-  }
-}
+<script lang="ts">
+	import type { tCanvasAdjust, tLayers, Figure } from 'geometrix';
+	import { adjustMini, copyLayers } from 'geometrix';
+	import { sDraw } from './stateDrawing.svelte';
+
+	// props
+	interface Props {
+		pFig: Figure;
+		full: boolean;
+	}
+	let { pFig, full }: Props = $props();
+
+	// const
+	const canvas_size_mini = 200;
+	const scaleFactor = 0.6;
+
+	// internal state: no need of reactivity with $state()
+	let canvasMini: HTMLCanvasElement;
+
+	// Canavas Figures
+	function canvasRedrawMini(
+		aFigure: Figure,
+		iZAdjust: tCanvasAdjust,
+		iCZwidth: number,
+		iLayers: tLayers
+	) {
+		const sLayers = copyLayers(iLayers);
+		sLayers.ruler = false;
+		let mAdjust: tCanvasAdjust;
+		if (canvasMini) {
+			const ctx1 = canvasMini.getContext('2d')!;
+			ctx1.clearRect(0, 0, ctx1.canvas.width, ctx1.canvas.height);
+			const c1w = ctx1.canvas.width;
+			try {
+				if (full) {
+					// mini-full with zAdjust set to adjustZero()
+					mAdjust = aFigure.getAdjustFull(ctx1.canvas.width, ctx1.canvas.height);
+				} else {
+					mAdjust = adjustMini(iCZwidth, c1w, iZAdjust);
+				}
+				aFigure.draw(ctx1, mAdjust, sLayers);
+			} catch (emsg) {
+				//rGeome.logstr += emsg;
+				console.log(emsg);
+			}
+			// extra drawing
+			//point(5, 5).draw(ctx1, mAdjust, 'green');
+			//point(5, 15).draw(ctx1, mAdjust, 'blue', 'rectangle');
+		}
+	}
+	// reactivity
+	$effect(() => {
+		canvasRedrawMini(pFig, sDraw.zAdjust, sDraw.canvasZWidth, sDraw.dLayers);
+	});
+	// actions
+	function clickQuater(eve: MouseEvent) {
+		const mouseX = eve.offsetX;
+		const mouseY = eve.offsetY;
+		const ctx1 = canvasMini.getContext('2d')!;
+		const quaterX = ctx1.canvas.width / 2;
+		const quaterY = ctx1.canvas.height / 2;
+		if (eve.button === 0) {
+			// pressing the main button
+			let quaterID = 1;
+			if (mouseX > quaterX) {
+				quaterID += 1 * scaleFactor;
+			}
+			if (mouseY > quaterY) {
+				quaterID += 2 * scaleFactor;
+			}
+			ctx1.canvas.width = quaterID * canvas_size_mini;
+			ctx1.canvas.height = quaterID * canvas_size_mini;
+			canvasRedrawMini(pFig, sDraw.zAdjust, sDraw.canvasZWidth, sDraw.dLayers);
+		}
+	}
 </script>
 
-<canvas class="mini" width={canvas_size_mini} height={canvas_size_mini} bind:this={canvasMini} />
+<canvas
+	class="mini"
+	width={canvas_size_mini}
+	height={canvas_size_mini}
+	bind:this={canvasMini}
+	onclick={clickQuater}
+></canvas>
 
 <style>/*
 $canvas-point: grey;

package/dist/SimpleDrawing.svelte.d.ts

@@ -1,23 +1,7 @@
-import { SvelteComponent } from "svelte";
-import type { tCanvasAdjust, tGeomFunc } from 'geometrix';
-declare const __propDef: {
-    props: {
-        pageName: string;
-        fgeom: tGeomFunc;
-        selFace: string;
-        zAdjust: tCanvasAdjust;
-        simTime?: number;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type SimpleDrawingProps = typeof __propDef.props;
-export type SimpleDrawingEvents = typeof __propDef.events;
-export type SimpleDrawingSlots = typeof __propDef.slots;
-export default class SimpleDrawing extends SvelteComponent<SimpleDrawingProps, SimpleDrawingEvents, SimpleDrawingSlots> {
-}
-export {};
+import type { Figure } from 'geometrix';
+declare const SimpleDrawing: import("svelte").Component<{
+    pFig: Figure;
+    full: boolean;
+}, {}, "">;
+type SimpleDrawing = ReturnType<typeof SimpleDrawing>;
+export default SimpleDrawing;