From 248e7952f78115b75616d6454f8ba08e07745b90 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 1 Jun 2024 23:42:35 -0400 Subject: [PATCH 1/5] tweak cam op list l&f --- src/kiri-mode/cam/client.js | 5 ++--- src/kiri-mode/fdm/client.js | 2 +- web/kiri/index.css | 8 +++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index 9e922383..9a797a1a 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -457,7 +457,7 @@ CAM.init = function(kiri, api) { currentIndex = isIndexed && !isPreview ? index * DEG2RAD : 0; } - // (re)render thea re-orderable op list + // (re)render the re-orderable op list api.event.on("cam.op.render", func.opRender = () => { let oplist = current.process.ops; if (!(isCamMode && oplist)) { @@ -471,7 +471,6 @@ CAM.init = function(kiri, api) { let notime = false; oplist.forEach((rec,i) => { let clock = rec.type === '|'; - // let label = clock ? `` : rec.type; let label = clock ? `` : rec.type; let clazz = notime ? [ "draggable", "notime" ] : [ "draggable" ]; let notable = rec.note?.split(' ').filter(v => v.charAt(0) === '#'); @@ -481,7 +480,7 @@ CAM.init = function(kiri, api) { `
`, ``, clock ? '' : - ``, + ``, `
` ]); bind[mark+i] = rec; diff --git a/src/kiri-mode/fdm/client.js b/src/kiri-mode/fdm/client.js index 1a4eea10..fb359ba7 100644 --- a/src/kiri-mode/fdm/client.js +++ b/src/kiri-mode/fdm/client.js @@ -114,7 +114,7 @@ FDM.init = function(kiri, api) { let id = (now++).toString(36); let rows = Object.entries(range.fields).map(a => `
`).join(''); let hover = `
${rows}
`; - let info = ``; + let info = ``; html.appendAll([ `
${hover}${info}
` ]); diff --git a/web/kiri/index.css b/web/kiri/index.css index f7aab9fc..bbbe9fa6 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -1063,6 +1063,9 @@ th, tr, td, label { #oplist .clock:hover { background-color: var(--blue-2); } +#oplist > div { + padding: 5px 20px 5px 7px !important; +} #oplist > div, .opdiv { display: flex; flex-direction: column; @@ -1094,10 +1097,9 @@ th, tr, td, label { } #oplist div .del { position: absolute; - top: 1px; - right: 2px; + right: 6px; font-size: 14px; - color: rgba(0,0,0,0); + color: rgba(0,0,0,0.25); } .dark #oplist div:hover .del { color: #777; From e055f3c15707ec7a0edc3a4c740b592edb0a7ac9 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 2 Jun 2024 00:17:38 -0400 Subject: [PATCH 2/5] add timeline for all cnc index modes --- src/kiri-mode/cam/client.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index 9a797a1a..94cde2a8 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -103,10 +103,12 @@ CAM.init = function(kiri, api) { return; } const clockOp = cp.ops.filter(op => op.type === '|')[0]; - if (isIndexed && !clockOp) { + // if (isIndexed && !clockOp) { + // func.opAdd(popOp['|'].new()); + // } else if (!isIndexed && clockOp) { + // func.opDel(clockOp); + if (!clockOp) { func.opAdd(popOp['|'].new()); - } else if (!isIndexed && clockOp) { - func.opDel(clockOp); } else { func.opRender(); } From 47692e7a339340cd78c9e6cd429bba0c03449151 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 2 Jun 2024 01:11:10 -0400 Subject: [PATCH 3/5] add tool tip for timeline/clock bar --- src/kiri-mode/cam/client.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index 94cde2a8..c16a4df1 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -472,14 +472,15 @@ CAM.init = function(kiri, api) { let scale = API.view.unit_scale(); let notime = false; oplist.forEach((rec,i) => { + let title = ''; let clock = rec.type === '|'; let label = clock ? `` : rec.type; let clazz = notime ? [ "draggable", "notime" ] : [ "draggable" ]; let notable = rec.note?.split(' ').filter(v => v.charAt(0) === '#'); - if (clock) clazz.push('clock'); + if (clock) { clazz.push('clock'); title = ` title="end of ops chain\ndrag/drop like an op\nops after this are disabled"` } if (notable?.length) label = notable[0].slice(1); html.appendAll([ - `
`, + `
`, ``, clock ? '' : ``, From 2f2009047e1477d7a3ff0be62f514a8d7a6b68d0 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 2 Jun 2024 11:00:37 -0400 Subject: [PATCH 4/5] fix lay flat --- src/kiri/init.js | 2 +- src/kiri/tools.js | 3 ++- web/kiri/index.css | 12 ++++-------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 2ca04a7a..dd55e5a0 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2760,7 +2760,7 @@ gapp.register("kiri.init", [], (root, exports) => { }; $('context-duplicate').onclick = duplicateSelection; $('context-mirror').onclick = mirrorSelection; - $('context-layflat').onclick = layFlat; + $('context-layflat').onclick = () => { api.event.emit("tool.mesh.lay-flat") }; $('context-setfocus').onclick = setFocus; ui.modal.onclick = api.modal.hide; diff --git a/src/kiri/tools.js b/src/kiri/tools.js index f0df350a..ce1646d8 100644 --- a/src/kiri/tools.js +++ b/src/kiri/tools.js @@ -126,8 +126,9 @@ api.event.on('mouse.hover', (ev) => { pmesh.position.y = -v.z; pmesh.position.z = v.y; } else { + const zcomp = api.mode.get() === 'CAM' ? track.tzoff : 0; pmesh.position.y = -point.z - opos.y + norm.y * 0.1; - pmesh.position.z = point.y + track.tzoff + norm.z * 0.1; + pmesh.position.z = point.y + zcomp + norm.z * 0.1; } let q = new Quaternion().setFromUnitVectors(ZAXIS, new Vector3(norm.x,norm.y,norm.z) diff --git a/web/kiri/index.css b/web/kiri/index.css index bbbe9fa6..4a0cea83 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -722,9 +722,6 @@ th, tr, td, label { .movable { margin: 5px; } -.movable input { - background-color: rgba(255,255,255,0.5); -} .movable .title { color: white; padding: 2px 3px 1px 3px; @@ -737,10 +734,9 @@ th, tr, td, label { .movable .body { margin: 0; padding: 0 5px 0 0; - background-color: rgba(245,245,245,0.8); -} -.movable:hover .body { - background-color: rgba(245,245,245,0.95); + background-color: #fff; + border-left: 1px solid #eee; + border-right: 1px solid #eee; } .movable .footer { height: 10px; @@ -780,7 +776,7 @@ th, tr, td, label { #float-tools { position: absolute; - margin: 0 0 0 5px; + margin: 0; top: 50px; left: 50%; transform: translateX(-50%); From 6db731ebc17290286f09b8b759e5de64ff54429e Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 2 Jun 2024 11:05:10 -0400 Subject: [PATCH 5/5] bump rev 4.0.D9 --- package.json | 2 +- src/main/kiri.js | 2 +- src/moto/license.js | 2 +- web/kiri/manifest.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index b6273d8d..5375f5ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grid-apps", - "version": "4.0.8D", + "version": "4.0.9D", "description": "grid.space 3d slice & modeling tools", "author": "Stewart Allen ", "license": "MIT", diff --git a/src/main/kiri.js b/src/main/kiri.js index 30353dfc..a044f299 100644 --- a/src/main/kiri.js +++ b/src/main/kiri.js @@ -15,7 +15,7 @@ gapp.main("main.kiri", [], (root) => { const modfns = root.kirimod = ( root.kirimod || [] ); const kiri = root.kiri = { - beta: 4008, + beta: 4009, driver: {}, // driver modules load(fn) { modfns.push(fn); diff --git a/src/moto/license.js b/src/moto/license.js index 0ea30b80..9402691d 100644 --- a/src/moto/license.js +++ b/src/moto/license.js @@ -5,7 +5,7 @@ let terms = { COPYRIGHT: "Copyright (C) Stewart Allen - All Rights Reserved", LICENSE: "See the license.md file included with the source distribution", - VERSION: (is_self ? self : this).debug_version || "4.0.D8" + VERSION: (is_self ? self : this).debug_version || "4.0.D9" }; if (typeof(module) === 'object') { diff --git a/web/kiri/manifest.json b/web/kiri/manifest.json index 58fe920a..83231b33 100644 --- a/web/kiri/manifest.json +++ b/web/kiri/manifest.json @@ -1,5 +1,5 @@ { - "name": "Kiri:Moto 4.0.D8", + "name": "Kiri:Moto 4.0.D9", "short_name": "Kiri:Moto", "description": "Slicer for 3D printers, CNC mills, laser cutters and more", "start_url": "/kiri/",