HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r783:d2e48e985993

improved legend layout

sauimone -

r783:d2e48e985993

parent child

Context file:

r783:d2e48e985993

Collapse all files

src/chartpresenter.cpp +7 -2

             #include "qchart.h"
+            #include "qlegend.h"
             #include "qchartaxis.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             void ChartPresenter::handleGeometryChanged()
             {
+                qDebug() << "legend h:" << m_chart->legend()->size().height();
                 QRectF rect(QPoint(0,0),m_chart->size());
-                rect.adjust(m_padding,m_padding,-m_padding,-m_padding);
+                rect.adjust(m_padding,
+                            m_padding + m_chart->legend()->size().height(),
+                            -m_padding,
+                            -m_padding);
                 //rewrite zoom stack
                 /*
                 m_themeForce = force;
                 m_chartTheme = ChartTheme::createTheme(theme);
                 m_chartTheme->decorate(m_chart,m_themeForce);
-                m_chartTheme->decorate(&m_chart->legend(),m_themeForce);
+                m_chartTheme->decorate(m_chart->legend(),m_themeForce);
                 resetAllElements();
             }

src/charttheme.cpp +1 -1

                 QBrush brush;
                 if (pen == legend->pen() || force){
-                    //TODO:: legend->setPen();
+                    legend->setPen(Qt::NoPen);
                 }

src/qchart.cpp +14 -33

@@ -264,39 +264,9 QChartAxis* QChart::axisY() const
264	/*!	264	/*!
265	Returns the legend object of the chart. Ownership stays in chart.	265	Returns the legend object of the chart. Ownership stays in chart.
266	*/	266	*/
267	QLegend& QChart::legend() const	267	QLegend* QChart::legend() const
268	{	268	{
269	return *d_ptr->m_legend;	269	return d_ptr->m_legend;
270	}
271
272	/*!
273	Gives ownership of legend to user.
274	*/
275	QLegend* QChart::takeLegend()
276	{
277	QLegend* l = d_ptr->m_legend;
278	d_ptr->m_legend = 0;
279	return l;
280	}
281
282	/*!
283	Gives ownership of legend back to chart. QChart takes ownership of \a legend and deletes existing one
284	*/
285	void QChart::giveLegend(QLegend *legend)
286	{
287	if (d_ptr->m_legend) {
288	// Should not happen.
289	qDebug() << "Warning! Giving more than one legend to chart.";
290	delete d_ptr->m_legend;
291	}
292
293	d_ptr->m_legend = legend;
294
295	// Reconnect legend, in case not already connected.
296	disconnect(d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries,Domain)),d_ptr->m_legend,SLOT(handleSeriesAdded(QSeries,Domain)));
297	disconnect(d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries)),d_ptr->m_legend,SLOT(handleSeriesRemoved(QSeries)));
298	connect(d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries,Domain)),d_ptr->m_legend,SLOT(handleSeriesAdded(QSeries,Domain)));
299	connect(d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries)),d_ptr->m_legend,SLOT(handleSeriesRemoved(QSeries)));
300	}	270	}
301		271
302	/*!	272	/*!
@@ -424,7 +394,18 void QChartPrivate::updateLegendLayout()
424	}	394	}
425		395
426	m_legend->setMaximumSize(legendRect.size());	396	m_legend->setMaximumSize(legendRect.size());
427	m_legend->setPos(legendRect.topLeft());	397
		398	qreal width = legendRect.width() - m_legend->size().width();
		399	qreal height = legendRect.height() - m_legend->size().height();
		400
		401	QPointF pos = legendRect.topLeft();
		402	if (width > 0) {
		403	pos.setX(pos.x() + width/2);
		404	}
		405	if (height > 0) {
		406	pos.setY(pos.y() + height/2);
		407	}
		408	m_legend->setPos(pos);
428	}	409	}
429		410
430	void QChartPrivate::updateLayout()	411	void QChartPrivate::updateLayout()

src/qchart.h +4 -6

                 QFont titleFont() const;
                 void setTitleBrush(const QBrush &brush);
                 QBrush titleBrush() const;
-                void setBackgroundBrush(const QBrush& brush);
+                void setBackgroundBrush(const QBrush &brush);
                 QBrush backgroundBrush() const;
-                void setBackgroundPen(const QPen& pen);
+                void setBackgroundPen(const QPen &pen);
                 QPen backgroundPen() const;
                 void setBackgroundVisible(bool visible);
                 AnimationOptions animationOptions() const;
                 void zoomIn();
-                void zoomIn(const QRectF& rect);
+                void zoomIn(const QRectF &rect);
                 void zoomOut();
                 void scrollLeft();
                 void scrollRight();
                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
-                QLegend& legend() const;
+                QLegend* legend() const;
-                QLegend* takeLegend();
-                void giveLegend(QLegend* legend);
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);

src/qlegend.cpp +4 -4

                 Constructs the legend object and sets the parent to \a parent
             */
             QLegend::QLegend(QGraphicsItem *parent) : QGraphicsObject(parent),
+                m_margin(5),
                 m_pos(0,0),
-                m_size(0,0),
                 m_minimumSize(50,20),                // TODO: magic numbers
                 m_maximumSize(150,100),
-                m_brush(Qt::darkGray),       // TODO: from theme?
+                m_size(m_minimumSize),
+                m_brush(Qt::darkGray),
                 m_alignment(QLegend::LayoutTop),
-                mFirstMarker(0),
+                mFirstMarker(0)
-                m_margin(5)
             {
                 m_scrollButtonLeft = new LegendScrollButton(LegendScrollButton::ScrollButtonIdLeft, this);
                 m_scrollButtonRight = new LegendScrollButton(LegendScrollButton::ScrollButtonIdRight, this);

src/qlegend.h +2 -2

                 void checkFirstMarkerBounds();
                 bool scrollButtonsVisible();
+                qreal m_margin;
                 QPointF m_pos;
-                QSizeF m_size;
                 QSizeF m_minimumSize;
                 QSizeF m_maximumSize;
+                QSizeF m_size;
                 QList<LegendMarker *> m_markers;
                 LegendScrollButton *m_scrollButtonUp;
                 LegendScrollButton *m_scrollButtonDown;
-                qreal m_margin;
                 // <--- 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