CVS commit by sebsauer: Better colors and redo pie-legend. M +13 -7 statspageclients.cpp 1.4 --- kdeextragear-2/kmldonkey/kmldonkey/statspageclients.cpp #1.3:1.4 @@ -63,6 +63,9 @@ void ClientsPieWidget::paintEvent(QPaint if (values.count() > 1) { // at least 2 values should be there to display a pie + QFontMetrics fontmet( KGlobalSettings::generalFont() ); + int startpos = -1440; //-90*16 int alen; + int labelpos = fontmet.height() + 2; QValueList::iterator it; @@ -73,6 +76,9 @@ void ClientsPieWidget::paintEvent(QPaint painter.setPen( (*it)->color ); - painter.drawPie(2, 2, width() - 4, height() - 4, startpos, alen); + painter.drawPie(2 + 130, 2, width() - 4 - 130, height() - 4, startpos, alen); startpos += alen; + + painter.drawText(2, labelpos, (*it)->label); + labelpos += fontmet.height() + 2; } } @@ -84,13 +90,13 @@ void ClientsPieWidget::paintEvent(QPaint StatsPageClientsCallback::StatsPageClientsCallback() { + colorsList.append( Qt::blue ); colorsList.append( Qt::darkBlue ); colorsList.append( Qt::darkMagenta ); - colorsList.append( Qt::darkYellow ); - colorsList.append( Qt::darkRed ); colorsList.append( Qt::darkGreen ); - colorsList.append( Qt::darkCyan ); - colorsList.append( Qt::blue ); colorsList.append( Qt::red ); - colorsList.append( Qt::green ); + colorsList.append( Qt::darkCyan ); + colorsList.append( Qt::darkRed ); + colorsList.append( Qt::darkYellow ); + //colorsList.append( Qt::green ); colorsListIterator = colorsList.begin(); @@ -155,5 +161,5 @@ void StatsPageClientsCallback::callback( } pie->addValue(label.endsWith(":") ? label.left(label.length() - 1) : label, pv, colorsMap[label]); - value = value.left(p1+1) + "" + value.mid(p1+1, p3-p1-1) + "" + value.right(value.length()-p3); + value = value.left(p1+1) + "" + value.mid(p1+1, p3-p1-1) + "" + value.right(value.length()-p3); } }