HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1528:3fc8801b31bb

Removed QLegend::setLabelPen, clean up theme label brushes

Tero Ahola -

r1528:3fc8801b31bb

parent child

Context file:

r1528:3fc8801b31bb

Collapse all files

src/charttheme.cpp +5 -7

             ChartTheme::ChartTheme(QChart::ChartTheme id) :
                 m_masterFont(QFont("arial", 14)),
                 m_labelFont(QFont("arial", 10)),
-                m_titleBrush(QColor(QRgb(0x000000))),
+                m_labelBrush(QColor(QRgb(0x000000))),
                 m_axisLinePen(QPen(QRgb(0x000000))),
-                m_axisLabelBrush(QColor(QRgb(0x000000))),
                 m_backgroundShadesPen(Qt::NoPen),
                 m_backgroundShadesBrush(Qt::NoBrush),
                 m_backgroundShades(BackgroundShadesNone),
                 if(brush == chart->backgroundBrush() ||  m_force)
                     chart->setBackgroundBrush(m_chartBackgroundGradient);
                 chart->setTitleFont(m_masterFont);
-                chart->setTitleBrush(m_titleBrush);
+                chart->setTitleBrush(m_labelBrush);
                 chart->setDropShadowEnabled(m_backgroundDropShadowEnabled);
             }
                 if (brush == legend->brush() || m_force)
                     legend->setBrush(m_chartBackgroundGradient);
-                // TODO: should legend have own brush & font defined by theme?
                 if (font == legend->font() || m_force)
                     legend->setFont(m_labelFont);
                 if (brush == legend->labelBrush() || m_force)
-                    legend->setLabelBrush(m_axisLabelBrush);
+                    legend->setLabelBrush(m_labelBrush);
             }
             void ChartTheme::decorate(QAreaSeries *series, int index)
                         d->setBrush(brushColor, true);
                     if (d->m_data.m_labelBrush.isThemed() || m_force)
-                        d->setLabelBrush(QBrush(m_titleBrush.color()), true);
+                        d->setLabelBrush(m_labelBrush.color(), true);
                     if (d->m_data.m_labelFont.isThemed() || m_force)
                         d->setLabelFont(m_labelFont, true);
                 if (axis->isAxisVisible()) {
                     if(brush == axis->labelsBrush() ||  m_force){
-                        axis->setLabelsBrush(m_axisLabelBrush);
+                        axis->setLabelsBrush(m_labelBrush);
                     }
                     if(pen == axis->labelsPen() ||  m_force){
                         axis->setLabelsPen(Qt::NoPen); // NoPen for performance reasons

src/charttheme_p.h +1 -2

                 QFont m_masterFont;
                 QFont m_labelFont;
-                QBrush m_titleBrush;
+                QBrush m_labelBrush;
                 QPen m_axisLinePen;
-                QBrush m_axisLabelBrush;
                 QPen m_backgroundShadesPen;
                 QBrush m_backgroundShadesBrush;
                 BackgroundShadesMode m_backgroundShades;

src/legend/legendmarker.cpp +2 -13

             void LegendMarker::setPen(const QPen &pen)
             {
-                m_textItem->setPen(pen);
+                m_rectItem->setPen(pen);
                 updateLayout();
             }
             QPen LegendMarker::pen() const
             {
-                return m_textItem->pen();
+                return m_rectItem->pen();
             }
             void LegendMarker::setBrush(const QBrush &brush)
                 return m_textItem->brush();
             }
-            void LegendMarker::setLabelPen(const QPen &pen)
-                m_textItem->setPen(pen);
-                updateLayout();
-            QPen LegendMarker::labelPen() const
-                return m_textItem->pen();
             void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)

src/legend/legendmarker_p.h 0 -2

                 QString label() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;
-                void setLabelPen(const QPen &pen);
-                QPen labelPen() const;
                 QAbstractSeries *series() const { return m_series;}

src/legend/qlegend.cpp 0 -29

                 return d_ptr->m_font;
             }
-            void QLegend::setLabelPen(const QPen &pen)
-                if (d_ptr->m_labelPen != pen) {
-                    d_ptr->setLabelPen(pen);
-                    emit labelPenChanged(pen);
-            QPen QLegend::labelPen() const
-                return d_ptr->m_labelPen;
             void QLegend::setLabelBrush(const QBrush &brush)
             {
-                qDebug() << "setting legend brush 1";
                 if (d_ptr->m_labelBrush != brush) {
                     d_ptr->setLabelBrush(brush);
                     emit labelBrushChanged(brush);
-                    qDebug() << "setting legend brush 2";
                 }
             }
                 m_alignment(Qt::AlignTop),
                 m_brush(QBrush()),
                 m_pen(QPen()),
-                m_labelPen(QPen(Qt::NoPen)),
                 m_labelBrush(QBrush()),
                 m_offsetX(0),
                 m_offsetY(0),
                 updateLayout();
             }
