Commit 2b8196b1 authored by dogmaphobic's avatar dogmaphobic

Adding and/or fixing even more captions.

parent 81b4fd3a
...@@ -100,13 +100,17 @@ void QGCDataPlot2D::loadFile() ...@@ -100,13 +100,17 @@ void QGCDataPlot2D::loadFile()
void QGCDataPlot2D::loadFile(QString file) void QGCDataPlot2D::loadFile(QString file)
{ {
// TODO This "filename" is a private/protected member variable. It should be named in such way
// it indicates so. This same name is used in several places within this file in local scopes.
fileName = file; fileName = file;
if (QFileInfo(fileName).isReadable()) { QFileInfo fi(fileName);
if (fileName.contains(".raw") || fileName.contains(".imu")) { if (fi.isReadable()) {
if (fi.suffix() == QString("raw") || fi.suffix() == QString("imu")) {
loadRawLog(fileName); loadRawLog(fileName);
} else if (fileName.contains(".txt") || fileName.contains(".csv") || fileName.contains(".csv")) { } else if (fi.suffix() == QString("txt") || fi.suffix() == QString("csv")) {
loadCsvLog(fileName); loadCsvLog(fileName);
} }
// TODO Else, tell the user it doesn't know what to do with the file...
} }
} }
...@@ -116,7 +120,7 @@ void QGCDataPlot2D::loadFile(QString file) ...@@ -116,7 +120,7 @@ void QGCDataPlot2D::loadFile(QString file)
QString QGCDataPlot2D::getSavePlotFilename() QString QGCDataPlot2D::getSavePlotFilename()
{ {
QString fileName = QGCFileDialog::getSaveFileName( QString fileName = QGCFileDialog::getSaveFileName(
this, "Export Plot File", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), this, "Save Plot File", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
"PDF Documents (*.pdf);;SVG Images (*.svg)", "PDF Documents (*.pdf);;SVG Images (*.svg)",
"pdf"); "pdf");
return fileName; return fileName;
...@@ -691,7 +695,7 @@ bool QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, dou ...@@ -691,7 +695,7 @@ bool QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, dou
void QGCDataPlot2D::saveCsvLog() void QGCDataPlot2D::saveCsvLog()
{ {
QString fileName = QGCFileDialog::getSaveFileName( QString fileName = QGCFileDialog::getSaveFileName(
this, "Export CSV File Name", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), this, "Save CSV Log File", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
"CSV file (*.csv);;Text file (*.txt)", "CSV file (*.csv);;Text file (*.txt)",
"csv"); "csv");
......
...@@ -573,7 +573,7 @@ void QGCToolWidget::exportWidget() ...@@ -573,7 +573,7 @@ void QGCToolWidget::exportWidget()
{ {
const QString widgetFileExtension(".qgw"); const QString widgetFileExtension(".qgw");
QString fileName = QGCFileDialog::getSaveFileName( QString fileName = QGCFileDialog::getSaveFileName(
this, tr("Specify Widget File Name"), this, tr("Save Widget File"),
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
tr("QGroundControl Widget (*%1)").arg(widgetFileExtension), tr("QGroundControl Widget (*%1)").arg(widgetFileExtension),
"qgw"); "qgw");
...@@ -589,7 +589,7 @@ void QGCToolWidget::exportWidget() ...@@ -589,7 +589,7 @@ void QGCToolWidget::exportWidget()
void QGCToolWidget::importWidget() void QGCToolWidget::importWidget()
{ {
const QString widgetFileExtension(".qgw"); const QString widgetFileExtension(".qgw");
QString fileName = QGCFileDialog::getOpenFileName(this, tr("Specify File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1)").arg(widgetFileExtension)); QString fileName = QGCFileDialog::getOpenFileName(this, tr("Load Widget File"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1)").arg(widgetFileExtension));
loadSettings(fileName); loadSettings(fileName);
} }
......
...@@ -434,7 +434,7 @@ void LinechartWidget::refresh() ...@@ -434,7 +434,7 @@ void LinechartWidget::refresh()
QString LinechartWidget::getLogSaveFilename() QString LinechartWidget::getLogSaveFilename()
{ {
QString fileName = QGCFileDialog::getSaveFileName(this, QString fileName = QGCFileDialog::getSaveFileName(this,
tr("Specify Log File Name"), tr("Save Log File"),
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
tr("Log file (*.log)"), tr("Log file (*.log)"),
"log"); "log");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment