Skip to content

Commit de83dc6

Browse files
collin80collin80
committed
Fix for DBC editor bugs that crept in during conversion to qt6
1 parent d710753 commit de83dc6

9 files changed

+77
-22
lines changed

‎dbc/dbchandler.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,18 @@ bool DBCMessageHandler::addMessage(DBC_MESSAGE *msg)
173173
return true;
174174
}
175175

176+
bool DBCMessageHandler::changeMessageID(DBC_MESSAGE *msg, quint32 oldID)
177+
{
178+
//remove existing entry, add new entry with proper ID mapping
179+
if (messages.contains(oldID))
180+
{
181+
messages.insert(msg->ID, msg);
182+
messages.remove(oldID);
183+
return true;
184+
}
185+
return false;
186+
}
187+
176188
bool DBCMessageHandler::removeMessage(uint32_t ID)
177189
{
178190
if (messages.count() == 0) return false;

‎dbc/dbchandler.h

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class DBCMessageHandler: public QObject
4242
QList<DBC_MESSAGE*> findMsgsByNode(DBC_NODE *node);
4343
QList<DBC_MESSAGE*> getMsgsAsList();
4444
bool addMessage(DBC_MESSAGE *msg);
45+
bool changeMessageID(DBC_MESSAGE *msg, quint32 oldID);
4546
bool removeMessage(uint32_t ID);
4647
bool removeMessage(QString name);
4748
void removeAllMessages();

‎dbc/dbcmaineditor.cpp

+48-12
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ void DBCMainEditor::onTreeDoubleClicked(const QModelIndex &index)
283283
idString = firstCol->text(0).split(" ")[0];
284284
msgID = static_cast<uint32_t>(Utility::ParseStringToNum(idString));
285285
msg = dbcFile->messageHandler->findMsgByID(msgID);
286+
//msg = itemToMessage[firstCol];
286287
msgEditor->setMessageRef(msg);
287288
msgEditor->setFileIdx(fileIdx);
288289
//msgEditor->setWindowModality(Qt::WindowModal);
@@ -296,6 +297,7 @@ void DBCMainEditor::onTreeDoubleClicked(const QModelIndex &index)
296297
if (nameString.contains("(")) nameString = nameString.split(" ")[1];
297298
else nameString = nameString.split(" ")[0];
298299
sig = msg->sigHandler->findSignalByName(nameString);
300+
//sig = itemToSignal[firstCol];
299301
if (sig)
300302
{
301303
sigEditor->setSignalRef(sig);
@@ -494,8 +496,14 @@ void DBCMainEditor::updatedNode(DBC_NODE *node)
494496
else qDebug() << "That node doesn't exist. That's a bug dude.";
495497
}
496498

497-
void DBCMainEditor::updatedMessage(DBC_MESSAGE *msg)
499+
void DBCMainEditor::updatedMessage(DBC_MESSAGE *msg, quint32 orig_ID)
498500
{
501+
//if ID was changed then the messagehandler must be told to update its QMap as well.
502+
if (msg->ID != orig_ID)
503+
{
504+
dbcFile->messageHandler->changeMessageID(msg, orig_ID);
505+
}
506+
499507
if (messageToItem.contains(msg))
500508
{
501509
QTreeWidgetItem *item = messageToItem.value(msg);
@@ -675,7 +683,7 @@ void DBCMainEditor::newMessage()
675683
nodeItem = msgItem->parent();
676684
}
677685
if (typ == DBCItemTypes::NODE){
678-
msgItem = nodeItem;
686+
msgItem = nullptr; //we have no message, just a node selected
679687
}
680688

681689
//if there was a comment this will find the location of the comment and snip it out.
@@ -709,15 +717,15 @@ void DBCMainEditor::newMessage()
709717
else
710718
{
711719
msgPtr->name = nodeName + "Msg" + QString::number(randGen.bounded(500));
712-
msgPtr->ID = 0;
720+
msgPtr->ID = 0x003;
713721
msgPtr->len = 8;
714722
msgPtr->bgColor = QApplication::palette().color(QPalette::Base);
715723
}
716724
}
717725
else
718726
{
719727
msgPtr->name = nodeName + "Msg" + QString::number(randGen.bounded(500));
720-
msgPtr->ID = 0;
728+
msgPtr->ID = 0x004;
721729
msgPtr->len = 8;
722730
}
723731
msgPtr->sender = node;
@@ -743,23 +751,41 @@ void DBCMainEditor::newSignal()
743751
QTreeWidgetItem *parentItem = nullptr;
744752
msgItem = ui->treeDBC->currentItem();
745753
parentItem = msgItem;
746-
if (!msgItem) return; //nothing selected!
754+
if (!msgItem)
755+
{
756+
qDebug() << "Nothing selected!";
757+
return; //nothing selected!
758+
}
747759
int typ = msgItem->data(0, Qt::UserRole).toInt();
748-
if (typ == DBCItemTypes::NODE) return; //can't add signals to a node!
760+
if (typ == DBCItemTypes::NODE)
761+
{
762+
qDebug() << "Can't add signals to a node!";
763+
return; //can't add signals to a node!
764+
}
749765
if (typ == DBCItemTypes::SIG)
750766
{
751767
sigItem = msgItem;
752768
msgItem = msgItem->parent();
753769
parentItem = msgItem;
754770
//walk up the tree to find the parent msg
755771
while (msgItem && msgItem->data(0, Qt::UserRole).toInt() != DBCItemTypes::MESG) msgItem = msgItem->parent();
756-
if (!msgItem) return; //something bad happened. abort.
772+
if (!msgItem)
773+
{
774+
qDebug() << "Could not find parent message to attach signal to!";
775+
return; //something bad happened. abort.
776+
}
757777
}
758778

759779
QString idString = msgItem->text(0).split(" ")[0];
760780
int msgID = static_cast<uint32_t>(Utility::ParseStringToNum(idString));
761-
DBC_MESSAGE *msg = dbcFile->messageHandler->findMsgByID(msgID);
762-
if (!msg) return; //null pointers are a bummer. Do not follow them.
781+
DBCMessageHandler *msgHandler = dbcFile->messageHandler;
782+
783+
DBC_MESSAGE *msg = msgHandler->findMsgByID(msgID);
784+
if (!msg)
785+
{
786+
qDebug() << "Could not find data structure for message 0x" << QString::number(msgID, 16) << ". Aborting!";
787+
return; //null pointers are a bummer. Do not follow them.
788+
}
763789
DBC_SIGNAL *sigPtr = new DBC_SIGNAL;
764790
if (sigItem)
765791
{
@@ -841,8 +867,8 @@ void DBCMainEditor::deleteCurrentTreeItem()
841867
qDebug() << "Could not find the node in the map. That should not happen.";
842868
}
843869
}
844-
845870
break;
871+
846872
case DBCItemTypes::MESG: //cascades to removing all signals too.
847873
idString = currItem->text(0).split(" ")[0];
848874
msgID = static_cast<uint32_t>(Utility::ParseStringToNum(idString));
@@ -864,6 +890,7 @@ void DBCMainEditor::deleteCurrentTreeItem()
864890
}
865891
}
866892
break;
893+
867894
case DBCItemTypes::SIG: //no cascade, just this one signal.
868895
confirmDialog = QMessageBox::question(this, "Really?", "Are you sure you want to delete this signal?",
869896
QMessageBox::Yes|QMessageBox::No);
@@ -957,13 +984,22 @@ void DBCMainEditor::deleteMessage(DBC_MESSAGE *msg)
957984
void DBCMainEditor::deleteSignal(DBC_SIGNAL *sig)
958985
{
959986
qDebug() << "Signal about to vanish.";
960-
if (!signalToItem.contains(sig)) return;
987+
if (!signalToItem.contains(sig))
988+
{
989+
qDebug() << "Could not find signal in signalToItem collection! Aborting!";
990+
return;
991+
}
961992
QTreeWidgetItem *currItem = signalToItem[sig];
993+
if (!currItem)
994+
{
995+
qDebug() << "currItem was null in deleteSignal. Aborting!";
996+
return;
997+
}
962998
sig->parentMessage->sigHandler->removeSignal(sig->name);
963999

9641000
itemToSignal.remove(currItem);
9651001
signalToItem.remove(sig);
9661002
ui->treeDBC->removeItemWidget(currItem, 0);
967-
//delete currItem; //already removed by above remove call
1003+
delete currItem; //should have been removed above but do we need to call this anyway?!
9681004
dbcFile->setDirtyFlag();
9691005
}

