geomui 1.0.4 → 1.0.6

package/dist/ParamDrawExport.svelte

@@ -20,6 +20,7 @@
 	import InputParams from './InputParams.svelte';
 	import Drawing from './Drawing.svelte';
 	import SubDesign from './SubDesign.svelte';
+	import { getContentDownloadParams, downloadParams } from './downloadParams';
 	import { sParams } from './stateParams.svelte';
 	import { afterNavigate } from '$app/navigation';
 
@@ -79,8 +80,6 @@
 	afterNavigate(() => {
 		selFace = 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]));
@@ -187,8 +186,21 @@
 			download_textFile(fName, fContent, fMime);
 		}
 	}
-	async function downloadExport2() {
-		await downloadExport(exportFace);
+	async function downloadExportPxParams() {
+		//console.log('dbg621: downloadExportPxParams');
+		downloadParams(pDef.partName, sParams[pDef.partName], '');
+	}
+	let myDiag: HTMLDialogElement;
+	let myPreview = $state('');
+	function openDiag(txt: string) {
+		myPreview = txt;
+		myDiag.showModal();
+	}
+	function openDiag2(nFace: string, fmt: EFormat) {
+		openDiag(fileTextContent(fgeom, sParams[pDef.partName], pDef, nFace, fmt));
+	}
+	function closeDiag() {
+		myDiag.close();
 	}
 </script>
 
@@ -207,35 +219,247 @@
 </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>
+		2D Drawings :
+		{#each optFaces as optFace}
+			<button
+				onclick={() => {
+					selFace = optFace;
+				}}
+				class={{ theFace: selFace === optFace }}>{optFace}</button
+			>
+		{/each}
+		<button
+			onclick={() => {
+				selFace = c_ParametrixAll;
+			}}
+			class={{ theFace: selFace === c_ParametrixAll }}>All faces merged</button
+		>
 	</h2>
 </section>
 <Drawing pDefSim={pDef.sim} {pFig} bind:simTime />
 <section>
 	<h2>Export</h2>
-	<select bind:value={exportFace}>
-		{#each optFaces as optFace}
-			<option value="svg_{optFace}">face {optFace} as svg</option>
-		{/each}
-		<option value="allsvg">all faces merged as svg</option>
-		{#each optFaces as optFace}
-			<option value="dxf_{optFace}">face {optFace} as dxf</option>
-		{/each}
-		<option value="alldxf">all faces merged as dxf</option>
-		<option value="compute_log">compute.log as log-file</option>
-		<option value="pax">all faces as pax.json</option>
-		<option value="oscad">all faces as openscad.scad</option>
-		<option value="ojscad">all faces as OpenJScad.js</option>
-		<option value="freecad">all faces as Freecad.py</option>
-		<option value="zip">all faces and more as zip</option>
-	</select>
-	<button onclick={downloadExport2}>Save to File</button>
+	<table>
+		<caption>Output files</caption>
+		<thead>
+			<tr>
+				<th>#</th>
+				<th>Filename</th>
+				<th>Type</th>
+				<th>Preview</th>
+				<th>Download</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>1</td>
+				<td>px_{pDef.partName}.json</td>
+				<td>0-params- pxJson</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag(
+								getContentDownloadParams(pDef.partName, sParams[pDef.partName], '')
+							);
+						}}>preview</button
+					></td
+				>
+				<td><button onclick={downloadExportPxParams}>download</button></td>
+			</tr>
+			<tr>
+				<td>2</td>
+				<td>{pDef.partName}_all.log</td>
+				<td>1-log- txtLog</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag2('all', EFormat.eTXTLOG);
+						}}>preview</button
+					></td
+				>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('compute_log');
+						}}>download</button
+					></td
+				>
+			</tr>
+			{#each optFaces as optFace, idx}
+				<tr>
+					<td>{3 + idx}</td>
+					<td>{pDef.partName}_{optFace}.svg</td>
+					<td>2d- svg</td>
+					<td
+						><button
+							onclick={() => {
+								openDiag2(optFace, EFormat.eSVG);
+							}}>preview</button
+						></td
+					>
+					<td
+						><button
+							onclick={async () => {
+								await downloadExport(`svg_${optFace}`);
+							}}>download</button
+						></td
+					>
+				</tr>
+			{/each}
+			<tr>
+				<td>{3 + optFaces.length}</td>
+				<td>{pDef.partName}_all.svg</td>
+				<td>2d- svg</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag2('all', EFormat.eSVGALL);
+						}}>preview</button
+					></td
+				>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('allsvg');
+						}}>download</button
+					></td
+				>
+			</tr>
+			{#each optFaces as optFace, idx}
+				<tr>
+					<td>{4 + optFaces.length + idx}</td>
+					<td>{pDef.partName}_{optFace}.dxf</td>
+					<td>2d- dxf</td>
+					<td
+						><button
+							onclick={() => {
+								openDiag2(optFace, EFormat.eDXF);
+							}}>preview</button
+						></td
+					>
+					<td
+						><button
+							onclick={async () => {
+								await downloadExport(`dxf_${optFace}`);
+							}}>download</button
+						></td
+					>
+				</tr>
+			{/each}
+			<tr>
+				<td>{4 + 2 * optFaces.length}</td>
+				<td>{pDef.partName}_all.dxf</td>
+				<td>2d- dxf</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag2('all', EFormat.eDXFALL);
+						}}>preview</button
+					></td
+				>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('alldxf');
+						}}>download</button
+					></td
+				>
+			</tr>
+			<tr>
+				<td>{5 + 2 * optFaces.length}</td>
+				<td>{pDef.partName}_all.pax.json</td>
+				<td>4-pax- paxJson</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag2('all', EFormat.ePAX);
+						}}>preview</button
+					></td
+				>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('pax');
+						}}>download</button
+					></td
+				>
+			</tr>
+			<tr>
+				<td>{6 + 2 * optFaces.length}</td>
+				<td>{pDef.partName}_all_noarc_openscad.scad</td>
+				<td>5-script- scad</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag2('all', EFormat.eOPENSCAD);
+						}}>preview</button
+					></td
+				>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('oscad');
+						}}>download</button
+					></td
+				>
+			</tr>
+			<tr>
+				<td>{7 + 2 * optFaces.length}</td>
+				<td>{pDef.partName}_all_noarc_jscad.js</td>
+				<td>5-script- jsCad</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag2('all', EFormat.eJSCAD);
+						}}>preview</button
+					></td
+				>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('ojscad');
+						}}>download</button
+					></td
+				>
+			</tr>
+			<tr>
+				<td>{8 + 2 * optFaces.length}</td>
+				<td>{pDef.partName}_all_freecad.py</td>
+				<td>5-script- pyFreecad</td>
+				<td
+					><button
+						onclick={() => {
+							openDiag2('all', EFormat.eFREECAD);
+						}}>preview</button
+					></td
+				>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('freecad');
+						}}>download</button
+					></td
+				>
+			</tr>
+			<tr>
+				<td>{9 + 2 * optFaces.length}</td>
+				<td>{pDef.partName}_all.zip</td>
+				<td>6-zip- zip</td>
+				<td></td>
+				<td
+					><button
+						onclick={async () => {
+							await downloadExport('zip');
+						}}>download</button
+					></td
+				>
+			</tr>
+		</tbody>
+	</table>
+	<dialog id="dBview" bind:this={myDiag}>
+		<textarea readonly wrap="soft" value={myPreview}></textarea>
+		<button class="bback" onclick={closeDiag}>close - back - escape</button>
+	</dialog>
 	<SubDesign {subD} origPartName={pDef.partName} {pLink} />
 </section>
 
