HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r803:a2705c21cb29

legend pos to theme example, legend padding

sauimone -

r803:a2705c21cb29

parent child

Context file:

r803:a2705c21cb29

Collapse all files

demos/chartthemes/themewidget.cpp +22 -1

             #include <QSplineSeries>
             #include <QScatterSeries>
             #include <QAreaSeries>
+            #include <QLegend>
             #include <QGridLayout>
             #include <QFormLayout>
             #include <QComboBox>
                 m_dataTable(generateRandomData(m_listCount,m_valueMax,m_valueCount)),
                 m_themeComboBox(createThemeBox()),
                 m_antialiasCheckBox(new QCheckBox("Anti aliasing")),
-                m_animatedComboBox(createAnimationBox())
+                m_animatedComboBox(createAnimationBox()),
+                m_legendComboBox(createLegendBox())
             {
                 connectSignals();
                 settingsLayout->addWidget(m_themeComboBox);
                 settingsLayout->addWidget(new QLabel("Animation:"));
                 settingsLayout->addWidget(m_animatedComboBox);
+                settingsLayout->addWidget(m_legendComboBox);
                 settingsLayout->addWidget(m_antialiasCheckBox);
                 settingsLayout->addStretch();
                 baseLayout->addLayout(settingsLayout, 0, 0, 1, 3);
                 connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 connect(m_antialiasCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
+                connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
             }
             DataTable ThemeWidget::generateRandomData(int listCount,int valueMax,int valueCount) const
                 return animationComboBox;
             }
+            QComboBox* ThemeWidget::createLegendBox() const
+            {
+                QComboBox* legendComboBox = new QComboBox();
+                legendComboBox->addItem("Legend Top", QLegend::AlignmentTop);
+                legendComboBox->addItem("Legend Bottom", QLegend::AlignmentBottom);
+                legendComboBox->addItem("Legend Left", QLegend::AlignmentLeft);
+                legendComboBox->addItem("Legend Right", QLegend::AlignmentRight);
+                return legendComboBox;
+            }
             QChart* ThemeWidget::createAreaChart() const
             {
                 // area chart
                     foreach (QChartView *chartView, m_charts)
                         chartView->chart()->setAnimationOptions(options);
                 }
+                QLegend::Alignments alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt());
+                foreach (QChartView *chartView, m_charts) {
+                    qDebug() << alignment;
+                    chartView->chart()->legend()->setAlignmnent(alignment);
+                }
             }

demos/chartthemes/themewidget.h +2 0

                 DataTable generateRandomData(int listCount,int valueMax,int valueCount) const;
                 QComboBox* createThemeBox() const;
                 QComboBox* createAnimationBox() const;
+                QComboBox* createLegendBox() const;
                 void connectSignals();
                 QChart* createAreaChart() const;
                 QChart* createBarChart(int valueCount) const;
                 QComboBox *m_themeComboBox;
                 QCheckBox *m_antialiasCheckBox;
                 QComboBox *m_animatedComboBox;
+                QComboBox *m_legendComboBox;
             };
             #endif /* THEMEWINDOW_H_ */

src/chartpresenter.cpp +5 -54

