HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r387:23f0c228569f

Updated barchart examples and documentation. Also bug fix to barchart model

sauimone -

r387:23f0c228569f

parent child

Context file:

r387:23f0c228569f

Collapse all files

doc/images/barchart.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

doc/images/percentbarchart.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

doc/images/stackedbarchart.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

doc/src/example-percentbarchart.qdoc created 644 +39 0

@@ -0,0 +1,39
	1	/*!
	2	\example example/percentbarchart
	3	\title PercentBarChart Example
	4	\subtitle
	5
	6	The example shows how to create simple percent bar chart. Percent bar chart shows the data in set as percentage of all sets, per category.
	7
	8	\image percentbarchart.png
	9
	10	First we define categories.
	11
	12	\snippet ../example/percentbarchart/main.cpp 1
	13
	14	Data that barchart visualizes, is defined by QBarSet instances. Here we create some sets and append data
	15	we want to visulaize to them.
	16
	17	\snippet ../example/percentbarchart/main.cpp 2
	18
	19	To combine the sets and categories to a chart, we need to create QBarSeries instance. When creating
	20	the QBarSeries, the categories must be known. Sets can be added later. For example purposes the sets
	21	are added to series here.
	22
	23	\snippet ../example/percentbarchart/main.cpp 3
	24
	25	We want our barchart to behave so, that when mouse is hovered over bar, the name of set which the bar
	26	represents is shown as tooltip.
	27	Also when we click the bar, floating values for the set are toggled. Floating values are the data values
	28	that are drawn on top of bars.
	29
	30	\snippet ../example/percentbarchart/main.cpp 4
	31
	32	Here we create the view and add our series to it. Also we set the title and theme we want our chart to use
	33
	34	\snippet ../example/percentbarchart/main.cpp 5
	35
	36	For barchart, we don't need X-axis to be visible, so it can be disabled.
	37
	38	\snippet ../example/percentbarchart/main.cpp 6
	39	*/ No newline at end of file

doc/src/example-stackedbarchart.qdoc created 644 +39 0

@@ -0,0 +1,39
	1	/*!
	2	\example example/stackedbarchart
	3	\title StackedBarChart Example
	4	\subtitle
	5
	6	The example shows how to create simple stacked bar chart. Stacked bar chart shows the data in sets as bars that are stacked on top of each other. The stacking is done per category.
	7
	8	\image stackedbarchart.png
	9
	10	First we define categories.
	11
	12	\snippet ../example/stackedbarchart/main.cpp 1
	13
	14	Data that barchart visualizes, is defined by QBarSet instances. Here we create some sets and append data
	15	we want to visulaize to them.
	16
	17	\snippet ../example/stackedbarchart/main.cpp 2
	18
	19	To combine the sets and categories to a chart, we need to create QBarSeries instance. When creating
	20	the QBarSeries, the categories must be known. Sets can be added later. For example purposes the sets
	21	are added to series here.
	22
	23	\snippet ../example/stackedbarchart/main.cpp 3
	24
	25	We want our barchart to behave so, that when mouse is hovered over bar, the name of set which the bar
	26	represents is shown as tooltip.
	27	Also when we click the bar, floating values for the set are toggled. Floating values are the data values
	28	that are drawn on top of bars.
	29
	30	\snippet ../example/stackedbarchart/main.cpp 4
	31
	32	Here we create the view and add our series to it. Also we set the title and theme we want our chart to use
	33
	34	\snippet ../example/stackedbarchart/main.cpp 5
	35
	36	For barchart, we don't need X-axis to be visible, so it can be disabled.
	37
	38	\snippet ../example/stackedbarchart/main.cpp 6
	39	*/ No newline at end of file

doc/src/example-barchart.qdoc +35 -5

