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

Fixes to CANAlyzer ASC format when saving. Hopefully perfectly matches

Browse Source 
now
This commit is contained in:
Collin Kidder
2019-03-20 19:55:54 -04:00
parent 15460f70e3
commit e013b91af3
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+12 -6
View File
@@ -811,9 +811,15 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector<CANFrame>* fr
lineCounter = 0; lineCounter = 0;
} }
outFile->write(QString::number((frames->at(c).timestamp - offsetTime) / 1000000.0, 'f', 5).toUtf8()); uint64_t timeStamp = (frames->at(c).timestamp - offsetTime) / 1000000ull;
int tsLen = QString::number(timeStamp).length();
int precision = 6;
//vector seems to keep 10 bytes at the start of the line for the timestamp. It should never exceed this
//and there should never be a precision over 6 digits after the decimal
if (tsLen > 3) precision = 9 - tsLen;
outFile->write(QString::number((frames->at(c).timestamp - offsetTime) / 1000000.0, 'f', precision).rightJustified(10, ' ').toUtf8());
outFile->putChar(' '); outFile->putChar(' ');
outFile->write(QString::number(frames->at(c).bus).toUtf8()); outFile->write(QString::number(frames->at(c).bus + 1).toUtf8());
outFile->write(" "); outFile->write(" ");
if (frames->at(c).extended) if (frames->at(c).extended)
outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8());
@@ -824,16 +830,16 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector<CANFrame>* fr
} }
outFile->write(" "); outFile->write(" ");
if (frames->at(c).isReceived) outFile->write("Rx d "); if (frames->at(c).isReceived) outFile->write("Rx D ");
else outFile->write("Tx d "); else outFile->write("Tx D ");
outFile->write(QString::number(frames->at(c).len).toUtf8()); outFile->write(QString::number(frames->at(c).len).toUtf8());
outFile->putChar(' '); outFile->write(" ");
for (unsigned int temp = 0; temp < frames->at(c).len; temp++) for (unsigned int temp = 0; temp < frames->at(c).len; temp++)
{ {
outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8()); outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8());
outFile->putChar(' '); outFile->write(" ");
} }
outFile->write("\n"); outFile->write("\n");