Skip to content

rtkrcv, rtknavi: support more input and solution out streams #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ourairquality wants to merge 2 commits into
base: main
Choose a base branch
from
Open

rtkrcv, rtknavi: support more input and solution out streams #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f71e2a9
rtknavi_qt: keep the stream details even if disabled
ourairquality Jun 12, 2026
7d5d2f6
rtkrcv, rtknavi: support more input and solution out streams
ourairquality Oct 3, 2025
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/consapp/rtkrcv/gcc/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
BINDIR = /usr/local/bin
SRC = ../../../../src

CTARGET= -DTRACE -DENAGLO -DENAQZS -DENACMP -DENAGAL -DENAIRN -DNFREQ=4 -DNEXOBS=3 -DSVR_REUSEADDR
CTARGET= -DTRACE -DENAGLO -DENAQZS -DENACMP -DENAGAL -DENAIRN -DNFREQ=4 -DNEXOBS=3 -DSVR_REUSEADDR -DRTKSVRNIN=5 -DRTKSVRNSOL=6
#CTARGET= -DENAGLO -DENAQZS -DENACMP -DENAGAL -DENAIRN -DNFREQ=4 -DIERS_MODEL -DSVR_REUSEADDR

CFLAGS = -std=c99 -Wall -O3 -pedantic -Wno-unused-but-set-variable -I$(SRC) -I.. -DTRACE $(CTARGET) -g
Expand Down
215 changes: 136 additions & 79 deletions app/consapp/rtkrcv/rtkrcv.c
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 75 additions & 29 deletions app/qtapp/rtknavi_qt/instrdlg.cpp
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions app/qtapp/rtknavi_qt/instrdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include <QDialog>

#include "rtklib.h"

namespace Ui {
class InputStrDialog;
}
Expand Down Expand Up @@ -88,15 +90,19 @@ public slots:
void showStreamOptions1();
void showStreamOptions2();
void showStreamOptions3();
void showStreamOptions4();
void showCommandDialog1();
void showCommandDialog2();
void showCommandDialog3();
void showCommandDialog4();
void selectFile1();
void selectFile2();
void selectFile3();
void selectFile4();
void showReceiverOptions1();
void showReceiverOptions2();
void showReceiverOptions3();
void showReceiverOptions4();
void selectPosition();
void updateEnable();

Expand All @@ -116,12 +122,12 @@ public slots:
TcpOptDialog *tcpOptDialog;
FtpOptDialog *ftpOptDialog;

int commandEnable[3][3], commandEnableTcp[3][3];
QString commands[3][3], commandsTcp[3][3];
QString paths[3][4];
int commandEnable[RTKSVRNIN][3], commandEnableTcp[RTKSVRNIN][3];
QString commands[RTKSVRNIN][3], commandsTcp[RTKSVRNIN][3];
QString paths[RTKSVRNIN][4];


