HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r974:de7be57d3935

Krazy reported errors...

Michal Klocek -

r974:de7be57d3935

parent child

Context file:

r974:de7be57d3935

Expand all files

doc/src/examples-stackedbarchartdrilldown.qdoc +1 -1

                 \snippet ../examples/stackedbarchartdrilldown/main.cpp 1
-                To enable drilldown we create own view, which implements handler for right click. All QBarSeries derived classes send out rightClicked(QBarSet*, QString) signal when series is clicked with right mouse button. The parameters QBarSet and QString contain the pointer to clicked bar set and name of category, where click occured.
+                To enable drilldown we create own view, which implements handler for right click. All QBarSeries derived classes send out rightClicked(QBarSet*, QString) signal when series is clicked with right mouse button. The parameters QBarSet and QString contain the pointer to clicked bar set and name of category, where click occurred.
                 In our DrilldownChart we implement handler, which selects the drilldown chart with the category.

src/animations/chartanimator.cpp +6 -4

                     QRectF rect = item->geometry();
                     oldLayout.resize(newLayout.count());
-                    for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; i++, j--) {
+                    for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {
                         oldLayout[i] = item->axisType() == Axis::X_AXIS ? rect.left() : rect.bottom();
                         oldLayout[j] = item->axisType() == Axis::X_AXIS ? rect.right() : rect.top();
                     }
                 case ScrollRightState: {
                     oldLayout.resize(newLayout.count());
-                    for(int i = 0, j = i + 1; i < oldLayout.count() - 1; i++, j++)
+                    for(int i = 0, j = i + 1; i < oldLayout.count() - 1; ++i, ++j)
                         oldLayout[i]= oldLayout[j];
                 }
                     break;
                 case ScrollLeftState: {
                     oldLayout.resize(newLayout.count());
-                    for(int i = oldLayout.count() - 1, j = i - 1; i > 0; i--, j--)
+                    for(int i = oldLayout.count() - 1, j = i - 1; i > 0; --i, --j)
                         oldLayout[i]= oldLayout[j];
                 }
                     break;
                 default: {
                     oldLayout.resize(newLayout.count());
                     QRectF rect = item->geometry();
-                    for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); i++, j--)
+                    for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)
                         oldLayout[i] = item->axisType() == Axis::X_AXIS ? rect.left() : rect.top();
                 }
                     break;
                 m_point = point;
             }
+            #include "moc_chartanimator_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/chartanimator_p.h +3 -2

             class LineChartItem;
             class XYChartItem;
