Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/b-DfAUWA7F.js → app/assets/b-CPaVrUFx.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion app/assets/b-CZsg-F2o.js

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/b-DakhJ3K3.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export{t as default}from"./b-CPaVrUFx.js";
2 changes: 2 additions & 0 deletions app/assets/kochasoz-B-JXIhBt.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions app/assets/kochasoz-CLc7pZQV.js

This file was deleted.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/kochasoz.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Archivo:wght@400;500;600;700;800&family=IBM+Plex+Mono:wght@400;500;600&display=swap" rel="stylesheet">
<script>try{var t=localStorage.getItem("mr-theme");document.documentElement.dataset.theme=t==="dark"||(t!=="light"&&matchMedia("(prefers-color-scheme: dark)").matches)?"dark":"light";var l=localStorage.getItem("mr-lang")||localStorage.getItem("kps_lang");document.documentElement.lang=l||"en"}catch(e){}</script>
<script type="module" crossorigin src="./assets/kochasoz-CLc7pZQV.js"></script>
<script type="module" crossorigin src="./assets/kochasoz-B-JXIhBt.js"></script>
<link rel="modulepreload" crossorigin href="./assets/preload-helper-CRzLMJPS.js">
<link rel="modulepreload" crossorigin href="./assets/i18n-B1YlXUub.js">
<link rel="modulepreload" crossorigin href="./assets/wm-CheJixM9.js">
Expand Down
4 changes: 2 additions & 2 deletions mr/src/kochasoz/boards/b.ts
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ export default class Component extends DCLogic {
[[8, X(-SB), s.eL], [X(rl + SB), HW, s.eR]].forEach(function (bx) { if (bx[2] && bx[2] !== 'bino') return; add('M' + bx[0] + ' ' + G + 'H' + bx[1] + 'V' + (G + 3.2 * px) + 'H' + bx[0] + 'Z', line ? '#fff' : '#ebe7df', INK, 0.8); for (var hh = bx[0] - 3.2 * px; hh < bx[1]; hh += 6) { var xa = Math.max(bx[0], hh), xb = Math.min(bx[1], hh + 3.2 * px); if (xb > xa) add('M' + xa.toFixed(1) + ' ' + (G + 3.2 * px - (xa - hh)).toFixed(1) + 'L' + xb.toFixed(1) + ' ' + (G + 3.2 * px - (xb - hh)).toFixed(1), null, LIGHT, 0.5); } });
/* binolar — kesimdagi oddiy hajm: kontur, qavat yopmalari, qavat raqamlari va sath belgisi; chuqurligi ≤ 14 m,
qolgani uzilish chizigʻi bilan. Baland bino sigʻmasa — gorizontal uzilish. Ichida «N qavat · ≈ H m» va − / + */
var BB = [], HCAP = G - 34;
var BB = [], HCAP = s.noCap ? Infinity : G - 34; /* noCap — faqat Render eksporti uchun: bino uzilishsiz, toʻliq balandlikda (main.ts kesimToRender) */
/* chet (qizil chiziq + chekinishdan tashqari): bino oʻrniga bogʻ, ochiq maydon, qiyalik yoki suv (daryo, kanal) */
function edgeDraw(sd, et) {
var fx = sd < 0 ? X(-SB) : X(rl + SB), ox = sd < 0 ? 8 : HW, a = Math.min(fx, ox), b = Math.max(fx, ox), w = b - a, n = Math.max(1, Math.floor(w / (7 * px))), o = LYR, q;
Expand Down Expand Up @@ -1084,7 +1084,7 @@ export default class Component extends DCLogic {
fitC: Math.abs(d) < 0.01 ? 'ok' : (d > 0 ? 'bad' : 'warn'), fitT: Math.abs(d) < 0.01 ? 'Qizil chiziqlarga sigʻadi' : (d > 0 ? '+' + fm(d) + ' m ortiqcha' : fm(-d) + ' m boʻsh'),
fit: function () { upd(function (E) { var u = 0; E.forEach(function (e) { u += e[1]; }); var k = self.state.rl / u; E.forEach(function (e) { e[1] = Math.round(e[1] * k * 100) / 100; }); var u2 = 0; E.forEach(function (e) { u2 += e[1]; }); E[0][1] = Math.round((E[0][1] + self.state.rl - u2) * 100) / 100; }); },
uOn: s.showU ? 'on' : '', tU: function () { self.setState({ showU: !self.state.showU }); }, showU: s.showU, auto: autoAll, clr: function () { self.setState({ U: [], selU: -1, uSkip: [] }); },
clipR: s.view === 1 ? [{ x: 0, y: 0, w: VW, h: 604 }, { x: 0, y: 618, w: 16 + 10 * px + 30, h: 40 }] : [{ x: 0, y: 0, w: VW, h: 680 }], uH: UROW.some(function (r) { return r; }) ? '46px' : '30px',
clipR: s.view === 1 ? [{ x: 0, y: 0, w: VW, h: 604 }, { x: 0, y: 618, w: 16 + 10 * px + 30, h: 40 }] : [{ x: 0, y: s.noCap ? -4000 : 0, w: VW, h: s.noCap ? 4680 : 680 }], uH: UROW.some(function (r) { return r; }) ? '46px' : '30px',
blks: blks, rlLp: pv(0), rlRp: pv(rl), hnd: HND, uh: UH, bb: BB, shnd: SH, ufb: ufb,
ubs: U.map(function (u, j) { var c = UCd(u.k), on = s.selU === j, ev = evalU(u, U.filter(function (o, q) { return q !== j; })); return { k: ulbl(u.k), l: pv(u.x), tp: UROW[j] ? '20px' : '4px', down: udown(j, false), c: c[2], bg: on ? c[2] : '#fff', p: on ? 'true' : 'false', sh: ev.worst === 'bad' ? '0 0 0 2px #b23a2e' : 'none', pick: function () { self.setState({ selU: j }); } }; }),
isPlanZone: isPlanZone,
Expand Down
31 changes: 20 additions & 11 deletions mr/src/kochasoz/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function gate(v: Record<string, unknown>): Record<string, unknown> {
const STREET = ['PL', 'els', 'rl', 'tplName', 'TPL', 'sk', 'uk', 'U', 'bL', 'bR', 'eL', 'eR', 'gfx', 'showU'];
const SHARED: Partial<Record<BoardId, string[]>> = { b: STREET, varaq: STREET, c: ['TPL'] };
/** faqat oʻsha oynada kerak (saqlanmaydi): tanlangan zona/tarmoq */
const VOLATILE = new Set(['sel', 'selU', 'vw', 'skMenu', 'ukMenu', 'peMenu', 'zaMenu']);
const VOLATILE = new Set(['sel', 'selU', 'vw', 'skMenu', 'ukMenu', 'peMenu', 'zaMenu', 'noCap']);
const LS = { get(k: string): Record<string, unknown> | null { try { return JSON.parse(localStorage.getItem(scoped(k)) || 'null'); } catch { return null; } },
set(k: string, v: unknown): void { try { localStorage.setItem(scoped(k), JSON.stringify(v)); } catch { /* toʻla */ } } };
const pick = (o: Record<string, unknown>, keys: string[]) => Object.fromEntries(keys.filter(k => k in o).map(k => [k, o[k]]));
Expand Down Expand Up @@ -409,28 +409,37 @@ async function varaqToRender(svg: SVGSVGElement, name: string): Promise<void> {
}

/**
* B · kesim → Render studiyasi (18.11, taqqoslov №2 sahna 6): oʻlcham zanjiri, zona kodlari, legenda, yozuvlar va
* «N qavat» tugmalarisiz toza kesim (yer osti pastigacha kesiladi) + chap/oʻng qavatlar soni (subj «kesim»).
* Bino rasmda uzilish belgisi bilan kesilgan boʻlsa, oʻsha tomon qavati yuborilmaydi — model kadrni choʻzmasin.
* B · kesim → Render studiyasi (18.11, taqqoslov №2 sahna 6): oʻlcham zanjiri, zona kodlari, legenda, qizil chiziqlar,
* yozuvlar va «N qavat» tugmalarisiz toza kesim (yer osti pastigacha) + chap/oʻng qavatlar soni (subj «kesim»).
* Jonli sinov (18.11): uzilish belgisi bilan kesilgan binoni model oʻzicha choʻzardi (9 → ~14 qavat) — shuning uchun
* eksport vaqtida bino toʻliq balandlikda chiziladi (noCap) va kadr yuqoriga kengaytiriladi; soʻng ekran avvalgi holatiga qaytadi.
*/
async function kesimToRender(svg: SVGSVGElement, st: { bL?: number; bR?: number; eL?: string; eR?: string }, name: string): Promise<void> {
const inst = current?.m.inst as { setState(p: Record<string, unknown>): void } | undefined, draw = () => current?.m.render(); // setState chizishni rAF ga qoldiradi — eksport uchun darhol chizamiz
try {
const c = svg.cloneNode(true) as SVGSVGElement, px = parseFloat(svg.dataset.px ?? ''), G = parseFloat(svg.dataset.g ?? ''), d1 = parseFloat(svg.dataset.d1 ?? '');
const px = parseFloat(svg.dataset.px ?? ''), G = parseFloat(svg.dataset.g ?? ''), d1 = parseFloat(svg.dataset.d1 ?? '');
const bino = (n: number | undefined, e: string | undefined) => Number.isInteger(n) && (n as number) > 0 && (!e || e === 'bino');
const hOf = (n: number) => (4.2 + (n - 1) * 3.2) * px;
const tall = Math.max(bino(st.bL, st.eL) ? hOf(st.bL as number) : 0, bino(st.bR, st.eR) ? hOf(st.bR as number) : 0);
inst?.setState({ noCap: true }); draw();
const live = stage.querySelector<SVGSVGElement>('.ws-b svg[role=img]') ?? svg;
const c = live.cloneNode(true) as SVGSVGElement;
inst?.setState({ noCap: false }); draw();
// cleanSvg (io.ts) bilan bir xil UI tozalash + render uchun: oʻlcham qatlamlari, zona kodlari, legenda, qizil chiziqlar va barcha yozuvlar
c.querySelectorAll('[data-ly="UI"], [data-ly="DIMROW"], [data-ly="KS_DIM"], [data-ly="KS_TEXT"], [data-ly="KS_LEGEND"], [data-ly="KS_RED_LINE"], text, .ks-hnd, .ks-uh, .ks-bb, rect[style*="cursor"]').forEach(e => e.remove());
c.querySelectorAll('[data-ly], [data-bk]').forEach(e => { e.removeAttribute('data-ly'); e.removeAttribute('data-bk'); });
const vb = svg.viewBox.baseVal, Hc = Number.isFinite(d1) ? Math.min(vb.height, d1 - 28) : vb.height;
c.setAttribute('viewBox', `${vb.x} ${vb.y} ${vb.width} ${Hc}`); c.removeAttribute('style'); c.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
const vb = svg.viewBox.baseVal, y0 = Number.isFinite(G) && tall > 0 ? Math.min(vb.y, Math.floor(G - tall - 24)) : vb.y;
const Hc = (Number.isFinite(d1) ? Math.min(vb.y + vb.height, d1 - 28) : vb.y + vb.height) - y0;
c.setAttribute('viewBox', `${vb.x} ${y0} ${vb.width} ${Hc}`); c.removeAttribute('style'); c.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
const W = 2400, H = Math.round(W * Hc / (vb.width || 1)); c.setAttribute('width', String(W)); c.setAttribute('height', String(H));
const u = URL.createObjectURL(new Blob([new XMLSerializer().serializeToString(c)], { type: 'image/svg+xml' })), im = new Image(); im.src = u; await im.decode();
const cv = document.createElement('canvas'); cv.width = W; cv.height = H; const g = cv.getContext('2d')!; g.fillStyle = '#fff'; g.fillRect(0, 0, W, H); g.drawImage(im, 0, 0, W, H); URL.revokeObjectURL(u);
const whole = (n: number | undefined, e: string | undefined) => Number.isInteger(n) && (n as number) > 0 && (!e || e === 'bino') && Number.isFinite(px) && Number.isFinite(G) && (4.2 + ((n as number) - 1) * 3.2) * px <= G - 34;
const facts: Record<string, number> = {};
if (whole(st.bL, st.eL)) facts.floorsLeft = st.bL as number;
if (whole(st.bR, st.eR)) facts.floorsRight = st.bR as number;
if (bino(st.bL, st.eL)) facts.floorsLeft = st.bL as number;
if (bino(st.bR, st.eR)) facts.floorsRight = st.bR as number;
const { sendToRender } = await import('../render/inbox');
await sendToRender({ name, from: 'ks', subj: 'kesim', img: cv.toDataURL('image/png'), w: W, h: H, ...(Object.keys(facts).length ? { facts } : {}) });
} catch (e) { toast(`Render: ${(e as Error).message}`); }
} catch (e) { inst?.setState({ noCap: false }); draw(); toast(`Render: ${(e as Error).message}`); }
}

/** A (tarmoq) da tanlangan koʻcha toifasi → B dagi mos tayyor kesim (B ochilganda qoʻllanadi) */
Expand Down
8 changes: 5 additions & 3 deletions mr/tests/e2e/render.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,18 @@ test('Koʻchasoz B kesimidan «Render studiyasiga» — toza kesim, «Koʻcha ke
await expect(page).toHaveURL(/render\.html/, { timeout: 20_000 });
await expect(page.locator('#subj button[aria-pressed=true]')).toHaveText('Koʻcha kesimi');
await expect(page.locator('.ren-base .cap code')).toHaveText(/^2400×\d+$/);
// Koʻchasoz ekrani avvalgi holatda qolgan (noCap saqlanmaydi)
expect(await page.evaluate(() => JSON.stringify(localStorage)).then(t => t.includes('noCap'))).toBe(false);
const src = await page.evaluate(async () => {
const db: IDBDatabase = await new Promise((ok, no) => { const r = indexedDB.open('archemistry-mr'); r.onsuccess = () => ok(r.result); r.onerror = () => no(r.error); });
const v: any = await new Promise((ok, no) => { const q = db.transaction('cache').objectStore('cache').get('render-src'); q.onsuccess = () => ok(q.result?.v); q.onerror = () => no(q.error); });
const s = v[0], im = new Image(); im.src = s.img; await im.decode();
return { subj: s.subj, facts: s.facts, w: im.naturalWidth, h: im.naturalHeight };
});
expect(src.subj).toBe('kesim');
// 4 qavat toʻliq chizilgan — yuboriladi; 30 qavat uzilish belgisi bilan kesilgan — yuborilmaydi
expect(src.facts).toEqual({ floorsLeft: 4 });
expect(src.h).toBeLessThan(src.w);
// eksportda bino uzilishsiz, toʻliq balandlikda chiziladi — ikkala tomon qavati ham yuboriladi; kadr yuqoriga choʻziladi
expect(src.facts).toEqual({ floorsLeft: 4, floorsRight: 30 });
expect(src.h).toBeGreaterThan(src.w * 0.6);
expect(errs).toEqual([]);
});

Expand Down
Loading