HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r800:32248fc3cb26

solid brush for all legend markers

sauimone -

r800:32248fc3cb26

parent child

Context file:

r800:32248fc3cb26

Collapse all files

src/legendmarker.cpp +9 -5

             void LegendMarker::changed()
             {
+                setPen(Qt::NoPen);
                 switch (m_series->type()) {
                 case QSeries::SeriesTypeArea: {
                     QAreaSeries* s = static_cast<QAreaSeries*> (m_series);
-                    setPen(s->pen());
                     setBrush(s->brush());
                     setName(s->name());
                     break;
                 }
                 case QSeries::SeriesTypeLine:
-                case QSeries::SeriesTypeScatter:
                 case QSeries::SeriesTypeSpline: {
                     QXYSeries* s = static_cast<QXYSeries*> (m_series);
-                    setPen(s->pen());
+                    setBrush(QBrush(s->pen().color(),Qt::SolidPattern));
-                    setBrush(s->brush());
                     setName(s->name());
                     break;
                     }
+                case QSeries::SeriesTypeScatter: {
+                    QXYSeries* s = static_cast<QXYSeries*> (m_series);
+                    setBrush(s->brush());
+                    setName(s->name());
+                    break;
+                }
                 case QSeries::SeriesTypeBar:
                 case QSeries::SeriesTypeStackedBar:
                 case QSeries::SeriesTypePercentBar: {
-                    setPen(m_barset->pen());
                     setBrush(m_barset->brush());
                     setName(m_barset->name());
                     break;
                     break;
                     }
                 default: {
+                    setBrush(Qt::NoBrush);
                     break;
                     }
                 }

src/qchart.cpp +1 -1

                 switch (m_legend->alignment())
                 {
                     case QLegend::AlignmentTop: {
-                        legendRect = m_rect.adjusted(0,0,0,-padding - plotRect.height());
+                        legendRect = m_rect.adjusted(0,padding,0,-padding - plotRect.height());
                         break;
                     }
                     case QLegend::AlignmentBottom: {

src/qlegend.cpp +5 -13

                 m_maximumSize(150,100),
                 m_size(m_minimumSize),
                 m_brush(Qt::darkGray),              // TODO: default should come from theme
-                m_alignment(QLegend::AlignmentRight),
+                m_alignment(QLegend::AlignmentTop),
                 mFirstMarker(0),
                 m_attachedToChart(true)
             {
             void QLegend::appendMarkers(QAreaSeries* series)
             {
                 LegendMarker* marker = new LegendMarker(series,this);
-                marker->setName(series->name());
-                marker->setPen(series->pen());
-                marker->setBrush(series->brush());
                 connect(marker, SIGNAL(clicked(QSeries *, Qt::MouseButton)), this, SIGNAL(clicked(QSeries *, Qt::MouseButton)));
                 connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 connect(series,SIGNAL(updated()),marker,SLOT(changed()));
+                marker->changed();
                 m_markers.append(marker);
                 childItems().append(marker);
             }
             void QLegend::appendMarkers(QXYSeries* series)
             {
                 LegendMarker* marker = new LegendMarker(series,this);
-                marker->setName(series->name());
-                marker->setPen(series->pen());
-                marker->setBrush(series->brush());
                 connect(marker, SIGNAL(clicked(QSeries *, Qt::MouseButton)), this, SIGNAL(clicked(QSeries *, Qt::MouseButton)));
                 connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 connect(series,SIGNAL(updated()),marker,SLOT(changed()));
+                marker->changed();
                 m_markers.append(marker);
                 childItems().append(marker);
             }
             {
                 foreach(QBarSet* set, series->barSets()) {
                     LegendMarker* marker = new LegendMarker(series, set, this);
-                    marker->setName(set->name());
-                    marker->setPen(set->pen());
-                    marker->setBrush(set->brush());
                     connect(marker, SIGNAL(clicked(QBarSet *, Qt::MouseButton)),
                             this, SIGNAL(clicked(QBarSet *, Qt::MouseButton)));
                     connect(set, SIGNAL(valueChanged()), marker, SLOT(changed()));
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
+                    marker->changed();
                     m_markers.append(marker);
                     childItems().append(marker);
                 }
             {
                 foreach(QPieSlice* slice, series->slices()) {
                     LegendMarker* marker = new LegendMarker(series, slice, this);
-                    marker->setName(slice->label());
-                    marker->setPen(slice->pen());
-                    marker->setBrush(slice->brush());
                     connect(marker, SIGNAL(clicked(QPieSlice *, Qt::MouseButton)),
                             this, SIGNAL(clicked(QPieSlice *, Qt::MouseButton)));
                     connect(slice, SIGNAL(changed()), marker, SLOT(changed()));
                     connect(slice, SIGNAL(destroyed()), marker, SLOT(deleteLater()));
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
+                    marker->changed();
                     m_markers.append(marker);
                     childItems().append(marker);
                 }

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