@reekon-tools/boldr-cad 1.3.0 → 1.5.0

package/src/tools/shapes.ts

@@ -15,6 +15,7 @@ import { mainT, requestDraw, requestOverlayDraw, S } from '../render/view';
 import { fmtLen } from '../units';
 import { anchorMark, applyPending, commitPoint, lengthPreview, PT, rememberHover, wallBand, type PEv } from './registry';
 import { toast, updateHint } from '../editor/ports';
+import { noScaleYet } from '../editor/scaleGate';
 import { wallBounds } from '../editor/elevation';
 import { drawsWalls } from '../editor/mode';
 import { splitWallsAtEnds } from './modify';
@@ -93,13 +94,15 @@ export const rectTool = {
     // (a wall corner placed partway along another wall splits that one there)
     if (wall) for (const id of sides) splitWallsAtEnds(sk, id);
     applyPending(a.cons); applyPending(c.cons);
-    for (const k of [{ type: 'h' as const, a: a.id, b }, { type: 'v' as const, a: b, b: c.id }, { type: 'h' as const, a: d, b: c.id }, { type: 'v' as const, a: a.id, b: d }]) tryAddConstraint(k, { silent: true });
+    // its sides held level and plumb only with auto-constrain on, as any drawing's are (the user's call, 2026-10-26:
+    // "if auto constraint is disabled - it should not work on squares either"); off, it's four lines like any others
+    if (settings.autoCons) for (const k of [{ type: 'h' as const, a: a.id, b }, { type: 'v' as const, a: b, b: c.id }, { type: 'h' as const, a: d, b: c.id }, { type: 'v' as const, a: a.id, b: d }]) tryAddConstraint(k, { silent: true });
     this.reset();
     // (drawn, not selected: nothing new is highlighted — tap it to select it)
     ed.sel = [];
     afterEdit();
   },
-  hint() { return this.st.p1 ? 'Tap the opposite corner.' : 'Tap or drag two opposite corners. Edges stay square.'; },
+  hint() { return this.st.p1 ? 'Tap the opposite corner.' : 'Tap or drag two opposite corners.' + (settings.autoCons ? ' Edges stay square.' : ''); },
 };
 
 export const circleTool = {
@@ -128,7 +131,8 @@ export const circleTool = {
         c.restore();
         // centre marker: crosshair + dot, always visible
         anchorMark(c, x, y);
-        chip(c, 'Ø ' + fmtLen(2 * r), x, y - r * T.s - 16, { bg: '#fff', fg: '#0066FF', border: ['#0066FF', 1.5] });
+        // (its diameter once the drawing has its scale: before, only a placeholder)
+        if (!noScaleYet()) chip(c, 'Ø ' + fmtLen(2 * r), x, y - r * T.s - 16, { bg: '#fff', fg: '#0066FF', border: ['#0066FF', 1.5] });
       };
     } else ed.preview = null;
     requestOverlayDraw();
@@ -151,7 +155,8 @@ export const circleTool = {
     applyPending(cp.cons);
     const id = uid('ci');
     SK().circles[id] = { c: cp.id, r, ...asDrawn() };
-    if (s.kind === 'point') tryAddConstraint({ type: 'oncircle', p: s.ref!, c: id }, { silent: true });
+    // (its edge on a point: held there with auto-constrain on, as a snap is when drawing)
+    if (s.kind === 'point' && settings.autoCons) tryAddConstraint({ type: 'oncircle', p: s.ref!, c: id }, { silent: true });
     this.reset();
     ed.sel = [];
     afterEdit();

package/src/tools/survey.ts

@@ -256,5 +256,26 @@ export function takeSurveyPoint(x: number, y: number, capture?: unknown): boolea
   return true;
 }
 
+/**
+ * Close the open run from the host's device (a button that means "close": BOLDR's T1R's D), as the bar's Close shape
+ * does. No point is taken: the last edge goes back to the first point from wherever the run ended. False when there's
+ * no run of 3 points or more to close, or the drawing can't take it now (the toast says which).
+ */
+export function closeSurveyRun(): boolean {
+  if (ed.readOnly) return false;
+  if (elevOpen()) { toast('Back out of the wall view to close the shape.', { warn: true }); return false; }
+  if (keypadOpen()) { toast('Close the keypad, then close the shape again.', { warn: true }); return false; }
+  // (a run ends when another tool is picked up, or on Annotate: its chain is kept only for the next pick-up to clear)
+  const n = ed.tool === 'survey' ? liveChain().length : 0;
+  if (n < 3) {
+    toast(n ? 'Take ' + (n === 2 ? 'one more point' : '2 more points') + ', then close the shape.' : 'No shape to close — take points with your templator first.', { warn: true });
+    return false;
+  }
+  // (the 3D tab keeps the run, as it keeps the tool in hand: closed on the plan, as a point there would be)
+  if (is3d()) close3d();
+  surveyTool.closeShape();
+  return true;
+}
+
 // a new session (another drawing): every page's frame and the run start again
 onSessionReset(() => { surveyTool.st = fresh(); });

