From ecf4c1788b6f53f9d250b01228a499a5132b3fe1 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Tue, 18 Sep 2018 19:24:21 -0400
Subject: [PATCH] Fix loading of graph definitions

---
 re/graphingwindow.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/re/graphingwindow.cpp b/re/graphingwindow.cpp
index da7139d..fd93766 100644
--- a/re/graphingwindow.cpp
+++ b/re/graphingwindow.cpp
@@ -846,7 +846,7 @@ void GraphingWindow::loadDefinitions()
     QStringList filters;
     filters.append(QString(tr("Graph definition (*.gdf)")));
 
-    if (dbcHandler == NULL) return;
+    if (dbcHandler == nullptr) return;
     if (dbcHandler->getFileCount() == 0) dbcHandler->createBlankFile();
 
     dialog.setFileMode(QFileDialog::ExistingFile);
@@ -872,11 +872,14 @@ void GraphingWindow::loadDefinitions()
 
                 if (tokens[0] == "X") //newest format based around signals
                 {
-                    gp.ID = tokens[1].toInt(NULL, 16);
-                    gp.mask = tokens[2].toULongLong(NULL, 16);
+                    gp.ID = tokens[1].toUInt(nullptr, 16);
+                    gp.mask = tokens[2].toULongLong(nullptr, 16);
                     gp.startBit = tokens[3].toInt();
-                    if (gp.startBit < 0) gp.intelFormat = false;
-                        else gp.intelFormat = true;
+                    if (gp.startBit < 0) {
+                        gp.intelFormat = false;
+                        gp.startBit *= -1;
+                    }
+                    else gp.intelFormat = true;
                     gp.numBits = tokens[4].toInt();
                     if (tokens[5] == "Y") gp.isSigned = true;
                         else gp.isSigned = false;
@@ -895,18 +898,18 @@ void GraphingWindow::loadDefinitions()
                 }
                 else //one of the two older formats then
                 {
-                    gp.ID = tokens[0].toInt(NULL, 16);
+                    gp.ID = tokens[0].toUInt(nullptr, 16);
                     if (tokens[1] == "S") //old signal based graph definition
                     {
                         //tokens[2] is the signal name. Need to use the message ID and this name to look it up
                         DBC_MESSAGE *msg = dbcHandler->getFileByIdx(0)->messageHandler->findMsgByID(gp.ID);
-                        if (msg != NULL)
+                        if (msg != nullptr)
                         {
                             DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(tokens[2]);
                             if (sig)
                             {
                                 gp.mask = 0xFFFFFFFF;
-                                gp.bias = sig->bias;
+                                gp.bias = (float)sig->bias;
                                 gp.color.setRed(tokens[3].toInt());
                                 gp.color.setGreen(tokens[4].toInt());
                                 gp.color.setBlue(tokens[5].toInt());
@@ -915,7 +918,7 @@ void GraphingWindow::loadDefinitions()
                                 if (sig->valType == SIGNED_INT) gp.isSigned = true;
                                     else gp.isSigned = false;
                                 gp.numBits = sig->signalSize;
-                                gp.scale = sig->factor;
+                                gp.scale = (float)sig->factor;
                                 gp.startBit = sig->startBit;
                                 gp.stride = 1;
                                 createGraph(gp, true);
@@ -927,7 +930,7 @@ void GraphingWindow::loadDefinitions()
                         //hard part - this all changed drastically
                         //the difference between intel and motorola format is whether
                         //start is larger than end byte or not.
-                        uint64_t oldMask = tokens[1].toULongLong(NULL, 16);
+                        uint64_t oldMask = tokens[1].toULongLong(nullptr, 16);
                         int oldStart = tokens[2].toInt();
                         int oldEnd = tokens[3].toInt();