Skip to content

Commit 6a2d8c8

Browse files
JensReimannJensReimann
committed
Qt GUI Update
- rtkpost_qt: fix SNR mask not being updated (#748) - rtkpost_qt: fix "excluded satllites" not being updated (#744) - fix issue with file path completion not working correctly
1 parent b30a6ac commit 6a2d8c8

File tree

9 files changed

+51
-70
lines changed

9 files changed

+51
-70
lines changed

‎app/qtapp/appcmn_qt/navi_post_opt.cpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,15 @@ OptDialog::OptDialog(QWidget *parent, int opts)
197197
}
198198

199199
// set up completers
200-
QCompleter *fileCompleter = new QCompleter(this);
201-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
200+
QFileSystemModel *fileModel = new QFileSystemModel(this);
202201
fileModel->setRootPath("");
203-
fileCompleter->setModel(fileModel);
204-
ui->lEStationPositionFile->setCompleter(fileCompleter);
205-
ui->lEAntennaPcvFile->setCompleter(fileCompleter);
206-
ui->lESatellitePcvFile->setCompleter(fileCompleter);
207-
ui->lEDCBFile->setCompleter(fileCompleter);
208-
ui->lEGeoidDataFile->setCompleter(fileCompleter);
209-
ui->lEEOPFile->setCompleter(fileCompleter);
210-
ui->lEBLQFile->setCompleter(fileCompleter);
202+
ui->lEStationPositionFile->setCompleter(new QCompleter(fileModel, this));
203+
ui->lEAntennaPcvFile->setCompleter(new QCompleter(fileModel, this));
204+
ui->lESatellitePcvFile->setCompleter(new QCompleter(fileModel, this));
205+
ui->lEDCBFile->setCompleter(new QCompleter(fileModel, this));
206+
ui->lEGeoidDataFile->setCompleter(new QCompleter(fileModel, this));
207+
ui->lEEOPFile->setCompleter(new QCompleter(fileModel, this));
208+
ui->lEBLQFile->setCompleter(new QCompleter(fileModel, this));
211209

