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

Fixed a compile time bug in deltamodel. Whoops. Also fixed some warnings in graphing window.

Browse Source
This commit is contained in:
Collin Kidder
2016-06-07 10:01:00 -04:00
parent a226055693
commit 5253dc4d47
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deltamodel.cpp
+5
View File
@@ -8,6 +8,7 @@ DeltaModel::DeltaModel(QObject *parent)
QVariant DeltaModel::headerData(int section, Qt::Orientation orientation, int role) const QVariant DeltaModel::headerData(int section, Qt::Orientation orientation, int role) const
{ {
// FIXME: Implement me! // FIXME: Implement me!
return QVariant();
} }
int DeltaModel::rowCount(const QModelIndex &parent) const int DeltaModel::rowCount(const QModelIndex &parent) const
@@ -15,6 +16,8 @@ int DeltaModel::rowCount(const QModelIndex &parent) const
if (!parent.isValid()) if (!parent.isValid())
return 0; return 0;
return 0;
// FIXME: Implement me! // FIXME: Implement me!
} }
@@ -23,6 +26,8 @@ int DeltaModel::columnCount(const QModelIndex &parent) const
if (!parent.isValid()) if (!parent.isValid())
return 0; return 0;
return 0;
// FIXME: Implement me! // FIXME: Implement me!
} }
graphingwindow.cpp
+3 -3
View File
@@ -837,7 +837,7 @@ void GraphingWindow::loadDefinitions()
for (int b = 0; b < 8; b++) for (int b = 0; b < 8; b++)
{ {
if (oldMask & (1 << b)) if (oldMask & (1ull << b))
{ {
gp.startBit = (8 * oldEnd) + b; gp.startBit = (8 * oldEnd) + b;
break; break;
@@ -846,7 +846,7 @@ void GraphingWindow::loadDefinitions()
for (int c = 7; c >= 0; c--) for (int c = 7; c >= 0; c--)
{ {
if ( oldMask & (1<<(((numBytes - 1) * 8) + c)) ) if ( oldMask & (1ull << (((numBytes - 1) * 8) + c)) )
{ {
gp.numBits -= (7-c); gp.numBits -= (7-c);
break; break;
@@ -865,7 +865,7 @@ void GraphingWindow::loadDefinitions()
gp.numBits = 8; gp.numBits = 8;
for (int b = 0; b < 8; b++) for (int b = 0; b < 8; b++)
{ {
if (oldMask & (1 << b)) if (oldMask & (1ull << b))
{ {
gp.startBit = 8 * oldStart + b; gp.startBit = 8 * oldStart + b;
gp.numBits = 8 - b; gp.numBits = 8 - b;