HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1300:6bd3a3b0fd91

legend example to documentation. minor legend fixes

sauimone -

r1300:6bd3a3b0fd91

parent child

Context file:

r1300:6bd3a3b0fd91

Collapse all files

doc/src/examples-legend.qdoc created 644 +29 0

@@ -0,0 +1,29
	1	/*!
	2	\example examples/legend
	3	\title Legend Example
	4	\subtitle
	5
	6	This example shows how to detach legend from chart and how to attach it back. By default the chart
	7	draws the legend inside same view with the chart. In some cases user may want to draw legend to somewhere else. To make this possible the legend can be detached from the chart. Detaching means that chart doesn't draw the legend or try to change it's layout. Detached can then be drawn where user wants, for example in different graphics scene. In this example we do so.
	8
	9	First we create our chart as usual.
	10
	11	\snippet ../examples/legend/mainwidget.cpp 1
	12
	13	Here we create custom graphics scene, where we want to draw the detached legend.
	14
	15	\snippet ../examples/legend/mainwidget.cpp 2
	16
	17	Add some series to the chart.
	18
	19	\snippet ../examples/legend/mainwidget.cpp 3
	20
	21	Here we detach the legend. After detaching, we set new geometry for it and add it to the custom scene. The custom scene adopts the legend and becomes new parent for it. Note that chart will still update the contents of the legend.
	22
	23	\snippet ../examples/legend/mainwidget.cpp 4
	24
	25	To attach legend back to chart we first remove it from the custom scene. Then we add legend to the scene, where chart is. Last we attach legend to chart. Attaching legend to chart automatically sets the QChart as parent for legend.
	26
	27	\snippet ../examples/legend/mainwidget.cpp 5
	28
	29	*/

doc/src/examples.qdoc +1 0

                         <li><a href="examples-barchart.html">Bar chart</a></li>
                         <li><a href="examples-customchart.html">Custom chart</a></li>
                         <li><a href="examples-groupedbarchart.html">Grouped bar chart</a></li>
+                        <li><a href="examples-legend.html">Legend</a></li>
                         <li><a href="examples-linechart.html">Line chart</a></li>
                         <li><a href="examples-modeldata.html">Model data</a></li>
                         <li><a href="examples-percentbarchart.html">Percent bar chart</a></li>

examples/legend/mainwidget.cpp +25 -27

             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
-                m_setCount = 0;
+                // Create buttons for ui
-                m_chart = new QChart();
-            //![1]
                 m_buttonLayout = new QGridLayout();
                 QPushButton *detachLegendButton = new QPushButton("detach legend");
                 connect(detachLegendButton, SIGNAL(clicked()), this, SLOT(detachLegend()));
                 QPushButton *removeBarsetButton = new QPushButton("remove barset");
                 connect(removeBarsetButton, SIGNAL(clicked()), this, SLOT(removeBarset()));
                 m_buttonLayout->addWidget(removeBarsetButton, 3, 0);
-            //![1]
                 // Create chart view with the chart
+            //![1]
+                m_chart = new QChart();
                 m_chartView = new QChartView(m_chart, this);
                 m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
