feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Improve color highlighting of memory view.

Browse Source 
Factor out and streamline code from the annotation highlighter
to create a list of colors suitable for highlighting and use that
in memory view.

Task-number: QTCREATORBUG-8250
Change-Id: Iefd408847897ddc98e3aecd6e4f084d1415b80c0
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-11-15 16:57:11 +01:00
committed by hjk
parent 4cc11497fe
commit 0767aab4b9
4 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/vcsbase/baseannotationhighlighter.cpp
View File

@@ -29,7 +29,6 @@
#include "baseannotationhighlighter.h"
#include <math.h>
#include <QSet>
#include <QDebug>
#include <QColor>
@@ -81,26 +80,12 @@ BaseAnnotationHighlighter::~BaseAnnotationHighlighter()
void BaseAnnotationHighlighter::setChangeNumbers(const ChangeNumbers &changeNumbers)
{
QColor bg = d->m_background;
d->m_changeNumberMap.clear();
if (!changeNumbers.isEmpty()) {
// Assign a color gradient to annotation change numbers. Give
// each change number a unique color.
const double oneThird = 1.0 / 3.0;
const int step = qRound(ceil(pow(double(changeNumbers.count()), oneThird)));
QList<QColor> colors;
const int factor = 255 / step;
int half = factor / 2;
for (int i=0; i<=step; ++i)
for (int j=0; j<=step; ++j)
for (int k=0; k<=step; ++k) {
QColor c(i*factor, j*factor, k*factor);
if ((bg.red() - half > c.red() ||bg.red() + half <= c.red())
&& (bg.green() - half > c.green() || bg.green() + half <= c.green())
&& (bg.blue() - half > c.blue() || bg.blue() + half <= c.blue()))
colors.prepend(c);
}
const QList<QColor> colors =
TextEditor::SyntaxHighlighter::generateColors(changeNumbers.size(), d->m_background);
int m = 0;
const int cstep = colors.count() / changeNumbers.count();
const ChangeNumbers::const_iterator cend = changeNumbers.constEnd();