@@ -1,9 +1,39
1	/*!	1	/*!
2	\example example/barchart	2	\example example/barchart
3	\title ~~Line~~Chart Example	3	\title BarChart Example
4	\subtitle	4	\subtitle
5		5
6	The example shows how to create simple bar chart.	6	The example shows how to create simple bar chart. Barchart shows the data in sets as separate bars, which are grouped in categories.
7		7
8	...	8	\image barchart.png
		9
		10	First we define categories.
		11
		12	\snippet ../example/barchart/main.cpp 1
		13
		14	Data that barchart visualizes, is defined by QBarSet instances. Here we create some sets and append data
		15	we want to visulaize to them.
		16
		17	\snippet ../example/barchart/main.cpp 2
		18
		19	To combine the sets and categories to a chart, we need to create QBarSeries instance. When creating
		20	the QBarSeries, the categories must be known. Sets can be added later. For example purposes the sets
		21	are added to series here.
		22
		23	\snippet ../example/barchart/main.cpp 3
		24
		25	We want our barchart to behave so, that when mouse is hovered over bar, the name of set which the bar
		26	represents is shown as tooltip.
		27	Also when we click the bar, floating values for the set are toggled. Floating values are the data values
		28	that are drawn on top of bars.
		29
		30	\snippet ../example/barchart/main.cpp 4
		31
		32	Here we create the view and add our series to it. Also we set the title and theme we want our chart to use
		33
		34	\snippet ../example/barchart/main.cpp 5
		35
		36	For barchart, we don't need X-axis to be visible, so it can be disabled.
		37
		38	\snippet ../example/barchart/main.cpp 6
9	*/ No newline at end of file	39	*/

doc/src/examples.qdoc +2 0

                     <td valign="top">
                     <ul>
                         <li><a href="example-barchart.html">Bar Chart example</a></li>
+                        <li><a href="example-stackedbarchart.html">Stacked Bar Chart example</a></li>
+                        <li><a href="example-percentbarchart.html">Percent Bar Chart example</a></li>
                         <li><a href="example-linechart.html">Line Chart example</a></li>
                         <li><a href="example-piechart.html">Pie Chart example</a></li>
                     </ul>

example/barchart/main.cpp +16 -9

             #include <qchartview.h>
             #include <qbarseries.h>
             #include <qbarset.h>
+            #include <qchartaxis.h>
             #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 //! [1]
                 // Define categories
-                QStringList catecories;
+                QStringList categories;
-                catecories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
+                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 //! [1]
                 //! [2]
                 QBarSet *set3 = new QBarSet("Larry");
                 QBarSet *set4 = new QBarSet("Zak");
-                *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
+                *set0 << 1 << 2 << 3 << 4 << 5 << 6;
-                *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
+                *set1 << 5 << 0 << 0 << 4 << 0 << 7;
-                *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
+                *set2 << 3 << 5 << 8 << 13 << 8 << 5;
-                *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
+                *set3 << 5 << 6 << 7 << 3 << 4 << 5;
-                *set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
+                *set4 << 9 << 7 << 5 << 3 << 1 << 2;
                 //! [2]
                 //! [3]
                 // Create series and add sets to it
-                QBarSeries* series= new QBarSeries(catecories);
+                QBarSeries* series= new QBarSeries(categories);
                 series->addBarSet(set0);
                 series->addBarSet(set1);
                 chartView->setChartTheme(QChart::ChartThemeIcy);
                 //! [5]
+                //! [6]
+                chartView->axisX()->setAxisVisible(false);
+                chartView->axisX()->setGridVisible(false);
+                chartView->axisX()->setLabelsVisible(false);
+                //! [6]
                 window.setCentralWidget(chartView);
-                window.resize(600, 300);
+                window.resize(400, 300);
                 window.show();
                 return a.exec();

example/percentbarchart/main.cpp +13 -6

             #include <qpercentbarseries.h>
             #include <qchartview.h>
             #include <qbarset.h>
+            #include <qchartaxis.h>
             #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 //! [1]
                 // Define categories
                 QStringList categories;
-                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
+                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 //! [1]
                 //! [2]
                 QBarSet *set3 = new QBarSet("Larry");
                 QBarSet *set4 = new QBarSet("Zak");
