HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1844:691cce09e051

QAbstractAxis: renamed Arrow and Axis to line in methods names

Marek Rosa -

r1844:691cce09e051

parent child

Context file:

r1844:691cce09e051

Collapse all files

examples/customchart/main.cpp +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <QMainWindow>
             #include <QChartView>
             #include <QLineSeries>
             #include <QCategoryAxis>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
             //![1]
                 QLineSeries* series = new QLineSeries();
                 *series << QPointF(0, 6) << QPointF(9, 4) << QPointF(15, 20) << QPointF(25, 12) << QPointF(29, 26);
                 QChart* chart = new QChart();
                 chart->legend()->hide();
                 chart->addSeries(series);
             //![1]
             //![2]
                 // Customize series
                 QPen pen(QRgb(0xfdb157));
                 pen.setWidth(5);
                 series->setPen(pen);
                 // Customize chart title
                 QFont font;
                 font.setPixelSize(18);
                 chart->setTitleFont(font);
                 chart->setTitleBrush(QBrush(Qt::white));
                 chart->setTitle("Customchart example");
                 // Customize chart background
                 QLinearGradient backgroundGradient;
                 backgroundGradient.setStart(QPointF(0,0));
                 backgroundGradient.setFinalStop(QPointF(0,1));
                 backgroundGradient.setColorAt(0.0, QRgb(0xd2d0d1));
                 backgroundGradient.setColorAt(1.0, QRgb(0x4c4547));
                 backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                 chart->setBackgroundBrush(backgroundGradient);
             //![2]
             //![3]
                 QCategoryAxis* axisX = new QCategoryAxis();
                 QCategoryAxis* axisY = new QCategoryAxis();
                 // Customize axis label font
                 QFont labelsFont;
                 labelsFont.setPixelSize(12);
                 axisX->setLabelsFont(labelsFont);
                 axisY->setLabelsFont(labelsFont);
                 // Customize axis colors
                 QPen axisPen(QRgb(0xd18952));
                 axisPen.setWidth(2);
-                axisX->setAxisPen(axisPen);
+                axisX->setLinePen(axisPen);
-                axisY->setAxisPen(axisPen);
+                axisY->setLinePen(axisPen);
                 // Customize axis label colors
                 QBrush axisBrush(Qt::white);
                 axisX->setLabelsBrush(axisBrush);
                 axisY->setLabelsBrush(axisBrush);
                 // Customize grid lines and shades
                 axisX->setGridLineVisible(false);
                 axisY->setGridLineVisible(false);
                 axisY->setShadesPen(Qt::NoPen);
                 axisY->setShadesBrush(QBrush(QRgb(0xa5a2a3)));
                 axisY->setShadesVisible(true);
             //![3]
             //![4]
                 axisX->append("low", 10);
                 axisX->append("optimal", 20);
                 axisX->append("high", 30);
                 axisX->setRange(0, 30);
                 axisY->append("slow", 10);
                 axisY->append("med", 20);
                 axisY->append("fast", 30);
                 axisY->setRange(0, 30);
                 chart->setAxisX(axisX, series);
                 chart->setAxisY(axisY, series);
             //![4]
             //![5]
                 QChartView* chartView = new QChartView(chart);
                 chartView->setRenderHint(QPainter::Antialiasing);
             //![5]
             //![6]
                 QMainWindow window;
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
             //![6]
                 return a.exec();
             }