@@ -252,7 +476,7 @@ section > h2 {
   margin: 1rem 0.5rem 0;
 }
 
-section > h2 > select {
+section > h2 > button {
   /*display: inline-block;*/
   height: 1.6rem;
   /*width: 1.6rem;*/
@@ -268,6 +492,11 @@ section > h2 > select {
   background-color: lightBlue;
 }
 
+section > h2 > button.theFace {
+  border-color: Blue;
+  border-width: 0.2rem;
+}
+
 section > textarea {
   /*resize: horizontal;*/
   margin-left: 0.5rem;
@@ -281,19 +510,80 @@ section > textarea.colorErr {
   background-color: violet;
 }
 
-section > button,
-section > select {
+table {
+  border-collapse: collapse;
+  /*border: 1px solid colors.$timectrl-sign;*/
+  margin: 0.2rem 1rem 2rem;
+}
+
+table > caption {
+  color: darkBlue;
+  background-color: lightBlue;
+  font-weight: 700;
+}
+
+table > thead > tr > th,
+table > tbody > tr > td {
+  border: 1px solid darkBlue;
+  padding: 0.2rem 1rem 0.2rem;
+}
+
+table > tbody > tr:nth-child(odd) {
+  background-color: lightYellow;
+}
+
+table > tbody > tr:nth-child(even) {
+  background-color: lightBlue;
+}
+
+section > table > tbody > tr > td > button {
   /*display: inline-block;*/
-  height: 1.6rem;
+  /*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;
+  font-size: 1rem;
+  font-weight: 700;
+  padding: 0.1rem 0.4rem 0.1rem;
+  border-style: none;
+  /*Border-width: 0.1rem;*/
+  /*Border-radius: 0.2rem;*/
+  /*Border-color: colors.$timectrl-sign;*/
+  margin: 0;
+  background-color: inherit;
+}
+
+section > table > tbody > tr > td > button:hover {
+  background-color: white;
+}
+
+dialog#dBview {
+  display: none;
+}
+
+dialog#dBview[open] {
+  display: block;
+}
+
+dialog#dBview::backdrop {
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+dialog#dBview > textarea {
+  display: block;
+  resize: none;
+  background-color: lightYellow;
+  width: 80vw;
+  height: 70vh;
+  margin: 0;
+}
+
+dialog#dBview > button.bback {
+  display: block;
+  color: white;
+  background-color: black;
+  border: none;
+  outline: none;
+  width: 100%;
+  height: 2rem;
+  margin: 1rem 0 0 0;
 }</style>

