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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qchart.h"
             #include "qlegend.h"
             #include "qchartaxis.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             //series
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
             #include "qsplineseries.h"
             //items
             #include "axisitem_p.h"
             #include "areachartitem_p.h"
             #include "barchartitem_p.h"
             #include "stackedbarchartitem_p.h"
             #include "percentbarchartitem_p.h"
             #include "linechartitem_p.h"
             #include "piechartitem_p.h"
             #include "scatterchartitem_p.h"
             #include "splinechartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(chart),
                 m_chart(chart),
                 m_animator(0),
                 m_dataset(dataset),
                 m_chartTheme(0),
                 m_rect(QRectF(QPoint(0,0),m_chart->size())),
                 m_options(QChart::NoAnimation),
                 m_themeForce(false),
                 m_padding(50),
                 m_backgroundPadding(10)
             {
                 createConnections();
                 setTheme(QChart::ChartThemeDefault,false);
             }
             ChartPresenter::~ChartPresenter()
             {
             	delete m_chartTheme;
             }
             void ChartPresenter::createConnections()
             {
                 QObject::connect(m_chart,SIGNAL(geometryChanged()),this,SLOT(handleGeometryChanged()));
                 QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),this,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),this,SLOT(handleSeriesRemoved(QSeries*)));
                 QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*,Domain*)),this,SLOT(handleAxisAdded(QChartAxis*,Domain*)));
                 QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*)));
             }
             void ChartPresenter::handleGeometryChanged()
             {
                 QRectF rect(QPoint(0,0),m_chart->size());
-                rect.adjust(m_padding,
+                QLegend* legend = m_chart->legend();
-                            m_padding + m_chart->legend()->size().height(),
+                if ((legend->attachedToChart()) && (legend->isVisible())) {
-                            -m_padding,
-                            -m_padding);
+                    // Reserve some space for legend
+                    switch (m_chart->legend()->alignment()) {
+                    case QLegend::AlignmentTop: {
+                        rect.adjust(m_padding,
+                                    m_padding + legend->size().height(),
+                                    -m_padding,
+                                    -m_padding);
+                        break;
+                    }
+                    case QLegend::AlignmentBottom: {
+                        rect.adjust(m_padding,
+                                    m_padding,
+                                    -m_padding,
+                                    -m_padding - legend->size().height());
+                        break;
+                    }
+                    case QLegend::AlignmentLeft: {
+                        rect.adjust(m_padding + legend->size().width(),
+                                    m_padding,
+                                    -m_padding,
+                                    -m_padding);
+                        break;
+                    }
+                    case QLegend::AlignmentRight: {
+                        rect.adjust(m_padding,
+                                    m_padding,
+                                    -m_padding - legend->size().width(),
+                                    -m_padding);
+                        break;
+                    }
+                    default: {
+                        rect.adjust(m_padding,
+                                    m_padding,
+                                    -m_padding,
+                                    -m_padding);
+                        break;
+                    }
+                    }
+                } else {
+                    // Legend is detached, or not visible
+                    rect.adjust(m_padding,
+                                m_padding,
+                                -m_padding,
+                                -m_padding);
+                }
                 //rewrite zoom stack
                 /*
                 for(int i=0;i<m_zoomStack.count();i++){
                     QRectF r = m_zoomStack[i];
                     qreal w = rect.width()/m_rect.width();
                     qreal h = rect.height()/m_rect.height();
                     QPointF tl = r.topLeft();
                     tl.setX(tl.x()*w);
                     tl.setY(tl.y()*h);
                     QPointF br = r.bottomRight();
                     br.setX(br.x()*w);
                     br.setY(br.y()*h);
                     r.setTopLeft(tl);
                     r.setBottomRight(br);
                     m_zoomStack[i]=r;
                 }
                 */
                 m_rect = rect;
                 Q_ASSERT(m_rect.isValid());
                 emit geometryChanged(m_rect);
             }
             void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
             {
                 Axis* item = new Axis(axis,this,axis==m_dataset->axisX()?Axis::X_AXIS : Axis::Y_AXIS);
                 if(m_options.testFlag(QChart::GridAxisAnimations)){
                     m_animator->addAnimation(item);
                 }
                 if(axis==m_dataset->axisX()){
                     m_chartTheme->decorate(axis,true,m_themeForce);
                     QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize
                     item->handleRangeChanged(domain->minX(),domain->maxX(),domain->tickXCount());
                 }
                 else{
                     m_chartTheme->decorate(axis,false,m_themeForce);
                     QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize
                     item->handleRangeChanged(domain->minY(),domain->maxY(),domain->tickYCount());
                 }
                 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                 //initialize
                 item->handleGeometryChanged(m_rect);
                 m_axisItems.insert(axis, item);
             }
             void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
             {
                 Axis* item = m_axisItems.take(axis);
                 Q_ASSERT(item);
                 if(m_animator) m_animator->removeAnimation(item);
                 delete item;
             }
             void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain)
             {
             	Chart *item = 0 ;
                 switch(series->type())
                 {
                 case QSeries::SeriesTypeLine: {
                     QLineSeries* lineSeries = static_cast<QLineSeries*>(series);
                     LineChartItem* line = new LineChartItem(lineSeries,this);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                     	m_animator->addAnimation(line);
                     }
                     m_chartTheme->decorate(lineSeries, m_dataset->seriesIndex(series),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),line,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),line,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item = line;
                     break;
                 }
                 case QSeries::SeriesTypeArea: {
                     QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
                     AreaChartItem* area = new AreaChartItem(areaSeries,this);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         m_animator->addAnimation(area->upperLineItem());
                         if(areaSeries->lowerSeries())  m_animator->addAnimation(area->lowerLineItem());
                     }
                     m_chartTheme->decorate(areaSeries, m_dataset->seriesIndex(series),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),area,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),area,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=area;
                     break;
                 }
                 case QSeries::SeriesTypeBar: {
                     QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                     BarChartItem* bar = new BarChartItem(barSeries,this);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         m_animator->addAnimation(bar);
                     }
                     m_chartTheme->decorate(barSeries, m_dataset->seriesIndex(barSeries),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     break;
                 }
                 case QSeries::SeriesTypeStackedBar: {
                     QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                     StackedBarChartItem* bar = new StackedBarChartItem(stackedBarSeries,this);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         m_animator->addAnimation(bar);
                     }
                     m_chartTheme->decorate(stackedBarSeries, m_dataset->seriesIndex(stackedBarSeries),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     break;
                 }
                 case QSeries::SeriesTypePercentBar: {
                     QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                     PercentBarChartItem* bar = new PercentBarChartItem(percentBarSeries,this);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         m_animator->addAnimation(bar);
                     }
                     m_chartTheme->decorate(percentBarSeries, m_dataset->seriesIndex(percentBarSeries),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     break;
                 }
                 case QSeries::SeriesTypeScatter: {
                 	QScatterSeries *scatterSeries = static_cast<QScatterSeries *>(series);
                         ScatterChartItem *scatter = new ScatterChartItem(scatterSeries,this);
                         if(m_options.testFlag(QChart::SeriesAnimations)) {
                             m_animator->addAnimation(scatter);
                         }
                         m_chartTheme->decorate(scatterSeries, m_dataset->seriesIndex(series),m_themeForce);
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),scatter,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),scatter,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                         item = scatter;
                         break;
             	}
                 case QSeries::SeriesTypePie: {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                     PieChartItem* pie = new PieChartItem(pieSeries, this);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         m_animator->addAnimation(pie);
                     }
                     m_chartTheme->decorate(pieSeries, m_dataset->seriesIndex(series),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),pie,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),pie,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     // Hide all from background when there is only piechart
                     // TODO: refactor this ugly code... should be one setting for this
                     if (m_chartItems.count() == 0) {
                         m_chart->axisX()->hide();
                         m_chart->axisY()->hide();
                     }
                     item=pie;
                     break;
                 }
                 case QSeries::SeriesTypeSpline: {
                     QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series);
                     SplineChartItem* spline  = new SplineChartItem(splineSeries, this);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         m_animator->addAnimation(spline);
                     }
                     m_chartTheme->decorate(splineSeries, m_dataset->seriesIndex(series),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),spline,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),spline,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=spline;
                     break;
                 }
                 default: {
                     qDebug()<< "Series type" << series->type() << "not implemented.";
                     break;
                 }
                 }
                 //initialize
                 item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
                 if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
                 m_chartItems.insert(series,item);
             }
             void ChartPresenter::handleSeriesRemoved(QSeries* series)
             {
                 Chart* item = m_chartItems.take(series);
                 Q_ASSERT(item);
                 if(m_animator) {
                     //small hack to handle area animations
                     if(series->type()==QSeries::SeriesTypeArea){
                          QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
                          AreaChartItem* area = static_cast<AreaChartItem*>(item);
                          m_animator->removeAnimation(area->upperLineItem());
                          if(areaSeries->lowerSeries())  m_animator->removeAnimation(area->lowerLineItem());
                     }else
                     m_animator->removeAnimation(item);
                 }
                 delete item;
             }
             void ChartPresenter::setTheme(QChart::ChartTheme theme,bool force)
             {
             	if(m_chartTheme && m_chartTheme->id() == theme) return;
                 delete m_chartTheme;
                 m_themeForce = force;
                 m_chartTheme = ChartTheme::createTheme(theme);
                 m_chartTheme->decorate(m_chart,m_themeForce);
                 m_chartTheme->decorate(m_chart->legend(),m_themeForce);
                 resetAllElements();
             }
             QChart::ChartTheme ChartPresenter::theme()
             {
                 return m_chartTheme->id();
             }
             void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
             {
                 if(m_options!=options) {
                     m_options=options;
                     if(m_options!=QChart::NoAnimation && !m_animator) {
                         m_animator= new ChartAnimator(this);
                     }
                     resetAllElements();
                 }
             }
             void ChartPresenter::resetAllElements()
             {
                  QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
                  QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
                  foreach(QChartAxis* axis, axisList) {
                      handleAxisRemoved(axis);
                      handleAxisAdded(axis,m_dataset->domain(axis));
                  }
                  foreach(QSeries* series, seriesList) {
                      handleSeriesRemoved(series);
                      handleSeriesAdded(series,m_dataset->domain(series));
                  }
             }
             void ChartPresenter::zoomIn()
             {
             	QRectF rect = geometry();
             	rect.setWidth(rect.width()/2);
             	rect.setHeight(rect.height()/2);
             	rect.moveCenter(geometry().center());
             	zoomIn(rect);
             }
             void ChartPresenter::zoomIn(const QRectF& rect)
             {
             	QRectF r = rect.normalized();
             	r.translate(-m_padding, -m_padding);
             	if(m_animator) {
             		QPointF point(r.center().x()/geometry().width(),r.center().y()/geometry().height());
             		m_animator->setState(ChartAnimator::ZoomInState,point);
             	}
             	m_dataset->zoomInDomain(r,geometry().size());
             	if(m_animator) {
             		m_animator->setState(ChartAnimator::ShowState);
             	}
             }
             void ChartPresenter::zoomOut()
             {
             	if(m_animator)
             	{
             		m_animator->setState(ChartAnimator::ZoomOutState);
             	}
             	QSizeF size = geometry().size();
             	QRectF rect = geometry();
             	rect.translate(-m_padding, -m_padding);
             	m_dataset->zoomOutDomain(rect.adjusted(size.width()/4,size.height()/4,-size.width()/4,-size.height()/4),size);
                 //m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());
             	if(m_animator){
             			m_animator->setState(ChartAnimator::ShowState);
             	}
             }
             void ChartPresenter::scroll(int dx,int dy)
             {
             	if(m_animator){
             		if(dx<0) m_animator->setState(ChartAnimator::ScrollLeftState,QPointF());
             		if(dx>0) m_animator->setState(ChartAnimator::ScrollRightState,QPointF());
             		if(dy<0) m_animator->setState(ChartAnimator::ScrollUpState,QPointF());
             		if(dy>0) m_animator->setState(ChartAnimator::ScrollDownState,QPointF());
             	}
             	m_dataset->scrollDomain(dx,dy,geometry().size());
                 if(m_animator){
             		m_animator->setState(ChartAnimator::ShowState);
             	}
             }
             QChart::AnimationOptions ChartPresenter::animationOptions() const
             {
                 return m_options;
             }
             #include "moc_chartpresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.cpp +11 -9

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qchart.h"
             #include "qchart_p.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              \enum QChart::ChartTheme
              This enum describes the theme used by the chart.
              \value ChartThemeDefault Follows the GUI style of the Operating System
              \value ChartThemeLight
              \value ChartThemeBlueCerulean
              \value ChartThemeDark
              \value ChartThemeBrownSand
              \value ChartThemeBlueNcs
              \value ChartThemeHighContrast
              \value ChartThemeBlueIcy
              \value ChartThemeCount Not really a theme; the total count of themes.
              */
             /*!
              \enum QChart::AnimationOption
              For enabling/disabling animations. Defaults to NoAnimation.
              \value NoAnimation
              \value GridAxisAnimations
              \value SeriesAnimations
              \value AllAnimations
              */
             /*!
              \class QChart
              \brief QtCommercial chart API.
              QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
              representation of different types of QChartSeries and other chart related objects like
              QChartAxis and QChartLegend. If you simply want to show a chart in a layout, you can use the
              convenience class QChartView instead of QChart.
              \sa QChartView
              */
             /*!
              Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
              */
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
             d_ptr(new QChartPrivate(this))
             {
                 //setMinimumSize(200,200);
                 d_ptr->m_legend = new QLegend(this);
                 d_ptr->m_dataset = new ChartDataSet(this);
                 d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
                 int padding = d_ptr->m_presenter->padding();
                 setMinimumSize(3*padding,3*padding);
                 connect(d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),d_ptr->m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 connect(d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries*)),d_ptr->m_legend,SLOT(handleSeriesRemoved(QSeries*)));
             }
             /*!
              Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
              */
             QChart::~QChart()
             {
                 //delete first presenter , since this is a root of all the graphical items
                 delete d_ptr->m_presenter;
                 d_ptr->m_presenter=0;
             }
             /*!
              Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
              If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
              the y axis).
              */
             void QChart::addSeries(QSeries* series, QChartAxis* axisY)
             {
                 d_ptr->m_dataset->addSeries(series, axisY);
             }
             /*!
              Removes the \a series specified in a perameter from the QChartView.
              It releses its ownership of the specified QChartSeries object.
              It does not delete the pointed QChartSeries data object
              \sa addSeries(), removeAllSeries()
              */
             void QChart::removeSeries(QSeries* series)
             {
                 d_ptr->m_dataset->removeSeries(series);
             }
             /*!
              Removes all the QChartSeries that have been added to the QChartView
              It also deletes the pointed QChartSeries data objects
              \sa addSeries(), removeSeries()
              */
             void QChart::removeAllSeries()
             {
                 d_ptr->m_dataset->removeAllSeries();
             }
             /*!
              Sets the \a brush that is used for painting the background of the chart area.
              */
             void QChart::setBackgroundBrush(const QBrush& brush)
             {
                 d_ptr->createChartBackgroundItem();
                 d_ptr->m_backgroundItem->setBrush(brush);
                 d_ptr->m_backgroundItem->update();
             }
             QBrush QChart::backgroundBrush() const
             {
                 if (!d_ptr->m_backgroundItem) return QBrush();
                 return (d_ptr->m_backgroundItem)->brush();
             }
             /*!
              Sets the \a pen that is used for painting the background of the chart area.
              */
             void QChart::setBackgroundPen(const QPen& pen)
             {
                 d_ptr->createChartBackgroundItem();
                 d_ptr->m_backgroundItem->setPen(pen);
                 d_ptr->m_backgroundItem->update();
             }
             QPen QChart::backgroundPen() const
             {
                 if (!d_ptr->m_backgroundItem) return QPen();
                 return d_ptr->m_backgroundItem->pen();
             }
             /*!
              Sets the chart \a title. The description text that is drawn above the chart.
              */
             void QChart::setTitle(const QString& title)
             {
                 d_ptr->createChartTitleItem();
                 d_ptr->m_titleItem->setText(title);
                 d_ptr->updateLayout();
             }
             /*!
              Returns the chart title. The description text that is drawn above the chart.
              */
             QString QChart::title() const
             {
                 if (d_ptr->m_titleItem)
                 return d_ptr->m_titleItem->text();
                 else
                 return QString();
             }
             /*!
              Sets the \a font that is used for rendering the description text that is rendered above the chart.
              */
             void QChart::setTitleFont(const QFont& font)
             {
                 d_ptr->createChartTitleItem();
                 d_ptr->m_titleItem->setFont(font);
                 d_ptr->updateLayout();
             }
             /*!
              Sets the \a brush used for rendering the title text.
              */
             void QChart::setTitleBrush(const QBrush &brush)
             {
                 d_ptr->createChartTitleItem();
                 d_ptr->m_titleItem->setBrush(brush);
                 d_ptr->updateLayout();
             }
             /*!
              Returns the brush used for rendering the title text.
              */
             QBrush QChart::titleBrush() const
             {
                 if (!d_ptr->m_titleItem) return QBrush();
                 return d_ptr->m_titleItem->brush();
             }
             /*!
              Sets the \a theme used by the chart for rendering the graphical representation of the data
              \sa ChartTheme, chartTheme()
              */
             void QChart::setTheme(QChart::ChartTheme theme)
             {
                 d_ptr->m_presenter->setTheme(theme);
             }
             /*!
              Returns the theme enum used by the chart.
              \sa ChartTheme, setChartTheme()
              */
             QChart::ChartTheme QChart::theme() const
             {
                 return d_ptr->m_presenter->theme();
             }
             /*!
              Zooms in the view by a factor of 2
              */
             void QChart::zoomIn()
             {
                 d_ptr->m_presenter->zoomIn();
             }
             /*!
              Zooms in the view to a maximum level at which \a rect is still fully visible.
              */
             void QChart::zoomIn(const QRectF& rect)
             {
                 if (!rect.isValid()) return;
                 d_ptr->m_presenter->zoomIn(rect);
             }
             /*!
              Restores the view zoom level to the previous one.
              */
             void QChart::zoomOut()
             {
                 d_ptr->m_presenter->zoomOut();
             }
             /*!
              Returns the pointer to the x axis object of the chart
              */
             QChartAxis* QChart::axisX() const
             {
                 return d_ptr->m_dataset->axisX();
             }
             /*!
              Returns the pointer to the y axis object of the chart
              */
             QChartAxis* QChart::axisY() const
             {
                 return d_ptr->m_dataset->axisY();
             }
             /*!
              Returns the legend object of the chart. Ownership stays in chart.
              */
             QLegend* QChart::legend() const
             {
                 return d_ptr->m_legend;
             }
             /*!
              Resizes and updates the chart area using the \a event data
              */
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 d_ptr->m_rect = QRectF(QPoint(0,0),event->newSize());
                 d_ptr->updateLayout();
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             /*!
              Sets animation \a options for the chart
              */
             void QChart::setAnimationOptions(AnimationOptions options)
             {
                 d_ptr->m_presenter->setAnimationOptions(options);
             }
             /*!
              Returns animation options for the chart
              */
             QChart::AnimationOptions QChart::animationOptions() const
             {
                 return d_ptr->m_presenter->animationOptions();
             }
             void QChart::scrollLeft()
             {
                 d_ptr->m_presenter->scroll(-d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollRight()
             {
                 d_ptr->m_presenter->scroll(d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollUp()
             {
                 d_ptr->m_presenter->scroll(0,d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::scrollDown()
             {
                 d_ptr->m_presenter->scroll(0,-d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::setBackgroundVisible(bool visible)
             {
                 d_ptr->createChartBackgroundItem();
                 d_ptr->m_backgroundItem->setVisible(visible);
             }
             bool QChart::isBackgroundVisible() const
             {
                 if (!d_ptr->m_backgroundItem) return false;
                 return d_ptr->m_backgroundItem->isVisible();
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QChartPrivate::QChartPrivate(QChart *parent):
             q_ptr(parent),
             m_backgroundItem(0),
             m_titleItem(0),
             m_legend(0),
             m_dataset(0),
             m_presenter(0)
             {
             }
             QChartPrivate::~QChartPrivate()
             {
             }
             void QChartPrivate::createChartBackgroundItem()
             {
                 if (!m_backgroundItem) {
                     m_backgroundItem = new ChartBackground(q_ptr);
                     m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChartPrivate::createChartTitleItem()
             {
                 if (!m_titleItem) {
                     m_titleItem = new QGraphicsSimpleTextItem(q_ptr);
                     m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChartPrivate::updateLegendLayout()
             {
                 int padding = m_presenter->padding();
                 QRectF plotRect = m_rect.adjusted(padding,padding,-padding,-padding);
                 QRectF legendRect;
                 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: {
                         legendRect = plotRect;
                         break;
                     }
                 }
                 m_legend->setMaximumSize(legendRect.size());
                 qreal width = legendRect.width() - m_legend->size().width();
                 qreal height = legendRect.height() - m_legend->size().height();
                 QPointF pos = legendRect.topLeft();
                 if (width > 0) {
                     pos.setX(pos.x() + width/2);
                 }
                 if (height > 0) {
                     pos.setY(pos.y() + height/2);
                 }
+                qDebug() << "lenged topleft:" << pos;
                 m_legend->setPos(pos);
             }
             void QChartPrivate::updateLayout()
             {
                 if (!m_rect.isValid()) return;
                 int padding = m_presenter->padding();
                 int backgroundPadding = m_presenter->backgroundPadding();
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + padding/2);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
                     m_backgroundItem->setRect(m_rect.adjusted(backgroundPadding,backgroundPadding, -backgroundPadding, -backgroundPadding));
                 }
                 // recalculate legend position
                 if (m_legend) {
-                    if (m_legend->parentObject() == q_ptr) {
+                    if ((m_legend->attachedToChart()) && (m_legend->parentObject() == q_ptr)) {
                         updateLegendLayout();
                     }
                 }
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.cpp +36 -11

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qlegend.h"
             #include "qchart_p.h"
             #include "qseries.h"
             #include "legendmarker_p.h"
             #include "legendscrollbutton_p.h"
             #include "qxyseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qscatterseries.h"
             #include "qsplineseries.h"
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qbarset.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QPen>
             #include <QGraphicsSceneEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QLegend
                 \brief part of QtCommercial chart API.
                 QLegend is a graphical object, whics displays legend of the chart. Legend state is updated by QChart, when
                 series have been changed. By default, legend is drawn by QChart, but user can set a new parent to legend and
                 handle the drawing manually.
                 User isn't supposed to create or delete legend objects, but can reference it via QChart class.
                 \mainclass
                 \sa QChart, QSeries
             */
             /*!
                 \enum QLegend::Layout
                 This enum describes the possible position for legend inside chart.
                 \value LayoutTop
                 \value LayoutBottom
                 \value LayoutLeft
                 \value LayoutRight
             */
             /*!
                 \fn void QLegend::clicked(QSeries* series, Qt::MouseButton button)
                 \brief Notifies when series has been clicked on legend \a series \a button
             */
             /*!
                 \fn void QLegend::clicked(QBarSet* barset, Qt::MouseButton button)
                 \brief Notifies when barset has been clicked on legend \a barset \a button
             */
             /*!
                 \fn void QLegend::clicked(QPieSlice* slice, Qt::MouseButton button)
                 \brief Notifies when pie slice has been clicked on legend \a slice \a button
             */
             /*!
                 Constructs the legend object and sets the parent to \a parent
             */
             QLegend::QLegend(QChart *chart):QGraphicsWidget(chart),
                 m_margin(5),
                 m_pos(0,0),
                 m_minimumSize(50,20),                // TODO: magic numbers
                 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);
                 m_scrollButtonUp = new LegendScrollButton(LegendScrollButton::ScrollButtonIdUp, this);
                 m_scrollButtonDown = new LegendScrollButton(LegendScrollButton::ScrollButtonIdDown, this);
                 setZValue(ChartPresenter::LegendZValue);
             }
             /*!
                 Paints the legend to given \a painter. Paremeters \a option and \a widget arent used.
             */
             void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 painter->setOpacity(opacity());
                 painter->setPen(m_pen);
                 painter->setBrush(m_brush);
             //    painter->drawRect(boundingRect());
             }
             /*!
                 Bounding rect of legend.
             */
             QRectF QLegend::boundingRect() const
             {
                 return QRectF(m_pos,m_size);
             }
             /*!
                 Sets the \a brush of legend. Brush affects the background of legend.
             */
             void QLegend::setBrush(const QBrush &brush)
             {
                 if (m_brush != brush) {
                     m_brush = brush;
                     update();
                 }
             }
             /*!
                 Returns the brush used by legend.
             */
             QBrush QLegend::brush() const
             {
                 return m_brush;
             }
             /*!
                 Sets the \a pen of legend. Pen affects the legend borders.
             */
             void QLegend::setPen(const QPen &pen)
             {
                 if (m_pen != pen) {
                     m_pen = pen;
                     update();
                 }
             }
             /*!
                 Returns the pen used by legend
             */
             QPen QLegend::pen() const
             {
                 return m_pen;
             }
             /*!
                 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;
             }
             /*!
                 Returns the maximum size of legend.
             */
             QSizeF QLegend::maximumSize() const
             {
                 return m_maximumSize;
             }
             /*!
                 Sets the maximum \a size for legend. The legend can't grow bigger than this size. If there are
                 more series than legend can fit to this size, scroll buttons are displayed.
             */
             void QLegend::setMaximumSize(const QSizeF size)
             {
                 m_maximumSize = size;
                 updateLayout();
             }
             /*!
                 Returns the current size of legend.
             */
             QSizeF QLegend::size() const
             {
                 return m_size;
             }
             /*!
                 Sets the \a size of legend. If size is bigger than maximum size of legend, the legend is resized to the maximum size.
                 \sa setMmaximumSize()
             */
             void QLegend::setSize(const QSizeF size)
             {
                 m_size = size;
                 if (m_size.width() > m_maximumSize.width()) {
                     m_size.setWidth(m_maximumSize.width());
                 }
                 if (m_size.height() > m_maximumSize.height()) {
                     m_size.setHeight(m_maximumSize.height());
                 }
             }
             /*!
                 Sets position of legend to \a pos
             */
             void QLegend::setPos(const QPointF &pos)
             {
                 m_pos = pos;
                 updateLayout();
             }
             /*!
                 \internal \a series \a domain Should be called when series is added to chart.
             */
             void QLegend::handleSeriesAdded(QSeries *series, Domain *domain)
             {
                 Q_UNUSED(domain)
                 switch (series->type())
                 {
                 case QSeries::SeriesTypeLine: {
                     QLineSeries *lineSeries = static_cast<QLineSeries *>(series);
                     appendMarkers(lineSeries);
                     break;
                 }
                 case QSeries::SeriesTypeArea: {
                     QAreaSeries *areaSeries = static_cast<QAreaSeries *>(series);
                     appendMarkers(areaSeries);
                     break;
                 }
                 case QSeries::SeriesTypeBar: {
                     QBarSeries *barSeries = static_cast<QBarSeries *>(series);
                     appendMarkers(barSeries);
                     break;
                 }
                 case QSeries::SeriesTypeStackedBar: {
                     QStackedBarSeries *stackedBarSeries = static_cast<QStackedBarSeries *>(series);
                     appendMarkers(stackedBarSeries);
                     break;
                 }
                 case QSeries::SeriesTypePercentBar: {
                     QPercentBarSeries *percentBarSeries = static_cast<QPercentBarSeries *>(series);
                     appendMarkers(percentBarSeries);
                     break;
                 }
                 case QSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = static_cast<QScatterSeries *>(series);
                     appendMarkers(scatterSeries);
                     break;
                 }
                 case QSeries::SeriesTypePie: {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                     appendMarkers(pieSeries);
                     connect(pieSeries,SIGNAL(added(QList<QPieSlice*>)),this,SLOT(handleAdded(QList<QPieSlice*>)));
                     break;
                 }
                 case QSeries::SeriesTypeSpline: {
                     QSplineSeries *splineSeries = static_cast<QSplineSeries *>(series);
                     appendMarkers(splineSeries);
                     break;
                 }
                 default: {
                     qWarning()<< "QLegend::handleSeriesAdded" << series->type() << "unknown series type.";
                     break;
                 }
                 }
                 updateLayout();
             }
             /*!
                 \internal \a series Should be called when series is removed from chart.
             */
             void QLegend::handleSeriesRemoved(QSeries *series)
             {
                 switch (series->type())
                 {
                 case QSeries::SeriesTypeArea: {
                     QAreaSeries *areaSeries = static_cast<QAreaSeries *>(series);
                     deleteMarkers(areaSeries);
                     break;
                 }
                 case QSeries::SeriesTypePie: {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                     disconnect(pieSeries, SIGNAL(added(QList<QPieSlice *>)), this, SLOT(handleAdded(QList<QPieSlice *>)));
                     deleteMarkers(series);
                     break;
                 }
                 default: {
                     // All other types
                     deleteMarkers(series);
                     break;
                 }
                 }
                 updateLayout();
             }
             /*!
                 \internal \a slices Should be called when slices are added to pie chart.
             */
             void QLegend::handleAdded(QList<QPieSlice *> slices)
             {
                 QPieSeries* series = static_cast<QPieSeries *> (sender());
                 foreach(QPieSlice* s, slices) {
                     LegendMarker* marker = new LegendMarker(series, s, this);
                     marker->setName(s->label());
                     marker->setBrush(s->brush());
                     connect(marker, SIGNAL(clicked(QPieSlice*,Qt::MouseButton)),
                             this, SIGNAL(clicked(QPieSlice*,Qt::MouseButton)));
                     connect(s, SIGNAL(changed()), marker, SLOT(changed()));
                     connect(s, SIGNAL(destroyed()), marker, SLOT(deleteLater()));
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers.append(marker);
                     childItems().append(marker);
                 }
                 updateLayout();
             }
             /*!
                 \internal \a slices Should be called when slices are removed from pie chart. Currently unused,
                 because removed slices are also deleted and we listen destroyed signal
             */
             void QLegend::handleRemoved(QList<QPieSlice *> slices)
             {
                 Q_UNUSED(slices)
             }
             /*!
                 \internal Notifies legend that some marker has been removed. Sent by legend markers when destroyed
             */
             void QLegend::handleMarkerDestroyed()
             {
                 LegendMarker* m = static_cast<LegendMarker *> (sender());
                 m_markers.removeOne(m);
                 updateLayout();
             }
             /*!
                 \internal \a event Handles clicked signals from scroll buttons
             */
             void QLegend::scrollButtonClicked(LegendScrollButton *scrollButton)
             {
                  Q_ASSERT(scrollButton);
                 switch (scrollButton->id()) {
                 case LegendScrollButton::ScrollButtonIdLeft:
                 case LegendScrollButton::ScrollButtonIdUp: {
                     // Lower limit is same in these cases
                     mFirstMarker--;
                     checkFirstMarkerBounds();
                     break;
                 }
                 case LegendScrollButton::ScrollButtonIdRight:
                 case LegendScrollButton::ScrollButtonIdDown: {
                     mFirstMarker++;
                     checkFirstMarkerBounds();
                     break;
                 }
                 default: {
                     break;
                 }
                 }
                 updateLayout();
             }
             /*!
+                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)
             {
                 LegendMarker* marker = new LegendMarker(series,this);
                 marker->setName(series->name());
                 marker->setPen(series->pen());
                 marker->setBrush(series->brush());
                 connect(marker, SIGNAL(clicked(QSeries *, Qt::MouseButton)), this, SIGNAL(clicked(QSeries *, Qt::MouseButton)));
                 connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 connect(series,SIGNAL(updated()),marker,SLOT(changed()));
                 m_markers.append(marker);
                 childItems().append(marker);
             }
             /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QXYSeries* series)
             {
                 LegendMarker* marker = new LegendMarker(series,this);
                 marker->setName(series->name());
                 marker->setPen(series->pen());
                 marker->setBrush(series->brush());
                 connect(marker, SIGNAL(clicked(QSeries *, Qt::MouseButton)), this, SIGNAL(clicked(QSeries *, Qt::MouseButton)));
                 connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 connect(series,SIGNAL(updated()),marker,SLOT(changed()));
                 m_markers.append(marker);
                 childItems().append(marker);
             }
             /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QBarSeries *series)
             {
                 foreach(QBarSet* set, series->barSets()) {
                     LegendMarker* marker = new LegendMarker(series, set, this);
                     marker->setName(set->name());
                     marker->setPen(set->pen());
                     marker->setBrush(set->brush());
                     connect(marker, SIGNAL(clicked(QBarSet *, Qt::MouseButton)),
                             this, SIGNAL(clicked(QBarSet *, Qt::MouseButton)));
                     connect(set, SIGNAL(valueChanged()), marker, SLOT(changed()));
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers.append(marker);
                     childItems().append(marker);
                 }
             }
             /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QPieSeries *series)
             {
                 foreach(QPieSlice* slice, series->slices()) {
                     LegendMarker* marker = new LegendMarker(series, slice, this);
                     marker->setName(slice->label());
                     marker->setPen(slice->pen());
                     marker->setBrush(slice->brush());
                     connect(marker, SIGNAL(clicked(QPieSlice *, Qt::MouseButton)),
                             this, SIGNAL(clicked(QPieSlice *, Qt::MouseButton)));
                     connect(slice, SIGNAL(changed()), marker, SLOT(changed()));
                     connect(slice, SIGNAL(destroyed()), marker, SLOT(deleteLater()));
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers.append(marker);
                     childItems().append(marker);
                 }
             }
             /*!
                 \internal Deletes all markers that are created from \a series
             */
             void QLegend::deleteMarkers(QSeries *series)
             {
                 // Search all markers that belong to given series and delete them.
                 foreach (LegendMarker *m, m_markers) {
                     if (m->series() == series) {
                         m_markers.removeOne(m);
                         delete m;
                     }
                 }
             }
             /*!
                 \internal Updates layout of legend. Tries to fit as many markers as possible up to the maximum size of legend.
                 If items don't fit, sets the visibility of scroll buttons accordingly.
                 Causes legend to be resized.
             */
             void QLegend::updateLayout()
             {
                 // Calculate layout for markers and text
                 if (m_markers.count() <= 0) {
                     // Nothing to do
                     return;
                 }
                 // Find out widest item.
                 QSizeF markerMaxSize = maximumMarkerSize();
                 checkFirstMarkerBounds();
                 // Use max height as scroll button size
                 rescaleScrollButtons(QSize(markerMaxSize.height() ,markerMaxSize.height()));
                 qreal totalWidth = 0;
                 qreal totalHeight = 0;
                 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;
                     qreal y = m_pos.y() + m_margin;
                     int column = 0;
                     int maxColumns = 1;
                     qreal scrollButtonWidth = 0;
                     // Set correct visibility for scroll scrollbuttons
                     if (scrollButtonsVisible()) {
                         m_scrollButtonLeft->setVisible(true);
                         m_scrollButtonRight->setVisible(true);
                         // scrollbuttons visible, so add their width to total width
                         totalWidth += (m_scrollButtonLeft->boundingRect().width() + m_margin) * 2;
                         scrollButtonWidth = m_scrollButtonLeft->boundingRect().width() + m_margin;
                         // start position changes by scrollbutton width
                         x += scrollButtonWidth;
                     } else {
                         m_scrollButtonLeft->setVisible(false);
                         m_scrollButtonRight->setVisible(false);
                     }
                     m_scrollButtonUp->setVisible(false);
                     m_scrollButtonDown->setVisible(false);
                     for (int i=0; i < m_markers.count(); i++) {
                         LegendMarker *m = m_markers.at(i);
                         if (i < mFirstMarker) {
                             // Markers before first are not visible.
                             m->setVisible(false);
                         } else {
                             if ((x + xStep + scrollButtonWidth + m_margin) > (m_pos.x() + m_maximumSize.width())) {
                                 // This marker would go outside legend rect.
                                 m->setVisible(false);
                             } else {
                                 // This marker is ok
                                 m->setVisible(true);
                                 m->setPos(x, y);
                                 x += xStep;
                                 column++;
                             }
                         }
                         maxColumns = column;
                     }
                     m_scrollButtonLeft->setPos(m_pos.x() + m_margin, y);
                     m_scrollButtonRight->setPos(x + m_margin, y);
                     totalWidth += maxColumns * markerMaxSize.width() + m_margin * 2;
                     totalHeight = markerMaxSize.height() + m_margin * 2;
                     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;
                     int row = 1;
                     int maxRows = 1;
                     qreal scrollButtonHeight = 0;
                     // Set correct visibility for scroll scrollbuttons
                     if (scrollButtonsVisible()) {
                         m_scrollButtonUp->setVisible(true);
                         m_scrollButtonDown->setVisible(true);
                         totalHeight += (m_scrollButtonUp->boundingRect().height() + m_margin) * 2;   // scrollbuttons visible, so add their height to total height
                         scrollButtonHeight = m_scrollButtonUp->boundingRect().height();
                         y += scrollButtonHeight + m_margin;                                         // start position changes by scrollbutton height
                     } else {
                         m_scrollButtonUp->setVisible(false);
                         m_scrollButtonDown->setVisible(false);
                     }
                     m_scrollButtonLeft->setVisible(false);
                     m_scrollButtonRight->setVisible(false);
                     for (int i=0; i < m_markers.count(); i++) {
                         LegendMarker* m = m_markers.at(i);
                         if (i < mFirstMarker) {
                             // Markers before first are not visible.
                             m->setVisible(false);
                         } else {
                             if ((y + yStep + scrollButtonHeight) > (m_pos.y() + m_maximumSize.height())) {
                                 // This marker would go outside legend rect.
                                 m->setVisible(false);
                             } else {
                                 // This marker is ok
                                 m->setVisible(true);
                                 m->setPos(x, y);
                                 y += yStep;
                                 row++;
                             }
                         }
                         maxRows = row;
                     }
                     m_scrollButtonUp->setPos(m_pos.x() + m_margin, m_pos.y() + m_margin);
                     m_scrollButtonDown->setPos(m_pos.x() + m_margin, y + m_margin);
                     totalWidth += markerMaxSize.width() + m_margin * 2;
                     totalHeight = maxRows * markerMaxSize.height() + m_margin * 4 + scrollButtonHeight; // TODO: check this
                     break;
                 }
                 default: {
                     break;
                 }
                 }
                 m_size.setWidth(totalWidth);
                 m_size.setHeight(totalHeight);
                 update();
             }
             /*!
                 \internal Sets the size of scroll buttons to \a size
             */
             void QLegend::rescaleScrollButtons(const QSize &size)
             {
                 QPolygonF left;
                 left << QPointF(size.width(), 0) << QPointF(0, size.height() / 2) << QPointF(size.width(), size.height());
                 QPolygonF right;
                 right << QPointF(0, 0) << QPointF(size.width(), size.height() / 2) << QPointF(0, size.height());
                 QPolygonF up;
                 up << QPointF(0, size.height()) << QPointF(size.width() / 2,0) << QPointF(size.width(), size.height());
                 QPolygonF down;
                 down << QPointF(0, 0) << QPointF(size.width() / 2, size.height()) << QPointF(size.width(), 0);
                 m_scrollButtonLeft->setPolygon(left);
                 m_scrollButtonRight->setPolygon(right);
                 m_scrollButtonUp->setPolygon(up);
                 m_scrollButtonDown->setPolygon(down);
             }
             /*!
                 \internal Finds out maximum size of single marker. Marker sizes depend on series names.
             */
             QSizeF QLegend::maximumMarkerSize()
             {
                 QSizeF max(0,0);
                 foreach (LegendMarker* m, m_markers) {
                     if (m->boundingRect().width() > max.width())
                         max.setWidth(m->boundingRect().width());
                     if (m->boundingRect().height() > max.height())
                         max.setHeight(m->boundingRect().height());
                 }
                 return max;
             }
             /*!
                 \internal Checks that first marker is in acceptable bounds. Bounds range from 0 to (maximum number of markers - visible markers)
                 If scrollbuttons are visible, they affect the number of visible markers.
             */
             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()) {
                         max = (m_maximumSize.height() - m_scrollButtonLeft->boundingRect().height() * 2 - m_margin * 4) / maximumMarkerSize().height();
                     } else {
                         max = m_maximumSize.height() / maximumMarkerSize().height();
                     }
                     if (mFirstMarker > m_markers.count() - max)
                         mFirstMarker = m_markers.count() - max;
                 } else {
                     // Bounds limited by width
                     int max;
                     if (scrollButtonsVisible()) {
                         max = (m_maximumSize.width() - m_scrollButtonLeft->boundingRect().width() * 2 - m_margin*4) / maximumMarkerSize().width();
                     } else {
                         max = m_maximumSize.width() / maximumMarkerSize().width();
                     }
                     if (mFirstMarker > m_markers.count() - max)
                         mFirstMarker = m_markers.count() - max;
                 }
                 if (mFirstMarker < 0)
                     mFirstMarker = 0;
             }
             /*!
                 \internal Helper function. Visibility of scroll buttons isn't quite obvious, so helper function clarifies the logic.
             */
             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());
                 }
                 return (maximumMarkerSize().height() * m_markers.count() + m_margin * 2 > m_maximumSize.height());
             }
             #include "moc_qlegend.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.h +14 -9

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QLEGEND_H
             #define QLEGEND_H
             #include <QChartGlobal>
             #include <QGraphicsWidget>
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Domain;
             class LegendMarker;
             class QPieSlice;
             class QXYSeries;
             class QBarSet;
             class QBarSeries;
             class QPieSeries;
             class QAreaSeries;
             class LegendScrollButton;
             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);
             public:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QRectF boundingRect() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 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);
                 QSizeF size() const;
                 void setSize(const QSizeF size);
                 void setPos(const QPointF &pos);
                 void scrollButtonClicked(LegendScrollButton *scrollButton);
+                void detachFromChart();
+                void attachToChart();
+                bool attachedToChart();
             Q_SIGNALS:
                 // for interactions.
                 void clicked(QSeries *series, Qt::MouseButton button);
                 void clicked(QBarSet *barset, Qt::MouseButton button);
                 void clicked(QPieSlice *slice, Qt::MouseButton button);
             public Q_SLOTS:
                 // PIMPL --->
                 void handleSeriesAdded(QSeries *series, Domain *domain);
                 void handleSeriesRemoved(QSeries *series);
                 void handleAdded(QList<QPieSlice *> slices);
                 void handleRemoved(QList<QPieSlice *> slices);
                 void handleMarkerDestroyed();
                 // PIMPL <---
             private:
                 // PIMPL --->
                 void appendMarkers(QAreaSeries *series);
                 void appendMarkers(QXYSeries *series);
                 void appendMarkers(QBarSeries *series);
                 void appendMarkers(QPieSeries *series);
                 void deleteMarkers(QSeries *series);
                 void updateLayout();
                 void rescaleScrollButtons(const QSize &size);
                 QSizeF maximumMarkerSize();
                 void checkFirstMarkerBounds();
                 bool scrollButtonsVisible();
                 qreal m_margin;
                 QPointF m_pos;
                 QSizeF m_minimumSize;
                 QSizeF m_maximumSize;
                 QSizeF m_size;
                 QList<LegendMarker *> m_markers;
                 QBrush m_brush;
                 QPen m_pen;
-                QLegend::Layout m_alignment;
+                QLegend::Alignment m_alignment;
                 int mFirstMarker;
                 LegendScrollButton *m_scrollButtonLeft;
                 LegendScrollButton *m_scrollButtonRight;
                 LegendScrollButton *m_scrollButtonUp;
                 LegendScrollButton *m_scrollButtonDown;
+                bool m_attachedToChart;
                 friend class QChart;
                 // <--- PIMPL
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QLEGEND_H

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