src/axis/chartaxis.cpp +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartaxis_p.h"
             #include "qabstractaxis.h"
             #include "qabstractaxis_p.h"
             #include "chartpresenter_p.h"
             #include "domain_p.h"
             #include <qmath.h>
             #include <QDateTime>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter) : ChartElement(presenter),
                 m_chartAxis(axis),
                 m_labelsAngle(0),
                 m_grid(new QGraphicsItemGroup(presenter->rootItem())),
                 m_shades(new QGraphicsItemGroup(presenter->rootItem())),
                 m_labels(new QGraphicsItemGroup(presenter->rootItem())),
                 m_arrow(new QGraphicsItemGroup(presenter->rootItem())),
                 m_min(0),
                 m_max(0),
                 m_animation(0),
                 m_minWidth(0),
                 m_minHeight(0)
             {
                 //initial initialization
                 m_arrow->setZValue(ChartPresenter::AxisZValue);
                 m_arrow->setHandlesChildEvents(false);
                 m_labels->setZValue(ChartPresenter::AxisZValue);
                 m_shades->setZValue(ChartPresenter::ShadesZValue);
                 m_grid->setZValue(ChartPresenter::GridZValue);
                 QObject::connect(m_chartAxis->d_ptr.data(),SIGNAL(updated()),this,SLOT(handleAxisUpdated()));
                 QGraphicsSimpleTextItem item;
                 m_font = item.font();
             }
             ChartAxis::~ChartAxis()
             {
             }
             void ChartAxis::setAnimation(AxisAnimation* animation)
             {
                 m_animation=animation;
             }
             void ChartAxis::setLayout(QVector<qreal> &layout)
             {
                 m_layoutVector=layout;
             }
             void ChartAxis::createItems(int count)
             {
                 if (m_arrow->children().size() == 0)
                 m_arrow->addToGroup(new AxisItem(this,presenter()->rootItem()));
                 for (int i = 0; i < count; ++i) {
                     m_grid->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
                     m_labels->addToGroup(new QGraphicsSimpleTextItem(presenter()->rootItem()));
                     m_arrow->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
                     if ((m_grid->childItems().size())%2 && m_grid->childItems().size()>2) m_shades->addToGroup(new QGraphicsRectItem(presenter()->rootItem()));
                 }
             }
             void ChartAxis::deleteItems(int count)
             {
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
                 QList<QGraphicsItem *> axis = m_arrow->childItems();
                 for (int i = 0; i < count; ++i) {
                     if (lines.size()%2 && lines.size() > 1) delete(shades.takeLast());
                     delete(lines.takeLast());
                     delete(labels.takeLast());
                     delete(axis.takeLast());
                 }
             }
             void ChartAxis::updateLayout(QVector<qreal> &layout)
             {
                 int diff = m_layoutVector.size() - layout.size();
                 if (diff>0) {
                     deleteItems(diff);
                 }
                 else if (diff<0) {
                     createItems(-diff);
                 }
                 if(diff<0) handleAxisUpdated();
                 if (m_animation) {
                       switch(presenter()->state()){
                           case ChartPresenter::ZoomInState:
                               m_animation->setAnimationType(AxisAnimation::ZoomInAnimation);
                               m_animation->setAnimationPoint(presenter()->statePoint());
                               break;
                           case ChartPresenter::ZoomOutState:
                               m_animation->setAnimationType(AxisAnimation::ZoomOutAnimation);
                               m_animation->setAnimationPoint(presenter()->statePoint());
                               break;
                           case ChartPresenter::ScrollUpState:
                           case ChartPresenter::ScrollLeftState:
                               m_animation->setAnimationType(AxisAnimation::MoveBackwordAnimation);
                               break;
                           case ChartPresenter::ScrollDownState:
                           case ChartPresenter::ScrollRightState:
                               m_animation->setAnimationType(AxisAnimation::MoveForwardAnimation);
                               break;
                           case ChartPresenter::ShowState:
                               m_animation->setAnimationType(AxisAnimation::DefaultAnimation);
                               break;
                       }
                       m_animation->setValues(m_layoutVector,layout);
                       presenter()->startAnimation(m_animation);
                 }
                 else {
                     setLayout(layout);
                     updateGeometry();
                 }
             }
             void ChartAxis::setArrowOpacity(qreal opacity)
             {
                 m_arrow->setOpacity(opacity);
             }
             qreal ChartAxis::arrowOpacity() const
             {
                 return m_arrow->opacity();
             }
             void ChartAxis::setArrowVisibility(bool visible)
             {
                 m_arrow->setOpacity(visible);
             }
             void ChartAxis::setGridOpacity(qreal opacity)
             {
                 m_grid->setOpacity(opacity);
             }
             qreal ChartAxis::gridOpacity() const
             {
                 return m_grid->opacity();
             }
             void ChartAxis::setGridVisibility(bool visible)
             {
                 m_grid->setOpacity(visible);
             }
             void ChartAxis::setLabelsOpacity(qreal opacity)
             {
                 m_labels->setOpacity(opacity);
             }
             qreal ChartAxis::labelsOpacity() const
             {
                 return m_labels->opacity();
             }
             void ChartAxis::setLabelsVisibility(bool visible)
             {
                 m_labels->setOpacity(visible);
             }
             void ChartAxis::setShadesOpacity(qreal opacity)
             {
                 m_shades->setOpacity(opacity);
             }
             qreal ChartAxis::shadesOpacity() const
             {
                 return m_shades->opacity();
             }
             void ChartAxis::setShadesVisibility(bool visible)
             {
                 m_shades->setVisible(visible);
             }
             void ChartAxis::setLabelsAngle(int angle)
             {
                 foreach(QGraphicsItem* item , m_labels->childItems()) {
                       item->setRotation(angle);
                 }
                 m_labelsAngle=angle;
             }
             void ChartAxis::setLabelsPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_labels->childItems()) {
                     static_cast<QGraphicsSimpleTextItem*>(item)->setPen(pen);
                 }
             }
             void ChartAxis::setLabelsBrush(const QBrush &brush)
             {
                 foreach(QGraphicsItem* item , m_labels->childItems()) {
                     static_cast<QGraphicsSimpleTextItem*>(item)->setBrush(brush);
                 }
             }
             void ChartAxis::setLabelsFont(const QFont &font)
             {
                 foreach(QGraphicsItem* item , m_labels->childItems()) {
                     static_cast<QGraphicsSimpleTextItem*>(item)->setFont(font);
                 }
                 m_font = font;
             }
             void ChartAxis::setShadesBrush(const QBrush &brush)
             {
                 foreach(QGraphicsItem* item , m_shades->childItems()) {
                     static_cast<QGraphicsRectItem*>(item)->setBrush(brush);
                 }
             }
             void ChartAxis::setShadesPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_shades->childItems()) {
                     static_cast<QGraphicsRectItem*>(item)->setPen(pen);
                 }
             }
             void ChartAxis::setArrowPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_arrow->childItems()) {
                        static_cast<QGraphicsLineItem*>(item)->setPen(pen);
                 }
             }
             void ChartAxis::setGridPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_grid->childItems()) {
                     static_cast<QGraphicsLineItem*>(item)->setPen(pen);
                 }
             }
             bool ChartAxis::isEmpty()
             {
                 return m_rect.isEmpty() || qFuzzyIsNull(m_min - m_max);
             }
             void ChartAxis::handleDomainUpdated()
             {
                 Domain* domain = qobject_cast<Domain*>(sender());
                 qreal min(0);
                 qreal max(0);
                 if(m_chartAxis->orientation()==Qt::Horizontal) {
                     min = domain->minX();
                     max = domain->maxX();
                 }
                 else if (m_chartAxis->orientation()==Qt::Vertical)
                 {
                     min = domain->minY();
                     max = domain->maxY();
                 }
                 if (!qFuzzyIsNull(m_min - min) || !qFuzzyIsNull(m_max - max))
                 {
                     m_min = min;
                     m_max = max;
                     if (!isEmpty()) {
                         QVector<qreal> layout = calculateLayout();
                         updateLayout(layout);
                     }
                 }
             }
             void ChartAxis::handleAxisUpdated()
             {
                 if(isEmpty()) return;
                 bool visible = m_chartAxis->isVisible();
-                setArrowVisibility(visible && m_chartAxis->isArrowVisible());
+                setArrowVisibility(visible && m_chartAxis->isLineVisible());
                 setGridVisibility(visible && m_chartAxis->isGridLineVisible());
                 setLabelsVisibility(visible && m_chartAxis->labelsVisible());
                 setShadesVisibility(visible && m_chartAxis->shadesVisible());
                 setLabelsAngle(m_chartAxis->labelsAngle());
-                setArrowPen(m_chartAxis->axisPen());
+                setArrowPen(m_chartAxis->linePen());
                 setLabelsPen(m_chartAxis->labelsPen());
                 setLabelsBrush(m_chartAxis->labelsBrush());
                 setLabelsFont(m_chartAxis->labelsFont());
                 setGridPen(m_chartAxis->gridLinePen());
                 setShadesPen(m_chartAxis->shadesPen());
                 setShadesBrush(m_chartAxis->shadesBrush());
             }
             void ChartAxis::hide()
             {
                 setArrowVisibility(false);
                 setGridVisibility(false);
                 setLabelsVisibility(false);
                 setShadesVisibility(false);
             }
             void ChartAxis::handleGeometryChanged(const QRectF &rect)
             {
                 if(m_rect != rect)
                 {
                     m_rect = rect;
                     if (isEmpty()) return;
                     QVector<qreal> layout = calculateLayout();
                     updateLayout(layout);
                 }
             }
             qreal ChartAxis::minimumWidth()
             {
                 if(m_minWidth == 0) updateGeometry();
                 return m_minWidth;
             }
             qreal ChartAxis::minimumHeight()
             {
                 if(m_minHeight == 0) updateGeometry();
                 return m_minHeight;
             }
             void ChartAxis::axisSelected()
             {
                 qDebug()<<"TODO: axis clicked";
             }
             void ChartAxis::createNumberLabels(QStringList &labels,qreal min, qreal max, int ticks) const
             {
                 Q_ASSERT(max>min);
                 Q_ASSERT(ticks>1);
                 int n = qMax(int(-qFloor(log10((max-min)/(ticks-1)))),0);
                 n++;
                 for (int i=0; i< ticks; i++) {
                     qreal value = min + (i * (max - min)/ (ticks-1));
                     labels << QString::number(value,'f',n);
                 }
             }
             #include "moc_chartaxis_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qabstractaxis.cpp +8 -8

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qabstractaxis.h"
             #include "qabstractaxis_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QAbstractAxis
                 \brief The QAbstractAxis class is used for manipulating chart's axis.
                 \mainclass
                 There is only one x Axis visible at the time, however there can be multiple y axes.
                 Each chart series can be bound to exactly one Y axis and the shared common X axis.
                 Axis can be setup to show axis line with tick marks, grid lines and shades.
             */
             /*!
                 \qmlclass AbstractAxis QAbstractAxis
                 \brief The Axis element is used for manipulating chart's axes
                 There is only one x Axis visible at the time, however there can be multiple y axes on a ChartView.
                 Each chart series can be bound to exactly one Y axis and the shared common X axis.
                 Axis can be setup to show axis line with tick marks, grid lines and shades.
                 To access Axes you can use ChartView API. For example:
                 \code
                     ChartView {
                         axisX.min: 0
                         axisX.max: 3
                         axisX.ticksCount: 4
                         axisY.min: 0
                         axisY.max: 4
                         // Add a few series...
                     }
                 \endcode
             */
             /*!
                 \enum QAbstractAxis::AxisType
                 The type of the series object.
                 \value AxisTypeNoAxis
                 \value AxisTypeValue
                 \value AxisTypeBarCategory
                 \value AxisTypeCategory
                 \value AxisTypeDateTime
             */
             /*!
              *\fn void QAbstractAxis::type() const
               Returns the type of the axis
             */
             /*!
               \property QAbstractAxis::arrowVisible
               The visibility of the axis arrow
             */
             /*!
               \qmlproperty bool AbstractAxis::arrrowVisible
               The visibility of the axis arrow
             */
             /*!
               \property QAbstractAxis::labelsVisible
               Defines if axis labels are visible.
             */
             /*!
               \qmlproperty bool AbstractAxis::labelsVisible
               Defines if axis labels are visible.
             */
             /*!
               \property QAbstractAxis::visible
               The visibility of the axis.
             */
             /*!
               \qmlproperty bool AbstractAxis::visible
               The visibility of the axis.
             */
             /*!
               \property QAbstractAxis::gridVisible
               The visibility of the grid lines.
             */
             /*!
               \qmlproperty bool AbstractAxis::gridVisible
               The visibility of the grid lines.
             */
             /*!
               \property QAbstractAxis::color
               The color of the axis and ticks.
             */
             /*!
               \qmlproperty color AbstractAxis::color
               The color of the axis and ticks.
             */
             /*!
               \property QAbstractAxis::labelsFont
               The font of the axis labels.
             */
             /*!
               \qmlproperty Font AbstractAxis::labelsFont
               The font of the axis labels.
               See the \l {Font} {QML Font Element} for detailed documentation.
             */
             /*!
               \property QAbstractAxis::labelsColor
               The color of the axis labels.
             */
             /*!
               \qmlproperty color AbstractAxis::labelsColor
               The color of the axis labels.
             */
             /*!
               \property QAbstractAxis::labelsAngle
               The angle of the axis labels in degrees.
             */
             /*!
               \qmlproperty int AbstractAxis::labelsAngle
               The angle of the axis labels in degrees.
             */
             /*!
               \property QAbstractAxis::shadesVisible
               The visibility of the axis shades.
             */
             /*!
               \qmlproperty bool AbstractAxis::shadesVisible
               The visibility of the axis shades.
             */
             /*!
               \property QAbstractAxis::shadesColor
               The fill (brush) color of the axis shades.
             */
             /*!
               \qmlproperty color AbstractAxis::shadesColor
               The fill (brush) color of the axis shades.
             */
             /*!
               \property QAbstractAxis::shadesBorderColor
               The border (pen) color of the axis shades.
             */
             /*!
               \qmlproperty color AbstractAxis::shadesBorderColor
               The border (pen) color of the axis shades.
             */
             /*!
               \fn void QAbstractAxis::visibleChanged(bool visible)
               Visiblity of the axis has changed to \a visible.
             */
             /*!
               \qmlsignal AbstractAxis::onVisibleChanged(bool visible)
               Visiblity of the axis has changed to \a visible.
             */
             /*!
               \fn void QAbstractAxis::arrowVisibleChanged(bool visible)
               Visiblity of the axis arrow has changed to \a visible.
             */
             /*!
               \qmlsignal AbstractAxis::onArrowVisibleChanged(bool visible)
               Visiblity of the axis arrow has changed to \a visible.
             */
             /*!
               \fn void QAbstractAxis::labelsVisibleChanged(bool visible)
               Visiblity of the labels of the axis has changed to \a visible.
             */
             /*!
               \qmlsignal AbstractAxis::onLabelsVisibleChanged(bool visible)
               Visiblity of the labels of the axis has changed to \a visible.
             */
             /*!
               \fn void QAbstractAxis::gridVisibleChanged(bool visible)
               Visiblity of the grid lines of the axis has changed to \a visible.
             */
             /*!
               \qmlsignal AbstractAxis::onGridVisibleChanged(bool visible)
               Visiblity of the grid lines of the axis has changed to \a visible.
             */
             /*!
               \fn void QAbstractAxis::colorChanged(QColor color)
               Emitted if the \a color of the axis is changed.
             */
             /*!
               \qmlsignal AbstractAxis::onColorChanged(QColor color)
               Emitted if the \a color of the axis is changed.
             */
             /*!
               \fn void QAbstractAxis::labelsColorChanged(QColor color)
               Emitted if the \a color of the axis labels is changed.
             */
             /*!
               \qmlsignal AbstractAxis::onLabelsColorChanged(QColor color)
               Emitted if the \a color of the axis labels is changed.
             */
             /*!
               \fn void QAbstractAxis::shadesVisibleChanged(bool)
               Emitted if the visibility of the axis shades is changed to \a visible.
             */
             /*!
               \qmlsignal AbstractAxis::onShadesVisibleChanged(bool visible)
               Emitted if the visibility of the axis shades is changed to \a visible.
             */
             /*!
               \fn void QAbstractAxis::shadesColorChanged(QColor color)
               Emitted if the \a color of the axis shades is changed.
             */
             /*!
               \qmlsignal AbstractAxis::onShadesColorChanged(QColor color)
               Emitted if the \a color of the axis shades is changed.
             */
             /*!
               \fn void QAbstractAxis::shadesBorderColorChanged(QColor)
               Emitted if the border \a color of the axis shades is changed.
             */
             /*!
               \qmlsignal AbstractAxis::onBorderColorChanged(QColor color)
               Emitted if the border \a color of the axis shades is changed.
             */
             /*!
              \internal
               Constructs new axis object which is a child of \a parent. Ownership is taken by
               QChart when axis added.
             */
             QAbstractAxis::QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent) :
             QObject(parent),
             d_ptr(&d)
             {
             }
             /*!
               Destructor of the axis object. When axis is added to chart, chart object takes ownership.
             */
             QAbstractAxis::~QAbstractAxis()
             {
                 if(d_ptr->m_dataset) qFatal("Still binded axis detected !");
             }
             /*!
               Sets \a pen used to draw axis line and ticks.
              */
