HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r182:0dd3fe4314e9

Enabled theme colors in scatter again

Tero Ahola -

r182:0dd3fe4314e9

parent child

Context file:

r182:0dd3fe4314e9

Collapse all files

example/scatter/main.cpp +12 -6

              {
                  QApplication a(argc, argv);
-                 // Create widget and scatter series
+                 // Create chart widget
                  QChartView *chartWidget = new QChartView();
+                 // Create scatter series with simple test data
                  QScatterSeries *scatter = new QScatterSeries();
+                 *scatter << QPointF(0.5, 2.0)
+                          << QPointF(1.0, 2.5)
+                          << QPointF(1.5, 2.0)
+                          << QPointF(2.0, 2.5);
+                 chartWidget->addSeries(scatter);
-                 // Add test data to the series
+                 // Add another scatter series with more complex data with random component
+                 QScatterSeries *scatter2 = new QScatterSeries();
                  for (qreal i(0.0); i < 20; i += 0.5)
-                     (*scatter) << QPointF(i + (qreal)(rand() % 100) / 100.0,
+                     (*scatter2) << QPointF(i + (qreal)(rand() % 100) / 100.0,
                                         i + (qreal)(rand() % 100) / 100.0);
-                 // Add series to the chart widget
-                 chartWidget->addSeries(scatter);
+                 chartWidget->addSeries(scatter2);
                  // Use the chart widget as the central widget
                  QMainWindow w;

src/chartpresenter.cpp +1 0

                                           scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
                          QObject::connect(m_dataset, SIGNAL(domainChanged(const Domain&)),
                                           scatterPresenter, SLOT(handleDomainChanged(const Domain&)));
+                         m_chartTheme->decorate(scatterPresenter, scatterSeries, m_chartItems.count());
              //            scatterSeries->d->m_theme = m_chartTheme->themeForSeries();
              //            scatterSeries->d->setParentItem(this);
              //            scatterSeries->d->m_boundingRect = m_rect.adjusted(margin(),margin(), -margin(), -margin());

src/charttheme.cpp +19 0

              #include "stackedbarchartseries.h"
              #include "percentbarchartseries.h"
              #include "qlinechartseries.h"
+             #include "qscatterseries.h"
              #include "qpieseries.h"
              //items
              #include "stackedbargroup.h"
              #include "linechartitem_p.h"
              #include "percentbargroup.h"
+             #include "scatterpresenter.h"
              #include "piepresenter.h"
              //themes
                  item->addColor(QColor(255,128,0,128));
              }
+             void ChartTheme::decorate(ScatterPresenter* presenter, QScatterSeries* series, int count)
+             {
+                 Q_ASSERT(presenter);
+                 Q_ASSERT(series);
+                 presenter->m_markerPen.setColor(m_seriesColor.at(count % m_seriesColor.size()));
+             //    QPen pen;
+             //    if(pen != series->pen()){
+             //        item->setPen(series->pen());
+             //        return;
+             //    }
+             //    pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
+             //    pen.setWidthF(2);
+             //    item->setPen(pen);
+             }
              void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int /*count*/)
              {
                  // create a list of slice colors based on current theme

src/charttheme_p.h +3 0

              class StackedBarChartSeries;
              class PercentBarChartSeries;
              class PercentBarGroup;
+             class QScatterSeries;
+             class ScatterPresenter;
              class PiePresenter;
              class QPieSeries;
                  void decorate(BarGroup* item, BarChartSeries* series,int count);
                  void decorate(StackedBarGroup* item, StackedBarChartSeries* series,int count);
                  void decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count);
+                 void decorate(ScatterPresenter* presenter, QScatterSeries* series, int count);
                  void decorate(PiePresenter* item, QPieSeries* series, int count);
                  void decorate(QChartAxis& axis,AxisItem* item);

src/qscatterseries.h 0 -2

                  // TODO: the name of the function? addPoint? addData? addValue?
                  void addData(QPointF value);
                  QScatterSeries& operator << (const QPointF &value);
                  void setData(QList<QPointF> data);
                  QList<QPointF> data();
                  //TODO? void insertData(int index, QPointF data);

src/scatterpresenter.cpp +11 -7

                  m_series(series),
                  m_boundingRect(),
                  //m_markerColor(QColor()),
-                 m_markerColor(QColor(255, 0, 0)),
+             //    m_markerColor(QColor(255, 0, 0)),
                  m_visibleChartArea()
              {
                  if (parent)
              {
                  // TODO: The opacity should be user definable?
                  //brush.setColor(QColor(255, 82, 0, 100));
-                 if (m_markerColor.isValid()) {
+                 //if (m_series->markerPen().isValid()) {
+                 if (false) {
                      QPen pen = painter->pen();
                      QBrush brush = pen.brush();
-                     brush.setColor(m_markerColor);
+                     brush.setColor(m_series->markerPen().color());
                      pen.setBrush(brush);
                      pen.setWidth(4);
                      painter->setPen(pen);
                  }
                  else {
-                     //painter->setPen(m_theme.markerPen);
-             //        brush.setColor(m_theme..lineColor);
+                     // TODO: fix this
+                     QPen pen = painter->pen();
+                     QBrush brush = pen.brush();
+                     brush.setColor(m_markerPen.color());
+                     pen.setBrush(brush);
+                     pen.setWidth(4);
+                     painter->setPen(pen);
                  }
-                 // TODO: m_scenex and m_sceny are left empty during construction -> we would need a resize
-                 // event right after construction or maybe given a size during initialization
                  for (int i(0); i < m_scenex.count() && i < m_sceney.count(); i++) {
                      if (scene()->width() > m_scenex.at(i) && scene()->height() > m_sceney.at(i))
                          //painter->drawArc(m_scenex.at(i), m_sceney.at(i), 2, 2, 0, 5760);

src/scatterpresenter.h +2 -1

              #include "qchartglobal.h"
              #include "chartitem_p.h"
              #include <QObject>
+             #include <QPen>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  QRectF m_boundingRect;
                  QList<qreal> m_scenex;
                  QList<qreal> m_sceney;
-                 QColor m_markerColor;
                  Domain m_visibleChartArea;
+                 QPen m_markerPen;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

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