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>

1 files changed, 0 insertions, 143 deletions

diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index e65aef0f..0c3a88af 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -92,20 +92,6 @@ Q3DScatter::Q3DScatter()
                      &Q3DScatter::shadowQualityChanged);
     QObject::connect(d_ptr->m_shared, &Abstract3DController::themeChanged, this,
                      &Q3DScatter::themeChanged);
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::colorStyleChanged, this,
-                     &Q3DScatter::colorStyleChanged);
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::objectColorChanged, this,
-                     &Q3DScatter::itemColorChanged);
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::objectGradientChanged, this,
-                     &Q3DScatter::itemGradientChanged);
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::singleHighlightColorChanged, this,
-                     &Q3DScatter::singleHighlightColorChanged);
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::singleHighlightGradientChanged, this,
-                     &Q3DScatter::singleHighlightGradientChanged);
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::multiHighlightColorChanged, this,
-                     &Q3DScatter::multiHighlightColorChanged);
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::multiHighlightGradientChanged, this,
-                     &Q3DScatter::multiHighlightGradientChanged);
     QObject::connect(d_ptr->m_shared, &Abstract3DController::needRender, this,
                      &Q3DWindow::renderLater);
 }
@@ -284,135 +270,6 @@ QDataVis::ShadowQuality Q3DScatter::shadowQuality() const
 }
 
 /*!
- * \property Q3DScatter::colorStyle
- *
- * Sets the color \a style used to render items.
- * Defaults to true.
- *
- * \sa itemColor, itemGradient
- */
-void Q3DScatter::setColorStyle(Q3DTheme::ColorStyle style)
-{
-    d_ptr->m_shared->setColorStyle(style);
-}
-
-Q3DTheme::ColorStyle Q3DScatter::colorStyle() const
-{
-    return d_ptr->m_shared->colorStyle();
-}
-
-/*!
- * \property Q3DScatter::itemColor
- *
- * Set item color to the \a color for this set. Overrides any previously set item gradient for this
- * set, as well as any item gradient or color from the theme.
- *
- * \sa theme, itemGradient
- */
-void Q3DScatter::setItemColor(const QColor &color)
-{
-    d_ptr->m_shared->setBaseColor(color);
-}
-
-QColor Q3DScatter::itemColor() const
-{
-    return d_ptr->m_shared->baseColor();
-}
-
-/*!
- * \property Q3DScatter::itemGradient
- *
- * Set item gradient to the \a gradient for this set. Overrides any previously set item color for this
- * set, as well as any item gradient or color from the theme.
- *
- * \sa theme, itemColor, colorStyle
- */
-void Q3DScatter::setItemGradient(const QLinearGradient &gradient)
-{
-    d_ptr->m_shared->setBaseGradient(gradient);
-}
-
-QLinearGradient Q3DScatter::itemGradient() const
-{
-    return d_ptr->m_shared->baseGradient();
-}
-
-/*!
- * \property Q3DScatter::singleHighlightColor
- *
- * Set single item highlight color to the \a color for this set. Overrides any previously set single
- * item highlight gradient for this set, as well as any single item highlight gradient or color from the theme.
- *
- * \sa theme, singleHighlightGradient
- */
-void Q3DScatter::setSingleHighlightColor(const QColor &color)
-{
-    d_ptr->m_shared->setSingleHighlightColor(color);
-}
-
-QColor Q3DScatter::singleHighlightColor() const
-{
-    return d_ptr->m_shared->singleHighlightColor();
-}
-
-/*!
- * \property Q3DScatter::singleHighlightGradient
- *
- * Set single item highlight gradient to the \a gradient for this set.
- * Overrides any previously set single item highlight color for this
- * set, as well as any single item highlight gradient or color from the theme.
- *
- * \sa theme, singleHighlightColor, colorStyle
- */
-void Q3DScatter::setSingleHighlightGradient(const QLinearGradient &gradient)
-{
-    d_ptr->m_shared->setSingleHighlightGradient(gradient);
-}
-
-QLinearGradient Q3DScatter::singleHighlightGradient() const
-{
-    return d_ptr->m_shared->singleHighlightGradient();
-}
-
-/*!
- * \property Q3DScatter::multiHighlightColor
- *
- * Set multiple item highlight (e.g. row/column highlight) color to the \a color for this set.
- * Overrides any previously set multiple item highlight gradient for this set, as well as any
- * multiple item highlight gradient or color from the theme.
- *
- * \sa theme, multiHighlightGradient
- */
-void Q3DScatter::setMultiHighlightColor(const QColor &color)
-{
-    d_ptr->m_shared->setMultiHighlightColor(color);
-}
-
-QColor Q3DScatter::multiHighlightColor() const
-{
-    return d_ptr->m_shared->multiHighlightColor();
-}
-
-/*!
- * \property Q3DScatter::multiHighlightGradient
- *
- * Set multiple item highlight (e.g. row/column highlight) gradient to the \a gradient for this set.
- * Overrides any previously set multiple item highlight color for this
- * set, as well as any multiple item highlight gradient or color from the theme.
- *
- * \sa theme, multiHighlightColor, colorStyle
- */
-void Q3DScatter::setMultiHighlightGradient(const QLinearGradient &gradient)
-{
-    d_ptr->m_shared->setMultiHighlightGradient(gradient);
-}
-
-QLinearGradient Q3DScatter::multiHighlightGradient() const
-{
-    return d_ptr->m_shared->multiHighlightGradient();
-}
-
-/*!
  * Sets a user-defined X-axis. Implicitly calls addAxis() to transfer ownership
  * of the \a axis to this graph.
  *