diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp index 0c13f1fd..463fde5c 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp @@ -69,7 +69,7 @@ void Phase::draw(QPainter *painter, const QwtScaleMap &xMap, if (!line->isCollapsed()) { drawPhaseSymbol(span.Begin(), span.End(), line->getYVal(), - drawingProperties.drawText, getPhaseSymbol(), painter, xMap, yMap); + drawingProperties.drawText, getPhaseSymbol(), painter, xMap, yMap, drawingProperties.textColor); if (getGranularity() == Granularity::Bankwise) { @@ -90,7 +90,7 @@ void Phase::draw(QPainter *painter, const QwtScaleMap &xMap, for (auto commandBusLine : drawingProperties.getCommandBusLines()) { drawPhaseSymbol(span.Begin(), span.End(), commandBusLine->getYVal(), - false, PhaseSymbol::Hexagon, painter, xMap, yMap); + false, PhaseSymbol::Hexagon, painter, xMap, yMap, drawingProperties.textColor); } } @@ -99,14 +99,14 @@ void Phase::draw(QPainter *painter, const QwtScaleMap &xMap, for (auto dataBusLine : drawingProperties.getDataBusLines()) { drawPhaseSymbol(spanOnDataBus->Begin(), spanOnDataBus->End(), dataBusLine->getYVal(), - false, PhaseSymbol::Hexagon, painter, xMap, yMap); + false, PhaseSymbol::Hexagon, painter, xMap, yMap, drawingProperties.textColor); } } } void Phase::drawPhaseSymbol(traceTime begin, traceTime end, double y, bool drawtext, PhaseSymbol symbol, QPainter *painter, const QwtScaleMap &xMap, - const QwtScaleMap &yMap) const + const QwtScaleMap &yMap, QColor textColor) const { double yVal = yMap.transform(y); double symbolHeight = yMap.transform(0) - yMap.transform(hexagonHeight); @@ -126,7 +126,7 @@ void Phase::drawPhaseSymbol(traceTime begin, traceTime end, double y, if (drawtext) drawText(painter, Name(), QPoint(static_cast(xMap.transform(begin)), - static_cast(yVal + symbolHeight / 2)), TextPositioning::bottomRight); + static_cast(yVal + symbolHeight / 2)), TextPositioning::bottomRight, textColor); } void Phase::drawPhaseDependencies(traceTime begin, traceTime end, double y, diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.h b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.h index 3f05b8d2..ce474fe8 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.h +++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.h @@ -99,7 +99,7 @@ protected: virtual QColor getPhaseColor() const = 0; virtual void drawPhaseSymbol(traceTime begin, traceTime end, double y, bool drawtext, PhaseSymbol symbol, QPainter *painter, const QwtScaleMap &xMap, - const QwtScaleMap &yMap) const; + const QwtScaleMap &yMap, QColor textColor) const; virtual void drawPhaseDependencies(traceTime begin, traceTime end, double y, const TraceDrawingProperties &drawingProperties, QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap) const; diff --git a/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h b/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h index 6c437ad0..119d1a24 100644 --- a/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h +++ b/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h @@ -92,6 +92,7 @@ public: bool drawBorder; DependencyOptions drawDependenciesOption; ColorGrouping colorGrouping; + QColor textColor; unsigned int numberOfRanks = 1; unsigned int numberOfBankGroups = 1; diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp index 7c986afd..d81bc852 100644 --- a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp +++ b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp @@ -302,6 +302,7 @@ void TracePlot::setUpDrawingProperties() { drawingProperties.init(navigator->getTracePlotLines(), navigator->getTracePlotLineCache(), this); + drawingProperties.textColor = palette().text().color(); drawingProperties.numberOfRanks = navigator->GeneralTraceInfo().numberOfRanks; drawingProperties.numberOfBankGroups = navigator->GeneralTraceInfo().numberOfBankGroups; drawingProperties.numberOfBanks = navigator->GeneralTraceInfo().numberOfBanks; diff --git a/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp b/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp index 79d75c72..883c7c5c 100644 --- a/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp +++ b/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp @@ -106,6 +106,7 @@ void TraceScroller::setUpDrawingProperties() { drawingProperties.init(navigator->getTracePlotLines(), navigator->getTracePlotLineCache()); + drawingProperties.textColor = palette().text().color(); drawingProperties.numberOfRanks = navigator->GeneralTraceInfo().numberOfRanks; drawingProperties.numberOfBankGroups = navigator->GeneralTraceInfo().numberOfBankGroups; drawingProperties.numberOfBanks = navigator->GeneralTraceInfo().numberOfBanks; diff --git a/DRAMSys/traceAnalyzer/selectmetrics.ui b/DRAMSys/traceAnalyzer/selectmetrics.ui index b74e0ca8..cfbf9f22 100644 --- a/DRAMSys/traceAnalyzer/selectmetrics.ui +++ b/DRAMSys/traceAnalyzer/selectmetrics.ui @@ -67,9 +67,6 @@ true - - - true @@ -78,13 +75,10 @@ 0 0 - 469 - 599 + 467 + 597 - - background-color:white -