@@ -19,7 +19,6
19	****************************************************************************/	19	****************************************************************************/
20		20
21	#include "qchart.h"	21	#include "qchart.h"
22	#include "qlegend.h"
23	#include "qchartaxis.h"	22	#include "qchartaxis.h"
24	#include "chartpresenter_p.h"	23	#include "chartpresenter_p.h"
25	#include "chartdataset_p.h"	24	#include "chartdataset_p.h"
@@ -55,7 +54,6 ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(char
55	m_rect(QRectF(QPoint(0,0),m_chart->size())),	54	m_rect(QRectF(QPoint(0,0),m_chart->size())),
56	m_options(QChart::NoAnimation),	55	m_options(QChart::NoAnimation),
57	m_themeForce(false),	56	m_themeForce(false),
58	m_padding(50),
59	m_backgroundPadding(10)	57	m_backgroundPadding(10)
60	{	58	{
61	createConnections();	59	createConnections();
@@ -79,55 +77,8 void ChartPresenter::createConnections()
79	void ChartPresenter::handleGeometryChanged()	77	void ChartPresenter::handleGeometryChanged()
80	{	78	{
81	QRectF rect(QPoint(0,0),m_chart->size());	79	QRectF rect(QPoint(0,0),m_chart->size());
82	QLegend* legend = m_chart->legend();	80	QRectF padding = m_chart->padding();
83	if ((legend->attachedToChart()) && (legend->isVisible())) {	81	rect.adjust(padding.left(), padding.top(), -padding.right(), -padding.bottom());
84
85	// Reserve some space for legend
86	switch (m_chart->legend()->alignment()) {
87	case QLegend::AlignmentTop: {
88	rect.adjust(m_padding,
89	m_padding + legend->size().height(),
90	-m_padding,
91	-m_padding);
92	break;
93	}
94	case QLegend::AlignmentBottom: {
95	rect.adjust(m_padding,
96	m_padding,
97	-m_padding,
98	-m_padding - legend->size().height());
99	break;
100	}
101	case QLegend::AlignmentLeft: {
102	rect.adjust(m_padding + legend->size().width(),
103	m_padding,
104	-m_padding,
105	-m_padding);
106	break;
107	}
108	case QLegend::AlignmentRight: {
109	rect.adjust(m_padding,
110	m_padding,
111	-m_padding - legend->size().width(),
112	-m_padding);
113	break;
114	}
115	default: {
116	rect.adjust(m_padding,
117	m_padding,
118	-m_padding,
119	-m_padding);
120	break;
121	}
122	}
123	} else {
124
125	// Legend is detached, or not visible
126	rect.adjust(m_padding,
127	m_padding,
128	-m_padding,
129	-m_padding);
130	}
131		82
132	//rewrite zoom stack	83	//rewrite zoom stack
133	/*	84	/*
@@ -393,7 +344,7 void ChartPresenter::zoomIn()
393	void ChartPresenter::zoomIn(const QRectF& rect)	344	void ChartPresenter::zoomIn(const QRectF& rect)
394	{	345	{
395	QRectF r = rect.normalized();	346	QRectF r = rect.normalized();
396	r.translate(-m_padding, -m_padding);	347	r.translate(-m_chart->padding().topLeft());
397	if(m_animator) {	348	if(m_animator) {
398		349
399	QPointF point(r.center().x()/geometry().width(),r.center().y()/geometry().height());	350	QPointF point(r.center().x()/geometry().width(),r.center().y()/geometry().height());
@@ -414,8 +365,8 void ChartPresenter::zoomOut()
414		365
415	QSizeF size = geometry().size();	366	QSizeF size = geometry().size();
416	QRectF rect = geometry();	367	QRectF rect = geometry();
417	rect.translate(-m_~~padding~~, -m_padding);	368	rect.translate(-m_chart->padding().topLeft());
418	m_dataset->zoomOutDomain(rect.adjusted(size.width()/4,size.height()/4,-size.width()/4,-size.height()/4),size);	369	m_dataset->zoomOutDomain(rect.adjusted(size.width()/4,size.height()/4,-size.width()/4,-size.height()/4),size);
419	//m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());	370	//m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());
420		371
421	if(m_animator){	372	if(m_animator){

src/chartpresenter_p.h 0 -2

                 ChartPresenter(QChart* chart,ChartDataSet *dataset);
                 virtual ~ChartPresenter();
-                int padding() const { return m_padding; }
                 int backgroundPadding() const { return m_backgroundPadding; }
                 QRectF geometry() const { return m_rect; }
                 ChartAnimator* animator() const { return m_animator; }
                 QRectF m_rect;
                 QChart::AnimationOptions m_options;
                 bool m_themeForce;
-                int m_padding;
                 int m_backgroundPadding;
             };

src/qchart.cpp +67 -7

@@ -73,8 +73,7 d_ptr(new QChartPrivate(this))
73	d_ptr->m_legend = new QLegend(this);	73	d_ptr->m_legend = new QLegend(this);
74	d_ptr->m_dataset = new ChartDataSet(this);	74	d_ptr->m_dataset = new ChartDataSet(this);
75	d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);	75	d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
76	int padding = d_ptr->m_presenter->padding();	76	setMinimumSize(d_ptr->m_padding.left() * 3, d_ptr->m_padding.top() * 3);
77	setMinimumSize(3padding,3padding);
78	connect(d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries,Domain)),d_ptr->m_legend,SLOT(handleSeriesAdded(QSeries,Domain)));	77	connect(d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries,Domain)),d_ptr->m_legend,SLOT(handleSeriesAdded(QSeries,Domain)));
79	connect(d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries)),d_ptr->m_legend,SLOT(handleSeriesRemoved(QSeries)));	78	connect(d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries)),d_ptr->m_legend,SLOT(handleSeriesRemoved(QSeries)));
80	}	79	}
@@ -269,6 +268,12 QLegend* QChart::legend() const
269	return d_ptr->m_legend;	268	return d_ptr->m_legend;
270	}	269	}
271		270
		271	QRectF QChart::padding() const
		272	{
		273	return d_ptr->m_padding;
		274	}
		275
		276
272	/*!	277	/*!
273	Resizes and updates the chart area using the \a event data	278	Resizes and updates the chart area using the \a event data
274	*/	279	*/
@@ -336,7 +341,8 m_backgroundItem(0),
336	m_titleItem(0),	341	m_titleItem(0),
337	m_legend(0),	342	m_legend(0),
338	m_dataset(0),	343	m_dataset(0),
339	m_presenter(0)	344	m_presenter(0),
		345	m_padding(QRectF(50,50,50,50))
340	{	346	{
341		347
342	}	348	}
@@ -365,10 +371,65 void QChartPrivate::createChartTitleItem()
365		371
366	void QChartPrivate::updateLegendLayout()	372	void QChartPrivate::updateLegendLayout()
367	{	373	{
368	~~int~~ padding = m_~~presenter~~->padding();	374	//int legendPadding = m_chart->legend()->padding();
369	QRectF plotRect = m_rect.adjusted(padding,padding,-padding,-padding);	375	int legendPadding = 30;
		376	QRectF rect = m_rect;
		377
		378	if ((m_legend->attachedToChart()) && (m_legend->isVisible())) {
		379
		380	// Reserve some space for legend
		381	switch (m_legend->alignment()) {
		382	case QLegend::AlignmentTop: {
		383	rect.adjust(m_padding.left(),
		384	m_padding.top() + legendPadding,
		385	-m_padding.right(),
		386	-m_padding.bottom());
		387	break;
		388	}
		389	case QLegend::AlignmentBottom: {
		390	rect.adjust(m_padding.left(),
		391	m_padding.top(),
		392	-m_padding.right(),
		393	-m_padding.bottom() - legendPadding);
		394	break;
		395	}
		396	case QLegend::AlignmentLeft: {
		397	rect.adjust(m_padding.left() + legendPadding,
		398	m_padding.top(),
		399	-m_padding.right(),
		400	-m_padding.bottom());
		401	break;
		402	}
		403	case QLegend::AlignmentRight: {
		404	rect.adjust(m_padding.left(),
		405	m_padding.top(),
		406	-m_padding.right() - legendPadding,
		407	-m_padding.bottom());
		408	break;
		409	}
		410	default: {
		411	rect.adjust(m_padding.left(),
		412	m_padding.top(),
		413	-m_padding.right(),
		414	-m_padding.bottom());
		415	break;
		416	}
		417	}
		418	} else {
		419
		420	rect.adjust(m_padding.left(),
		421	m_padding.top(),
		422	-m_padding.right(),
		423	-m_padding.bottom());
		424	}
		425
		426	QRectF plotRect = m_rect.adjusted(m_padding.left()
		427	,m_padding.top()
		428	,-m_padding.right()
		429	,-m_padding.bottom());
370	QRectF legendRect;	430	QRectF legendRect;
371		431
		432	int padding = 0; // TODO: fix this
372	switch (m_legend->alignment())	433	switch (m_legend->alignment())
373	{	434	{
374	case QLegend::AlignmentTop: {	435	case QLegend::AlignmentTop: {
@@ -406,7 +467,6 void QChartPrivate::updateLegendLayout()
406	pos.setY(pos.y() + height/2);	467	pos.setY(pos.y() + height/2);
407	}	468	}
408		469
409	qDebug() << "lenged topleft:" << pos;
410	m_legend->setPos(pos);	470	m_legend->setPos(pos);
411	}	471	}
412		472
@@ -414,7 +474,7 void QChartPrivate::updateLayout()
414	{	474	{
415	if (!m_rect.isValid()) return;	475	if (!m_rect.isValid()) return;
416		476
417	int padding = m_p~~resenter~~->padding();	477	int padding = m_padding.top();
418	int backgroundPadding = m_presenter->backgroundPadding();	478	int backgroundPadding = m_presenter->backgroundPadding();
419		479
420	// recalculate title position	480	// recalculate title position

src/qchart.h +2 0

                 QLegend* legend() const;
+                QRectF padding() const;
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);

src/qchart_p.h +1 0

                 QLegend* m_legend;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
+                QRectF m_padding;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.cpp +2 -2

             {
                 if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
-                    int padding = d_ptr->m_presenter->padding();
+                    int padding = d_ptr->m_chart->padding().top();
                     QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
                     if (rect.contains(event->pos())) {
             void QChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isVisible()) {
-                    int padding = d_ptr->m_presenter->padding();
+                    int padding = d_ptr->m_chart->padding().top();
                     QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
                     int width = event->pos().x() - d_ptr->m_rubberBandOrigin.x();
                     int height = event->pos().y() - d_ptr->m_rubberBandOrigin.y();

src/qlegend.cpp +9 -5

                 m_brush(Qt::darkGray),              // TODO: default should come from theme
                 m_alignment(QLegend::AlignmentTop),
                 mFirstMarker(0),
-                m_attachedToChart(true)
+                m_attachedToChart(true),
+                m_chart(chart)
             {
                 m_scrollButtonLeft = new LegendScrollButton(LegendScrollButton::ScrollButtonIdLeft, this);
                 m_scrollButtonRight = new LegendScrollButton(LegendScrollButton::ScrollButtonIdRight, this);
                 Sets the \a preferred layout for legend. Legend tries to paint itself on the defined position in chart.
                 \sa QLegend::Layout
             */
-            void QLegend::setAlignmnent(QLegend::Alignment alignment)
+            void QLegend::setAlignmnent(QLegend::Alignments alignment)
             {
-                m_alignment = alignment;
+            //    if (!m_attachedToChart) {
-                updateLayout();
+                    m_alignment = alignment;
+                    updateLayout();
+                    m_chart->resize(m_chart->size());
+            //    }
             }
             /*!
                 Returns the preferred layout for legend
             */
-            QLegend::Alignment QLegend::alignment() const
+            QLegend::Alignments QLegend::alignment() const
             {
                 return m_alignment;
             }

src/qlegend.h +8 -3

                     AlignmentLeft = Qt::AlignLeft,
                     AlignmentRight = Qt::AlignRight
                 };
+                Q_DECLARE_FLAGS(Alignments, Alignment)
             private:
                 explicit QLegend(QChart *chart);
                 void setPen(const QPen &pen);
                 QPen pen() const;
-                void setAlignmnent(QLegend::Alignment alignment);
+                void setAlignmnent(QLegend::Alignments alignment);
-                QLegend::Alignment alignment() const;
+                QLegend::Alignments alignment() const;
                 QSizeF maximumSize() const;
                 void setMaximumSize(const QSizeF size);
                 void clicked(QSeries *series, Qt::MouseButton button);
                 void clicked(QBarSet *barset, Qt::MouseButton button);
                 void clicked(QPieSlice *slice, Qt::MouseButton button);
+                void legendGeometryChanged();
             public Q_SLOTS:
                 // PIMPL --->
                 QBrush m_brush;
                 QPen m_pen;
-                QLegend::Alignment m_alignment;
+                QLegend::Alignments m_alignment;
                 int mFirstMarker;
                 bool m_attachedToChart;
+                QChart *m_chart;
                 friend class QChart;
                 // <--- PIMPL
             };

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