Sort messages and signals alphabetically to make it easier to find them. Also fixed a bug that would not allow signals to be found if not in the first loaded DBC file.
This commit is contained in:
@@ -225,21 +225,19 @@ void NewGraphDialog::loadMessages()
|
|||||||
if (assocSignal && msg->name == assocSignal->parentMessage->name)
|
if (assocSignal && msg->name == assocSignal->parentMessage->name)
|
||||||
{
|
{
|
||||||
ui->cbMessages->setCurrentIndex(ui->cbMessages->count() -1);
|
ui->cbMessages->setCurrentIndex(ui->cbMessages->count() -1);
|
||||||
qDebug() << "Found my parent";
|
//qDebug() << "Found my parent";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ui->cbMessages->model()->sort(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void NewGraphDialog::loadSignals(int idx)
|
void NewGraphDialog::loadSignals(int idx)
|
||||||
{
|
{
|
||||||
Q_UNUSED(idx);
|
Q_UNUSED(idx);
|
||||||
//messages were placed into the list in the same order as they exist
|
//search through all DBC files in order to try to find a message with the given name
|
||||||
//in the data structure so it should have been possible to just
|
DBC_MESSAGE *msg = dbcHandler->findMessage(ui->cbMessages->currentText());
|
||||||
//look it up based on index but by name is probably safer and this operation
|
|
||||||
//is not time critical at all.
|
|
||||||
DBC_MESSAGE *msg = dbcHandler->getFileByIdx(0)->messageHandler->findMsgByName(ui->cbMessages->currentText());
|
|
||||||
DBC_SIGNAL *sig;
|
DBC_SIGNAL *sig;
|
||||||
|
|
||||||
if (msg == NULL) return;
|
if (msg == NULL) return;
|
||||||
@@ -254,10 +252,11 @@ void NewGraphDialog::loadSignals(int idx)
|
|||||||
if (assocSignal && sig->name == assocSignal->name)
|
if (assocSignal && sig->name == assocSignal->name)
|
||||||
{
|
{
|
||||||
ui->cbSignals->setCurrentIndex(ui->cbSignals->count() - 1);
|
ui->cbSignals->setCurrentIndex(ui->cbSignals->count() - 1);
|
||||||
qDebug() << "Found me";
|
//qDebug() << "Found me";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ui->cbSignals->model()->sort(0);
|
||||||
checkSignalAgreement();
|
checkSignalAgreement();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user