HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r786:3f886841e62a

updated theme example. minor fix to legend

sauimone -

r786:3f886841e62a

parent child

Context file:

r786:3f886841e62a

Collapse all files

demos/chartthemes/themewidget.cpp +17 0

                 QChart *chart = new QChart();
                 chart->setTitle("Area chart");
                 {
+                    QString name("Series ");
+                    int nameIndex = 0;
                     for (int i(0); i < m_dataTable.count(); i++) {
                         QLineSeries *series1 = new QLineSeries(chart);
                         QLineSeries *series2 = new QLineSeries(chart);
+                        series1->setName(name + QString::number(nameIndex) + QString(" lo"));
+                        series2->setName(name + QString::number(nameIndex) + QString(" hi"));
+                        nameIndex++;
                         foreach (Data data, m_dataTable[i]) {
                             series1->add(data.first);
                             series2->add(QPointF(data.first.x(), 0.0));
                 // line chart
                 QChart* chart = new QChart();
                 chart->setTitle("Line chart");
+                QString name("Series ");
+                int nameIndex = 0;
                 foreach (DataList list, m_dataTable) {
                     QLineSeries *series = new QLineSeries(chart);
                     foreach (Data data, list)
                         series->add(data.first);
+                    series->setName(name + QString::number(nameIndex));
+                    nameIndex++;
                     chart->addSeries(series);
                 }
                 return chart;
             { // spine chart
                 QChart* chart = new QChart();
                 chart->setTitle("Spline chart");
+                QString name("Series ");
+                int nameIndex = 0;
                 foreach (DataList list, m_dataTable) {
                     QSplineSeries *series = new QSplineSeries(chart);
                     foreach (Data data, list)
                         series->add(data.first);
+                    series->setName(name + QString::number(nameIndex));
+                    nameIndex++;
                     chart->addSeries(series);
                 }
                 return chart;
             { // scatter chart
                 QChart* chart = new QChart();
                 chart->setTitle("Scatter chart");
+                QString name("Series ");
+                int nameIndex = 0;
                 foreach (DataList list, m_dataTable) {
                     QScatterSeries *series = new QScatterSeries(chart);
                     foreach (Data data, list)
                         series->add(data.first);
+                    series->setName(name + QString::number(nameIndex));
+                    nameIndex++;
                     chart->addSeries(series);
                 }
                 return chart;

src/legendmarker.cpp +2 0

                 {
                 case LegendMarkerTypeSeries: {
                     QXYSeries* s = static_cast<QXYSeries*> (m_series);
+                    setPen(s->pen());
                     setBrush(s->brush());
                     setName(s->name());
                     break;
                 }
                 case LegendMarkerTypeBarset: {
+                    setPen(m_barset->pen());
                     setBrush(m_barset->brush());
                     setName(m_barset->name());
                     break;

src/qlegend.cpp +13 -13

             */
             void QLegend::appendMarkers(QBarSeries *series)
             {
-                foreach(QBarSet* s, series->barSets()) {
+                foreach(QBarSet* set, series->barSets()) {
-                    LegendMarker* marker = new LegendMarker(series, s, this);
+                    LegendMarker* marker = new LegendMarker(series, set, this);
-                    marker->setName(s->name());
+                    marker->setName(set->name());
-                    marker->setPen(s->pen());
+                    marker->setPen(set->pen());
-                    marker->setBrush(s->brush());
+                    marker->setBrush(set->brush());
                     connect(marker, SIGNAL(clicked(QBarSet *, Qt::MouseButton)),
                             this, SIGNAL(clicked(QBarSet *, Qt::MouseButton)));
-                    connect(s, SIGNAL(valueChanged()), marker, SLOT(changed()));
+                    connect(set, SIGNAL(valueChanged()), marker, SLOT(changed()));
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers.append(marker);
                     childItems().append(marker);
             */
             void QLegend::appendMarkers(QPieSeries *series)
             {
-                foreach(QPieSlice* s, series->slices()) {
+                foreach(QPieSlice* slice, series->slices()) {
-                    LegendMarker* marker = new LegendMarker(series, s, this);
+                    LegendMarker* marker = new LegendMarker(series, slice, this);
-                    marker->setName(s->label());
+                    marker->setName(slice->label());
-                    marker->setPen(s->pen());
+                    marker->setPen(slice->pen());
-                    marker->setBrush(s->brush());
+                    marker->setBrush(slice->brush());
                     connect(marker, SIGNAL(clicked(QPieSlice *, Qt::MouseButton)),
                             this, SIGNAL(clicked(QPieSlice *, Qt::MouseButton)));
-                    connect(s, SIGNAL(changed()), marker, SLOT(changed()));
+                    connect(slice, SIGNAL(changed()), marker, SLOT(changed()));
-                    connect(s, SIGNAL(destroyed()), marker, SLOT(deleteLater()));
+                    connect(slice, SIGNAL(destroyed()), marker, SLOT(deleteLater()));
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     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