package/src/ui/ctx.ts

@@ -1,6 +1,6 @@
 import { ed } from '../app/state';
 import { markupTarget } from '../editor/markup';
-import { applyCtxAction, barItems, deleteSelection, plusAction, plusLabel, plusVisible } from '../editor/actions';
+import { applyCtxAction, barItems, deleteSelection, iconAlone, plusAction, plusLabel, plusVisible } from '../editor/actions';
 import { selInfo, selectionHint } from '../editor/selection';
 import { $ } from './dom';
 import { icon } from './icons';
@@ -16,10 +16,11 @@ export function updateCtx(): void {
     if (it === 'sep') { const d = document.createElement('div'); d.className = 'sep'; box.appendChild(d); continue; }
     if ('lbl' in it) { const d = document.createElement('div'); d.className = 'lbl'; d.textContent = it.lbl; box.appendChild(d); continue; }
     const b = document.createElement('button');
-    b.className = 'cb' + (it.on ? ' on' : '') + (it.locked ? ' locked' : '');
+    b.className = 'cb' + (it.on ? ' on' : '') + (it.locked ? ' locked' : '') + (iconAlone(it) ? ' lead' : '');
+    // (the bar's lead — Lock, or Open — and Lock wherever it is: its icon alone, its name its label for a screen reader)
     b.innerHTML = (it.ic === 'color'
       ? `<svg width="24" height="24" viewBox="0 0 24 24" aria-hidden="true"><circle cx="12" cy="12" r="8" fill="${markupTarget().color}" stroke="#fff" stroke-width="2"/></svg>`
-      : icon(it.ic)) + '<span>' + it.label + '</span>';
+      : icon(it.ic)) + (iconAlone(it) ? '' : '<span>' + it.label + '</span>');
     b.setAttribute('aria-label', it.label);
     if (it.on != null) b.setAttribute('aria-pressed', String(!!it.on));
     if (it.locked != null) b.setAttribute('aria-pressed', String(it.locked));

package/src/ui/drawer.ts

@@ -1,5 +1,6 @@
 import { addPage, deletePage, deletePending, duplicatePage, focusSpace, renamePage, renameProject, renameSpace, spaceSchedule, switchPage as switchPageIn } from '../editor/project';
 import { allPages, page, store } from '../model/store';
+import { noScaleYet } from '../editor/scaleGate';
 import { drawThumb } from '../render/draw';
 import { fmtArea, fmtLen } from '../units';
 import { $, esc } from './dom';