-            class ChartAnimator : public QObject {
+            class ChartAnimator : public QObject
+            {
+                Q_OBJECT
             public:
                 enum State{ShowState, ScrollUpState, ScrollDownState, ScrollLeftState, ScrollRightState, ZoomInState, ZoomOutState};

src/animations/splineanimation.cpp +1 -1

                     break;
                 case LineDrawAnimation:{
                     Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
-                    int count = endPair.first.count()* qBound(0.0, progress, 1.0);
+                    int count = endPair.first.count()* qBound(qreal(0), progress, qreal(1));
                     for(int i = 0; i < count; i++) {
                         result.first << endPair.first[i];
                         if(i + 1 == count)

src/animations/xyanimation.cpp +1 -1

                 }
                     break;
                 case LineDrawAnimation: {
-                    for(int i = 0; i < endVector.count() * qBound(0.0, progress, 1.0); i++)
+                    for(int i = 0; i < endVector.count() * qBound(qreal(0), progress, qreal(1)); i++)
                         result << endVector[i];
                 }
                     break;

src/areachart/qareaseries.cpp +1 -1

             /*!
                 Constructs area series object which is a child of \a upperSeries. Area will be spanned between \a
                 upperSeries line and \a lowerSeries line.  If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.
-                When series object is added to QChartView or QChart instance ownerships is transfered.
+                When series object is added to QChartView or QChart instance ownerships is transferred.
             */
             QAreaSeries::QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries)
                 : QSeries(*new QAreaSeriesPrivate(upperSeries,lowerSeries,this),upperSeries)

src/axis/qchartaxiscategories.cpp +1 -1

             void QChartAxisCategories::insert(const QBarCategories &categories)
             {
                 int i=1;
-                foreach (QString string , categories) {
+                foreach (const QString& string , categories) {
                     d_ptr->m_map.insert(i,string);
                     i++;
                 }

src/barchart/barchartmodel.cpp +1 -1

@@ -195,4 +195,4 QString BarChartModel::categoryName(int category)
195		195
196	#include "moc_barchartmodel_p.cpp"	196	#include "moc_barchartmodel_p.cpp"
197		197
198	QTCOMMERCIALCHART_END_NAMESPACE No newline at end of file	198	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.cpp +4 -4

                 \class QBarSeries
                 \brief part of QtCommercial chart API.
-                QBarSeries represents a series of data shown as bars. One QBarSeries can contain multible
+                QBarSeries represents a series of data shown as bars. One QBarSeries can contain multiple
                 QBarSet data sets. QBarSeries groups the data from sets to categories, which are defined
                 by QStringList.
             }
             /*!
-                Removes a set of bars from series. Releases ownership of \a set. Doesnt delete \a set.
+                Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
                 Disconnects the clicked(QString, Qt::MouseButtons) signal
                 of \a set from this series
             */
             }
             /*!
-                Removes a list of barsets from series. Releases ownership of \a sets. Doesnt delete \a sets.
+                Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets.
                 Disconnects the clicked(QString, Qt::MouseButtons) signal
                 of \a sets from this series
             */
                  Parameter \a bottomBoundry indicates the column/row where the first bar set is located in the model.
                  Parameter \a topBoundry indicates the column/row where the last bar set is located in the model.
                  All the columns/rows inbetween those two values are also used as data for bar sets.
-                 The \a orientation paramater specifies whether the data is in columns or in rows.
+                 The \a orientation parameter specifies whether the data is in columns or in rows.
              */
             void QBarSeries::setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation)
             {

src/barchart/qpercentbarseries.cpp +1 -1

                 \brief part of QtCommercial chart API.
                 QPercentBarSeries represents a series of data shown as bars. Each bar of QBarSet is shown as percentage
-                of all bars in category. One QPercentBarSeries can contain multible QBarSet data sets.
+                of all bars in category. One QPercentBarSeries can contain multiple QBarSet data sets.
                 QBarSeries groups the data from sets to categories, which are defined by QStringList.
                 \mainclass

src/barchart/qstackedbarseries.cpp +1 -1

                 \brief part of QtCommercial chart API.
                 QStackedBarSeries represents a series of data shown as bars. All bars in same category are
-                stacked on top of each other. One QStackedBarSeries can contain multible QBarSet data sets.
+                stacked on top of each other. One QStackedBarSeries can contain multiple QBarSet data sets.
                 QStackedBarSeries groups the data from sets to categories, which are defined by QStringList.
                 \mainclass

src/chartdataset.cpp +19 -22

                     return;
                 }
-                if(!series->parent()){
+                series->setParent(this); // take ownership
-                   series->setParent(this); // take ownership
+                axisY->setParent(this); // take ownership
-                };
-                if(!axisY->parent()){
-                   axisY->setParent(this); // take ownership
                 Domain* domain = m_axisDomainMap.value(axisY);
             }
-            void ChartDataSet::removeSeries(QSeries* series)
+            QChartAxis* ChartDataSet::removeSeries(QSeries* series)
             {
                 QChartAxis* axis = m_seriesAxisMap.value(series);
                 if(!axis){
                     qWarning()<<"Can not remove series. Series not found on the chart.";
-                    return;
+                    return 0;
                 }
                 emit seriesRemoved(series);
                 m_seriesAxisMap.remove(series);
                 int key = seriesIndex(series);
                 Q_ASSERT(key!=-1);
                 m_indexSeriesMap.remove(key);
+                series->setParent(0);
-                if(series->parent()==this){
-                    delete series;
-                    series=0;
                 QList<QChartAxis*> axes =  m_seriesAxisMap.values();
                     Domain* domain = m_axisDomainMap.take(axis);
                     emit axisRemoved(axis);
                     if(axis!=axisY()){
-                        if(axis->parent()==this){
+                        axis->setParent(0);
-                            delete axis;
-                            axis=0;
                     }
                     delete domain;
                 }
                     m_axisXInitialized=false;
                     emit axisRemoved(axisX());
                 }
+                return axis;
             }
             void ChartDataSet::removeAllSeries()
             {
                 QList<QSeries*> series =  m_seriesAxisMap.keys();
+                QList<QChartAxis*> axes;
                 foreach(QSeries* s , series) {
-                    removeSeries(s);
+                    QChartAxis* axis  = removeSeries(s);
+                    if(axis==axisY()) continue;
+                    int i = axes.indexOf(axis);
+                    if(i==-1){
+                        axes<<axis;
+                    }
                 }
                 Q_ASSERT(m_seriesAxisMap.count()==0);
                 Q_ASSERT(m_axisDomainMap.count()==0);
+                qDeleteAll(series);
+                qDeleteAll(axes);
             }
             void ChartDataSet::setupCategories(QBarSeries* series)

src/chartdataset_p.h +1 -1

                 virtual ~ChartDataSet();
                 void addSeries(QSeries* series,QChartAxis *axisY = 0);
-                void removeSeries(QSeries* series);
+                QChartAxis* removeSeries(QSeries* series);
                 void removeAllSeries();
                 void zoomInDomain(const QRectF& rect, const QSizeF& size);

src/charttheme.cpp +1 -1

             void ChartTheme::generateSeriesGradients()
             {
                 // Generate gradients in HSV color space
-                foreach (QColor color, m_seriesColors) {
+                foreach (const QColor& color, m_seriesColors) {
                     QLinearGradient g;
                     qreal h = color.hsvHueF();
                     qreal s = color.hsvSaturationF();

src/legend/qlegend.cpp +2 -2

                         if(m_width<=m_rect.width()) return;
                         if (x != m_offsetX) {
-                            m_offsetX = qBound(0.0, x, m_width - m_rect.width());
+                            m_offsetX = qBound(qreal(0), x, m_width - m_rect.width());
                             m_markers->setPos(-m_offsetX,m_rect.top());
                         }
                         break;
                         if(m_height<=m_rect.height()) return;
                         if (y != m_offsetY) {
-                            m_offsetY = qBound(0.0, y, m_height - m_rect.height());
+                            m_offsetY = qBound(qreal(0), y, m_height - m_rect.height());
                             m_markers->setPos(m_rect.left(),-m_offsetY);
                         }
                         break;

src/linechart/qlineseries.cpp +1 -1

             /*!
                 Constructs empty series object which is a child of \a parent.
-                When series object is added to QChartView or QChart instance ownerships is transfered.
+                When series object is added to QChartView or QChart instance ownerships is transferred.
             */
             QLineSeries::QLineSeries(QObject *parent) : QXYSeries(*new QLineSeriesPrivate(this),parent)
             {

src/linechart/qlineseries.h +1 -1

             class QTCOMMERCIALCHART_EXPORT QLineSeries : public QXYSeries
             {
             public:
-                explicit QLineSeries(QObject *parent=0);
+                explicit QLineSeries(QObject *parent = 0);
                 ~QLineSeries();
                 QSeries::QSeriesType type() const;

src/piechart/qpieseries.cpp +2 -2

                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the minumum size (pie not drawn).
+                \o 0.0 is the minimum size (pie not drawn).
                 \o 1.0 is the maximum size that can fit the chart.
                 \endlist
                  Sets column/row specified by \a modelValuesLine to be used as a list of pie slice values for the pie.
                  Parameter \a modelValuesLine indicates the column/row where the values for the pie slices are located in the model.
                  Parameter \a modelLabelsLine indicates the column/row where the labels for the pie slices are located in the model.
-                 The \a orientation paramater specifies whether the data is in columns or in rows.
+                 The \a orientation parameter specifies whether the data is in columns or in rows.
              */
             void QPieSeries::setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::Orientation orientation)
             {

src/qseries.cpp +1 0

             }
             #include "moc_qseries.cpp"
+            #include "moc_qseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qseries_p.h +1 0

             class QSeriesPrivate : public QObject
             {
+                Q_OBJECT
             public:
                 QSeriesPrivate(QSeries *q);
                 ~QSeriesPrivate();

src/scroller.cpp +2 0

                 m_scroller->scrollTick();
             }
+            #include "moc_scroller_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scroller_p.h +1 0

             class ScrollTicker : public QObject
             {
+                Q_OBJECT
             public:
                 explicit ScrollTicker(Scroller *scroller,QObject *parent = 0);
                 void start(int interval);

src/splinechart/qsplineseries.cpp +2 -2

             /*!
                 Constructs empty series object which is a child of \a parent.
-                When series object is added to QChartView or QChart instance then the ownerships is transfered.
+                When series object is added to QChartView or QChart instance then the ownerships is transferred.
               */
             QSplineSeries::QSplineSeries(QObject *parent) :
             /*//!
                  \fn bool QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
                  Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
-                 as a data source for y coordinate. The \a orientation paramater specifies whether the data
+                 as a data source for y coordinate. The \a orientation parameter specifies whether the data
                  is in columns or in rows.
              */
             //void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)

src/xychart/qxyseries.cpp +2 -2

                 \internal
                 Constructs empty series object which is a child of \a parent.
-                When series object is added to QChartView or QChart instance ownerships is transfered.
+                When series object is added to QChartView or QChart instance ownerships is transferred.
             */
             QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent):QSeries(d,parent)
             {
             /*!
                  \fn bool QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
                  Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
-                 as a data source for y coordinate. The \a orientation paramater specifies whether the data
+                 as a data source for y coordinate. The \a orientation parameter specifies whether the data
                  is in columns or in rows.
                  \sa setModel(), setModelMappingRange()
              */

test/auto/chartdataset/tst_chartdataset.cpp +58 -26

                 QCOMPARE(spy2.count(), 3);
                 QCOMPARE(spy3.count(), 0);
+                if(axis0==0) axis0 = dataSet.axisY();
+                if(axis1==0) axis1 = dataSet.axisY();
+                if(axis2==0) axis2 = dataSet.axisY();
+                QVERIFY(axis0 == dataSet.removeSeries(series0));
+                QVERIFY(axis1 == dataSet.removeSeries(series1));
+                QVERIFY(axis2 == dataSet.removeSeries(series2));
             }
             void tst_ChartDataSet::removeSeries_data()
             void tst_ChartDataSet::removeAllSeries_data()
             {
-                addSeries_data();
             }
             void tst_ChartDataSet::removeAllSeries()
             {
-                QFETCH(QLineSeries*, series0);
+                QLineSeries* series0 = new QLineSeries(this);
-                  QFETCH(QChartAxis*, axis0);
+                QLineSeries* series1 = new QLineSeries(this);
-                  QFETCH(QLineSeries*, series1);
+                QLineSeries* series2 = new QLineSeries(this);
-                  QFETCH(QChartAxis*, axis1);
-                  QFETCH(QLineSeries*, series2);
+                QChartAxis* axis0 = new QChartAxis(this);
-                  QFETCH(QChartAxis*, axis2);
+                QChartAxis* axis1 = new QChartAxis(this);
-                  QFETCH(int, axisCount);
+                QChartAxis* axis2 = new QChartAxis(this);
-                  ChartDataSet dataSet;
+                ChartDataSet dataSet;
-                  dataSet.addSeries(series0,axis0);
-                  dataSet.addSeries(series1,axis1);
+                dataSet.addSeries(series0, axis0);
-                  dataSet.addSeries(series2,axis2);
+                dataSet.addSeries(series1, axis1);
+                dataSet.addSeries(series2, axis2);
-                  QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
-                  QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
+                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
-                  QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
+                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-                  QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
+                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
+                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
-                  dataSet.removeAllSeries();
+                dataSet.removeAllSeries();
-                  QCOMPARE(spy0.count(), 0);
-                  QCOMPARE(spy1.count(), axisCount);
+                QCOMPARE(spy0.count(), 0);
-                  QCOMPARE(spy2.count(), 0);
+                QCOMPARE(spy1.count(), 4);
-                  QCOMPARE(spy3.count(), 3);
+                QCOMPARE(spy2.count(), 0);
+                QCOMPARE(spy3.count(), 3);
             }
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
+                dataSet.removeSeries(series0);
+                dataSet.removeSeries(series1);
+                dataSet.removeSeries(series2);
             }
             void tst_ChartDataSet::seriesIndex_data()
                 QCOMPARE(dataSet.seriesIndex(series1),1);
                 QCOMPARE(dataSet.seriesIndex(series2),0);
+                dataSet.removeSeries(series0);
+                dataSet.removeSeries(series1);
+                dataSet.removeSeries(series2);
             }
             void tst_ChartDataSet::domain_data()
                 QCOMPARE(spy1.count(), 0);
                 QCOMPARE(spy2.count(), 0);
                 QCOMPARE(spy3.count(), 0);
+                dataSet.removeSeries(series0);
+                dataSet.removeSeries(series1);
+                dataSet.removeSeries(series2);
             }
             void tst_ChartDataSet::zoomInDomain_data()
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 1);
                 QCOMPARE(spy2.count(), 1);
+                dataSet.removeSeries(series0);
+                dataSet.removeSeries(series1);
+                dataSet.removeSeries(series2);
             }
             void tst_ChartDataSet::zoomOutDomain_data()
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 1);
                 QCOMPARE(spy2.count(), 1);
+                dataSet.removeSeries(series0);
+                dataSet.removeSeries(series1);
+                dataSet.removeSeries(series2);
             }
             void tst_ChartDataSet::scrollDomain_data()
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 1);
                 QCOMPARE(spy2.count(), 1);
+                dataSet.removeSeries(series0);
+                dataSet.removeSeries(series1);
+                dataSet.removeSeries(series2);
             }
             QTEST_MAIN(tst_ChartDataSet)

test/auto/qchart/tst_qchart.cpp +2 0

                 if(!axis) axis = m_chart->axisY();
                 m_chart->addSeries(series,axis);
                 QCOMPARE(m_chart->axisY(series),axis);
+                m_chart->removeSeries(series);
             }
             void tst_QChart::animationOptions_data()

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