HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2343:cd130a1062f2

Added links LogValueAxis to demos and qml docs pages

Marek Rosa -

r2343:cd130a1062f2

parent child

Context file:

r2343:cd130a1062f2

Collapse all files

doc/src/classes.qdoc +1 0

             /*!
                 \page classes.html
                 \title QtCommercial Charts API
                 \keyword All Classes
                 Charts API is build on top of Qt Graphics View Framework. Charts can be displayed as QGraphicsWidget using QChart class. However
                 there is also convenience class QChartView which is QWidget based. These lets quickly use QCharts as normal Qt widget.
                 Each chart type is represented by QAbstractSeries derived class. To create given chart type users have to use instance of related series class and add it to QChart instance.
                 \code
                 QLineSeries* series = new QLineSeries();
                 series->add(0, 6);
                 series->add(2, 4);
                 ...
                 chartView->chart()->addSeries(series);
                 chartView->chart()->createDefaultAxes();
                 \endcode
                 \raw HTML
                     <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%">
                                 Common and global
                             </th>
                             <th class="titleheader" width="25%">
                                 XY chart
                             </th>
                         </tr>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qchart.html">QChart</a></li>
                                 <li><a href="qchartview.html">QChartView</a></li>
                                 <li><a href="qabstractaxis.html">QAbstractAxis</a></li>
                                 <li><a href="qvalueaxis.html">QValueAxis</a></li>
+                                <li><a href="qlogvalueaxis.html">QLogValueAxis</a></li>
                                 <li><a href="qbarcategoryaxis.html">QBarCategoryAxis</a></li>
                                 <li><a href="qcategoryaxis.html">QCategoryAxis</a></li>
                                 <li><a href="qdatetimeaxis.html">QDateTimeAxis</a></li>
                                 <li><a href="qlegend.html">QLegend</a></li>
                                 <li><a href="qlegendmarker.html">QLegendMarker</a></li>
                                 <li><a href="qpielegendmarker.html">QPieLegendMarker</a></li>
                                 <li><a href="qxylegendmarker.html">QXYLegendMarker</a></li>
                                 <li><a href="qbarlegendmarker.html">QBarLegendMarker</a></li>
                                 <li><a href="qarealegendmarker.html">QAreaLegendMarker</a></li>
                                 <li><a href="qabstractseries.html">QAbstractSeries</a></li>
                                 <li><a href="qchartglobal.html">QChartGlobal</a></li>
                                 </ul>
                             </td>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qxyseries.html">QXYSeries</a></li>
                                 <li><a href="qlineseries.html">QLineSeries</a></li>
                                 <li><a href="qareaseries.html">QAreaSeries</a></li>
                                 <li><a href="qscatterseries.html">QScatterSeries</a></li>
                                 <li><a href="qsplineseries.html">QSplineSeries</a></li>
                                 <li><a href="qhxymodelmapper.html">QHXYModelMapper</a></li>
                                 <li><a href="qvxymodelmapper.html">QVXYModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%">
                                 Pie chart
                             </th>
                             <th class="titleheader" width="25%">
                                 Bar chart
                             </th>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qpieseries.html">QPieSeries</a></li>
                                 <li><a href="qpieslice.html">QPieSlice</a></li>
                                 <li><a href="qhpiemodelmapper.html">QHPieModelMapper</a></li>
                                 <li><a href="qvpiemodelmapper.html">QVPieModelMapper</a></li>
                                 </ul>
                             </td>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qbarseries.html">QBarSeries</a></li>
                                 <li><a href="qbarset.html">QBarSet</a></li>
                                 <li><a href="qpercentbarseries.html">QPercentBarSeries</a></li>
                                 <li><a href="qstackedbarseries.html">QStackedBarSeries</a></li>
                                 <li><a href="qhbarmodelmapper.html">QHBarModelMapper</a></li>
                                 <li><a href="qvbarmodelmapper.html">QVBarModelMapper</a></li>
                                 <li><a href="qhorizontalbarseries.html">QHorizontalBarSeries</a></li>
                                 <li><a href="qhorizontalstackedbarseries.html">QHorizontalStackedBarSeries</a></li>
                                 <li><a href="qhorizontalpercentbarseries.html">QHorizontalPercentBarSeries</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                 \endraw
             */