QString receiverOptions[3];
QString receiverOptions[RTKSVRNIN];
QString history[10];
int noFormats;
QString stationPositionFile;
Expand Down
112 changes: 111 additions & 1 deletion app/qtapp/rtknavi_qt/instrdlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>(4)</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="lblInputFilePath">
<property name="toolTip">
Expand All @@ -189,6 +196,13 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lEFilePath4">
<property name="toolTip">
<string>Specify file name for correction data</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -724,7 +738,96 @@
</item>
</widget>
</item>
</layout>
<item row="4" column="0">
<widget class="QCheckBox" name="cBStreamC4">
<property name="toolTip">
<string>Activate data input stream for additional corrections</string>
</property>
<property name="text">
<string>(4) Correction</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="cBStream4">
<property name="toolTip">
<string>Select input stream type for corrections</string>
</property>
<item>
<property name="text">
<string>Serial</string>
</property>
</item>
<item>
<property name="text">
<string>TCP Client</string>
</property>
</item>
<item>
<property name="text">
<string>TCP Server</string>
</property>
</item>
<item>
<property name="text">
<string>NTRIP Client</string>
</property>
</item>
<item>
<property name="text">
<string>File</string>
</property>
</item>
<item>
<property name="text">
<string>FTP</string>
</property>
</item>
<item>
<property name="text">
<string>HTTP</string>
</property>
</item>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="btnStream4">
<property name="toolTip">
<string>Select options for the correction data stream</string>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QPushButton" name="btnCmd4">
<property name="toolTip">
<string>Specify additional commands for the correction data stream</string>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QComboBox" name="cBFormat4">
<property name="toolTip">
<string>Select correction data stream format</string>
</property>
</widget>
</item>
<item row="4" column="5">
<widget class="QPushButton" name="btnReceiverOptions4">
<property name="toolTip">
<string>Define additional options for the receiver</string>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand All @@ -748,6 +851,12 @@
<tabstop>btnCmd3</tabstop>
<tabstop>cBFormat3</tabstop>
<tabstop>btnReceiverOptions3</tabstop>
<tabstop>cBStreamC4</tabstop>
<tabstop>cBStream4</tabstop>
<tabstop>btnStream4</tabstop>
<tabstop>btnCmd4</tabstop>
<tabstop>cBFormat4</tabstop>
<tabstop>btnReceiverOptions4</tabstop>
<tabstop>cBNmeaRequestType</tabstop>
<tabstop>sBNmeaPosition1</tabstop>
<tabstop>sBNmeaPosition2</tabstop>
Expand All @@ -758,6 +867,7 @@
<tabstop>lEFilePath1</tabstop>
<tabstop>lEFilePath2</tabstop>
<tabstop>lEFilePath3</tabstop>
<tabstop>lEFilePath4</tabstop>
<tabstop>cBTimeTag</tabstop>
<tabstop>cBTimeSpeed</tabstop>
<tabstop>cB64Bit</tabstop>
Expand Down
61 changes: 44 additions & 17 deletions app/qtapp/rtknavi_qt/logstrdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ LogStrDialog::LogStrDialog(QWidget *parent)
ui->lEFilePath1->setCompleter(new QCompleter(fileModel, this));
ui->lEFilePath2->setCompleter(new QCompleter(fileModel, this));
ui->lEFilePath3->setCompleter(new QCompleter(fileModel, this));
ui->lEFilePath4->setCompleter(new QCompleter(fileModel, this));

// line edit actions
QAction *aclEFilePath1Select = ui->lEFilePath1->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);
Expand All @@ -40,22 +41,28 @@ LogStrDialog::LogStrDialog(QWidget *parent)
aclEFilePath2Select->setToolTip(tr("Select File"));
QAction *aclEFilePath3Select = ui->lEFilePath3->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);
aclEFilePath3Select->setToolTip(tr("Select File"));
QAction *aclEFilePath4Select = ui->lEFilePath4->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);
aclEFilePath4Select->setToolTip(tr("Select File"));

connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &LogStrDialog::accept);
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &LogStrDialog::reject);
connect(ui->btnKey, &QPushButton::clicked, this, &LogStrDialog::showKeyDialog);
connect(aclEFilePath1Select, &QAction::triggered, this, &LogStrDialog::selectFile1);
connect(aclEFilePath2Select, &QAction::triggered, this, &LogStrDialog::selectFile2);
connect(aclEFilePath3Select, &QAction::triggered, this, &LogStrDialog::selectFile3);
connect(aclEFilePath4Select, &QAction::triggered, this, &LogStrDialog::selectFile4);
connect(ui->btnStream1, &QPushButton::clicked, this, &LogStrDialog::showStreamOptions1);
connect(ui->btnStream2, &QPushButton::clicked, this, &LogStrDialog::showStreamOptions2);
connect(ui->btnStream3, &QPushButton::clicked, this, &LogStrDialog::showStreamOptions3);
connect(ui->btnStream4, &QPushButton::clicked, this, &LogStrDialog::showStreamOptions4);
connect(ui->cBStream1, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &LogStrDialog::updateEnable);
connect(ui->cBStream2, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &LogStrDialog::updateEnable);
connect(ui->cBStream3, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &LogStrDialog::updateEnable);
connect(ui->cBStream4, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &LogStrDialog::updateEnable);
connect(ui->cBStream1C, &QCheckBox::clicked, this, &LogStrDialog::updateEnable);
connect(ui->cBStream2C, &QCheckBox::clicked, this, &LogStrDialog::updateEnable);
connect(ui->cBStream3C, &QCheckBox::clicked, this, &LogStrDialog::updateEnable);
connect(ui->cBStream4C, &QCheckBox::clicked, this, &LogStrDialog::updateEnable);

ui->cBSwapInterval->setValidator(new QDoubleValidator(this));
}
Expand All @@ -75,6 +82,11 @@ void LogStrDialog::selectFile3()
ui->lEFilePath3->setText(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath3->text())));
}
//---------------------------------------------------------------------------
void LogStrDialog::selectFile4()
{
ui->lEFilePath4->setText(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath4->text())));
}
//---------------------------------------------------------------------------
void LogStrDialog::showKeyDialog()
{
keyDialog->show();
Expand All @@ -98,7 +110,7 @@ void LogStrDialog::showStreamOptions2()
case 1: showTcpOptions(1, 1); break;
case 2: showTcpOptions(1, 0); break;
case 3: showTcpOptions(1, 2); break;
case 4: showTcpOptions(0, 4); break;
case 4: showTcpOptions(1, 4); break;
}
}
//---------------------------------------------------------------------------
Expand All @@ -109,7 +121,18 @@ void LogStrDialog::showStreamOptions3()
case 1: showTcpOptions(2, 1); break;
case 2: showTcpOptions(2, 0); break;
case 3: showTcpOptions(2, 2); break;
case 4: showTcpOptions(0, 4); break;
case 4: showTcpOptions(2, 4); break;
}
}
//---------------------------------------------------------------------------
void LogStrDialog::showStreamOptions4()
{
switch (ui->cBStream4->currentIndex()) {
case 0: showSerialOptions(3, 0); break;
case 1: showTcpOptions(3, 1); break;
case 2: showTcpOptions(3, 0); break;
case 3: showTcpOptions(3, 2); break;
case 4: showTcpOptions(3, 4); break;
}
}
//---------------------------------------------------------------------------
Expand All @@ -133,7 +156,7 @@ QString LogStrDialog::setFilePath(const QString &p)
//---------------------------------------------------------------------------
void LogStrDialog::showSerialOptions(int index, int opt)
{
if ((index < 0) || (index > 2)) return;
if ((index < 0) || (index >= RTKSVRNIN)) return;

serialOptDialog->setOptions(opt);
serialOptDialog->setPath(paths[index][0]);
Expand All @@ -146,7 +169,7 @@ void LogStrDialog::showSerialOptions(int index, int opt)
//---------------------------------------------------------------------------
void LogStrDialog::showTcpOptions(int index, int opt)
{
if ((index < 0) || (index > 2)) return;
if ((index < 0) || (index >= RTKSVRNIN)) return;

tcpOptDialog->setOptions(opt);
tcpOptDialog->setHistory(history, 10);
Expand All @@ -165,17 +188,21 @@ void LogStrDialog::updateEnable()
{
int ena = (ui->cBStream1C->isChecked() && ui->cBStream1->currentIndex() == 5) ||
(ui->cBStream2C->isChecked() && ui->cBStream2->currentIndex() == 5) ||
(ui->cBStream3C->isChecked() && ui->cBStream3->currentIndex() == 5);
(ui->cBStream3C->isChecked() && ui->cBStream3->currentIndex() == 5) ||
(ui->cBStream4C->isChecked() && ui->cBStream4->currentIndex() == 5);

ui->cBStream1->setEnabled(ui->cBStream1C->isChecked());
ui->cBStream2->setEnabled(ui->cBStream2C->isChecked());
ui->cBStream3->setEnabled(ui->cBStream3C->isChecked());
ui->cBStream4->setEnabled(ui->cBStream4C->isChecked());
ui->btnStream1->setEnabled(ui->cBStream1C->isChecked() && ui->cBStream1->currentIndex() <= 4);
ui->btnStream2->setEnabled(ui->cBStream2C->isChecked() && ui->cBStream2->currentIndex() <= 4);
ui->btnStream3->setEnabled(ui->cBStream3C->isChecked() && ui->cBStream3->currentIndex() <= 4);
ui->btnStream4->setEnabled(ui->cBStream4C->isChecked() && ui->cBStream4->currentIndex() <= 4);
ui->lEFilePath1->setEnabled(ui->cBStream1C->isChecked() && ui->cBStream1->currentIndex() == 5);
ui->lEFilePath2->setEnabled(ui->cBStream2C->isChecked() && ui->cBStream2->currentIndex() == 5);
ui->lEFilePath3->setEnabled(ui->cBStream3C->isChecked() && ui->cBStream3->currentIndex() == 5);
ui->lEFilePath4->setEnabled(ui->cBStream4C->isChecked() && ui->cBStream4->currentIndex() == 5);
ui->lblSwapInterval->setEnabled(ena);
ui->lblF1->setEnabled(ena);
ui->cBTimeTag->setEnabled(ena);
Expand All @@ -185,25 +212,25 @@ void LogStrDialog::updateEnable()
//---------------------------------------------------------------------------
void LogStrDialog::setStreamEnabled(int stream, int enabled)
{
QCheckBox *cBStreamC[] = {ui->cBStream1C, ui->cBStream2C, ui->cBStream3C};
if ((stream < 0 ) || (stream > 2)) return;
QCheckBox *cBStreamC[] = {ui->cBStream1C, ui->cBStream2C, ui->cBStream3C, ui->cBStream4C};
if ((stream < 0 ) || (stream >= RTKSVRNIN)) return;

cBStreamC[stream]->setChecked(enabled);
updateEnable();
}
//---------------------------------------------------------------------------
int LogStrDialog::getStreamEnabled(int stream)
{
QCheckBox *cBStreamC[] = {ui->cBStream1C, ui->cBStream2C, ui->cBStream3C};
if ((stream < 0 ) || (stream > 2)) return false;
QCheckBox *cBStreamC[] = {ui->cBStream1C, ui->cBStream2C, ui->cBStream3C, ui->cBStream4C};
if ((stream < 0 ) || (stream >= RTKSVRNIN)) return false;

return cBStreamC[stream]->isChecked();
}
//---------------------------------------------------------------------------
void LogStrDialog::setStreamType(int stream, int type)
{
QComboBox *cBStream[] = {ui->cBStream1, ui->cBStream2, ui->cBStream3};
if ((stream < 0 ) || (stream > 2)) return;
QComboBox *cBStream[] = {ui->cBStream1, ui->cBStream2, ui->cBStream3, ui->cBStream4};
if ((stream < 0 ) || (stream >= RTKSVRNIN)) return;

cBStream[stream]->setCurrentIndex(type);

Expand All @@ -212,16 +239,16 @@ void LogStrDialog::setStreamType(int stream, int type)
//---------------------------------------------------------------------------
int LogStrDialog::getStreamType(int stream)
{
QComboBox *cBStream[] = {ui->cBStream1, ui->cBStream2, ui->cBStream3};
if ((stream < 0 ) || (stream > 2)) return STR_NONE;
QComboBox *cBStream[] = {ui->cBStream1, ui->cBStream2, ui->cBStream3, ui->cBStream4};
if ((stream < 0 ) || (stream >= RTKSVRNIN)) return STR_NONE;

return cBStream[stream]->currentIndex();
};
//---------------------------------------------------------------------------
void LogStrDialog::setPath(int stream, int type, const QString &path)
{
QLineEdit *edits[] = {ui->lEFilePath1, ui->lEFilePath2, ui->lEFilePath3};
if ((stream < 0 ) || (stream > 2)) return;
QLineEdit *edits[] = {ui->lEFilePath1, ui->lEFilePath2, ui->lEFilePath3, ui->lEFilePath4};
if ((stream < 0 ) || (stream >= RTKSVRNIN)) return;
if ((type < 0 ) || (type > 3)) return;

paths[stream][type] = path;
Expand All @@ -240,8 +267,8 @@ void LogStrDialog::setPath(int stream, int type, const QString &path)
//---------------------------------------------------------------------------
QString LogStrDialog::getPath(int stream, int type)
{
QLineEdit *edits[] = {ui->lEFilePath1, ui->lEFilePath2, ui->lEFilePath3};
if ((stream < 0 ) || (stream > 2)) return "";
QLineEdit *edits[] = {ui->lEFilePath1, ui->lEFilePath2, ui->lEFilePath3, ui->lEFilePath4};
if ((stream < 0 ) || (stream >= RTKSVRNIN)) return "";
if ((type < 0 ) || (type > 3)) return "";

if (type == 2)
Expand Down
Loading