Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed up color codes for qt 4.7 in NetworkGraph (bug in qt::lighter())

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-08-31 20:04:04 +00:00
parent 8941aa5991
commit 52a8b281d5
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/NetworkView.cpp
View File

@ -158,7 +158,7 @@ void NetworkView::updateDisplay()
if(!rsPeers->getPeerDetails(info.gpg_id, detail)) if(!rsPeers->getPeerDetails(info.gpg_id, detail))
continue ; continue ;
switch(detail.validLvl) switch(detail.trustLvl)
{ {
case GPGME_VALIDITY_MARGINAL: auth = GraphWidget::ELASTIC_NODE_AUTH_MARGINAL ; break; case GPGME_VALIDITY_MARGINAL: auth = GraphWidget::ELASTIC_NODE_AUTH_MARGINAL ; break;
case GPGME_VALIDITY_FULL: case GPGME_VALIDITY_FULL:

26
retroshare-gui/src/gui/elastic/node.cpp
View File

@ -79,6 +79,9 @@ Node::Node(const std::string& node_string,GraphWidget::NodeType type,GraphWidget
_speedx=_speedy=0; _speedx=_speedy=0;
_steps=0; _steps=0;
if(_type == GraphWidget::ELASTIC_NODE_TYPE_OWN)
_auth = GraphWidget::ELASTIC_NODE_AUTH_FULL ;
} }
void Node::addEdge(Edge *edge) void Node::addEdge(Edge *edge)
@ -239,6 +242,19 @@ QPainterPath Node::shape() const
return path; return path;
} }
#if QT_VERSION >= 0x040700
static QColor lightdark(const QColor& col,int l,int d)
{
int h,s,v ;
col.getHsv(&h,&s,&v) ;
v = (int)floor(v * l/(float)d ) ;
return QColor::fromHsv(h,s,v) ;
}
#endif
void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
{ {
static QColor type_color[4] = { QColor(Qt::yellow), QColor(Qt::green), QColor(Qt::cyan), QColor(Qt::black) } ; static QColor type_color[4] = { QColor(Qt::yellow), QColor(Qt::green), QColor(Qt::cyan), QColor(Qt::black) } ;
@ -254,13 +270,23 @@ void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWid
{ {
gradient.setCenter(3, 3); gradient.setCenter(3, 3);
gradient.setFocalPoint(3, 3); gradient.setFocalPoint(3, 3);
#if QT_VERSION >= 0x040700
gradient.setColorAt(1, lightdark(col0,120, 100+_auth*50));
gradient.setColorAt(0, lightdark(col0, 70, 100+_auth*50));
#else
gradient.setColorAt(1, col0.light(120).dark(100+_auth*100)); gradient.setColorAt(1, col0.light(120).dark(100+_auth*100));
gradient.setColorAt(0, col0.light(70).dark(100+_auth*100)); gradient.setColorAt(0, col0.light(70).dark(100+_auth*100));
#endif
} }
else else
{ {
#if QT_VERSION >= 0x040700
gradient.setColorAt(1, lightdark(col0, 50,100+_auth*50));
gradient.setColorAt(0, lightdark(col0,100,100+_auth*50));
#else
gradient.setColorAt(1, col0.light(50).dark(100+_auth*100)); gradient.setColorAt(1, col0.light(50).dark(100+_auth*100));
gradient.setColorAt(0, col0.dark(100+_auth*100)); gradient.setColorAt(0, col0.dark(100+_auth*100));
#endif
} }
painter->setBrush(gradient); painter->setBrush(gradient);
painter->setPen(QPen(Qt::black, 0)); painter->setPen(QPen(Qt::black, 0));