-            void QLegendPrivate::setLabelPen(const QPen &pen)
-                m_labelPen = pen;
-                QList<QGraphicsItem *> items = m_markers->childItems();
-                foreach (QGraphicsItem *markers, items) {
-                    LegendMarker *marker = static_cast<LegendMarker*>(markers);
-                    marker->setPen(m_labelPen);
-                updateLayout();
             void QLegendPrivate::setLabelBrush(const QBrush &brush)
             {
                 m_labelBrush = brush;
                 QList<LegendMarker*> markers = series->d_ptr->createLegendMarker(q_ptr);
                 foreach(LegendMarker* marker, markers) {
                     marker->setFont(m_font);
-                    marker->setLabelPen(m_labelPen);
                     marker->setLabelBrush(m_labelBrush);
                     m_markers->addToGroup(marker);
                 }

src/legend/qlegend.h 0 -7

                 Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
                 Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
                 Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
-            // TODO?
-            //    Q_PROPERTY(QColor labelBorderColor READ labelBorderColor WRITE setLabelBorderColor NOTIFY labelBorderColorChanged)
             private:
                 explicit QLegend(QChart *chart);
                 void setFont(const QFont &font);
                 QFont font() const;
-                void setLabelPen(const QPen &pen);
-                QPen labelPen() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;
                 void colorChanged(QColor color);
                 void borderColorChanged(QColor color);
                 void fontChanged(QFont font);
-                void labelPenChanged(QPen pen);
                 void labelBrushChanged(QBrush brush);
                 void labelColorChanged(QColor color);
-            // TODO?
-            //    void labelBorderColorChanged(QColor color);
             private:
                 QScopedPointer<QLegendPrivate> d_ptr;

src/legend/qlegend_p.h 0 -2

                 void attachToChart();
                 int roundness(qreal size);
                 void setFont(const QFont &font);
-                void setLabelPen(const QPen &pen);
                 void setLabelBrush(const QBrush &brush);
             public Q_SLOTS:
                 QBrush m_brush;
                 QPen m_pen;
                 QFont m_font;
-                QPen m_labelPen;
                 QBrush m_labelBrush;
                 QRectF m_rect;
                 qreal m_offsetX;

src/themes/chartthemebluecerulean_p.h +1 -2

                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
-                    m_titleBrush = QBrush(QRgb(0xffffff));
+                    m_labelBrush = QBrush(QRgb(0xffffff));
                     m_axisLinePen = QPen(QRgb(0xd6d6d6));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0xffffff));
                     m_gridLinePen = QPen(QRgb(0x84a2b0));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;

src/themes/chartthemeblueicy_p.h +1 -2

                     m_backgroundDropShadowEnabled = true;
                     // Axes and other
-                    m_titleBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_axisLinePen = QPen(QRgb(0xd6d6d6));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;

src/themes/chartthemebluencs_p.h +1 -2

                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
-                    m_titleBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_axisLinePen = QPen(QRgb(0xd6d6d6));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;

src/themes/chartthemebrownsand_p.h +1 -2

                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
-                    m_titleBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_axisLinePen = QPen(QRgb(0xb5b0a7));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xd4cec3));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;

src/themes/chartthemedark_p.h +1 -2

                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
-                    m_titleBrush = QBrush(QRgb(0xffffff));
+                    m_labelBrush = QBrush(QRgb(0xffffff));
                     m_axisLinePen = QPen(QRgb(0x86878c));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0xffffff));
                     m_gridLinePen = QPen(QRgb(0x86878c));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;

src/themes/chartthemehighcontrast_p.h +1 -2

                     m_backgroundDropShadowEnabled = true;
                     // Axes and other
-                    m_titleBrush = QBrush(QRgb(0x181818));
+                    m_labelBrush = QBrush(QRgb(0x181818));
                     m_axisLinePen = QPen(QRgb(0x8c8c8c));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0x181818));
                     m_gridLinePen = QPen(QRgb(0x8c8c8c));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShadesBrush = QBrush(QRgb(0xffeecd));

src/themes/chartthemelight_p.h +1 -1

                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;

src/themes/chartthemesystem_p.h +4 -4

                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
-                    m_axisLabelBrush = QBrush(QRgb(0x404044));
+                    m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +2 0

                 legend.onBackgroundVisibleChanged: console.log("legend.onBackgroundVisibleChanged: " + visible);
                 legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                 legend.onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);
+                legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
+                legend.onLabelBrushChanged:        console.log("legend.onLabelBrushChanged: " + brush);
                 axisX.onColorChanged:               console.log("axisX.onColorChanged: " + color);
                 axisX.onLabelsVisibleChanged:       console.log("axisX.onLabelsVisibleChanged: " + visible);

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor2.qml +4 0

                         onClicked: chartLegend.borderColor = main.nextColor();
                     }
                     Button {
+                        text: "legend label color"
+                        onClicked: chartLegend.labelColor = main.nextColor();
+                    }
+                    Button {
                         text: "legend top"
                         onClicked: chartLegend.alignment ^= Qt.AlignTop;
                     }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages