Skip to content

rtknav_qt: correct uninitialised positions being saved #866

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 1 commit into
base: main
Choose a base branch
from
+19 −5
Open

rtknav_qt: correct uninitialised positions being saved #866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions app/qtapp/appcmn_qt/navi_post_opt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ OptDialog::OptDialog(QWidget *parent, int opts)
navSelect = 0; /* navigation mesaage select */
proxyaddr[0] = '\0'; /* proxy address */

current_roverPositionType = -1;
current_referencePositionType = -1;

static opt_t _naviopt[] = {
{ "misc-svrcycle", 0, (void *)&serverCycle, "ms" },
{ "misc-timeout", 0, (void *)&timeoutTime, "ms" },
Expand Down Expand Up @@ -429,10 +432,15 @@ void OptDialog::showSnrMaskDialog()
//---------------------------------------------------------------------------
void OptDialog::roverPositionTypeChanged(int)
{
QLineEdit *edit[] = {ui->lERoverPosition1, ui->lERoverPosition2, ui->lERoverPosition3};
double pos[3];
// Startup guard.
if (current_roverPositionType < 0 ) {
current_roverPositionType = ui->cBRoverPositionType->currentIndex();
return;
}

// update position value in accordance to type
QLineEdit *edit[] = {ui->lERoverPosition1, ui->lERoverPosition2, ui->lERoverPosition3};
double pos[3];
int error = getPosition(current_roverPositionType, edit, pos);
if (error) {
ui->cBRoverPositionType->setCurrentIndex(current_roverPositionType); // don't allow to change the type
Expand All @@ -445,6 +453,12 @@ void OptDialog::roverPositionTypeChanged(int)
//---------------------------------------------------------------------------
void OptDialog::referencePositionTypeChanged(int)
{
// Startup guard.
if (current_referencePositionType < 0 ) {
current_referencePositionType = ui->cBReferencePositionType->currentIndex();
return;
}

QLineEdit *edit[] = {ui->lEReferencePosition1, ui->lEReferencePosition2, ui->lEReferencePosition3};
double pos[3];

Expand Down Expand Up @@ -651,7 +665,6 @@ void OptDialog::selectSolutionFont()
//---------------------------------------------------------------------------
void OptDialog::updateOptions()
{
double rovPos[3], refPos[3];
QLineEdit *editu[] = {ui->lERoverPosition1, ui->lERoverPosition2, ui->lERoverPosition3 };
QLineEdit *editr[] = {ui->lEReferencePosition1, ui->lEReferencePosition2, ui->lEReferencePosition3 };
pcvs_t pcvr;
Expand Down Expand Up @@ -756,6 +769,7 @@ void OptDialog::updateOptions()
processingOptions.baseline[1] = 0.0;
}

double rovPos[3], refPos[3];
getPosition(ui->cBRoverPositionType->currentIndex(), editu, rovPos);
getPosition(ui->cBReferencePositionType->currentIndex(), editr, refPos);

Expand Down Expand Up @@ -1274,7 +1288,6 @@ void OptDialog::save(const QString &file)
//---------------------------------------------------------------------------
void OptDialog::saveOptions(QSettings &settings)
{
double rovPos[3], refPos[3];
QLineEdit *editu[] = {ui->lERoverPosition1, ui->lERoverPosition2, ui->lERoverPosition3};
QLineEdit *editr[] = {ui->lEReferencePosition1, ui->lEReferencePosition2, ui->lEReferencePosition3};

Expand Down Expand Up @@ -1323,6 +1336,7 @@ void OptDialog::saveOptions(QSettings &settings)

settings.setValue("setting/rovpostype", ui->cBRoverPositionType->currentIndex());
settings.setValue("setting/refpostype", ui->cBReferencePositionType->currentIndex());
double rovPos[3] = {0}, refPos[3] = {0};
if (ui->cBRoverPositionType->currentIndex() < 3) getPosition(ui->cBRoverPositionType->currentIndex(), editu, rovPos);
if (ui->cBReferencePositionType->currentIndex() < 3) getPosition(ui->cBReferencePositionType->currentIndex(), editr, refPos);

Expand Down Expand Up @@ -1473,7 +1487,6 @@ void OptDialog::saveOptions(QSettings &settings)
//---------------------------------------------------------------------------
void OptDialog::loadOptions(QSettings &settings)
{
double rovPos[3], refPos[3];
QLineEdit *editu[] = {ui->lERoverPosition1, ui->lERoverPosition2, ui->lERoverPosition3};
QLineEdit *editr[] = {ui->lEReferencePosition1, ui->lEReferencePosition2, ui->lEReferencePosition3};

Expand Down Expand Up @@ -1569,6 +1582,7 @@ void OptDialog::loadOptions(QSettings &settings)
ui->cBRoverAntenna->setCurrentIndex(ui->cBRoverAntenna->findText(settings.value("prcopt/anttype1", "").toString()));
ui->cBReferenceAntenna->setCurrentIndex(ui->cBReferenceAntenna->findText(settings.value("prcopt/anttype2", "").toString()));

double rovPos[3], refPos[3];
for (int i = 0; i < 3; i++) {
rovPos[i] = settings.value(QStringLiteral("setting/rovpos_%1").arg(i), 0.0).toDouble();
refPos[i] = settings.value(QStringLiteral("setting/refpos_%1").arg(i), 0.0).toDouble();
Expand Down