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

Found a place where the unified file loading code wasn't being used.

Browse Source 
This has been fixed.
This commit is contained in:
Collin Kidder
2016-01-30 21:05:30 -05:00
parent 48db19213b
commit 43c03110f6
1 changed files with 21 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameplaybackwindow.cpp
+21 -45
View File
@@ -342,57 +342,33 @@ void FramePlaybackWindow::btnDeleteCurrSeq()
void FramePlaybackWindow::btnLoadFile() void FramePlaybackWindow::btnLoadFile()
{ {
QString filename; QString filename;
QFileDialog dialog(this);
bool result = false;
SequenceItem item; SequenceItem item;
QStringList filters; if (FrameFileIO::loadFrameFile(filename, &item.data))
filters.append(QString(tr("CRTD Logs (*.txt)")));
filters.append(QString(tr("GVRET Logs (*.csv)")));
filters.append(QString(tr("Generic ID/Data CSV (*.csv)")));
filters.append(QString(tr("BusMaster Log (*.log)")));
filters.append(QString(tr("Microchip Log (*.log)")));
dialog.setFileMode(QFileDialog::ExistingFile);
dialog.setNameFilters(filters);
dialog.setViewMode(QFileDialog::Detail);
if (dialog.exec() == QDialog::Accepted)
{ {
filename = dialog.selectedFiles()[0]; QStringList fileList = filename.split('/');
item.filename = fileList[fileList.length() - 1];
if (dialog.selectedNameFilter() == filters[0]) result = FrameFileIO::loadCRTDFile(filename, &item.data); item.currentLoopCount = 0;
if (dialog.selectedNameFilter() == filters[1]) result = FrameFileIO::loadNativeCSVFile(filename, &item.data); item.maxLoops = 1;
if (dialog.selectedNameFilter() == filters[2]) result = FrameFileIO::loadGenericCSVFile(filename, &item.data); fillIDHash(item);
if (dialog.selectedNameFilter() == filters[3]) result = FrameFileIO::loadLogFile(filename, &item.data); if (ui->tblSequence->currentRow() == -1)
if (dialog.selectedNameFilter() == filters[4]) result = FrameFileIO::loadMicrochipFile(filename, &item.data);
if (result)
{ {
QStringList fileList = filename.split('/'); ui->tblSequence->setCurrentCell(0,0);
item.filename = fileList[fileList.length() - 1];
item.currentLoopCount = 0;
item.maxLoops = 1;
fillIDHash(item);
if (ui->tblSequence->currentRow() == -1)
{
ui->tblSequence->setCurrentCell(0,0);
}
seqItems.append(item);
int row = ui->tblSequence->rowCount();
ui->tblSequence->insertRow(row);
ui->tblSequence->setItem(row, 0, new QTableWidgetItem(item.filename));
ui->tblSequence->setItem(row, 1, new QTableWidgetItem(QString::number(item.maxLoops)));
qDebug() << currentSeqNum;
if (currentSeqNum == -1)
{
currentSeqNum = 0;
currentSeqItem = &seqItems[0];
}
refreshIDList();
updateFrameLabel();
} }
seqItems.append(item);
int row = ui->tblSequence->rowCount();
ui->tblSequence->insertRow(row);
ui->tblSequence->setItem(row, 0, new QTableWidgetItem(item.filename));
ui->tblSequence->setItem(row, 1, new QTableWidgetItem(QString::number(item.maxLoops)));
qDebug() << currentSeqNum;
if (currentSeqNum == -1)
{
currentSeqNum = 0;
currentSeqItem = &seqItems[0];
}
refreshIDList();
updateFrameLabel();
} }
} }
void FramePlaybackWindow::btnLoadLive() void FramePlaybackWindow::btnLoadLive()