Fix some errors created during last merge.

This commit is contained in:
Collin Kidder
2020-09-30 21:55:39 -04:00
parent ad84bb8096
commit 1c7caa3884
2 changed files with 12 additions and 10 deletions
+2 -1
View File
@@ -1,6 +1,7 @@
#include "dbc_classes.h"
#include "dbchandler.h"
#include "utility.h"
#include <QtMath>
DBC_MESSAGE::DBC_MESSAGE()
{
@@ -73,7 +74,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o
endResult = ((double)result * factor) + bias;
result = (int64_t)endResult;
// if factor is an integer, we don't need the possibly human-unreadable float representation
isInteger = (factor == ceilf(factor));
isInteger = (factor == qFloor(factor));
}
else if (valType == SP_FLOAT)
{