From 2f93773913b7ad7b4601e13bed88a3fdfab52d41 Mon Sep 17 00:00:00 2001 From: Iron Prando da Silva Date: Thu, 25 Nov 2021 14:05:14 +0100 Subject: [PATCH] Renamed 'Alpha Colored' to 'Rainbow Colored'. --- .../businessObjects/phases/phase.cpp | 4 ++-- .../presentation/tracedrawingproperties.h | 2 +- DRAMSys/traceAnalyzer/presentation/traceplot.cpp | 16 ++++++++-------- DRAMSys/traceAnalyzer/presentation/traceplot.h | 4 ++-- .../presentation/util/colorgenerator.cpp | 6 +++--- .../presentation/util/colorgenerator.h | 2 +- .../presentation/util/colorobject.cpp | 2 +- .../presentation/util/colorobject.h | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp index 55a7e0d0..42c9d66d 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp @@ -186,8 +186,8 @@ QColor Phase::getColor(const TraceDrawingProperties &drawingProperties) const case ColorGrouping::Thread: return ColorGenerator::getColor(static_cast(transaction.lock()->thread)); break; - case ColorGrouping::AlphaTransaction: - return ColorGenerator::getAlphaColored(transaction.lock()->id, ColorName::HSV15); + case ColorGrouping::RainbowTransaction: + return ColorGenerator::getRainbowColored(transaction.lock()->id, ColorName::HSV15); break; case ColorGrouping::Transaction: diff --git a/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h b/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h index 2573606e..0b71ce48 100644 --- a/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h +++ b/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h @@ -57,7 +57,7 @@ enum class ColorGrouping PhaseType, Transaction, Thread, - AlphaTransaction + RainbowTransaction }; class TracePlot; diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp index 7c93d29d..9389c5e5 100644 --- a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp +++ b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp @@ -147,10 +147,10 @@ void TracePlot::setUpActions() QObject::connect(setColorGroupingTransaction, SIGNAL(triggered()), this, SLOT(on_colorGroupingTransaction())); - setColorGroupingAlphaTransaction = new QAction("Group by Transaction - Alpha Colored", this); - addAction(setColorGroupingAlphaTransaction); - QObject::connect(setColorGroupingAlphaTransaction, SIGNAL(triggered()), this, - SLOT(on_colorGroupingAlphaTransaction())); + setColorGroupingRainbowTransaction = new QAction("Group by Transaction - Rainbow Colored", this); + addAction(setColorGroupingRainbowTransaction); + QObject::connect(setColorGroupingRainbowTransaction, SIGNAL(triggered()), this, + SLOT(on_colorGroupingRainbowTransaction())); setColorGroupingThread = new QAction("Group by Thread", this); addAction(setColorGroupingThread); @@ -222,7 +222,7 @@ void TracePlot::setUpContextMenu() QMenu *colorGroupingSubMenu = new QMenu("Group by", contextMenu); colorGroupingSubMenu->addActions( - {setColorGroupingPhase, setColorGroupingTransaction, setColorGroupingThread, setColorGroupingAlphaTransaction}); + {setColorGroupingPhase, setColorGroupingTransaction, setColorGroupingRainbowTransaction, setColorGroupingThread}); contextMenu->addMenu(colorGroupingSubMenu); dependenciesSubMenu = new QMenu("Show dependencies", contextMenu); @@ -586,10 +586,10 @@ void TracePlot::on_colorGroupingTransaction() replot(); } -void TracePlot::on_colorGroupingAlphaTransaction() +void TracePlot::on_colorGroupingRainbowTransaction() { - drawingProperties.colorGrouping = ColorGrouping::AlphaTransaction; - Q_EMIT(colorGroupingChanged(ColorGrouping::AlphaTransaction)); + drawingProperties.colorGrouping = ColorGrouping::RainbowTransaction; + Q_EMIT(colorGroupingChanged(ColorGrouping::RainbowTransaction)); replot(); } diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.h b/DRAMSys/traceAnalyzer/presentation/traceplot.h index c3ec388c..560b819f 100644 --- a/DRAMSys/traceAnalyzer/presentation/traceplot.h +++ b/DRAMSys/traceAnalyzer/presentation/traceplot.h @@ -108,7 +108,7 @@ private Q_SLOTS: void on_colorGroupingPhase(); void on_colorGroupingTransaction(); void on_colorGroupingThread(); - void on_colorGroupingAlphaTransaction(); + void on_colorGroupingRainbowTransaction(); void on_goToTransaction(); void on_goToPhase(); void on_deselectAll(); @@ -181,7 +181,7 @@ private: QAction *setColorGroupingPhase; QAction *setColorGroupingTransaction; QAction *setColorGroupingThread; - QAction *setColorGroupingAlphaTransaction; + QAction *setColorGroupingRainbowTransaction; QAction *exportToPdf; ToggleCollapsedAction *toggleCollapsedState; diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp b/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp index 11cf1023..c42339f5 100644 --- a/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp +++ b/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp @@ -51,13 +51,13 @@ QColor ColorGenerator::getColor(unsigned int i, ColorName color) return {0, 0, 0}; } -QColor ColorGenerator::getAlphaColored(unsigned int i, ColorName color) +QColor ColorGenerator::getRainbowColored(unsigned int i, ColorName color) { switch(color) { case ColorName::Default: - return cDefault.getAlphaColored(i); + return cDefault.getRainbowColored(i); case ColorName::HSV15: - return cHSV15.getAlphaColored(i); + return cHSV15.getRainbowColored(i); } return {0, 0, 0}; diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h b/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h index 7897393d..e1e98ec0 100644 --- a/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h +++ b/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h @@ -60,7 +60,7 @@ private: public: static QColor getColor(unsigned int i, ColorName color = ColorName::Default); - static QColor getAlphaColored(unsigned int i, ColorName color = ColorName::Default); + static QColor getRainbowColored(unsigned int i, ColorName color = ColorName::Default); }; diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorobject.cpp b/DRAMSys/traceAnalyzer/presentation/util/colorobject.cpp index a3e21ca8..a9a4e82b 100644 --- a/DRAMSys/traceAnalyzer/presentation/util/colorobject.cpp +++ b/DRAMSys/traceAnalyzer/presentation/util/colorobject.cpp @@ -47,7 +47,7 @@ QColor ColorObject::getColor(unsigned int i) return result; } -QColor ColorObject::getAlphaColored(unsigned int i) +QColor ColorObject::getRainbowColored(unsigned int i) { const int minAlpha = 50; const int alphaLevels = 20 - 255 / minAlpha; diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorobject.h b/DRAMSys/traceAnalyzer/presentation/util/colorobject.h index f54ee8f4..d3ec584c 100644 --- a/DRAMSys/traceAnalyzer/presentation/util/colorobject.h +++ b/DRAMSys/traceAnalyzer/presentation/util/colorobject.h @@ -55,7 +55,7 @@ protected: public: virtual QColor getColor(unsigned int i); - virtual QColor getAlphaColored(unsigned int i); + virtual QColor getRainbowColored(unsigned int i); }; class ColorDefault : public ColorObject