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

Fixed display of rankwise commands.

Browse Source
This commit is contained in:
Lukas Steiner
2019-10-02 17:46:37 +02:00
parent abb9a37096
commit f4a018cfb3
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp
View File

@@ -64,7 +64,7 @@ void Phase::draw(QPainter *painter, const QwtScaleMap &xMap,
}
if (!isBankwise()) {
for (unsigned int i = 0; i < drawingProperties.numberOfBanks; i++)
for (int i = getYVal(drawingProperties); i < (int)(getYVal(drawingProperties) + drawingProperties.banksPerRank); i++)
drawPhaseSymbol(span.Begin(), span.End(), i, drawingProperties.drawText,
getPhaseSymbol(), painter, xMap, yMap);
} else
@@ -123,8 +123,10 @@ QColor Phase::getColor(const TraceDrawingProperties &drawingProperties) const
int Phase::getYVal(const TraceDrawingProperties &drawingProperties) const
{
Q_UNUSED(drawingProperties)
return transaction->Bank();
if (isBankwise())
return transaction->Bank();
else
return transaction->Rank() * drawingProperties.banksPerRank;
}
Qt::BrushStyle Phase::getBrushStyle() const

9
DRAMSys/traceAnalyzer/presentation/pornotracescroller.cpp
View File

@@ -86,10 +86,11 @@ void PornoTraceScroller::setUpTracePlotItem()
void PornoTraceScroller::setUpDrawingProperties()
{
unsigned int numberOfBanks = navigator->GeneralTraceInfo().numberOfBanks;
drawingProperties.numberOfBanks = numberOfBanks;
drawingProperties.yValResponse = numberOfBanks;
drawingProperties.yValRequest = numberOfBanks + 1;
drawingProperties.numberOfRanks = navigator->GeneralTraceInfo().numberOfRanks;
drawingProperties.numberOfBanks = navigator->GeneralTraceInfo().numberOfBanks;
drawingProperties.banksPerRank = drawingProperties.numberOfBanks / drawingProperties.numberOfRanks;
drawingProperties.yValResponse = drawingProperties.numberOfBanks;
drawingProperties.yValRequest = drawingProperties.numberOfBanks + 1;
drawingProperties.yValCommandBus = -3;
drawingProperties.yValDataBus = -4;
}

4
DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h
View File

@@ -55,6 +55,7 @@ struct TraceDrawingProperties {
int yValDataBus;
unsigned int numberOfRanks;
unsigned int numberOfBanks;
unsigned int banksPerRank;
TraceDrawingProperties() : drawText(true), drawBorder(true),
colorGrouping(ColorGrouping::PhaseType) {}
@@ -67,7 +68,8 @@ struct TraceDrawingProperties {
drawText(drawText), drawBorder(drawBorder), colorGrouping(colorGrouping),
yValResponse(yValResponse), yValRequest(yValRequest),
yValCommandBus(yValCommandBus), yValDataBus(yValDataBus),
numberOfRanks(numberOfRanks), numberOfBanks(numberOfBanks) {}
numberOfRanks(numberOfRanks), numberOfBanks(numberOfBanks),
banksPerRank(numberOfBanks / numberOfRanks) {}
QHash<int, QString> getLabels() const
{

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

@@ -206,10 +206,10 @@ void TracePlot::connectNavigatorQ_SIGNALS()
void TracePlot::setUpDrawingProperties()
{
drawingProperties.numberOfRanks = navigator->GeneralTraceInfo().numberOfRanks;
unsigned int numberOfBanks = navigator->GeneralTraceInfo().numberOfBanks;
drawingProperties.numberOfBanks = numberOfBanks;
drawingProperties.yValResponse = numberOfBanks;
drawingProperties.yValRequest = numberOfBanks + 1;
drawingProperties.numberOfBanks = navigator->GeneralTraceInfo().numberOfBanks;
drawingProperties.banksPerRank = drawingProperties.numberOfBanks / drawingProperties.numberOfRanks;
drawingProperties.yValResponse = drawingProperties.numberOfBanks;
drawingProperties.yValRequest = drawingProperties.numberOfBanks + 1;
drawingProperties.yValCommandBus = -3;
drawingProperties.yValDataBus = -4;
}