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

fix bug when Msg ID is not set in DBC Editing Window

Browse Source
This commit is contained in:
canpadawan
2016-05-31 14:50:50 +02:00
parent 77031f1310
commit 90a0fb401b
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbcmaineditor.cpp
+13 -10
View File
@@ -382,16 +382,19 @@ void DBCMainEditor::onCellClickedMessage(int row, int col)
{ {
if (col == 3) //3 is the signals field. If clicked we go to the signals dialog if (col == 3) //3 is the signals field. If clicked we go to the signals dialog
{ {
QString idString = ui->MessagesTable->item(row, 0)->text(); QTableWidgetItem* msg = ui->MessagesTable->item(row, 0);
DBC_MESSAGE *message = dbcFile->messageHandler->findMsgByID(Utility::ParseStringToNum(idString)); if(msg) {
sigEditor->setMessageRef(message); QString idString = msg->text();
sigEditor->setFileIdx(fileIdx); DBC_MESSAGE *message = dbcFile->messageHandler->findMsgByID(Utility::ParseStringToNum(idString));
sigEditor->exec(); //blocks this window from being active until we're done sigEditor->setMessageRef(message);
//now update the displayed # of signals sigEditor->setFileIdx(fileIdx);
inhibitCellChanged = true; sigEditor->exec(); //blocks this window from being active until we're done
QTableWidgetItem *replacement = new QTableWidgetItem(QString::number(message->sigHandler->getCount())); //now update the displayed # of signals
ui->MessagesTable->setItem(row, col, replacement); inhibitCellChanged = true;
inhibitCellChanged = false; QTableWidgetItem *replacement = new QTableWidgetItem(QString::number(message->sigHandler->getCount()));
ui->MessagesTable->setItem(row, col, replacement);
inhibitCellChanged = false;
}
} }
} }