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.
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:
@@ -176,7 +176,6 @@ void FlowViewWindow::saveFileGraph()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@@ -201,7 +200,6 @@ void FlowViewWindow::saveFileFlow()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -226,7 +226,10 @@ bool FrameFileIO::saveNativeCSVFile(QString filename, const QVector<CANFrame>* f
|
|||||||
|
|
||||||
for (int temp = 0; temp < 8; temp++)
|
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);
|
outFile->putChar(44);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -148,7 +148,6 @@ void FramePlaybackWindow::saveFilters()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -345,7 +345,6 @@ void GraphingWindow::saveGraphs()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@@ -369,7 +368,6 @@ void GraphingWindow::saveDefinitions()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -479,7 +479,6 @@ void MainWindow::handleSaveFile()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@@ -531,7 +530,6 @@ void MainWindow::handleSaveFilteredFile()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@@ -564,7 +562,6 @@ void MainWindow::handleSaveFilters()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@@ -628,7 +625,6 @@ void MainWindow::handleSaveDBC()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@@ -652,7 +648,6 @@ void MainWindow::handleSaveDecoded()
|
|||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
dialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
dialog.setOption(QFileDialog::DontUseNativeDialog);
|
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user