-            void QAbstractAxis::setAxisPen(const QPen &pen)
+            void QAbstractAxis::setLinePen(const QPen &pen)
             {
             	if (d_ptr->m_axisPen!=pen) {
             	    d_ptr->m_axisPen = pen;
             	    d_ptr->emitUpdated();
             	}
             }
             /*!
               Returns pen used to draw axis and ticks.
             */
-            QPen QAbstractAxis::axisPen() const
+            QPen QAbstractAxis::linePen() const
             {
                 return d_ptr->m_axisPen;
             }
-            void QAbstractAxis::setAxisPenColor(QColor color)
+            void QAbstractAxis::setLinePenColor(QColor color)
             {
                 QPen p = d_ptr->m_axisPen;
                 if (p.color() != color) {
                     p.setColor(color);
-                    setAxisPen(p);
+                    setLinePen(p);
                     emit colorChanged(color);
                 }
             }
-            QColor QAbstractAxis::axisPenColor() const
+            QColor QAbstractAxis::linePenColor() const
             {
                 return d_ptr->m_axisPen.color();
             }
             /*!
               Sets if axis and ticks are \a visible.
              */
-            void QAbstractAxis::setArrowVisible(bool visible)
+            void QAbstractAxis::setLineVisible(bool visible)
             {
                 if (d_ptr->m_arrowVisible != visible) {
                     d_ptr->m_arrowVisible = visible;
                     d_ptr->emitUpdated();
-                    emit arrowVisibleChanged(visible);
+                    emit lineVisibleChanged(visible);
             	}
             }