doc/src/qml.qdoc +1 0

             /*!
                 \page qml.html
                 \title QtCommercial Charts QML API
                 \keyword Charts QML API
                 QtCommercial Charts QML API is an intuitive and simple way to show charts in your QML
                 applications.
                 \table
                     \row
                         \o  \br
                             Use the following QML to create a simple pie chart:
                             \br
                             \br
                             \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
                             \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
                             \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
                         \o \inlineimage examples_qmlpiechart.png
                 \endtable
                 \raw HTML
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> ChartView and it's properties </th>
                         </tr>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-chartview.html">ChartView</a></li>
                                 <li><a href="qml-abstractaxis.html">AbstractAxis</a></li>
                                 <li><a href="qml-valueaxis.html">ValueAxis</a></li>
+                                <li><a href="qml-logvaluesaxis.html">LogValueAxis</a></li>
                                 <li><a href="qml-categoryaxis.html">CategoryAxis</a></li>
                                 <li><a href="qml-categoryrange.html">CategoryRange</a></li>
                                 <li><a href="qml-barcategoryaxis.html">BarCategoryAxis</a></li>
                                 <li><a href="qml-datetimeaxis.html">DateTimeAxis</a></li>
                                 <li><a href="qml-legend.html">Legend</a></li>
                                 <li><a href="qml-abstractseries.html">AbstractSeries</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> XY chart </th>
                         </tr>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-xyseries.html">XYSeries</a></li>
                                 <li><a href="qml-lineseries.html">LineSeries</a></li>
                                 <li><a href="qml-areaseries.html">AreaSeries</a></li>
                                 <li><a href="qml-scatterseries.html">ScatterSeries</a></li>
                                 <li><a href="qml-splineseries.html">SplineSeries</a></li>
                                 <li><a href="qml-xypoint.html">XYPoint</a></li>
                                 <li><a href="qml-hxymodelmapper.html">HXYModelMapper</a></li>
                                 <li><a href="qml-vxymodelmapper.html">VXYModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> Pie chart </th>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-pieseries.html">PieSeries</a></li>
                                 <li><a href="qml-pieslice.html">PieSlice</a></li>
                                 <li><a href="qml-hpiemodelmapper.html">HPieModelMapper</a></li>
                                 <li><a href="qml-vpiemodelmapper.html">VPieModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
                         <tr>
                             <th class="titleheader" width="25%"> Bar chart </th>
                         <tr>
                             <td valign="top">
                                 <ul>
                                 <li><a href="qml-barseries.html">BarSeries</a></li>
                                 <li><a href="qml-stackedbarseries.html">StackedBarSeries</a></li>
                                 <li><a href="qml-percentbarseries.html">PercentBarSeries</a></li>
                                 <li><a href="qml-horizontalbarseries.html">HorizontalBarSeries</a></li>
                                 <li><a href="qml-horizontalstackedbarseries.html">HorizontalStackedBarSeries</a></li>
                                 <li><a href="qml-horizontalpercentbarseries.html">HorizontalPercentBarSeries</a></li>
                                 <li><a href="qml-barset.html">BarSet</a></li>
                                 <li><a href="qml-hbarmodelmapper.html">HBarModelMapper</a></li>
                                 <li><a href="qml-vbarmodelmapper.html">VBarModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>
                     </table>
                 \endraw
             */