@@ -57,11 +58,16 @@ export function renderDrawer(): void {
   } else {
     const sched = spaceSchedule(), total = sched.total;
     if (!sched.rows.length) { body.innerHTML = '<p class="empty">No spaces on this page yet. Close a loop of walls or lines, or pick the Space tool and tap inside a closed shape.</p>'; return; }
+    // (a sketch's sizes are placeholders until its first length: no areas until then)
+    const sketchOnly = noScaleYet();
     let h = '';
     for (const r of sched.rows) {
-      h += `<div class="roomrow"><input class="field" data-room="${r.id}" value="${esc(r.name)}" aria-label="Space name"><div class="nums"><span><b>${fmtArea(r.area)}</b> floor</span><span><b>${fmtLen(r.per)}</b> perimeter</span></div></div>`;
+      const nums = sketchOnly ? '' : `<div class="nums"><span><b>${fmtArea(r.area)}</b> floor</span><span><b>${fmtLen(r.per)}</b> perimeter</span></div>`;
+      h += `<div class="roomrow"><input class="field" data-room="${r.id}" value="${esc(r.name)}" aria-label="Space name">${nums}</div>`;
     }
-    h += `<div class="row"><div><b>Total</b><small>Measured to inside wall faces</small></div><b>${fmtArea(total)}</b></div>`;
+    h += sketchOnly
+      ? '<p class="empty">Areas show once the drawing has a length. Select a line and tap + to enter one.</p>'
+      : `<div class="row"><div><b>Total</b><small>Measured to inside wall faces</small></div><b>${fmtArea(total)}</b></div>`;
     body.innerHTML = h;
     body.querySelectorAll<HTMLInputElement>('[data-room]').forEach(i => {
       i.onchange = () => renameSpace(i.dataset.room!, i.value);

package/src/view3d/build.ts

@@ -2,12 +2,12 @@ import { openingHeights, toU, wallHeight } from '../model/elevation';
 import { faceKeyParts } from '../model/faces';
 import { faceFrame, UPPER_Z } from '../model/facesolve';
 import { hyp, normAng } from '../model/geom';
-import { edgeS, openingSpan } from '../model/openings';
+import { edgeS, hingeEdge, openingSpan } from '../model/openings';
 import { curveFrame, wallThick } from '../model/planGeom';
 import { roomGeom } from '../model/rooms';
 import { settings } from '../model/settings';
 import { roomValid, withLineIndex } from '../model/sketch';
-import type { Opening, Sketch, XY } from '../model/types';
+import type { Opening, OpeningEdge, Sketch, XY } from '../model/types';
 import { wallPieces } from '../model/wallshape';
 import { boxLines, cellLines, mergeIv, raiseIn, type Cell3 } from './lines';
 import { PartBuilder, type Mat3, type Part3, type V3 } from './mesh';
@@ -59,7 +59,7 @@ export function inFront(cut: Cut3, m: XY, n: XY): boolean {
 
 interface Wall3 { id: string; A: XY; B: XY; u: XY; L: number; t: number; h: number; full: number }
 
-interface Opening3 { id: string; type: Opening['type']; s0: number; s1: number; sill: number; head: number; flip: boolean }
+interface Opening3 { id: string; type: Opening['type']; s0: number; s1: number; sill: number; head: number; flip: boolean; hinge: OpeningEdge }
 
 /** The plan's straight walls, each at its height (cut down when it's in front of a cutaway). */
 function straightWalls(sk: Sketch, cut: Cut3 | null, lowered: string[]): Map<string, Wall3> {
@@ -150,7 +150,7 @@ function openingsIn(sk: Sketch, w: Wall3, mine: [string, Opening][]): Opening3[]
     const s0 = Math.max(0, Math.min(a, b)), s1 = Math.min(w.L, Math.max(a, b));
     if (s1 - s0 < 0.01) continue;
     const { sill, head } = openingHeights(o);
-    out.push({ id, type: o.type, s0, s1, sill: Math.min(sill, w.h), head: Math.min(head, w.h), flip: !!o.flip });
+    out.push({ id, type: o.type, s0, s1, sill: Math.min(sill, w.h), head: Math.min(head, w.h), flip: !!o.flip, hinge: hingeEdge(o) });
   }
   return out.sort((p, q) => p.s0 - q.s0);
 }
@@ -243,8 +243,8 @@ const FRAME = 0.75, CASING = 2.5, CASING_OUT = 0.625, LEAF = 1.375, OPEN = (30 *
 
 /**
  * A door, so it reads as one: the floor run on through the doorway, a frame lining its sides and head, casings round
- * it on both faces (as high as the wall goes), and its leaf — hinged at its first side on the face it swings to, as the
- * plan draws it, and open a little. Its outlines go on `lines`.
+ * it on both faces (as high as the wall goes), and its leaf — hung on its hinge's jamb (Opening.hinge) on the face it
+ * swings to, as the plan draws it, and open a little. Its outlines go on `lines`.
  */
 function doorPart(w: Wall3, o: Opening3, lines: number[]): PartBuilder {
   const b = new PartBuilder('opening', o.id), half = w.t / 2, head = Math.min(o.head, w.h), nx = -w.u.y, ny = w.u.x;
@@ -267,12 +267,13 @@ function doorPart(w: Wall3, o: Opening3, lines: number[]): PartBuilder {
     box(rect(o.s1, o.s1 + CASING, k0, k1), 0, top, 'frame');
     box(rect(o.s0, o.s1, k0, k1), head, top, 'frame');
   }
-  const f = o.flip ? -1 : 1, W = o.s1 - o.s0 - 2 * FRAME, H = head - FRAME - 0.5;
+  const f = o.flip ? -1 : 1, m = o.hinge === 's1' ? -1 : 1, W = o.s1 - o.s0 - 2 * FRAME, H = head - FRAME - 0.5;
   if (W > 2 && H > 2) {
-    // (turned about its hinge, at the frame on the face it swings to, toward that face)
-    const hs = o.s0 + FRAME, hk = f * half, c = Math.cos(f * OPEN), sn = Math.sin(f * OPEN);
+    // (turned about its hinge, at the frame on the face it swings to, toward that face; it runs from its hinge's jamb
+    // to the other: along the wall, or back along it, `m`)
+    const hs = m > 0 ? o.s0 + FRAME : o.s1 - FRAME, hk = f * half, c = Math.cos(m * f * OPEN), sn = Math.sin(m * f * OPEN);
     const R = (s: number, k: number): XY => P(hs + (s - hs) * c - (k - hk) * sn, hk + (s - hs) * sn + (k - hk) * c);
-    box([R(hs, hk), R(hs + W, hk), R(hs + W, hk - f * LEAF), R(hs, hk - f * LEAF)], 0.5, 0.5 + H, 'door');
+    box([R(hs, hk), R(hs + m * W, hk), R(hs + m * W, hk - f * LEAF), R(hs, hk - f * LEAF)], 0.5, 0.5 + H, 'door');
   }
   return b;
 }