‎dbc/dbcmaineditor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class DBCMainEditor : public QDialog
3636

3737
public slots:
3838
void updatedNode(DBC_NODE *node);
39-
void updatedMessage(DBC_MESSAGE *msg);
39+
void updatedMessage(DBC_MESSAGE *msg, quint32 orig_id);
4040
void updatedSignal(DBC_SIGNAL *sig);
4141

4242
private slots:

‎dbc/dbcmessageeditor.cpp

+10-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
2626
if (suppressEditCallbacks) return;
2727
if (dbcMessage->comment != ui->lineComment->text()) dbcFile->setDirtyFlag();
2828
dbcMessage->comment = ui->lineComment->text();
29-
emit updatedTreeInfo(dbcMessage);
29+
emit updatedTreeInfo(dbcMessage, origID);
3030
});
3131

3232
connect(ui->lineFrameID, &QLineEdit::editingFinished,
@@ -36,7 +36,11 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
3636
if (suppressEditCallbacks) return;
3737
if ((dbcMessage->ID & 0x1FFFFFFFul) != Utility::ParseStringToNum(ui->lineFrameID->text())) dbcFile->setDirtyFlag();
3838
dbcMessage->ID = Utility::ParseStringToNum(ui->lineFrameID->text());
39-
emit updatedTreeInfo(dbcMessage);
39+
40+
if (dbcMessage->ID > 0x7FF) dbcMessage->extendedID = true;
41+
else dbcMessage->extendedID = false;
42+
43+
emit updatedTreeInfo(dbcMessage, origID);
4044
});
4145

