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

Change formatting of CANAnalyzer ASC saving to hopefully better match

Browse Source 
the "Real" program's output
This commit is contained in:
Collin Kidder
2019-03-17 18:30:10 -04:00
parent 2e5de7a37d
commit 6a9bd48442
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+12 -2
View File
@@ -708,6 +708,11 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector<CANFrame>* fr
{ {
QFile *outFile = new QFile(filename); QFile *outFile = new QFile(filename);
int lineCounter = 0; int lineCounter = 0;
uint64_t offsetTime = frames->at(0).timestamp;
for (int c = 0; c < frames->count(); c++)
{
if (frames->at(c).timestamp < offsetTime) offsetTime = frames->at(c).timestamp;
}
if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text)) if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
{ {
@@ -717,7 +722,12 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector<CANFrame>* fr
QDateTime now; QDateTime now;
now = QDateTime::currentDateTime(); now = QDateTime::currentDateTime();
outFile->write("date " + now.toString("MMM-dd HH:mm:ss.zzz").toUtf8()); if (offsetTime > 10000000000) //chances are the input file had times as system time so load it
{
now.setMSecsSinceEpoch(offsetTime / 1000); //offsetTime was in microseconds
}
outFile->write("date " + now.toString("ddd MMM dd h:mm:ss.zzz a yyyy").toUtf8());
outFile->write("\nbase hex timestamps absolute\n"); outFile->write("\nbase hex timestamps absolute\n");
outFile->write("no internal event logging\n"); outFile->write("no internal event logging\n");
outFile->write("// version 11.0.0\n"); outFile->write("// version 11.0.0\n");
@@ -731,7 +741,7 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector<CANFrame>* fr
lineCounter = 0; lineCounter = 0;
} }
outFile->write(QString::number(frames->at(c).timestamp / 1000000.0, 'f', 6).toUtf8()); outFile->write(QString::number((frames->at(c).timestamp - offsetTime) / 1000000.0, 'f', 5).toUtf8());
outFile->putChar(' '); outFile->putChar(' ');
outFile->write(QString::number(frames->at(c).bus).toUtf8()); outFile->write(QString::number(frames->at(c).bus).toUtf8());
outFile->write(" "); outFile->write(" ");