HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r859:e87be6f0a1e1

Adds ScrolledQLegend...

Michal Klocek -

r859:e87be6f0a1e1

parent child

Context file:

r859:e87be6f0a1e1

Collapse all files

src/qchart.cpp +1 -1

             /****************************************************************************
             **
             ** 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 ChartThemeLight The default theme
              \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())
             {
-                d_ptr->m_legend = new QLegend(this);
+                d_ptr->m_legend = new  ScrolledQLegend(this);
                 d_ptr->m_dataset = new ChartDataSet(this);
                 d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
                 d_ptr->m_presenter->setTheme(QChart::ChartThemeLight, false);
                 //TODO:fix me setMinimumSize(d_ptr->m_padding.left() * 3, d_ptr->m_padding.top() * 3);
                 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->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setBrush(brush);
                 d_ptr->m_presenter->m_backgroundItem->update();
             }
             QBrush QChart::backgroundBrush() const
             {
                 if (!d_ptr->m_presenter->m_backgroundItem) return QBrush();
                 return (d_ptr->m_presenter->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->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setPen(pen);
                 d_ptr->m_presenter->m_backgroundItem->update();
             }
             QPen QChart::backgroundPen() const
             {
                 if (!d_ptr->m_presenter->m_backgroundItem) return QPen();
                 return d_ptr->m_presenter->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->m_presenter->createChartTitleItem();
                 d_ptr->m_presenter->m_titleItem->setText(title);
                 d_ptr->m_presenter->updateLayout();
             }
             /*!
              Returns the chart title. The description text that is drawn above the chart.
              */
             QString QChart::title() const
             {
                 if (d_ptr->m_presenter->m_titleItem)
                 return d_ptr->m_presenter->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->m_presenter->createChartTitleItem();
                 d_ptr->m_presenter->m_titleItem->setFont(font);
                 d_ptr->m_presenter->updateLayout();
             }
             /*!
              Sets the \a brush used for rendering the title text.
              */
             void QChart::setTitleBrush(const QBrush &brush)
             {
                 d_ptr->m_presenter->createChartTitleItem();
                 d_ptr->m_presenter->m_titleItem->setBrush(brush);
                 d_ptr->m_presenter->updateLayout();
             }
             /*!
              Returns the brush used for rendering the title text.
              */
             QBrush QChart::titleBrush() const
             {
                 if (!d_ptr->m_presenter->m_titleItem) return QBrush();
                 return d_ptr->m_presenter->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;
             }
             QRect QChart::margins() const
             {
                 return d_ptr->m_presenter->margins();
             }
             /*!
              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());
                 QGraphicsWidget::resizeEvent(event);
                 d_ptr->m_presenter->setGeometry(d_ptr->m_rect);
             }
             /*!
              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->chartGeometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollRight()
             {
                 d_ptr->m_presenter->scroll(d_ptr->m_presenter->chartGeometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollUp()
             {
                 d_ptr->m_presenter->scroll(0,d_ptr->m_presenter->chartGeometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::scrollDown()
             {
                 d_ptr->m_presenter->scroll(0,-d_ptr->m_presenter->chartGeometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::setBackgroundVisible(bool visible)
             {
                 d_ptr->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setVisible(visible);
             }
             bool QChart::isBackgroundVisible() const
             {
                 if (!d_ptr->m_presenter->m_backgroundItem) return false;
                 return d_ptr->m_presenter->m_backgroundItem->isVisible();
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QChartPrivate::QChartPrivate():
             m_legend(0),
             m_dataset(0),
             m_presenter(0)
             {
             }
             QChartPrivate::~QChartPrivate()
             {
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.cpp +1 -18

             /****************************************************************************
             **
             ** 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 "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 "scroller_p.h"
             #include <QPainter>
             #include <QPen>
             #include <QTimer>
             #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_offsetX(0),
                 m_offsetY(0),
                 m_brush(Qt::darkGray),              // TODO: default should come from theme
                 m_alignment(QLegend::AlignmentTop),
                 m_markers(new QGraphicsItemGroup(this)),
                 m_attachedToChart(true),
                 m_chart(chart),
                 m_minWidth(0),
                 m_minHeight(0),
                 m_width(0),
                 m_height(0),
                 m_visible(false),
-                m_dirty(false),
+                m_dirty(false)
-                m_scroller(new Scroller(this))
             {
                 setZValue(ChartPresenter::LegendZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
             }
             /*!
                 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)
             	if(!m_visible) return;
                 painter->setOpacity(opacity());
                 painter->setPen(m_pen);
                 painter->setBrush(m_brush);
                 painter->drawRect(boundingRect());
             }
             /*!
                 Bounding rect of legend.
             */
             QRectF QLegend::boundingRect() const
             {
                 return m_rect;
             }
             /*!
                 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::Alignments alignment)
             {
                 if(m_alignment!=alignment && m_attachedToChart) {
                     m_alignment = alignment;
                     updateLayout();
                 }
             }
             /*!
                 Returns the preferred layout for legend
             */
             QLegend::Alignments QLegend::alignment() const
             {
                 return m_alignment;
             }
             /*!
                 \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;
                 }
                 }
                // wait for all series added
                if(!m_dirty){
             	   QTimer::singleShot(0,this,SLOT(updateLayout()));
             	   m_dirty=true;
                }
             }
             /*!
                 \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* slice, slices) {
                     PieLegendMarker* marker = new PieLegendMarker(series,slice, this);
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers->addToGroup(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());
                 delete m;
                // 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::isAttachedToChart()
             {
                 return m_attachedToChart;
             }
             /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QAreaSeries* series)
             {
                 AreaLegendMarker* marker = new AreaLegendMarker(series,this);
                 connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 m_markers->addToGroup(marker);
             }
             /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QXYSeries* series)
             {
                 XYLegendMarker* marker = new XYLegendMarker(series,this);
                 connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 m_markers->addToGroup(marker);
             }
             /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QBarSeries *series)
             {
                 foreach(QBarSet* set, series->barSets()) {
                     BarLegendMarker* marker = new BarLegendMarker(series,set, this);
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers->addToGroup(marker);
                 }
             }
             /*!
                 \internal Helper function. Appends markers from \a series to legend.
             */
             void QLegend::appendMarkers(QPieSeries *series)
             {
                 foreach(QPieSlice* slice, series->slices()) {
                     PieLegendMarker* marker = new PieLegendMarker(series,slice, this);
                     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers->addToGroup(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.
                 QList<QGraphicsItem *> items = m_markers->childItems();
                 foreach (QGraphicsItem *m, items) {
                     LegendMarker *marker = static_cast<LegendMarker*>(m);
                     if (marker->series() == series) {
                         delete marker;
                     }
                 }
             }
             /*!
                 \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::setOffset(const QPointF& point)
             {
                 switch(m_alignment) {
                     case AlignmentTop:
                     case AlignmentBottom: {
                         if(m_width<=m_rect.width()) return;
                         if (point.x() != m_offsetX) {
                             m_offsetX = qBound(0.0, point.x(), m_width - m_rect.width());
                             m_markers->setPos(-m_offsetX,m_rect.top());
                         }
                         break;
                     }
                     case AlignmentLeft:
                     case AlignmentRight: {
                         if(m_height<=m_rect.height()) return;
                         if (point.y() != m_offsetY) {
                             m_offsetY = qBound(0.0, point.y(), m_height - m_rect.height());
                             m_markers->setPos(m_rect.left(),-m_offsetY);
                         }
                         break;
                     }
                 }
             }
             QPointF QLegend::offset() const
             {
                 return QPointF(m_offsetX,m_offsetY);
             }
             // this function runs first to set min max values
             void QLegend::updateLayout()
             {
             	m_dirty=false;
             	m_offsetX=0;
                 QList<QGraphicsItem *> items = m_markers->childItems();
                 if(items.isEmpty()) return;
                 m_minWidth=0;
                 m_minHeight=0;
                 switch(m_alignment) {
                     case AlignmentTop:
                     case AlignmentBottom: {
                         QPointF point = m_rect.topLeft();
                         m_width = 0;
                         foreach (QGraphicsItem *item, items) {
                             item->setPos(point.x(),m_rect.height()/2 -item->boundingRect().height()/2);
                             const QRectF& rect = item->boundingRect();
                             qreal w = rect.width();
                             m_minWidth=qMax(m_minWidth,w);
                             m_minHeight=qMax(m_minHeight,rect.height());
                             m_width+=w;
                             point.setX(point.x() + w);
                         }
                         if(m_width<m_rect.width()){
                             m_markers->setPos(m_rect.width()/2-m_width/2,m_rect.top());
                         }else{
                             m_markers->setPos(m_rect.topLeft());
                         }
                         m_height=m_minHeight;
                     }
                     break;
                     case AlignmentLeft:
                     case AlignmentRight:{
                         QPointF point = m_rect.topLeft();
                         m_height = 0;
                         foreach (QGraphicsItem *item, items) {
                             item->setPos(point);
                             const QRectF& rect = item->boundingRect();
                             qreal h = rect.height();
                             m_minWidth=qMax(m_minWidth,rect.width());
                             m_minHeight=qMax(m_minHeight,h);
                             m_height+=h;
                             point.setY(point.y() + h);
                         }
                         if(m_height<m_rect.height()){
                             m_markers->setPos(m_rect.left(),m_rect.height()/2-m_height/2);
                         }else{
                             m_markers->setPos(m_rect.topLeft());
                         }
                         m_width=m_minWidth;
                     }
                     break;
                 }
                 m_chart->d_ptr->m_presenter->updateLayout(); //TODO fixme;
             }
             void QLegend::setBackgroundVisible(bool visible)
             {
                 if(m_visible!=visible)
                 {
                 	m_visible=visible;
                 	update();
                 }
             }
             bool QLegend::isBackgroundVisible() const
             {
                return m_visible;
             }
             void QLegend::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 const QRectF& rect = QRectF(QPoint(0,0),event->newSize());
                 QGraphicsWidget::resizeEvent(event);
                 if(m_rect != rect){
                     m_rect = rect;
                     updateLayout();
                 }
             }
             void QLegend::hideEvent(QHideEvent *event)
             {
                 QGraphicsWidget::hideEvent(event);
                 setEnabled(false);
                 updateLayout();
             }
             void QLegend::showEvent(QShowEvent *event)
             {
                 QGraphicsWidget::showEvent(event);
                 setEnabled(true);
                 updateLayout();
             }
-            void QLegend::mousePressEvent(QGraphicsSceneMouseEvent* event)
-                //Q_UNUSED(event);
-                m_scroller->mousePressEvent(event);
-            void QLegend::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
-                //Q_UNUSED(event);
-                m_scroller->mouseMoveEvent(event);
-            void QLegend::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
-                //Q_UNUSED(event);
-                m_scroller->mouseReleaseEvent(event);
             #include "moc_qlegend.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.h +33 -6

             /****************************************************************************
             **
             ** 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>
+            #include "scroller_p.h"
             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;
-            class Scroller;
             class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 // We only support these alignments (for now)
                 enum Alignment {
                     AlignmentTop = Qt::AlignTop,
                     AlignmentBottom = Qt::AlignBottom,
                     AlignmentLeft = Qt::AlignLeft,
                     AlignmentRight = Qt::AlignRight
                 };
                 Q_DECLARE_FLAGS(Alignments, Alignment)
             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::Alignments alignment);
                 QLegend::Alignments alignment() const;
                 void detachFromChart();
                 void attachToChart();
                 bool isAttachedToChart();
                 qreal minWidht() const { return m_minWidth;}
                 qreal minHeight() const { return m_minHeight;}
                 void setBackgroundVisible(bool visible);
                 bool isBackgroundVisible() const;
                 void setOffset(const QPointF& point);
                 QPointF offset() const;
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);
                 void hideEvent(QHideEvent *event);
                 void showEvent(QShowEvent *event);
-                void mousePressEvent(QGraphicsSceneMouseEvent* event);
-                void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
-                void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
             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);
             private Q_SLOTS:
                 void updateLayout();
             private:
                 qreal m_margin;
                 QRectF m_rect;
                 qreal m_offsetX;
                 qreal m_offsetY;
                 //QList<LegendMarker *> m_markers;
                 QBrush m_brush;
                 QPen m_pen;
                 QLegend::Alignments m_alignment;
                 QGraphicsItemGroup* m_markers;
                 bool m_attachedToChart;
                 QChart *m_chart;
                 qreal m_minWidth;
                 qreal m_minHeight;
                 qreal m_width;
                 qreal m_height;
                 bool m_visible;
                 bool m_dirty;
-                Scroller* m_scroller;
+                friend class ScrolledQLegend;
-                friend class QChart;
                 // <--- PIMPL
             };
+            class ScrolledQLegend: public QLegend, public Scroller
+            {
+            public:
+                ScrolledQLegend(QChart *chart):QLegend(chart)
+                {
+                }
+                void setOffset(const QPointF& point)
+                {
+                    QLegend::setOffset(point);
+                }
+                QPointF offset() const
+                {
+                    return QLegend::offset();
+                }
+                void mousePressEvent(QGraphicsSceneMouseEvent* event){
+                    Scroller::mousePressEvent(event);
+                    //QLegend::mousePressEvent(event);
+                }
+                void mouseMoveEvent(QGraphicsSceneMouseEvent* event){
+                    Scroller::mouseMoveEvent(event);
+                    //QLegend::mouseMoveEvent(event);
+                }
+                void mouseReleaseEvent(QGraphicsSceneMouseEvent* event){
+                    Scroller::mouseReleaseEvent(event);
+                    //QLegend::mouseReleaseEvent(event);
+                }
+            };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QLEGEND_H

src/scroller.cpp +2 -13

             /****************************************************************************
             **
             ** 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 "scroller_p.h"
             #include "qlegend.h"
             #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            Scroller::Scroller(QLegend* legend):
+            Scroller::Scroller():
             m_ticker(this),
             m_state(Idle),
             m_moveThreshold(10),
-            m_timeTreshold(50),
+            m_timeTreshold(50)
-            m_legend(legend)
             {
             }
             Scroller::~Scroller()
             {
             }
             void Scroller::mousePressEvent(QGraphicsSceneMouseEvent* event)
             {
                 if (event->button() == Qt::LeftButton) {
                     switch (m_state) {
                     case Idle:
                     {
                         m_state = Pressed;
                         m_offset = offset();
                         m_press = event->pos();
                         m_timeStamp = QTime::currentTime();
                         event->accept();
                         break;
                     }
                     case Scroll:
                     {
                         m_state = Stop;
                         m_speed = QPoint(0, 0);
                         m_offset = offset();
                         m_press = event->pos();
                         event->accept();
                         break;
                     }
                     case Pressed:
                     case Move:
                     case Stop:
                         qWarning() << __FUNCTION__<<"Scroller unexpected state" << m_state;
                         event->ignore();
                         break;
                     }
                 }
             }
             void Scroller::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
             {
                 QPointF delta = event->pos() - m_press;
                 switch (m_state) {
                 case Pressed:
                 case Stop:
                 {
                     if (qAbs(delta.x()) > m_moveThreshold || qAbs(delta.y()) > m_moveThreshold) {
                         m_state = Move;
                         m_timeStamp = QTime::currentTime();
                         m_distance = QPointF(0, 0);
                         m_press = event->pos();
                         event->accept();
                         break;
                     }
                     else {
                         event->ignore();
                         break;
                     }
                 }
                 case Move:
                 {
                     setOffset(m_offset - delta);
                     calculateSpeed(event->pos());
                     event->accept();
                     break;
                 }
                 case Idle:
                 case Scroll:
                     qWarning() << __FUNCTION__<<"Scroller unexpected state" << m_state;
                     event->ignore();
                     break;
                 }
             }
             void Scroller::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
             {
                 if (event->button() == Qt::LeftButton) {
                     switch (m_state) {
                     case Scroll:
                         m_state = Stop;
                         m_speed = QPointF(0, 0);
                         m_offset = offset();
                         event->accept();
                         break;
                     case Pressed:
                     {
                         m_state = Idle;
                         //if (m_timeStamp.elapsed() < m_clickedPressDelay) {
                         //emit clicked(m_offset.toPoint());
                         //}
                         event->accept();
                         break;
                     }
                     case Move:
                     {
                         calculateSpeed(event->pos());
                         m_offset = offset();
                         m_press = event->pos();
                         if (m_speed == QPointF(0, 0)) {
                             m_state = Idle;
                         }
                         else {
                             m_speed /= 4;
                             m_state = Scroll;
                             m_ticker.start(20);
                         }
                         event->accept();
                         break;
                     }
                     case Stop:
                     case Idle:
                         qWarning() << __FUNCTION__<<"Scroller unexpected state" << m_state;
                         event->ignore();
                         break;
                     }
                 }
             }
             void Scroller::scrollTick()
             {
                 switch (m_state) {
                     case Scroll:
                     {
                         lowerSpeed(m_speed);
                         setOffset(m_offset - m_speed);
                         m_offset = offset();
                         if (m_speed == QPointF(0, 0)) {
                             m_state = Idle;
                             m_ticker.stop();
                         }
                         break;
                     }
                     case Stop:
                         m_ticker.stop();
                         break;
                     case Idle:
                     case Move:
                     case Pressed:
                         qWarning() << __FUNCTION__<<"Scroller unexpected state" << m_state;
                         m_ticker.stop();
                     break;
                 }
             }
             void Scroller::lowerSpeed(QPointF& speed, qreal maxSpeed)
             {
                 qreal x = qBound(-maxSpeed, speed.x(), maxSpeed);
                 qreal y = qBound(-maxSpeed, speed.y(), maxSpeed);
                 x = (x == 0) ? x :
                     (x > 0) ? qMax(qreal(0), x - m_fraction.x()) : qMin(qreal(0), x + m_fraction.x());
                 y = (y == 0) ? y :
                     (y > 0) ? qMax(qreal(0), y - m_fraction.y()) : qMin(qreal(0), y + m_fraction.y());
                 speed.setX(x);
                 speed.setY(y);
             }
             void Scroller::calculateSpeed(const QPointF& position)
             {
                 if (m_timeStamp.elapsed() > m_timeTreshold) {
                     QPointF distance = position - m_press;
                     m_timeStamp = QTime::currentTime();
                     m_speed = distance -  m_distance;
                     m_distance = distance;
                     qreal fraction = qMax(qAbs(m_speed.x()), qAbs(m_speed.y()));
                     if (fraction != 0) {
                         m_fraction.setX(qAbs(m_speed.x() / fraction));
                         m_fraction.setY(qAbs(m_speed.y() / fraction));
                     }
                     else {
                         m_fraction.setX(1);
                         m_fraction.setY(1);
                     }
                 }
             }
-            void Scroller::setOffset(const QPointF& point)
-                m_legend->setOffset(point);
-            QPointF Scroller::offset() const
-                return m_legend->offset();
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             ScrollTicker::ScrollTicker(Scroller *scroller,QObject* parent):QObject(parent),
                 m_scroller(scroller)
             {
             }
             void ScrollTicker::start(int interval)
             {
                 if (!m_timer.isActive()){
                     m_timer.start(interval, this);
                 }
             }
             void ScrollTicker::stop()
             {
                 m_timer.stop();
             }
             void ScrollTicker::timerEvent(QTimerEvent *event)
             {
                 Q_UNUSED(event);
                 m_scroller->scrollTick();
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/scroller_p.h +3 -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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef SCROLLER_P_H_
             #define SCROLLER_P_H_
             #include "qchartglobal.h"
             #include <QBasicTimer>
             #include <QTime>
             #include <QPointF>
             class QGraphicsSceneMouseEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Scroller;
             class QLegend;
             class ScrollTicker : public QObject
             {
             public:
                 ScrollTicker(Scroller *scroller,QObject *parent=0);
                 void start(int interval);
                 void stop();
             protected:
                 void timerEvent(QTimerEvent *event);
             private:
                 QBasicTimer m_timer;
                 Scroller *m_scroller;
             };
             class Scroller
             {
             public:
                 enum State {
                     Idle,
                     Pressed,
                     Move,
                     Scroll,
                     Stop
                 };
-                explicit Scroller(QLegend* legend);
+                Scroller();
                 virtual ~Scroller();
-                virtual void setOffset(const QPointF& point);
+                virtual void setOffset(const QPointF& point) = 0;
-                virtual QPointF offset() const;
+                virtual QPointF offset() const = 0;
             public:
                 void scrollTick();
             public:
                 void mousePressEvent(QGraphicsSceneMouseEvent* event);
                 void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
                 void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
             private:
                 void calculateSpeed(const QPointF& position);
                 void lowerSpeed(QPointF& speed,qreal maxSpeed=100);
             private:
                 ScrollTicker m_ticker;
                 State m_state;
                 QTime m_timeStamp;
                 QPointF m_press;
                 QPointF m_offset;
                 QPointF m_speed;
                 QPointF m_distance;
                 QPointF m_fraction;
                 int m_moveThreshold;
                 int m_timeTreshold;
-                QLegend* m_legend;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* SCROLLER_P_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