-            bool QAbstractAxis::isArrowVisible() const
+            bool QAbstractAxis::isLineVisible() const
             {
                 return d_ptr->m_arrowVisible;
             }
             void QAbstractAxis::setGridLineVisible(bool visible)
             {
                 if (d_ptr->m_gridLineVisible != visible) {
                     d_ptr->m_gridLineVisible = visible;
                     d_ptr->emitUpdated();
                     emit gridVisibleChanged(visible);
             	}
             }
             bool QAbstractAxis::isGridLineVisible() const
             {
                 return d_ptr->m_gridLineVisible;
             }
             /*!
               Sets \a pen used to draw grid line.
             */
             void QAbstractAxis::setGridLinePen(const QPen &pen)
             {
                 if (d_ptr->m_gridLinePen != pen) {
                     d_ptr->m_gridLinePen = pen;
                     d_ptr->emitUpdated();
             	}
             }
             /*!
               Returns pen used to draw grid.
             */
             QPen QAbstractAxis::gridLinePen() const
             {
                 return d_ptr->m_gridLinePen;
             }
             void QAbstractAxis::setLabelsVisible(bool visible)
             {
                 if (d_ptr->m_labelsVisible != visible) {
                     d_ptr->m_labelsVisible = visible;
                     d_ptr->emitUpdated();
                     emit labelsVisibleChanged(visible);
             	}
             }
             bool QAbstractAxis::labelsVisible() const
             {
                 return d_ptr->m_labelsVisible;
             }
             /*!
               Sets \a pen used to draw labels.
             */
             void QAbstractAxis::setLabelsPen(const QPen &pen)
             {
                 if (d_ptr->m_labelsPen != pen) {
                     d_ptr->m_labelsPen = pen;
                     d_ptr->emitUpdated();
             	}
             }
             /*!
               Returns the pen used to labels.
             */
             QPen QAbstractAxis::labelsPen() const
             {
                 return d_ptr->m_labelsPen;
             }
             /*!
               Sets \a brush used to draw labels.
              */
             void QAbstractAxis::setLabelsBrush(const QBrush &brush)
             {
                 if (d_ptr->m_labelsBrush != brush) {
                     d_ptr->m_labelsBrush = brush;
                     d_ptr->emitUpdated();
             	}
             }
             /*!
               Returns brush used to draw labels.
             */
             QBrush  QAbstractAxis::labelsBrush() const
             {
                 return d_ptr->m_labelsBrush;
             }
             /*!
               Sets \a font used to draw labels.
             */
             void QAbstractAxis::setLabelsFont(const QFont &font)
             {
                 if (d_ptr->m_labelsFont != font) {
                     d_ptr->m_labelsFont = font;
                     d_ptr->emitUpdated();
             	}
             }
             /*!
               Returns font used to draw labels.
             */
             QFont QAbstractAxis::labelsFont() const
             {
                 return d_ptr->m_labelsFont;
             }
             void QAbstractAxis::setLabelsAngle(int angle)
             {
                 if (d_ptr->m_labelsAngle != angle) {
                     d_ptr->m_labelsAngle = angle;
                     d_ptr->emitUpdated();
             	}
             }
             int QAbstractAxis::labelsAngle() const
             {
                 return d_ptr->m_labelsAngle;
             }
             void QAbstractAxis::setLabelsColor(QColor color)
             {
                 QBrush b = d_ptr->m_labelsBrush;
                 if (b.color() != color) {
                     b.setColor(color);
                     setLabelsBrush(b);
                     emit labelsColorChanged(color);
                 }
             }
             QColor QAbstractAxis::labelsColor() const
             {
                 return d_ptr->m_labelsBrush.color();
             }
             void QAbstractAxis::setShadesVisible(bool visible)
             {
                 if (d_ptr->m_shadesVisible != visible) {
                     d_ptr->m_shadesVisible = visible;
                     d_ptr->emitUpdated();
                     emit shadesVisibleChanged(visible);
             	}
             }
             bool QAbstractAxis::shadesVisible() const
             {
                 return d_ptr->m_shadesVisible;
             }
             /*!
               Sets \a pen used to draw shades.
             */
             void QAbstractAxis::setShadesPen(const QPen &pen)
             {
                 if (d_ptr->m_shadesPen != pen) {
                     d_ptr->m_shadesPen = pen;
                     d_ptr->emitUpdated();
             	}
             }
             /*!
               Returns pen used to draw shades.
             */
             QPen QAbstractAxis::shadesPen() const
             {
                 return d_ptr->m_shadesPen;
             }
             /*!
               Sets \a brush used to draw shades.
             */
             void QAbstractAxis::setShadesBrush(const QBrush &brush)
             {
                 if (d_ptr->m_shadesBrush != brush) {
                     d_ptr->m_shadesBrush = brush;
                     d_ptr->emitUpdated();
                     emit shadesColorChanged(brush.color());
                 }
             }
             /*!
                Returns brush used to draw shades.
             */
             QBrush QAbstractAxis::shadesBrush() const
             {
                 return d_ptr->m_shadesBrush;
             }
             void QAbstractAxis::setShadesColor(QColor color)
             {
                 QBrush b = d_ptr->m_shadesBrush;
                 b.setColor(color);
                 setShadesBrush(b);
             }
             QColor QAbstractAxis::shadesColor() const
             {
                 return d_ptr->m_shadesBrush.color();
             }
             void QAbstractAxis::setShadesBorderColor(QColor color)
             {
                 QPen p = d_ptr->m_shadesPen;
                 p.setColor(color);
                 setShadesPen(p);
             }
             QColor QAbstractAxis::shadesBorderColor() const
             {
                 return d_ptr->m_shadesPen.color();
             }
             bool QAbstractAxis::isVisible() const
             {
                 return d_ptr->m_visible;
             }
             /*!
               Sets axis, shades, labels and grid lines to be visible.
             */
             void QAbstractAxis::setVisible(bool visible)
             {
                 if(d_ptr->m_visible!=visible){
                     d_ptr->m_visible=visible;
                     d_ptr->emitUpdated();
                     emit visibleChanged(visible);
                 }
             }
             /*!
               Sets axis, shades, labels and grid lines to be visible.
             */
             void QAbstractAxis::show()
             {
                 setVisible(true);
             }
             /*!
               Sets axis, shades, labels and grid lines to not be visible.
             */
             void QAbstractAxis::hide()
             {
                 setVisible(false);
             }
             /*!
               Sets the minimum value shown on the axis.
               Depending on the actual axis type the \a min paramter is converted to appropriate type.
               If the conversion is impossible then the function call does nothing
             */
             void QAbstractAxis::setMin(const QVariant &min)
             {
                 d_ptr->setMin(min);
             }
             /*!
               Sets the maximum value shown on the axis.
               Depending on the actual axis type the \a max paramter is converted to appropriate type.
               If the conversion is impossible then the function call does nothing
             */
             void QAbstractAxis::setMax(const QVariant &max)
             {
                 d_ptr->setMax(max);
             }
             /*!
               Sets the range shown on the axis.
               Depending on the actual axis type the \a min and \a max paramters are converted to appropriate types.
               If the conversion is impossible then the function call does nothing.
             */
             void QAbstractAxis::setRange(const QVariant &min, const QVariant &max)
             {
                 d_ptr->setRange(min,max);
             }
             /*!
               Returns the orientation in which the axis is being used (Vertical or Horizontal)
             */
             Qt::Orientation QAbstractAxis::orientation()
             {
                 return d_ptr->m_orientation;
             }
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis* q):
                 q_ptr(q),
                 m_orientation(Qt::Orientation(0)),
                 m_dataset(0),
                 m_visible(false),
                 m_arrowVisible(true),
                 m_gridLineVisible(true),
                 m_labelsVisible(true),
                 m_labelsAngle(0),
                 m_shadesVisible(false),
                 m_shadesBrush(Qt::SolidPattern),
                 m_shadesOpacity(1.0),
                 m_dirty(false)
             {
             }
             QAbstractAxisPrivate::~QAbstractAxisPrivate()
             {
             }
             void QAbstractAxisPrivate::emitUpdated()
             {
                 if(!m_dirty){
                     m_dirty=true;
                     emit updated();
                 }
             }
             void QAbstractAxisPrivate::setDirty(bool dirty)
             {
                 m_dirty=dirty;
             }
             void QAbstractAxisPrivate::setOrientation(Qt::Orientation orientation)
             {
                 m_orientation=orientation;
             }
             #include "moc_qabstractaxis.cpp"
             #include "moc_qabstractaxis_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qabstractaxis.h +9 -9

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QABSTRACTAXIS_H
             #define QABSTRACTAXIS_H
             #include <qchartglobal.h>
             #include <QPen>
             #include <QFont>
             #include <QVariant>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAbstractAxisPrivate;
             class QTCOMMERCIALCHART_EXPORT QAbstractAxis : public QObject
             {
             	Q_OBJECT
             	Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-                Q_PROPERTY(bool arrowVisible READ isArrowVisible WRITE setArrowVisible NOTIFY arrowVisibleChanged)
+                Q_PROPERTY(bool arrowVisible READ isLineVisible WRITE setLineVisible NOTIFY lineVisibleChanged)
-                Q_PROPERTY(QColor color READ axisPenColor WRITE setAxisPenColor NOTIFY colorChanged)
+                Q_PROPERTY(QColor color READ linePenColor WRITE setLinePenColor NOTIFY colorChanged)
                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
                 Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle)
                 Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont)
                 Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged)
                 Q_PROPERTY(bool gridVisible READ isGridLineVisible WRITE setGridLineVisible NOTIFY gridVisibleChanged)
                 Q_PROPERTY(bool shadesVisible READ shadesVisible WRITE setShadesVisible NOTIFY shadesVisibleChanged)
                 Q_PROPERTY(QColor shadesColor READ shadesColor WRITE setShadesColor NOTIFY shadesColorChanged)
                 Q_PROPERTY(QColor shadesBorderColor READ shadesBorderColor WRITE setShadesBorderColor NOTIFY shadesBorderColorChanged)
             public:
                 enum AxisType {
                     AxisTypeNoAxis = 0x0,
                     AxisTypeValue = 0x1,
                     AxisTypeBarCategory = 0x2,
                     AxisTypeCategory = 0x3,
                     AxisTypeDateTime = 0x4
                 };
                 Q_DECLARE_FLAGS(AxisTypes, AxisType)
             protected:
                 explicit QAbstractAxis(QAbstractAxisPrivate &d,QObject *parent = 0);
             public:
                 ~QAbstractAxis();
                 virtual AxisType type() const = 0;
                 //visibilty hadnling
                 bool isVisible() const;
                 void setVisible(bool visible = true);
                 //axis handling