-                *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
+                *set0 << 1 << 2 << 3 << 4 << 5 << 6;
-                *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
+                *set1 << 5 << 0 << 0 << 4 << 0 << 7;
-                *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
+                *set2 << 3 << 5 << 8 << 13 << 8 << 5;
-                *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
+                *set3 << 5 << 6 << 7 << 3 << 4 << 5;
-                *set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
+                *set4 << 9 << 7 << 5 << 3 << 1 << 2;
                 //! [2]
                 //! [3]
                 chartView->setChartTheme(QChart::ChartThemeIcy);
                 //! [5]
+                //! [6]
+                chartView->axisX()->setAxisVisible(false);
+                chartView->axisX()->setGridVisible(false);
+                chartView->axisX()->setLabelsVisible(false);
+                //! [6]
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();

example/stackedbarchart/main.cpp +15 -8

             #include <qchartview.h>
             #include <qstackedbarseries.h>
             #include <qbarset.h>
+            #include <qchartaxis.h>
             #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 //! [1]
                 // Define categories
-                QStringList catecories;
+                QStringList categories;
-                catecories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
+                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 //! [1]
                 //! [2]
                 QBarSet *set3 = new QBarSet("Larry");
                 QBarSet *set4 = new QBarSet("Zak");
-                *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
+                *set0 << 1 << 2 << 3 << 4 << 5 << 6;
-                *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
+                *set1 << 5 << 0 << 0 << 4 << 0 << 7;
-                *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
+                *set2 << 3 << 5 << 8 << 13 << 8 << 5;
-                *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
+                *set3 << 5 << 6 << 7 << 3 << 4 << 5;
-                *set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
+                *set4 << 9 << 7 << 5 << 3 << 1 << 2;
                 //! [2]
                 //! [3]
                 // Create series and add sets to it
-                QStackedBarSeries* series = new QStackedBarSeries(catecories);
+                QStackedBarSeries* series = new QStackedBarSeries(categories);
                 series->addBarSet(set0);
                 series->addBarSet(set1);
                 chartView->setChartTheme(QChart::ChartThemeIcy);
                 //! [5]
+                //! [6]
+                chartView->axisX()->setAxisVisible(false);
+                chartView->axisX()->setGridVisible(false);
+                chartView->axisX()->setLabelsVisible(false);
+                //! [6]
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();

src/barchart/barchartmodel.cpp +4 -18

                 return legend;
             }
-            int BarChartModel::countSets()
+            int BarChartModel::barsetCount()
             {
                 return mDataModel.count();
             }
