From 3866e510c5143f819fb58030d70ea353c14bf4ec 2012-11-26 12:58:47 From: Jani Honkonen Date: 2012-11-26 12:58:47 Subject: [PATCH] Some fixes for Qt5, vs2010 build and qml --- diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index a69e8c8..93d8158 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -248,13 +248,12 @@ DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent) 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); } diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h index 59f0b72..8c2aa30 100644 --- a/plugins/declarative/declarativechart.h +++ b/plugins/declarative/declarativechart.h @@ -157,7 +157,7 @@ public Q_SLOTS: 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 diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp index 0b4c804..046dfde 100644 --- a/src/axis/chartaxis.cpp +++ b/src/axis/chartaxis.cpp @@ -101,16 +101,16 @@ void ChartAxis::setLayout(QVector &layout) 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); } } @@ -118,20 +118,20 @@ void ChartAxis::createItems(int count) 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); } } @@ -217,32 +217,32 @@ void ChartAxis::setGeometry(const QRectF &axis, const QRectF &grid) 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 @@ -311,10 +311,10 @@ void ChartAxis::handleLabelsBrushChanged(const QBrush &brush) void ChartAxis::handleLabelsFontChanged(const QFont &font) { - foreach (QGraphicsItem *item , m_labels->childItems()) - static_cast(item)->setFont(font); - QGraphicsLayoutItem::updateGeometry(); - presenter()->layout()->invalidate(); + foreach (QGraphicsItem *item , m_labels->childItems()) + static_cast(item)->setFont(font); + QGraphicsLayoutItem::updateGeometry(); + presenter()->layout()->invalidate(); } void ChartAxis::handleShadesBrushChanged(const QBrush &brush) @@ -343,9 +343,9 @@ void ChartAxis::handleGridPenChanged(const QPen &pen) void ChartAxis::handleTitleTextChanged(const QString &title) { - Q_UNUSED(title) - QGraphicsLayoutItem::updateGeometry(); - presenter()->layout()->invalidate(); + Q_UNUSED(title) + QGraphicsLayoutItem::updateGeometry(); + presenter()->layout()->invalidate(); } @@ -370,29 +370,29 @@ void ChartAxis::handleTitleFontChanged(const QFont &font) 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 layout = calculateLayout(); - updateLayout(layout); - QSizeF before = effectiveSizeHint(Qt::PreferredSize); - QSizeF after = sizeHint(Qt::PreferredSize); + QVector 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()); + } + } } @@ -463,7 +463,7 @@ QStringList ChartAxis::createLogValueLabels(qreal min, qreal max, qreal base, in 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); diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index cb75504..a0dae7e 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -889,8 +889,8 @@ QAbstractAxis* QPieSeriesPrivate::createDefaultAxis(Qt::Orientation orientation) void QPieSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced) { - Q_Q(QPieSeries); - const QList& colors = theme->seriesColors(); + //Q_Q(QPieSeries); + //const QList& colors = theme->seriesColors(); const QList& gradients = theme->seriesGradients(); for (int i(0); i < m_slices.count(); i++) { diff --git a/src/qchart.h b/src/qchart.h index e2d1540..af87c25 100644 --- a/src/qchart.h +++ b/src/qchart.h @@ -33,7 +33,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QAbstractSeries; class QAbstractAxis; class QLegend; -struct QChartPrivate; +class QChartPrivate; class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget { diff --git a/src/themes/chartthemesystem_p.h b/src/themes/chartthemesystem_p.h index 12a552b..c373e8f 100644 --- a/src/themes/chartthemesystem_p.h +++ b/src/themes/chartthemesystem_p.h @@ -77,10 +77,10 @@ public: 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;