Small bug fixes (updated version # too)
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONFIG
|
#ifndef CONFIG
|
||||||
#define CONFIG
|
#define CONFIG
|
||||||
|
|
||||||
#define VERSION 123
|
#define VERSION 124
|
||||||
|
|
||||||
//try to keep this in sync.
|
//try to keep this in sync.
|
||||||
//SavvyCAN will complain if you connect a GVRET board with a revision
|
//SavvyCAN will complain if you connect a GVRET board with a revision
|
||||||
|
|||||||
@@ -134,6 +134,8 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
|
|||||||
|
|
||||||
ui->treeDetails->clear();
|
ui->treeDetails->clear();
|
||||||
|
|
||||||
|
if (frameCache.count() == 0) return;
|
||||||
|
|
||||||
baseNode = new QTreeWidgetItem();
|
baseNode = new QTreeWidgetItem();
|
||||||
baseNode->setText(0, QString("ID: 0x") + newID );
|
baseNode->setText(0, QString("ID: 0x") + newID );
|
||||||
|
|
||||||
|
|||||||
+7
-7
@@ -483,7 +483,7 @@ void GraphingWindow::addNewGraph()
|
|||||||
|
|
||||||
void GraphingWindow::createGraph(GraphParams ¶ms, bool createGraphParam)
|
void GraphingWindow::createGraph(GraphParams ¶ms, bool createGraphParam)
|
||||||
{
|
{
|
||||||
int tempVal;
|
long long tempVal; //64 bit temp value.
|
||||||
float yminval=10000000.0, ymaxval = -1000000.0;
|
float yminval=10000000.0, ymaxval = -1000000.0;
|
||||||
float xminval=10000000000.0, xmaxval = -10000000000.0;
|
float xminval=10000000000.0, xmaxval = -10000000000.0;
|
||||||
|
|
||||||
@@ -531,15 +531,15 @@ void GraphingWindow::createGraph(GraphParams ¶ms, bool createGraphParam)
|
|||||||
else if (params.endByte > params.startByte) //big endian
|
else if (params.endByte > params.startByte) //big endian
|
||||||
{
|
{
|
||||||
float tempValue;
|
float tempValue;
|
||||||
int tempValInt;
|
long long tempValInt;
|
||||||
int numBytes = (params.endByte - params.startByte) + 1;
|
int numBytes = (params.endByte - params.startByte) + 1;
|
||||||
int shiftRef = 1 << (numBytes * 8);
|
long long shiftRef = 1 << (numBytes * 8);
|
||||||
uint64_t maskShifter;
|
uint64_t maskShifter;
|
||||||
uint8_t tempByte;
|
uint8_t tempByte;
|
||||||
for (int j = 0; j < numEntries; j++)
|
for (int j = 0; j < numEntries; j++)
|
||||||
{
|
{
|
||||||
tempValInt = 0;
|
tempValInt = 0;
|
||||||
int expon = 1;
|
long long expon = 1;
|
||||||
maskShifter = params.mask;
|
maskShifter = params.mask;
|
||||||
for (int c = 0; c < numBytes; c++)
|
for (int c = 0; c < numBytes; c++)
|
||||||
{
|
{
|
||||||
@@ -578,15 +578,15 @@ void GraphingWindow::createGraph(GraphParams ¶ms, bool createGraphParam)
|
|||||||
else //little endian
|
else //little endian
|
||||||
{
|
{
|
||||||
float tempValue;
|
float tempValue;
|
||||||
int tempValInt;
|
long long tempValInt;
|
||||||
int numBytes = (params.startByte - params.endByte) + 1;
|
int numBytes = (params.startByte - params.endByte) + 1;
|
||||||
int shiftRef = 1 << (numBytes * 8);
|
long long shiftRef = 1 << (numBytes * 8);
|
||||||
uint64_t maskShifter;
|
uint64_t maskShifter;
|
||||||
uint8_t tempByte;
|
uint8_t tempByte;
|
||||||
for (int j = 0; j < numEntries; j++)
|
for (int j = 0; j < numEntries; j++)
|
||||||
{
|
{
|
||||||
tempValInt = 0;
|
tempValInt = 0;
|
||||||
int expon = 1;
|
long long expon = 1;
|
||||||
maskShifter = params.mask;
|
maskShifter = params.mask;
|
||||||
for (int c = 0; c < numBytes; c++)
|
for (int c = 0; c < numBytes; c++)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -89,7 +89,7 @@ void NewGraphDialog::getParams(GraphParams ¶ms)
|
|||||||
|
|
||||||
//now catch stupidity and bring it to defaults
|
//now catch stupidity and bring it to defaults
|
||||||
if (params.mask == 0) params.mask = 0xFFFFFFFF;
|
if (params.mask == 0) params.mask = 0xFFFFFFFF;
|
||||||
if (fabs(params.scale) < 0.0001f) params.scale = 1.0f;
|
if (fabs(params.scale) < 0.00000001) params.scale = 1.0f;
|
||||||
if (params.stride < 1) params.stride = 1;
|
if (params.stride < 1) params.stride = 1;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user