-                bool isArrowVisible() const;
+                bool isLineVisible() const;
-                void setArrowVisible(bool visible = true);
+                void setLineVisible(bool visible = true);
-                void setAxisPen(const QPen &pen);
+                void setLinePen(const QPen &pen);
-                QPen axisPen() const;
+                QPen linePen() const;
-                void setAxisPenColor(QColor color);
+                void setLinePenColor(QColor color);
-                QColor axisPenColor() const;
+                QColor linePenColor() const;
                 //grid handling
                 bool isGridLineVisible() const;
                 void setGridLineVisible(bool visible = true);
                 void setGridLinePen(const QPen &pen);
                 QPen gridLinePen() const;
                 //labels handling
                 bool labelsVisible() const;
                 void setLabelsVisible(bool visible = true);
                 void setLabelsPen(const QPen &pen);
                 QPen labelsPen() const;
                 void setLabelsBrush(const QBrush &brush);
                 QBrush labelsBrush() const;
                 void setLabelsFont(const QFont &font);
                 QFont labelsFont() const;
                 void setLabelsAngle(int angle);
                 int labelsAngle() const;
                 void setLabelsColor(QColor color);
                 QColor labelsColor() const;
                 //shades handling
                 bool shadesVisible() const;
                 void setShadesVisible(bool visible = true);
                 void setShadesPen(const QPen &pen);
                 QPen shadesPen() const;
                 void setShadesBrush(const QBrush &brush);
                 QBrush shadesBrush() const;
                 void setShadesColor(QColor color);
                 QColor shadesColor() const;
                 void setShadesBorderColor(QColor color);
                 QColor shadesBorderColor() const;
                 Qt::Orientation orientation();
                 //range handling
                 void setMin(const QVariant &min);
                 void setMax(const QVariant &max);
                 void setRange(const QVariant &min, const QVariant &max);
                 void show();
                 void hide();
             Q_SIGNALS:
                 void visibleChanged(bool visible);