212210
QCompleter *dirCompleter = new QCompleter(this);
213211
QFileSystemModel *dirModel = new QFileSystemModel(dirCompleter);
@@ -691,7 +689,7 @@ void OptDialog::updateOptions()
691689
if (ui->cBNavSys6->isChecked()) processingOptions.navsys |= SYS_CMP;
692690
if (ui->cBNavSys7->isChecked()) processingOptions.navsys |= SYS_IRN;
693691
processingOptions.elmin = ui->cBElevationMask->currentText().toDouble() * D2R;
694-
// snrmask: already set by calling mask dialog
692+
processingOptions.snrmask = snrmask;
695693
processingOptions.sateph = ui->cBSatelliteEphemeris->currentIndex();
696694
processingOptions.modear = ui->cBAmbiguityResolution->currentIndex();
697695
processingOptions.glomodear = ui->cBAmbiguityResolutionGLO->currentIndex();
@@ -806,15 +804,15 @@ void OptDialog::updateOptions()
806804
QMessageBox::warning(this, tr("Error"), tr("Antenna file read error: \"%1\"").arg(fileOptions.rcvantp));
807805
return;
808806
}
809-
if (ui->cBRoverAntennaPcv->isChecked() && processingOptions.anttype[0] != QStringLiteral("") &&
807+
if (ui->cBRoverAntennaPcv->isChecked() && processingOptions.anttype[0] != QLatin1String("") &&
810808
processingOptions.anttype[0] != QStringLiteral("*")) {
811809
pcv_t *pcv = searchpcv(0, processingOptions.anttype[0], time, &pcvr);
812810
if (pcv)
813811
processingOptions.pcvr[0] = *pcv;
814812
else
815813
QMessageBox::warning(this, tr("Error"), tr("No rover antenna PCV: \"%1\"").arg(processingOptions.anttype[0]));
816814
}
817-
if (ui->cBReferenceAntennaPcv->isChecked() && processingOptions.anttype[1] != QStringLiteral("") &&
815+
if (ui->cBReferenceAntennaPcv->isChecked() && processingOptions.anttype[1] != QLatin1String("") &&
818816
processingOptions.anttype[1] != QStringLiteral("*")) {
819817
pcv_t *pcv = searchpcv(0, processingOptions.anttype[1], time, &pcvr);
820818
if (pcv)
@@ -2026,6 +2024,7 @@ QString OptDialog::excludedSatellitesString(const prcopt_t *prcopt)
20262024
//---------------------------------------------------------------------------
20272025
bool OptDialog::fillExcludedSatellites(prcopt_t *prcopt, const QString &excludedSatellites)
20282026
{
2027+
memset(prcopt->exsats, 0, MAXSAT); // reset mask
20292028
if (!excludedSatellites.isEmpty()) {
20302029
foreach (QString sat, excludedSatellites.split(' ')) {
20312030
unsigned char ex;

‎app/qtapp/rtkconv_qt/convmain.cpp‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,18 @@ MainWindow::MainWindow(QWidget *parent)
109109
ui->cBFormat->addItem(formatstrs[STRFMT_RINEX], STRFMT_RINEX);
110110

111111
// set up completers to propose the user valid paths
112-
QCompleter *fileCompleter = new QCompleter(this);
113-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
112+
QFileSystemModel *fileModel = new QFileSystemModel(this);
114113
fileModel->setRootPath("");
115-
fileCompleter->setModel(fileModel);
116-
ui->lEOutputFile1->setCompleter(fileCompleter);
117-
ui->lEOutputFile2->setCompleter(fileCompleter);
118-
ui->lEOutputFile3->setCompleter(fileCompleter);
119-
ui->lEOutputFile4->setCompleter(fileCompleter);
120-
ui->lEOutputFile5->setCompleter(fileCompleter);
121-
ui->lEOutputFile6->setCompleter(fileCompleter);
122-
ui->lEOutputFile7->setCompleter(fileCompleter);
123-
ui->lEOutputFile8->setCompleter(fileCompleter);
124-
ui->lEOutputFile9->setCompleter(fileCompleter);
125-
ui->cBInputFile->setCompleter(fileCompleter);
114+
ui->lEOutputFile1->setCompleter(new QCompleter(fileModel, this));
115+
ui->lEOutputFile2->setCompleter(new QCompleter(fileModel, this));
116+
ui->lEOutputFile3->setCompleter(new QCompleter(fileModel, this));
117+
ui->lEOutputFile4->setCompleter(new QCompleter(fileModel, this));
118+
ui->lEOutputFile5->setCompleter(new QCompleter(fileModel, this));
119+
ui->lEOutputFile6->setCompleter(new QCompleter(fileModel, this));
120+
ui->lEOutputFile7->setCompleter(new QCompleter(fileModel, this));
121+
ui->lEOutputFile8->setCompleter(new QCompleter(fileModel, this));
122+
ui->lEOutputFile9->setCompleter(new QCompleter(fileModel, this));
123+
ui->cBInputFile->setCompleter(new QCompleter(fileModel, this));
126124

127125
ui->comboTimeInterval->setValidator(new QDoubleValidator());
128126

‎app/qtapp/rtkget_qt/getoptdlg.cpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ DownOptDialog::DownOptDialog(QWidget *parent)
1818
{
1919
ui->setupUi(this);
2020

21-
QCompleter *fileCompleter = new QCompleter(this);
22-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
21+
QFileSystemModel *fileModel = new QFileSystemModel(this);
2322
fileModel->setRootPath("");
24-
fileCompleter->setModel(fileModel);
25-
ui->lEUrlFilename->setCompleter(fileCompleter);
26-
ui->lELogFilename->setCompleter(fileCompleter);
23+
ui->lEUrlFilename->setCompleter(new QCompleter(fileModel, this));
24+
ui->lELogFilename->setCompleter(new QCompleter(fileModel, this));
2725

2826
QAction *acLogFilename = ui->lELogFilename->addAction(QIcon(":/icons/folder"), QLineEdit::TrailingPosition);
2927
acLogFilename->setToolTip(tr("Select Log File Path"));

‎app/qtapp/rtknavi_qt/instrdlg.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,11 @@ InputStrDialog::InputStrDialog(QWidget *parent)
4646
ftpOptDialog = new FtpOptDialog(this);
4747

4848
// setup completers
49-
QCompleter *fileCompleter = new QCompleter(this);
50-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
49+
QFileSystemModel *fileModel = new QFileSystemModel(this);
5150
fileModel->setRootPath("");
52-
fileCompleter->setModel(fileModel);
53-
ui->lEFilePath1->setCompleter(fileCompleter);
54-
ui->lEFilePath2->setCompleter(fileCompleter);
55-
ui->lEFilePath3->setCompleter(fileCompleter);
51+
ui->lEFilePath1->setCompleter(new QCompleter(fileModel, this));
52+
ui->lEFilePath2->setCompleter(new QCompleter(fileModel, this));
53+
ui->lEFilePath3->setCompleter(new QCompleter(fileModel, this));
5654

5755
// line edit actions
5856
QAction *aclEFilePath1Select = ui->lEFilePath1->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);

‎app/qtapp/rtknavi_qt/logstrdlg.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ LogStrDialog::LogStrDialog(QWidget *parent)
2727
serialOptDialog = new SerialOptDialog(this);
2828
tcpOptDialog = new TcpOptDialog(this);
2929

30-
QCompleter *fileCompleter = new QCompleter(this);
31-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
30+
QFileSystemModel *fileModel = new QFileSystemModel(this);
3231
fileModel->setRootPath("");
33-
fileCompleter->setModel(fileModel);
34-
ui->lEFilePath1->setCompleter(fileCompleter);
35-
ui->lEFilePath2->setCompleter(fileCompleter);
36-
ui->lEFilePath3->setCompleter(fileCompleter);
32+
ui->lEFilePath1->setCompleter(new QCompleter(fileModel, this));
33+
ui->lEFilePath2->setCompleter(new QCompleter(fileModel, this));
34+
ui->lEFilePath3->setCompleter(new QCompleter(fileModel, this));
3735

3836
// line edit actions
3937
QAction *aclEFilePath1Select = ui->lEFilePath1->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);

‎app/qtapp/rtknavi_qt/outstrdlg.cpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@ OutputStrDialog::OutputStrDialog(QWidget *parent)
3838
serialOptDialog = new SerialOptDialog(this);
3939
tcpOptDialog = new TcpOptDialog(this);
4040

41-
QCompleter *fileCompleter = new QCompleter(this);
42-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
41+
QFileSystemModel *fileModel = new QFileSystemModel(this);
4342
fileModel->setRootPath("");
44-
fileCompleter->setModel(fileModel);
45-
ui->lEFilePath1->setCompleter(fileCompleter);
46-
ui->lEFilePath2->setCompleter(fileCompleter);
43+
ui->lEFilePath1->setCompleter(new QCompleter(fileModel, this));
44+
ui->lEFilePath2->setCompleter(new QCompleter(fileModel, this));
4745

4846
// line edit actions
4947
QAction *aclEFilePath1Select = ui->lEFilePath1->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);

‎app/qtapp/rtkplot_qt/plotopt.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@ PlotOptDialog::PlotOptDialog(QWidget *parent)
4545

4646
refDialog = new RefDialog(this, 1);
4747

48-
QCompleter *fileCompleter = new QCompleter(this);
49-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
48+
QFileSystemModel *fileModel = new QFileSystemModel(this);
5049
fileModel->setRootPath("");
51-
fileCompleter->setModel(fileModel);
52-
ui->lETLEFile->setCompleter(fileCompleter);
53-
ui->lETLESatelliteFile->setCompleter(fileCompleter);
54-
ui->lEShapeFile->setCompleter(fileCompleter);
50+
ui->lETLEFile->setCompleter(new QCompleter(fileModel, this));
51+
ui->lETLESatelliteFile->setCompleter(new QCompleter(fileModel, this));
52+
ui->lEShapeFile->setCompleter(new QCompleter(fileModel, this));
5553

5654
QAction * acTLEFileOpen = ui->lETLEFile->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);
5755
acTLEFileOpen->setToolTip(tr("Select TLE file"));

‎app/qtapp/rtkpost_qt/kmzconv.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ ConvDialog::ConvDialog(QWidget *parent)
3737

3838
viewer = new TextViewer(this);
3939

40-
QCompleter *fileCompleter = new QCompleter(this);
41-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
40+
QFileSystemModel *fileModel = new QFileSystemModel(this);
4241
fileModel->setRootPath("");
43-
fileCompleter->setModel(fileModel);
44-
ui->lEInputFile->setCompleter(fileCompleter);
45-
ui->lEOutputFile->setCompleter(fileCompleter);
46-
ui->lEGoogleEarthFile->setCompleter(fileCompleter);
42+
ui->lEInputFile->setCompleter(new QCompleter(fileModel, this));
43+
ui->lEOutputFile->setCompleter(new QCompleter(fileModel, this));
44+
ui->lEGoogleEarthFile->setCompleter(new QCompleter(fileModel, this));
4745

4846
// Google Earth file line edit actions
4947
QAction *acGoogleEarthFileSelect = ui->lEGoogleEarthFile->addAction(QIcon(":/buttons/folder"), QLineEdit::TrailingPosition);

‎app/qtapp/rtkpost_qt/postmain.cpp‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,13 @@ MainForm::MainForm(QWidget *parent)
190190
textViewer = new TextViewer(this);
191191

192192
// setup completers
193-
QCompleter *fileCompleter = new QCompleter(this);
194-
QFileSystemModel *fileModel = new QFileSystemModel(fileCompleter);
193+
QComboBox *cBinputFiles[] = {ui->cBInputFile1, ui->cBInputFile2, ui->cBInputFile3, ui->cBInputFile4, ui->cBInputFile5, ui->cBInputFile6};
194+
QFileSystemModel *fileModel = new QFileSystemModel(this);
195195
fileModel->setRootPath("");
196-
fileCompleter->setModel(fileModel);
197-
ui->cBInputFile1->setCompleter(fileCompleter);
198-
ui->cBInputFile2->setCompleter(fileCompleter);
199-
ui->cBInputFile3->setCompleter(fileCompleter);
200-
ui->cBInputFile4->setCompleter(fileCompleter);
201-
ui->cBInputFile5->setCompleter(fileCompleter);
202-
ui->cBInputFile6->setCompleter(fileCompleter);
203-
ui->cBOutputFile->setCompleter(fileCompleter);
196+
for (int i=0; i<6; i++)
197+
{
198+
cBinputFiles[i]->setCompleter(new QCompleter(fileModel, this));
199+
}
204200

205201
QCompleter *dirCompleter = new QCompleter(this);
206202
QFileSystemModel *dirModel = new QFileSystemModel(dirCompleter);

0 commit comments

Comments
 (0)