diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-09 10:49:49 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-12-10 09:01:45 +0200 |
commit | 3573055abe42ff283d011d8550bc8495156338a1 (patch) | |
tree | bb45d4f7e32a0c63329d9f52639081162b34e17e /src/datavisualizationqml2/declarativesurface.cpp | |
parent | 22557b312570cbefde584466a28f2b9bfcc570ba (diff) |
Move series specific visual elements to series, part 4
Colors to series
- Multiselection labels in bar slices still buggy
- Selection in bars doesn't work correctly if not all
series have items in that grid
Task-number: QTRD-2557
Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativesurface.cpp')
-rw-r--r-- | src/datavisualizationqml2/declarativesurface.cpp | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index b0adeb21..7c73d379 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -25,8 +25,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) : AbstractDeclarative(parent), - m_surfaceController(0), - m_gradient(0) + m_surfaceController(0) { setFlags(QQuickItem::ItemHasContents); setAcceptedMouseButtons(Qt::AllButtons); @@ -53,12 +52,6 @@ DeclarativeSurface::~DeclarativeSurface() delete m_surfaceController; } -void DeclarativeSurface::handleGradientUpdate() -{ - if (m_gradient) - setControllerGradient(*m_gradient); -} - Q3DValueAxis *DeclarativeSurface::axisX() const { return static_cast<Q3DValueAxis *>(m_surfaceController->axisX()); @@ -89,48 +82,6 @@ void DeclarativeSurface::setAxisZ(Q3DValueAxis *axis) m_surfaceController->setAxisZ(axis); } -void DeclarativeSurface::setGradient(ColorGradient *gradient) -{ - // connect new / disconnect old - if (gradient != m_gradient) { - if (m_gradient) - QObject::disconnect(m_gradient, 0, this, 0); - - m_gradient = gradient; - - if (m_gradient) { - QObject::connect(m_gradient, &ColorGradient::updated, this, - &DeclarativeSurface::handleGradientUpdate); - } - } - - if (m_gradient) - setControllerGradient(*m_gradient); -} - -ColorGradient *DeclarativeSurface::gradient() const -{ - return m_gradient; -} - -void DeclarativeSurface::setControllerGradient(const ColorGradient &gradient) -{ - QLinearGradient newGradient; - QGradientStops stops; - QList<ColorGradientStop *> qmlstops = gradient.m_stops; - - // Get sorted gradient stops - for (int i = 0; i < qmlstops.size(); i++) { - int j = 0; - while (j < stops.size() && stops.at(j).first < qmlstops[i]->position()) - j++; - stops.insert(j, QGradientStop(qmlstops.at(i)->position(), qmlstops.at(i)->color())); - } - - newGradient.setStops(stops); - m_surfaceController->setGradient(newGradient); -} - QQmlListProperty<QSurface3DSeries> DeclarativeSurface::seriesList() { return QQmlListProperty<QSurface3DSeries>(this, this, |