t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all the references to using non-native save windows. It didn't fix linux and it broke Windows and linux. SO, yeah, this is reverting that.

Browse Source 
Also, 0 out data bytes that aren't used for the native format. The native format always shows 8 data bytes even if the frame didn't have that many. That way programs like Excel will still have data in all of the positions.
This commit is contained in:
Collin Kidder
2015-07-27 21:15:46 -04:00
parent 0e0dada271
commit b8bd058f40
5 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flowviewwindow.cpp
-2
View File
@@ -176,7 +176,6 @@ void FlowViewWindow::saveFileGraph()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
@@ -201,7 +200,6 @@ void FlowViewWindow::saveFileFlow()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
framefileio.cpp
+4 -1
View File
@@ -226,7 +226,10 @@ bool FrameFileIO::saveNativeCSVFile(QString filename, const QVector<CANFrame>* f
for (int temp = 0; temp < 8; temp++)
{
outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8());
if (temp < frames->at(c).len)
outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8());
else
outFile->write("00");
outFile->putChar(44);
}
frameplaybackwindow.cpp
-1
View File
@@ -148,7 +148,6 @@ void FramePlaybackWindow::saveFilters()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
graphingwindow.cpp
-2
View File
@@ -345,7 +345,6 @@ void GraphingWindow::saveGraphs()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
@@ -369,7 +368,6 @@ void GraphingWindow::saveDefinitions()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
mainwindow.cpp
-5
View File
@@ -479,7 +479,6 @@ void MainWindow::handleSaveFile()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
@@ -531,7 +530,6 @@ void MainWindow::handleSaveFilteredFile()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
@@ -564,7 +562,6 @@ void MainWindow::handleSaveFilters()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
@@ -628,7 +625,6 @@ void MainWindow::handleSaveDBC()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{
@@ -652,7 +648,6 @@ void MainWindow::handleSaveDecoded()
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setOption(QFileDialog::DontUseNativeDialog);
if (dialog.exec() == QDialog::Accepted)
{