Fix to add proper file extension when saving even if OS does not automatically add it for us.

This commit is contained in:
Collin Kidder
2015-08-12 20:49:31 -04:00
parent 07de662532
commit c4c0079675
6 changed files with 77 additions and 14 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef CONFIG #ifndef CONFIG
#define CONFIG #define CONFIG
#define VERSION 131 #define VERSION 132
//try to keep this in sync. //try to keep this in sync.
//SavvyCAN will complain if you connect a GVRET board with a revision //SavvyCAN will complain if you connect a GVRET board with a revision
+1
View File
@@ -322,6 +322,7 @@ void FileComparatorWindow::saveDetails()
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (!filename.contains('.')) filename += ".txt";
QFile *outFile = new QFile(filename); QFile *outFile = new QFile(filename);
if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
+25 -5
View File
@@ -181,9 +181,21 @@ void FlowViewWindow::saveFileGraph()
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (dialog.selectedNameFilter() == filters[0]) ui->graphView->savePdf(filename, true, 0, 0); if (dialog.selectedNameFilter() == filters[0])
if (dialog.selectedNameFilter() == filters[1]) ui->graphView->savePng(filename, 1024, 768); {
if (dialog.selectedNameFilter() == filters[2]) ui->graphView->saveJpg(filename, 1024, 768); if (!filename.contains('.')) filename += ".pdf";
ui->graphView->savePdf(filename, true, 0, 0);
}
if (dialog.selectedNameFilter() == filters[1])
{
if (!filename.contains('.')) filename += ".png";
ui->graphView->savePng(filename, 1024, 768);
}
if (dialog.selectedNameFilter() == filters[2])
{
if (!filename.contains('.')) filename += ".jpg";
ui->graphView->saveJpg(filename, 1024, 768);
}
} }
} }
@@ -205,8 +217,16 @@ void FlowViewWindow::saveFileFlow()
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (dialog.selectedNameFilter() == filters[0]) ui->flowView->saveImage(filename, 1024, 768); if (dialog.selectedNameFilter() == filters[0])
if (dialog.selectedNameFilter() == filters[1]) ui->flowView->saveImage(filename, 1024, 768); {
if (!filename.contains('.')) filename += ".png";
ui->flowView->saveImage(filename, 1024, 768);
}
if (dialog.selectedNameFilter() == filters[1])
{
if (!filename.contains('.')) filename += ".jpg";
ui->flowView->saveImage(filename, 1024, 768);
}
} }
} }
+1
View File
@@ -153,6 +153,7 @@ void FramePlaybackWindow::saveFilters()
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (!filename.contains('.')) filename += ".ftl";
if (dialog.selectedNameFilter() == filters[0]) if (dialog.selectedNameFilter() == filters[0])
{ {
QFile *outFile = new QFile(filename); QFile *outFile = new QFile(filename);
+16 -3
View File
@@ -365,9 +365,21 @@ void GraphingWindow::saveGraphs()
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (dialog.selectedNameFilter() == filters[0]) ui->graphingView->savePdf(filename, true, 0, 0); if (dialog.selectedNameFilter() == filters[0])
if (dialog.selectedNameFilter() == filters[1]) ui->graphingView->savePng(filename, 0, 0); {
if (dialog.selectedNameFilter() == filters[2]) ui->graphingView->saveJpg(filename, 0, 0); if (!filename.contains('.')) filename += ".pdf";
ui->graphingView->savePdf(filename, true, 0, 0);
}
if (dialog.selectedNameFilter() == filters[1])
{
if (!filename.contains('.')) filename += ".png";
ui->graphingView->savePng(filename, 0, 0);
}
if (dialog.selectedNameFilter() == filters[2])
{
if (!filename.contains('.')) filename += ".jpg";
ui->graphingView->saveJpg(filename, 0, 0);
}
} }
} }
@@ -387,6 +399,7 @@ void GraphingWindow::saveDefinitions()
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (!filename.contains('.')) filename += ".gdf";
QFile *outFile = new QFile(filename); QFile *outFile = new QFile(filename);
+33 -5
View File
@@ -512,22 +512,27 @@ void MainWindow::handleSaveFile()
if (dialog.selectedNameFilter() == filters[0]) if (dialog.selectedNameFilter() == filters[0])
{ {
if (!filename.contains('.')) filename += ".txt";
result = FrameFileIO::saveCRTDFile(filename, frames); result = FrameFileIO::saveCRTDFile(filename, frames);
} }
if (dialog.selectedNameFilter() == filters[1]) if (dialog.selectedNameFilter() == filters[1])
{ {
if (!filename.contains('.')) filename += ".csv";
result = FrameFileIO::saveNativeCSVFile(filename, frames); result = FrameFileIO::saveNativeCSVFile(filename, frames);
} }
if (dialog.selectedNameFilter() == filters[2]) if (dialog.selectedNameFilter() == filters[2])
{ {
if (!filename.contains('.')) filename += ".csv";
result = FrameFileIO::saveGenericCSVFile(filename, frames); result = FrameFileIO::saveGenericCSVFile(filename, frames);
} }
if (dialog.selectedNameFilter() == filters[3]) if (dialog.selectedNameFilter() == filters[3])
{ {
if (!filename.contains('.')) filename += ".log";
result = FrameFileIO::saveLogFile(filename, frames); result = FrameFileIO::saveLogFile(filename, frames);
} }
if (dialog.selectedNameFilter() == filters[4]) if (dialog.selectedNameFilter() == filters[4])
{ {
if (!filename.contains('.')) filename += ".log";
result = FrameFileIO::saveMicrochipFile(filename, frames); result = FrameFileIO::saveMicrochipFile(filename, frames);
} }
@@ -575,11 +580,31 @@ void MainWindow::handleSaveFilteredFile()
qApp->processEvents(); qApp->processEvents();
if (dialog.selectedNameFilter() == filters[0]) result = FrameFileIO::saveCRTDFile(filename, frames); if (dialog.selectedNameFilter() == filters[0])
if (dialog.selectedNameFilter() == filters[1]) result = FrameFileIO::saveNativeCSVFile(filename, frames); {
if (dialog.selectedNameFilter() == filters[2]) result = FrameFileIO::saveGenericCSVFile(filename, frames); if (!filename.contains('.')) filename += ".txt";
if (dialog.selectedNameFilter() == filters[3]) result = FrameFileIO::saveLogFile(filename, frames); result = FrameFileIO::saveCRTDFile(filename, frames);
if (dialog.selectedNameFilter() == filters[4]) result = FrameFileIO::saveMicrochipFile(filename, frames); }
if (dialog.selectedNameFilter() == filters[1])
{
if (!filename.contains('.')) filename += ".csv";
result = FrameFileIO::saveNativeCSVFile(filename, frames);
}
if (dialog.selectedNameFilter() == filters[2])
{
if (!filename.contains('.')) filename += ".csv";
result = FrameFileIO::saveGenericCSVFile(filename, frames);
}
if (dialog.selectedNameFilter() == filters[3])
{
if (!filename.contains('.')) filename += ".log";
result = FrameFileIO::saveLogFile(filename, frames);
}
if (dialog.selectedNameFilter() == filters[4])
{
if (!filename.contains('.')) filename += ".log";
result = FrameFileIO::saveMicrochipFile(filename, frames);
}
progress.cancel(); progress.cancel();
@@ -609,6 +634,7 @@ void MainWindow::handleSaveFilters()
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (!filename.contains('.')) filename += ".ftl";
if (dialog.selectedNameFilter() == filters[0]) model->saveFilterFile(filename); if (dialog.selectedNameFilter() == filters[0]) model->saveFilterFile(filename);
} }
} }
@@ -672,6 +698,7 @@ void MainWindow::handleSaveDBC()
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (!filename.contains('.')) filename += ".dbc";
dbcHandler->saveDBCFile(filename); dbcHandler->saveDBCFile(filename);
QStringList fileList = filename.split('/'); QStringList fileList = filename.split('/');
lbStatusDatabase.setText(fileList[fileList.length() - 1] + tr(" loaded.")); lbStatusDatabase.setText(fileList[fileList.length() - 1] + tr(" loaded."));
@@ -695,6 +722,7 @@ void MainWindow::handleSaveDecoded()
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
{ {
filename = dialog.selectedFiles()[0]; filename = dialog.selectedFiles()[0];
if (!filename.contains('.')) filename += ".txt";
saveDecodedTextFile(filename); saveDecodedTextFile(filename);
} }
} }