HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r799:0ecf2967daa4

legend layout with padding

sauimone -

r799:0ecf2967daa4

parent child

Context file:

r799:0ecf2967daa4

Collapse all files

src/chartpresenter.cpp +49 -4

@@ -79,10 +79,55 void ChartPresenter::createConnections()
79	void ChartPresenter::handleGeometryChanged()	79	void ChartPresenter::handleGeometryChanged()
80	{	80	{
81	QRectF rect(QPoint(0,0),m_chart->size());	81	QRectF rect(QPoint(0,0),m_chart->size());
82	rect.adjust(m_padding,	82	QLegend* legend = m_chart->legend();
83	m_padding + m_chart->legend()->size().height(),	83	if ((legend->attachedToChart()) && (legend->isVisible())) {
84	-m_padding,	84
85	-m_padding);	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	}
86		131
87	//rewrite zoom stack	132	//rewrite zoom stack
88	/*	133	/*

src/qchart.cpp +11 -9

                 switch (m_legend->alignment())
                 {
-                    case QLegend::LayoutTop: {
+                    case QLegend::AlignmentTop: {
-                        legendRect = plotRect.adjusted(0,0,0,-padding - plotRect.height());
+                        legendRect = m_rect.adjusted(0,0,0,-padding - plotRect.height());
                         break;
                     }
-                    case QLegend::LayoutBottom: {
+                    case QLegend::AlignmentBottom: {
-                        legendRect = plotRect.adjusted(padding,padding + plotRect.height(),-padding,0);
+                        legendRect = m_rect.adjusted(padding,padding + plotRect.height(),-padding,0);
                         break;
                     }
-                    case QLegend::LayoutLeft: {
+                    case QLegend::AlignmentLeft: {
-                        legendRect = plotRect.adjusted(0,padding,-padding - plotRect.width(),-padding);
+                        legendRect = m_rect.adjusted(0,padding,-padding - plotRect.width(),-padding);
                         break;
                     }
-                    case QLegend::LayoutRight: {
+                    case QLegend::AlignmentRight: {
-                        legendRect = plotRect.adjusted(padding + plotRect.width(),padding,0,-padding);
+                        legendRect = m_rect.adjusted(padding + plotRect.width(),padding,0,-padding);
                         break;
                     }
                     default: {
                 if (height > 0) {
                     pos.setY(pos.y() + height/2);
                 }
+                qDebug() << "lenged topleft:" << pos;
                 m_legend->setPos(pos);
             }
                 // recalculate legend position
                 if (m_legend) {
-                    if (m_legend->parentObject() == q_ptr) {
+                    if ((m_legend->attachedToChart()) && (m_legend->parentObject() == q_ptr)) {
                         updateLegendLayout();
                     }
                 }

src/qlegend.cpp +36 -11

                 m_maximumSize(150,100),
                 m_size(m_minimumSize),
                 m_brush(Qt::darkGray),              // TODO: default should come from theme
-                m_alignment(QLegend::LayoutTop),
+                m_alignment(QLegend::AlignmentRight),
-                mFirstMarker(0)
+                mFirstMarker(0),
+                m_attachedToChart(true)
             {
                 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::Layout alignment)
+            void QLegend::setAlignmnent(QLegend::Alignment alignment)
             {
                 m_alignment = alignment;
                 updateLayout();
             /*!
                 Returns the preferred layout for legend
             */
-            QLegend::Layout QLegend::alignment() const
+            QLegend::Alignment QLegend::alignment() const
             {
                 return m_alignment;
             }
             }
             /*!
+                Detaches the legend from chart. Chart won't change layout of the legend.
+            */
+            void QLegend::detachFromChart()
+            {
+                m_attachedToChart = false;
+            }
+            /*!
+                Attaches the legend to chart. Chart may change layout of the legend.
+            */
+            void QLegend::attachToChart()
+            {
+                m_attachedToChart = true;
+            }
+            /*!
+                Returns true, if legend is attached to chart.
+            */
+            bool QLegend::attachedToChart()
+            {
+                return m_attachedToChart;
+            }
+            /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QAreaSeries* series)
                 switch (m_alignment)
                 {
                 // Both cases organise items horizontally
-                case QLegend::LayoutBottom:
+                case QLegend::AlignmentBottom:
-                case QLegend::LayoutTop: {
+                case QLegend::AlignmentTop: {
                     qreal xStep = markerMaxSize.width();
                     qreal x = m_pos.x() + m_margin;
                     break;
                 }
                 // Both cases organize items vertically
-                case QLegend::LayoutLeft:
+                case QLegend::AlignmentLeft:
-                case QLegend::LayoutRight: {
+                case QLegend::AlignmentRight: {
                     qreal yStep = markerMaxSize.height();
                     qreal x = m_pos.x() + m_margin;
                     qreal y = m_pos.y() + m_margin;
             */
             void QLegend::checkFirstMarkerBounds()
             {
-                if ((m_alignment == QLegend::LayoutLeft) || (m_alignment == QLegend::LayoutRight)) {
+                if ((m_alignment == QLegend::AlignmentLeft) || (m_alignment == QLegend::AlignmentRight)) {
                     // Bounds limited by height.
                     int max;
                     if (scrollButtonsVisible()) {
             bool QLegend::scrollButtonsVisible()
             {
                 // Just a helper to clarify, what the magic below means :)
-                if ((m_alignment == QLegend::LayoutTop) || (m_alignment == QLegend::LayoutBottom)) {
+                if ((m_alignment == QLegend::AlignmentTop) || (m_alignment == QLegend::AlignmentBottom)) {
                     return (maximumMarkerSize().width() * m_markers.count() + m_margin * 2 > m_maximumSize.width());
-                } else if ((m_alignment == QLegend::LayoutLeft) || (m_alignment == QLegend::LayoutRight)) {
+                } else if ((m_alignment == QLegend::AlignmentLeft) || (m_alignment == QLegend::AlignmentRight)) {
                     return (maximumMarkerSize().height() * m_markers.count() + m_margin * 2 > m_maximumSize.height());
                 }

src/qlegend.h +14 -9

             class QSeries;
             class QChart;
-            // TODO: This as widget
             class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 // We only support these alignments (for now)
-                enum Layout {
+                enum Alignment {
-                    LayoutTop = Qt::AlignTop,
+                    AlignmentTop = Qt::AlignTop,
-                    LayoutBottom = Qt::AlignBottom,
+                    AlignmentBottom = Qt::AlignBottom,
-                    LayoutLeft = Qt::AlignLeft,
+                    AlignmentLeft = Qt::AlignLeft,
-                    LayoutRight = Qt::AlignRight
+                    AlignmentRight = Qt::AlignRight
                 };
             private:
                 explicit QLegend(QChart *chart);
                 void setPen(const QPen &pen);
                 QPen pen() const;
-                void setAlignmnent(QLegend::Layout alignment);
+                void setAlignmnent(QLegend::Alignment alignment);
-                QLegend::Layout alignment() const;
+                QLegend::Alignment alignment() const;
                 QSizeF maximumSize() const;
                 void setMaximumSize(const QSizeF size);
                 void scrollButtonClicked(LegendScrollButton *scrollButton);
+                void detachFromChart();
+                void attachToChart();
+                bool attachedToChart();
             Q_SIGNALS:
                 // for interactions.
                 void clicked(QSeries *series, Qt::MouseButton button);
                 QBrush m_brush;
                 QPen m_pen;
-                QLegend::Layout m_alignment;
+                QLegend::Alignment m_alignment;
                 int mFirstMarker;
                 LegendScrollButton *m_scrollButtonUp;
                 LegendScrollButton *m_scrollButtonDown;
+                bool m_attachedToChart;
                 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