package/dist/downloadParams.d.ts

@@ -1,4 +1,5 @@
 import type { tParamVal } from 'geometrix';
+declare function getContentDownloadParams(iPartName: string, idparams: tParamVal, iComment: string): string;
 declare function downloadParams(iPartName: string, idparams: tParamVal, iComment: string): void;
 declare function generateUrl(ihref: string, idparams: tParamVal, iLenghtLimit: boolean): string;
-export { downloadParams, generateUrl };
+export { getContentDownloadParams, downloadParams, generateUrl };

package/dist/downloadParams.js

@@ -10,6 +10,13 @@ function download_file(file_name, file_content) {
     //document.body.removeChild(elem_a_download);
     elem_a_download.remove(); // Is this really required?
 }
+function getContentDownloadParams(iPartName, idparams, iComment) {
+    const re1 = /[-:]/g;
+    const re2 = /\..*$/;
+    const datestr = new Date().toISOString().replace(re1, '').replace(re2, '').replace('T', '_');
+    const file_content = createParamFile(datestr, iPartName, idparams, iComment);
+    return file_content;
+}
 function downloadParams(iPartName, idparams, iComment) {
     const re1 = /[-:]/g;
     const re2 = /\..*$/;
@@ -39,4 +46,4 @@ function generateUrl(ihref, idparams, iLenghtLimit) {
     }
     return url1.toString();
 }
-export { downloadParams, generateUrl };
+export { getContentDownloadParams, downloadParams, generateUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geomui",
-	"version": "1.0.4",
+	"version": "1.0.6",
 	"description": "The svelte-library of the webapp-UI of Parametrix",
 	"private": false,
 	"repository": {
@@ -70,32 +70,32 @@
 		"svelte": "^5.19.0"
 	},
 	"dependencies": {
-		"geometrix": "^1.0.3"
+		"geometrix": "^1.0.5"
 	},
 	"devDependencies": {
 		"@atao60/fse-cli": "^0.1.9",
 		"@sveltejs/adapter-auto": "^4.0.0",
 		"@sveltejs/adapter-static": "^3.0.8",
-		"@sveltejs/kit": "^2.16.1",
-		"@sveltejs/package": "^2.3.9",
+		"@sveltejs/kit": "^2.17.1",
+		"@sveltejs/package": "^2.3.10",
 		"@sveltejs/vite-plugin-svelte": "^5.0.3",
 		"@types/eslint": "^9.6.1",
-		"designix": "^1.0.3",
-		"eslint": "^9.19.0",
+		"designix": "^1.0.5",
+		"eslint": "^9.20.0",
 		"eslint-config-prettier": "^10.0.1",
 		"eslint-plugin-svelte": "^2.46.1",
 		"globals": "^15.14.0",
 		"npm-run-all2": "^7.0.2",
-		"prettier": "^3.4.2",
+		"prettier": "^3.5.0",
 		"prettier-plugin-svelte": "^3.3.3",
-		"publint": "^0.3.2",
+		"publint": "^0.3.4",
 		"rimraf": "^6.0.1",
-		"sass": "^1.83.4",
-		"svelte": "^5.19.3",
+		"sass": "^1.84.0",
+		"svelte": "^5.19.9",
 		"svelte-check": "^4.1.4",
 		"typescript": "^5.7.3",
-		"typescript-eslint": "^8.21.0",
-		"vite": "^6.0.11",
-		"vitest": "^3.0.4"
+		"typescript-eslint": "^8.24.0",
+		"vite": "^6.1.0",
+		"vitest": "^3.0.5"
 	}
 }