From 00f7ce2a6a97faaf817a8e4a0de608755c8c4de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Vermot?= Date: Sat, 4 May 2024 12:42:40 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20couleur=20texte=20graph=20s?= =?UTF-8?q?tats=20par=20a=C3=A9ronef?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ManageDb.cpp | 1 - src/StatistiqueDonutCombine.cpp | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ManageDb.cpp b/src/ManageDb.cpp index d7e6767..232c9b3 100644 --- a/src/ManageDb.cpp +++ b/src/ManageDb.cpp @@ -1107,7 +1107,6 @@ AeroDmsTypes::ListeVolSortieOuBalade ManageDb::recupererBaladesEtSorties( const const float p_proportionRemboursement, const int p_annee ) { - qDebug() << p_annee; AeroDmsTypes::ListeVolSortieOuBalade liste; QSqlQuery query; if (p_annee == -1) diff --git a/src/StatistiqueDonutCombine.cpp b/src/StatistiqueDonutCombine.cpp index 3e2018e..8065a97 100644 --- a/src/StatistiqueDonutCombine.cpp +++ b/src/StatistiqueDonutCombine.cpp @@ -22,7 +22,7 @@ StatistiqueDonutCombine::StatistiqueDonutCombine(QGraphicsItem* parent, Qt::Wind void StatistiqueDonutCombine::addBreakdownSeries(QPieSeries* breakdownSeries, QColor color) { - QFont font("Arial", 10); + QFont font("Arial", 8); // add breakdown series as a slice to center pie auto mainSlice = new StatistiqueDonutCombinePartie(breakdownSeries); @@ -33,7 +33,11 @@ void StatistiqueDonutCombine::addBreakdownSeries(QPieSeries* breakdownSeries, QC // customize the slice mainSlice->setBrush(color); mainSlice->setLabelVisible(); - mainSlice->setLabelColor(Qt::black); + const float darkness = 0.2126 * color.redF() + 0.7152 * color.greenF() + 0.0722 * color.blueF(); + if(darkness > 0.5) + mainSlice->setLabelColor(Qt::black); + else + mainSlice->setLabelColor(Qt::white); mainSlice->setLabelPosition(QPieSlice::LabelInsideNormal); mainSlice->setLabelFont(font);