@reekon-tools/boldr-cad 0.1.0 → 1.0.0

package/dist/editor/mode.js

@@ -1,6 +1,7 @@
 import { ed } from '../app/state';
 import { requestDraw } from '../render/view';
 import { cancelTool } from '../tools/registry';
+import { elevOpen, WALL_ICON, WALL_RAIL } from './elevation';
 import { refreshModes, updateCtx, updateHint, updateRail } from './ports';
 /** Switch between Draft and Annotate: each has its own tools, and the selection starts empty. */
 export function setMode(m) {
@@ -19,20 +20,86 @@ export function setMode(m) {
 /** New lines become construction lines (guides that never make spaces), or regular lines again. */
 export function toggleConstr() {
     ed.drawConstr = !ed.drawConstr;
+    // (a wall is never a guide)
+    if (ed.drawConstr)
+        ed.drawWalls = false;
+    toggled();
+}
+/** What's drawn — lines, rectangles, circles, arcs, Draw to shape — becomes walls, or lines again. */
+export function toggleWalls() {
+    ed.drawWalls = !ed.drawWalls;
+    if (ed.drawWalls)
+        ed.drawConstr = false;
+    toggled();
+}
+/** A toggle flipped: the rail shows it, and a shape being drawn (and the hint) shows what it'll now make. */
+function toggled() {
     updateRail();
+    updateHint();
+    requestDraw();
 }
+/** Whether what's drawn now is walls: the Walls toggle, except in the wall view (what's drawn on a wall's face never is). */
+export const drawsWalls = () => ed.drawWalls && !elevOpen();
+/** The rail's toggles: whether each is on, and flipping it. */
+export const TOGGLES = {
+    wall: { on: () => ed.drawWalls, flip: toggleWalls },
+    constr: { on: () => ed.drawConstr, flip: toggleConstr },
+};
+/** The tool rail now: the wall view's while a wall is open, otherwise the current mode's (the 3D tab has none). */
+export const railItems = () => (elevOpen() ? WALL_RAIL : RAIL[ed.mode]);
+/** The icon for a rail item. */
+export const railIcon = (id) => WALL_ICON[id] ?? id;
 /** The tool rail for each mode. 'toggle' items switch something on and off; 'act' items run an action. */
 export const RAIL = {
     draft: [
-        ['select', 'Select', 'V'], ['line', 'Line', 'L'], ['freehand', 'Draw to shape', 'S'], ['wall', 'Wall', 'W'], ['rect', 'Rectangle', 'R'], ['circle', 'Circle', 'C'], ['arc', 'Arc', 'A'], '|',
-        // Trim (T) and Offset (O) stay on the keyboard; Offset is also in the bar for a selected line
-        ['dim', 'Dimension', 'D'], ['door', 'Door', 'B'], ['window', 'Window', 'N'], ['room', 'Space', 'M'], ['constr', 'Construction lines', 'X', 'toggle'], '|',
+        // drawing; then the building (walls, what goes in them, spaces); then measuring and guides
+        ['select', 'Select', 'V'], ['line', 'Line', 'L'], ['freehand', 'Draw to shape', 'S'], ['rect', 'Rectangle', 'R'], ['circle', 'Circle', 'C'], ['arc', 'Arc', 'A'], '|',
+        ['door', 'Door', 'B'], ['window', 'Window', 'N'], ['room', 'Space', 'M'], '|',
+        // Trim (T) and Offset (O) stay on the keyboard; Offset is also in the bar for a selected line.
+        // The toggles together: what's drawn is walls, or guides (one or the other, never both)
+        ['dim', 'Dimension', 'D'], ['wall', 'Walls', 'W', 'toggle'], ['constr', 'Construction lines', 'X', 'toggle'], '|',
         ['undo', 'Undo', '⌘Z', 'act'], ['redo', 'Redo', '⇧⌘Z', 'act'],
     ],
     annotate: [
-        ['aselect', 'Select markup', 'V'], ['arrow', 'Arrow', 'K'], ['pen', 'Pen', 'P'], ['image', 'Add photo or plan', '', 'act'], ['text', 'Note', 'N'], ['cloud', 'Revision cloud', 'Q'], ['calib', 'Set image scale', 'J'], '|',
+        // the markup shapes, Arrow first (on a phone they share Arrow's place: MARKS_GROUP)
+        ['aselect', 'Select markup', 'V'], ['arrow', 'Arrow', 'K'], ['mline', 'Line', 'L'], ['mrect', 'Rectangle', 'R'], ['mtri', 'Triangle', ''],
+        ['mcircle', 'Circle', 'C'], ['pen', 'Pen', 'P'], ['cloud', 'Revision cloud', 'Q'], ['text', 'Note', 'N'], ['image', 'Add photo or plan', '', 'act'], '|',
         ['color', 'Markup color', '', 'act'], '|',
         ['undo', 'Undo', '⌘Z', 'act'], ['redo', 'Redo', '⇧⌘Z', 'act'],
     ],
 };
+/**
+ * Tools that share one place on a phone's rail, which has no room for each: a tap draws with the one used last (the
+ * place shows it), and a long press opens a menu of them all (react/ShapeMenu.tsx) — Draft's Line, Rectangle, Circle
+ * and Arc, and Annotate's markup shapes. A tablet's or a browser's rail shows every one in its own place.
+ */
+export const SHAPE_TOOLS = ['line', 'rect', 'circle', 'arc'];
+export const SHAPES_GROUP = 'shapes';
+export const MARK_TOOLS = ['arrow', 'mline', 'mrect', 'mtri', 'mcircle'];
+export const MARKS_GROUP = 'marks';
+export const TOOL_GROUPS = {
+    [SHAPES_GROUP]: { tools: SHAPE_TOOLS, label: 'Shapes', mode: 'draft', phoneOnly: true },
+    [MARKS_GROUP]: { tools: MARK_TOOLS, label: 'Markup shapes', mode: 'annotate', phoneOnly: true },
+};
+/** The group a tool shares its place with on this rail, if any. */
+export const groupOf = (tool, phone) => Object.keys(TOOL_GROUPS).find(g => TOOL_GROUPS[g].tools.includes(tool) && (phone || !TOOL_GROUPS[g].phoneOnly)) ?? null;
+/** A rail with each group's tools folded into one place, where the first of them was; the rest as it was. */
+export function groupTools(items, phone) {
+    if (!items.some(it => it !== '|' && groupOf(it[0], phone)))
+        return items;
+    const out = [];
+    for (const it of items) {
+        const g = it === '|' ? null : groupOf(it[0], phone);
+        if (!g)
+            out.push(it);
+        else if (!out.some(o => o !== '|' && o[0] === g))
+            out.push([g, TOOL_GROUPS[g].label, '', 'group']);
+    }
+    return out;
+}
+/** A tool's name on the rail ('Line', 'Rectangle'…). */
+export const toolLabel = (id) => {
+    const it = [...RAIL.draft, ...RAIL.annotate].find(r => r !== '|' && r[0] === id);
+    return it && it !== '|' ? it[1] : id;
+};
 //# sourceMappingURL=mode.js.map

package/dist/editor/mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../src/editor/mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAa,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1E,iGAAiG;AACjG,MAAM,UAAU,OAAO,CAAC,CAAO;IAC7B,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI;QAAE,OAAO;IAC1B,UAAU,EAAE,CAAC;IACb,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC;IACZ,EAAE,CAAC,IAAI,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;IACZ,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC;IAChB,YAAY,EAAE,CAAC;IAAC,SAAS,EAAE,CAAC;IAAC,UAAU,EAAE,CAAC;IAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,YAAY;IAC1B,EAAE,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC;IAC/B,UAAU,EAAE,CAAC;AACf,CAAC;AAKD,0GAA0G;AAC1G,MAAM,CAAC,MAAM,IAAI,GAA6B;IAC5C,KAAK,EAAE;QACL,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG;QAC5L,8FAA8F;QAC9F,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG;QACzJ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC;KAC9D;IACD,QAAQ,EAAE;QACR,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,GAAG;QAC3N,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,GAAG;QACzC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC;KAC9D;CACF,CAAC"}
+{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../src/editor/mode.ts"],"names":[],"mappings":"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"}

package/dist/editor/ports.d.ts

@@ -1,4 +1,5 @@
-import type { Constraint } from '../model/types';
+import type { Constraint, LinkTarget } from '../model/types';
+import type { MeasurementKind } from './links';
 export interface ToastOpts {
     warn?: boolean;
     action?: {
@@ -27,9 +28,21 @@ export interface KeypadSpec {
     laser?: boolean;
     /** extra buttons, read again after each press so their state can change */
     extras?: () => KeypadExtra[];
-    onDone?: (v: number) => void;
+    /** the value; `capture`, a laser reading's record (laserReading's), when it's that reading applied as it came in */
+    onDone?: (v: number, capture?: unknown) => void;
+    /**
+     * A line's length, or a dimension's angle: the job's measurements are offered with the keys (a page swiped to on a
+     * touch screen, Select From List on a desktop), those of `kind` pickable — the one picked handed to `pick` (the
+     * keypad's for closing, and the value for setting from it, linked to it).
+     */
+    measurements?: {
+        kind: MeasurementKind;
+        pick: (t: LinkTarget) => void;
+    };
     /** called whenever the keypad closes (applied or cancelled), e.g. to clear a preview */
     onClose?: () => void;
+    /** no backdrop: the drawing stays live behind it (a tool can take the next tap, and close it) */
+    modeless?: boolean;
 }
 export interface ConflictSpec {
     title: string;
@@ -42,13 +55,13 @@ export interface ConflictSpec {
     retry?: () => void;
     onResolved?: (() => void) | null;
 }
-export type DrawerTab = 'pages' | 'layers' | 'rooms';
+export type DrawerTab = 'pages' | 'rooms';
 /**
  * Parts of the interface that show editor state and must re-read it after a change:
  * the contextual bar, the hint, the definition-state pill, the tool rail, the mode tabs (and the rail's tool set),
  * the project drawer, the wall elevation view, the top bar's view toggles, the keypad's display, and the laser tray.
  */
-export type ChromePart = 'ctx' | 'hint' | 'status' | 'rail' | 'mode' | 'drawer' | 'elevation' | 'topbar' | 'keypad' | 'tray';
+export type ChromePart = 'ctx' | 'hint' | 'status' | 'rail' | 'mode' | 'drawer' | 'elevation' | 'topbar' | 'keypad' | 'tray' | 'confirm';
 export interface EditorPorts {
     refresh(part: ChromePart): void;
     toast(msg: string, opts?: ToastOpts): void;
@@ -58,16 +71,28 @@ export interface EditorPorts {
     keypadTyped(): number | null;
     showConflict(spec: ConflictSpec): void;
     openDrawer(tab?: DrawerTab): void;
-    showNoteInput(sx: number, sy: number, cb: (text: string) => void): void;
+    /** the text field for a note at a screen point; `initial`: the text it starts with (editing a note) */
+    showNoteInput(sx: number, sy: number, cb: (text: string) => void, initial?: string): void;
     hideNoteInput(): void;
     /** the markup color picker, next to `anchor` (the button that asked for it, if any) */
     openPalette(anchor?: unknown): void;
+    /** the selected image's opacity slider, above the bar (its button again closes it) */
+    toggleImageOpacity(anchor?: unknown): void;
+    /** the selected image's rotation slider, above the bar (its button again closes it) */
+    toggleImageRotation(anchor?: unknown): void;
+    /** the link tiles' size slider, above the bar (its button again closes it) */
+    toggleTileSize(anchor?: unknown): void;
     /** let the user type a new name for a space */
     editRoomName(roomId: string): void;
     /** the mouse cursor over the plan (or the wall elevation), as a CSS cursor name ('' = the default); ignored without a mouse */
     setCursor(cursor: string, where?: 'plan' | 'elevation'): void;
     /** close any open popover (the settings menu, the color palette); true if one was open */
     dismissPopovers(): boolean;
+    /**
+     * a gesture on the drawing started moving — a stroke, a drag, a pan or a pinch (never a tap) — or its last pointer
+     * lifted: the interface can step out of the way meanwhile
+     */
+    interacting(on: boolean): void;
     /** close the conflict sheet; true if it was open */
     dismissConflict(): boolean;
     /** save now (⌘S) */
@@ -85,12 +110,16 @@ export declare const closeKeypad: () => void;
 export declare const kpTyped: () => number | null;
 export declare const showConflict: (spec: ConflictSpec) => void;
 export declare const openDrawer: (tab?: DrawerTab) => void;
-export declare const showNoteInput: (sx: number, sy: number, cb: (text: string) => void) => void;
+export declare const showNoteInput: (sx: number, sy: number, cb: (text: string) => void, initial?: string) => void;
 export declare const hideNoteInput: () => void;
 export declare const openPalette: (anchor?: unknown) => void;
+export declare const toggleImageOpacity: (anchor?: unknown) => void;
+export declare const toggleImageRotation: (anchor?: unknown) => void;
+export declare const toggleTileSize: (anchor?: unknown) => void;
 export declare const editRoomName: (roomId: string) => void;
 export declare const setCursor: (cursor: string, where?: 'plan' | 'elevation') => void;
 export declare const dismissPopovers: () => boolean;
+export declare const interacting: (on: boolean) => void;
 export declare const dismissConflict: () => boolean;
 export declare const saveNowPort: () => void;
 export declare const saveFile: (name: string, mime: string, data: string) => void;
@@ -104,3 +133,4 @@ export declare const renderElevation: () => void;
 export declare const updateTopBar: () => void;
 export declare const refreshKeypad: () => void;
 export declare const refreshTray: () => void;
+export declare const refreshConfirm: () => void;

package/dist/editor/ports.js

@@ -10,9 +10,13 @@ export const basePorts = () => ({
     showNoteInput() { },
     hideNoteInput() { },
     openPalette() { },
+    toggleImageOpacity() { },
+    toggleImageRotation() { },
+    toggleTileSize() { },
     editRoomName() { },
     setCursor() { },
     dismissPopovers: () => false,
+    interacting() { },
     dismissConflict: () => false,
     save() { },
     saveFile() { },
@@ -29,12 +33,16 @@ export const closeKeypad = () => ports.closeKeypad();
 export const kpTyped = () => ports.keypadTyped();
 export const showConflict = (spec) => ports.showConflict(spec);
 export const openDrawer = (tab) => ports.openDrawer(tab);
-export const showNoteInput = (sx, sy, cb) => ports.showNoteInput(sx, sy, cb);
+export const showNoteInput = (sx, sy, cb, initial) => ports.showNoteInput(sx, sy, cb, initial);
 export const hideNoteInput = () => ports.hideNoteInput();
 export const openPalette = (anchor) => ports.openPalette(anchor);
+export const toggleImageOpacity = (anchor) => ports.toggleImageOpacity(anchor);
+export const toggleImageRotation = (anchor) => ports.toggleImageRotation(anchor);
+export const toggleTileSize = (anchor) => ports.toggleTileSize(anchor);
 export const editRoomName = (roomId) => ports.editRoomName(roomId);
 export const setCursor = (cursor, where = 'plan') => ports.setCursor(cursor, where);
 export const dismissPopovers = () => ports.dismissPopovers();
+export const interacting = (on) => ports.interacting(on);
 export const dismissConflict = () => ports.dismissConflict();
 export const saveNowPort = () => ports.save();
 export const saveFile = (name, mime, data) => ports.saveFile(name, mime, data);
@@ -48,4 +56,5 @@ export const renderElevation = () => ports.refresh('elevation');
 export const updateTopBar = () => ports.refresh('topbar');
 export const refreshKeypad = () => ports.refresh('keypad');
 export const refreshTray = () => ports.refresh('tray');
+export const refreshConfirm = () => ports.refresh('confirm');
 //# sourceMappingURL=ports.js.map

package/dist/editor/ports.js.map

@@ -1 +1 @@
-{"version":3,"file":"ports.js","sourceRoot":"","sources":["../../src/editor/ports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ports.js","sourceRoot":"","sources":["../../src/editor/ports.ts"],"names":[],"mappings":"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"}

package/dist/editor/project.d.ts

@@ -1,4 +1,6 @@
 import { settings, type Layers } from '../model/settings';
+import type { Underlay } from '../model/types';
+import { type Unit } from '../units';
 /** Show another page: its drawing, view and selection. */
 export declare function switchPage(id: string): void;
 export declare function addPage(): void;
@@ -13,11 +15,22 @@ export type LayerKey = keyof Layers | 'showCons';
 export declare const LAYER_ROWS: [LayerKey, string, string][];
 export declare const layerOn: (k: LayerKey) => boolean;
 export declare function toggleLayer(k: LayerKey): void;
-export declare function setUnderlayOpacity(v: number): void;
-export declare function toggleUnderlayLock(): void;
-/** Calibrate the image: the Set scale tool (two points you know the distance between). */
-export declare function calibrateUnderlay(): void;
-export declare function removeUnderlay(): void;
+/** The image being worked on: the one selected (or, if there's just one on the page, that one). */
+export declare function targetImage(id?: string): Underlay | undefined;
+/** The steps an image's opacity takes (percent). */
+export declare const OPACITY_MIN = 10, OPACITY_STEP = 5;
+export declare function setUnderlayOpacity(id: string, v: number): void;
+/** How far an image turns (degrees, clockwise as seen, either way from upright), in steps of half a degree. */
+export declare const ROTATE_MAX = 180, ROTATE_STEP = 0.5;
+/** Turn an image about its middle: degrees clockwise as it's seen (0: upright). */
+export declare function setUnderlayRotation(id: string, deg: number): void;
+export declare function toggleUnderlayLock(id: string): void;
+/** Calibrate an image: the Set scale tool (two points you know the distance between), that image selected. */
+export declare function calibrateUnderlay(id?: string): void;
+/** Take an image off the page (one undo step). */
+export declare function removeUnderlay(id: string): void;
+/** Bring an image in front of the others, or send it behind them (one undo step). */
+export declare function restackImage(id: string, to: 'front' | 'back'): void;
 /** The page's spaces with their floor area and perimeter (to inside wall faces), and the total area. */
 export declare function spaceSchedule(): {
     rows: {
@@ -33,7 +46,26 @@ export declare function renameSpace(id: string, name: string): void;
 export declare function focusSpace(id: string): void;
 /** Units, precision, the default wall height and the theme: display and new walls follow at once. */
 export declare function setPreference<K extends 'unit' | 'denom' | 'wallH' | 'theme'>(k: K, v: (typeof settings)[K]): void;
-export declare function togglePreference(k: 'snapGrid' | 'autoCons'): void;
+/** The heights the Wall height setting offers in one tap (8', 9', 10'); anything else is Custom. */
+export declare const WALL_PRESETS: number[];
+/**
+ * Settings → Wall height: the height of every wall that hasn't one of its own. Refused (and says why) below a door's
+ * or window's head on such a wall, or outside 6'–30'. Returns whether it was set.
+ */
+export declare function setDefaultWallHeight(v: number): boolean;
+/** Settings → Wall height → Custom: any height, on the keypad. */
+export declare function editDefaultWallHeight(): void;
+export type UnitChoice = 'account' | Unit;
+/**
+ * Settings → Units: the editor's own units (ft-in, in, mm), or 'account' — the host's (BOLDR: the person's account
+ * settings). Remembered in this browser, so it sticks from drawing to drawing.
+ */
+export declare function setUnits(choice: UnitChoice): void;
+/** Settings → Precision (the editor's own inch units). */
+export declare function setPrecision(denom: number): void;
+/** Put back the units the person picked last time (after the host's units are set). */
+export declare function restoreUnits(): void;
+export declare function togglePreference(k: 'snapGrid' | 'autoCons' | 'toolTips'): void;
 /**
  * Put a picked image (a data URL, `w` × `h` pixels) under the drawing: 60% of the view wide, centred, selected so
  * its handles show, in Annotate mode where it can be sized, scaled and locked.

package/dist/editor/project.js

@@ -2,16 +2,20 @@ import { afterEdit, analyze } from '../app/edit';
 import { ed } from '../app/state';
 import { newPage } from '../model/demo';
 import { pushHistory } from '../model/history';
-import { deep } from '../model/ids';
+import { deep, uid } from '../model/ids';
+import { imageById } from '../model/images';
 import { roomGeom } from '../model/rooms';
 import { sessionState, onSessionReset } from '../model/session';
 import { settings } from '../model/settings';
 import { roomValid } from '../model/sketch';
-import { allPages, page, saveSoon, SK, store } from '../model/store';
-import { cvs, fitView, mainT, requestDraw, s2w } from '../render/view';
+import { allPages, page, planSK, saveSoon, store } from '../model/store';
+import { closeElevation } from './elevation';
+import { cvs, fitView, mainT, requestDraw, requestImageDraw, s2w, underlayH } from '../render/view';
 import { cancelTool, setTool } from '../tools/registry';
+import { fmtLen, followingHostUnits, hostUnits, setOwnUnits } from '../units';
+import { openingHeights } from '../model/elevation';
 import { setMode } from './mode';
-import { closeKeypad, dismissConflict, refreshDrawerSoon, toast, updateCtx, updateStatus, updateTopBar } from './ports';
+import { closeKeypad, dismissConflict, openKeypad, refreshDrawerSoon, toast, updateCtx, updateStatus, updateTopBar } from './ports';
 /*
   The project panel's decisions, whatever draws it: pages (switch, add, duplicate, delete with a second tap to
   confirm, rename), the project's name, layer switches, the page's photo or plan underlay, and the spaces schedule.
@@ -23,6 +27,7 @@ onSessionReset(() => clearTimeout(pendingT));
 export function switchPage(id) {
     if (id === store.curPageId)
         return;
+    closeElevation(); // the wall view is of this page's walls
     cancelTool();
     closeKeypad();
     dismissConflict();
@@ -48,8 +53,8 @@ export function addPage() {
     toast('New page added');
 }
 export function duplicatePage() {
-    const p = newPage(page().name + ' copy', deep(SK()));
-    p.underlay = page().underlay ? deep(page().underlay) : null;
+    const p = newPage(page().name + ' copy', deep(planSK()));
+    p.underlays = deep(page().underlays);
     store.project.pages.splice(store.project.pages.indexOf(page()) + 1, 0, p);
     switchPage(p.id);
     toast('Page duplicated');
@@ -58,7 +63,7 @@ export function duplicatePage() {
 export const deletePending = () => pj.pendingDelete === store.curPageId;
 export function deletePage() {
     if (allPages().length <= 1) {
-        toast('A project needs at least one page.');
+        toast('A project needs at least one page.', { warn: true });
         return;
     }
     if (pj.pendingDelete !== store.curPageId) {
@@ -82,7 +87,8 @@ export const LAYER_ROWS = [
     ['dims', 'Driving dimensions', 'Blue chips that set sizes'],
     ['print', 'Print dimensions', 'Labels for the crew; never move geometry'],
     ['rooms', 'Spaces', 'Fill, name and area'],
-    ['annot', 'Markup', 'Pen, arrows, clouds and notes'],
+    ['cabinets', 'Cabinets', 'Their footprints, from each wall’s view'],
+    ['annot', 'Markup', 'Pen, arrows, shapes, clouds and notes'],
     ['showCons', 'Constraint icons', 'H, V, ∥, ⊥ badges'],
 ];
 export const layerOn = (k) => (k === 'showCons' ? settings.showCons : settings.layers[k]);
@@ -98,36 +104,81 @@ export function toggleLayer(k) {
     refreshDrawerSoon();
     saveSoon();
 }
-// ---- the page's underlay ----
-export function setUnderlayOpacity(v) {
-    const u = page().underlay;
+// ---- the page's photos and plans ----
+/** The image being worked on: the one selected (or, if there's just one on the page, that one). */
+export function targetImage(id) {
+    const ims = page().underlays;
+    if (id)
+        return imageById(id);
+    const sel = ed.sel.find(x => x.type === 'underlay');
+    return sel ? imageById(sel.id) : ims.length === 1 ? ims[0] : undefined;
+}
+/** The steps an image's opacity takes (percent). */
+export const OPACITY_MIN = 10, OPACITY_STEP = 5;
+export function setUnderlayOpacity(id, v) {
+    const u = imageById(id);
     if (!u)
         return;
     u.opacity = v;
-    requestDraw();
+    requestImageDraw();
     saveSoon();
 }
-export function toggleUnderlayLock() {
-    const u = page().underlay;
+/** How far an image turns (degrees, clockwise as seen, either way from upright), in steps of half a degree. */
+export const ROTATE_MAX = 180, ROTATE_STEP = 0.5;
+/** Turn an image about its middle: degrees clockwise as it's seen (0: upright). */
+export function setUnderlayRotation(id, deg) {
+    const u = imageById(id);
+    if (!u)
+        return;
+    // (-180, 180]: a whole turn either way is the same as none
+    const r = ((((deg + 180) % 360) + 360) % 360) - 180 || 0;
+    if (Math.abs(r) < 1e-9)
+        delete u.rot;
+    else
+        u.rot = r === -180 ? 180 : r;
+    requestImageDraw();
+    saveSoon();
+}
+export function toggleUnderlayLock(id) {
+    const u = imageById(id);
     if (!u)
         return;
     pushHistory();
     u.locked = !u.locked;
     afterEdit();
 }
-/** Calibrate the image: the Set scale tool (two points you know the distance between). */
-export function calibrateUnderlay() { setMode('annotate'); setTool('calib'); }
-export function removeUnderlay() {
-    page().underlay = null;
+/** Calibrate an image: the Set scale tool (two points you know the distance between), that image selected. */
+export function calibrateUnderlay(id) {
+    const u = targetImage(id);
+    setMode('annotate');
+    if (u)
+        ed.sel = [{ type: 'underlay', id: u.id }];
+    setTool('calib');
+}
+/** Take an image off the page (one undo step). */
+export function removeUnderlay(id) {
+    if (!imageById(id))
+        return;
+    pushHistory();
+    page().underlays = page().underlays.filter(u => u.id !== id);
+    ed.sel = ed.sel.filter(x => !(x.type === 'underlay' && x.id === id));
+    afterEdit();
     refreshDrawerSoon();
-    requestDraw();
-    saveSoon();
-    updateCtx();
+}
+/** Bring an image in front of the others, or send it behind them (one undo step). */
+export function restackImage(id, to) {
+    const ims = page().underlays, u = imageById(id);
+    if (!u || ims.length < 2)
+        return;
+    pushHistory();
+    const rest = ims.filter(x => x !== u);
+    page().underlays = to === 'front' ? [...rest, u] : [u, ...rest];
+    afterEdit();
 }
 // ---- spaces ----
 /** The page's spaces with their floor area and perimeter (to inside wall faces), and the total area. */
 export function spaceSchedule() {
-    const sk = SK(), rows = Object.entries(sk.rooms).filter(([, r]) => roomValid(sk, r)).map(([id, r]) => {
+    const sk = planSK(), rows = Object.entries(sk.rooms).filter(([, r]) => roomValid(sk, r)).map(([id, r]) => {
         const g = roomGeom(sk, r);
         return { id, name: r.name, area: g.area, per: g.per };
     });
@@ -135,7 +186,7 @@ export function spaceSchedule() {
 }
 export function renameSpace(id, name) {
     pushHistory();
-    SK().rooms[id].name = name.trim() || 'Space';
+    planSK().rooms[id].name = name.trim() || 'Space';
     afterEdit();
 }
 /** Select a space on the drawing (its name field took focus). */
@@ -146,6 +197,85 @@ export function setPreference(k, v) {
     settings[k] = v;
     afterEdit();
 }
+/** The heights the Wall height setting offers in one tap (8', 9', 10'); anything else is Custom. */
+export const WALL_PRESETS = [96, 108, 120];
+/** The lowest and highest default wall height accepted. */
+const WALL_MIN = 72, WALL_MAX = 360;
+/**
+ * Settings → Wall height: the height of every wall that hasn't one of its own. Refused (and says why) below a door's
+ * or window's head on such a wall, or outside 6'–30'. Returns whether it was set.
+ */
+export function setDefaultWallHeight(v) {
+    if (!(v >= WALL_MIN && v <= WALL_MAX)) {
+        toast('Enter a wall height between ' + fmtLen(WALL_MIN) + ' and ' + fmtLen(WALL_MAX) + '.', { warn: true });
+        return false;
+    }
+    const sk = planSK(), own = (lid) => sk.lines[lid]?.height != null;
+    const tallest = Math.max(0, ...Object.values(sk.openings).filter(o => !own(o.line)).map(o => openingHeights(o).head));
+    if (v < tallest - 1e-6) {
+        toast('A door or window reaches ' + fmtLen(tallest) + '. Enter ' + fmtLen(tallest) + ' or more, or lower it first.', { warn: true });
+        return false;
+    }
+    setPreference('wallH', v);
+    return true;
+}
+/** Settings → Wall height → Custom: any height, on the keypad. */
+export function editDefaultWallHeight() {
+    openKeypad({
+        title: 'Wall height', sub: 'Walls without their own height', initial: fmtLen(settings.wallH), selectAll: true, laser: true,
+        onDone: v => { setDefaultWallHeight(v); },
+    });
+}
+const UNITS_KEY = 'boldr-cad-units';
+/**
+ * Settings → Units: the editor's own units (ft-in, in, mm), or 'account' — the host's (BOLDR: the person's account
+ * settings). Remembered in this browser, so it sticks from drawing to drawing.
+ */
+export function setUnits(choice) {
+    const host = hostUnits();
+    if (choice === 'account') {
+        if (host) {
+            settings.unit = host.unit;
+            settings.denom = host.denom;
+        }
+        setOwnUnits(false);
+    }
+    else {
+        settings.unit = choice;
+        setOwnUnits(!!host);
+    }
+    rememberUnits();
+    afterEdit();
+}
+/** Settings → Precision (the editor's own inch units). */
+export function setPrecision(denom) {
+    settings.denom = denom;
+    rememberUnits();
+    afterEdit();
+}
+function rememberUnits() {
+    if (!hostUnits())
+        return; // without a host the units are saved with the project
+    try {
+        localStorage.setItem(UNITS_KEY, JSON.stringify(followingHostUnits() ? 'account' : { unit: settings.unit, denom: settings.denom }));
+    }
+    catch { /* no storage here: just this session */ }
+}
+/** Put back the units the person picked last time (after the host's units are set). */
+export function restoreUnits() {
+    if (!hostUnits())
+        return;
+    try {
+        const v = JSON.parse(localStorage.getItem(UNITS_KEY) || 'null');
+        if (!v || v === 'account' || !['ftin', 'in', 'mm'].includes(v.unit ?? ''))
+            return;
+        settings.unit = v.unit;
+        if (v.denom === 4 || v.denom === 8 || v.denom === 16)
+            settings.denom = v.denom;
+        setOwnUnits(true);
+    }
+    catch { /* nothing remembered */ }
+}
 export function togglePreference(k) {
     settings[k] = !settings[k];
     updateCtx();
@@ -158,13 +288,23 @@ export function togglePreference(k) {
  */
 export function placeUnderlay(src, w, h) {
     const T = mainT(), ww = (cvs.W / T.s) * 0.6, hh = (ww * h) / w;
-    const [cx, cy] = s2w(cvs.W / 2, cvs.H / 2);
-    page().underlay = { src, x: cx - ww / 2, y: cy + hh / 2, w: ww, h: hh, opacity: 0.6, locked: false };
+    let [cx, cy] = s2w(cvs.W / 2, cvs.H / 2);
+    // one already exactly there (the last one added): this one goes a little down and to the right, so both show
+    const step = 24 / T.s;
+    while (page().underlays.some(u => Math.abs(u.x + u.w / 2 - cx) < step / 2 && Math.abs(u.y - underlayH(u) / 2 - cy) < step / 2)) {
+        cx += step;
+        cy -= step;
+    }
+    pushHistory();
+    const id = uid('img');
+    page().underlays.push({ id, src, x: cx - ww / 2, y: cy + hh / 2, w: ww, h: hh, opacity: 0.6, locked: false });
     settings.layers.underlay = true;
     setMode('annotate');
     setTool('aselect');
-    ed.sel = [{ type: 'underlay', id: 'u' }];
+    ed.sel = [{ type: 'underlay', id }];
     afterEdit();
-    toast('Image added. Drag the corners to size it, or use Set scale with two points you know. Lock it once it’s placed.');
+    toast(page().underlays.length > 1
+        ? 'Image added on top of the others. Drag the corners to size it, or Set scale with two points you know.'
+        : 'Image added. Drag the corners to size it, or use Set scale with two points you know. Lock it once it’s placed.');
 }
 //# sourceMappingURL=project.js.map