-            int BarChartModel::countCategories()
+            int BarChartModel::categoryCount()
             {
-                int count(0);
+                return mCategory.count();
-                for (int i=0; i<mDataModel.count(); i++){
-                    // TODO: can we assume that all series have same number of values? If not. then which values are empty?
-                    int temp = mDataModel.at(i)->count();
-                    if (temp > count) {
-                        count = temp;
-                return count;
-            int BarChartModel::countTotalItems()
-                int total = mDataModel.count() * countCategories();
-                return total;
             }
             qreal BarChartModel::min()
             qreal BarChartModel::maxCategorySum()
             {
                 qreal max = INT_MIN;
-                int count = countCategories();
+                int count = categoryCount();
                 for (int col=0; col<count; col++) {
                     qreal sum = categorySum(col);

src/barchart/barchartmodel_p.h +2 -3

                 QList<QSeries::Legend> legend();
-                int countSets();            // Number of sets in model
+                int barsetCount();          // Number of sets in model
-                int countCategories();      // Number of categories
+                int categoryCount();        // Number of categories
-                int countTotalItems();      // Total items in all sets. Includes empty items.
                 qreal max();                // Maximum value of all sets
                 qreal min();                // Minimum value of all sets

src/barchart/barpresenter.cpp +1 -1

             BarPresenter::BarPresenter(QBarSeries *series, QGraphicsItem *parent) :
                 BarPresenterBase(series, parent)
             {
-                mBarDefaultWidth = 15;
+                mBarDefaultWidth = 5;
             }
             void BarPresenter::layoutChanged()

src/barchart/barvalue.cpp +4 -2

             void BarValue::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                painter->setPen(mPen);
+                if (isVisible()) {
-                painter->drawText(boundingRect(),mValueString);
+                    painter->setPen(mPen);
+                    painter->drawText(boundingRect(),mValueString);
+                }
             }
             QRectF BarValue::boundingRect() const

src/barchart/qbarseries.cpp +7 -7

             */
             /*!
-                Constructs empty QBarSeries. Parameter \a category defines the categories for chart.
+                Constructs empty QBarSeries. Parameter \a categories defines the categories for chart.
                 QBarSeries is QObject which is a child of a \a parent.
             */
             QBarSeries::QBarSeries(QStringList categories, QObject *parent)
             */
             int QBarSeries::barsetCount()
             {
-                return mModel->countSets();
+                return mModel->barsetCount();
             }
             /*!
             */
             int QBarSeries::categoryCount()
             {
-                return mModel->countCategories();
+                return mModel->categoryCount();
             }
             /*!
             void QBarSeries::setFloatingValuesEnabled(bool enabled)
             {
                 if (enabled) {
-                    for (int i=0; i<mModel->countSets(); i++) {
+                    for (int i=0; i<mModel->barsetCount(); i++) {
                         QBarSet *set = mModel->setAt(i);
                         connect(set,SIGNAL(clicked()),set,SIGNAL(toggleFloatingValues()));
                     }
                 } else {
-                    for (int i=0; i<mModel->countSets(); i++) {
+                    for (int i=0; i<mModel->barsetCount(); i++) {
                         QBarSet *set = mModel->setAt(i);
                         disconnect(set,SIGNAL(clicked()),set,SIGNAL(toggleFloatingValues()));
                     }
             void QBarSeries::setToolTipEnabled(bool enabled)
             {
                 if (enabled) {
-                    for (int i=0; i<mModel->countSets(); i++) {
+                    for (int i=0; i<mModel->barsetCount(); i++) {
                         QBarSet *set = mModel->setAt(i);
                         connect(set,SIGNAL(showToolTip(QPoint,QString)),this,SIGNAL(showToolTip(QPoint,QString)));
                     }
                 } else {
-                    for (int i=0; i<mModel->countSets(); i++) {
+                    for (int i=0; i<mModel->barsetCount(); i++) {
                         QBarSet *set = mModel->setAt(i);
                         disconnect(set,SIGNAL(showToolTip(QPoint,QString)),this,SIGNAL(showToolTip(QPoint,QString)));
                     }

src/barchart/qpercentbarseries.cpp +1 -1

             */
             /*!
-                Constructs empty QPercentBarSeries. Parameter \a category defines the categories for chart.
+                Constructs empty QPercentBarSeries. Parameter \a categories defines the categories for chart.
                 QPercentBarSeries is QObject which is a child of a \a parent.
             */
             QPercentBarSeries::QPercentBarSeries(QStringList categories, QObject *parent)

src/barchart/qstackedbarseries.cpp +1 -1

             */
             /*!
-                Constructs empty QStackedBarSeries. Parameter \a category defines the categories for chart.
+                Constructs empty QStackedBarSeries. Parameter \a categories defines the categories for chart.
                 QStackedBarSeries is QObject which is a child of a \a parent.
             */
             QStackedBarSeries::QStackedBarSeries(QStringList categories, QObject *parent)

src/qseries.cpp +5 0

                 used by the series. Returns true if the model is valid for the series.
             */
+            /*!
+                \fn QList<QSeries::Legend> legend()
+                \brief Returns the legend of the series. If series is empty, empty list is returned.
+            */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             #include "moc_qseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qseries.h +2 -1

                 };
                 // Helper class to contain legend and color for it
-                // TODO: This as private class?
+                // TODO: This as private class? Or should we expose this to user of API
                 class Legend {
                 public:
                     QString mName;
                 // TODO
                 virtual bool setModel(QAbstractItemModel* /*model*/) { return false; }
+                // TODO: should this be internal?
                 virtual QList<QSeries::Legend> legend() { QList<QSeries::Legend> l; return l; }
             };

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