HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1866:b747c15751dd

population pyramid documentation. updated example.

sauimone -

r1866:b747c15751dd

parent child

Context file:

r1866:b747c15751dd

Collapse all files

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

NO CONTENT: new file 100644, binary diff hidden

doc/src/examples-pouplationpyramid.qdoc created 644 +45 0

			@@ -0,0 +1,45
		1	/*!
		2	\example examples/populationpyramid
		3	\title Population pyramid example
		4	\subtitle
		5
		6	The example shows how to create a bar chart with bars extending in opposite directions. For example purposes we use population data found from wikipedia.
		7
		8	\image examples_populationpyramid.png
		9
		10	First we create two barsets and append the data to them. To make another barset grow to left, the values are negated.
		11
		12	\snippet ../examples/populationpyramid/main.cpp 1
		13
		14	We create the series and append the barsets to it. The series takes ownership of the barsets. We want the bars to be at same position on the y-axis, so we turn the
		15	overlap drawing on. We also set the bar width to be 50% of the category width.
		16
		17	\snippet ../examples/populationpyramid/main.cpp 2
		18
		19	Here we create the chart object and add the series to it. We set the title for chart with setTitle and then turn on animations of the series by calling
		20	setAnimationOptions(QChart::SeriesAnimations)
		21
		22	\snippet ../examples/populationpyramid/main.cpp 3
		23
		24	To have categories displayed on axis, we need to create a QBarCategoryAxis for that. Here we create a category axis with list of categories and
		25	set it to be the y-axis of the chart. The chart takes ownership of axis. For x-axis we use default axis, which is created and scaled to series data
		26	by calling createDefaultAxes of the chart. Note that the call for createDefaultAxes must be before we set the category axis. Otherwise the default axis will
		27	override the category axis.
		28	We also set the range for x-axis, since in this case it gives nicer result than autoscaling.
		29
		30	\snippet ../examples/populationpyramid/main.cpp 4
		31
		32	We also want to show the legend. To do that, we get the legend pointer from chart and set it to visible. We also place the legend to bottom of the chart by setting it's alignment
		33	to Qt::AlignBottom.
		34
		35	\snippet ../examples/populationpyramid/main.cpp 5
		36
		37	Finally we add the chart onto a view. We also turn on the antialiasing for the chartView.
		38
		39	\snippet ../examples/populationpyramid/main.cpp 6
		40
		41	Chart is ready to be shown. We set the chart to be central widget of the window.
		42	We also set the size for the chart window and show it.
		43
		44	\snippet ../examples/populationpyramid/main.cpp 7
		45	*/ No newline at end of file

doc/src/examples.qdoc +1 0

                          <li><a href="examples-modeldata.html">Model data</a></li>
                          <li><a href="examples-barmodelmapper.html">Bar chart from model</a></li>
                          <li><a href="examples-percentbarchart.html">Percent bar chart</a></li>
+                         <li><a href="examples-populationpyramid.html">Population pyramid</a></li>
                          <li><a href="examples-piechart.html">Pie chart</a></li>
                          <li><a href="examples-donutchart.html">Donut chart</a></li>
                          <li><a href="examples-piechartdrilldown.html">Pie chart drilldown</a></li>

examples/populationpyramid/main.cpp +4 -4

                  QBarSet *male = new QBarSet("Male");
                  QBarSet *female = new QBarSet("Female");
-                 // From wikipedia
+                 // Not really negative population. Negated values are used to grow bar to left.
                  *male << -145596 << -149894 << -167327 << -164118 << -170710 << -169408 << -158395 << -176975 << -191803 << -191198 << -196815
                        << -207826 << -145517 << -113204 << -90986 << -70909 << -40013 << -15887 << -5769;
                  series->append(male);
                  series->append(female);
                  series->setBarWidth(0.5);
-                 series->setGrouping(false);
+                 series->setOverlap(true);
              //![2]
              //![3]
                  QChart* chart = new QChart();
                  chart->addSeries(series);
                  chart->setTitle("Population of Finland in 2005 by age group");
-                 chart->createDefaultAxes();
                  chart->setAnimationOptions(QChart::SeriesAnimations);
              //![3]
                  QBarCategoryAxis* axis = new QBarCategoryAxis();
                  axis->append(categories);
+                 chart->createDefaultAxes();
                  chart->setAxisY(axis,series);
                  chart->axisX(series)->setRange(-210000,210000);
              //![4]
              //![7]
                  QMainWindow window;
                  window.setCentralWidget(chartView);