-                void arrowVisibleChanged(bool visible);
+                void lineVisibleChanged(bool visible);
                 void labelsVisibleChanged(bool visible);
                 void gridVisibleChanged(bool visible);
                 void colorChanged(QColor color);
                 void labelsColorChanged(QColor color);
                 void shadesVisibleChanged(bool visible);
                 void shadesColorChanged(QColor color);
                 void shadesBorderColorChanged(QColor color);
             protected:
             	QScopedPointer<QAbstractAxisPrivate> d_ptr;
                 Q_DISABLE_COPY(QAbstractAxis)
                 friend class ChartDataSet;
                 friend class ChartAxis;
                 friend class ChartPresenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/charttheme.cpp +3 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "charttheme_p.h"
             #include "qchart.h"
             #include "qchart_p.h"
             #include "qchartview.h"
             #include "qlegend.h"
             #include "qabstractaxis.h"
             #include <QTime>
             //series
             #include "qbarset.h"
             #include "qabstractbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qscatterseries.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "qpieslice_p.h"
             #include "qsplineseries.h"
             //items
             #include "chartaxis_p.h"
             #include "abstractbarchartitem_p.h"
             #include "stackedbarchartitem_p.h"
             #include "percentbarchartitem_p.h"
             #include "linechartitem_p.h"
             #include "areachartitem_p.h"
             #include "scatterchartitem_p.h"
             #include "piechartitem_p.h"
             #include "splinechartitem_p.h"
             //themes
             #include "chartthemesystem_p.h"
             #include "chartthemelight_p.h"
             #include "chartthemebluecerulean_p.h"
             #include "chartthemedark_p.h"
             #include "chartthemebrownsand_p.h"
             #include "chartthemebluencs_p.h"
             #include "chartthemehighcontrast_p.h"
             #include "chartthemeblueicy_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartTheme::ChartTheme(QChart::ChartTheme id) :
                 m_masterFont(QFont("arial", 14)),
                 m_labelFont(QFont("arial", 10)),
                 m_labelBrush(QColor(QRgb(0x000000))),
                 m_axisLinePen(QPen(QRgb(0x000000))),
                 m_backgroundShadesPen(Qt::NoPen),
                 m_backgroundShadesBrush(Qt::NoBrush),
                 m_backgroundShades(BackgroundShadesNone),
                 m_backgroundDropShadowEnabled(false),
                 m_gridLinePen(QPen(QRgb(0x000000))),
                 m_force(false)
             {
                 m_id = id;
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
             }
             ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme)
             {
                 switch(theme) {
                 case QChart::ChartThemeLight:
                     return new ChartThemeLight();
                 case QChart::ChartThemeBlueCerulean:
                     return new ChartThemeBlueCerulean();
                 case QChart::ChartThemeDark:
                     return new ChartThemeDark();
                 case QChart::ChartThemeBrownSand:
                     return new ChartThemeBrownSand();
                 case QChart::ChartThemeBlueNcs:
                     return new ChartThemeBlueNcs();
                 case QChart::ChartThemeHighContrast:
                     return new ChartThemeHighContrast();
                 case QChart::ChartThemeBlueIcy:
                     return new ChartThemeBlueIcy();
                 default:
                     return new ChartThemeSystem();
                 }
             }
             void ChartTheme::decorate(QChart *chart)
             {
                 QBrush brush;
                 if(m_force || brush == chart->backgroundBrush())
                     chart->setBackgroundBrush(m_chartBackgroundGradient);
                 chart->setTitleFont(m_masterFont);
                 chart->setTitleBrush(m_labelBrush);
                 chart->setDropShadowEnabled(m_backgroundDropShadowEnabled);
             }
             void ChartTheme::decorate(QLegend *legend)
             {
                 QPen pen;
                 QBrush brush;
                 QFont font;
                 if (m_force || pen == legend->pen())
                     legend->setPen(m_axisLinePen);
                 if (m_force || brush == legend->brush())
                     legend->setBrush(m_chartBackgroundGradient);
                 if (m_force || font == legend->font())
                     legend->setFont(m_labelFont);
                 if (m_force || brush == legend->labelBrush())
                     legend->setLabelBrush(m_labelBrush);
             }
             void ChartTheme::decorate(QAreaSeries *series, int index)
             {
                 QPen pen;
                 QBrush brush;
                 if (m_force || pen == series->pen()){
                     pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
                 if (m_force || brush == series->brush()) {
                     QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                     series->setBrush(brush);
                 }
             }
             void ChartTheme::decorate(QLineSeries *series,int index)
             {
                 QPen pen;
                 if(m_force || pen == series->pen()){
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
             }
             void ChartTheme::decorate(QAbstractBarSeries *series, int index)
             {
                 QBrush brush;
                 QPen pen;
                 QList<QBarSet *> sets = series->barSets();
                 qreal takeAtPos = 0.5;
                 qreal step = 0.2;
                 if (sets.count() > 1 ) {
                     step = 1.0 / (qreal) sets.count();
                     if (sets.count() % m_seriesGradients.count())
                         step *= m_seriesGradients.count();
                     else
                         step *= (m_seriesGradients.count() - 1);
                 }
                 for (int i(0); i < sets.count(); i++) {
                     int colorIndex = (index + i) % m_seriesGradients.count();
                     if (i > 0 && i % m_seriesGradients.count() == 0) {
                         // There is no dedicated base color for each sets, generate more colors
                         takeAtPos += step;
                         if (takeAtPos == 1.0)
                             takeAtPos += step;
                         takeAtPos -= (int) takeAtPos;
                     }
                     if (m_force || brush == sets.at(i)->brush())
                         sets.at(i)->setBrush(colorAt(m_seriesGradients.at(colorIndex), takeAtPos));
                     // Pick label color from the opposite end of the gradient.
                     // 0.3 as a boundary seems to work well.
                     if (m_force || brush == sets.at(i)->labelBrush()) {
                         if (takeAtPos < 0.3)
                             sets.at(i)->setLabelBrush(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1));
                         else
                             sets.at(i)->setLabelBrush(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0));
                     }
                     if (m_force || pen == sets.at(i)->pen()) {
                         QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
                         sets.at(i)->setPen(c);
                     }
                 }
             }
             void ChartTheme::decorate(QScatterSeries *series, int index)
             {
                 QPen pen;
                 QBrush brush;
                 if (m_force || pen == series->pen()) {
                     pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
                 if (m_force || brush == series->brush()) {
                     QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                     series->setBrush(brush);
                 }
             }
             void ChartTheme::decorate(QPieSeries *series, int index)
             {
                 for (int i(0); i < series->slices().count(); i++) {
                     QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
                     // Get color for a slice from a gradient linearly, beginning from the start of the gradient
                     qreal pos = (qreal) (i + 1) / (qreal) series->count();
                     QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     QPieSlice *s = series->slices().at(i);
                     QPieSlicePrivate *d = QPieSlicePrivate::fromSlice(s);
                     if (m_force || d->m_data.m_slicePen.isThemed())
                         d->setPen(penColor, true);
                     if (m_force || d->m_data.m_sliceBrush.isThemed())
                         d->setBrush(brushColor, true);
                     if (m_force || d->m_data.m_labelBrush.isThemed())
                         d->setLabelBrush(m_labelBrush.color(), true);
                     if (m_force || d->m_data.m_labelFont.isThemed())
                         d->setLabelFont(m_labelFont, true);
                 }
             }
             void ChartTheme::decorate(QSplineSeries *series, int index)
             {
                 QPen pen;
                 if(m_force || pen == series->pen()){
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
             }
             void ChartTheme::decorate(QAbstractAxis *axis)
             {
                 QPen pen;
                 QBrush brush;
                 QFont font;
                 bool axisX = axis->orientation()== Qt::Horizontal;
-                if (axis->isArrowVisible()) {
+                if (axis->isLineVisible()) {
                     if(m_force || brush == axis->labelsBrush()){
                         axis->setLabelsBrush(m_labelBrush);
                     }
                     if(m_force || pen == axis->labelsPen()){
                         axis->setLabelsPen(Qt::NoPen); // NoPen for performance reasons
                     }
                     if (m_force || axis->shadesVisible()) {
                         if(m_force || brush == axis->shadesBrush()){
                             axis->setShadesBrush(m_backgroundShadesBrush);
                         }
                         if(m_force || pen == axis->shadesPen()){
                             axis->setShadesPen(m_backgroundShadesPen);
                         }
                         if( m_force && (m_backgroundShades == BackgroundShadesBoth
                                         || (m_backgroundShades == BackgroundShadesVertical && axisX)
                                         || (m_backgroundShades == BackgroundShadesHorizontal && !axisX))){
                             axis->setShadesVisible(true);
                         }
                     }
-                    if(m_force || pen == axis->axisPen()){
+                    if(m_force || pen == axis->linePen()){
-                        axis->setAxisPen(m_axisLinePen);
+                        axis->setLinePen(m_axisLinePen);
                     }
                     if(m_force || pen == axis->gridLinePen()){
                         axis->setGridLinePen(m_gridLinePen);
                     }
                     if(m_force || font == axis->labelsFont()){
                         axis->setLabelsFont(m_labelFont);
                     }
                 }
             }
             void ChartTheme::generateSeriesGradients()
             {
                 // Generate gradients in HSV color space
                 foreach (const QColor& color, m_seriesColors) {
                     QLinearGradient g;
                     qreal h = color.hsvHueF();
                     qreal s = color.hsvSaturationF();
                     // TODO: tune the algorithm to give nice results with most base colors defined in
                     // most themes. The rest of the gradients we can define manually in theme specific
                     // implementation.
                     QColor start = color;
                     start.setHsvF(h, 0.0, 1.0);
                     g.setColorAt(0.0, start);
                     g.setColorAt(0.5, color);
                     QColor end = color;
                     end.setHsvF(h, s, 0.25);
                     g.setColorAt(1.0, end);
                     m_seriesGradients << g;
                 }
             }
             QColor ChartTheme::colorAt(const QColor &start, const QColor &end, qreal pos)
             {
                 Q_ASSERT(pos >= 0.0 && pos <= 1.0);
                 qreal r = start.redF() + ((end.redF() - start.redF()) * pos);
                 qreal g = start.greenF() + ((end.greenF() - start.greenF()) * pos);
                 qreal b = start.blueF() + ((end.blueF() - start.blueF()) * pos);
                 QColor c;
                 c.setRgbF(r, g, b);
                 return c;
             }
             QColor ChartTheme::colorAt(const QGradient &gradient, qreal pos)
             {
                 Q_ASSERT(pos >= 0 && pos <= 1.0);
                 QGradientStops stops = gradient.stops();
                 int count = stops.count();
                 // find previous stop relative to position
                 QGradientStop prev = stops.first();
                 for (int i = 0; i < count; i++) {
                     QGradientStop stop = stops.at(i);
                     if (pos > stop.first)
                         prev = stop;
                     // given position is actually a stop position?
                     if (pos == stop.first) {
                         //qDebug() << "stop color" << pos;
                         return stop.second;
                     }
                 }
                 // find next stop relative to position
                 QGradientStop next = stops.last();
                 for (int i = count - 1; i >= 0; i--) {
                     QGradientStop stop = stops.at(i);
                     if (pos < stop.first)
                         next = stop;
                 }
                 //qDebug() << "prev" << prev.first << "pos" << pos << "next" << next.first;
                 qreal range = next.first - prev.first;
                 qreal posDelta = pos - prev.first;
                 qreal relativePos = posDelta / range;
                 //qDebug() << "range" << range << "posDelta" << posDelta << "relativePos" << relativePos;
                 return colorAt(prev.second, next.second, relativePos);
             }
             void ChartTheme::setForced(bool enabled)
             {
                 m_force = enabled;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

tests/auto/qabstractaxis/tst_qabstractaxis.cpp +11 -11

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "tst_qabstractaxis.h"
             Q_DECLARE_METATYPE(QPen)
             Q_DECLARE_METATYPE(Qt::Orientation)
             void tst_QAbstractAxis::initTestCase()
             {
             }
             void tst_QAbstractAxis::cleanupTestCase()
             {
             }
             void tst_QAbstractAxis::init(QAbstractAxis* axis, QAbstractSeries* series)
             {
                 m_axis = axis;
                 m_series = series;
                 m_view = new QChartView(new QChart());
                 m_chart = m_view->chart();
             }
             void tst_QAbstractAxis::cleanup()
             {
                 delete m_view;
                 m_view = 0;
                 m_chart = 0;
                 m_axis = 0;
             }
             void tst_QAbstractAxis::qabstractaxis()
             {
-                QCOMPARE(m_axis->axisPen(), QPen());
+                QCOMPARE(m_axis->linePen(), QPen());
                 //TODO QCOMPARE(m_axis->axisPenColor(), QColor());
                 QCOMPARE(m_axis->gridLinePen(), QPen());
-                QCOMPARE(m_axis->isArrowVisible(), true);
+                QCOMPARE(m_axis->isLineVisible(), true);
                 QCOMPARE(m_axis->isGridLineVisible(), true);
                 QCOMPARE(m_axis->isVisible(), false);
                 QCOMPARE(m_axis->labelsAngle(), 0);
                 QCOMPARE(m_axis->labelsBrush(), QBrush());
                 //TODO QCOMPARE(m_axis->labelsColor(), QColor());
                 QCOMPARE(m_axis->labelsFont(), QFont());
                 QCOMPARE(m_axis->labelsPen(), QPen());
                 QCOMPARE(m_axis->labelsVisible(), true);
                 QCOMPARE(m_axis->orientation(), Qt::Orientation(0));
-                m_axis->setArrowVisible(false);
+                m_axis->setLineVisible(false);
-                m_axis->setAxisPen(QPen());
+                m_axis->setLinePen(QPen());
-                m_axis->setAxisPenColor(QColor());
+                m_axis->setLinePenColor(QColor());
                 m_axis->setGridLinePen(QPen());
                 m_axis->setGridLineVisible(false);
                 m_axis->setLabelsAngle(-1);
                 m_axis->setLabelsBrush(QBrush());
                 m_axis->setLabelsColor(QColor());
                 m_axis->setLabelsFont(QFont());
                 m_axis->setLabelsPen(QPen());
                 m_axis->setLabelsVisible(false);
                 m_axis->setMax(QVariant());
                 m_axis->setMin(QVariant());
                 m_axis->setRange(QVariant(), QVariant());
                 m_axis->setShadesBorderColor(QColor());
                 m_axis->setShadesBrush(QBrush());
                 m_axis->setShadesColor(QColor());
                 m_axis->setShadesPen(QPen());
                 m_axis->setShadesVisible(false);
                 m_axis->setVisible(false);
                 //TODO QCOMPARE(m_axis->shadesBorderColor(), QColor());
                 //TODO QCOMPARE(m_axis->shadesBrush(), QBrush());
                 //TODO QCOMPARE(m_axis->shadesColor(), QColor());
                 QCOMPARE(m_axis->shadesPen(), QPen());
                 QCOMPARE(m_axis->shadesVisible(), false);
                 m_axis->show();
                 m_axis->hide();
             }
             void tst_QAbstractAxis::axisPen_data()
             {
                 QTest::addColumn<QPen>("axisPen");
                 QTest::newRow("null") << QPen();
                 QTest::newRow("blue") << QPen(Qt::blue);
                 QTest::newRow("black") << QPen(Qt::black);
                 QTest::newRow("red") << QPen(Qt::red);
             }
             void tst_QAbstractAxis::axisPen()
             {
                 QFETCH(QPen, axisPen);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
-                m_axis->setAxisPen(axisPen);
+                m_axis->setLinePen(axisPen);
-                QCOMPARE(m_axis->axisPen(), axisPen);
+                QCOMPARE(m_axis->linePen(), axisPen);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 //TODO QCOMPARE(m_axis->axisPen(), axisPen);
             }
             void tst_QAbstractAxis::axisPenColor_data()
             {
             }
             void tst_QAbstractAxis::axisPenColor()
             {
                 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
             }
             void tst_QAbstractAxis::gridLinePen_data()
             {
                 QTest::addColumn<QPen>("gridLinePen");
                 QTest::newRow("null") << QPen();
                 QTest::newRow("blue") << QPen(Qt::blue);
                 QTest::newRow("black") << QPen(Qt::black);
                 QTest::newRow("red") << QPen(Qt::red);
             }
             void tst_QAbstractAxis::gridLinePen()
             {
                 QFETCH(QPen, gridLinePen);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setGridLinePen(gridLinePen);
                 QCOMPARE(m_axis->gridLinePen(), gridLinePen);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 //TODO QCOMPARE(m_axis->gridLinePen(), gridLinePen);
             }
             void tst_QAbstractAxis::arrowVisible_data()
             {
                 QTest::addColumn<bool>("arrowVisible");
                 QTest::newRow("true") << true;
                 QTest::newRow("false") << false;
             }
             void tst_QAbstractAxis::arrowVisible()
             {
                 QFETCH(bool, arrowVisible);
-                m_axis->setArrowVisible(!arrowVisible);
+                m_axis->setLineVisible(!arrowVisible);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
-                m_axis->setArrowVisible(arrowVisible);
+                m_axis->setLineVisible(arrowVisible);
-                QCOMPARE(m_axis->isArrowVisible(), arrowVisible);
+                QCOMPARE(m_axis->isLineVisible(), arrowVisible);
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
-                QCOMPARE(m_axis->isArrowVisible(), arrowVisible);
+                QCOMPARE(m_axis->isLineVisible(), arrowVisible);
             }
             void tst_QAbstractAxis::gridLineVisible_data()
             {
                 QTest::addColumn<bool>("gridLineVisible");
                 QTest::newRow("true") << true;
                 QTest::newRow("false") << false;
             }
             void tst_QAbstractAxis::gridLineVisible()
             {
                 QFETCH(bool, gridLineVisible);
                 m_axis->setGridLineVisible(!gridLineVisible);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setGridLineVisible(gridLineVisible);
                 QCOMPARE(m_axis->isGridLineVisible(), gridLineVisible);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 1);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->isGridLineVisible(), gridLineVisible);
             }
             void tst_QAbstractAxis::visible_data()
             {
                 QTest::addColumn<bool>("visible");
                 QTest::newRow("true") << true;
                 QTest::newRow("false") << false;
             }
             void tst_QAbstractAxis::visible()
             {
                 QFETCH(bool, visible);
                 m_axis->setVisible(!visible);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setVisible(visible);
                 QCOMPARE(m_axis->isVisible(), visible);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 1);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->isVisible(), true);
             }
             void tst_QAbstractAxis::labelsAngle_data()
             {
                 QTest::addColumn<int>("labelsAngle");
                 QTest::newRow("0") << 0;
                 QTest::newRow("45") << 45;
                 QTest::newRow("90") << 90;
             }
             void tst_QAbstractAxis::labelsAngle()
             {
                 QFETCH(int, labelsAngle);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setLabelsAngle(labelsAngle);
                 QCOMPARE(m_axis->labelsAngle(), labelsAngle);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->labelsAngle(), labelsAngle);
             }
             void tst_QAbstractAxis::labelsBrush_data()
             {
                 QTest::addColumn<QBrush>("labelsBrush");
                 QTest::newRow("null") << QBrush();
                 QTest::newRow("blue") << QBrush(Qt::blue);
                 QTest::newRow("black") << QBrush(Qt::black);
             }
             void tst_QAbstractAxis::labelsBrush()
             {
                 QFETCH(QBrush, labelsBrush);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setLabelsBrush(labelsBrush);
                 QCOMPARE(m_axis->labelsBrush(), labelsBrush);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 //TODO QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->labelsBrush(), labelsBrush);
             }
             void tst_QAbstractAxis::labelsColor_data()
             {
             }
             void tst_QAbstractAxis::labelsColor()
             {
                 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
             }
             void tst_QAbstractAxis::labelsFont_data()
             {
                 QTest::addColumn<QFont>("labelsFont");
                 QTest::newRow("null") << QFont();
                 QTest::newRow("serif") << QFont("SansSerif");
             }
             void tst_QAbstractAxis::labelsFont()
             {
                 QFETCH(QFont, labelsFont);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setLabelsFont(labelsFont);
                 QCOMPARE(m_axis->labelsFont(), labelsFont);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->labelsFont(), labelsFont);
             }
             void tst_QAbstractAxis::labelsPen_data()
             {
                 QTest::addColumn<QPen>("labelsPen");
                 QTest::newRow("null") << QPen();
                 QTest::newRow("blue") << QPen(Qt::blue);
                 QTest::newRow("black") << QPen(Qt::black);
                 QTest::newRow("red") << QPen(Qt::red);
             }
             void tst_QAbstractAxis::labelsPen()
             {
                 QFETCH(QPen, labelsPen);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setLabelsPen(labelsPen);
                 QCOMPARE(m_axis->labelsPen(), labelsPen);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 //TODO QCOMPARE(m_axis->labelsPen(), labelsPen);
             }
             void tst_QAbstractAxis::labelsVisible_data()
             {
                 QTest::addColumn<bool>("labelsVisible");
                 QTest::newRow("true") << true;
                 QTest::newRow("false") << false;
             }
             void tst_QAbstractAxis::labelsVisible()
             {
                 QFETCH(bool, labelsVisible);
                 m_axis->setLabelsVisible(!labelsVisible);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setLabelsVisible(labelsVisible);
                 QCOMPARE(m_axis->labelsVisible(), labelsVisible);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 1);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->labelsVisible(), labelsVisible);
             }
             void tst_QAbstractAxis::orientation_data()
             {
                 QTest::addColumn<Qt::Orientation>("orientation");
                 QTest::newRow("Vertical") << Qt::Vertical;
                 QTest::newRow("Horizontal") << Qt::Horizontal;
             }
             void tst_QAbstractAxis::orientation()
             {
                 QFETCH(Qt::Orientation, orientation);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 if(orientation==Qt::Vertical){
                     m_chart->setAxisY(m_axis,m_series);
                 }else{
                     m_chart->setAxisX(m_axis,m_series);
                 }
                 QCOMPARE(m_axis->orientation(), orientation);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 1);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->orientation(), orientation);
             }
             void tst_QAbstractAxis::setMax_data()
             {
                 //just check if it does not crash
                 QTest::addColumn<QVariant>("max");
                 QTest::newRow("something") << QVariant("something");
                 QTest::newRow("1.0") << QVariant(1.0);
             }
             void tst_QAbstractAxis::setMax()
             {
                 QFETCH(QVariant, max);
                 m_axis->setMax(max);
             }
             void tst_QAbstractAxis::setMin_data()
             {
                 //just check if it does not crash
                 QTest::addColumn<QVariant>("min");
                 QTest::newRow("something") << QVariant("something");
                 QTest::newRow("1.0") << QVariant(1.0);
             }
             // public void setMin(QVariant const& min)
             void tst_QAbstractAxis::setMin()
             {
                 QFETCH(QVariant, min);
                 m_axis->setMin(min);
             }
             void tst_QAbstractAxis::setRange_data()
             {
                 //just check if it does not crash
                 QTest::addColumn<QVariant>("min");
                 QTest::addColumn<QVariant>("max");
                 QTest::newRow("something") << QVariant("something0") << QVariant("something1");
                 QTest::newRow("-1 1") << QVariant(-1.0) << QVariant(1.0);
             }
             // public void setRange(QVariant const& min, QVariant const& max)
             void tst_QAbstractAxis::setRange()
             {
                 QFETCH(QVariant, min);
                 QFETCH(QVariant, max);
                 m_axis->setRange(min,max);
             }
             void tst_QAbstractAxis::shadesBorderColor_data()
             {
             }
             void tst_QAbstractAxis::shadesBorderColor()
             {
                 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
             }
             void tst_QAbstractAxis::shadesBrush_data()
             {
                 QTest::addColumn<QBrush>("shadesBrush");
                 QTest::newRow("null") << QBrush();
                 QTest::newRow("blue") << QBrush(Qt::blue);
                 QTest::newRow("black") << QBrush(Qt::black);
             }
             void tst_QAbstractAxis::shadesBrush()
             {
                 QFETCH(QBrush, shadesBrush);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setShadesBrush(shadesBrush);
                 QCOMPARE(m_axis->shadesBrush(), shadesBrush);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 //TODO QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->shadesBrush(), shadesBrush);
             }
             void tst_QAbstractAxis::shadesColor_data()
             {
             }
             // public QColor shadesColor() const
             void tst_QAbstractAxis::shadesColor()
             {
                 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
             }
             void tst_QAbstractAxis::shadesPen_data()
             {
                 QTest::addColumn<QPen>("shadesPen");
                 QTest::newRow("null") << QPen();
                 QTest::newRow("blue") << QPen(Qt::blue);
                 QTest::newRow("black") << QPen(Qt::black);
                 QTest::newRow("red") << QPen(Qt::red);
             }
             void tst_QAbstractAxis::shadesPen()
             {
                 QFETCH(QPen, shadesPen);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setShadesPen(shadesPen);
                 QCOMPARE(m_axis->shadesPen(), shadesPen);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->shadesPen(), shadesPen);
             }
             void tst_QAbstractAxis::shadesVisible_data()
             {
                 QTest::addColumn<bool>("shadesVisible");
                 QTest::newRow("true") << true;
                 QTest::newRow("false") << false;
             }
             void tst_QAbstractAxis::shadesVisible()
             {
                 QFETCH(bool, shadesVisible);
                 m_axis->setShadesVisible(!shadesVisible);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->setShadesVisible(shadesVisible);
                 QCOMPARE(m_axis->shadesVisible(), shadesVisible);
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 1);
                 QCOMPARE(spy8.count(), 0);
                 m_chart->setAxisX(m_axis, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 QCOMPARE(m_axis->shadesVisible(), shadesVisible);
             }
             void tst_QAbstractAxis::show_data()
             {
             }
             void tst_QAbstractAxis::show()
             {
                 m_axis->hide();
                 QCOMPARE(m_axis->isVisible(), false);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->show();
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 1);
                 QCOMPARE(m_axis->isVisible(), true);
             }
             void tst_QAbstractAxis::hide_data()
             {
             }
             void tst_QAbstractAxis::hide()
             {
                 m_axis->show();
                 QCOMPARE(m_axis->isVisible(),true);
                 QSignalSpy spy0(m_axis, SIGNAL(arrowVisibleChanged(bool)));
                 QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
                 QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
                 QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
                 QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
                 QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
                 QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
                 QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
                 QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
                 m_axis->hide();
                 QCOMPARE(spy0.count(), 0);
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
                 QCOMPARE(spy4.count(), 0);
                 QCOMPARE(spy5.count(), 0);
                 QCOMPARE(spy6.count(), 0);
                 QCOMPARE(spy7.count(), 0);
                 QCOMPARE(spy8.count(), 1);
                 QCOMPARE(m_axis->isVisible(),false);
             }

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