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

Only code clean up to remove many warnings. There should be no changes

Browse Source 
to program operation.
This commit is contained in:
Collin Kidder
2022-12-05 19:33:47 -05:00
parent 549113f9e1
commit edc210c336
18 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbc_classes.cpp
+1 -1
View File
@@ -155,7 +155,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o
//a 32 bit single precision float. That's evil incarnate but it is very fast and small
//in terms of new code.
result = Utility::processIntegerSignal(frame.payload(), startBit, 32, intelByteOrder, false);
endResult = (*((float *)(&result)) * factor) + bias;
endResult = (*((float *)(&result)) * factor) + bias; //look away! This is awful. I don't even know for sure if it works. Should test that.
}
else //double precision float
{
dbc/dbchandler.cpp
+2
View File
@@ -1527,6 +1527,8 @@ bool DBCFile::saveFile(QString fileName)
case ATTR_TYPE_SIG:
msgOutput.append("SG_ ");
break;
case ATTR_TYPE_ANY:
break;
}
msgOutput.append("\"" + dbc_attributes[x].name + "\" ");
dbc/dbcmaineditor.cpp
+8 -16
View File
@@ -160,6 +160,7 @@ void DBCMainEditor::writeSettings()
void DBCMainEditor::onCustomMenuTree(QPoint point)
{
Q_UNUSED(point);
QMenu *menu = new QMenu(this);
menu->setAttribute(Qt::WA_DeleteOnClose);
@@ -259,7 +260,7 @@ void DBCMainEditor::onTreeDoubleClicked(const QModelIndex &index)
Q_UNUSED(index)
QTreeWidgetItem* firstCol = ui->treeDBC->currentItem();
bool ret = false;
//bool ret = false;
DBC_MESSAGE *msg;
DBC_SIGNAL *sig;
DBC_NODE *node;
@@ -311,11 +312,6 @@ void DBCMainEditor::onTreeDoubleClicked(const QModelIndex &index)
void DBCMainEditor::onTreeContextMenu(const QPoint & pos)
{
QTreeWidgetItem* firstCol = ui->treeDBC->currentItem();
bool ret = false;
DBC_MESSAGE *msg;
DBC_SIGNAL *sig;
DBC_NODE *node;
uint32_t msgID;
QString idString;
qDebug() << firstCol->data(0, Qt::UserRole) << " - " << firstCol->text(0);
@@ -324,7 +320,7 @@ void DBCMainEditor::onTreeContextMenu(const QPoint & pos)
{
case 1: //a node
idString = firstCol->text(0).split(" ")[0];
node = dbcFile->findNodeByName(idString);
//node = dbcFile->findNodeByName(idString);
QAction *actionRebase = new QAction(QIcon(":/Resource/warning32.ico"), tr("Rebase all messages"), this);
actionRebase->setStatusTip(tr("Rebase all messages in node"));
@@ -338,7 +334,7 @@ void DBCMainEditor::onTreeContextMenu(const QPoint & pos)
menu.addAction(actionRebase);
menu.addAction(actionDupe);
QPoint pt(pos);
//QPoint pt(pos);
menu.exec( ui->treeDBC->mapToGlobal(pos) );
break;
}
@@ -347,11 +343,7 @@ void DBCMainEditor::onTreeContextMenu(const QPoint & pos)
void DBCMainEditor::onRebaseMessages()
{
QTreeWidgetItem* firstCol = ui->treeDBC->currentItem();
bool ret = false;
DBC_MESSAGE *msg;
DBC_SIGNAL *sig;
DBC_NODE *node;
uint32_t msgID;
QString idString;
idString = firstCol->text(0).split(" ")[0];
@@ -368,11 +360,11 @@ void DBCMainEditor::onRebaseMessages()
void DBCMainEditor::onDuplicateNode()
{
QTreeWidgetItem* firstCol = ui->treeDBC->currentItem();
bool ret = false;
DBC_MESSAGE *msg;
DBC_SIGNAL *sig;
//bool ret = false;
//DBC_MESSAGE *msg;
//DBC_SIGNAL *sig;
//uint32_t msgID;
DBC_NODE *node;
uint32_t msgID;
QString idString;
idString = firstCol->text(0).split(" ")[0];
dbc/dbcnodeduplicateeditor.cpp
+6 -6
View File
@@ -41,7 +41,7 @@ DBCNodeDuplicateEditor::DBCNodeDuplicateEditor(QWidget *parent) :
return;
}
uint rebaseDiff = newBase - lowestMsgId;
int32_t rebaseDiff = newBase - lowestMsgId;
QList<DBC_MESSAGE*> messagesForNode = dbcFile->messageHandler->findMsgsByNode(dbcNode);
if(messagesForNode.count() == 0)
@@ -70,11 +70,11 @@ DBCNodeDuplicateEditor::DBCNodeDuplicateEditor(QWidget *parent) :
return;
}
for (int i=0; i<messagesForNode.count(); i++)
for (int i = 0; i < messagesForNode.count(); i++)
{
uint newMsgId = messagesForNode[i]->ID + rebaseDiff;
int32_t newMsgId = messagesForNode[i]->ID + rebaseDiff;
if(newMsgId < 0 || newMsgId > 0x1FFFFFFFul)
if(newMsgId < 0 || newMsgId > 0x1FFFFFFFl)
{
QMessageBox::question(this, "Invalid Address Range", "The new starting address would cause a message to be outside of the valid address range.",
QMessageBox::Ok);
@@ -82,9 +82,9 @@ DBCNodeDuplicateEditor::DBCNodeDuplicateEditor(QWidget *parent) :
}
}
for (int i=0; i<messagesForNode.count(); i++)
for (int i = 0; i < messagesForNode.count(); i++)
{
uint newMsgId = messagesForNode[i]->ID + rebaseDiff;
int32_t newMsgId = messagesForNode[i]->ID + rebaseDiff;
emit cloneMessageToNode(nodePtr, messagesForNode[i], newMsgId);
}
dbc/dbcnoderebaseeditor.cpp
+4 -4
View File
@@ -62,11 +62,11 @@ DBCNodeRebaseEditor::DBCNodeRebaseEditor(QWidget *parent) :
return;
}
for (int i=0; i<messagesForNode.count(); i++)
for (int i = 0; i < messagesForNode.count(); i++)
{
uint newMsgId = messagesForNode[i]->ID + rebaseDiff;
int32_t newMsgId = messagesForNode[i]->ID + rebaseDiff;
if(newMsgId < 0 || newMsgId > 0x1FFFFFFFul)
if(newMsgId < 0 || newMsgId > 0x1FFFFFFFl)
{
QMessageBox::question(this, "Invalid Address Range", "The new starting address would cause a message to be outside of the valid address range.",
QMessageBox::Ok);
@@ -74,7 +74,7 @@ DBCNodeRebaseEditor::DBCNodeRebaseEditor(QWidget *parent) :
}
}
for (int i=0; i<messagesForNode.count(); i++)
for (int i = 0; i < messagesForNode.count(); i++)
{
messagesForNode[i]->ID += rebaseDiff;
emit updatedTreeInfo(messagesForNode[i]);