HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r571:0bb609016fcc

Refactors click signal to line,area,spline,scatter charts

Michal Klocek -

r571:0bb609016fcc

parent child

Context file:

r571:0bb609016fcc

Collapse all files

examples/presenterchart/chartview.cpp +10 0

                 m_series<<series3;
                 m_titles<<chartTitle()+": AreaChart";
             //![3]
                 addSeries(series0);
                 setChartTitle(m_titles.at(0));
+                foreach (QSeries* series, m_series) {
+                    QObject::connect(series,SIGNAL(clicked(const QPointF&)),this,SLOT(handlePointClicked(const QPointF&)));
+                }
                 m_timer.start();
             }
                 setChartTitle(m_titles.at(m_index));
             }
             //![4]
+            void ChartView::handlePointClicked(const QPointF& point)
+            {
+                setChartTitle(m_titles.at(m_index) + QString(" x: %1 y: %2").arg(point.x()).arg(point.y()));
+            }

examples/presenterchart/chartview.h +1 0

             public slots:
                 void handleTimeout();
+                void handlePointClicked(const QPointF& point);
             private:
                 QTimer m_timer;

src/areachart/areachartitem.cpp +7 0

             #include "qlineseries.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
+            #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 }
                 QObject::connect(areaSeries,SIGNAL(updated()),this,SLOT(handleUpdated()));
+                QObject::connect(this,SIGNAL(clicked(const QPointF&)),areaSeries,SIGNAL(clicked(const QPointF&)));
                 handleUpdated();
             }
                 painter->restore();
             }
+            void AreaChartItem::mousePressEvent( QGraphicsSceneMouseEvent * event )
+            {
+                emit clicked(m_upper->calculateDomainPoint(event->pos()));
+            }
             #include "moc_areachartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/areachart/areachartitem_p.h +7 0

                 LineChartItem* lowerLineItem() const { return m_lower ;}
                 void updatePath();
+            protected:
+                void mousePressEvent( QGraphicsSceneMouseEvent * event );
+            signals:
+                void clicked(const QPointF& point);
             public slots:
                 void handleUpdated();
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);

src/areachart/qareaseries.cpp +9 0

             */
             void QAreaSeries::setPen(const QPen& pen)
             {
+                if(m_pen!=pen){
                     m_pen=pen;
+                    emit updated();
+                }
             }
             /*!
             */
             void QAreaSeries::setBrush(const QBrush& brush)
             {
+                if(m_brush!=brush){
                     m_brush=brush;
+                    emit updated();
+                }
             }
             /*!
                 Sets if data points are \a visible and should be drawn on line.
             */
             void QAreaSeries::setPointsVisible(bool visible)
             {
+                if(m_pointsVisible!=visible){
                     m_pointsVisible=visible;
+                    emit updated();
+                }
             }
             #include "moc_qareaseries.cpp"

src/areachart/qareaseries.h +1 0

             signals:
                 void updated();
+                void clicked(const QPointF& point);
             private:
                 QBrush m_brush;

src/linechart/linechartitem.cpp 0 -7

             #include "qlineseries.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
-            #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series,SIGNAL(updated()),this,SLOT(handleUpdated()));
-                QObject::connect(this,SIGNAL(clicked(const QPointF&)),series,SIGNAL(clicked(const QPointF&)));
                 handleUpdated();
             }
                 painter->restore();
             }
-            void LineChartItem::mousePressEvent( QGraphicsSceneMouseEvent * event )
-                emit clicked(calculateDomainPoint(event->pos()));
             #include "moc_linechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/linechartitem_p.h 0 -4

             public slots:
                 void handleUpdated();
-            signals:
-                void clicked(const QPointF& point);
             protected:
                 void setLayout(QVector<QPointF>& points);
-                void mousePressEvent( QGraphicsSceneMouseEvent * event );
             private:
                 QLineSeries* m_series;

src/linechart/qlineseries.cpp +2 -4

             {
                 if(pen!=m_pen){
                 m_pen=pen;
-                emit updated();
+                emit QXYSeries::updated();
                 }
             }
             {
                 if(m_pointsVisible!=visible){
                 m_pointsVisible=visible;
-                emit updated();
+                emit QXYSeries::updated();
                 }
             }
                 return debug.space();
             }
