HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2277:3866e510c514

Some fixes for Qt5, vs2010 build and qml

Jani Honkonen -

r2277:3866e510c514

parent child

Context file:

r2277:3866e510c514

Collapse all files

plugins/declarative/declarativechart.cpp +2 -3

                  connect(m_margins, SIGNAL(bottomChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
                  connect(m_margins, SIGNAL(leftChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
                  connect(m_margins, SIGNAL(rightChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
-                 connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,AbstractDomain*)), this, SLOT(handleSeriesAdded(QAbstractSeries*,AbstractDomain*)));
+                 connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesAdded(QAbstractSeries*)));
                  connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*)));
              }
-             void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series, AbstractDomain *domain)
+             void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series)
              {
-                 Q_UNUSED(domain)
                  emit seriesAdded(series);
              }

plugins/declarative/declarativechart.h +1 -1

                  void changeMinimumMargins(int top, int bottom, int left, int right);
                  void handleAxisXSet(QAbstractAxis *axis);
                  void handleAxisYSet(QAbstractAxis *axis);
-                 void handleSeriesAdded(QAbstractSeries *series, AbstractDomain *domain);
+                 void handleSeriesAdded(QAbstractSeries *series);
              private:
                  // Extending QChart with DeclarativeChart is not possible because QObject does not support

