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

Renamed 'Alpha Colored' to 'Rainbow Colored'.

Browse Source
This commit is contained in:
Iron Prando da Silva
2021-11-25 14:05:14 +01:00
parent 92c8e0c72c
commit 2f93773913
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,8 +186,8 @@ QColor Phase::getColor(const TraceDrawingProperties &drawingProperties) const
case ColorGrouping::Thread:
return ColorGenerator::getColor(static_cast<unsigned int>(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:

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

@@ -57,7 +57,7 @@ enum class ColorGrouping
PhaseType,
Transaction,
Thread,
AlphaTransaction
RainbowTransaction
};
class TracePlot;

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

@@ -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();
}

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

@@ -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;

6
DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp
View File

@@ -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};

2
DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h
View File

@@ -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);
};

2
DRAMSys/traceAnalyzer/presentation/util/colorobject.cpp
View File

@@ -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;

2
DRAMSys/traceAnalyzer/presentation/util/colorobject.h
View File

@@ -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