-            #include "moc_qlineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/qlineseries.h 0 -4

             class QTCOMMERCIALCHART_EXPORT QLineSeries : public QXYSeries
             {
-            	Q_OBJECT
             public:
             	QLineSeries(QObject* parent=0);
             	virtual ~QLineSeries();
             	void setPointsVisible(bool visible);
             	bool pointsVisible() const {return m_pointsVisible;}
-            signals:
-                void clicked(const QPointF& point);
             public: // from QChartSeries
             	virtual QSeriesType type() const {return QSeries::SeriesTypeLine;}
                 friend QDebug operator<< (QDebug d, const QLineSeries series);

src/qchart.cpp +22 -13

             {
                 createChartTitleItem();
                 m_titleItem->setText(title);
+                updateLayout();
             }
             /*!
             {
                 createChartTitleItem();
                 m_titleItem->setFont(font);
+                updateLayout();
             }
             /*!
             {
                 createChartTitleItem();
                 m_titleItem->setBrush(brush);
+                updateLayout();
             }
             /*!
             void QChart::setMargin(int margin)
             {
                 m_presenter->setMargin(margin);
+                updateLayout();
             }
             /*!
             {
                 m_rect = QRectF(QPoint(0,0),event->newSize());
-                QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
+                updateLayout();
-                // recalculate title position
-                if (m_titleItem) {
-                    QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
-                    m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
-                //recalculate background gradient
-                if (m_backgroundItem) {
-                    m_backgroundItem->setRect(rect);
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             	 m_presenter->scroll(0,-m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
+            void QChart::updateLayout()
+            {
+                if(!m_rect.isValid()) return;
+                QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
+                // recalculate title position
+                if (m_titleItem) {
+                    QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
+                    m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
+                }
+                //recalculate background gradient
+                if (m_backgroundItem) {
+                    m_backgroundItem->setRect(rect);
+                }
+            }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +1 0

             private:
                 inline void createChartBackgroundItem();
                 inline void createChartTitleItem();
+                void updateLayout();
             private:
                 Q_DISABLE_COPY(QChart)

src/scatterseries/qscatterseries.cpp 0 -4

                 emit updated();
             }
-            #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/qscatterseries.h 0 -4

             class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QXYSeries
             {
-                Q_OBJECT
             public:
                 enum MarkerShape {
                 qreal size() const;
                 void setSize(qreal size);
-            signals:
-                void clicked(const QPointF& point);
             private:
                 MarkerShape m_shape;
                 qreal m_size;

src/scatterseries/scatterchartitem.cpp +5 -2

                 Q_ASSERT(series);
                 QObject::connect(m_series,SIGNAL(updated()), this, SLOT(handleUpdated()));
-                QObject::connect(this,SIGNAL(clicked(const QPointF&)), m_series, SIGNAL(clicked(const QPointF&)));
                 setZValue(ChartPresenter::ScatterSeriesZValue);
                 setFlags(QGraphicsItem::ItemHasNoContents);
             void ScatterChartItem::markerSelected(Marker* marker)
             {
-                emit clicked(QPointF(m_series->x(marker->index()), m_series->y(marker->index())));
+                emit XYChartItem::clicked(QPointF(m_series->x(marker->index()), m_series->y(marker->index())));
             }
             void ScatterChartItem::setLayout(QVector<QPointF>& points)
             }
+            void ScatterChartItem::mousePressEvent( QGraphicsSceneMouseEvent * event )
+            {
+            }
             #include "moc_scatterchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterchartitem_p.h +1 -3

                 void markerSelected(Marker* item);
-            signals:
-                void clicked(const QPointF& point);
             public slots:
                 void handleUpdated();
             protected:
                 void setLayout(QVector<QPointF>& points);
+                void mousePressEvent( QGraphicsSceneMouseEvent * event );
             private:
                 QScatterSeries *m_series;

src/splinechart/splinechartitem_p.h 0 -2

                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
-                void setPointsVisible(bool visible);
             public slots:
                 void handleUpdated();

src/xychart/qxyseries.h +1 0

                     void modelDataRemoved(QModelIndex parent, int start, int end);
             signals:
+                void clicked(const QPointF& point);
                 void updated();
                 void pointReplaced(int index);
                 void pointRemoved(int index);

src/xychart/xychartitem.cpp +7 -1

             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
+            #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QObject::connect(series,SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
                 QObject::connect(series,SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
                 QObject::connect(series,SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
+                QObject::connect(this,SIGNAL(clicked(const QPointF&)),series,SIGNAL(clicked(const QPointF&)));
             }
             QPointF XYChartItem::calculateGeometryPoint(const QPointF& point) const
                return !m_clipRect.isValid() ||  m_maxX - m_minX == 0 || m_maxY - m_minY ==0 ;
             }
+            void XYChartItem::mousePressEvent( QGraphicsSceneMouseEvent * event )
+            {
+                emit clicked(calculateDomainPoint(event->pos()));
+            }
             #include "moc_xychartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/xychartitem_p.h +5 0

                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF& size);
+            signals:
+                void clicked(const QPointF& point);
             protected:
                 virtual void setLayout(QVector<QPointF>& points);
                 QPointF calculateGeometryPoint(const QPointF& point) const;
                 QPointF calculateGeometryPoint(int index) const;
                 QPointF calculateDomainPoint(const QPointF& point) const;
                 QVector<QPointF> calculateGeometryPoints() const;
+                void mousePressEvent( QGraphicsSceneMouseEvent * event );
             private:
                 void applyLayout(QVector<QPointF>& points);
                 QVector<QPointF> m_points;
                 friend class XYAnimation;
+                friend class AreaChartItem;
             };

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