##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

renamed barseries files to abstractbarseries
sauimone -
r1586:9c6a61adadc9
parent child
Show More
Side by Side Unified
Context file:
r1586:9c6a61adadc9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -23,7 +23,7
23 23 #include <QChartView>
24 24 #include <QPieSeries>
25 25 #include <QPieSlice>
26 #include <QBarSeries>
26 #include <QAbstractBarSeries>
27 27 #include <QPercentBarSeries>
28 28 #include <QStackedBarSeries>
29 29 #include <QBarSet>
Show file before | Show file after | Hide comments
@@ -6,7 +6,7 SOURCES += \
6 6 $$PWD/barchartitem.cpp \
7 7 $$PWD/percentbarchartitem.cpp \
8 8 $$PWD/groupedbarchartitem.cpp \
9 $$PWD/qbarseries.cpp \
9 $$PWD/qabstractbarseries.cpp \
10 10 $$PWD/qbarset.cpp \
11 11 $$PWD/qpercentbarseries.cpp \
12 12 $$PWD/qstackedbarseries.cpp \
@@ -23,14 +23,14 PRIVATE_HEADERS += \
23 23 $$PWD/stackedbarchartitem_p.h \
24 24 $$PWD/groupedbarchartitem_p.h \
25 25 $$PWD/qbarset_p.h \
26 $$PWD/qbarseries_p.h \
26 $$PWD/qabstractbarseries_p.h \
27 27 $$PWD/qstackedbarseries_p.h\
28 28 $$PWD/qpercentbarseries_p.h \
29 29 $$PWD/qgroupedbarseries_p.h \
30 30 $$PWD/qbarmodelmapper_p.h
31 31
32 32 PUBLIC_HEADERS += \
33 $$PWD/qbarseries.h \
33 $$PWD/qabstractbarseries.h \
34 34 $$PWD/qbarset.h \
35 35 $$PWD/qpercentbarseries.h \
36 36 $$PWD/qstackedbarseries.h \
Show file before | Show file after | Hide comments
@@ -22,8 +22,8
22 22 #include "bar_p.h"
23 23 #include "qbarset.h"
24 24 #include "qbarset_p.h"
25 #include "qbarseries.h"
26 #include "qbarseries_p.h"
25 #include "qabstractbarseries.h"
26 #include "qabstractbarseries_p.h"
27 27 #include "qchart.h"
28 28 #include "chartpresenter_p.h"
29 29 #include "chartanimator_p.h"
Show file before | Show file after | Hide comments
@@ -32,7 +32,7
32 32 #define BARCHARTITEM_H
33 33
34 34 #include "chartitem_p.h"
35 #include "qbarseries.h"
35 #include "qabstractbarseries.h"
36 36 #include <QPen>
37 37 #include <QBrush>
38 38
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 21 #include "groupedbarchartitem_p.h"
22 22 #include "bar_p.h"
23 23 #include "qbarset_p.h"
24 #include "qbarseries_p.h"
24 #include "qabstractbarseries_p.h"
25 25 #include "qbarset.h"
26 26 #include "qbarset_p.h"
27 27
Show file before | Show file after | Hide comments
@@ -20,7 +20,7
20 20
21 21 #include "percentbarchartitem_p.h"
22 22 #include "bar_p.h"
23 #include "qbarseries_p.h"
23 #include "qabstractbarseries_p.h"
24 24 #include "qbarset.h"
25 25 #include "chartanimator_p.h"
26 26 #include "qbarset_p.h"
Show file before | Show file after | Hide comments
@@ -18,8 +18,8
18 18 **
19 19 ****************************************************************************/
20 20
21 #include "qbarseries.h"
22 #include "qbarseries_p.h"
21 #include "qabstractbarseries.h"
22 #include "qabstractbarseries_p.h"
23 23 #include "qbarset.h"
24 24 #include "qbarset_p.h"
25 25 #include "domain_p.h"
@@ -33,11 +33,11
33 33 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 34
35 35 /*!
36 \class QBarSeries
36 \class QAbstractBarSeries
37 37 \brief Series for creating a bar chart
38 38 \mainclass
39 39
40 QBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
40 QAbstractBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
41 41 the position defined by data. Single bar is defined by QPointF, where x value is the x-coordinate of the bar
42 42 and y-value is the height of the bar. The category names are ignored with this series and x-axis
43 43 shows the x-values.
@@ -48,7 +48,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
48 48 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
49 49 */
50 50 /*!
51 \qmlclass BarSeries QBarSeries
51 \qmlclass BarSeries QAbstractBarSeries
52 52 \inherits AbstractSeries
53 53
54 54 The following QML shows how to create a simple bar chart:
@@ -61,7 +61,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
61 61 */
62 62
63 63 /*!
64 \property QBarSeries::barWidth
64 \property QAbstractBarSeries::barWidth
65 65 The width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
66 66 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
67 67 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
@@ -77,7 +77,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
77 77 */
78 78
79 79 /*!
80 \property QBarSeries::count
80 \property QAbstractBarSeries::count
81 81 Holds the number of sets in series.
82 82 */
83 83 /*!
@@ -86,7 +86,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
86 86 */
87 87
88 88 /*!
89 \property QBarSeries::labelsVisible
89 \property QAbstractBarSeries::labelsVisible
90 90 Defines the visibility of the labels in series
91 91 */
92 92 /*!
@@ -95,7 +95,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
95 95 */
96 96
97 97 /*!
98 \fn void QBarSeries::clicked(int index, QBarSet *barset)
98 \fn void QAbstractBarSeries::clicked(int index, QBarSet *barset)
99 99 The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset.
100 100 Clicked bar inside set is indexed by \a index
101 101 */
@@ -106,7 +106,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
106 106 */
107 107
108 108 /*!
109 \fn void QBarSeries::hovered(bool status, QBarSet* barset)
109 \fn void QAbstractBarSeries::hovered(bool status, QBarSet* barset)
110 110
111 111 The signal is emitted if mouse is hovered on top of series.
112 112 Parameter \a barset is the pointer of barset, where hover happened.
@@ -121,7 +121,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
121 121 */
122 122
123 123 /*!
124 \fn void QBarSeries::countChanged()
124 \fn void QAbstractBarSeries::countChanged()
125 125 This signal is emitted when barset count has been changed, for example by append or remove.
126 126 */
127 127 /*!
@@ -130,13 +130,13 QTCOMMERCIALCHART_BEGIN_NAMESPACE
130 130 */
131 131
132 132 /*!
133 \fn void QBarSeries::labelsVisibleChanged()
133 \fn void QAbstractBarSeries::labelsVisibleChanged()
134 134 This signal is emitted when labels visibility have changed.
135 135 \sa isLabelsVisible(), setLabelsVisible()
136 136 */
137 137
138 138 /*!
139 \fn void QBarSeries::barsetsAdded(QList<QBarSet*> sets)
139 \fn void QAbstractBarSeries::barsetsAdded(QList<QBarSet*> sets)
140 140 This signal is emitted when \a sets have been added to the series.
141 141 \sa append(), insert()
142 142 */
@@ -146,7 +146,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
146 146 */
147 147
148 148 /*!
149 \fn void QBarSeries::barsetsRemoved(QList<QBarSet*> sets)
149 \fn void QAbstractBarSeries::barsetsRemoved(QList<QBarSet*> sets)
150 150 This signal is emitted when \a sets have been removed from the series.
151 151 \sa remove()
152 152 */
@@ -189,8 +189,8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
189 189 */
190 190
191 191 /*!
192 Constructs empty QBarSeries.
193 QBarSeries is QObject which is a child of a \a parent.
192 Constructs empty QAbstractBarSeries.
193 QAbstractBarSeries is QObject which is a child of a \a parent.
194 194 */
195 195 QAbstractBarSeries::QAbstractBarSeries(QObject *parent) :
196 196 QAbstractSeries(*new QAbstractBarSeriesPrivate(this),parent)
@@ -726,7 +726,7 bool QAbstractBarSeriesPrivate::insert(int index, QBarSet *set)
726 726 return true;
727 727 }
728 728
729 #include "moc_qbarseries.cpp"
730 #include "moc_qbarseries_p.cpp"
729 #include "moc_qabstractbarseries.cpp"
730 #include "moc_qabstractbarseries_p.cpp"
731 731
732 732 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from src/barchart/qbarseries.h to src/barchart/qabstractbarseries.h
Show file before | Show file after | Hide comments
@@ -27,10 +27,10
27 27 //
28 28 // We mean it.
29 29
30 #ifndef QBARSERIES_P_H
31 #define QBARSERIES_P_H
30 #ifndef QABSTRACTBARSERIES_P_H
31 #define QABSTRACTBARSERIES_P_H
32 32
33 #include "qbarseries.h"
33 #include "qabstractbarseries.h"
34 34 #include "qabstractseries_p.h"
35 35 #include <QStringList>
36 36 #include <QAbstractSeries>
@@ -94,4 +94,4 private:
94 94
95 95 QTCOMMERCIALCHART_END_NAMESPACE
96 96
97 #endif // QBARSERIESPRIVATE_P_H
97 #endif // QABSTRACTBARSERIES_P_H
Show file before | Show file after | Hide comments
@@ -20,7 +20,7
20 20
21 21 #include "qbarmodelmapper.h"
22 22 #include "qbarmodelmapper_p.h"
23 #include "qbarseries.h"
23 #include "qabstractbarseries.h"
24 24 #include "qbarset.h"
25 25 #include "qchart.h"
26 26 #include <QAbstractItemModel>
@@ -105,7 +105,7 void QBarModelMapper::setFirst(int first)
105 105 }
106 106
107 107 /*!
108 Returns the number of rows/columns of the model that are mapped as the data for QBarSeries
108 Returns the number of rows/columns of the model that are mapped as the data for QAbstractBarSeries
109 109 Minimal and default value is: -1 (count limited by the number of rows/columns in the model)
110 110 */
111 111 int QBarModelMapper::count() const
@@ -115,7 +115,7 int QBarModelMapper::count() const
115 115 }
116 116
117 117 /*!
118 Sets the \a count of rows/columns of the model that are mapped as the data for QBarSeries
118 Sets the \a count of rows/columns of the model that are mapped as the data for QAbstractBarSeries
119 119 Minimal and default value is: -1 (count limited by the number of rows/columns in the model)
120 120 */
121 121 void QBarModelMapper::setCount(int count)
Show file before | Show file after | Hide comments
@@ -34,7 +34,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 34
35 35 \mainclass
36 36
37 \sa QBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries
37 \sa QAbstractBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries
38 38 */
39 39 /*!
40 40 \qmlclass BarSet QBarSet
Show file before | Show file after | Hide comments
@@ -101,7 +101,7 Q_SIGNALS:
101 101 private:
102 102 QScopedPointer<QBarSetPrivate> d_ptr;
103 103 Q_DISABLE_COPY(QBarSet)
104 friend class QBarSeries;
104 friend class QAbstractBarSeries;
105 105 friend class BarLegendMarker;
106 106 friend class BarChartItem;
107 107 friend class QAbstractBarSeriesPrivate;
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
41 41 See the \l {GroupedbarChart Example} {grouped bar chart example} to learn how to create a grouped bar chart.
42 42 \image examples_groupedbarchart.png
43 43
44 \sa QBarSet, QPercentBarSeries, QBarSeries, QStackedBarSeries
44 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries
45 45 */
46 46 /*!
47 47 \qmlclass GroupedBarSeries QGroupedBarSeries
Show file before | Show file after | Hide comments
@@ -22,7 +22,7
22 22 #define GROUPEDBARSERIES_H
23 23
24 24 #include <QStringList>
25 #include <qbarseries.h>
25 #include <qabstractbarseries.h>
26 26
27 27 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 28
Show file before | Show file after | Hide comments
@@ -30,7 +30,7
30 30 #ifndef QGROUPEDBARSERIES_P_H
31 31 #define QGROUPEDBARSERIES_P_H
32 32
33 #include "qbarseries_p.h"
33 #include "qabstractbarseries_p.h"
34 34 #include "domain_p.h"
35 35
36 36 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -28,7 +28,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 28 \mainclass
29 29
30 30 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
31 Horizontal model mapper is used to create a connection between QBarSeries and QAbstractItemModel derived model object.
31 Horizontal model mapper is used to create a connection between QAbstractBarSeries and QAbstractItemModel derived model object.
32 32 Model mapper maintains equal size of all the BarSets.
33 33 Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.
34 34 NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
@@ -114,12 +114,12 QTCOMMERCIALCHART_BEGIN_NAMESPACE
114 114
115 115 /*!
116 116 \property QHBarModelMapper::columnCount
117 \brief Defines the number of columns of the model that are mapped as the data for QBarSeries
117 \brief Defines the number of columns of the model that are mapped as the data for QAbstractBarSeries
118 118 Minimal and default value is: -1 (count limited by the number of columns in the model)
119 119 */
120 120 /*!
121 121 \qmlproperty int HBarModelMapper::columnCount
122 Defines the number of columns of the model that are mapped as the data for QBarSeries. The default value is
122 Defines the number of columns of the model that are mapped as the data for QAbstractBarSeries. The default value is
123 123 -1 (count limited by the number of columns in the model)
124 124 */
125 125
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
41 41 See the \l {PercentbarChart Example} {percent bar chart example} to learn how to create a percent bar chart.
42 42 \image examples_percentbarchart.png
43 43
44 \sa QBarSet, QStackedBarSeries, QBarSeries
44 \sa QBarSet, QStackedBarSeries, QAbstractBarSeries
45 45 */
46 46 /*!
47 47 \qmlclass PercentBarSeries QPercentBarSeries
Show file before | Show file after | Hide comments
@@ -22,7 +22,7
22 22 #define PERCENTBARSERIES_H
23 23
24 24 #include <QStringList>
25 #include <qbarseries.h>
25 #include <qabstractbarseries.h>
26 26
27 27 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 28
Show file before | Show file after | Hide comments
@@ -30,7 +30,7
30 30 #ifndef QPERCENTBARSERIES_P_H
31 31 #define QPERCENTBARSERIES_P_H
32 32
33 #include "qbarseries_p.h"
33 #include "qabstractbarseries_p.h"
34 34 #include "domain_p.h"
35 35
36 36 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
41 41 See the \l {StackedbarChart Example} {stacked bar chart example} to learn how to create a stacked bar chart.
42 42 \image examples_stackedbarchart.png
43 43
44 \sa QBarSet, QPercentBarSeries, QBarSeries
44 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries
45 45 */
46 46
47 47 /*!
Show file before | Show file after | Hide comments
@@ -22,7 +22,7
22 22 #define STACKEDBARSERIES_H
23 23
24 24 #include <QStringList>
25 #include <qbarseries.h>
25 #include <qabstractbarseries.h>
26 26
27 27 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 28
Show file before | Show file after | Hide comments
@@ -30,7 +30,7
30 30 #ifndef QSTACKEDBARSERIES_P_H
31 31 #define QSTACKEDBARSERIES_P_H
32 32
33 #include "qbarseries_p.h"
33 #include "qabstractbarseries_p.h"
34 34 #include "domain_p.h"
35 35
36 36 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -28,7 +28,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
28 28 \mainclass
29 29
30 30 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
31 Vertical model mapper is used to create a connection between QBarSeries and QAbstractItemModel derived model object.
31 Vertical model mapper is used to create a connection between QAbstractBarSeries and QAbstractItemModel derived model object.
32 32 Model mapper maintains equal size of all the BarSets.
33 33 Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.
34 34 NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
@@ -115,12 +115,12 QTCOMMERCIALCHART_BEGIN_NAMESPACE
115 115
116 116 /*!
117 117 \property QVBarModelMapper::rowCount
118 \brief Defines the number of rows of the model that are mapped as the data for QBarSeries
118 \brief Defines the number of rows of the model that are mapped as the data for QAbstractBarSeries
119 119 Minimal and default value is: -1 (count limited by the number of rows in the model)
120 120 */
121 121 /*!
122 122 \qmlproperty int VBarModelMapper::rowCount
123 Defines the number of rows of the model that are mapped as the data for QBarSeries. The default value is
123 Defines the number of rows of the model that are mapped as the data for QAbstractBarSeries. The default value is
124 124 -1 (count limited by the number of rows in the model)
125 125 */
126 126
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 21 #include "stackedbarchartitem_p.h"
22 22 #include "bar_p.h"
23 23 #include "qbarset_p.h"
24 #include "qbarseries_p.h"
24 #include "qabstractbarseries_p.h"
25 25 #include "qbarset.h"
26 26 #include "chartanimator_p.h"
27 27
Show file before | Show file after | Hide comments
@@ -23,7 +23,7
23 23 #include "qvaluesaxis.h"
24 24 #include "qvaluesaxis_p.h"
25 25 #include "qabstractseries_p.h"
26 #include "qbarseries.h"
26 #include "qabstractbarseries.h"
27 27 #include "qstackedbarseries.h"
28 28 #include "qpercentbarseries.h"
29 29 #include "qpieseries.h"
Show file before | Show file after | Hide comments
@@ -28,7 +28,7
28 28
29 29 //series
30 30 #include "qbarset.h"
31 #include "qbarseries.h"
31 #include "qabstractbarseries.h"
32 32 #include "qstackedbarseries.h"
33 33 #include "qpercentbarseries.h"
34 34 #include "qlineseries.h"
Show file before | Show file after | Hide comments
@@ -22,7 +22,7
22 22 #include "qxyseries.h"
23 23 #include "qxyseries_p.h"
24 24 #include "qlegend.h"
25 #include "qbarseries.h"
25 #include "qabstractbarseries.h"
26 26 #include "qpieseries.h"
27 27 #include "qpieslice.h"
28 28 #include "qbarset.h"
Show file before | Show file after | Hide comments
@@ -30,7 +30,7
30 30 #include "qareaseries.h"
31 31 #include "qscatterseries.h"
32 32 #include "qsplineseries.h"
33 #include "qbarseries.h"
33 #include "qabstractbarseries.h"
34 34 #include "qstackedbarseries.h"
35 35 #include "qpercentbarseries.h"
36 36 #include "qbarset.h"
Show file before | Show file after | Hide comments
@@ -33,7 +33,7 class LegendMarker;
33 33 class QPieSlice;
34 34 class QXYSeries;
35 35 class QBarSet;
36 class QBarSeries;
36 class QAbstractBarSeries;
37 37 class QPieSeries;
38 38 class QAreaSeries;
39 39 class LegendScrollButton;
Show file before | Show file after | Hide comments
@@ -30,7 +30,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30 30 \mainclass
31 31
32 32 Usually you use the series type specific inherited classes instead of the base class.
33 \sa QXYSeries, QLineSeries, QSplineSeries, QScatterSeries, QAreaSeries, QBarSeries, QStackedBarSeries,
33 \sa QXYSeries, QLineSeries, QSplineSeries, QScatterSeries, QAreaSeries, QAbstractBarSeries, QStackedBarSeries,
34 34 QPercentBarSeries, QPieSeries
35 35 */
36 36 /*!
Show file before | Show file after | Hide comments
@@ -27,7 +27,7
27 27 #include <qscatterseries.h>
28 28 #include <qsplineseries.h>
29 29 #include <qpieseries.h>
30 #include <qbarseries.h>
30 #include <qabstractbarseries.h>
31 31 #include <qpercentbarseries.h>
32 32 #include <qstackedbarseries.h>
33 33 #include <private/chartdataset_p.h>
Show file before | Show file after | Hide comments
@@ -19,7 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QtTest/QtTest>
22 #include <qbarseries.h>
22 #include <qabstractbarseries.h>
23 23 #include <qbarset.h>
24 24 #include <qchartview.h>
25 25 #include <qchart.h>
Show file before | Show file after | Hide comments
@@ -25,7 +25,7
25 25 #include <qscatterseries.h>
26 26 #include <qsplineseries.h>
27 27 #include <qpieseries.h>
28 #include <qbarseries.h>
28 #include <qabstractbarseries.h>
29 29 #include <qpercentbarseries.h>
30 30 #include <qstackedbarseries.h>
31 31 #include <qvaluesaxis.h>
Show file before | Show file after | Hide comments
@@ -27,7 +27,7
27 27 #include <qareaseries.h>
28 28 #include <qsplineseries.h>
29 29 #include <qbarset.h>
30 #include <qbarseries.h>
30 #include <qabstractbarseries.h>
31 31 #include <qgroupedbarseries.h>
32 32 #include <qstackedbarseries.h>
33 33 #include <qpercentbarseries.h>
General Comments 0
You need to be logged in to leave comments. Login now