Moved lawicel autodetector down the list as it is a bit overly generic
and falsely loaded some files it shouldn't.
This commit is contained in:
+10
-10
@@ -369,16 +369,6 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector<CANFrame>* frames
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "Attempting lawicel";
|
|
||||||
if (isLawicelFile(filename))
|
|
||||||
{
|
|
||||||
if (loadLawicelFile(filename, frames))
|
|
||||||
{
|
|
||||||
qDebug() << "Loaded as lawicel successfully!";
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
qDebug() << "Attempting 'CARBUS Analyzer'";
|
qDebug() << "Attempting 'CARBUS Analyzer'";
|
||||||
if (isCARBUSAnalyzerFile(filename))
|
if (isCARBUSAnalyzerFile(filename))
|
||||||
{
|
{
|
||||||
@@ -494,6 +484,16 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector<CANFrame>* frames
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qDebug() << "Attempting lawicel";
|
||||||
|
if (isLawicelFile(filename))
|
||||||
|
{
|
||||||
|
if (loadLawicelFile(filename, frames))
|
||||||
|
{
|
||||||
|
qDebug() << "Loaded as lawicel successfully!";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
qDebug() << "Attempting generic CSV";
|
qDebug() << "Attempting generic CSV";
|
||||||
if (isGenericCSVFile(filename))
|
if (isGenericCSVFile(filename))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user