Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5f79b18c2 | ||
|
|
1605e30f60 | ||
|
|
6aff322be6 | ||
|
|
ed3c132f70 | ||
|
|
385e8c4c86 | ||
|
|
61e5736f1e | ||
|
|
6ca808a6c9 | ||
|
|
f698096f53 | ||
|
|
ef628e066a | ||
|
|
4ffdfc2548 | ||
|
|
83e7727aab |
@@ -10227,6 +10227,16 @@ func (a *App) runManualUpload(svc extsvc.Service, ids []int64, cfg extsvc.Extern
|
||||
uploaded++
|
||||
}
|
||||
emit(fmt.Sprintf("LoTW: %d QSO(s) uploaded", uploaded))
|
||||
// TQSL accepted the batch but left contacts out of it — already
|
||||
// uploaded, or outside the certificate's date range. Said out loud:
|
||||
// the operator has no other way to learn that some of what they just
|
||||
// selected is still not on LoTW.
|
||||
if res.Ignored {
|
||||
emit(res.Message)
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "toast", "LoTW: "+res.Message)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if svc == extsvc.ServiceClublog || svc == extsvc.ServiceHRDLog {
|
||||
statusCol, dateCol := "clublog_qso_upload_status", "clublog_qso_upload_date"
|
||||
@@ -11870,6 +11880,21 @@ func (a *App) LogUDPLoggedADIF(adifText string) (int64, error) {
|
||||
return 0, fmt.Errorf("record missing required fields (call/band/mode/date)")
|
||||
}
|
||||
|
||||
// The grid the station SENT beats any directory.
|
||||
//
|
||||
// A CQ in FT8 carries the operator's square, and it is where they are right
|
||||
// now. QRZ and HamQTH describe where they LIVE, which for an expedition is
|
||||
// the wrong side of the planet: RI0FA transmitted QN35 all evening and was
|
||||
// logged with its licence-holder's home square, because WSJT-X's ADIF carries
|
||||
// no GRIDSQUARE and the lookup was the only source left.
|
||||
//
|
||||
// Applied BEFORE the lookup, so refineGrid below sees a grid it must not
|
||||
// replace. It still upgrades a 4-character square to a 6-character one from
|
||||
// the same field.
|
||||
if g := a.lookupDecodeGrid(q.Callsign); g != "" {
|
||||
q.Grid = refineGrid(q.Grid, g)
|
||||
}
|
||||
|
||||
// ── Lookup-based enrichment ──
|
||||
// WSJT sends only call/freq/mode/RST/date. Fill Name/QTH/Country/
|
||||
// Grid/CQZ/ITUZ/DXCC/Continent via the lookup chain (QRZ/HamQTH/
|
||||
@@ -12108,7 +12133,13 @@ func (a *App) consumeUDPEvents() {
|
||||
})
|
||||
}
|
||||
case ev.LoggedADIF != "":
|
||||
applog.Printf("udp: emit udp:logged_qso (%d bytes ADIF)\n", len(ev.LoggedADIF))
|
||||
// The RECORD, not just its size. "Was the grid in what WSJT-X sent, or
|
||||
// did OpsLog put it there?" is the first question asked when a contact
|
||||
// is logged in the wrong square, and a byte count cannot answer it —
|
||||
// an expedition logged at its licence holder's home QTH stayed
|
||||
// undiagnosable for exactly that reason. One line per QSO, ~280 bytes.
|
||||
applog.Printf("udp: emit udp:logged_qso (%d bytes) %s\n",
|
||||
len(ev.LoggedADIF), strings.Join(strings.Fields(ev.LoggedADIF), " "))
|
||||
wruntime.EventsEmit(a.ctx, "udp:logged_qso", map[string]any{
|
||||
"config_id": ev.ConfigID,
|
||||
"service": string(ev.Service),
|
||||
|
||||
+78
-8
@@ -19,31 +19,66 @@ type RowColorRule struct {
|
||||
ID string `json:"id"`
|
||||
Color string `json:"color"`
|
||||
Enabled bool `json:"enabled"`
|
||||
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz.
|
||||
//
|
||||
// Empty means ALL of them — what an operator expects from a rule they have
|
||||
// not narrowed, and what keeps a config written before this field meaningful.
|
||||
Channels []string `json:"channels"`
|
||||
}
|
||||
|
||||
// The QSL channels a rule can be scoped to.
|
||||
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz"}
|
||||
|
||||
// RowColorSettings is the whole appearance block.
|
||||
type RowColorSettings struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
// Style is how the colour is shown: "bar" paints a stripe down the left edge,
|
||||
// "tint" washes the row, "both" does each.
|
||||
//
|
||||
// A bar is the default because a filled row is a poor signal in a log where
|
||||
// nearly every contact has SOME QSL state: colour that is always present
|
||||
// stops being information and becomes a striped background, with the data
|
||||
// behind it. The stripe says the same thing and costs nothing to read.
|
||||
Style string `json:"style"`
|
||||
// Intensity is the tint strength in percent. Only used by "tint"/"both".
|
||||
Intensity int `json:"intensity"`
|
||||
// BandMapLotw marks stations that upload to LoTW on the band map, with the
|
||||
// same "L" badge the cluster list uses — one visual vocabulary across the two
|
||||
// views rather than a second invention.
|
||||
BandMapLotw bool `json:"bandmap_lotw"`
|
||||
// Configured distinguishes "saved with this off" from "saved before the
|
||||
// option existed", so a new marker can default ON without silently turning
|
||||
// itself back on for an operator who switched it off.
|
||||
Configured bool `json:"configured"`
|
||||
Rules []RowColorRule `json:"rules"`
|
||||
}
|
||||
|
||||
// The rule ids, in priority order. The frontend matches on these and holds the
|
||||
// labels, so a translated name never has to travel through the settings.
|
||||
// The four categories, in the order they are tested — first match wins.
|
||||
//
|
||||
// "To send" comes FIRST on purpose. A contact can be confirmed on LoTW and
|
||||
// still owe a paper card, and the colour an operator scans for is the one that
|
||||
// means "there is something left to do here". Put after "confirmed", that row
|
||||
// would go green and the card would never be printed.
|
||||
//
|
||||
// "Worked" is the catch-all: a contact with nothing sent, nothing asked for and
|
||||
// nothing back. Off by default — with it on, every remaining row is painted.
|
||||
var rowColorOrder = []string{
|
||||
"confirmed_lotw", // LoTW confirmation received
|
||||
"confirmed_paper", // card or eQSL received
|
||||
"sent_waiting", // sent by some route, nothing back yet
|
||||
"to_send", // a card is requested / queued and has not gone out
|
||||
"to_send", // requested or queued on a watched channel, not gone out
|
||||
"confirmed", // a watched channel has a confirmation back
|
||||
"sent", // gone out on a watched channel, nothing back yet
|
||||
"worked", // none of the above
|
||||
}
|
||||
|
||||
// Defaults: green for done, amber for waiting, blue for owed. Deliberately
|
||||
// muted — they are composited at low opacity over a dark grid, and a saturated
|
||||
// value there reads as an error state rather than a status.
|
||||
var rowColorDefaults = map[string]string{
|
||||
"confirmed_lotw": "#16a34a",
|
||||
"confirmed_paper": "#0ea5e9",
|
||||
"sent_waiting": "#f59e0b",
|
||||
"to_send": "#a855f7",
|
||||
"confirmed": "#16a34a",
|
||||
"sent": "#f59e0b",
|
||||
"worked": "#64748b",
|
||||
}
|
||||
|
||||
// hexColor guards what reaches the stylesheet. The value is interpolated into a
|
||||
@@ -56,13 +91,48 @@ func normRowColors(s RowColorSettings) RowColorSettings {
|
||||
for _, r := range s.Rules {
|
||||
byID[r.ID] = r
|
||||
}
|
||||
out := RowColorSettings{Enabled: s.Enabled}
|
||||
out := RowColorSettings{
|
||||
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
||||
BandMapLotw: s.BandMapLotw, Configured: true,
|
||||
}
|
||||
if !s.Configured {
|
||||
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
||||
}
|
||||
switch out.Style {
|
||||
case "bar", "tint", "both":
|
||||
default:
|
||||
out.Style = "bar"
|
||||
}
|
||||
// Clamped rather than rejected: the value only shapes a colour-mix, and a
|
||||
// number outside the range is a slider that got away, not a fault worth
|
||||
// resetting the operator's whole choice for.
|
||||
if out.Intensity < 5 {
|
||||
out.Intensity = 12
|
||||
} else if out.Intensity > 45 {
|
||||
out.Intensity = 45
|
||||
}
|
||||
ok := map[string]bool{}
|
||||
for _, c := range rowColorChannels {
|
||||
ok[c] = true
|
||||
}
|
||||
for _, id := range rowColorOrder {
|
||||
r := byID[id]
|
||||
r.ID = id
|
||||
if !hexColor.MatchString(strings.TrimSpace(r.Color)) {
|
||||
r.Color = rowColorDefaults[id]
|
||||
}
|
||||
// Keep only channels we know, in the canonical order, de-duplicated.
|
||||
want := map[string]bool{}
|
||||
for _, c := range r.Channels {
|
||||
want[strings.ToLower(strings.TrimSpace(c))] = true
|
||||
}
|
||||
chans := []string{}
|
||||
for _, c := range rowColorChannels {
|
||||
if want[c] {
|
||||
chans = append(chans, c)
|
||||
}
|
||||
}
|
||||
r.Channels = chans
|
||||
out.Rules = append(out.Rules, r)
|
||||
}
|
||||
return out
|
||||
|
||||
+73
-10
@@ -6,8 +6,8 @@ import "testing"
|
||||
// that is not plainly a hex colour has to be refused rather than passed on.
|
||||
func TestRowColorsRefuseAnythingButHex(t *testing.T) {
|
||||
in := RowColorSettings{Enabled: true, Rules: []RowColorRule{
|
||||
{ID: "confirmed_lotw", Color: "#123abc", Enabled: true},
|
||||
{ID: "sent_waiting", Color: "red; background:url(x)", Enabled: true},
|
||||
{ID: "confirmed", Color: "#123abc", Enabled: true},
|
||||
{ID: "sent", Color: "red; background:url(x)", Enabled: true},
|
||||
{ID: "to_send", Color: "", Enabled: true},
|
||||
}}
|
||||
got := normRowColors(in)
|
||||
@@ -16,11 +16,11 @@ func TestRowColorsRefuseAnythingButHex(t *testing.T) {
|
||||
for _, r := range got.Rules {
|
||||
byID[r.ID] = r
|
||||
}
|
||||
if byID["confirmed_lotw"].Color != "#123abc" {
|
||||
t.Errorf("a valid colour was rewritten: %q", byID["confirmed_lotw"].Color)
|
||||
if byID["confirmed"].Color != "#123abc" {
|
||||
t.Errorf("a valid colour was rewritten: %q", byID["confirmed"].Color)
|
||||
}
|
||||
if byID["sent_waiting"].Color != rowColorDefaults["sent_waiting"] {
|
||||
t.Errorf("an injection attempt survived: %q", byID["sent_waiting"].Color)
|
||||
if byID["sent"].Color != rowColorDefaults["sent"] {
|
||||
t.Errorf("an injection attempt survived: %q", byID["sent"].Color)
|
||||
}
|
||||
if byID["to_send"].Color != rowColorDefaults["to_send"] {
|
||||
t.Errorf("an empty colour was kept: %q", byID["to_send"].Color)
|
||||
@@ -34,7 +34,7 @@ func TestRowColorsKeepPriorityOrder(t *testing.T) {
|
||||
// Saved in a jumbled order, as a hand-edited settings row could be.
|
||||
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||
{ID: "to_send", Color: "#111111"},
|
||||
{ID: "confirmed_lotw", Color: "#222222"},
|
||||
{ID: "confirmed", Color: "#222222"},
|
||||
}})
|
||||
if len(got.Rules) != len(rowColorOrder) {
|
||||
t.Fatalf("got %d rules, want every one present", len(got.Rules))
|
||||
@@ -44,8 +44,71 @@ func TestRowColorsKeepPriorityOrder(t *testing.T) {
|
||||
t.Errorf("rule %d is %q, want %q", i, got.Rules[i].ID, id)
|
||||
}
|
||||
}
|
||||
// The saved colours survived the reordering.
|
||||
if got.Rules[0].Color != "#222222" {
|
||||
t.Errorf("confirmed_lotw lost its colour: %q", got.Rules[0].Color)
|
||||
// The saved colours survived the reordering: each stayed with its own rule.
|
||||
byID := map[string]string{}
|
||||
for _, r := range got.Rules {
|
||||
byID[r.ID] = r.Color
|
||||
}
|
||||
if byID["to_send"] != "#111111" || byID["confirmed"] != "#222222" {
|
||||
t.Errorf("colours moved between rules: %v", byID)
|
||||
}
|
||||
}
|
||||
|
||||
// Style and strength are normalised, not rejected: they only shape a colour, and
|
||||
// a value that got away is a slider, not a fault worth resetting the operator's
|
||||
// whole choice for.
|
||||
func TestRowColorsNormaliseStyleAndIntensity(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
inStyle string
|
||||
inPct int
|
||||
wantStyle string
|
||||
wantPct int
|
||||
}{
|
||||
{"bar", 12, "bar", 12},
|
||||
{"tint", 30, "tint", 30},
|
||||
{"both", 45, "both", 45},
|
||||
{"", 0, "bar", 12}, // never configured
|
||||
{"wallpaper", 12, "bar", 12}, // not a style we draw
|
||||
{"tint", 900, "tint", 45}, // clamped, not reset
|
||||
{"tint", -5, "tint", 12},
|
||||
} {
|
||||
got := normRowColors(RowColorSettings{Style: tc.inStyle, Intensity: tc.inPct})
|
||||
if got.Style != tc.wantStyle || got.Intensity != tc.wantPct {
|
||||
t.Errorf("(%q,%d) -> (%q,%d), want (%q,%d)",
|
||||
tc.inStyle, tc.inPct, got.Style, got.Intensity, tc.wantStyle, tc.wantPct)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Channels are normalised to the canonical order, and anything unknown is
|
||||
// dropped. Empty stays empty, because empty means "every channel" — a rule the
|
||||
// operator has not narrowed must not silently become a rule about nothing.
|
||||
func TestRowColorChannelsNormalise(t *testing.T) {
|
||||
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||
{ID: "confirmed", Color: "#111111", Channels: []string{"LOTW", "pigeon", "qsl", "lotw"}},
|
||||
{ID: "sent", Color: "#222222"},
|
||||
}})
|
||||
byID := map[string][]string{}
|
||||
for _, r := range got.Rules {
|
||||
byID[r.ID] = r.Channels
|
||||
}
|
||||
if len(byID["confirmed"]) != 2 || byID["confirmed"][0] != "qsl" || byID["confirmed"][1] != "lotw" {
|
||||
t.Errorf("confirmed channels = %v, want [qsl lotw] — canonical order, deduped, unknown dropped", byID["confirmed"])
|
||||
}
|
||||
if len(byID["sent"]) != 0 {
|
||||
t.Errorf("sent channels = %v, want empty (meaning every channel)", byID["sent"])
|
||||
}
|
||||
}
|
||||
|
||||
// The order IS the priority, and "to send" leads. A contact confirmed on LoTW
|
||||
// that still owes a paper card must read as owing the card — put after
|
||||
// "confirmed" it would go green and never be printed.
|
||||
func TestToSendOutranksConfirmed(t *testing.T) {
|
||||
got := normRowColors(RowColorSettings{})
|
||||
if got.Rules[0].ID != "to_send" {
|
||||
t.Errorf("first rule is %q, want to_send", got.Rules[0].ID)
|
||||
}
|
||||
if got.Rules[len(got.Rules)-1].ID != "worked" {
|
||||
t.Errorf("last rule is %q, want worked as the catch-all", got.Rules[len(got.Rules)-1].ID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,26 @@
|
||||
[
|
||||
{
|
||||
"version": "0.24.9",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Appearance: row colouring now defaults to a left stripe, with a filled row and its strength offered as choices.",
|
||||
"The band map now follows the cluster filters — LoTW only, spotter continent, hide worked, status and mode chips.",
|
||||
"Band map: stations that upload to LoTW now carry the same L badge as the cluster list, switchable in Appearance.",
|
||||
"LoTW: contacts TQSL leaves out — already uploaded, or outside the certificate date range — are no longer reported as uploaded.",
|
||||
"FT8: a contact is logged with the grid the station actually sent, not the home square from QRZ — expeditions were logged in the wrong place.",
|
||||
"SPE amplifier: switching it off is shown at once, instead of needing a second press of OFF.",
|
||||
"Appearance: row colouring is now Worked / Confirmed / QSL sent / To be sent, each scoped to the channels you pick — paper, LoTW, eQSL, QRZ.com."
|
||||
],
|
||||
"fr": [
|
||||
"Apparence : la coloration des lignes se fait par défaut sur une barre à gauche, la ligne remplie et son intensité restant proposées.",
|
||||
"La band map suit désormais les filtres du cluster — LoTW seulement, continent du spotter, masquer les contactés, statuts et modes.",
|
||||
"Band map : les stations qui utilisent LoTW portent le même badge L que la liste du cluster, activable dans Apparence.",
|
||||
"LoTW : les contacts que TQSL écarte — déjà envoyés, ou hors de la plage de dates du certificat — ne sont plus annoncés comme envoyés.",
|
||||
"FT8 : un contact est enregistré avec le locator réellement émis par la station, et non le carré du domicile depuis QRZ — les expéditions étaient logguées au mauvais endroit.",
|
||||
"Amplificateur SPE : l extinction s affiche immédiatement, au lieu de demander un second appui sur OFF.",
|
||||
"Apparence : la coloration des lignes devient Contacté / Confirmé / QSL envoyée / À envoyer, chacune limitée aux canaux choisis — papier, LoTW, eQSL, QRZ.com."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.8",
|
||||
"date": "",
|
||||
|
||||
+26
-6
@@ -4717,12 +4717,21 @@ export default function App() {
|
||||
// Cluster spots after every active filter (band / mode / status / search /
|
||||
// hide-worked / group). Shared by the Cluster tab and the Main-view cluster
|
||||
// pane so both show exactly the same list.
|
||||
const clusterRenderedRows = useMemo(() => {
|
||||
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
||||
// Everything the operator has said about WHICH STATIONS they care about —
|
||||
// LoTW only, the spotter's continent, hide worked, the status and mode chips,
|
||||
// the search box, the source node.
|
||||
//
|
||||
// Shared with the band map, which used to receive the raw stream filtered by
|
||||
// band alone: switching on "LoTW users only" changed the cluster list and left
|
||||
// the panadapter showing everyone. Two views of one spot stream disagreeing
|
||||
// about the same spot is the fault lib/spotDisplay already exists to prevent.
|
||||
//
|
||||
// The BAND filter is deliberately not in here: a band map's band IS its
|
||||
// filter, and applying the cluster's would empty every map but one.
|
||||
const spotPassesStationFilters = useCallback((s: ClusterSpot): boolean => {
|
||||
const search = clusterSearch.trim().toUpperCase();
|
||||
const list = spots.filter((s) => {
|
||||
{
|
||||
if (clusterFilterSource && s.source_id !== clusterFilterSource) return false;
|
||||
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
||||
if (search && !s.dx_call.includes(search)) return false;
|
||||
if (clusterLockMode) {
|
||||
const spotMode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
||||
@@ -4774,6 +4783,15 @@ export default function App() {
|
||||
if (e.worked_call || e.status === 'worked') return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}, [clusterFilterSource, clusterSearch, clusterLockMode, mode, clusterModeFilter,
|
||||
clusterStatusFilter, spotStatus, clusterLotwOnly, clusterSpotterConts, clusterHideWorked]);
|
||||
|
||||
const clusterRenderedRows = useMemo(() => {
|
||||
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
||||
const list = spots.filter((s) => {
|
||||
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
||||
return spotPassesStationFilters(s);
|
||||
});
|
||||
let rendered = list as (ClusterSpot & { repeats?: number })[];
|
||||
if (clusterGroup) {
|
||||
@@ -6775,13 +6793,14 @@ export default function App() {
|
||||
</div>
|
||||
<BandMap
|
||||
band={b}
|
||||
spots={spots.filter((s) => s.band === b)}
|
||||
spots={spots.filter((s) => s.band === b && spotPassesStationFilters(s))}
|
||||
spotStatus={spotStatus}
|
||||
currentFreqHz={band === b && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||
onSpotClick={handleSpotClick}
|
||||
onClose={() => toggleBandMapBand(b)}
|
||||
hideDigital={bandMapHideFt}
|
||||
fitToBand={bandMapFit}
|
||||
showLotw={!!rowColors?.bandmap_lotw}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
@@ -6811,11 +6830,12 @@ export default function App() {
|
||||
side={bandMapSide}
|
||||
onToggleSide={toggleBandMapSide}
|
||||
band={band}
|
||||
spots={spots.filter((s) => s.band === band)}
|
||||
spots={spots.filter((s) => s.band === band && spotPassesStationFilters(s))}
|
||||
spotStatus={spotStatus}
|
||||
currentFreqHz={band && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||
onSpotClick={handleSpotClick}
|
||||
onClose={() => setBandMapShown(false)}
|
||||
showLotw={!!rowColors?.bandmap_lotw}
|
||||
keyNav
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -17,10 +17,17 @@ const PALETTE = [
|
||||
// The rule ids the backend orders; the labels live here so a translation never
|
||||
// travels through the settings row.
|
||||
const LABELS: Record<string, string> = {
|
||||
confirmed_lotw: 'appr.confirmedLotw',
|
||||
confirmed_paper: 'appr.confirmedPaper',
|
||||
sent_waiting: 'appr.sentWaiting',
|
||||
to_send: 'appr.toSend',
|
||||
to_send: 'appr.ruleToSend',
|
||||
confirmed: 'appr.ruleConfirmed',
|
||||
sent: 'appr.ruleSent',
|
||||
worked: 'appr.ruleWorked',
|
||||
};
|
||||
|
||||
// The channels a rule can be scoped to. "worked" is the catch-all — it means
|
||||
// nothing on ANY channel — so narrowing it would say nothing.
|
||||
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||
const CHANNEL_LABELS: Record<string, string> = {
|
||||
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
||||
};
|
||||
|
||||
export function AppearancePanel() {
|
||||
@@ -37,15 +44,32 @@ export function AppearancePanel() {
|
||||
setCfg(next);
|
||||
SaveRowColors(next as any).catch(() => {});
|
||||
};
|
||||
const patchRule = (id: string, patch: Partial<{ color: string; enabled: boolean }>) => {
|
||||
const patchRule = (id: string, patch: Partial<{ color: string; enabled: boolean; channels: string[] }>) => {
|
||||
if (!cfg) return;
|
||||
save({ ...cfg, rules: cfg.rules.map((r) => (r.id === id ? { ...r, ...patch } : r)) });
|
||||
};
|
||||
|
||||
// The rule card shows the row exactly as the grid will draw it, so the choice
|
||||
// is made by looking rather than by imagining.
|
||||
const preview = (color: string): Record<string, string> => {
|
||||
const st = cfg?.style ?? 'bar';
|
||||
const pct = cfg?.intensity ?? 12;
|
||||
const out: Record<string, string> = {};
|
||||
if (st === 'tint' || st === 'both') out.backgroundColor = `color-mix(in srgb, ${color} ${pct}%, transparent)`;
|
||||
if (st === 'bar' || st === 'both') out.boxShadow = `inset 3px 0 0 ${color}`;
|
||||
return out;
|
||||
};
|
||||
|
||||
if (!cfg) return <div className="p-1 text-sm text-muted-foreground">…</div>;
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={!!cfg.bandmap_lotw} className="mt-0.5"
|
||||
onCheckedChange={(c) => save({ ...cfg, bandmap_lotw: !!c } as any)} />
|
||||
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
||||
</label>
|
||||
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
||||
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
||||
@@ -53,18 +77,59 @@ export function AppearancePanel() {
|
||||
</label>
|
||||
|
||||
{cfg.enabled && (
|
||||
<div className="space-y-2">
|
||||
<div className="space-y-3">
|
||||
{/* Style first: it decides whether the colours below are a signal or a
|
||||
wallpaper, which matters more than which hue they are. */}
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
<span className="text-sm">{t('appr.style')}</span>
|
||||
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||
{(['bar', 'tint', 'both'] as const).map((v) => (
|
||||
<button key={v} type="button" onClick={() => save({ ...cfg, style: v })}
|
||||
className={cn('px-3 py-1.5 font-medium', (cfg.style ?? 'bar') === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||
{t('appr.style' + v[0].toUpperCase() + v.slice(1))}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
{(cfg.style ?? 'bar') !== 'bar' && (
|
||||
<label className="flex items-center gap-2 text-sm">
|
||||
{t('appr.intensity')}
|
||||
<input type="range" min={5} max={45} step={1} value={cfg.intensity ?? 12}
|
||||
onChange={(e) => save({ ...cfg, intensity: parseInt(e.target.value, 10) })}
|
||||
className="w-32 accent-[var(--primary)]" />
|
||||
<span className="font-mono text-xs text-muted-foreground w-8">{cfg.intensity ?? 12}%</span>
|
||||
</label>
|
||||
)}
|
||||
</div>
|
||||
{/* Order matters and is shown: a contact is usually several of these at
|
||||
once, and the first match wins. */}
|
||||
<p className="text-xs text-muted-foreground">{t('appr.orderHint')}</p>
|
||||
{cfg.rules.map((r, i) => (
|
||||
<div key={r.id} className="rounded-lg border border-border/60 p-2.5 space-y-2"
|
||||
style={{ backgroundColor: r.enabled ? `color-mix(in srgb, ${r.color} 24%, transparent)` : undefined }}>
|
||||
style={r.enabled ? preview(r.color) : undefined}>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={r.enabled} onCheckedChange={(c) => patchRule(r.id, { enabled: !!c })} />
|
||||
<span className="font-mono text-xs text-muted-foreground">{i + 1}.</span>
|
||||
<span className="font-medium">{t(LABELS[r.id] ?? r.id)}</span>
|
||||
</label>
|
||||
{/* Which channels this category looks at. None ticked = all of
|
||||
them, which is what an unnarrowed rule should mean. */}
|
||||
{r.enabled && r.id !== 'worked' && (
|
||||
<div className="flex items-center gap-3 flex-wrap pl-6 text-xs">
|
||||
{CHANNELS.map((c) => {
|
||||
const on = !r.channels?.length || r.channels.includes(c);
|
||||
return (
|
||||
<label key={c} className="flex items-center gap-1.5 cursor-pointer">
|
||||
<Checkbox checked={on} onCheckedChange={(v) => {
|
||||
const cur = r.channels?.length ? r.channels : [...CHANNELS];
|
||||
const next = v ? [...new Set([...cur, c])] : cur.filter((x) => x !== c);
|
||||
patchRule(r.id, { channels: next });
|
||||
}} />
|
||||
{CHANNEL_LABELS[c]?.startsWith('appr.') ? t(CHANNEL_LABELS[c]) : CHANNEL_LABELS[c]}
|
||||
</label>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{r.enabled && (
|
||||
<div className="flex items-center gap-1.5 flex-wrap pl-6">
|
||||
{PALETTE.map((c) => (
|
||||
|
||||
@@ -38,6 +38,9 @@ type SpotStatusEntry = {
|
||||
new_county?: boolean;
|
||||
new_pota?: boolean;
|
||||
new_pfx?: boolean;
|
||||
// Whether the station uploads to LoTW. Not a status — it says nothing about
|
||||
// whether the spot is worth chasing — so it is drawn as a badge, never a colour.
|
||||
lotw?: boolean;
|
||||
};
|
||||
|
||||
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
||||
@@ -79,6 +82,8 @@ interface Props {
|
||||
// globally from the band-map tab toolbar.
|
||||
hideDigital?: boolean;
|
||||
fitToBand?: boolean;
|
||||
// Mark stations that upload to LoTW (Settings → Appearance).
|
||||
showLotw?: boolean;
|
||||
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
||||
// frequency (and tune to it). Only the docked Main-view band map sets this, so
|
||||
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
|
||||
@@ -227,7 +232,7 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
||||
// last; ties broken by closeness to the rig freq).
|
||||
const MAX_VISIBLE_SPOTS = 30;
|
||||
|
||||
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
||||
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false, showLotw = false }: Props) {
|
||||
const { t } = useI18n();
|
||||
|
||||
// The two display options are applied ONCE here, on the whole map, so the
|
||||
@@ -649,6 +654,15 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
})()}
|
||||
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
||||
<span>{p.spot.dx_call}</span>
|
||||
{/* Same badge the cluster list draws, for the same reason: the
|
||||
muted-blue of a confirmation, never a status colour —
|
||||
whether a station uploads to LoTW says nothing about
|
||||
whether the spot is worth chasing. A glyph rather than a
|
||||
colour also keeps it off the channel the statuses use. */}
|
||||
{showLotw && entry?.lotw && (
|
||||
<span title={t('clu.lotwBadge')} className="text-[9px] font-normal rounded px-1 py-px"
|
||||
style={{ background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)' }}>L</span>
|
||||
)}
|
||||
{mode && (
|
||||
<span className="text-[9px] font-normal text-current/70 bg-current/10 rounded px-1 py-px">
|
||||
{mode}
|
||||
|
||||
@@ -114,7 +114,7 @@ const en: Dict = {
|
||||
'nav.user': 'User Configuration', 'nav.software': 'Software Configuration', 'nav.hardware': 'Hardware Configuration', 'nav.lists': 'Lists',
|
||||
'sec.station': 'Station Information', 'sec.profiles': 'Profiles', 'sec.operating': 'Operating conditions',
|
||||
'sec.confirmations': 'Confirmations', 'sec.external': 'External services',
|
||||
'sec.general': 'General', 'sec.appearance': 'Appearance', 'appr.enable': 'Colour whole rows by QSL status', 'appr.enableHint': '(in the log grid, like Logger32)', 'appr.orderHint': 'A contact is often several of these at once — the first rule that matches decides the colour.', 'appr.confirmedLotw': 'Confirmed on LoTW', 'appr.confirmedPaper': 'Confirmed by card or eQSL', 'appr.sentWaiting': 'Sent, no answer yet', 'appr.toSend': 'Queued to send (card, LoTW or eQSL)', 'appr.custom': 'Pick any colour', 'sec.email': 'E-mail (SMTP)', 'sec.lookup': 'Callsign Lookup',
|
||||
'sec.general': 'General', 'sec.appearance': 'Appearance', 'appr.enable': 'Colour whole rows by QSL status', 'appr.enableHint': '(in the log grid, like Logger32)', 'appr.orderHint': 'A contact is often several of these at once — the first rule that matches decides the colour.', 'appr.ruleToSend': 'To be sent', 'appr.ruleConfirmed': 'Confirmed', 'appr.ruleSent': 'QSL sent', 'appr.ruleWorked': 'Worked, nothing sent', 'appr.chQsl': 'Paper QSL', 'appr.custom': 'Pick any colour', 'appr.style': 'Style', 'appr.styleBar': 'Left stripe', 'appr.styleTint': 'Filled row', 'appr.styleBoth': 'Both', 'appr.intensity': 'Strength', 'appr.bandmapLotw': 'Mark LoTW users on the band map', 'appr.bandmapLotwHint': '(the same L badge the cluster list uses)', 'sec.email': 'E-mail (SMTP)', 'sec.lookup': 'Callsign Lookup',
|
||||
'sec.bands': 'Bands', 'sec.modes': 'Modes & default RST', 'sec.cluster': 'DX Cluster',
|
||||
'sec.udp': 'UDP integrations', 'sec.database': 'Database', 'sec.autostart': 'Autostart', 'sec.backup': 'Database backup', 'sec.uscounties': 'US Counties',
|
||||
'sec.webpublish': 'Web publishing', 'wpub.hint': 'Publishes your log as a file for a website: a standalone HTML page or a CSV, written locally and optionally uploaded by FTP. It is refreshed when you log a QSO and, if you set an interval, on a timer.', 'wpub.enable': 'Publish the log to a file', 'wpub.fileSection': 'The file', 'wpub.format': 'Format', 'wpub.formatHtml': 'HTML page', 'wpub.formatCsv': 'CSV', 'wpub.folder': 'Output folder', 'wpub.browse': 'Browse…', 'wpub.fileName': 'File name', 'wpub.title': 'Page title', 'wpub.titlePh': 'blank = your callsign', 'wpub.count': 'Last N QSOs', 'wpub.every': 'Refresh every', 'wpub.everyHint': 'minutes — 0 = only when a QSO is logged', 'wpub.columns': 'Columns', 'wpub.columnsCount': '{n} of {total} chosen', 'wpub.columnsPick': 'Choose columns…', 'wpub.columnsSearch': 'Search a field…', 'wpub.removeColumn': 'Click to remove', 'wpub.columnsHint': 'Click to add or remove. The order shown here is the order in the file.', 'wpub.ftpEnable': 'Upload by FTP', 'wpub.ftpHost': 'Server / port', 'wpub.ftpUser': 'User', 'wpub.ftpPassword': 'Password', 'wpub.ftpFolder': 'Remote folder', 'wpub.ftpFileName': 'Remote file name', 'wpub.ftpTls': 'Use TLS (FTPS)', 'wpub.publishNow': 'Publish now', 'wpub.testFtp': 'Test connection', 'wpub.lastRun': 'Last run:', 'sec.adifmon': 'ADIF monitor',
|
||||
@@ -541,7 +541,7 @@ const fr: Dict = {
|
||||
'nav.user': 'Configuration utilisateur', 'nav.software': 'Configuration logicielle', 'nav.hardware': 'Configuration matérielle', 'nav.lists': 'Listes',
|
||||
'sec.station': 'Informations station', 'sec.profiles': 'Profils', 'sec.operating': "Conditions d'opération",
|
||||
'sec.confirmations': 'Confirmations', 'sec.external': 'Services externes',
|
||||
'sec.general': 'Général', 'sec.appearance': 'Apparence', 'appr.enable': 'Colorer les lignes entières selon le statut QSL', 'appr.enableHint': '(dans le tableau du log, comme Logger32)', 'appr.orderHint': "Un contact est souvent plusieurs de ces états à la fois — la première règle qui correspond décide de la couleur.", 'appr.confirmedLotw': 'Confirmé sur LoTW', 'appr.confirmedPaper': 'Confirmé par carte ou eQSL', 'appr.sentWaiting': 'Envoyé, sans réponse', 'appr.toSend': 'En attente d envoi (carte, LoTW ou eQSL)', 'appr.custom': 'Choisir une couleur', 'sec.email': 'E-mail (SMTP)', 'sec.lookup': "Recherche d'indicatif",
|
||||
'sec.general': 'Général', 'sec.appearance': 'Apparence', 'appr.enable': 'Colorer les lignes entières selon le statut QSL', 'appr.enableHint': '(dans le tableau du log, comme Logger32)', 'appr.orderHint': "Un contact est souvent plusieurs de ces états à la fois — la première règle qui correspond décide de la couleur.", 'appr.ruleToSend': 'À envoyer', 'appr.ruleConfirmed': 'Confirmé', 'appr.ruleSent': 'QSL envoyée', 'appr.ruleWorked': 'Contacté, rien envoyé', 'appr.chQsl': 'QSL papier', 'appr.custom': 'Choisir une couleur', 'appr.style': 'Style', 'appr.styleBar': 'Barre à gauche', 'appr.styleTint': 'Ligne remplie', 'appr.styleBoth': 'Les deux', 'appr.intensity': 'Intensité', 'appr.bandmapLotw': 'Marquer les utilisateurs LoTW sur la band map', 'appr.bandmapLotwHint': '(le même badge L que la liste du cluster)', 'sec.email': 'E-mail (SMTP)', 'sec.lookup': "Recherche d'indicatif",
|
||||
'sec.bands': 'Bandes', 'sec.modes': 'Modes & RST par défaut', 'sec.cluster': 'DX Cluster',
|
||||
'sec.udp': 'Intégrations UDP', 'sec.database': 'Base de données', 'sec.autostart': 'Démarrage auto', 'sec.backup': 'Sauvegarde base', 'sec.uscounties': 'Comtés US',
|
||||
'sec.webpublish': 'Publication web', 'wpub.hint': "Publie ton journal dans un fichier destiné à un site web : une page HTML autonome ou un CSV, écrit en local et envoyé par FTP si tu le souhaites. Il est rafraîchi à chaque QSO enregistré et, si tu règles un intervalle, périodiquement.", 'wpub.enable': 'Publier le journal dans un fichier', 'wpub.fileSection': 'Le fichier', 'wpub.format': 'Format', 'wpub.formatHtml': 'Page HTML', 'wpub.formatCsv': 'CSV', 'wpub.folder': 'Dossier de sortie', 'wpub.browse': 'Parcourir…', 'wpub.fileName': 'Nom du fichier', 'wpub.title': 'Titre de la page', 'wpub.titlePh': 'vide = ton indicatif', 'wpub.count': 'N derniers QSO', 'wpub.every': 'Rafraîchir toutes les', 'wpub.everyHint': 'minutes — 0 = seulement à chaque QSO', 'wpub.columns': 'Colonnes', 'wpub.columnsCount': '{n} sur {total} choisis', 'wpub.columnsPick': 'Choisir les colonnes…', 'wpub.columnsSearch': 'Chercher un champ…', 'wpub.removeColumn': 'Cliquer pour retirer', 'wpub.columnsHint': 'Clique pour ajouter ou retirer. L ordre affiché ici est celui du fichier.', 'wpub.ftpEnable': 'Envoyer par FTP', 'wpub.ftpHost': 'Serveur / port', 'wpub.ftpUser': 'Utilisateur', 'wpub.ftpPassword': 'Mot de passe', 'wpub.ftpFolder': 'Dossier distant', 'wpub.ftpFileName': 'Nom du fichier distant', 'wpub.ftpTls': 'Utiliser TLS (FTPS)', 'wpub.publishNow': 'Publier maintenant', 'wpub.testFtp': 'Tester la connexion', 'wpub.lastRun': 'Dernière exécution :', 'sec.adifmon': 'Moniteur ADIF',
|
||||
|
||||
@@ -1,41 +1,93 @@
|
||||
// Row colouring for the log grid, by QSL / LoTW status.
|
||||
// Row colouring for the log grid, by QSL status.
|
||||
//
|
||||
// The rules are ORDERED and the first match wins: a contact is usually several
|
||||
// things at once, and one confirmed on LoTW and by card is confirmed, not
|
||||
// "sent, awaiting reply".
|
||||
// Four categories, each scoped to the channels the operator cares about —
|
||||
// paper QSL, LoTW, eQSL, QRZ.com. The rules are ORDERED and the first match
|
||||
// wins, because a contact is usually several of them at once.
|
||||
|
||||
export type RowColorRule = { id: string; color: string; enabled: boolean };
|
||||
export type RowColorSettings = { enabled: boolean; rules: RowColorRule[] };
|
||||
export type RowColorRule = {
|
||||
id: string;
|
||||
color: string;
|
||||
enabled: boolean;
|
||||
channels?: string[]; // empty = every channel
|
||||
};
|
||||
export type RowColorSettings = {
|
||||
enabled: boolean;
|
||||
style?: 'bar' | 'tint' | 'both';
|
||||
intensity?: number;
|
||||
bandmap_lotw?: boolean;
|
||||
rules: RowColorRule[];
|
||||
};
|
||||
|
||||
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||
|
||||
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
||||
// "upload status" rather than a QSL flag, but they carry the same Y / R letters.
|
||||
const FIELDS: Record<string, { sent: string; rcvd: string }> = {
|
||||
qsl: { sent: 'qsl_sent', rcvd: 'qsl_rcvd' },
|
||||
lotw: { sent: 'lotw_sent', rcvd: 'lotw_rcvd' },
|
||||
eqsl: { sent: 'eqsl_sent', rcvd: 'eqsl_rcvd' },
|
||||
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
|
||||
};
|
||||
|
||||
// ADIF QSL fields are single letters. Y is the only one that means "yes";
|
||||
// R (requested) and Q (queued) mean a card is owed, which is a different state
|
||||
// and the one an operator is looking for when deciding what to post.
|
||||
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
|
||||
// and the one an operator looks for when deciding what to send.
|
||||
const yes = (v: any) => String(v ?? '').trim().toUpperCase() === 'Y';
|
||||
const owed = (v: any) => {
|
||||
const s = String(v ?? '').trim().toUpperCase();
|
||||
return s === 'R' || s === 'Q';
|
||||
};
|
||||
|
||||
export function matchRowRule(q: any): string | null {
|
||||
if (!q) return null;
|
||||
if (yes(q.lotw_rcvd)) return 'confirmed_lotw';
|
||||
if (yes(q.qsl_rcvd) || yes(q.eqsl_rcvd)) return 'confirmed_paper';
|
||||
if (yes(q.qsl_sent) || yes(q.lotw_sent) || yes(q.eqsl_sent)) return 'sent_waiting';
|
||||
// Any route still queued, not just the paper card. LoTW marks a pending upload
|
||||
// as R, which is the commonest "not gone out yet" state in a digital log and
|
||||
// was matching nothing at all while this only looked at qsl_sent.
|
||||
if (owed(q.qsl_sent) || owed(q.lotw_sent) || owed(q.eqsl_sent)) return 'to_send';
|
||||
const chansOf = (r: RowColorRule): readonly string[] =>
|
||||
r.channels && r.channels.length ? r.channels : CHANNELS;
|
||||
|
||||
function ruleMatches(q: any, r: RowColorRule): boolean {
|
||||
const cs = chansOf(r);
|
||||
switch (r.id) {
|
||||
case 'confirmed':
|
||||
return cs.some((c) => yes(q[FIELDS[c]?.rcvd]));
|
||||
case 'sent':
|
||||
return cs.some((c) => yes(q[FIELDS[c]?.sent]));
|
||||
case 'to_send':
|
||||
return cs.some((c) => owed(q[FIELDS[c]?.sent]));
|
||||
case 'worked':
|
||||
// The catch-all: nothing sent, nothing asked for, nothing back.
|
||||
return !CHANNELS.some((c) => yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent]));
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Walks the rules IN ORDER — the order is the priority, and the settings panel
|
||||
// shows it numbered so it can be read rather than guessed.
|
||||
export function matchRowRule(q: any, cfg: RowColorSettings | null): RowColorRule | null {
|
||||
if (!q || !cfg?.rules) return null;
|
||||
for (const r of cfg.rules) {
|
||||
if (r.enabled && ruleMatches(q, r)) return r;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// The colour is applied as a TINT, not a fill. The grid is dark and a solid
|
||||
// user-picked colour behind white text is unreadable at exactly the moment it
|
||||
// matters — Logger32 gets away with it because its grid is white.
|
||||
export function rowStyleFor(q: any, cfg: RowColorSettings | null): { backgroundColor: string } | undefined {
|
||||
// The colour is never a fill by default.
|
||||
//
|
||||
// A log where nearly every contact has SOME QSL state ends up with every row
|
||||
// painted, and colour that is always present stops being information. The
|
||||
// default is a stripe down the left edge; a tint is offered at a chosen strength.
|
||||
export function rowStyleFor(q: any, cfg: RowColorSettings | null): Record<string, string> | undefined {
|
||||
if (!cfg?.enabled) return undefined;
|
||||
const id = matchRowRule(q);
|
||||
if (!id) return undefined;
|
||||
const rule = cfg.rules?.find((r) => r.id === id);
|
||||
if (!rule?.enabled || !rule.color) return undefined;
|
||||
return { backgroundColor: `color-mix(in srgb, ${rule.color} 24%, transparent)` };
|
||||
const rule = matchRowRule(q, cfg);
|
||||
if (!rule?.color) return undefined;
|
||||
|
||||
const style = cfg.style ?? 'bar';
|
||||
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
||||
const out: Record<string, string> = {};
|
||||
if (style === 'tint' || style === 'both') {
|
||||
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
||||
}
|
||||
if (style === 'bar' || style === 'both') {
|
||||
// inset shadow rather than a border: a border would shift the cells three
|
||||
// pixels on coloured rows only, and the columns would stop lining up.
|
||||
out.boxShadow = `inset 3px 0 0 ${rule.color}`;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Single source of truth for the app version shown in the UI (header + About).
|
||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||
export const APP_VERSION = '0.24.8';
|
||||
export const APP_VERSION = '0.24.9';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
@@ -2996,6 +2996,7 @@ export namespace main {
|
||||
id: string;
|
||||
color: string;
|
||||
enabled: boolean;
|
||||
channels: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new RowColorRule(source);
|
||||
@@ -3006,10 +3007,15 @@ export namespace main {
|
||||
this.id = source["id"];
|
||||
this.color = source["color"];
|
||||
this.enabled = source["enabled"];
|
||||
this.channels = source["channels"];
|
||||
}
|
||||
}
|
||||
export class RowColorSettings {
|
||||
enabled: boolean;
|
||||
style: string;
|
||||
intensity: number;
|
||||
bandmap_lotw: boolean;
|
||||
configured: boolean;
|
||||
rules: RowColorRule[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
@@ -3019,6 +3025,10 @@ export namespace main {
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.style = source["style"];
|
||||
this.intensity = source["intensity"];
|
||||
this.bandmap_lotw = source["bandmap_lotw"];
|
||||
this.configured = source["configured"];
|
||||
this.rules = this.convertValues(source["rules"], RowColorRule);
|
||||
}
|
||||
|
||||
|
||||
@@ -142,4 +142,10 @@ type UploadResult struct {
|
||||
OK bool // the service accepted (or already had) the QSO
|
||||
LogID string // service-assigned record id, when provided
|
||||
Message string // human-readable detail (reason on failure)
|
||||
// Ignored is set when the service accepted the submission but left some or
|
||||
// all of the QSOs out of it. TQSL does this for contacts already uploaded
|
||||
// AND for contacts outside the certificate's date range, and reports both
|
||||
// with the same exit code — so the caller must show the message rather than
|
||||
// decide on its own that everything went through.
|
||||
Ignored bool
|
||||
}
|
||||
|
||||
+51
-4
@@ -178,8 +178,12 @@ func fileExists(p string) bool {
|
||||
//
|
||||
// tqsl -d -x -a all -l "<location>" -u [-p <keypass>] <file.adi>
|
||||
//
|
||||
// Exit codes (TQSL): 0 = uploaded; 8 = nothing new (all duplicates/out of
|
||||
// range); 9 = some uploaded, some skipped; anything else = failure.
|
||||
// Exit codes are TQSL's own (see the table in its cmdline help). 8 and 9 are
|
||||
// the ones that matter and both used to be read as plain success: 8 means NO
|
||||
// QSOs were processed and 9 means some were left out — in each case because
|
||||
// they were already uploaded OR outside the callsign certificate's date range.
|
||||
// Reporting either as success is how a contact came to be stamped "uploaded"
|
||||
// while LoTW had never seen it.
|
||||
func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord string) (UploadResult, error) {
|
||||
tqsl := strings.TrimSpace(cfg.TQSLPath)
|
||||
loc := strings.TrimSpace(cfg.StationLocation)
|
||||
@@ -249,11 +253,31 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
||||
}
|
||||
}
|
||||
|
||||
// TQSL's exit codes, from its own cmdline documentation. Two of them used to
|
||||
// be read as plain success, and that is how contacts came to be stamped
|
||||
// "uploaded" while LoTW had never seen them:
|
||||
//
|
||||
// 8 NO QSOs were processed — already uploaded OR OUT OF DATE RANGE
|
||||
// 9 some processed, some ignored — same two reasons
|
||||
// 14 some already uploaded, the rest signed
|
||||
//
|
||||
// "Out of date range" is the one that bites: a contact older than the
|
||||
// callsign certificate's validity is silently left out, and reporting that as
|
||||
// success stamped it sent for ever. TQSL says which case it is in its output,
|
||||
// so the message is carried up rather than replaced with a guess.
|
||||
switch code {
|
||||
case 0, 9:
|
||||
case 0:
|
||||
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
|
||||
case 9, 14:
|
||||
return UploadResult{OK: true, Ignored: true, Message: tqslDetail(msg,
|
||||
"uploaded — but TQSL left some contacts out (already uploaded, or outside the certificate's date range)")}, nil
|
||||
case 8:
|
||||
return UploadResult{OK: true, Message: "already uploaded (duplicate)"}, nil
|
||||
// Nothing reached LoTW. NOT stamped as sent: a duplicate left at "R" is
|
||||
// harmless and will be refused again, while a contact wrongly marked sent
|
||||
// is one the operator will never think to look at again.
|
||||
return UploadResult{OK: false, Ignored: true, Message: tqslDetail(msg,
|
||||
"TQSL uploaded nothing — every contact was already uploaded, or outside the certificate's date range")},
|
||||
fmt.Errorf("lotw: no QSOs processed")
|
||||
default:
|
||||
if msg == "" {
|
||||
msg = fmt.Sprintf("tqsl exit code %d", code)
|
||||
@@ -262,6 +286,29 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
||||
}
|
||||
}
|
||||
|
||||
// tqslDetail keeps the lines of TQSL's own output that say what happened to the
|
||||
// contacts, and appends the summary.
|
||||
//
|
||||
// TQSL is explicit — "414 QSO records were already uploaded", "N QSO records
|
||||
// are out of date range" — and that sentence is the whole answer to "why is my
|
||||
// contact not on LoTW". It used to be captured and thrown away.
|
||||
func tqslDetail(out, summary string) string {
|
||||
var keep []string
|
||||
for _, ln := range strings.Split(out, "\n") {
|
||||
ln = strings.TrimSpace(ln)
|
||||
l := strings.ToLower(ln)
|
||||
if strings.Contains(l, "qso") && (strings.Contains(l, "already uploaded") ||
|
||||
strings.Contains(l, "date range") || strings.Contains(l, "ignored") ||
|
||||
strings.Contains(l, "duplicate")) {
|
||||
keep = append(keep, ln)
|
||||
}
|
||||
}
|
||||
if len(keep) == 0 {
|
||||
return summary
|
||||
}
|
||||
return summary + " — " + strings.Join(keep, "; ")
|
||||
}
|
||||
|
||||
// TestLoTW validates the LoTW config: tqsl present and the chosen station
|
||||
// location exists in station_data.
|
||||
func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package extsvc
|
||||
|
||||
import "testing"
|
||||
|
||||
// TQSL's own exit codes, from its cmdline documentation:
|
||||
//
|
||||
// 0 success
|
||||
// 8 NO QSOs were processed — already uploaded OR out of date range
|
||||
// 9 some processed, some ignored — same two reasons
|
||||
// 14 some already uploaded, the rest signed
|
||||
//
|
||||
// 8 and 9 both used to be read as plain success, and that is how a contact came
|
||||
// to be stamped "uploaded to LoTW" while LoTW had never seen it. The one that
|
||||
// bites is "out of date range": a contact older than the callsign certificate's
|
||||
// validity is silently left out of the submission.
|
||||
func TestTQSLDetailKeepsTheReason(t *testing.T) {
|
||||
out := `13:22:01: Signing using Callsign G0ABC, DXCC Entity ENGLAND
|
||||
13:22:02: /tmp/x.adi: 20 QSO records are out of date range
|
||||
13:22:02: Final Status: No QSOs were processed (8)`
|
||||
got := tqslDetail(out, "summary")
|
||||
if got == "summary" {
|
||||
t.Fatal("threw away TQSL's explanation — that sentence is the whole answer to \"why is my contact not on LoTW\"")
|
||||
}
|
||||
if !contains(got, "out of date range") {
|
||||
t.Errorf("the reason was lost: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTQSLDetailFallsBackToTheSummary(t *testing.T) {
|
||||
if got := tqslDetail("nothing useful here", "summary"); got != "summary" {
|
||||
t.Errorf("got %q, want the plain summary when TQSL said nothing specific", got)
|
||||
}
|
||||
}
|
||||
|
||||
func contains(h, n string) bool {
|
||||
return len(h) >= len(n) && (func() bool {
|
||||
for i := 0; i+len(n) <= len(h); i++ {
|
||||
if h[i:i+len(n)] == n {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
})()
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package spe
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// decodeCSV marks the client connected on EVERY frame it parses, and the poll
|
||||
// goroutine can be mid-read while PowerOff runs. So the frame from a second ago
|
||||
// landed after PowerOff had marked the amp offline and put it straight back —
|
||||
// the console kept showing the amplifier on until the operator pressed OFF a
|
||||
// second time.
|
||||
func TestFrameInFlightDoesNotResurrectASwitchedOffAmp(t *testing.T) {
|
||||
c := &Client{}
|
||||
const frame = ",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,"
|
||||
|
||||
// Normal running: a frame marks it connected and reads OPERATE.
|
||||
c.decodeCSV(frame)
|
||||
if !c.GetStatus().Connected || !c.GetStatus().Operate {
|
||||
t.Fatal("a status frame should mark the amp connected")
|
||||
}
|
||||
|
||||
// The operator presses OFF. This is what PowerOff does, in order.
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Now().Add(3 * time.Second)
|
||||
c.statusMu.Unlock()
|
||||
c.setErr(errSwitchedOff{})
|
||||
|
||||
// A frame that was already on the wire arrives now.
|
||||
c.decodeCSV(frame)
|
||||
|
||||
if c.GetStatus().Connected {
|
||||
t.Error("a frame from before the switch-off put the amp back on — this is the double-click on OFF")
|
||||
}
|
||||
}
|
||||
|
||||
// An amp switched back on at its own front panel must reappear without OpsLog
|
||||
// being told, so the suppression has to expire rather than latch.
|
||||
func TestSuppressionExpires(t *testing.T) {
|
||||
c := &Client{}
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Now().Add(-time.Second) // window already past
|
||||
c.statusMu.Unlock()
|
||||
c.setErr(errSwitchedOff{})
|
||||
|
||||
c.decodeCSV(",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,")
|
||||
if !c.GetStatus().Connected {
|
||||
t.Error("an amp answering after the window must come back on its own")
|
||||
}
|
||||
}
|
||||
|
||||
type errSwitchedOff struct{}
|
||||
|
||||
func (errSwitchedOff) Error() string { return "switched off" }
|
||||
+56
-2
@@ -91,6 +91,15 @@ type Client struct {
|
||||
statusMu sync.RWMutex
|
||||
status Status
|
||||
lastRaw string // last raw status payload logged (log only on change)
|
||||
// offUntil suppresses status frames that were already in flight when the amp
|
||||
// was switched off. decodeCSV marks the client connected on every frame it
|
||||
// parses, and the poll goroutine can be mid-read while PowerOff runs — so the
|
||||
// frame from a second ago resurrected an amplifier the operator had just
|
||||
// switched off, and the console only caught up when they pressed OFF twice.
|
||||
//
|
||||
// Time-bounded rather than a latch: an amp switched back on at its own front
|
||||
// panel must reappear on its own.
|
||||
offUntil time.Time
|
||||
|
||||
stop chan struct{}
|
||||
running bool
|
||||
@@ -177,6 +186,12 @@ func (c *Client) PowerOn() error {
|
||||
if c.GetStatus().Connected {
|
||||
return nil
|
||||
}
|
||||
// Switching on cancels the suppression window: the operator wants frames
|
||||
// believed again, and waiting out a timer they cannot see would read as the
|
||||
// power-on having failed.
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Time{}
|
||||
c.statusMu.Unlock()
|
||||
// The poll goroutine may still be inside a blocking read on the old handle;
|
||||
// Windows keeps the port "busy" until that read times out (ioTimeout). Retry
|
||||
// the open for a little longer than that.
|
||||
@@ -205,9 +220,17 @@ func (c *Client) PowerOn() error {
|
||||
time.Sleep(wakePulse)
|
||||
return set(true)
|
||||
}
|
||||
if err = pulse(sp.SetRTS); err == nil {
|
||||
err = pulse(sp.SetDTR)
|
||||
// Each line reported separately. Not every USB-serial chip honours the modem
|
||||
// lines, and some refuse them without saying so — on an amplifier that never
|
||||
// wakes, "which of the two failed, or neither" is the whole diagnosis, and a
|
||||
// single combined error cannot give it.
|
||||
rtsErr := pulse(sp.SetRTS)
|
||||
dtrErr := pulse(sp.SetDTR)
|
||||
if err = rtsErr; err == nil {
|
||||
err = dtrErr
|
||||
}
|
||||
applog.Printf("spe: power ON pulse on %s (model=%q transport=%s) — RTS err=%v, DTR err=%v",
|
||||
c.cfg.ComPort, c.GetStatus().Model, c.cfg.Transport, rtsErr, dtrErr)
|
||||
// Booting, the amp re-enumerates its USB interface, which leaves this handle
|
||||
// pointing at a device that no longer exists — the amp came up and OpsLog
|
||||
// still read "offline". Drop it; the poll loop reopens a fresh one as soon as
|
||||
@@ -216,6 +239,26 @@ func (c *Client) PowerOn() error {
|
||||
c.dropLocked()
|
||||
c.mu.Unlock()
|
||||
applog.Printf("spe: power ON — RTS then DTR pulsed on %s (err=%v)", c.cfg.ComPort, err)
|
||||
|
||||
// Say whether it actually woke. "The ON button does nothing" is a report with
|
||||
// three different causes — the pulse was refused, the pulse went out and the
|
||||
// amp ignored it, or the amp came up and the UI missed it — and only the log
|
||||
// can separate them. Watched off the caller's goroutine so the click returns
|
||||
// at once.
|
||||
go func() {
|
||||
deadline := time.Now().Add(15 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
time.Sleep(time.Second)
|
||||
if c.GetStatus().Connected {
|
||||
applog.Printf("spe: power ON — amp answered after %.0fs",
|
||||
15-time.Until(deadline).Seconds())
|
||||
return
|
||||
}
|
||||
}
|
||||
applog.Printf("spe: power ON — no answer within 15s on %s. The pulse was sent; "+
|
||||
"either this amplifier does not wake on RTS/DTR, or the adapter does not drive those lines",
|
||||
c.cfg.ComPort)
|
||||
}()
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -226,6 +269,14 @@ func (c *Client) PowerOn() error {
|
||||
// the poll loop keeps reopening the port with both lines high and that has
|
||||
// never woken it — only the deliberate low→high sequence in PowerOn does.
|
||||
func (c *Client) PowerOff() error {
|
||||
// Close the window BEFORE the key goes out, so a frame already travelling up
|
||||
// the wire cannot land after setErr and undo it. Three seconds covers a poll
|
||||
// interval with room to spare; after that a real answer means the amp is
|
||||
// genuinely alive again, which is what happens if it is switched back on at
|
||||
// its own front panel.
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Now().Add(3 * time.Second)
|
||||
c.statusMu.Unlock()
|
||||
err := c.sendCmd(cmdOff)
|
||||
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
|
||||
// Drop the link and mark the amp offline at once, exactly as a fresh start
|
||||
@@ -482,6 +533,9 @@ func (c *Client) decodeCSV(payload string) {
|
||||
c.lastRaw = payload
|
||||
applog.Printf("spe: status raw=%q fields=%d", payload, len(f))
|
||||
}
|
||||
if time.Now().Before(c.offUntil) {
|
||||
return // a frame from before the switch-off — the amp is on its way down
|
||||
}
|
||||
c.status.Connected = true
|
||||
c.status.LastError = ""
|
||||
// The real frame carries a leading empty field (it starts with a comma), so the
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.24.8"
|
||||
appVersion = "0.24.9"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
// A CQ in FT8 carries the operator's square and it is where they are NOW.
|
||||
// QRZ and HamQTH describe where they LIVE, which for an expedition is the
|
||||
// wrong side of the planet — RI0FA transmitted QN35 all evening and was logged
|
||||
// with its licence-holder's home square.
|
||||
//
|
||||
// refineGrid is the referee. What it must never do is let a directory value
|
||||
// replace one heard on the air.
|
||||
func TestRefineGridKeepsWhatWasHeardOnAir(t *testing.T) {
|
||||
for _, tc := range []struct{ have, found, want string }{
|
||||
// The expedition case: heard QN35, directory says the home square.
|
||||
{"QN35", "KO85", "QN35"},
|
||||
// Nothing heard: the directory is all there is.
|
||||
{"", "KO85", "KO85"},
|
||||
// A finer square from the SAME field is an upgrade, not a contradiction.
|
||||
{"QN35", "QN35SL", "QN35SL"},
|
||||
// A finer square from a DIFFERENT field is a contradiction — refuse it.
|
||||
{"QN35", "KO85AB", "QN35"},
|
||||
// Case and padding must not decide anything.
|
||||
{" qn35 ", "KO85", "QN35"},
|
||||
{"QN35", "", "QN35"},
|
||||
} {
|
||||
if got := refineGrid(tc.have, tc.found); got != tc.want {
|
||||
t.Errorf("refineGrid(%q, %q) = %q, want %q", tc.have, tc.found, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// And the ordering that makes it work: the decoded grid has to be applied
|
||||
// BEFORE the lookup, or refineGrid has nothing to defend.
|
||||
func TestDecodedGridWinsOverTheDirectory(t *testing.T) {
|
||||
a := &App{}
|
||||
a.rememberDecodeGrid("RI0FA", "QN35", "decode")
|
||||
|
||||
grid := "" // WSJT-X's ADIF carried no GRIDSQUARE, which is the usual case
|
||||
if g := a.lookupDecodeGrid("RI0FA"); g != "" {
|
||||
grid = refineGrid(grid, g)
|
||||
}
|
||||
grid = refineGrid(grid, "KO85") // then the lookup answers with the home square
|
||||
|
||||
if grid != "QN35" {
|
||||
t.Errorf("logged grid = %q, want QN35 — the square the station actually sent", grid)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user