-                 window.resize(400, 800);
+                 window.resize(400, 600);
                  window.show();
              //![7]

src/barchart/horizontal/bar/horizontalbarchartitem.cpp +6 -6

                  qreal barHeight;
               // On horizontal chart barWidth of the barseries means height of the rect.
-                 if (m_series->d_func()->m_grouping) {
-                     barHeight = (scaleY / setCount) * m_series->d_func()->barWidth();
-                 } else {
+                 if (m_series->d_func()->m_overlap) {
                      barHeight = scaleY * m_series->d_func()->barWidth();
+                 } else {
+                     barHeight = (scaleY / setCount) * m_series->d_func()->barWidth();
                  }
                  int itemIndex(0);
                          QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
                          qreal yPos = m_rect.bottom() + (m_domainMinY - barSet->pos(category)) * scaleY;
-                         if (m_series->d_func()->m_grouping) {
+                         if (m_series->d_func()->m_overlap) {
+                             yPos += barHeight/2;
+                         } else {
                              yPos += setCount*barHeight/2;
                              yPos -= set*barHeight;
-                         } else {
-                             yPos += barHeight/2;
                          }
                          qreal barWidth = barSet->value(category) * scaleX;

src/barchart/qabstractbarseries.cpp +9 -8

              }
              /*!
-                 Sets the grouped drawing mode for bars. If \a grouping is true, then the bars
+                 Sets the overlap drawing mode for bars. If \a overlap is true, then the bars
                  are drawn at same position inside group. Can be used for example to draw negative bars
-                 at same position on axis than positive bars.
+                 at same position on axis than positive bars. By default overlap is false and bars are drawn
+                 next to each other. Note that this setting doesn't affect stacked and percent bar series.
              */
-             void QAbstractBarSeries::setGrouping(bool grouping)
+             void QAbstractBarSeries::setOverlap(bool overlap)
              {
                  Q_D(QAbstractBarSeries);
-                 d->setGrouping(grouping);
+                 d->setOverlap(overlap);
              }
                  m_barWidth(0.5),  // Default value is 50% of category width
                  m_labelsVisible(false),
                  m_visible(true),
-                 m_grouping(true)
+                 m_overlap(false)
              {
              }
                  emit labelsVisibleChanged(visible);
              }
-             void QAbstractBarSeriesPrivate::setGrouping(bool grouping)
+             void QAbstractBarSeriesPrivate::setOverlap(bool overlap)
              {
-                 if (m_grouping != grouping) {
-                     m_grouping = grouping;
+                 if (m_overlap != overlap) {
+                     m_overlap = overlap;
                      emit updatedBars();
                  }
              }

src/barchart/qabstractbarseries.h +1 -1

                  void setLabelsVisible(bool visible = true);
                  bool isLabelsVisible() const;
-                 void setGrouping(bool grouping = true);
+                 void setOverlap(bool overlap = true);
              protected:
                  explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d,QObject *parent = 0);

src/barchart/qabstractbarseries_p.h +2 -2

                  void setVisible(bool visible);
                  void setLabelsVisible(bool visible);
-                 void setGrouping(bool grouping);
+                 void setOverlap(bool overlap);
                  void scaleDomain(Domain& domain);
                  ChartElement* createGraphics(ChartPresenter* presenter);
                  qreal m_barWidth;
                  bool m_labelsVisible;
                  bool m_visible;
-                 bool m_grouping;
+                 bool m_overlap;
              private:
                  Q_DECLARE_PUBLIC(QAbstractBarSeries)

src/barchart/vertical/bar/barchartitem.cpp +6 -6

                  qreal scaleX = (width / rangeX);
                  qreal barWidth;
-                 if (m_series->d_func()->m_grouping) {
-                     barWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
-                 } else {
+                 if (m_series->d_func()->m_overlap) {
                      barWidth = scaleX * m_series->d_func()->barWidth();
+                 } else {
+                     barWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
                  }
                  int itemIndex(0);
                          qreal xPos;
-                         if (m_series->d_func()->m_grouping) {
+                         if (m_series->d_func()->m_overlap) {
+                             xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+                         } else {
                              xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left();
                              xPos -= setCount*barWidth/2;
                              xPos += set*barWidth;
-                         } else {
-                             xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
                          }
                          qreal barHeight = barSet->value(category) * scaleY;

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