src/axis/logvalueaxis/qlogvalueaxis.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 "qlogvalueaxis.h"
             #include "qlogvalueaxis_p.h"
             #include "chartlogvalueaxisx_p.h"
             #include "chartlogvalueaxisy_p.h"
             #include "abstractdomain_p.h"
             #include <float.h>
             #include <cmath>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QLogValueAxis
                 \brief The QLogValueAxis class is used for manipulating chart's axis.
                 \mainclass
             */
             /*!
-                \qmlclass DateTimeAxis QLogValueAxis
+                \qmlclass LogValuesAxis QLogValueAxis
-                \brief The QLogValueAxis element is used for manipulating chart's axes
+                \brief The LogValueAxis element is used for manipulating chart's axes
                 \inherits AbstractAxis
             */
             /*!
               \property QLogValueAxis::min
               Defines the minimum value on the axis.
               When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
               Value has to be greater then 0.
             */
             /*!
               \qmlproperty real LogValuesAxis::min
               Defines the minimum value on the axis.
               When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
               Value has to be greater then 0.
             */
             /*!
               \property QLogValueAxis::max
               Defines the maximum value on the axis.
               When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
               Value has to be greater then 0.
             */
             /*!
               \qmlproperty real LogValuesAxis::max
               Defines the maximum value on the axis.
               When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
               Value has to be greater then 0.
             */
             /*!
               \property QLogValueAxis::base
               Defines the base of the logarithm.
               Value has to be greater then 0 and not equal 1
             */
             /*!
               \qmlproperty real LogValuesAxis::base
               Defines the maximum value on the axis.
               Defines the base of the logarithm.
               Value has to be greater then 0 and not equal 1
             */
             /*!
               \property QLogValueAxis::labelFormat
               Defines the label format of the axis.
               Supported specifiers are: d, i, o, x, X, f, F, e, E, g, G, c
               See QString::sprintf() for additional details.
             */
             /*!
               \qmlproperty real LogValuesAxis::labelFormat
               Defines the label format of the axis.
               Supported specifiers are: d, i, o, x, X, f, F, e, E, g, G, c
               See QString::sprintf() for additional details.
             */
             /*!
               \fn void QLogValueAxis::minChanged(qreal min)
               Axis emits signal when \a min of axis has changed.
             */
             /*!
               \qmlsignal LogValuesAxis::onMinChanged(qreal min)
               Axis emits signal when \a min of axis has changed.
             */
             /*!
               \fn void QLogValueAxis::maxChanged(qreal max)
               Axis emits signal when \a max of axis has changed.
             */
             /*!
               \qmlsignal LogValuesAxis::onMaxChanged(qreal max)
               Axis emits signal when \a max of axis has changed.
             */
             /*!
               \fn void QLogValueAxis::rangeChanged(qreal min, qreal max)
               Axis emits signal when \a min or \a max of axis has changed.
             */
             /*!
               \fn void QLogValueAxis::labelFormatChanged(const QString &format)
               Axis emits signal when \a format of axis labels has changed.
             */
             /*!
               \qmlsignal LogValueAxis::labelFormatChanged(const QString &format)
                Axis emits signal when \a format of axis labels has changed.
             */
             /*!
               \fn void QLogValueAxis::baseChanged(qreal base)
               Axis emits signal when \a base of logarithm of the axis has changed.
             */
             /*!
               \qmlsignal LogValuesAxis::baseChanged(qreal base)
               Axis emits signal when \a base of logarithm of the axis has changed.
             */
             /*!
                 Constructs an axis object which is a child of \a parent.
             */
             QLogValueAxis::QLogValueAxis(QObject *parent) :
                 QAbstractAxis(*new QLogValueAxisPrivate(this), parent)
             {
             }
             /*!
                 \internal
             */
             QLogValueAxis::QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent) : QAbstractAxis(d, parent)
             {
             }
             /*!
                 Destroys the object
             */
             QLogValueAxis::~QLogValueAxis()
             {
                 Q_D(QLogValueAxis);
                 if (d->m_chart)
                     d->m_chart->removeAxis(this);
             }
             void QLogValueAxis::setMin(qreal min)
             {
                 Q_D(QLogValueAxis);
                 setRange(min, qMax(d->m_max, min));
             }
             qreal QLogValueAxis::min() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_min;
             }
             void QLogValueAxis::setMax(qreal max)
             {
                 Q_D(QLogValueAxis);
                 setRange(qMin(d->m_min, max), max);
             }
             qreal QLogValueAxis::max() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_max;
             }
             /*!
               Sets range from \a min to \a max on the axis.
               If min is greater than max then this function returns without making any changes.
             */
             void QLogValueAxis::setRange(qreal min, qreal max)
             {
                 Q_D(QLogValueAxis);
                 bool changed = false;
                 if (min > max)
                     return;
                 if (min > 0) {
                     if (!qFuzzyCompare(d->m_min, min)) {
                         d->m_min = min;
                         changed = true;
                         emit minChanged(min);
                     }
                     if (!qFuzzyCompare(d->m_max, max)) {
                         d->m_max = max;
                         changed = true;
                         emit maxChanged(max);
                     }
                     if (changed) {
                         emit rangeChanged(min, max);
                         emit d->rangeChanged(min,max);
                     }
                 }
             }
             void QLogValueAxis::setLabelFormat(const QString &format)
             {
                 Q_D(QLogValueAxis);
                 d->m_format = format;
                 emit labelFormatChanged(format);
             }
             QString QLogValueAxis::labelFormat() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_format;
             }
             void QLogValueAxis::setBase(qreal base)
             {
                 // check if base is correct
                 if (qFuzzyCompare(base, 1))
                     return;
                 if (base > 0) {
                     Q_D(QLogValueAxis);
                     d->m_base = base;
                     emit baseChanged(base);
                 }
             }
             qreal QLogValueAxis::base() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_base;
             }
             /*!
               Returns the type of the axis
             */
             QAbstractAxis::AxisType QLogValueAxis::type() const
             {
                 return AxisTypeLogValue;
             }
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QLogValueAxisPrivate::QLogValueAxisPrivate(QLogValueAxis *q)
                 : QAbstractAxisPrivate(q),
                   m_min(1),
                   m_max(1),
                   m_base(10),
                   m_format(QString::null)
             {
             }
             QLogValueAxisPrivate::~QLogValueAxisPrivate()
             {
             }
             void QLogValueAxisPrivate::setMin(const QVariant &min)
             {
                 Q_Q(QLogValueAxis);
                 bool ok;
                 qreal value = min.toReal(&ok);
                 if (ok)
                     q->setMin(value);
             }
             void QLogValueAxisPrivate::setMax(const QVariant &max)
             {
                 Q_Q(QLogValueAxis);
                 bool ok;
                 qreal value = max.toReal(&ok);
                 if (ok)
                     q->setMax(value);
             }
             void QLogValueAxisPrivate::setRange(const QVariant &min, const QVariant &max)
             {
                 Q_Q(QLogValueAxis);
                 bool ok1;
                 bool ok2;
                 qreal value1 = min.toReal(&ok1);
                 qreal value2 = max.toReal(&ok2);
                 if (ok1 && ok2)
                     q->setRange(value1, value2);
             }
             void QLogValueAxisPrivate::setRange(qreal min, qreal max)
             {
                 Q_Q(QLogValueAxis);
                 bool changed = false;
                 if (min > max)
                     return;
                 if (min > 0) {
                     if (!qFuzzyCompare(m_min, min)) {
                         m_min = min;
                         changed = true;
                         emit q->minChanged(min);
                     }
                     if (!qFuzzyCompare(m_max, max)) {
                         m_max = max;
                         changed = true;
                         emit q->maxChanged(max);
                     }
                     if (changed) {
                         emit rangeChanged(min,max);
                         emit q->rangeChanged(min, max);
                     }
                 }
             }
             void QLogValueAxisPrivate::initializeGraphics(QGraphicsItem* parent)
             {
                 Q_Q(QLogValueAxis);
                 ChartAxis* axis(0);
                 if (orientation() == Qt::Vertical)
                     axis = new ChartLogValueAxisY(q,parent);
                 if (orientation() == Qt::Horizontal)
                     axis = new ChartLogValueAxisX(q,parent);
                 m_item.reset(axis);
                 QAbstractAxisPrivate::initializeGraphics(parent);
             }
             void QLogValueAxisPrivate::initializeDomain(AbstractDomain *domain)
             {
                 if (orientation() == Qt::Vertical) {
                     if(!qFuzzyCompare(m_max, m_min)) {
                         domain->setRangeY(m_min, m_max);
                     }
                     else if ( domain->minY() > 0) {
                         setRange(domain->minY(), domain->maxY());
                     } else {
                         domain->setRangeY(m_min, domain->maxY());
                     }
                 }
                 if (orientation() == Qt::Horizontal) {
                     if(!qFuzzyCompare(m_max, m_min)) {
                         domain->setRangeX(m_min, m_max);
                     }
                     else if (domain->minX() > 0){
                         setRange(domain->minX(), domain->maxX());
                     } else {
                         domain->setRangeX(m_min, domain->maxX());
                     }
                 }
             }
             #include "moc_qlogvalueaxis.cpp"
             #include "moc_qlogvalueaxis_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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