4246
connect(ui->lineMsgName, &QLineEdit::editingFinished,
@@ -46,7 +50,7 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
4650
if (suppressEditCallbacks) return;
4751
if (dbcMessage->name != ui->lineMsgName->text().simplified().replace(' ', '_')) dbcFile->setDirtyFlag();
4852
dbcMessage->name = ui->lineMsgName->text().simplified().replace(' ', '_');
49-
emit updatedTreeInfo(dbcMessage);
53+
emit updatedTreeInfo(dbcMessage, origID);
5054
});
5155

5256
connect(ui->lineFrameLen, &QLineEdit::editingFinished,
@@ -67,7 +71,7 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
6771
if (!node) return;
6872
if (node != dbcMessage->sender) dbcFile->setDirtyFlag();
6973
dbcMessage->sender = node;
70-
emit updatedTreeInfo(dbcMessage);
74+
emit updatedTreeInfo(dbcMessage, origID);
7175
});
7276

7377
connect(ui->comboSender->lineEdit(), &QLineEdit::editingFinished,
@@ -87,7 +91,7 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
8791
}
8892
if (node != dbcMessage->sender) dbcFile->setDirtyFlag();
8993
dbcMessage->sender = node;
90-
emit updatedTreeInfo(dbcMessage);
94+
emit updatedTreeInfo(dbcMessage, origID);
9195
});
9296

9397
connect(ui->btnTextColor, &QAbstractButton::clicked,
@@ -206,6 +210,7 @@ void DBCMessageEditor::writeSettings()
206210
void DBCMessageEditor::setMessageRef(DBC_MESSAGE *msg)
207211
{
208212
dbcMessage = msg;
213+
origID = msg->ID;
209214
}
210215

211216
void DBCMessageEditor::showEvent(QShowEvent* event)

‎dbc/dbcmessageeditor.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DBCMessageEditor : public QDialog
2222
void refreshView();
2323

2424
signals:
25-
void updatedTreeInfo(DBC_MESSAGE *msg);
25+
void updatedTreeInfo(DBC_MESSAGE *msg, quint32 orig_id);
2626

2727
private:
2828
Ui::DBCMessageEditor *ui;
@@ -31,6 +31,7 @@ class DBCMessageEditor : public QDialog
3131
DBC_MESSAGE *dbcMessage;
3232
DBCFile *dbcFile;
3333
bool suppressEditCallbacks;
34+
quint32 origID;
3435

3536
void closeEvent(QCloseEvent *event);
3637
bool eventFilter(QObject *obj, QEvent *event);

‎dbc/dbcnodeduplicateeditor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DBCNodeDuplicateEditor : public QDialog
2222
bool refreshView();
2323

2424
signals:
25-
void updatedTreeInfo(DBC_MESSAGE *msg);
25+
void updatedTreeInfo(DBC_MESSAGE *msg, quint32 origID);
2626
void createNode(QString nodeName);
2727
void cloneMessageToNode(DBC_NODE *parentNode, DBC_MESSAGE *source, uint newMsgId);
2828
void nodeAdded();

‎dbc/dbcnoderebaseeditor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ DBCNodeRebaseEditor::DBCNodeRebaseEditor(QWidget *parent) :
7777
for (int i = 0; i < messagesForNode.count(); i++)
7878
{
7979
messagesForNode[i]->ID += rebaseDiff;
80-
emit updatedTreeInfo(messagesForNode[i]);
80+
emit updatedTreeInfo(messagesForNode[i], messagesForNode[i]->ID);
8181
}
8282

8383
dbcFile->setDirtyFlag();

‎dbc/dbcnoderebaseeditor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DBCNodeRebaseEditor : public QDialog
2222
bool refreshView();
2323

2424
signals:
25-
void updatedTreeInfo(DBC_MESSAGE *msg);
25+
void updatedTreeInfo(DBC_MESSAGE *msg, quint32 origID);
2626

2727
private:
2828
Ui::DBCNodeRebaseEditor *ui;

0 commit comments

Comments
 (0)