src/axis/chartaxis.cpp +44 -44

              void ChartAxis::createItems(int count)
              {
-                 if (m_arrow->children().size() == 0){
+                 if (m_arrow->childItems().size() == 0){
                      QGraphicsLineItem* arrow = new ArrowItem(this, this);
                      arrow->setPen(m_axis->linePen());
                      m_arrow->addToGroup(arrow);
                  }
-                 if (m_intervalAxis && m_grid->children().size() == 0) {
+                 if (m_intervalAxis && m_grid->childItems().size() == 0) {
                      for (int i = 0 ; i < 2 ; i  ++){
-                     	QGraphicsLineItem* item = new QGraphicsLineItem(this);
-                     	item->setPen(m_axis->gridLinePen());
+                         QGraphicsLineItem* item = new QGraphicsLineItem(this);
+                         item->setPen(m_axis->gridLinePen());
                          m_grid->addToGroup(item);
                      }
                  }
                  for (int i = 0; i < count; ++i) {
                      QGraphicsLineItem* arrow = new QGraphicsLineItem(this);
                      arrow->setPen(m_axis->linePen());
-                 	QGraphicsLineItem* grid = new QGraphicsLineItem(this);
-                 	grid->setPen(m_axis->gridLinePen());
-                 	QGraphicsSimpleTextItem* label = new QGraphicsSimpleTextItem(this);
-                 	label->setFont(m_axis->labelsFont());
-                 	label->setPen(m_axis->labelsPen());
-                 	label->setBrush(m_axis->labelsBrush());
-                 	m_arrow->addToGroup(arrow);
+                     QGraphicsLineItem* grid = new QGraphicsLineItem(this);
+                     grid->setPen(m_axis->gridLinePen());
+                     QGraphicsSimpleTextItem* label = new QGraphicsSimpleTextItem(this);
+                     label->setFont(m_axis->labelsFont());
+                     label->setPen(m_axis->labelsPen());
+                     label->setBrush(m_axis->labelsBrush());
+                     m_arrow->addToGroup(arrow);
                      m_grid->addToGroup(grid);
                      m_labels->addToGroup(label);
                      if ((m_grid->childItems().size()) % 2 && m_grid->childItems().size() > 2){
-                     	QGraphicsRectItem* shades = new QGraphicsRectItem(this);
-                     	shades->setPen(m_axis->shadesPen());
-                      	shades->setBrush(m_axis->shadesBrush());
+                         QGraphicsRectItem* shades = new QGraphicsRectItem(this);
+                         shades->setPen(m_axis->shadesPen());
+                         shades->setBrush(m_axis->shadesBrush());
                          m_shades->addToGroup(shades);
                      }
                  }
              qreal ChartAxis::min() const
              {
-             	return m_axis->d_ptr->min();
+                 return m_axis->d_ptr->min();
              }
              qreal ChartAxis::max() const
              {
-             	return m_axis->d_ptr->max();
+                 return m_axis->d_ptr->max();
              }
              QFont ChartAxis::font() const
              {
-             	return m_axis->labelsFont();
+                 return m_axis->labelsFont();
              }
              QFont ChartAxis::titleFont() const
              {
-             	return m_axis->titleFont();
+                 return m_axis->titleFont();
              }
              QString ChartAxis::titleText() const
              {
-             	return m_axis->titleText();
+                 return m_axis->titleText();
              }
              void ChartAxis::axisSelected()
              {
-             	emit clicked();
+                 emit clicked();
              }
              Qt::Orientation ChartAxis::orientation() const
              void ChartAxis::handleLabelsFontChanged(const QFont &font)
              {
-             	foreach (QGraphicsItem *item , m_labels->childItems())
-             	static_cast<QGraphicsSimpleTextItem *>(item)->setFont(font);
-             	QGraphicsLayoutItem::updateGeometry();
-             	presenter()->layout()->invalidate();
+                 foreach (QGraphicsItem *item , m_labels->childItems())
+                 static_cast<QGraphicsSimpleTextItem *>(item)->setFont(font);
+                 QGraphicsLayoutItem::updateGeometry();
+                 presenter()->layout()->invalidate();
              }
              void ChartAxis::handleShadesBrushChanged(const QBrush &brush)
              void ChartAxis::handleTitleTextChanged(const QString &title)
              {
-             	Q_UNUSED(title)
-             	QGraphicsLayoutItem::updateGeometry();
-             	presenter()->layout()->invalidate();
+                 Q_UNUSED(title)
+                 QGraphicsLayoutItem::updateGeometry();
+                 presenter()->layout()->invalidate();
              }
              void ChartAxis::handleVisibleChanged(bool visible)
              {
-             	setVisible(visible);
+                 setVisible(visible);
              }
              void ChartAxis::handleRangeChanged(qreal min, qreal max)
              {
-             	Q_UNUSED(min);
-             	Q_UNUSED(max);
+                 Q_UNUSED(min);
+                 Q_UNUSED(max);
-             	if (!isEmpty()) {
+                 if (!isEmpty()) {
-             		QVector<qreal> layout = calculateLayout();
-             		updateLayout(layout);
-             		QSizeF before = effectiveSizeHint(Qt::PreferredSize);
-             		QSizeF after = sizeHint(Qt::PreferredSize);
+                     QVector<qreal> layout = calculateLayout();
+                     updateLayout(layout);
+                     QSizeF before = effectiveSizeHint(Qt::PreferredSize);
+                     QSizeF after = sizeHint(Qt::PreferredSize);
-             		if (before != after) {
-             			QGraphicsLayoutItem::updateGeometry();
-             			//we don't want to call invalidate on layout, since it will change minimum size of component,
-             			//which we would like to avoid since it causes nasty flips when scrolling or zooming,
-             			//instead recalculate layout and use plotArea for extra space.
-             			presenter()->layout()->setGeometry(presenter()->layout()->geometry());
+             		}
+             	}
+                     if (before != after) {
+                         QGraphicsLayoutItem::updateGeometry();
+                         //we don't want to call invalidate on layout, since it will change minimum size of component,
+                         //which we would like to avoid since it causes nasty flips when scrolling or zooming,
+                         //instead recalculate layout and use plotArea for extra space.
+                         presenter()->layout()->setGeometry(presenter()->layout()->geometry());
+                     }
+                 }
              }
                          labels << QString::number(value, 'f', n);
                      }
                  } else {
-                     QByteArray array = format.toAscii();
+                     QByteArray array = format.toLatin1();
                      for (int i = firstTick; i < ticks + firstTick; i++) {
                          qreal value = qPow(base, i);
                          labels << QString().sprintf(array, value);

src/piechart/qpieseries.cpp +2 -2

              void QPieSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
              {
-                 Q_Q(QPieSeries);
-                 const QList<QColor>& colors = theme->seriesColors();
+                 //Q_Q(QPieSeries);
+                 //const QList<QColor>& colors = theme->seriesColors();
                  const QList<QGradient>& gradients = theme->seriesGradients();
                  for (int i(0); i < m_slices.count(); i++) {

src/qchart.h +1 -1

              class QAbstractSeries;
              class QAbstractAxis;
              class QLegend;
-             struct QChartPrivate;
+             class QChartPrivate;
              class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
              {

src/themes/chartthemesystem_p.h +2 -2

                                          GetGValue(colorGradientActiveCaptionRight),
                                          GetBValue(colorGradientActiveCaptionRight));
                      g.setColorAt(1.0, end);
-                     m_seriesColors.append(colorAt(g, 0.5));
+                     m_seriesColors.append(ChartThemeManager::colorAt(g, 0.5));
                      // Generate gradients from the base colors
-                     generateSeriesGradients();
+                     ChartThemeManager::generateSeriesGradients(m_seriesColors);
                      // Background fill color from COLOR_WINDOW
                      QLinearGradient backgroundGradient;

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