+            //![1]
+                // Create custom scene and view, where detached legend will be drawn
             //![2]
                 m_customView = new QGraphicsView(this);
                 m_customScene = new QGraphicsScene(this);
             void MainWidget::createSeries()
             {
+            //![3]
                 m_series = new QBarSeries();
                 addBarset();
                 addBarset();
                 m_chart->axisY()->setNiceNumbersEnabled(true);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
+            //![3]
             }
             void MainWidget::detachLegend()
             {
-            //![3]
+                // Detach legend from chart and
-                // Detach legend from chart
+                // put legend to our custom scene
+            //![4]
                 QLegend *legend = m_chart->legend();
                 legend->detachFromChart();
                 legend->setGeometry(m_customView->rect());
-            //    legend->setAlignment(QLegend::AlignmentLeft);
-                // Put legend to our custom scene
                 m_customScene->addItem(legend);
-            //![3]
+            //![4]
-                // This causes redraw
+                // This forces redraw
-                QSize size(1,1);
+                QSize delta(1,1);
-                this->resize(this->size() + size);
+                resize(size() + delta);
-                this->resize(this->size() - size);
+                resize(size() - delta);
             }
             void MainWidget::attachLegend()
             {
-            //![4]
+                // Remove legend from custom scene and put it back to chartview scene.
+                // Attach legend back to chart, so that layout works.
+            //![5]
                 QLegend *legend = m_chart->legend();
                 if (m_customScene->items().contains(legend)) {
-                    // Remove legend from custom scene and put it back to chartview scene.
-                    // Attach legend back to chart, so that layout works.
                     m_customScene->removeItem(legend);
-                    legend->setParent(m_chart);
                     m_chartView->scene()->addItem(legend);
-            //        legend->setAlignment(QLegend::AlignmentBottom);
                     legend->attachToChart();
                 }
-            //![4]
+            //![5]
-                // This causes redraw
+                // This forces redraw
-                QSize size(1,1);
+                QSize delta(1,1);
-                this->resize(this->size() + size);
+                resize(size() + delta);
-                this->resize(this->size() - size);
+                resize(size() - delta);
             }
             void MainWidget::addBarset()
             {
-                QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_setCount));
+                QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->barsetCount()));
-                m_setCount++;
                 qreal delta = m_series->barsetCount() * 0.1;
                 *barSet << QPointF(0.0 + delta, 1 + delta) << QPointF(1.0 + delta, 2 + delta) << QPointF(2.0 + delta, 3 + delta) << QPointF(3.0 + delta, 4 + delta);
                 m_series->append(barSet);

examples/legend/mainwidget.h 0 -5

                 QChart *m_chart;
                 QBarSeries *m_series;
-                QGraphicsScene *m_scene;
                 QChartView *m_chartView;
                 QGridLayout *m_mainLayout;
                 QGridLayout *m_buttonLayout;
                 QGraphicsView *m_customView;
                 QGraphicsScene *m_customScene;
-                QGraphicsGridLayout *m_customLayout;
-                int m_setCount;
             };
             #endif // MAINWIDGET_H

src/chartpresenter.cpp +1 -1

                 QLegend* legend = m_chart->d_ptr->m_legend;
                 // recalculate legend position
-                if (legend->isAttachedToChart() && legend->isEnabled()) {
+                if (legend != 0 && legend->isAttachedToChart() && legend->isEnabled()) {
                     QRect legendRect;

src/legend/qlegend.cpp +10 -3

              */
             QLegend::QLegend(QChart *chart):QGraphicsWidget(chart),
-            d_ptr(new QLegendPrivate(chart->d_ptr->m_presenter,this))
+            d_ptr(new QLegendPrivate(chart->d_ptr->m_presenter,chart,this))
             {
                 setZValue(ChartPresenter::LegendZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
              */
             void QLegend::attachToChart()
             {
-                d_ptr->m_attachedToChart = true;
+                d_ptr->attachToChart();
             }
             /*!
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QLegendPrivate::QLegendPrivate(ChartPresenter* presenter,QLegend *q):
+            QLegendPrivate::QLegendPrivate(ChartPresenter* presenter, QChart *chart, QLegend *q):
                 q_ptr(q),
                 m_presenter(presenter),
+                m_chart(chart),
                 m_markers(new QGraphicsItemGroup(q)),
                 m_alignment(QLegend::AlignmentTop),
                 m_offsetX(0),
                 }
             }
+            void QLegendPrivate::attachToChart()
+            {
+                m_attachedToChart = true;
+                q_ptr->setParent(m_chart);
+            }
             void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
             {
                 Q_UNUSED(domain)

src/legend/qlegend_p.h +4 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class QChart;
             class ChartPresenter;
             class QAbstractSeries;
             {
                 Q_OBJECT
             public:
-                QLegendPrivate(ChartPresenter *chart,QLegend *q);
+                QLegendPrivate(ChartPresenter *presenter, QChart *chart, QLegend *q);
                 ~QLegendPrivate();
                 void setOffset(qreal x, qreal y);
                 void updateLayout();
+                void attachToChart();
             public Q_SLOTS:
                 void handleSeriesAdded(QAbstractSeries *series, Domain *domain);
             private:
                 QLegend *q_ptr;
                 ChartPresenter *m_presenter;
+                QChart* m_chart;
                 QGraphicsItemGroup* m_markers;
                 QLegend::Alignments m_alignment;
                 QBrush m_brush;

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