derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'work/fix_warnings' into 'develop'

Browse Source 
Fix compiler warnings in TraceAnalyzer

See merge request ems/astdm/dram.sys!314
This commit is contained in:
Lukas Steiner
2021-09-21 08:13:13 +00:00
parent f34f5be239 20d0329584
commit 7d9855f1cb
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DRAMSys/traceAnalyzer/evaluationtool.cpp
View File

@@ -125,7 +125,7 @@ void EvaluationTool::cleanUpUI()
void EvaluationTool::fillFileList(QList<QString> paths)
{
qSort(paths.begin(), paths.end(), [] (const QString & path1,
std::sort(paths.begin(), paths.end(), [] (const QString & path1,
const QString & path2) {
return QFileInfo(path1).baseName() < QFileInfo(path2).baseName();
});

2
DRAMSys/traceAnalyzer/presentation/tracedrawing.cpp
View File

@@ -139,7 +139,7 @@ void drawText(QPainter *painter, const QString &text, const QPoint &position,
QPen saved = painter->pen();
painter->setPen(QPen(textColor));
QFontMetrics fm = painter->fontMetrics();
QPoint offset(fm.width(text), fm.height());
QPoint offset(fm.horizontalAdvance(text), fm.height());
QRect rect(position - offset, position + offset);
int flags;

4
DRAMSys/traceAnalyzer/presentation/traceplot.cpp
View File

@@ -636,9 +636,9 @@ bool TracePlot::eventFilter(QObject *object, QEvent *event)
case QEvent::Wheel : {
QWheelEvent *wheelEvent = static_cast<QWheelEvent *>(event);
traceTime zoomCenter = static_cast<traceTime>(this->invTransform(xBottom,
wheelEvent->x()));
wheelEvent->position().x()));
(wheelEvent->delta() > 0) ? zoomIn(zoomCenter) : zoomOut(zoomCenter);
(wheelEvent->angleDelta().y() > 0) ? zoomIn(zoomCenter) : zoomOut(zoomCenter);
return true;
}

2
DRAMSys/traceAnalyzer/presentation/tracescroller.cpp
View File

@@ -228,7 +228,7 @@ bool TraceScroller::eventFilter( QObject *object, QEvent *event )
QWheelEvent *wheelEvent = static_cast<QWheelEvent *>(event);
traceTime offset;
int speed = 4;
(wheelEvent->delta() > 0) ? offset = -zoomLevel * speed : offset = zoomLevel *
(wheelEvent->angleDelta().y() > 0) ? offset = -zoomLevel * speed : offset = zoomLevel *
speed;
navigator->navigateToTime(navigator->CurrentTraceTime() + offset);
return true;

6
DRAMSys/traceAnalyzer/presentation/tracetesttreewidget.cpp
View File

@@ -51,9 +51,9 @@ void TraceTestTreeWidget::addTraceTestResult(const TraceTestResults
addTopLevelItem(top);
if (traceTestResult.hasPassedAllTests())
top->setTextColor(0, Qt::green);
top->setForeground(0, Qt::green);
else
top->setTextColor(0, Qt::red);
top->setForeground(0, Qt::red);
for (const TestResult &testResult : traceTestResult.getTestResults()) {
new TestResultTreeItem(top, testResult);
@@ -79,6 +79,6 @@ TraceTestTreeWidget::TestResultTreeItem::TestResultTreeItem(
{
setText(0, testResult.getTestName());
if (!testResult.hasPassed())
setTextColor(0, Qt::red);
setForeground(0, Qt::red);
message = testResult.getMessage();
}

8
DRAMSys/traceAnalyzer/traceanalyzer.cpp
View File

@@ -172,8 +172,8 @@ void TraceAnalyzer::on_actionReload_all_triggered()
delete traceFileTab;
}
QList<QString> list = openedTraceFiles.toList();
qSort(list);
QList<QString> list = openedTraceFiles.values();
std::sort(list.begin(), list.end());
// Recreate all tabs
int tabIndex = 0;
@@ -219,14 +219,14 @@ void TraceAnalyzer::on_actionTest_triggered()
{
evaluationTool.raise();
evaluationTool.activateWindow();
evaluationTool.showAndRunTests(openedTraceFiles.toList());
evaluationTool.showAndRunTests(openedTraceFiles.values());
}
void TraceAnalyzer::on_actionMetrics_triggered()
{
evaluationTool.raise();
evaluationTool.activateWindow();
evaluationTool.showAndEvaluateMetrics(openedTraceFiles.toList());
evaluationTool.showAndEvaluateMetrics(openedTraceFiles.values());
}
void TraceAnalyzer::closeEvent(QCloseEvent *event)