From 05d9cc6f37b128e98611dbd341673fedd91cada0 Mon Sep 17 00:00:00 2001 From: oaq Date: Wed, 27 May 2026 13:33:50 +1000 Subject: [PATCH] rtknavi_qt show ssr: support the combined data as a source --- app/qtapp/rtknavi_qt/mondlg.cpp | 9 +++++---- app/winapp/rtknavi/mondlg.cpp | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/qtapp/rtknavi_qt/mondlg.cpp b/app/qtapp/rtknavi_qt/mondlg.cpp index b8829d02b..8b13ae9fc 100644 --- a/app/qtapp/rtknavi_qt/mondlg.cpp +++ b/app/qtapp/rtknavi_qt/mondlg.cpp @@ -2110,11 +2110,12 @@ void MonitorDialog::showRtcmSsr() time = rtksvr->rtk.sol.time; for (i = n = 0; i < MAXSAT; i++) { if (!(satsys(i + 1, NULL) & sys)) continue; - bool valid = rtksvr->rtcm[effectiveStream].ssr[i].t0[0].time && - fabs(timediff(time, rtksvr->rtcm[effectiveStream].ssr[i].t0[0])) <= 1800.0 && - rtksvr->rtcm[effectiveStream].ssr[i].iode >= 0; + if (inputStream == 3) + ssr[n] = rtksvr->nav.ssr[i]; + else + ssr[n] = rtksvr->rtcm[effectiveStream].ssr[i]; + bool valid = ssr[n].t0[0].time && fabs(timediff(time, ssr[n].t0[0])) <= 1800.0 && ssr[n].iode >= 0; if (ui->cBSelectSatellites->currentIndex() && !valid) continue; - ssr[n] = rtksvr->rtcm[effectiveStream].ssr[i]; sat[n++] = i + 1; } rtksvrunlock(rtksvr); diff --git a/app/winapp/rtknavi/mondlg.cpp b/app/winapp/rtknavi/mondlg.cpp index 4f8626e06..673d993c8 100644 --- a/app/winapp/rtknavi/mondlg.cpp +++ b/app/winapp/rtknavi/mondlg.cpp @@ -1964,11 +1964,9 @@ void __fastcall TMonitorDialog::ShowRtcmSsr(void) time=rtksvr.rtk.sol.time; for (i=n=0;i= 0; - if (SelSat->ItemIndex == 1 && !valid) continue; ssr[n]=rtksvr.rtcm[Str1].ssr[i]; + int valid = ssr[n].t0[0].time && fabs(timediff(time, ssr[n].t0[0])) <= 1800.0 && ssr[n].iode >= 0; + if (SelSat->ItemIndex == 1 && !valid) continue; sat[n++]=i+1; } rtksvrunlock(&rtksvr);