geomui 0.5.36 → 0.5.38

package/README.md

@@ -5,64 +5,30 @@ Geomui
 Presentation
 ------------
 
-The svg-files, that describe the parameters, are expected to be copied in the directory *static/pgdsvg*. Per convention, each *design package* should provide its svg-files in the directory *dist/pgdsvg*.
+*Geomui* is the svelte library of [parametrix](https://charlyoleg2.github.io/parametrix/).
+The top-level component is *OneDesign*. It expose the parameters and the rendering of a *design*.
 
 
-# create-svelte
+SVG files
+---------
 
-Everything you need to build a Svelte library, powered by [`create-svelte`](https://github.com/sveltejs/kit/tree/master/packages/create-svelte).
+The svg-files, that describe the parameters, are expected to be copied in the directory *static/pgdsvg*. Per convention, each *design-library* should provide its svg-files in the directory *dist/pgdsvg*.
 
-Read more about creating a library [in the docs](https://kit.svelte.dev/docs/packaging).
 
-## Creating a project
-
-If you're seeing this, you've probably already done this step. Congrats!
-
-```bash
-# create a new project in the current directory
-npm create svelte@latest
-
-# create a new project in my-app
-npm create svelte@latest my-app
-```
-
-## Developing
-
-Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
-
-```bash
-npm run dev
-
-# or start the server and open the app in a new browser tab
-npm run dev -- --open
-```
-
-Everything inside `src/lib` is part of your library, everything inside `src/routes` can be used as a showcase or preview app.
-
-## Building
-
-To build your library:
-
-```bash
-npm run package
-```
-
-To create a production version of your showcase app:
-
-```bash
-npm run build
-```
-
-You can preview the production build with `npm run preview`.
-
-> To deploy your app, you may need to install an [adapter](https://kit.svelte.dev/docs/adapters) for your target environment.
+Requirements
+------------
 
-## Publishing
+- [node](https://nodejs.org) > 20.10.0
+- [npm](https://docs.npmjs.com/cli) > 10.5.0
 
-Go into the `package.json` and give your package the desired name through the `"name"` option. Also consider adding a `"license"` field and point it to a `LICENSE` file which you can create from a template (one popular option is the [MIT license](https://opensource.org/license/mit/)).
 
-To publish your library to [npm](https://www.npmjs.com):
+Getting started
+---------------
 
 ```bash
-npm publish
+git clone https://github.com/charlyoleg2/parametrix
+cd parametrix
+npm install
+npm run ci
+npm run preview
 ```

package/dist/Drawing.svelte

@@ -17,6 +17,7 @@ export let pDef;
 export let fgeom;
 export let optFaces;
 export let selFace;
+export let zAdjust;
 export let simTime = 0;
 const c_ParametrixAll = "ParametrixAll";
 let windowWidth;
@@ -25,7 +26,6 @@ let canvasZoom;
 const canvas_size_min = 400;
 let aFigure;
 let cAdjust;
-let zAdjust;
 function canvasRedrawFull(iLayers) {
   const ctx1 = canvasFull.getContext("2d");
   ctx1.clearRect(0, 0, ctx1.canvas.width, ctx1.canvas.height);

package/dist/Drawing.svelte.d.ts

@@ -5,6 +5,7 @@ declare const __propDef: {
         fgeom: tGeomFunc;
         optFaces: string[];
         selFace: string;
+        zAdjust: tCanvasAdjust;
         simTime?: number | undefined;
     };
     events: {

package/dist/InputParams.svelte

@@ -3,7 +3,7 @@ import ModalImg from "./ModalImg.svelte";
 import LocStorWrite from "./LocStorWrite.svelte";
 import LocStorRead from "./LocStorRead.svelte";
 import SimpleDrawing from "./SimpleDrawing.svelte";
-import { PType, parseParamFile, createParamFile } from "geometrix";
+import { PType, parseParamFile, createParamFile, adjustZero } from "geometrix";
 import { storePV } from "./storePVal";
 import { downloadParams, generateUrl } from "./downloadParams";
 import { onMount, createEventDispatcher } from "svelte";
@@ -14,7 +14,9 @@ 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" });
@@ -383,7 +385,10 @@ $: {
 		<img src={paramSvg} alt={paramSvg} />
 	</button>
 	<div class="mini-canvas">
-		<SimpleDrawing pageName={pDef.partName} {fgeom} {selFace} {simTime} />
+		<SimpleDrawing pageName={pDef.partName} {fgeom} {selFace} zAdjust={cAdjustZero} {simTime} />
+	</div>
+	<div class="mini-canvas">
+		<SimpleDrawing pageName={pDef.partName} {fgeom} {selFace} {zAdjust} {simTime} />
 	</div>
 </section>
 

package/dist/InputParams.svelte.d.ts

@@ -4,6 +4,7 @@ declare const __propDef: {
         pDef: tParamDef;
         fgeom: tGeomFunc;
         selFace: string;
+        zAdjust: tCanvasAdjust;
         simTime?: number | undefined;
     };
     events: {

package/dist/OneDesign.svelte

@@ -8,7 +8,7 @@ $:
 </script>
 
 <h1>{pageDef.pTitle}</h1>
-<article>{pageDef.pDescription}</article>
+<article>[{pageDef.pDef.partName}]: {pageDef.pDescription}</article>
 <DrawingList pDef={pageDef.pDef} />
 <ParamDrawExport pDef={pageDef.pDef} fgeom={pageDef.pGeom} {pLink} />
 

package/dist/ParamDrawExport.svelte

@@ -4,7 +4,8 @@
   fileTextContent,
   fileSuffix,
   fileMime,
-  fileBin
+  fileBin,
+  adjustZero
 } from "geometrix";
 import InputParams from "./InputParams.svelte";
 import Drawing from "./Drawing.svelte";
@@ -25,6 +26,7 @@ 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;
@@ -84,6 +86,8 @@ async function downloadExport(iExportFace) {
     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") {
@@ -124,7 +128,7 @@ async function downloadExport2() {
 }
 </script>
 
-<InputParams {pDef} on:paramChg={paramChange} {fgeom} {selFace} {simTime} />
+<InputParams {pDef} on:paramChg={paramChange} {fgeom} {selFace} {zAdjust} {simTime} />
 <section>
 	<h2>Log</h2>
 	<textarea
@@ -137,7 +141,7 @@ async function downloadExport2() {
 		class:colorWarn={calcWarn}
 	/>
 </section>
-<Drawing {pDef} {fgeom} {optFaces} bind:selFace bind:simTime />
+<Drawing {pDef} {fgeom} {optFaces} bind:selFace bind:zAdjust bind:simTime />
 <section>
 	<h2>Export</h2>
 	<select bind:value={exportFace}>
@@ -149,6 +153,7 @@ async function downloadExport2() {
 			<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>

package/dist/SimpleDrawing.svelte

@@ -5,6 +5,7 @@ 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;
@@ -15,7 +16,11 @@ function canvasRedrawMini(aFigure, iLayers) {
   const ctx1 = canvasMini.getContext("2d");
   ctx1.clearRect(0, 0, ctx1.canvas.width, ctx1.canvas.height);
   try {
-    mAdjust = aFigure.getAdjustFull(ctx1.canvas.width, ctx1.canvas.height);
+    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);

package/dist/SimpleDrawing.svelte.d.ts

@@ -4,6 +4,7 @@ declare const __propDef: {
         pageName: string;
         fgeom: tGeomFunc;
         selFace: string;
+        zAdjust: tCanvasAdjust;
         simTime?: number | undefined;
     };
     events: {

package/package.json

@@ -1,26 +1,15 @@
 {
 	"name": "geomui",
-	"version": "0.5.36",
+	"version": "0.5.38",
 	"description": "The svelte-library of the webapp-UI of Parametrix",
-	"type": "module",
 	"private": false,
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"svelte": "./dist/index.js"
-		}
-	},
-	"files": [
-		"dist",
-		"!dist/**/*.map",
-		"!dist/**/*.test.*",
-		"!dist/**/*.spec.*"
-	],
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/charlyoleg2/parametrix.git"
 	},
 	"homepage": "https://charlyoleg2.github.io/parametrix/",
+	"author": "charlyoleg",
+	"license": "ISC",
 	"keywords": [
 		"cad",
 		"programmatic",
@@ -30,7 +19,36 @@
 		"arc",
 		"gear"
 	],
-	"author": "charlyoleg",
+	"type": "module",
+	"exports": {
+		".": {
+			"types": "./dist/index.d.ts",
+			"svelte": "./dist/index.js"
+		}
+	},
+	"files": [
+		"dist",
+		"!dist/**/*.map",
+		"!dist/**/*.test.*",
+		"!dist/**/*.spec.*"
+	],
+	"prettier": {
+		"useTabs": true,
+		"singleQuote": true,
+		"trailingComma": "none",
+		"printWidth": 100,
+		"plugins": [
+			"prettier-plugin-svelte"
+		],
+		"overrides": [
+			{
+				"files": "*.svelte",
+				"options": {
+					"parser": "svelte"
+				}
+			}
+		]
+	},
 	"scripts": {
 		"cp_pgdsvg": "shx cp -r ../../node_modules/designix/dist/pgdsvg static/",
 		"dev": "vite dev",
@@ -52,48 +70,31 @@
 		"svelte": "^4.0.0"
 	},
 	"dependencies": {
-		"geometrix": "^0.5.33"
+		"geometrix": "^0.5.35"
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-auto": "^3.2.0",
 		"@sveltejs/adapter-static": "^3.0.1",
-		"@sveltejs/kit": "^2.5.5",
+		"@sveltejs/kit": "^2.5.7",
 		"@sveltejs/package": "^2.3.1",
-		"@sveltejs/vite-plugin-svelte": "^3.0.2",
+		"@sveltejs/vite-plugin-svelte": "^3.1.0",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
-		"designix": "^0.5.34",
+		"designix": "^0.5.36",
 		"eslint": "^8.57.0",
 		"eslint-config-prettier": "^9.1.0",
-		"eslint-plugin-svelte": "^2.35.1",
+		"eslint-plugin-svelte": "^2.38.0",
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.2.5",
-		"prettier-plugin-svelte": "^3.2.2",
+		"prettier-plugin-svelte": "^3.2.3",
 		"publint": "^0.2.7",
-		"sass": "^1.74.1",
+		"sass": "^1.77.0",
 		"shx": "^0.3.4",
-		"svelte": "^4.2.12",
-		"svelte-check": "^3.6.9",
+		"svelte": "^4.2.16",
+		"svelte-check": "^3.7.1",
 		"tslib": "^2.6.2",
-		"typescript": "^5.4.4",
-		"vite": "^5.2.8",
-		"vitest": "^1.4.0"
-	},
-	"prettier": {
-		"useTabs": true,
-		"singleQuote": true,
-		"trailingComma": "none",
-		"printWidth": 100,
-		"plugins": [
-			"prettier-plugin-svelte"
-		],
-		"overrides": [
-			{
-				"files": "*.svelte",
-				"options": {
-					"parser": "svelte"
-				}
-			}
-		]
+		"typescript": "^5.4.5",
+		"vite": "^5.2.11",
+		"vitest": "^1.6.0"
 	}
 }