diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp index 05bbdc61..e8ab05ba 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp @@ -4,17 +4,17 @@ PhaseDependency::PhaseDependency(DependencyType type, QString timeDependency, std::shared_ptr dependency) { - _type = type; - _timeDependency = timeDependency; - _dependency = dependency; + mType = type; + mTimeDependency = timeDependency; + mDependency = dependency; } PhaseDependency::PhaseDependency(DependencyType type, QString timeDependency) { - _type = type; - _timeDependency = timeDependency; - _dependency = nullptr; - _isInvisible = true; + mType = type; + mTimeDependency = timeDependency; + mDependency = nullptr; + mIsInvisible = true; } PhaseDependency::~PhaseDependency() @@ -26,17 +26,17 @@ bool PhaseDependency::draw(QPoint& end, const TraceDrawingProperties &drawingPro bool drawtext, QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap) { - if (_isInvisible) return false; + if (mIsInvisible) return false; - traceTime depBegin = _dependency->span.Begin(); - traceTime depEnd = _dependency->span.End(); + traceTime depBegin = mDependency->span.Begin(); + traceTime depEnd = mDependency->span.End(); if (xMap.transform(depEnd) < 0) return false; bool drawn = false; - for (auto line : _dependency->getTracePlotLines(drawingProperties)) { + for (auto line : mDependency->getTracePlotLines(drawingProperties)) { if (!line->isCollapsed()) { - _draw(end, line->getYVal(), drawingProperties, drawtext, painter, xMap, yMap); + mDraw(end, line->getYVal(), drawingProperties, drawtext, painter, xMap, yMap); drawn = true; } } @@ -46,17 +46,17 @@ bool PhaseDependency::draw(QPoint& end, const TraceDrawingProperties &drawingPro return drawn; } -void PhaseDependency::_draw(QPoint& end, double depY, const TraceDrawingProperties &drawingProperties, +void PhaseDependency::mDraw(QPoint& end, double depY, const TraceDrawingProperties &drawingProperties, bool drawtext, QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap) { - traceTime depBegin = _dependency->span.Begin(); - traceTime depEnd = _dependency->span.End(); + traceTime depBegin = mDependency->span.Begin(); + traceTime depEnd = mDependency->span.End(); - traceTime depOffset = (depBegin == depEnd) ? static_cast(0.05 * _dependency->clk) : 0; + traceTime depOffset = (depBegin == depEnd) ? static_cast(0.05 * mDependency->clk) : 0; double depYVal = yMap.transform(depY); - double depSymbolHeight = yMap.transform(0) - yMap.transform(_dependency->hexagonHeight); + double depSymbolHeight = yMap.transform(0) - yMap.transform(mDependency->hexagonHeight); QPoint depLineFrom(static_cast(xMap.transform(depBegin/* + (depEnd + depOffset - depBegin)/4*/)), static_cast(depYVal)); QLineF line(depLineFrom, end); @@ -68,8 +68,8 @@ void PhaseDependency::_draw(QPoint& end, double depY, const TraceDrawingProperti QPolygonF arrowHead; arrowHead << line.p2() << arrowP1 << arrowP2; - QColor color = _dependency->getColor(drawingProperties); - painter->setBrush(QBrush(color, _dependency->getBrushStyle())); + QColor color = mDependency->getColor(drawingProperties); + painter->setBrush(QBrush(color, mDependency->getBrushStyle())); painter->drawLine(line); painter->drawPolygon(arrowHead); @@ -89,7 +89,7 @@ void PhaseDependency::_draw(QPoint& end, double depY, const TraceDrawingProperti drawText( painter, - _timeDependency, + mTimeDependency, textPosition, alignment ); diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h index 34fc4ec0..7a0564b4 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h +++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h @@ -22,20 +22,20 @@ class PhaseDependency PhaseDependency(DependencyType type, QString timeDependency); ~PhaseDependency(); - bool isVisible() { return !_isInvisible; } + bool isVisible() { return !mIsInvisible; } bool draw(QPoint& end, const TraceDrawingProperties &drawingProperties, bool drawtext, QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap); protected: - DependencyType _type; - QString _timeDependency; - std::shared_ptr _dependency; + DependencyType mType; + QString mTimeDependency; + std::shared_ptr mDependency; - bool _isInvisible = false; + bool mIsInvisible = false; - void _draw(QPoint& end, double depY, const TraceDrawingProperties &drawingProperties, + void mDraw(QPoint& end, double depY, const TraceDrawingProperties &drawingProperties, bool drawtext, QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap); };