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

Many little changes to get rid of compile-time warnings.

Browse Source 
There now should be no warnings when compiling on LINUX. YMMV elsewhere.
This commit is contained in:
Collin Kidder
2020-02-15 19:52:18 -05:00
parent d550fa79a0
commit e4a3854af4
21 changed files with 89 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/filecomparatorwindow.cpp
+13 -13
View File
@@ -36,7 +36,7 @@ void FileComparatorWindow::showEvent(QShowEvent *)
void FileComparatorWindow::closeEvent(QCloseEvent *event)
{
Q_UNUSED(event);
Q_UNUSED(event)
writeSettings();
}
@@ -118,8 +118,8 @@ void FileComparatorWindow::clearReference()
void FileComparatorWindow::calculateDetails()
{
QMap<int, FrameData> interestedIDs;
QMap<int, FrameData> referenceIDs;
QMap<uint32_t, FrameData> interestedIDs;
QMap<uint32_t, FrameData> referenceIDs;
QTreeWidgetItem *interestedOnlyBase, *referenceOnlyBase = nullptr, *sharedBase, *bitmapBaseInterested, *bitmapBaseReference = nullptr;
QTreeWidgetItem *valuesBase, *detail, *sharedItem, *valuesInterested, *valuesReference = nullptr;
uint64_t tmp;
@@ -131,7 +131,7 @@ void FileComparatorWindow::calculateDetails()
QProgressDialog progress(this);
progress.setWindowModality(Qt::WindowModal);
progress.setLabelText("Calculating differences");
progress.setCancelButton(0);
progress.setCancelButton(nullptr);
progress.setRange(0,0);
progress.setMinimumDuration(0);
progress.show();
@@ -159,7 +159,7 @@ void FileComparatorWindow::calculateDetails()
if (interestedIDs.contains(frame.frameId())) //if we saw this ID before then add to the QList in there
{
for (unsigned int y = 0; y < dataLen; y++)
for (int y = 0; y < dataLen; y++)
{
interestedIDs[frame.frameId()].values[y][data[y]]++;
tmp = data[y];
@@ -184,7 +184,7 @@ void FileComparatorWindow::calculateDetails()
}
}
//memset(newData->values, 0, 256 * 8);
for (unsigned int y = 0; y < dataLen; y++)
for (int y = 0; y < dataLen; y++)
{
newData->values[y][data[y]] = 1;
tmp = data[y];
@@ -206,7 +206,7 @@ void FileComparatorWindow::calculateDetails()
if (referenceIDs.contains(frame.frameId())) //if we saw this ID before then add to the QList in there
{
for (unsigned int y = 0; y < dataLen; y++)
for (int y = 0; y < dataLen; y++)
{
referenceIDs[frame.frameId()].values[y][data[y]]++;
tmp = data[y];
@@ -229,7 +229,7 @@ void FileComparatorWindow::calculateDetails()
}
}
//memset(newData->values, 0, 256 * 8);
for (unsigned int y = 0; y < dataLen; y++)
for (int y = 0; y < dataLen; y++)
{
newData->values[y][data[y]] = 1;
tmp = data[y];
@@ -246,7 +246,7 @@ void FileComparatorWindow::calculateDetails()
//now we iterate through the IDs within both files and see which are unique to one file and which
//are shared
bool interestedHadUnique = false;
QMap<int, FrameData>::iterator i;
QMap<uint32_t, FrameData>::iterator i;
int framesCounter = 0;
for (i = interestedIDs.begin(); i != interestedIDs.end(); ++i)
{
@@ -257,7 +257,7 @@ void FileComparatorWindow::calculateDetails()
qApp->processEvents();
}
int keyone = i.key();
uint32_t keyone = i.key();
if (!referenceIDs.contains(keyone))
{
valuesBase = new QTreeWidgetItem();
@@ -324,7 +324,7 @@ void FileComparatorWindow::calculateDetails()
for (int j = 0; j < 256; j++)
{
detail = new QTreeWidgetItem();
detail->setText(0, Utility::formatHexNum(j));
detail->setText(0, Utility::formatHexNum(static_cast<unsigned int>(j)));
if ((interested.values[i][j] > 0) && (reference.values[i][j] == 0) )
{
valuesInterested->addChild(detail);
@@ -344,10 +344,10 @@ void FileComparatorWindow::calculateDetails()
if (!uniqueInterested)
{
QMap<int, FrameData>::iterator itwo;
QMap<uint32_t, FrameData>::iterator itwo;
for (itwo = referenceIDs.begin(); itwo != referenceIDs.end(); ++itwo)
{
int keytwo = itwo.key();
unsigned int keytwo = itwo.key();
if (!interestedIDs.contains(keytwo))
{
valuesBase = new QTreeWidgetItem();
re/filecomparatorwindow.h
+1 -1
View File
@@ -14,7 +14,7 @@ class FileComparatorWindow;
struct FrameData
{
int ID;
uint32_t ID;
int dataLen;
uint64_t bitmap;
int values[8][256]; //first index is the data byte, second is # of times we saw that value
re/flowviewwindow.cpp
+2 -4
View File
@@ -501,9 +501,8 @@ void FlowViewWindow::removeAllGraphs()
void FlowViewWindow::createGraph(int byteNum)
{
int tempVal;
float minval=1000000, maxval = -100000;
double minval = 1000000.0, maxval = -100000.0;
const unsigned char *data;
int dataLen = 0;
const CANFrame *frame;
qDebug() << "Create Graph " << byteNum;
@@ -521,14 +520,13 @@ void FlowViewWindow::createGraph(int byteNum)
{
frame = &frameCache[j];
data = reinterpret_cast<const unsigned char *>(frame->payload().constData());
dataLen = frame->payload().length();
tempVal = data[byteNum];
if (graphByTime)
{
if (secondsMode){
x[byteNum][j] = (double)(frame->timeStamp().microSeconds()) / 1000000.0;
x[byteNum][j] = frame->timeStamp().microSeconds() / 1000000.0;
}
else
{
re/flowviewwindow.h
+1 -1
View File
@@ -40,7 +40,7 @@ private slots:
void gotCellClick(int x, int y);
signals:
void sendCenterTimeID(int32_t ID, double timestamp);
void sendCenterTimeID(uint32_t ID, double timestamp);
private:
Ui::FlowViewWindow *ui;
re/frameinfowindow.cpp
+22 -22
View File
@@ -244,10 +244,10 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
{
int targettedID;
int minLen, maxLen, thisLen;
uint64_t avgInterval;
uint64_t minInterval;
uint64_t maxInterval;
uint64_t thisInterval;
int64_t avgInterval;
int64_t minInterval;
int64_t maxInterval;
int64_t thisInterval;
int minData[8];
int maxData[8];
int dataHistogram[256][8];
@@ -377,8 +377,8 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
//qDebug() << referenceBits[c];
}
std::vector<uint64_t> sortedIntervals;
uint64_t intervalSum = 0;
std::vector<int64_t> sortedIntervals;
int64_t intervalSum = 0;
//then find all data points
for (int j = 0; j < frameCache.count(); j++)
@@ -387,7 +387,7 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
dataLen = frameCache.at(j).payload().length();
byteGraphX.append(j);
for (uint32_t bytcnt = 0; bytcnt < dataLen; bytcnt++)
for (int bytcnt = 0; bytcnt < dataLen; bytcnt++)
{
byteGraphY[bytcnt].append(data[bytcnt]);
}
@@ -429,7 +429,7 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
}
std::sort(sortedIntervals.begin(), sortedIntervals.end());
uint64_t intervalStdDiv = 0, intervalPctl5 = 0, intervalPctl95 = 0, intervalMean = 0, intervalVariance = 0;
int64_t intervalStdDiv = 0, intervalPctl5 = 0, intervalPctl95 = 0, intervalMean = 0, intervalVariance = 0;
int maxTimeCounter = -1;
if (sortedIntervals.size() > 0)
@@ -441,17 +441,17 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
}
intervalVariance /= sortedIntervals.size();
intervalStdDiv = sqrt(intervalVariance);
intervalStdDiv = static_cast<int>(sqrt(intervalVariance));
intervalPctl5 = sortedIntervals[floor(0.05 * sortedIntervals.size())];
intervalPctl95 = sortedIntervals[floor(0.95 * sortedIntervals.size())];
intervalPctl5 = sortedIntervals[static_cast<unsigned int>(floor(0.05 * sortedIntervals.size()))];
intervalPctl95 = sortedIntervals[static_cast<unsigned int>(floor(0.95 * sortedIntervals.size()))];
uint64_t step = ceil((maxInterval - minInterval) / numIntervalHistBars);
uint64_t step = static_cast<unsigned int>(ceil((maxInterval - minInterval) / numIntervalHistBars));
qDebug() << "Step: " << step << " minInt: " << minInterval << " maxInt: " << maxInterval;
int index = 0;
unsigned int index = 0;
int counter = 0;
for(int l = 0; l <= numIntervalHistBars; l++) {
uint64_t currentMax = maxInterval - ((numIntervalHistBars - l) * step); // avoid missing the biggest value due to rounding errors
int64_t currentMax = maxInterval - ((numIntervalHistBars - l) * step); // avoid missing the biggest value due to rounding errors
qDebug() << "CurrentMax: " << currentMax;
while(index < sortedIntervals.size()) {
if(sortedIntervals[index] <= currentMax) {
@@ -483,22 +483,22 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
baseNode->addChild(tempItem);
tempItem = new QTreeWidgetItem();
tempItem->setText(0, tr("Average inter-frame interval: ") + QString::number(avgInterval / 1000.0f) + "ms");
tempItem->setText(0, tr("Average inter-frame interval: ") + QString::number(avgInterval / 1000.0) + "ms");
baseNode->addChild(tempItem);
tempItem = new QTreeWidgetItem();
tempItem->setText(0, tr("Minimum inter-frame interval: ") + QString::number(minInterval / 1000.0f) + "ms");
tempItem->setText(0, tr("Minimum inter-frame interval: ") + QString::number(minInterval / 1000.0) + "ms");
baseNode->addChild(tempItem);
tempItem = new QTreeWidgetItem();
tempItem->setText(0, tr("Maximum inter-frame interval: ") + QString::number(maxInterval / 1000.0f) + "ms");
tempItem->setText(0, tr("Maximum inter-frame interval: ") + QString::number(maxInterval / 1000.0) + "ms");
baseNode->addChild(tempItem);
tempItem = new QTreeWidgetItem();
tempItem->setText(0, tr("Inter-frame interval variation: ") + QString::number((maxInterval - minInterval) / 1000.0f) + "ms");
tempItem->setText(0, tr("Inter-frame interval variation: ") + QString::number((maxInterval - minInterval) / 1000.0) + "ms");
baseNode->addChild(tempItem);
tempItem = new QTreeWidgetItem();
tempItem->setText(0, tr("Interval standard deviation: ") + QString::number(intervalStdDiv / 1000.0f) + "ms");
tempItem->setText(0, tr("Interval standard deviation: ") + QString::number(intervalStdDiv / 1000.0) + "ms");
baseNode->addChild(tempItem);
tempItem = new QTreeWidgetItem();
tempItem->setText(0, tr("Minimum range to fit 90% of inter-frame intervals: ") + QString::number((intervalPctl95 - intervalPctl5) / 1000.0f) + "ms");
tempItem->setText(0, tr("Minimum range to fit 90% of inter-frame intervals: ") + QString::number((intervalPctl95 - intervalPctl5) / 1000.0) + "ms");
baseNode->addChild(tempItem);
for (int c = 0; c < maxLen; c++)
{
@@ -515,7 +515,7 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
dataBase->addChild(tempItem);
tempItem = new QTreeWidgetItem();
tempItem->setText(0, tr("Range: ") + Utility::formatNumber((char)minData[c]) + tr(" to ") + Utility::formatNumber((char)maxData[c]));
tempItem->setText(0, tr("Range: ") + Utility::formatNumber((unsigned int)minData[c]) + tr(" to ") + Utility::formatNumber((unsigned int)maxData[c]));
dataBase->addChild(tempItem);
histBase->setText(0, tr("Histogram"));
dataBase->addChild(histBase);
@@ -525,7 +525,7 @@ void FrameInfoWindow::updateDetailsWindow(QString newID)
if (dataHistogram[d][c] > 0)
{
tempItem = new QTreeWidgetItem();
tempItem->setText(0, QString::number(d) + "/0x" + QString::number(d, 16) +" (" + Utility::formatByteAsBinary(d) +") -> " + QString::number(dataHistogram[d][c]));
tempItem->setText(0, QString::number(d) + "/0x" + QString::number(d, 16) +" (" + Utility::formatByteAsBinary(static_cast<uint8_t>(d)) +") -> " + QString::number(dataHistogram[d][c]));
histBase->addChild(tempItem);
}
}
re/graphingwindow.h
+1 -1
View File
@@ -71,7 +71,7 @@ private slots:
void zoomOut();
signals:
void sendCenterTimeID(int32_t ID, double timestamp);
void sendCenterTimeID(uint32_t ID, double timestamp);
private:
Ui::GraphingWindow *ui;