Skip to content

qt apps: avoid empty file selections #923

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
Open

qt apps: avoid empty file selections #923

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions app/qtapp/appcmn_qt/fileoptdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,12 @@ QString FileOptDialog::getPath()
//---------------------------------------------------------------------------
void FileOptDialog::filePathSelect()
{
QString filename;
if (!options)
ui->lEFilePath->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, QString(), ui->lEFilePath->text())));
filename = QFileDialog::getOpenFileName(this, QString(), ui->lEFilePath->text());
else
ui->lEFilePath->setText(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, QString(), ui->lEFilePath->text())));
filename = QFileDialog::getSaveFileName(this, QString(), ui->lEFilePath->text());
if (!filename.isEmpty()) ui->lEFilePath->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void FileOptDialog::keyDialogShow()
Expand Down
5 changes: 3 additions & 2 deletions app/qtapp/appcmn_qt/refdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ void RefDialog::accept()
//---------------------------------------------------------------------------
void RefDialog::loadStations()
{
stationPositionFile = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Load Station List..."), stationPositionFile, tr("Position File (*.pos *.snx);;All (*.*)")));

QString filename = QFileDialog::getOpenFileName(this, tr("Load Station List..."), stationPositionFile, tr("Position File (*.pos *.snx);;All (*.*)"));
if (filename.isEmpty()) return;
stationPositionFile = QDir::toNativeSeparators(filename);
loadList(stationPositionFile);
}
//---------------------------------------------------------------------------
Expand Down
11 changes: 7 additions & 4 deletions app/qtapp/appcmn_qt/viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,13 @@ void TextViewer::reloadText()
//---------------------------------------------------------------------------
void TextViewer::readSaveFile()
{
if (ui->btnReadSave->text() == tr("&Save..."))
save(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, QString(), file)));
else
read(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, QString(), file)));
if (ui->btnReadSave->text() == tr("&Save...")) {
QString filename = QFileDialog::getSaveFileName(this, QString(), file);
if (!filename.isEmpty()) save(QDir::toNativeSeparators(filename));
} else {
QString filename = QFileDialog::getOpenFileName(this, QString(), file);
if (!filename.isEmpty()) read(QDir::toNativeSeparators(filename));
}
}
//---------------------------------------------------------------------------
void TextViewer::showOptions()
Expand Down
9 changes: 6 additions & 3 deletions app/qtapp/rtknavi_qt/logstrdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,20 @@ LogStrDialog::LogStrDialog(QWidget *parent)
//---------------------------------------------------------------------------
void LogStrDialog::selectFile1()
{
ui->lEFilePath1->setText(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath1->text())));
QString filename = QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath1->text());
if (!filename.isEmpty()) ui->lEFilePath1->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void LogStrDialog::selectFile2()
{
ui->lEFilePath2->setText(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath2->text())));
QString filename = QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath2->text());
if (!filename.isEmpty()) ui->lEFilePath2->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void LogStrDialog::selectFile3()
{
ui->lEFilePath3->setText(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath3->text())));
QString filename = QFileDialog::getSaveFileName(this, tr("Open..."), ui->lEFilePath3->text());
if (!filename.isEmpty()) ui->lEFilePath3->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void LogStrDialog::showKeyDialog()
Expand Down
51 changes: 27 additions & 24 deletions app/qtapp/rtkplot_qt/plotmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,29 +670,29 @@ void Plot::dropEvent(QDropEvent *event)
void Plot::openSolution1()
{
trace(3, "openSolution1\n");

readSolution(QStringList(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Solution 1"), solutionFiles[0].value(0), tr("Solution File (*.pos *.stat *.nmea *.nma *.txt *.ubx);;All (*.*)")))), 0);
QString filename = QFileDialog::getOpenFileName(this, tr("Open Solution 1"), solutionFiles[0].value(0), tr("Solution File (*.pos *.stat *.nmea *.nma *.txt *.ubx);;All (*.*)"));
if (!filename.isEmpty()) readSolution(QStringList(QDir::toNativeSeparators(filename)), 0);
}
// callback on menu-open-solution-2 -----------------------------------------
void Plot::openSolution2()
{
trace(3, "openSolution2\n");

readSolution(QStringList(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Solution 2"), solutionFiles[1].value(0), tr("Solution File (*.pos *.stat *.nmea *.nma *.txt *.ubx);;All (*.*)")))), 1);
QString filename = QFileDialog::getOpenFileName(this, tr("Open Solution 2"), solutionFiles[1].value(0), tr("Solution File (*.pos *.stat *.nmea *.nma *.txt *.ubx);;All (*.*)"));
if (!filename.isEmpty()) readSolution(QStringList(QDir::toNativeSeparators(filename)), 1);
}
// callback on menu-open-map-image ------------------------------------------
void Plot::openMapImage()
{
trace(3, "openMapImage\n");

readMapData(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Map Image"), mapImageFile, tr("JPEG File (*.jpg *.jpeg);;All (*.*)"))));
QString filename = QFileDialog::getOpenFileName(this, tr("Open Map Image"), mapImageFile, tr("JPEG File (*.jpg *.jpeg);;All (*.*)"));
if (!filename.isEmpty()) readMapData(QDir::toNativeSeparators(filename));
}
// callback on menu-open-track-points ---------------------------------------
void Plot::openShapeFile()
{
trace(3, "openShapeFile\n");

QStringList files = QFileDialog::getOpenFileNames(this, tr("Open Shape File"), QString(), tr("Shape File (*.shp);;All (*.*)"));
if (files.isEmpty()) return;
for (int i = 0; i < files.size(); i++)
files[i] = QDir::toNativeSeparators(files.at(i));

Expand All @@ -702,35 +702,37 @@ void Plot::openShapeFile()
void Plot::openSkyImage()
{
trace(3, "openSkyImage\n");

readSkyData(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Sky Image"), skyImageFile, tr("JPEG File (*.jpg *.jpeg);;All (*.*)"))));
QString filename = QFileDialog::getOpenFileName(this, tr("Open Sky Image"), skyImageFile, tr("JPEG File (*.jpg *.jpeg);;All (*.*)"));
if (!filename.isEmpty()) readSkyData(QDir::toNativeSeparators(filename));
}
// callback on menu-oepn-waypoint -------------------------------------------
void Plot::openWaypointsFile()
{
trace(3, "openWaypointFile\n");

readWaypoints(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Waypoints"), QString(), tr("Waypoints File (*.gpx *.pos);;All (*.*)"))));
QString filename = QFileDialog::getOpenFileName(this, tr("Open Waypoints"), QString(), tr("Waypoints File (*.gpx *.pos);;All (*.*)"));
if (!filename.isEmpty()) readWaypoints(QDir::toNativeSeparators(filename));
}
// callback on menu-open-obs-data -------------------------------------------
void Plot::openObservationFile()
{
trace(3, "openObservationFile\n");
readObservation(QFileDialog::getOpenFileNames(this, tr("Open Obs/Nav Data"), observationFiles.value(0), tr("RINEX OBS (*.obs *.*o *.*O *.*d *.O.rnx *O.rnx *O.rnx.gz *O.crx *O.crx.gz *.*o.gz *.*o.Z *.d.gz *.d.Z);;All (*.*)")));
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open Obs/Nav Data"), observationFiles.value(0), tr("RINEX OBS (*.obs *.*o *.*O *.*d *.O.rnx *O.rnx *O.rnx.gz *O.crx *O.crx.gz *.*o.gz *.*o.Z *.d.gz *.d.Z);;All (*.*)"));
if (!files.isEmpty()) readObservation(files);
}
// callback on menu-open-nav-data -------------------------------------------
void Plot::openNavigationFile()
{
trace(3, "openNavigationFile\n");

readNavigation(QFileDialog::getOpenFileNames(this, tr("Open Raw Obs/Nav Messages"), navigationFiles.value(0), tr("RINEX NAV (*.nav *.gnav *.hnav *.qnav *.*n *.*g *.*h *.*q *.*p *N.rnx *N.rnx.gz);;All (*.*)")));
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open Raw Obs/Nav Messages"), navigationFiles.value(0), tr("RINEX NAV (*.nav *.gnav *.hnav *.qnav *.*n *.*g *.*h *.*q *.*p *N.rnx *N.rnx.gz);;All (*.*)"));
if (!files.isEmpty()) readNavigation(files);
}
// callback on menu-open-elev-mask ------------------------------------------
void Plot::openElevationMaskFile()
{
trace(3, "openElevationMaskFile\n");

readElevationMaskData(QDir::toNativeSeparators(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Elevation Mask"), QString(), tr("Text File (*.txt);;All (*.*)")))));
QString filename = QFileDialog::getOpenFileName(this, tr("Open Elevation Mask"), QString(), tr("Text File (*.txt);;All (*.*)"));
if (!filename.isEmpty()) readElevationMaskData(QDir::toNativeSeparators(filename));
}
// callback on menu-vis-analysis --------------------------------------------
void Plot::visibilityAnalysis()
Expand Down Expand Up @@ -776,35 +778,36 @@ void Plot::visibilityAnalysis()
void Plot::savePlotImage()
{
trace(3, "savePlotImage\n");
buffer.save(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Save Image"), QString(), tr("JPEG (*.jpg);;Windows Bitmap (*.bmp)"))));
QString filename = QFileDialog::getSaveFileName(this, tr("Save Image"), QString(), tr("JPEG (*.jpg);;Windows Bitmap (*.bmp)"));
if (!filename.isEmpty()) buffer.save(QDir::toNativeSeparators(filename));
}
// callback on menu-save-waypoint -------------------------------------------
void Plot::saveWaypointsFile()
{
trace(3, "saveWaypointsFile\n");

saveWaypoints(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Save Waypoints"), QString(), tr("GPX File (*.gpx *.pos);;All (*.*)"))));
QString filename = QFileDialog::getSaveFileName(this, tr("Save Waypoints"), QString(), tr("GPX File (*.gpx *.pos);;All (*.*)"));
if (!filename.isEmpty()) saveWaypoints(QDir::toNativeSeparators(filename));
}
// callback on menu-save-# of sats/dop --------------------------------------
void Plot::saveDopFile()
{
trace(3, "saveDopFile\n");

saveDop(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Save Data"), QString(), tr("All (*.*);;Text File (*.txt)"))));
QString filename = QFileDialog::getSaveFileName(this, tr("Save Data"), QString(), tr("All (*.*);;Text File (*.txt)"));
if (!filename.isEmpty()) saveDop(QDir::toNativeSeparators(filename));
}
// callback on menu-save-snr,azel -------------------------------------------
void Plot::saveSnrMpFile()
{
trace(3, "saveSnrMpFile\n");

saveSnrMp(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Save Data"), QString(), tr("All (*.*);;Text File (*.txt)"))));
QString filename = QFileDialog::getSaveFileName(this, tr("Save Data"), QString(), tr("All (*.*);;Text File (*.txt)"));
if (!filename.isEmpty()) saveSnrMp(QDir::toNativeSeparators(filename));
}
// callback on menu-save-elmask ---------------------------------------------
void Plot::saveElevationMaskFile()
{
trace(3, "saveElevationMaskFile\n");

saveElevationMask(QDir::toNativeSeparators(QFileDialog::getSaveFileName(this, tr("Save Data"), QString(), tr("All (*.*);;Text File (*.txt)"))));
QString filename = QFileDialog::getSaveFileName(this, tr("Save Data"), QString(), tr("All (*.*);;Text File (*.txt)"));
if (!filename.isEmpty()) saveElevationMask(QDir::toNativeSeparators(filename));
}
// callback on menu-connection-settings -------------------------------------
void Plot::showConnectionSettingsDialog()
Expand Down
9 changes: 6 additions & 3 deletions app/qtapp/rtkplot_qt/plotopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,20 @@ void PlotOptDialog::fontSelect()
//---------------------------------------------------------------------------
void PlotOptDialog::shapeFileOpen()
{
ui->lEShapeFile->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open"), ui->lEShapeFile->text())));
QString filename = QFileDialog::getOpenFileName(this, tr("Open"), ui->lEShapeFile->text());
if (!filename.isEmpty()) ui->lEShapeFile->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void PlotOptDialog::tleFileOpen()
{
ui->lETLEFile->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open"), ui->lETLEFile->text(), tr("Text Files (*.txt);;Position Files (*.pos *.snx);;All (*.*)"))));
QString filename = QFileDialog::getOpenFileName(this, tr("Open"), ui->lETLEFile->text(), tr("Text Files (*.txt);;Position Files (*.pos *.snx);;All (*.*)"));
if (!filename.isEmpty()) ui->lETLEFile->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void PlotOptDialog::tleSatelliteFileOpen()
{
ui->lETLESatelliteFile->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open"), ui->lETLESatelliteFile->text(), tr("Text Files (*.txt);;Position Files (*.pos *.snx);;All (*.*)"))));
QString filename = QFileDialog::getOpenFileName(this, tr("Open"), ui->lETLESatelliteFile->text(), tr("Text Files (*.txt);;Position Files (*.pos *.snx);;All (*.*)"));
if (!filename.isEmpty()) ui->lETLESatelliteFile->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void PlotOptDialog::referencePositionSelect()
Expand Down
5 changes: 3 additions & 2 deletions app/qtapp/rtkplot_qt/skydlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ void SkyImgDialog::updateSkyEnabled()
//---------------------------------------------------------------------------
void SkyImgDialog::loadSkyImageTag()
{
readSkyTag(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Tag"), plot->getSkyImageFileName(), tr("Tag File (*.tag);;All (*.*)"))));

QString filename = QFileDialog::getOpenFileName(this, tr("Open Tag"), plot->getSkyImageFileName(), tr("Tag File (*.tag);;All (*.*)"));
if (filename.isEmpty()) return;
readSkyTag(QDir::toNativeSeparators(filename));
updateSky();
}
//---------------------------------------------------------------------------
Expand Down
7 changes: 5 additions & 2 deletions app/qtapp/rtkpost_qt/kmzconv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ void ConvDialog::setInput(const QString &filename)
//---------------------------------------------------------------------------
void ConvDialog::selectInputFile()
{
ui->lEInputFile->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open..."), ui->lEInputFile->text(), tr("All (*.*)"))));
QString filename = QFileDialog::getOpenFileName(this, tr("Open..."), ui->lEInputFile->text(), tr("All (*.*)"));
if (filename.isEmpty()) return;
ui->lEInputFile->setText(QDir::toNativeSeparators(filename));
updateOutputFile();
}
//---------------------------------------------------------------------------
Expand Down Expand Up @@ -232,7 +234,8 @@ void ConvDialog::updateOutputFile()
//---------------------------------------------------------------------------
void ConvDialog::selectGoogleEarthFile()
{
ui->lEGoogleEarthFile->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Google Earth Exe File"), ui->lEGoogleEarthFile->text())));
QString filename = QFileDialog::getOpenFileName(this, tr("Google Earth Exe File"), ui->lEGoogleEarthFile->text());
if (!filename.isEmpty()) ui->lEGoogleEarthFile->setText(QDir::toNativeSeparators(filename));
}
//---------------------------------------------------------------------------
void ConvDialog::callGoogleEarth()
Expand Down
Loading