From 7dfa285ac23acf87008082c288e37c796c7332ab Mon Sep 17 00:00:00 2001 From: larssand Date: Thu, 12 Nov 2026 13:28:03 +0100 Subject: [PATCH] feat(overlay): qualifiers seeded on the best N laps use the same short view as practice (1.89.7) --- CHANGELOG.md | 6 ++++++ README.md | 2 +- README.sv.md | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/overlays.js | 11 +++++++---- tests/overlay_leaderboard.test.js | 4 ++++ 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d17036..b287cfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.89.7 + +### Changed + +- Overlay leaderboard: a qualifier or practice seeded on the best N laps now shows the same short view as an Open Practice on N laps in a row: result, gap and best lap, without laps, ahead gap and own delta. Heats on laps and time, like most qualifiers and every final, keep the full columns. + ## 1.89.6 ### Changed diff --git a/README.md b/README.md index 8b05719..13ff684 100644 --- a/README.md +++ b/README.md @@ -280,7 +280,7 @@ Settings → Audio: The **Overlay** menu has leaderboard, speaker, results, TV and team modes, plus an OBS mode with layout (leaderboard, TV graphics, grid, lower third), theme (panel, transparent, chroma), rows and columns: - Columns: laps, **last lap**, result, best, gap, and **places since the start** (▲/▼ in heats and finals). - **Last lap** changes at every passing. In Open Practice, where the result is just the best lap, the leaderboard shows the last lap instead of the result. -- An Open Practice ranked on **N laps in a row** or **X minutes** shows only what the rule ranks on: position, driver, result (for example "3 laps 55.123"), gap and best lap (the next-lap bar stays). +- A session ranked on the **best N laps** (Open Practice on N laps in a row or X minutes, or a practice or qualifier seeded on the best N laps) shows only what the rule ranks on, the same in every session type: position, driver, result (for example "3 laps 55.123"), gap and best lap (the next-lap bar stays). Heats on laps and time, like most qualifiers and every final, keep the full columns. - **TV graphics:** a title plate top left (event and heat) and a timing tower top right with the clock on top and real columns: place / **start position** (e.g. "2 / 3"), driver, laps, time, best and gap, in large bold type with podium colours for the top three. No backdrop of its own, so the camera image shows through. The start position can be turned off and is not shown in practice. - **Live marks** in the leaderboard and the TV tower: a driver's row flashes briefly on a new time, a fuel pump badge with a ticking clock shows while the car is in the pits (then the stop time for 5 s), and a new split shows for 4 s with ± against the previous one. They run on the overlay computer's clock, and a freshly opened overlay never flashes every row. - The TV title plate has the RaceCore look: the club logo or a red RC mark, the event in small capitals and the heat in Orbitron. diff --git a/README.sv.md b/README.sv.md index faeb43b..fd5978a 100644 --- a/README.sv.md +++ b/README.sv.md @@ -293,7 +293,7 @@ Inställningar → Ljud: Menyn **Overlay** har lägena leaderboard, speaker, resultat, TV och lag, plus ett OBS-läge med layout (leaderboard, TV-grafik, grid, lower third), tema (panel, transparent, chroma), rader och kolumner: - Kolumner: varv, **senaste varv**, resultat, bästa, gap och **placering sedan start** (▲/▼ i heat och finaler). - **Senaste varv** byts vid varje passering. I Open Practice, där resultatet bara är bästa varvet, visar leaderboarden senaste varv i stället för resultat. -- En Open Practice som rankas på **N varv i rad** eller **X minuter** visar bara det regeln rankar på: placering, förare, resultat (t.ex. "3 varv 55,123"), gap och bästa varv (stapeln för nästa varv finns kvar). +- En session som rankas på **bästa N varv** (Open Practice på N varv i rad eller X minuter, eller träning eller kval med seeding på bästa N varv) visar bara det regeln rankar på, likadant i alla sessionstyper: placering, förare, resultat (t.ex. "3 varv 55,123"), gap och bästa varv (stapeln för nästa varv finns kvar). Heat på varv och tid, som de flesta kval och alla finaler, behåller alla kolumner. - **TV-grafik:** rubrikskylt uppe till vänster (event och heat) och en topplista uppe till höger med klockan överst och raka kolumner: placering / **startplats** (t.ex. "2 / 3"), förare, varv, tid, bästa och gap, i stor fet text och medaljfärger för topp 3. Ingen egen bakgrund, så kamerabilden syns igenom. Startplatsen kan stängas av och visas inte i träning. - **Livemarkeringar** i leaderboard och TV-topplistan: förarens rad blinkar kort vid en ny tid, en bränslepump med tickande klocka visas medan bilen är i depå (sedan stopptiden i 5 s), och en ny mellantid visas i 4 s med ± mot förra. De går på overlay-datorns klocka, och en nyöppnad overlay blinkar aldrig alla rader. - TV-rubrikskylten har RaceCore-utseende: klubbens logga eller ett rött RC-märke, eventet i små versaler och heatet i Orbitron. diff --git a/package-lock.json b/package-lock.json index cc7538d..f0cb521 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.6", + "version": "1.89.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.6", + "version": "1.89.7", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 900d76b..b6648de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.6", + "version": "1.89.7", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/overlays.js b/src/overlays.js index d89f7f8..d0ceb5e 100644 --- a/src/overlays.js +++ b/src/overlays.js @@ -277,11 +277,14 @@ function renderObsBroadcast({ active, compactRows, startOrder, showStartGrid, fa // In practice the ranking value *is* the best lap, so "result" and "best" would print the // same time twice - show it once. -// An Open Practice ranked on N laps in a row or X minutes: the overlay shows only what the -// rule ranks on (the result, the gap and the best lap), not the race columns. +// Ranked on the best N laps (or X minutes) rather than laps and time: an Open Practice set to +// N laps in a row / X minutes, or a practice or qualifier seeded on the best N laps. The overlay +// then shows only what the rule ranks on (result, gap, best lap), the same in every session type; +// laps-and-time heats (most qualifiers and every final) keep the full columns. export function isPracticeRankedSession(session) { - return ["open_practice", "free_practice"].includes(String(session?.type || "")) - && ["consecutive", "window"].includes(String(session?.practiceRanking || "")); + const type = String(session?.type || ""); + if (["open_practice", "free_practice"].includes(type)) return ["consecutive", "window"].includes(String(session?.practiceRanking || "")); + return ["practice", "qualification"].includes(type) && Number(session?.seedBestLapCount || 0) > 0; } // An Open Practice ranked on the best lap: its result only repeats the best-lap column, and the // last lap is what changes at each passing. Ranked on N laps in a row or X minutes, the result diff --git a/tests/overlay_leaderboard.test.js b/tests/overlay_leaderboard.test.js index ffeab83..3f993cf 100644 --- a/tests/overlay_leaderboard.test.js +++ b/tests/overlay_leaderboard.test.js @@ -57,6 +57,10 @@ test("practice ranked on 3 laps in a row: only result, gap and best lap as times assert.equal(isPracticeRankedSession({ type: "open_practice", practiceRanking: "consecutive" }), true); assert.equal(isPracticeRankedSession({ type: "open_practice" }), false); assert.equal(isPracticeRankedSession({ type: "final", practiceRanking: "consecutive" }), false); + assert.equal(isPracticeRankedSession({ type: "qualification", seedBestLapCount: 3 }), true, "qualifier on best 3 laps: same view"); + assert.equal(isPracticeRankedSession({ type: "practice", seedBestLapCount: 3 }), true); + assert.equal(isPracticeRankedSession({ type: "qualification" }), false, "qualifier on laps and time: full view, like a final"); + assert.equal(isPracticeRankedSession({ type: "final" }), false); const row = { key: "a", driverId: "a", displayName: "Anna", laps: 12, resultDisplay: "3 varv 55.123", gapDisplay: "+0.747s", gapAhead: "+0.2", lapDelta: "-0.1", bestLapMs: 18201, lastLapMs: 18777, predictedRemainingMs: 9000 }; const html = renderOverlayLeaderboard([row], deps, { practiceRank: true }); assert.match(html, /overlay-race-list-ranked/);